diff options
author | Ananya Sen | 2012-06-20 15:20:04 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-20 15:20:04 -0700 |
commit | caa9683fd259307658f96190a5c5bd771126fbb8 (patch) | |
tree | 83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/io | |
parent | d852ea28dad399e84e8d5e69c0293500c30b59f1 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/io')
4 files changed, 4 insertions, 4 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index de11034b..0417fa3d 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.1.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, |
4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html index c3209654..ff165f9a 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |||
@@ -12,7 +12,7 @@ | |||
12 | { | 12 | { |
13 | 13 | ||
14 | "newFileDirectory": { | 14 | "newFileDirectory": { |
15 | "prototype": "montage/ui/textfield.reel", | 15 | "prototype": "montage/ui/input-text.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "newFileDirectory"} | 17 | "element": {"#": "newFileDirectory"} |
18 | } | 18 | } |
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html index f9a42887..0c410a47 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | |||
@@ -56,7 +56,7 @@ | |||
56 | }, | 56 | }, |
57 | 57 | ||
58 | "newFileName": { | 58 | "newFileName": { |
59 | "prototype": "montage/ui/textfield.reel", | 59 | "prototype": "montage/ui/input-text.reel", |
60 | "properties": { | 60 | "properties": { |
61 | "element": {"#": "newFileName"} | 61 | "element": {"#": "newFileName"} |
62 | } | 62 | } |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html index dcdb073f..99f98ddb 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html | |||
@@ -18,7 +18,7 @@ | |||
18 | }, | 18 | }, |
19 | 19 | ||
20 | "newFileName": { | 20 | "newFileName": { |
21 | "prototype": "montage/ui/textfield.reel", | 21 | "prototype": "montage/ui/input-text.reel", |
22 | "properties": { | 22 | "properties": { |
23 | "element": {"#": "newFileName"} | 23 | "element": {"#": "newFileName"} |
24 | } | 24 | } |