aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-11 15:00:36 -0700
committerValerio Virgillito2012-05-11 15:00:36 -0700
commitf4c4bc7971a50f9e258d1ac23c70f8ea8cfe5dd6 (patch)
tree297cc2bdd26c5a72bd88edf6d91be8ceef25e98b /js/io
parent2b718df00eb9f3a3d2ad269fab533967668988bf (diff)
parent1fb663b5f348fe2ff5ce86a80e8a61be289eba70 (diff)
downloadninja-f4c4bc7971a50f9e258d1ac23c70f8ea8cfe5dd6.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
Diffstat (limited to 'js/io')
-rw-r--r--js/io/templates/descriptor.json59
-rwxr-xr-xjs/io/templates/files/banner.txt13
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js11
3 files changed, 76 insertions, 7 deletions
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index 21c4b58c..0b2b70e5 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -1,13 +1,21 @@
1{ 1{
2 "categories":{ 2 "categories":{
3 "children":["/"] 3 "children":["/basic", "/template"]
4 }, 4 },
5 "/":{ 5
6 "/basic":{
6 "name":"Blank File", 7 "name":"Blank File",
7 "uri":"/", 8 "uri":"/basic",
8 "type":"directory", 9 "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", "js/io/templates/files/xml.txt"] 10 "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 }, 11 },
12 "/template":{
13 "name":"Template",
14 "uri":"/template",
15 "type":"directory",
16 "children":["js/io/templates/files/banner.txt"]
17 },
18
11 "js/io/templates/files/html.txt":{ 19 "js/io/templates/files/html.txt":{
12 "name":"HTML", 20 "name":"HTML",
13 "uri":"js/io/templates/files/html.txt", 21 "uri":"js/io/templates/files/html.txt",
@@ -75,6 +83,49 @@
75 "name": "Basic", 83 "name": "Basic",
76 "uri": "defaultTemplate", 84 "uri": "defaultTemplate",
77 "type":"file" 85 "type":"file"
86 },
87
88 "js/io/templates/files/banner.txt":{
89 "name":"Banner",
90 "uri":"js/io/templates/files/banner.txt",
91 "type":"file",
92 "fileExtension":".html",
93 "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280", "550x400"]
94 },
95
96 "120x600":{
97 "name": "Skyscraper",
98 "uri": "120x600",
99 "type":"file"
100 },
101 "160x600":{
102 "name": "Wide Skyscraper",
103 "uri": "160x600",
104 "type":"file"
105 },
106 "200x200":{
107 "name": "Small Square",
108 "uri": "200x200",
109 "type":"file"
110 },
111 "250x250":{
112 "name": "Square",
113 "uri": "250x250",
114 "type":"file"
115 },
116 "300x250":{
117 "name": "Medium Rectangle",
118 "uri": "300x250",
119 "type":"file"
120 },
121 "336x280":{
122 "name": "Large Rectangle",
123 "uri": "336x280",
124 "type":"file"
125 },
126 "550x400":{
127 "name": "Animation Default",
128 "uri": "550x400",
129 "type":"file"
78 } 130 }
79
80} \ No newline at end of file 131} \ No newline at end of file
diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt
new file mode 100755
index 00000000..fdafe4f6
--- /dev/null
+++ b/js/io/templates/files/banner.txt
@@ -0,0 +1,13 @@
1<!DOCTYPE html>
2
3<div class="ninja-banner">
4
5 <!-- Created with Motorola Mobility Ninja -->
6
7 <!-- Ninja-Banner Dimensions@@@ -->
8
9 <style type="text/css">
10 .ninja-banner {}
11 </style>
12
13</div> \ 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 1a26c99c..ebe2df61 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
@@ -249,7 +249,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
249 249
250 handleOkButtonAction:{ 250 handleOkButtonAction:{
251 value: function(evt){ 251 value: function(evt){
252 var selectedProjectTypeID = this.selectedProjectType.uri, 252 var templateData,
253 selectedProjectTypeID = this.selectedProjectType.uri,
253 templateID = this.selectedTemplate.uri, 254 templateID = this.selectedTemplate.uri,
254 projectName = this.newFileLocation.newFileName.value, 255 projectName = this.newFileLocation.newFileName.value,
255 projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value, 256 projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,
@@ -264,7 +265,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
264 "projectDirectory="+projectDirectory+"\n"+ 265 "projectDirectory="+projectDirectory+"\n"+
265 "projectWidth="+projectWidth+"\n"+ 266 "projectWidth="+projectWidth+"\n"+
266 "projectHeight="+projectHeight; 267 "projectHeight="+projectHeight;
267 268 ////////////////////////////////////////////////////////////////////
269 //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
270 templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
271 ////////////////////////////////////////////////////////////////////
268 272
269 if(/[^/\\]$/g.test(projectDirectory)){ 273 if(/[^/\\]$/g.test(projectDirectory)){
270 projectDirectory = projectDirectory + "/"; 274 projectDirectory = projectDirectory + "/";
@@ -285,7 +289,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
285 if(!!this.newFileModel.callback){//inform document-controller if save successful 289 if(!!this.newFileModel.callback){//inform document-controller if save successful
286 this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID, 290 this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID,
287 "newFilePath":newFilePath, 291 "newFilePath":newFilePath,
288 "fileExtension":fileExtension});//document-controller api 292 "fileExtension":fileExtension,
293 "template":templateData});//document-controller api
289 }else{ 294 }else{
290 //send selection event 295 //send selection event
291 var newFileSelectionEvent = document.createEvent("Events"); 296 var newFileSelectionEvent = document.createEvent("Events");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 20:56:58 +0000