Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

2 files changed, 88 insertions, 36 deletions

diff --git a/js/document/views/code.js b/js/document/views/code.js
index 0a0ff5c1..c8b2a23e 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -82,12 +82,6 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
                 //
             var type;
             //
-            if(this.activeDocument) {
-                //need to hide only if another document was open before
-                //this.application.ninja.documentController._hideCurrentDocument();
-                                //this.hideOtherDocuments(doc.uuid);
-            }
-            //
             switch(file.extension) {
                 case  "css" :
                     type = "css";
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 947ad196..dad6de8b 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -7,7 +7,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =                   require("montage/core/core").Montage,
-        BaseDocumentView =      require("js/document/views/base").BaseDocumentView;
+        BaseDocumentView =      require("js/document/views/base").BaseDocumentView,
+    ElementModel =      require("js/models/element-model");
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.DesignDocumentView = Montage.create(BaseDocumentView, {
@@ -23,13 +24,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
         //
-    _template: {
-        value: null
+    _viewCallback: {
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //
-        _document: {
-        value: null
+    _template: {
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //
@@ -52,8 +53,29 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //TODO: Remove usage
-        model: {
+    //
+    _liveNodeList: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _webGlHelper: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _baseHref: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+    baseHref: {
+        get: function() {return this._baseHref;},
+        set: function(value) {this._baseHref = value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        _document: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
@@ -64,13 +86,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
         //
-    propertiesPanel: {
+    _documentRoot: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-    //
-    _liveNodeList: {
-        value: null
+        //
+    documentRoot: {
+        get: function() {return this._documentRoot;},
+        set: function(value) {this._documentRoot = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -109,12 +132,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
         //
         render: {
-        value: function (callback, template) {
+        value: function (callback, template, viewCallback) {
                 //TODO: Remove, this is a temp patch for webRequest API gate
                 this.application.ninja.documentController.redirectRequests = false;
                 //Storing callback for dispatch ready
                 this._callback = callback;
                 this._template = template;
+            this._viewCallback = viewCallback;
                 //Adding listener to know when template is loaded to then load user content
                 this.iframe.addEventListener("load", this.onTemplateLoad.bind(this), false);
                 //TODO: Add source parameter and root (optional)
@@ -129,7 +153,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         //
     onTemplateLoad: {
         value: function (e) {
-                //console.log(this.iframe.contentWindow);
+                //TODO: Remove, this is a temp patch for webRequest API gate
                 this.application.ninja.documentController.redirectRequests = true;
                 //TODO: Add support to constructing URL with a base HREF
                 var basetag = this.content.document.getElementsByTagName('base');
@@ -147,7 +171,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
             if (basetag.length) {
                 if (basetag[basetag.length-1].getAttribute && basetag[basetag.length-1].getAttribute('href')) {
                         //Setting base HREF in model
-                                this.model.baseHref = basetag[basetag.length-1].getAttribute('href');
+                                this.baseHref = basetag[basetag.length-1].getAttribute('href');
                         }
                 }
                 //Checking to content to be template
@@ -159,7 +183,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                                 this._observer.body = new WebKitMutationObserver(this.insertBannerContent.bind(this));
                         this._observer.body.observe(this._bodyFragment, {childList: true});
                                 //Inserting <body> HTML and parsing URLs via mediator method
-                                this._bodyFragment.innerHTML = '<ninjaloadinghack></ninjaloadinghack>'+(this.content.body.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, this.application.ninja.ioMediator.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator))).replace(/url\(([^"]*)(.+?)\1\)/g, this.application.ninja.ioMediator.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator));
+                                this._bodyFragment.innerHTML = '<ninjaloadinghack></ninjaloadinghack>'+(this.content.body.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, this.application.ninja.ioMediator.tmplt.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator.tmplt))).replace(/url\(([^"]*)(.+?)\1\)/g, this.application.ninja.ioMediator.tmplt.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator.tmplt));
                 }
                 } else {
                 //Creating temp code fragement to load head
@@ -168,19 +192,31 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                         this._observer.head = new WebKitMutationObserver(this.insertHeadContent.bind(this));
                 this._observer.head.observe(this._headFragment, {childList: true});
                         //Inserting <head> HTML and parsing URLs via mediator method
-                        this._headFragment.innerHTML = (this.content.head.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, this.application.ninja.ioMediator.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator))).replace(/url\(([^"]*)(.+?)\1\)/g, this.application.ninja.ioMediator.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator));
+                        this._headFragment.innerHTML = (this.content.head.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, this.application.ninja.ioMediator.tmplt.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator.tmplt))).replace(/url\(([^"]*)(.+?)\1\)/g, this.application.ninja.ioMediator.tmplt.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator.tmplt));
                         //Adding event listener to know when the body is ready and make callback (using HTML5 new DOM Mutation Events)
                 this._observer.body = new WebKitMutationObserver(this.bodyContentLoaded.bind(this));
                         this._observer.body.observe(this.document.body, {childList: true});
                         //Inserting <body> HTML and parsing URLs via mediator method
-                        this.document.body.innerHTML += '<ninjaloadinghack></ninjaloadinghack>'+(this.content.body.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, this.application.ninja.ioMediator.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator))).replace(/url\(([^"]*)(.+?)\1\)/g, this.application.ninja.ioMediator.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator));
+                        this.document.body.innerHTML += '<ninjaloadinghack></ninjaloadinghack>'+(this.content.body.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, this.application.ninja.ioMediator.tmplt.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator.tmplt))).replace(/url\(([^"]*)(.+?)\1\)/g, this.application.ninja.ioMediator.tmplt.getNinjaPropUrlRedirect.bind(this.application.ninja.ioMediator.tmplt));
                 //Copying attributes to maintain same properties as the <body>
                                 for (var n in this.content.document.body.attributes) {
                                         if (this.content.document.body.attributes[n].value) {
                                                 this.document.body.setAttribute(this.content.document.body.attributes[n].name, this.content.document.body.attributes[n].value);
                                         }
                                 }
-                                //TODO: Add attribute copying for <HEAD> and <HTML>
+                                //Copying attributes to maintain same properties as the <head>
+                                for (var m in this.content.document.head.attributes) {
+                                        if (this.content.document.head.attributes[m].value) {
+                                                this.document.head.setAttribute(this.content.document.head.attributes[m].name, this.content.document.head.attributes[m].value);
+                                        }
+                                }
+                                //Copying attributes to maintain same properties as the <html>
+                                var htmlTagMem = this.content.document.getElementsByTagName('html')[0], htmlTagDoc = this.document.getElementsByTagName('html')[0];
+                                for (var m in htmlTagMem.attributes) {
+                                        if (htmlTagMem.attributes[m].value) {
+                                                htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value);
+                                        }
+                                }
                         }
         }
     },
@@ -245,7 +281,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);