Return the setter values instead of this

cibernox · May 19, 2015 · 8054665 · 8054665
1 parent ce92a37
commit 8054665
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/packages/ember-metal/lib/set_properties.js b/packages/ember-metal/lib/set_properties.js
@@ -20,10 +20,10 @@ import keys from "ember-metal/keys";
   @method setProperties
   @param obj
   @param {Object} properties
-  @return obj
+  @return properties
 */
 export default function setProperties(obj, properties) {
-  if (!properties || typeof properties !== "object") { return obj; }
+  if (!properties || typeof properties !== "object") { return properties; }
   changeProperties(function() {
     var props = keys(properties);
     var propertyName;
@@ -34,5 +34,5 @@ export default function setProperties(obj, properties) {
       set(obj, propertyName, properties[propertyName]);
     }
   });
-  return obj;
+  return properties;
 }
diff --git a/packages/ember-runtime/lib/mixins/observable.js b/packages/ember-runtime/lib/mixins/observable.js
@@ -445,8 +445,7 @@ export default Mixin.create({
   incrementProperty(keyName, increment) {
     if (isNone(increment)) { increment = 1; }
     Ember.assert("Must pass a numeric value to incrementProperty", (!isNaN(parseFloat(increment)) && isFinite(increment)));
-    set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
-    return get(this, keyName);
+    return set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
   },
 
   /**
@@ -465,8 +464,7 @@ export default Mixin.create({
   decrementProperty(keyName, decrement) {
     if (isNone(decrement)) { decrement = 1; }
     Ember.assert("Must pass a numeric value to decrementProperty", (!isNaN(parseFloat(decrement)) && isFinite(decrement)));
-    set(this, keyName, (get(this, keyName) || 0) - decrement);
-    return get(this, keyName);
+    return set(this, keyName, (get(this, keyName) || 0) - decrement);
   },
 
   /**
@@ -482,8 +480,7 @@ export default Mixin.create({
     @return {Object} The new property value
   */
   toggleProperty(keyName) {
-    set(this, keyName, !get(this, keyName));
-    return get(this, keyName);
+    return set(this, keyName, !get(this, keyName));
   },
 
   /**