diff options
author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/io | |
parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/io')
-rw-r--r-- | js/io/system/ninjalibrary.json | 2 | ||||
-rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 5c1eb875..e9df5e58 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "libraries": [ | 2 | "libraries": [ |
3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"}, |
4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.7.0"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.9.0"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |
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 | ||