Merge branch 'master' of github.com:mapbox/wax

ianshward · Mar 1, 2011 · 4104c35 · 4104c35
2 parents 8d18f20 + 78aae20
commit 4104c35
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,10 @@ Wax includes two libraries in `/lib` which are included in builds
 
 ## Changelog
 
+#### 1.0.2
+
+* Bug fixes for Firefox 3
+
 #### 1.0.1
 
 * `make ext` added for downloading and installing external libraries needed to use examples.

diff --git a/build/wax.g.js b/build/wax.g.js
@@ -310,7 +310,7 @@ wax.Record = function(obj, context) {
         args = args.length ? wax.Record(args) : [];
 
         // real browsers
-        if (!$.browser.msie) {
+        if (Object.create) {
             obj = Object.create(fn_obj[1].prototype);
             fn_obj[1].apply(obj, args);
         // lord have mercy on your soul.
@@ -395,19 +395,15 @@ wax.Record = function(obj, context) {
         case '@call':
             return runFunction(statement.subject, statement.object, null);
         }
-    } else {
-        // Reify object/arrays.
-        try {
-            var keys = _.keys(obj);
-            for (i = 0; i < keys.length; i++) {
-                var key = keys[i];
-                obj[key] = wax.Record(obj[key], context);
-            }
-            return obj;
-        // Unwrapped scalars
-        } catch(e) {
-            return obj;
+    } else if (typeof obj === 'object') {
+        var keys = _.keys(obj);
+        for (i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            obj[key] = wax.Record(obj[key], context);
         }
+        return obj;
+    } else {
+        return obj;
     }
 };
 //     Underscore.js 1.1.4

diff --git a/build/wax.g.min.js b/build/wax.g.min.js
diff --git a/build/wax.ol.js b/build/wax.ol.js
@@ -310,7 +310,7 @@ wax.Record = function(obj, context) {
         args = args.length ? wax.Record(args) : [];
 
         // real browsers
-        if (!$.browser.msie) {
+        if (Object.create) {
             obj = Object.create(fn_obj[1].prototype);
             fn_obj[1].apply(obj, args);
         // lord have mercy on your soul.
@@ -395,19 +395,15 @@ wax.Record = function(obj, context) {
         case '@call':
             return runFunction(statement.subject, statement.object, null);
         }
-    } else {
-        // Reify object/arrays.
-        try {
-            var keys = _.keys(obj);
-            for (i = 0; i < keys.length; i++) {
-                var key = keys[i];
-                obj[key] = wax.Record(obj[key], context);
-            }
-            return obj;
-        // Unwrapped scalars
-        } catch(e) {
-            return obj;
+    } else if (typeof obj === 'object') {
+        var keys = _.keys(obj);
+        for (i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            obj[key] = wax.Record(obj[key], context);
         }
+        return obj;
+    } else {
+        return obj;
     }
 };
 //     Underscore.js 1.1.4

diff --git a/build/wax.ol.min.js b/build/wax.ol.min.js
diff --git a/lib/record.js b/lib/record.js
@@ -50,7 +50,7 @@ wax.Record = function(obj, context) {
         args = args.length ? wax.Record(args) : [];
 
         // real browsers
-        if (!$.browser.msie) {
+        if (Object.create) {
             obj = Object.create(fn_obj[1].prototype);
             fn_obj[1].apply(obj, args);
         // lord have mercy on your soul.
@@ -135,18 +135,14 @@ wax.Record = function(obj, context) {
         case '@call':
             return runFunction(statement.subject, statement.object, null);
         }
-    } else {
-        // Reify object/arrays.
-        try {
-            var keys = _.keys(obj);
-            for (i = 0; i < keys.length; i++) {
-                var key = keys[i];
-                obj[key] = wax.Record(obj[key], context);
-            }
-            return obj;
-        // Unwrapped scalars
-        } catch(e) {
-            return obj;
+    } else if (typeof obj === 'object') {
+        var keys = _.keys(obj);
+        for (i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            obj[key] = wax.Record(obj[key], context);
         }
+        return obj;
+    } else {
+        return obj;
     }
 };