Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

1 files changed, 38 insertions, 9 deletions

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 95e775a0..e9958ec3 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -86,6 +86,7 @@ exports.IoMediator = Montage.create(Component, {
                         case 204:
                                 //Creating and formatting result object for callbak
                                 result = read.file.details;
+                                result.root = read.file.details.uri.replace(read.file.details.name, "");
                                 //Checking for type of content to returns
                                 if (result.extension !== 'html' && result.extension !== 'htm') {
                                         //Simple string
@@ -142,12 +143,7 @@ exports.IoMediator = Montage.create(Component, {
                 //
                 switch (file.mode) {
                         case 'html':
-                                file.document.content.document.body.innerHTML = file.body;
-                                file.document.content.document.head.innerHTML = file.head;
-                                if (file.style) {
-                                        file.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(file.style.cssRules);
-                                }
-                                contents = file.document.content.document.documentElement.outerHTML;
+                                contents = this.parseNinjaTemplateToHtml(file);
                                 break;
                         default:
                                 contents = file.content;
@@ -155,9 +151,8 @@ exports.IoMediator = Montage.create(Component, {
                 }
                 //
                 save = this.fio.saveFile({uri: file.document.uri, contents: contents});
-            if(save.status === 204){
-                callback();
-            }
+            //
+            if (callback) callback(save);
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -170,6 +165,14 @@ exports.IoMediator = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    fileDelete: {
+        enumerable: false,
+        value: function (file, callback) {
+                //
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     parseHtmlToNinjaTemplate: {
         enumerable: false,
         value: function (html) {
@@ -182,6 +185,32 @@ exports.IoMediator = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
+    //TODO: Expand to allow more templates
+    parseNinjaTemplateToHtml: {
+        enumerable: false,
+        value: function (template) {
+                //
+                template.document.content.document.body.innerHTML = template.body;
+                template.document.content.document.head.innerHTML = template.head;
+                //
+                if (template.webgl.length > 0) {
+                        for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
+                                if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Assets' || this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
+                                        this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase());
+                                }
+                        }
+                
+                        //this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(path, libname);
+                        //console.log(this.application.ninja.coreIoApi.ninjaLibrary.libs);
+                }
+                //TODO: Remove temp fix for styles
+                if (template.style) {
+                        template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules);
+                }
+                return template.document.content.document.documentElement.outerHTML;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
     //Method to return a string from CSS rules (to be saved to a file)
     getCssFromRules: {
         enumerable: false,