diff options
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 8 | ||||
-rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.js | 2 | ||||
-rwxr-xr-x | js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js | 2 | ||||
-rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.js | 2 | ||||
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 2 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 6 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 9 |
7 files changed, 15 insertions, 16 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, { | |||
130 | 130 | ||
131 | bindSnap: { | 131 | bindSnap: { |
132 | value: function() { | 132 | value: function() { |
133 | this.addEventListener("change@appModel.snap", this.toggleSnap, false); | 133 | this.addPropertyChangeListener("appModel.snap", this.toggleSnap, false); |
134 | this.addEventListener("change@appModel.snapGrid", this.toggleSnapGrid, false); | 134 | this.addPropertyChangeListener("appModel.snapGrid", this.toggleSnapGrid, false); |
135 | this.addEventListener("change@appModel.snapObjects", this.toggleSnapObjects, false); | 135 | this.addPropertyChangeListener("appModel.snapObjects", this.toggleSnapObjects, false); |
136 | this.addEventListener("change@appModel.snapAlign", this.toggleSnapAlign, false); | 136 | this.addPropertyChangeListener("appModel.snapAlign", this.toggleSnapAlign, false); |
137 | } | 137 | } |
138 | }, | 138 | }, |
139 | 139 | ||
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js index 9e77759f..a5fab11c 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js | |||
@@ -16,7 +16,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, { | |||
16 | this.findDirectory.identifier = "findDirectory"; | 16 | this.findDirectory.identifier = "findDirectory"; |
17 | this.findDirectory.addEventListener("click", this, false); | 17 | this.findDirectory.addEventListener("click", this, false); |
18 | this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false); | 18 | this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false); |
19 | this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false); | 19 | this.addPropertyChangeListener("newFileDirectory.value", this.handleNewFileDirectoryChange, false); |
20 | this.newFileDirectory.element.addEventListener("keyup", this, false); | 20 | this.newFileDirectory.element.addEventListener("keyup", this, false); |
21 | } | 21 | } |
22 | }, | 22 | }, |
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js index 3ac38d02..e8a699cc 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js | |||
@@ -22,7 +22,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { | |||
22 | value: function() { | 22 | value: function() { |
23 | this.fileInputField.selectDirectory = true; | 23 | this.fileInputField.selectDirectory = true; |
24 | 24 | ||
25 | this.addEventListener("change@newFileName.value", this.newFileNameChange, false); | 25 | this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false); |
26 | this.newFileName.element.addEventListener("keyup", this, false); | 26 | this.newFileName.element.addEventListener("keyup", this, false); |
27 | this.newFileName.element.focus(); | 27 | this.newFileName.element.focus(); |
28 | this.newFileName.element.select(); | 28 | this.newFileName.element.select(); |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js index e2f50ff5..a27d9d13 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js | |||
@@ -57,7 +57,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { | |||
57 | this.fileInputField.selectDirectory = true; | 57 | this.fileInputField.selectDirectory = true; |
58 | this.fileInputField.pickerName = "saveAsDirectoryPicker"; | 58 | this.fileInputField.pickerName = "saveAsDirectoryPicker"; |
59 | 59 | ||
60 | this.addEventListener("change@newFileName.value", this.handleNewFileNameChange, false); | 60 | this.addPropertyChangeListener("newFileName.value", this.handleNewFileNameChange, false); |
61 | this.newFileName.element.addEventListener("keyup", this, false); | 61 | this.newFileName.element.addEventListener("keyup", this, false); |
62 | this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false); | 62 | this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false); |
63 | this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false); | 63 | this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false); |
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 49960f58..243caf5c 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -67,7 +67,7 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
67 | document.addEventListener("keydown", this, false); | 67 | document.addEventListener("keydown", this, false); |
68 | document.addEventListener("keyup", this, false); | 68 | document.addEventListener("keyup", this, false); |
69 | 69 | ||
70 | this.addEventListener("change@appModel.livePreview", this.handleLivePreview, false); | 70 | this.addPropertyChangeListener("appModel.livePreview", this.handleLivePreview, false); |
71 | } | 71 | } |
72 | }, | 72 | }, |
73 | 73 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 3fcce925..87167d4c 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -165,9 +165,9 @@ exports.Ninja = Montage.create(Component, { | |||
165 | this.eventManager.addEventListener( "selectSubTool", this, false); | 165 | this.eventManager.addEventListener( "selectSubTool", this, false); |
166 | this.eventManager.addEventListener( "onOpenDocument", this, false); | 166 | this.eventManager.addEventListener( "onOpenDocument", this, false); |
167 | 167 | ||
168 | this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false); | 168 | this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false); |
169 | this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false); | 169 | this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false); |
170 | this.addEventListener("change@appModel.debug", this.toggleDebug, false); | 170 | this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); |
171 | 171 | ||
172 | NJevent("appLoading"); | 172 | NJevent("appLoading"); |
173 | } | 173 | } |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 125155d8..93270561 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -300,7 +300,7 @@ exports.Stage = Montage.create(Component, { | |||
300 | // TODO - We will need to modify this once we support switching between multiple documents | 300 | // TODO - We will need to modify this once we support switching between multiple documents |
301 | this.application.ninja.toolsData.selectedToolInstance._configure(true); | 301 | this.application.ninja.toolsData.selectedToolInstance._configure(true); |
302 | 302 | ||
303 | this.addEventListener("change@appModel.show3dGrid", this, false); | 303 | this.addPropertyChangeListener("appModel.show3dGrid", this, false); |
304 | 304 | ||
305 | this.layout.handleOpenDocument(); | 305 | this.layout.handleOpenDocument(); |
306 | } | 306 | } |
@@ -309,10 +309,9 @@ exports.Stage = Montage.create(Component, { | |||
309 | /** | 309 | /** |
310 | * Event handler for the change @ 3DGrid | 310 | * Event handler for the change @ 3DGrid |
311 | */ | 311 | */ |
312 | handleEvent: { | 312 | handleChange: { |
313 | value: function(e) { | 313 | value: function(notification) { |
314 | if(e.type === "change@appModel.show3dGrid") { | 314 | if("appModel.show3dGrid" === notification.currentPropertyPath) { |
315 | |||
316 | if(this.appModel.show3dGrid) { | 315 | if(this.appModel.show3dGrid) { |
317 | 316 | ||
318 | drawUtils.drawXY = true; | 317 | drawUtils.drawXY = true; |