diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/mediators | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/element-mediator.js | 14 | ||||
-rw-r--r-- | js/mediators/io-mediator.js | 410 | ||||
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 76 |
3 files changed, 316 insertions, 184 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 06514076..7d5040ef 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -48,7 +48,7 @@ exports.ElementMediator = Montage.create(Component, { | |||
48 | 48 | ||
49 | document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify); | 49 | document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify); |
50 | 50 | ||
51 | this.application.ninja.documentController.activeDocument.needsSave = true; | 51 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
52 | 52 | ||
53 | if(notify || notify === undefined) { | 53 | if(notify || notify === undefined) { |
54 | NJevent("elementAdded", elements); | 54 | NJevent("elementAdded", elements); |
@@ -77,7 +77,7 @@ exports.ElementMediator = Montage.create(Component, { | |||
77 | 77 | ||
78 | document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify); | 78 | document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify); |
79 | 79 | ||
80 | this.application.ninja.documentController.activeDocument.needsSave = true; | 80 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
81 | 81 | ||
82 | NJevent("elementsRemoved", elements); | 82 | NJevent("elementsRemoved", elements); |
83 | } | 83 | } |
@@ -86,13 +86,13 @@ exports.ElementMediator = Montage.create(Component, { | |||
86 | replaceElement: { | 86 | replaceElement: { |
87 | value: function(newChild, oldChild, notify) { | 87 | value: function(newChild, oldChild, notify) { |
88 | 88 | ||
89 | this.application.ninja.currentDocument.documentRoot.replaceChild(newChild, oldChild); | 89 | this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild); |
90 | 90 | ||
91 | var undoLabel = "replace element"; | 91 | var undoLabel = "replace element"; |
92 | 92 | ||
93 | document.application.undoManager.add(undoLabel, this.replaceElement, this, oldChild, newChild); | 93 | document.application.undoManager.add(undoLabel, this.replaceElement, this, oldChild, newChild); |
94 | 94 | ||
95 | this.application.ninja.documentController.activeDocument.needsSave = true; | 95 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
96 | 96 | ||
97 | if(notify || notify === undefined) { | 97 | if(notify || notify === undefined) { |
98 | NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}}); | 98 | NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}}); |
@@ -520,13 +520,13 @@ exports.ElementMediator = Montage.create(Component, { | |||
520 | value: function(layersDraggedArray, layerDroppedAfter) { | 520 | value: function(layersDraggedArray, layerDroppedAfter) { |
521 | var documentRoot,length; | 521 | var documentRoot,length; |
522 | 522 | ||
523 | documentRoot = this.application.ninja.currentDocument.documentRoot; | 523 | documentRoot = this.application.ninja.currentDocument.model.documentRoot; |
524 | length = layersDraggedArray.length; | 524 | length = layersDraggedArray.length; |
525 | 525 | ||
526 | for(var i=0; documentRoot.children[i]; i++) { | 526 | for(var i=0; documentRoot.children[i]; i++) { |
527 | if(documentRoot.children[i] === layerDroppedAfter.layerData.elementsList[0]) { | 527 | if(documentRoot.children[i] === layerDroppedAfter.layerData.stageElement) { |
528 | if(length >0){ | 528 | if(length >0){ |
529 | documentRoot.children[i].parentNode.insertBefore(layersDraggedArray[length-1].layerData.elementsList[0], documentRoot.children[i]); | 529 | documentRoot.children[i].parentNode.insertBefore(layersDraggedArray[length-1].layerData.stageElement, documentRoot.children[i]); |
530 | } | 530 | } |
531 | 531 | ||
532 | /* Will require for Multiple Drag n Drop */ | 532 | /* Will require for Multiple Drag n Drop */ |
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 057a849d..e9ed86d7 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -10,7 +10,7 @@ var Montage = require("montage/core/core").Montage, | |||
10 | Component = require("montage/ui/component").Component, | 10 | Component = require("montage/ui/component").Component, |
11 | FileIo = require("js/io/system/fileio").FileIo, | 11 | FileIo = require("js/io/system/fileio").FileIo, |
12 | ProjectIo = require("js/io/system/projectio").ProjectIo, | 12 | ProjectIo = require("js/io/system/projectio").ProjectIo, |
13 | TemplateCreator = require("node_modules/tools/template-creator").TemplateCreator; | 13 | TemplateCreator = require("node_modules/tools/template/template-creator").TemplateCreator; |
14 | //////////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////////// |
15 | // | 15 | // |
16 | exports.IoMediator = Montage.create(Component, { | 16 | exports.IoMediator = Montage.create(Component, { |
@@ -53,14 +53,14 @@ exports.IoMediator = Montage.create(Component, { | |||
53 | // | 53 | // |
54 | fileNew: { | 54 | fileNew: { |
55 | enumerable: false, | 55 | enumerable: false, |
56 | value: function (file, template, callback) { | 56 | value: function (file, url, callback, template) { |
57 | //Loading template from template URL | 57 | //Loading template from template URL |
58 | var xhr = new XMLHttpRequest(), result; | 58 | var xhr = new XMLHttpRequest(), result; |
59 | xhr.open("GET", template, false); | 59 | xhr.open("GET", url, false); |
60 | xhr.send(); | 60 | xhr.send(); |
61 | if (xhr.readyState === 4) { | 61 | if (xhr.readyState === 4) { |
62 | //Making call to create file, checking for return code | 62 | //Making call to create file, checking for return code |
63 | switch (this.fio.newFile({ uri: file, contents: xhr.response })) { | 63 | switch (this.fio.newFile({ uri: file, contents: parseTemplate(xhr.response, template) })) { |
64 | case 201: | 64 | case 201: |
65 | result = { status: 201, success: true, uri: file }; | 65 | result = { status: 201, success: true, uri: file }; |
66 | break; | 66 | break; |
@@ -74,6 +74,21 @@ exports.IoMediator = Montage.create(Component, { | |||
74 | result = { status: 500, success: false, uri: file }; | 74 | result = { status: 500, success: false, uri: file }; |
75 | break; | 75 | break; |
76 | } | 76 | } |
77 | //TODO: Improve template data injection | ||
78 | function parseTemplate (content, template) { | ||
79 | // | ||
80 | if (template.name.toLowerCase() === 'banner' || template.name.toLowerCase() === 'animation') { | ||
81 | //Getting dimensions of banner | ||
82 | var dimensions = template.id.split('x'); | ||
83 | dimensions = {width: String(dimensions[0])+'px', height: String(dimensions[1])+'px'}; | ||
84 | // | ||
85 | content = content.replace(/Dimensions@@@/gi, "Dimensions@@@"+template.id); | ||
86 | content = content.replace(/ninja-banner {}/gi, "ninja-banner {overflow: visible; width: "+dimensions.width+"; height: "+dimensions.height+"}"); | ||
87 | content = content.replace(/ninja-content-wrapper {}/gi, "ninja-content-wrapper {overflow: hidden; width: "+dimensions.width+"; height: "+dimensions.height+"}"); | ||
88 | } | ||
89 | // | ||
90 | return content; | ||
91 | } | ||
77 | } else { | 92 | } else { |
78 | result = { status: 500, success: false, uri: file }; | 93 | result = { status: 500, success: false, uri: file }; |
79 | } | 94 | } |
@@ -147,25 +162,25 @@ exports.IoMediator = Montage.create(Component, { | |||
147 | // | 162 | // |
148 | fileSave: { | 163 | fileSave: { |
149 | enumerable: false, | 164 | enumerable: false, |
150 | value: function (file, callback) { | 165 | value: function (doc, callback) { |
151 | // | 166 | // |
152 | var contents, save; | 167 | var contents, save; |
153 | // | 168 | // |
154 | switch (file.mode) { | 169 | switch (doc.mode) { |
155 | case 'html': | 170 | case 'html': |
156 | |||
157 | |||
158 | //TODO: Add check for Monatage library to copy | ||
159 | |||
160 | //Getting content from function to properly handle saving assets (as in external if flagged) | 171 | //Getting content from function to properly handle saving assets (as in external if flagged) |
161 | contents = this.parseNinjaTemplateToHtml(file); | 172 | if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) { |
173 | contents = this.parseNinjaTemplateToHtml(doc, true); | ||
174 | } else { | ||
175 | contents = this.parseNinjaTemplateToHtml(doc); | ||
176 | } | ||
162 | break; | 177 | break; |
163 | default: | 178 | default: |
164 | contents = file.content; | 179 | contents = doc.content; |
165 | break; | 180 | break; |
166 | } | 181 | } |
167 | //Making call to save file | 182 | //Making call to save file |
168 | save = this.fio.saveFile({ uri: file.document.uri, contents: contents }); | 183 | save = this.fio.saveFile({ uri: doc.file.uri, contents: contents }); |
169 | //Checking for callback | 184 | //Checking for callback |
170 | if (callback) callback(save); | 185 | if (callback) callback(save); |
171 | } | 186 | } |
@@ -188,6 +203,59 @@ exports.IoMediator = Montage.create(Component, { | |||
188 | }, | 203 | }, |
189 | //////////////////////////////////////////////////////////////////// | 204 | //////////////////////////////////////////////////////////////////// |
190 | // | 205 | // |
206 | getDataDirectory: { | ||
207 | value: function (path) { | ||
208 | //TODO: Implement user overwrite | ||
209 | return this._getUserDirectory(path+'data/'); | ||
210 | } | ||
211 | }, | ||
212 | //////////////////////////////////////////////////////////////////// | ||
213 | // | ||
214 | getNinjaDirectory: { | ||
215 | value: function (path) { | ||
216 | //TODO: Implement user overwrite | ||
217 | return this._getUserDirectory(this.getDataDirectory(path)+'ninja/'); | ||
218 | } | ||
219 | }, | ||
220 | //////////////////////////////////////////////////////////////////// | ||
221 | // | ||
222 | getCanvasDirectory: { | ||
223 | value: function (path) { | ||
224 | //TODO: Implement user overwrite | ||
225 | return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/'); | ||
226 | } | ||
227 | }, | ||
228 | //////////////////////////////////////////////////////////////////// | ||
229 | // | ||
230 | _getUserDirectory: { | ||
231 | value: function (path) { | ||
232 | //Checking for data directory | ||
233 | var check = this.application.ninja.coreIoApi.fileExists({uri: path}), directory; | ||
234 | //Creating directory if doesn't exists | ||
235 | switch (check.status) { | ||
236 | case 204: //Exists | ||
237 | directory = path; | ||
238 | break; | ||
239 | case 404: //Doesn't exists | ||
240 | directory = this.application.ninja.coreIoApi.createDirectory({uri: path}); | ||
241 | //Checking for success | ||
242 | if (directory.status === 201) { | ||
243 | directory = path; | ||
244 | } else { | ||
245 | //Error | ||
246 | directory = null; | ||
247 | } | ||
248 | break; | ||
249 | default: //Error | ||
250 | directory = null; | ||
251 | break; | ||
252 | } | ||