Write hooks can change the return value of the writer by returning a …

…value themselves
nathansobo · Jan 10, 2011 · 1437aa5 · 1437aa5
1 parent 4c7c5e9
commit 1437aa5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/monarch/foundation.js b/lib/monarch/foundation.js
@@ -149,9 +149,11 @@ function buildPropertyAccessor(name, reader, writer, afterWriteHook, afterChange
     } else {
       var oldValue = this[fieldName];
       var newValue = writer.apply(this, arguments) || this[fieldName];
-      if (afterWriteHook) afterWriteHook.call(this, newValue, oldValue);
-      if (afterChangeHook && newValue !== oldValue) afterChangeHook.call(this, newValue, oldValue);
-      return newValue;
+
+      var writeHookReturnVal, changeHookReturnVal;
+      if (afterWriteHook) writeHookReturnVal = afterWriteHook.call(this, newValue, oldValue);
+      if (afterChangeHook && newValue !== oldValue) changeHookReturnVal = afterChangeHook.call(this, newValue, oldValue);
+      return changeHookReturnVal || writeHookReturnVal || newValue;
     }
   };
   accessor._accessor_ = true;