Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 5a36e367..2e8020d3 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -130,10 +130,10 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
     bindSnap: {
         value: function() {
-            this.addEventListener("change@appModel.snap", this.toggleSnap, false);
-            this.addEventListener("change@appModel.snapGrid", this.toggleSnapGrid, false);
-            this.addEventListener("change@appModel.snapObjects", this.toggleSnapObjects, false);
-            this.addEventListener("change@appModel.snapAlign", this.toggleSnapAlign, false);
+            this.addPropertyChangeListener("appModel.snap", this.toggleSnap, false);
+            this.addPropertyChangeListener("appModel.snapGrid", this.toggleSnapGrid, false);
+            this.addPropertyChangeListener("appModel.snapObjects", this.toggleSnapObjects, false);
+            this.addPropertyChangeListener("appModel.snapAlign", this.toggleSnapAlign, false);
         }
     },