diff options
author | Jose Antonio Marquez | 2012-06-07 11:24:29 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-07 11:24:29 -0700 |
commit | 0efbbf8287517b755be1774f6aa49947bed50a0d (patch) | |
tree | 48bd340949ac558bb552b47092447d3a7b977b52 /js/mediators | |
parent | 47e0e1f047e83b71c3f86812a45d33904201cc7a (diff) | |
download | ninja-0efbbf8287517b755be1774f6aa49947bed50a0d.tar.gz |
Adding unique ID to canvas data folders
Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
Diffstat (limited to 'js/mediators')
-rw-r--r-- | js/mediators/io-mediator.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index c9e10896..c487fef5 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -162,9 +162,9 @@ exports.IoMediator = Montage.create(Component, { | |||
162 | case 'html': | 162 | case 'html': |
163 | //Getting content from function to properly handle saving assets (as in external if flagged) | 163 | //Getting content from function to properly handle saving assets (as in external if flagged) |
164 | if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) { | 164 | if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) { |
165 | parsedDoc = this.tmplt.parseNinjaTemplateToHtml(doc, true, libCopyCallback); | 165 | parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback); |
166 | } else { | 166 | } else { |
167 | parsedDoc = this.tmplt.parseNinjaTemplateToHtml(doc, false, libCopyCallback); | 167 | parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback); |
168 | } | 168 | } |
169 | break; | 169 | break; |
170 | default: | 170 | default: |
@@ -176,13 +176,17 @@ exports.IoMediator = Montage.create(Component, { | |||
176 | save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content}); | 176 | save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content}); |
177 | //Checking for callback | 177 | //Checking for callback |
178 | if (callback) callback(save); | 178 | if (callback) callback(save); |
179 | //Checking for libraries, making callback if specified | ||
180 | if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true); | ||
179 | // | 181 | // |
180 | if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true); | 182 | return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId}; |
181 | } else { | 183 | } else { |
182 | //Making call to save file | 184 | //Making call to save file |
183 | save = this.fio.saveFile({uri: doc.file.uri, contents: content}); | 185 | save = this.fio.saveFile({uri: doc.file.uri, contents: content}); |
184 | //Checking for callback | 186 | //Checking for callback |
185 | if (callback) callback(save); | 187 | if (callback) callback(save); |
188 | // | ||
189 | return null; | ||
186 | } | 190 | } |
187 | } | 191 | } |
188 | }, | 192 | }, |