diff options
author | hwc487 | 2012-06-12 15:52:35 -0700 |
---|---|---|
committer | hwc487 | 2012-06-12 15:52:35 -0700 |
commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
tree | f44449a2e0055e21960a5513fb3a0738a91db528 /js/io/ui | |
parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
Diffstat (limited to 'js/io/ui')
-rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 5 |
1 files changed, 0 insertions, 5 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 | ||