2 files changed, 23 insertions, 3 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 6557c14e..6ca869ba 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -27,7 +27,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
             setTimeout(function() {
                 this.bindToModelObjects();
             }.bind(this), 1000);
-
+            this.currentObjectBindings = [];
             this._currentDocument = doc;
         },
         enumerable : false
@@ -150,9 +150,9 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
             var properties = [];
 
             for(var key in object) {
-                if(object.hasOwnProperty(key)) {
+                //if(object.hasOwnProperty(key)) {
                         properties.push(key);
-                }
+                //}
             }
 
             if(excludeUnderscoreProperties) {
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 4c177189..65a56a74 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -53,6 +53,8 @@ exports.PresetsController = Montage.create(Component, {
             //// TODO: replace this hack when webkit supports transitionStart event (see above)
             window.clearTimeout(el.njTimeout);
 
+            this._dispatchChange();
+
             el.classList.remove(this.transitionClass);
             el.removeEventListener("webkitTransitionEnd", this, true);
         }
@@ -107,6 +109,10 @@ exports.PresetsController = Montage.create(Component, {
                 }
             }, this);
 
+            if(!useTransition) {
+                this._dispatchChange();
+            }
+
         }
     },
 
@@ -126,5 +132,19 @@ exports.PresetsController = Montage.create(Component, {
 
             return keysString;
         }
+    },
+
+    _dispatchChange : {
+        value: function(property, value) {
+            this.application.ninja.stage.updatedStage = true;
+            NJevent('elementChange', {
+                type : 'presetChange',
+                data: {
+                    "prop": property,
+                    "value": value
+                },
+                redraw: null
+            });
+        }
     }
 });
\ No newline at end of file