aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-08 12:59:13 -0700
committerValerio Virgillito2012-06-08 12:59:13 -0700
commita50814178be2775892ed999c28041d8e81291e22 (patch)
tree309af98cd840d3841be74c32e87c30fa8739ff1e /js/mediators
parent4070475b8da7257eca629be7288bf7a31d5e384e (diff)
parentd14249dd2d76e9eb8d14733c10393d36bd2ea8ee (diff)
downloadninja-a50814178be2775892ed999c28041d8e81291e22.tar.gz
Merge branch 'refs/heads/master' into timeline-resizer-fix
Diffstat (limited to 'js/mediators')
-rw-r--r--js/mediators/io-mediator.js10
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 },