aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /js/io
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/io')
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html2
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 }