aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
Diffstat (limited to 'js/io')
-rw-r--r--js/io/system/ninjalibrary.js28
-rw-r--r--js/io/system/ninjalibrary.json4
-rw-r--r--js/io/templates/descriptor.json9
-rw-r--r--js/io/templates/files/xml.txt1
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html7
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html11
-rwxr-xr-xjs/io/ui/file-picker/picker-navigator.reel/picker-navigator.html39
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html24
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html22
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html20
10 files changed, 79 insertions, 86 deletions
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 201598fc..f4915a91 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -152,7 +152,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
152 // 152 //
153 this.chromeApi = chrome; 153 this.chromeApi = chrome;
154 // 154 //
155 var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [], copied; 155// debugger;
156 var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
156 //Getting known json list of libraries to copy to chrome 157 //Getting known json list of libraries to copy to chrome
157 xhr.open("GET", '/js/io/system/ninjalibrary.json', false); 158 xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
158 xhr.send(); 159 xhr.send();
@@ -166,23 +167,18 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
166 if (chromeLibs.length > 0) { 167 if (chromeLibs.length > 0) {
167 // 168 //
168 for (i=0; chromeLibs[i]; i++) { 169 for (i=0; chromeLibs[i]; i++) {
169 copied = false;
170 for (var j in libs.libraries) { 170 for (var j in libs.libraries) {
171 if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) { 171 if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) {
172 copied = true; 172 //TODO: Remove, currently manually removing copied libraries
173 } 173 // //this.chromeApi.directoryDelete(chromeLibs[i]);
174 } 174 } else {
175 // 175 if (libs.libraries[j].file) {
176 if (!copied) { 176 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file});
177 if (libs.libraries[j].file) { 177 } else {
178 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file}); 178 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path});
179 } else { 179 }
180 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path}); 180 }
181 } 181 }
182 } else {
183 //TODO: Remove, currently manually removing copied libraries
184 //this.chromeApi.directoryDelete(chromeLibs[i]);
185 }
186 } 182 }
187 183
188 } else { 184 } else {
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index e236f2e0..feced079 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.7.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.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/descriptor.json b/js/io/templates/descriptor.json
index acc03979..21c4b58c 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -6,7 +6,7 @@
6 "name":"Blank File", 6 "name":"Blank File",
7 "uri":"/", 7 "uri":"/",
8 "type":"directory", 8 "type":"directory",
9 "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt"] 9 "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"]
10 }, 10 },
11 "js/io/templates/files/html.txt":{ 11 "js/io/templates/files/html.txt":{
12 "name":"HTML", 12 "name":"HTML",
@@ -64,6 +64,13 @@
64 "fileExtension":".rb", 64 "fileExtension":".rb",
65 "children":["defaultTemplate"] 65 "children":["defaultTemplate"]
66 }, 66 },
67 "js/io/templates/files/xml.txt":{
68 "name":"XML",
69 "uri":"js/io/templates/files/xml.txt",
70 "type":"file",
71 "fileExtension":".xml",
72 "children":["defaultTemplate"]
73 },
67 "defaultTemplate":{ 74 "defaultTemplate":{
68 "name": "Basic", 75 "name": "Basic",
69 "uri": "defaultTemplate", 76 "uri": "defaultTemplate",
diff --git a/js/io/templates/files/xml.txt b/js/io/templates/files/xml.txt
new file mode 100644
index 00000000..8906a78b
--- /dev/null
+++ b/js/io/templates/files/xml.txt
@@ -0,0 +1 @@
<!-- Created with Motorola Mobility Ninja --> \ No newline at end of file
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index e58041ec..753597e7 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2 2
3<!-- <copyright> 3<!-- <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
@@ -16,8 +16,7 @@
16 <script type="text/montage-serialization"> 16 <script type="text/montage-serialization">
17 { 17 {
18 "owner": { 18 "owner": {
19 "module": "js/io/ui/cloudpopup.reel", 19 "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",
20 "name": "cloudpopup",
21 "properties": { 20 "properties": {
22 "element": {"#": "cloud_popup"} 21 "element": {"#": "cloud_popup"}
23 } 22 }
@@ -29,7 +28,7 @@
29 28
30 <body> 29 <body>
31 30
32 <div id="cloud_popup" class="cloud_popup"> 31 <div data-montage-id="cloud_popup" class="cloud_popup">
33 <div class="content"> 32 <div class="content">
34 33
35 <h3>Cloud Service Dialog</h3> 34 <h3>Cloud Service Dialog</h3>
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 00df1c11..c3209654 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
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -19,8 +19,7 @@
19 }, 19 },
20 20
21 "owner":{ 21 "owner":{
22 "module": "js/io/ui/file-picker/file-input-field.reel", 22 "prototype": "js/io/ui/file-picker/file-input-field.reel",
23 "name": "FileInputField",
24 "properties": { 23 "properties": {
25 "element": {"#": "fileInputField"}, 24 "element": {"#": "fileInputField"},
26 "findDirectory": {"#": "findDirectory"}, 25 "findDirectory": {"#": "findDirectory"},
@@ -31,9 +30,9 @@
31 </script> 30 </script>
32</head> 31</head>
33<body> 32<body>
34<div id="fileInputField" class="fileInputField"> 33<div data-montage-id="fileInputField" class="fileInputField">
35 <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" /> 34 <input type="search" data-montage-id="newFileDirectory" class="nj-skinned newFileDirectory" />
36 <span id="findDirectory" class="findDirectory"></span> 35 <span data-montage-id="findDirectory" class="findDirectory"></span>
37</div> 36</div>
38</body> 37</body>
39</html> \ No newline at end of file 38</html> \ No newline at end of file
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
index f46068ec..34d6b53a 100755
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner":{ 13 "owner":{
14 "module": "js/io/ui/file-picker/picker-navigator.reel", 14 "prototype": "js/io/ui/file-picker/picker-navigator.reel",
15 "name":"PickerNavigator",
16 "properties":{ 15 "properties":{
17 "element": {"#": "picker"}, 16 "element": {"#": "picker"},
18 "filterVal" : {"#": "filterVal"}, 17 "filterVal" : {"#": "filterVal"},
@@ -39,41 +38,41 @@
39 38
40</head> 39</head>
41<body> 40<body>
42<div id="picker" class="picker" style="visibility:hidden;"> 41<div data-montage-id="picker" class="picker" style="visibility:hidden;">
43 <div><span id="error" class="error"></span></div> 42 <div><span data-montage-id="error" class="error"></span></div>
44 <div class="pickerHeader"> 43 <div class="pickerHeader">
45 <div class="historyArrows"> 44 <div class="historyArrows">
46 <span id="backArrow" class="backArrow disable">&#9664</span> 45 <span data-montage-id="backArrow" class="backArrow disable">&#9664</span>
47 <span id="forwardArrow" class="forwardArrow disable">&#9654</span> 46 <span data-montage-id="forwardArrow" class="forwardArrow disable">&#9654</span>
48 </div> 47 </div>
49 <img id="reload" alt="refresh" title="refresh" width="25px" height="15px" class="reload" src="data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%24%00%00%00%16%08%06%00%00%00%A8%B2%3E%3E%00%00%00%04gAMA%00%00%D6%D8%D4OX2%00%00%00%18tEXtSoftware%00Paint.NET%20v3.30%40%84G%10%00%00%03%96IDATHK%B5%96%CBK%5BA%14%C6%13Z%84%D2B%A1%AB%82%FF%82%60%E2%2B%BAs%A1%18_%88%22f%25n*%0A%25%8A%BAiEQD%11%C4%85%DA%85%8AK%05)U%0C%8A%18%15%8A%82n%8C%8F%12%04A%17%09%D1Z%C4%92%14%91P%2Cr%3A%BF%A1%09%86%C6%DCK%AD%81%8Fsg%CE%99%EF%FBr%