Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/lib/NJUtils.js

3 files changed, 158 insertions, 105 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 06514076..483dacbc 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);
         }
@@ -92,7 +92,7 @@ exports.ElementMediator = Montage.create(Component, {
 
             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}});
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 057a849d..b1916446 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);
         }
@@ -196,23 +211,65 @@ exports.IoMediator = Montage.create(Component, {
             //Setting content to temp
             doc.getElementsByTagName('html')[0].innerHTML = html;
             //Creating return object
-            return { head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc };
+            return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc};
         }
     },
     ////////////////////////////////////////////////////////////////////
     //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
         enumerable: false,
-        value: function (template) {
-            var regexRootUrl, rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]));
+        value: function (template, ninjaWrapper) {
+                //TODO: Improve reference for rootUrl
+            var regexRootUrl,
+                rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
+                mjsCreator = template.mjsTemplateCreator.create(),
+                mJsSerialization,
+                montageTemplate;
+            //
+            montageTemplate = mjsCreator.initWithDocument(template.document);
+            //Setting up expression for parsing URLs
             regexRootUrl = new RegExp(rootUrl.replace(/\//gi, '\\\/'), 'gi');
             //Injecting head and body into old document
-            template.document.content.document.head.innerHTML = template.head.replace(regexRootUrl, '');
-            template.document.content.document.body.innerHTML = template.body.replace(regexRootUrl, '');
+            if (montageTemplate._ownerSerialization.length > 0) {
+                template.file.content.document.head.innerHTML = montageTemplate._document.head.innerHTML.replace(regexRootUrl, '');
+                    template.file.content.document.body.innerHTML = montageTemplate._document.body.innerHTML.replace(regexRootUrl, '');
+                    //
+                    mJsSerialization = montageTemplate._ownerSerialization;
+            } else {
+                template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
+                    template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
+            }
+            
+            //Copying attributes to maintain same properties as the <body>
+                        for (var n in template.body.attributes) {
+                                if (template.body.attributes[n].value) {
+                                        //
+                                        template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value);
+                                }                               
+                        }
+            //TODO: Add attribute copying for <HEAD> and <HTML>
+            
+            
+            
+            
             //Getting all CSS (style or link) tags
-            var styletags = template.document.content.document.getElementsByTagName('style'),
-                        linktags = template.document.content.document.getElementsByTagName('link'),
-                        toremovetags = [];
+            var styletags = template.file.content.document.getElementsByTagName('style'),
+                        linktags = template.file.content.document.getElementsByTagName('link'),
+                        toremovetags = [],
+                        njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]');
+                
+                //////////////////////////////////////////////////
+                //TODO: Remove, temp hack, this is to be fixed by Montage
+                var basetags = template.file.content.document.getElementsByTagName('base');
+                for (var g in basetags) {
+                        if (basetags[g].getAttribute) toremovetags.push(basetags[g]);
+                }
+                //////////////////////////////////////////////////
+                
+                //
+                for (var f in njtemplatetags) {
+                        if (njtemplatetags[f].getAttribute) toremovetags.push(njtemplatetags[f]);
+                }
             //Getting styles tags to be removed from document