aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /js/io
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/io')
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/templates/files/animation.txt6
-rwxr-xr-xjs/io/templates/files/banner.txt6
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js2
6 files changed, 16 insertions, 4 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index feced079..041e7ed7 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.8.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.6.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/js/io/templates/files/animation.txt b/js/io/templates/files/animation.txt
index 8a3dbd41..a850f186 100755
--- a/js/io/templates/files/animation.txt
+++ b/js/io/templates/files/animation.txt
@@ -8,6 +8,12 @@
8 <!-- Ninja-Banner Dimensions@@@ --> 8 <!-- Ninja-Banner Dimensions@@@ -->
9 9
10 <style type="text/css"> 10 <style type="text/css">
11 html, body {
12 width: 100%;
13 height: 100%;
14 margin: 0;
15 padding: 0;
16 }
11 .ninja-content-wrapper {} 17 .ninja-content-wrapper {}
12 .ninja-banner {} 18 .ninja-banner {}
13 </style> 19 </style>
diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt
index f26accf6..fcfac14c 100755
--- a/js/io/templates/files/banner.txt
+++ b/js/io/templates/files/banner.txt
@@ -8,6 +8,12 @@
8 <!-- Ninja-Banner Dimensions@@@ --> 8 <!-- Ninja-Banner Dimensions@@@ -->
9 9
10 <style type="text/css"> 10 <style type="text/css">
11 html, body {
12 width: 100%;
13 height: 100%;
14 margin: 0;
15 padding: 0;
16 }
11 .ninja-content-wrapper {} 17 .ninja-content-wrapper {}
12 .ninja-banner {} 18 .ninja-banner {}
13 </style> 19 </style>
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index 9e77759f..a5fab11c 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
@@ -16,7 +16,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
16 this.findDirectory.identifier = "findDirectory"; 16 this.findDirectory.identifier = "findDirectory";
17 this.findDirectory.addEventListener("click", this, false); 17 this.findDirectory.addEventListener("click", this, false);
18 this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false); 18 this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false);
19 this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false); 19 this.addPropertyChangeListener("newFileDirectory.value", this.handleNewFileDirectoryChange, false);
20 this.newFileDirectory.element.addEventListener("keyup", this, false); 20 this.newFileDirectory.element.addEventListener("keyup", this, false);
21 } 21 }
22 }, 22 },
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index 3ac38d02..e8a699cc 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -22,7 +22,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
22 value: function() { 22 value: function() {
23 this.fileInputField.selectDirectory = true; 23 this.fileInputField.selectDirectory = true;
24 24
25 this.addEventListener("change@newFileName.value", this.newFileNameChange, false); 25 this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false);
26 this.newFileName.element.addEventListener("keyup", this, false); 26 this.newFileName.element.addEventListener("keyup", this, false);
27 this.newFileName.element.focus(); 27 this.newFileName.element.focus();
28 this.newFileName.element.select(); 28 this.newFileName.element.select();
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index e2f50ff5..a27d9d13 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -57,7 +57,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
57 this.fileInputField.selectDirectory = true; 57 this.fileInputField.selectDirectory = true;
58 this.fileInputField.pickerName = "saveAsDirectoryPicker"; 58 this.fileInputField.pickerName = "saveAsDirectoryPicker";
59 59
60 this.addEventListener("change@newFileName.value", this.handleNewFileNameChange, false); 60 this.addPropertyChangeListener("newFileName.value", this.handleNewFileNameChange, false);
61 this.newFileName.element.addEventListener("keyup", this, false); 61 this.newFileName.element.addEventListener("keyup", this, false);
62 this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false); 62 this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false);
63 this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false); 63 this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false);