diff options
author | Valerio Virgillito | 2012-06-06 14:55:10 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 14:55:10 -0700 |
commit | 1ab7267ede9f4691caf9ca09940b2bac67badbcd (patch) | |
tree | 6a862b513e83e3796a9d43a4a81aa83f8e7b1127 /js | |
parent | e14ce28b5c8858af75fbf2003c8f1b854daa7e35 (diff) | |
parent | 5d1fd1fc1da434cd56ac8f366eb17b692c786497 (diff) | |
download | ninja-1ab7267ede9f4691caf9ca09940b2bac67badbcd.tar.gz |
Merge pull request #274 from ananyasen/bugfix-master
Bugfix master
Diffstat (limited to 'js')
-rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 5 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js index ebe2df61..7227d532 100644 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | |||
@@ -195,11 +195,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
195 | } | 195 | } |
196 | } | 196 | } |
197 | 197 | ||
198 | //disable ok | ||
199 | if(!this.okButton.hasAttribute("disabled")){ | ||
200 | this.okButton.setAttribute("disabled", "true"); | ||
201 | } | ||
202 | |||
203 | //save project type selection | 198 | //save project type selection |
204 | this.selectedProjectType = {"uri":evt.uri, "element":evt.target}; | 199 | this.selectedProjectType = {"uri":evt.uri, "element":evt.target}; |
205 | 200 | ||
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 8d1c087d..30ee1e40 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -242,7 +242,7 @@ exports.Stage = Montage.create(Component, { | |||
242 | 242 | ||
243 | // Hack for now until a full component | 243 | // Hack for now until a full component |
244 | this.layout.draw(); | 244 | this.layout.draw(); |
245 | if(this.currentDocument) { | 245 | if(this.currentDocument && (this.currentDocument.currentView === "design")) { |
246 | this.layout.draw3DInfo(true); | 246 | this.layout.draw3DInfo(true); |
247 | } | 247 | } |
248 | } else if(this.updatedStage) { | 248 | } else if(this.updatedStage) { |