3 files changed, 314 insertions, 182 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 06514076..f71a6f4d 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -48,7 +48,7 @@ exports.ElementMediator = Montage.create(Component, {
 
             document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify);
 
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
 
             if(notify || notify === undefined) {
                 NJevent("elementAdded", elements);
@@ -77,7 +77,7 @@ exports.ElementMediator = Montage.create(Component, {
 
             document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify);
 
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
 
             NJevent("elementsRemoved", elements);
         }
@@ -86,13 +86,13 @@ exports.ElementMediator = Montage.create(Component, {
     replaceElement: {
         value: function(newChild, oldChild, notify) {
 
-            this.application.ninja.currentDocument.documentRoot.replaceChild(newChild, oldChild);
+            this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
 
             var undoLabel = "replace element";
 
             document.application.undoManager.add(undoLabel, this.replaceElement, this, oldChild, newChild);
 
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
 
             if(notify || notify === undefined) {
                 NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}});
@@ -520,7 +520,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(layersDraggedArray, layerDroppedAfter) {
             var documentRoot,length;
 
-            documentRoot = this.application.ninja.currentDocument.documentRoot;
+            documentRoot = this.application.ninja.currentDocument.model.documentRoot;
             length = layersDraggedArray.length;
 
             for(var i=0; documentRoot.children[i]; i++) {
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,
         Component =             require("montage/ui/component").Component,
         FileIo =                        require("js/io/system/fileio").FileIo,
         ProjectIo =             require("js/io/system/projectio").ProjectIo,
-        TemplateCreator =       require("node_modules/tools/template-creator").TemplateCreator;
+        TemplateCreator =       require("node_modules/tools/template/template-creator").TemplateCreator;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.IoMediator = Montage.create(Component, {
@@ -53,14 +53,14 @@ exports.IoMediator = Montage.create(Component, {
     //
     fileNew: {
         enumerable: false,
-        value: function (file, template, callback) {
+        value: function (file, url, callback, template) {
             //Loading template from template URL
             var xhr = new XMLHttpRequest(), result;
-            xhr.open("GET", template, false);
+            xhr.open("GET", url, false);
             xhr.send();
             if (xhr.readyState === 4) {
                 //Making call to create file, checking for return code
-                switch (this.fio.newFile({ uri: file, contents: xhr.response })) {
+                switch (this.fio.newFile({ uri: file, contents: parseTemplate(xhr.response, template) })) {
                     case 201:
                         result = { status: 201, success: true, uri: file };
                         break;
@@ -74,6 +74,21 @@ exports.IoMediator = Montage.create(Component, {
                         result = { status: 500, success: false, uri: file };
                         break;
                 }
+                //TODO: Improve template data injection
+                function parseTemplate (content, template) {
+                        //
+                        if (template.name.toLowerCase() === 'banner' || template.name.toLowerCase() === 'animation') {
+                                //Getting dimensions of banner
+                                var dimensions = template.id.split('x');
+                                dimensions = {width: String(dimensions[0])+'px', height: String(dimensions[1])+'px'};
+                                //
+                                content = content.replace(/Dimensions@@@/gi, "Dimensions@@@"+template.id);
+                                content = content.replace(/ninja-banner {}/gi, "ninja-banner {overflow: visible; width: "+dimensions.width+"; height: "+dimensions.height+"}");
+                                content = content.replace(/ninja-content-wrapper {}/gi, "ninja-content-wrapper {overflow: hidden; width: "+dimensions.width+"; height: "+dimensions.height+"}");
+                        }
+                        //
+                        return content;
+                }
             } else {
                 result = { status: 500, success: false, uri: file };
             }
@@ -147,25 +162,25 @@ exports.IoMediator = Montage.create(Component, {
     //
     fileSave: {
         enumerable: false,
-        value: function (file, callback) {
+        value: function (doc, callback) {
             //
             var contents, save;
             //
-            switch (file.mode) {
+            switch (doc.mode) {
                 case 'html':
-
-
-                    //TODO: Add check for Monatage library to copy
-
                     //Getting content from function to properly handle saving assets (as in external if flagged)
-                    contents = this.parseNinjaTemplateToHtml(file);
+                    if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) {
+                        contents = this.parseNinjaTemplateToHtml(doc, true);
+                    } else {
+                        contents = this.parseNinjaTemplateToHtml(doc);
+                    }
                     break;
                 default:
-                    contents = file.content;
+                    contents = doc.content;
                     break;
             }
             //Making call to save file
-            save = this.fio.saveFile({ uri: file.document.uri, contents: contents });
+            save = this.fio.saveFile({ uri: doc.file.uri, contents: contents });
             //Checking for callback
             if (callback) callback(save);
         }
@@ -188,6 +203,59 @@ exports.IoMediator = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    getDataDirectory: {
+        value: function (path) {
+                //TODO: Implement user overwrite
+                return this._getUserDirectory(path+'data/');
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getNinjaDirectory: {
+        value: function (path) {
+                //TODO: Implement user overwrite
+                return this._getUserDirectory(this.getDataDirectory(path)+'ninja/');
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getCanvasDirectory: {
+        value: function (path) {
+                //TODO: Implement user overwrite
+                return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/');
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _getUserDirectory: {
+        value: function (path) {
+                //Checking for data directory
+            var check = this.application.ninja.coreIoApi.fileExists({uri: path}), directory;
+            //Creating directory if doesn't exists
+            switch (check.status) {
+                case 204: //Exists
+                        directory = path;
+                        break;
+                case 404: //Doesn't exists
+                        directory = this.application.ninja.coreIoApi.createDirectory({uri: path});
+                        //Checking for success
+                        if (directory.status === 201) {
+                                directory = path;
+                        } else {
+                                //Error
+                                directory = null;
+                        }
+                        break;
+                default: //Error
+                        directory = null;
+                        break;
+            }
+            //Returning the path to the directory on disk (null for any error)
+            return directory;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     parseHtmlToNinjaTemplate: {
         enumerable: false,
         value: function (html) {
@@ -196,23 +264,65 @@ exports.IoMediator = Montage.create(Component, {
             //Setting content to temp
             doc.getElementsByTagName('html')[0].innerHTML = html;
             //Creating return object