Merge pull request #981 from karlguillotte/master

Rename variables none/empty to isNone/isEmpty
emberjs · May 16, 2013 · 05e97a3 · 05e97a3
2 parents dc24b82 + d09d50d
commit 05e97a3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/packages/ember-data/lib/transforms/json_transforms.js b/packages/ember-data/lib/transforms/json_transforms.js
@@ -1,4 +1,4 @@
-var none = Ember.isNone, empty = Ember.isEmpty;
+var isNone = Ember.isNone, isEmpty = Ember.isEmpty;
 
 /**
   @module data
@@ -15,21 +15,21 @@ var none = Ember.isNone, empty = Ember.isEmpty;
 DS.JSONTransforms = {
   string: {
     deserialize: function(serialized) {
-      return none(serialized) ? null : String(serialized);
+      return isNone(serialized) ? null : String(serialized);
     },
 
     serialize: function(deserialized) {
-      return none(deserialized) ? null : String(deserialized);
+      return isNone(deserialized) ? null : String(deserialized);
     }
   },
 
   number: {
     deserialize: function(serialized) {
-      return empty(serialized) ? null : Number(serialized);
+      return isEmpty(serialized) ? null : Number(serialized);
     },
 
     serialize: function(deserialized) {
-      return empty(deserialized) ? null : Number(deserialized);
+      return isEmpty(deserialized) ? null : Number(deserialized);
     }
   },