5 files changed, 91 insertions, 32 deletions

diff --git a/js/document/models/html.js b/js/document/models/html.js
index 1639a8e2..b57ff832 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -24,8 +24,36 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+        baseHref: {
+                value: null
+        },
+    ////////////////////////////////////////////////////////////////////
+        //
         webGlHelper: {
         value: webGlDocumentHelper
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+    userComponents: {
+        value: {}
+    },
+        ////////////////////////////////////////////////////////////////////
+        //Add a reference to a component instance to the userComponents hash using the element UUID
+    setComponentInstance: {
+        value: function(instance, el) {
+            this.userComponents[el.uuid] = instance;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //Returns the component instance obj from the element
+    getComponentFromElement: {
+        value: function(el) {
+            if(el) {
+                if(el.uuid) return this.userComponents[el.uuid];
+            } else {
+                return null;
+            }
+        }
     }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 9ad088cb..765099e6 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -42,6 +42,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
+        //TODO: Remove usage
+        model: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
         //
     document: {
         get: function() {return this._document;},
@@ -78,6 +83,8 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         //
     onTemplateLoad: {
         value: function (e) {
+                //TODO: Add support to constructing URL with a base HREF
+                var basetag = this.content.document.getElementsByTagName('base');
                 //Removing event
                 this.iframe.removeEventListener("load", this.onTemplateLoad.bind(this), false);
                 //TODO: Improve usage of this reference
@@ -88,6 +95,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                         this.document.styleSheets[k].ownerNode.setAttribute('data-ninja-template', 'true');
                 }
             }
+            //Checking for a base URL
+            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');
+                        }
+                }
                 //Creating temp code fragement to load head
                 this._headFragment = this.document.createElement('head');
                 //Adding event listener to know when head is ready, event only dispatched once when using innerHTML
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 6d146c97..dae0f359 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, {
@@ -205,15 +205,34 @@ exports.IoMediator = Montage.create(Component, {
             //Injecting head and body into old document
             template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
             template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
+            
+            
+            
+            /*
+//Testing using montage clean up method
+            var mjscode, mjsTemp = TemplateCreator.create();
+                
+            //mjscode = mjsTemp.initWithHeadAndBodyElements(template.head, template.body);
+            //mjscode = mjsTemp.initWithDocument(template.file.content.document);
+            mjscode = mjsTemp.initWithDocument(template.document);
+            
+            console.log(template.head, mjscode._document.head);
+            template.file.content.document.head.innerHTML = mjscode._document.head.innerHTML.replace(regexRootUrl, '');
+            template.file.content.document.body.innerHTML = mjscode._document.body.innerHTML.replace(regexRootUrl, '');
+*/
+            
+            
+            
+            
             //Getting all CSS (style or link) tags
             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]'),
-                        basetags = template.file.content.document.getElementsByTagName('base');
+                        njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]');
                 
                 //////////////////////////////////////////////////
-                //TODO: Remove, temp hack to avoid montage
+                //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]);
                 }
@@ -469,9 +488,9 @@ function loadWebGL (e) {\n\
 
 
             //
-            var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create();
-            //
-            for (var m in template.mjs) {
+            
+            /*
+for (var m in template.mjs) {
                 mjsComponents.push(template.mjs[m]);
                 mjsCounter++;
             }
@@ -509,6 +528,7 @@ function loadWebGL (e) {\n\
                 //
                 mjstag.innerHTML = mjscode;
             }
+*/
 
 
 
@@ -570,7 +590,8 @@ function loadWebGL (e) {\n\
     //
     getDocRootUrl: {
         value: function () {
-            return this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
+                //TODO: Add support for model.baseHref (base tag)
+                return this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 4169423b..9b237229 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -278,7 +278,7 @@ exports.ComponentsPanel = Montage.create(Component, {
             that = this;
             element = this.makeComponent(component.component);
 
-            this.application.ninja.currentDocument._window.addComponent(element, {name: component.name, path: component.module}, function(instance, element) {
+            this.application.ninja.currentDocument.model.views.design.iframe.contentWindow.addComponent(element, {name: component.name, path: component.module}, function(instance, element) {
 
                 //var pos = that.getStageCenter();
 
@@ -297,7 +297,7 @@ exports.ComponentsPanel = Montage.create(Component, {
                 
                 instance.addEventListener('firstDraw', that, false);
 
-                that.application.ninja.currentDocument.setComponentInstance(instance, element);
+                that.application.ninja.currentDocument.model.setComponentInstance(instance, element);
 
                 that.application.ninja.elementMediator.addElements(element, styles);
             });
diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template/template-creator.js
index e312cd32..1cd65ddd 100644..100755
--- a/node_modules/tools/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -23,39 +23,38 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             return this.initWithHeadAndBodyElements(doc.head, doc.body, montageJsPath);
         }
     },
-
+    
     initWithBodyElement: {
         value: function(body, montageJsPath) {
             return this.initWithHeadAndBodyElements(null, body, montageJsPath);
         }
     },
-
+