From 4504972c1f3b9bf1d02a4484a07a8a85cf9ccee2 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 8 May 2012 10:37:38 -0700
Subject: Adding Chrome Preview

---
 js/document/models/base.js  | 11 ++++++++---
 js/document/views/design.js |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'js/document')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 746922ad..5667fb24 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -68,19 +68,24 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
 	//
 	switchViewTo: {
-        value: function () {
+        value: function (view) {
         	//
         }
     },
     ////////////////////////////////////////////////////////////////////
-	//
+	//TODO: Add API to allow other browser support
 	browserPreview: {
         value: function (browser) {
-        	//
+        	
+        	//TODO: Add file save before previewing
+        	
+        	//Currently only supporting current browser (Chrome, obviously)
         	switch (browser) {
         		case 'chrome':
+        			window.open(this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
         			break;
         		default:
+        			window.open(this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
         			break;
         	}
         }
diff --git a/js/document/views/design.js b/js/document/views/design.js
index b23ebe78..df6e9b53 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -230,7 +230,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     initWebGl: {
         value: function (scripttags) {
         	//
-        	var i, n, webgldata;
+        	var n, webgldata;
         	//Setting the iFrame property for reference in helper class
         	this.model.webGlHelper.iframe = this.model.views.design.iframe;
         	//Checking for webGL Data
-- 
cgit v1.2.3


From c79814664f3002613b3f12106edffc64932fa4ac Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 8 May 2012 16:27:50 -0700
Subject: Get clicked element when body is scrolled.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/templates/montage-web/index.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'js/document')

diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 47964ae4..6bd5ce7a 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -26,6 +26,11 @@
 				-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
 			}
 
+            html {
+                overflow: scroll;
+                padding: 0 11px 11px 0;
+            }
+
             html, body {
                 width: 100%;
                 height: 100%;
-- 
cgit v1.2.3


From a1e8540f5656e62db6a89f3af7829be6b259b7ed Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 8 May 2012 17:33:13 -0700
Subject: Adding SAVE for I/O

Adding save functionality to new template. Need to implement user UI for prompts and also clean up...
---
 js/document/models/base.js                   | 102 ++++++++++++++++++++++-----
 js/document/templates/montage-web/index.html |  17 +++--
 js/document/views/design.js                  |   7 ++
 3 files changed, 105 insertions(+), 21 deletions(-)

(limited to 'js/document')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 5667fb24..2bbbe501 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -76,39 +76,104 @@ exports.BaseDocumentModel = Montage.create(Component, {
 	//TODO: Add API to allow other browser support
 	browserPreview: {
         value: function (browser) {
-        	
-        	//TODO: Add file save before previewing
-        	
-        	//Currently only supporting current browser (Chrome, obviously)
-        	switch (browser) {
-        		case 'chrome':
-        			window.open(this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
-        			break;
-        		default:
-        			window.open(this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
-        			break;
-        	}
+        	//Generating URL for document
+        	var url = this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1];
+        	//TODO: Add logic to prompt user to save (all) before preview
+        	this.saveAll(function (result) {
+        		//Currently only supporting current browser (Chrome, obviously)
+        		switch (this.browser) {
+        			case 'chrome':
+        				window.open(this.url);
+	        			break;
+    	    		default:
+        				window.open(this.url);
+        				break;
+	        	}
+        	}.bind({browser: browser, url: url}));
         }
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	getStyleSheets: {
+		value: function () {
+			//
+			var styles = [];
+    		//
+    		for (var k in this.views.design.iframe.contentWindow.document.styleSheets) {
+    			if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode && this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute) {
+            		if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute('data-ninja-template') === null) {
+            			styles.push(this.views.design.iframe.contentWindow.document.styleSheets[k]);
+            		}
+            	}
+           	}
+           	//
+           	return styles;
+		}
+	},
     ////////////////////////////////////////////////////////////////////
 	//
 	save: {
-        value: function () {
+        value: function (callback) {
         	//
+        	if (this.currentView === this.views.design) {
+            	//
+        		this.application.ninja.ioMediator.fileSave({
+        			mode: 'html',
+        			file: this.file,
+        			webgl: this.webGlHelper.glData,
+        			styles: this.getStyleSheets(),
+        			document: this.views.design.iframe.contentWindow.document,
+        			head: this.views.design.iframe.contentWindow.document.head,
+        			body: this.views.design.iframe.contentWindow.document.body
+        		}, callback.bind(this));
+        	} else {
+        		//TODO: Add logic to save code view data
+        	}
+        	//
+        	if (this.needsSave) {
+        		//Save
+        	} else {
+        		//Ignore command
+        	}
         }
     },
     ////////////////////////////////////////////////////////////////////
 	//
-	saveAs: {
-        value: function () {
+	saveAll: {
+        value: function (callback) {
+        	//
+        	if (this.currentView === this.views.design) {
+            	//
+        		this.application.ninja.ioMediator.fileSave({
+        			mode: 'html',
+        			file: this.file,
+        			webgl: this.webGlHelper.glData,
+        			css: this.getStyleSheets(),
+        			document: this.views.design.iframe.contentWindow.document,
+        			head: this.views.design.iframe.contentWindow.document.head,
+        			body: this.views.design.iframe.contentWindow.document.body
+        		}, callback.bind(this));
+        	} else {
+        		//TODO: Add logic to save code view data
+        	}
         	//
+        	if (this.needsSave) {
+        		//Save
+        	} else {
+        		//Ignore command
+        	}
         }
     },
     ////////////////////////////////////////////////////////////////////
 	//
-	saveAll: {
+	saveAs: {
         value: function () {
         	//
+        	if (this.needsSave) {
+        		//Save current file on memory
+        	} else {
+        		//Copy file from disk
+        	}
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -116,6 +181,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
 	close: {
         value: function () {
         	//
+        	if (this.needsSave) {
+        		//Prompt user to save of lose data
+        	} else {
+        		//Close file
+        	}
         }
     }
 	////////////////////////////////////////////////////////////////////
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 47964ae4..3d550768 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -5,13 +5,20 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> -->
  
+ 
+<!-- 
+	NOTE(s):
+	All elements in the head of the document to be exclude from I/O
+	must set the 'data-ninja-template'
+	data-ninja-template="true"
+-->
 <html>
 
 	<head>
 	
-		<title>Ninja Prototype</title>
+		<title data-ninja-template="true">Ninja Prototype</title>
         
-       	<style type="text/css" id="nj-stage-stylesheet">
+       	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
        		* {
         		-webkit-transition-duration: 0s !important;
     			-webkit-animation-duration: 0s !important;
@@ -44,15 +51,15 @@
 			}
         </style>
     
-    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script>
+    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
     
-    	<script type="text/javascript">
+    	<script type="text/javascript" data-ninja-template="true">
       		function getElement(x,y) {
             	return document.elementFromPoint(x,y);
         	}
     	</script>
 
-        <script type="text/montage-serialization">
+        <script type="text/montage-serialization" data-ninja-template="true">
         {
             "owner": {
                 "prototype": "main"
diff --git a/js/document/views/design.js b/js/document/views/design.js
index df6e9b53..9ad088cb 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -100,6 +100,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         	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));
+        	//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>
         }
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 480c3c43f15162980390cf762411b93f7d02db19 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 9 May 2012 15:40:50 -0700
Subject: fixing the components for the new dom

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/models/html.js | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/models/html.js b/js/document/models/html.js
index 1639a8e2..2764a6d6 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -26,9 +26,36 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
 	//
 	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;
+            }
+        }
+    }
+
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3


From 3811f72f8cd8caaa2d13fa695b918f25facb85c5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 9 May 2012 16:28:13 -0700
Subject: Preliminary Montage Template Cleanup

The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save.
---
 js/document/models/html.js  | 25 +++++++++++++------------
 js/document/views/design.js | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'js/document')

diff --git a/js/document/models/html.js b/js/document/models/html.js
index 2764a6d6..b57ff832 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -22,30 +22,30 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     draw3DGrid: {
         value: false
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	baseHref: {
+		value: null
+	},
     ////////////////////////////////////////////////////////////////////
 	//
 	webGlHelper: {
         value: webGlDocumentHelper
     },
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+	//
     userComponents: {
         value: {}
     },
-
-    /**
-     * Add a reference to a component instance to the userComponents hash using the
-     * element UUID
-     */
+	////////////////////////////////////////////////////////////////////
+	//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
-     */
+    ////////////////////////////////////////////////////////////////////
+	//Returns the component instance obj from the element
     getComponentFromElement: {
         value: function(el) {
             if(el) {
@@ -55,7 +55,8 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
             }
         }
     }
-
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
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
@@ -41,6 +41,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 	content: {
         value: null
     },
+    ////////////////////////////////////////////////////////////////////
+	//TODO: Remove usage
+	model: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
     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
-- 
cgit v1.2.3


From fb7a3aa9ce0d9b99dca79cfb89951b5c51523250 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 10 May 2012 14:54:38 -0700
Subject: Adding partial close functionality

---
 js/document/document-html.js | 37 ++++++++++++++++++++++++++++++++++++-
 js/document/models/base.js   | 43 ++++++++++++++++++++++++++++++-------------
 js/document/views/design.js  | 31 +++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 14 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 567e4455..e00333f0 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -70,10 +70,11 @@ exports.HtmlDocument = Montage.create(Component, {
             //Creating instance of HTML Document Model
             this.model = Montage.create(HtmlDocumentModel,{
             	file: {value: file},
+            	parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach
             	views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
             });
             //Initiliazing views and hiding
-           	if (this.model.views.design.initialize(document.getElementById("iframeContainer"))) {
+           	if (this.model.views.design.initialize(this.model.parentContainer)) {
            		//Hiding iFrame, just initiliazing
            		this.model.views.design.hide();
            	} else {
@@ -123,6 +124,40 @@ exports.HtmlDocument = Montage.create(Component, {
     	    //Setting opacity to be viewable after load
 		   	this.model.views.design.iframe.style.opacity = 1;
     	}
+    },
+    ////////////////////////////////////////////////////////////////////
+	//
+	closeDocument: {
+		value: function () {
+			//
+			this.model.close(null, this.handleCloseDocument.bind(this));
+		}
+	},
+	////////////////////////////////////////////////////////////////////
+	//
+	handleCloseDocument: {
+		value: function (success) {
+			//TODO: Add logic for handling success or failure
+			//
+			this.application.ninja.documentController._documents.splice(this.uuid, 1);
+			//
+			NJevent("closeDocument", this.model.file.uri);
+			//TODO: Delete object here
+		}
+	},
+    ////////////////////////////////////////////////////////////////////
+	//
+    saveAppState: {
+    	value: function () {
+    		//TODO: Import functionality
+    	}
+    },
+    ////////////////////////////////////////////////////////////////////
+	//
+    restoreAppState: {
+    	value: function () {
+    		//TODO: Import functionality
+    	}
     }
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 2bbbe501..ebfb73b8 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -60,6 +60,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
         get: function() {return this._currentView;},
         set: function(value) {this._currentView = value;}
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+    parentContainer: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	views: {
@@ -114,6 +119,12 @@ exports.BaseDocumentModel = Montage.create(Component, {
 	//
 	save: {
         value: function (callback) {
+        	//
+        	if (this.needsSave) {
+        		//Save
+        	} else {
+        		//Ignore command
+        	}
         	//
         	if (this.currentView === this.views.design) {
             	//
@@ -129,18 +140,18 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	} else {
         		//TODO: Add logic to save code view data
         	}
-        	//
-        	if (this.needsSave) {
-        		//Save
-        	} else {
-        		//Ignore command
-        	}
         }
     },
     ////////////////////////////////////////////////////////////////////
 	//
 	saveAll: {
         value: function (callback) {
+           	//
+        	if (this.needsSave) {
+        		//Save
+        	} else {
+        		//Ignore command
+        	}
         	//
         	if (this.currentView === this.views.design) {
             	//
@@ -156,12 +167,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	} else {
         		//TODO: Add logic to save code view data
         	}
-        	//
-        	if (this.needsSave) {
-        		//Save
-        	} else {
-        		//Ignore command
-        	}
+
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -179,13 +185,24 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
 	//
 	close: {
-        value: function () {
+        value: function (view, callback) {
+        	//Outcome of close (pending on save logic)
+        	var success;
         	//
         	if (this.needsSave) {
         		//Prompt user to save of lose data
         	} else {
         		//Close file
+        		success = true;
+        	}
+        	//
+        	if (this.views.design && (!view || view === 'design')) {
+        		//
+        		this.parentContainer.removeChild(this.views.design.iframe);
+        		this.views.design = null;
         	}
+        	//
+        	if (callback) callback(success);
         }
     }
 	////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 765099e6..1a8f4986 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -289,6 +289,37 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         value: function(x, y) {
             return this.iframe.contentWindow.getElement(x,y);
         }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    pauseVideos:{
+        value:function(){
+        	var i, videos = this.document.getElementsByTagName("video");
+            for(i = 0; i < videos.length; i++){
+                if(!videos[i].paused) videos[i].pause();
+            }
+        }
+    },
+	////////////////////////////////////////////////////////////////////
+    //
+    stopVideos:{
+        value:function(){
+        	var i, videos = this.document.getElementsByTagName("video");
+            for(i = 0; i < videos.length; i++){
+                videos[i].src = "";
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    pauseAndStopVideos:{
+        value:function(){
+        	var i, videos = this.document.getElementsByTagName("video");
+            for(i = 0; i < videos.length; i++){
+            	if(!videos[i].paused) videos[i].pause();
+                videos[i].src = "";
+            }
+        }
     }
 	////////////////////////////////////////////////////////////////////
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From d75aff9e251f84a13c326668a5271b5852dcde53 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 10 May 2012 15:36:24 -0700
Subject: Adding webRequest API

Adding webRequest API to handle local URLs intercepting. Should be a temp fix.
---
 js/document/views/design.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 1a8f4986..321f93e8 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -71,6 +71,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 	//
 	render: {
         value: function (callback, template) {//TODO: Add support for templates
+        	this.application.ninja.documentController._hackRootFlag = false;
         	//Storing callback for dispatch ready
         	this._callback = callback;
         	//Adding listener to know when template is loaded to then load user content
@@ -83,6 +84,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 	//
     onTemplateLoad: {
         value: function (e) {
+        	this.application.ninja.documentController._hackRootFlag = true;
         	//TODO: Add support to constructing URL with a base HREF
         	var basetag = this.content.document.getElementsByTagName('base');
         	//Removing event
-- 
cgit v1.2.3


From f10bec0c594c6404eec51dc1a005f7f17570ba52 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 11 May 2012 10:13:27 -0700
Subject: Cleaning up template

---
 js/document/templates/montage-web/index.html | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'js/document')

diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index e02d8d8e..a1b8b242 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -15,8 +15,6 @@
 <html>
 
 	<head>
-	
-		<title data-ninja-template="true">Ninja Prototype</title>
         
        	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
        		* {
@@ -35,7 +33,6 @@
 
             html {
                 overflow: scroll;
-                padding: 0 11px 11px 0;
             }
 
             html, body {
@@ -55,14 +52,16 @@
 				-webkit-transition: all 450ms linear !important;
 			}
         </style>
-    
-    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
-    
-    	<script type="text/javascript" data-ninja-template="true">
+        
+        <script type="text/javascript" data-ninja-template="true">
       		function getElement(x,y) {
             	return document.elementFromPoint(x,y);
         	}
     	</script>
+    	
+    	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
+    
+    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
 
         <script type="text/montage-serialization" data-ninja-template="true">
         {
@@ -74,7 +73,6 @@
 
 	</head>
 
-	<body>
-	</body>
+	<body></body>
 
 </html>
\ No newline at end of file
-- 
cgit v1.2.3


From c87e538fdc337639bc4d54bb087dbf2b4f20297f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 11 May 2012 14:41:20 -0700
Subject: Adding support for new templates

This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
---
 js/document/document-html.js                       | 14 +++-
 js/document/models/base.js                         |  5 ++
 js/document/templates/banner/index.html            | 94 ++++++++++++++++++++++
 js/document/templates/banner/main.js               | 49 +++++++++++
 js/document/templates/banner/package.json          |  8 ++
 js/document/templates/html/index.html              | 78 ++++++++++++++++++
 js/document/templates/html/main.js                 | 49 +++++++++++
 js/document/templates/html/package.json            |  8 ++
 .../templates/montage-html/default_html.css        | 74 -----------------
 js/document/templates/montage-html/index.html      | 48 -----------
 .../templates/montage-html/main.reel/main.js       | 48 -----------
 js/document/templates/montage-html/package.json    |  8 --
 js/document/templates/montage-web/index.html       | 78 ------------------
 js/document/templates/montage-web/main.js          | 49 -----------
 js/document/templates/montage-web/package.json     |  8 --
 js/document/views/design.js                        | 90 ++++++++++++++++-----
 16 files changed, 372 insertions(+), 336 deletions(-)
 create mode 100755 js/document/templates/banner/index.html
 create mode 100644 js/document/templates/banner/main.js
 create mode 100755 js/document/templates/banner/package.json
 create mode 100755 js/document/templates/html/index.html
 create mode 100644 js/document/templates/html/main.js
 create mode 100755 js/document/templates/html/package.json
 delete mode 100755 js/document/templates/montage-html/default_html.css
 delete mode 100755 js/document/templates/montage-html/index.html
 delete mode 100644 js/document/templates/montage-html/main.reel/main.js
 delete mode 100755 js/document/templates/montage-html/package.json
 delete mode 100755 js/document/templates/montage-web/index.html
 delete mode 100644 js/document/templates/montage-web/main.js
 delete mode 100755 js/document/templates/montage-web/package.json

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index e00333f0..7e1f1806 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -63,13 +63,14 @@ exports.HtmlDocument = Montage.create(Component, {
 	////////////////////////////////////////////////////////////////////
 	//
     init: {
-        value:function(file, context, callback, view, template) { //TODO: Add template support logic
+        value:function(file, context, callback, view, template) {
         	//Storing callback data for loaded dispatch
         	this.loaded.callback = callback;
         	this.loaded.context = context;
             //Creating instance of HTML Document Model
             this.model = Montage.create(HtmlDocumentModel,{
             	file: {value: file},
+            	fileTemplate: {value: template},
             	parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach
             	views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
             });
@@ -97,8 +98,13 @@ exports.HtmlDocument = Montage.create(Component, {
             	this.model.views.design.render(function () {
             		//TODO: Identify and remove usage of '_document'
             		this._document = this.model.views.design.document;
-    				//TODO: Remove usage, seems as not needed
-            		this.documentRoot = this.model.views.design.document.body;
+            		//TODO: Remove usage, seems as not needed
+    				if (template && template.type === 'banner') {
+    					//this.documentRoot = this.model.views.design.document.body;
+    					this.documentRoot = this.model.views.design.document.body.getElementsByTagName('ninja-banner')[0];
+    				} else {
+    					this.documentRoot = this.model.views.design.document.body;
+    				}
             		//TODO: Why is this needed?
             		this._liveNodeList = this.model.views.design.document.body.getElementsByTagName('*');
             		//Initiliazing document model
@@ -106,7 +112,7 @@ exports.HtmlDocument = Montage.create(Component, {
             		//Adding observer to know when template is ready
             		this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this));
         			this._observer.observe(this.model.views.design.document.head, {childList: true});
-            	}.bind(this));
+            	}.bind(this), template);
             } else {
             	//TODO: Identify default view (probably code)
             }
diff --git a/js/document/models/base.js b/js/document/models/base.js
index ebfb73b8..0f58e75c 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -60,6 +60,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
         get: function() {return this._currentView;},
         set: function(value) {this._currentView = value;}
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+    fileTemplate: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
     parentContainer: {
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
new file mode 100755
index 00000000..2cd82f51
--- /dev/null
+++ b/js/document/templates/banner/index.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+ 
+ 
+<!-- 
+	NOTE(s):
+	All elements in the head of the document to be exclude from I/O
+	must set the 'data-ninja-template'
+	data-ninja-template="true"
+-->
+<html>
+
+	<head>
+        
+       	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
+       		* {
+        		-webkit-transition-duration: 0s !important;
+    			-webkit-animation-duration: 0s !important;
+    			-webkit-animation-name: none !important;
+			}
+			
+			body {
+				margin: 0;
+    			padding: 0;
+				position: absolute;
+				-webkit-transform-style: preserve-3d;
+				-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+			}
+
+            html {
+                overflow: scroll;
+            }
+
+            html, body {
+                width: 100%;
+                height: 100%;
+                background: #666;
+            }
+			
+			ninjaloadinghack {
+				display: none;
+			}
+
+			.active-element-outline {
+    			outline: #adff2f solid 2px;
+			}
+
+			.nj-preset-transition {
+				-webkit-transition: all 450ms linear !important;
+			}
+			
+			ninja-banner {
+				display: block;
+				margin: 0;
+				padding: 0;
+				border: 0;
+				position: absolute;
+				overflow: visible;
+				top: 50%;
+				left: 50%;
+				background: #FFF;
+			}
+        </style>
+        
+        <script type="text/javascript" data-ninja-template="true">
+      		function getElement(x,y) {
+            	return document.elementFromPoint(x,y);
+        	}
+    	</script>
+    	
+    	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
+    
+    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+
+        <script type="text/montage-serialization" data-ninja-template="true">
+        {
+            "owner": {
+                "prototype": "main"
+            }
+        }
+        </script>
+
+	</head>
+
+	<body>
+		<ninjaloadinghack></ninjaloadinghack>
+		<ninja-banner></ninja-banner>
+	</body>
+
+</html>
\ No newline at end of file
diff --git a/js/document/templates/banner/main.js b/js/document/templates/banner/main.js
new file mode 100644
index 00000000..d5ac88d5
--- /dev/null
+++ b/js/document/templates/banner/main.js
@@ -0,0 +1,49 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.Main = Montage.create(Component, {
+
+    hasTemplate: {
+        value: false
+    },
+
+    /**
+     * Adding window hooks to callback into this object from Ninja.
+     */
+    templateDidLoad: {
+        value: function(){
+            var self = this;
+            window.addComponent = function(element, data, callback) {
+                var component;
+
+                component = require.async(data.path)
+                    .then(function(component) {
+                        var componentRequire = component[data.name];
+                        var componentInstance = componentRequire.create();
+
+                        componentInstance.element = element;
+
+                        componentInstance.needsDraw = true;
+                        componentInstance.ownerComponent = self;
+
+                        callback(componentInstance, element);
+                    })
+                    .end();
+
+            };
+
+            // Dispatch event when this template has loaded.
+            /*
+            var newEvent = document.createEvent( "CustomEvent" );
+            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
+            document.body.dispatchEvent( newEvent );
+            */
+
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json
new file mode 100755
index 00000000..c8bc02fb
--- /dev/null
+++ b/js/document/templates/banner/package.json
@@ -0,0 +1,8 @@
+{
+       "directories": {
+           "lib": ""
+       },
+       "mappings": {
+           "montage": "../../../../node_modules/montage/"
+       }
+}
\ No newline at end of file
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
new file mode 100755
index 00000000..a1b8b242
--- /dev/null
+++ b/js/document/templates/html/index.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+ 
+ 
+<!-- 
+	NOTE(s):
+	All elements in the head of the document to be exclude from I/O
+	must set the 'data-ninja-template'
+	data-ninja-template="true"
+-->
+<html>
+
+	<head>
+        
+       	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
+       		* {
+        		-webkit-transition-duration: 0s !important;
+    			-webkit-animation-duration: 0s !important;
+    			-webkit-animation-name: none !important;
+			}
+			
+			body {
+				margin: 0;
+    			padding: 0;
+				position: absolute;
+				-webkit-transform-style: preserve-3d;
+				-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+			}
+
+            html {
+                overflow: scroll;
+            }
+
+            html, body {
+                width: 100%;
+                height: 100%;
+            }
+			
+			ninjaloadinghack {
+				display: none;
+			}
+
+			.active-element-outline {
+    			outline: #adff2f solid 2px;
+			}
+
+			.nj-preset-transition {
+				-webkit-transition: all 450ms linear !important;
+			}
+        </style>
+        
+        <script type="text/javascript" data-ninja-template="true">
+      		function getElement(x,y) {
+            	return document.elementFromPoint(x,y);
+        	}
+    	</script>
+    	
+    	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
+    
+    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+
+        <script type="text/montage-serialization" data-ninja-template="true">
+        {
+            "owner": {
+                "prototype": "main"
+            }
+        }
+        </script>
+
+	</head>
+
+	<body></body>
+
+</html>
\ No newline at end of file
diff --git a/js/document/templates/html/main.js b/js/document/templates/html/main.js
new file mode 100644
index 00000000..d5ac88d5
--- /dev/null
+++ b/js/document/templates/html/main.js
@@ -0,0 +1,49 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.Main = Montage.create(Component, {
+
+    hasTemplate: {
+        value: false
+    },
+
+    /**
+     * Adding window hooks to callback into this object from Ninja.
+     */
+    templateDidLoad: {
+        value: function(){
+            var self = this;
+            window.addComponent = function(element, data, callback) {
+                var component;
+
+                component = require.async(data.path)
+                    .then(function(component) {
+                        var componentRequire = component[data.name];
+                        var componentInstance = componentRequire.create();
+
+                        componentInstance.element = element;
+
+                        componentInstance.needsDraw = true;
+                        componentInstance.ownerComponent = self;
+
+                        callback(componentInstance, element);
+                    })
+                    .end();
+
+            };
+
+            // Dispatch event when this template has loaded.
+            /*
+            var newEvent = document.createEvent( "CustomEvent" );
+            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
+            document.body.dispatchEvent( newEvent );
+            */
+
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/document/templates/html/package.json b/js/document/templates/html/package.json
new file mode 100755
index 00000000..c8bc02fb
--- /dev/null
+++ b/js/document/templates/html/package.json
@@ -0,0 +1,8 @@
+{
+       "directories": {
+           "lib": ""
+       },
+       "mappings": {
+           "montage": "../../../../node_modules/montage/"
+       }
+}
\ No newline at end of file
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
deleted file mode 100755
index 04b21c6f..00000000
--- a/js/document/templates/montage-html/default_html.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-* {
-    -webkit-transition-duration: 0s !important;
-    -webkit-animation-duration: 0s !important;
-    -webkit-animation-name: none !important;
-}
-
-html{
-    overflow:hidden;
-}
-
-body
-{
-	background: #808080;
-}
-
-#Viewport 
-{
-	margin: 0px;
-	padding: 0px;
-	top: 200px;
-	left: 700px;
-    /*position: absolute;*/
-	/*height: 600px;*/
-	/*width: 800px;*/
-	opacity: 0.99;
-	z-index:2;
-}
-
-#stageBG
-{
-	background: #ffffff;
-	top: 200px;
-	left: 700px;
-	z-index:1;
-}
-        
-.stageDimension
-{
-	position: absolute;
-    height: 600px;
-    width: 800px;
-}
-
-.stageView
-{
-    border:  1px solid black;
-    -webkit-transform-style: preserve-3d;
-    -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-}
-
-.stageContentShadow {
-	-webkit-box-shadow: 3px 5px 4px rgba(0,0,0,.5);
-	-moz-box-shadow: 3px 5px 4px rgba(0,0,0,.5);
-	box-shadow: 3px 5px 4px rgba(0,0,0,.5);
-}
-
-#userHead
-{
-	display: none;
-}
-
-.active-element-outline {
-  outline: #adff2f solid 2px;
-}
-
-.nj-preset-transition {
-    -webkit-transition: all 450ms linear !important;
-}
\ No newline at end of file
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
deleted file mode 100755
index 79c6cd51..00000000
--- a/js/document/templates/montage-html/index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> -->
- 
-<html>
-
-	<head>
-	
-		<title>Ninja Prototype</title>
-
-        <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
-    
-    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script>
-    
-    	<script type="text/javascript">
-      		function getElement(x,y) {
-            	return document.elementFromPoint(x,y);
-        	}
-    	</script>
-
-        <script type="text/montage-serialization">
-        {
-            "owner": {
-                "prototype": "main.reel"
-            }
-        }
-        </script>
-
-	</head>
-
-	<body>
-		
-		<ninja-div id="userHead"></ninja-div>
-		
-		<ninja-div id="stageBG" class="stageDimension stageContentShadow"></ninja-div>
-		
-		<ninja-div id="Viewport" class="stageDimension">
-			
-			<ninja-div id="UserContent" class="stageView stageDimension"></ninja-div>
-			
-		</ninja-div>
-
-	</body>
-
-</html>
\ No newline at end of file
diff --git a/js/document/templates/montage-html/main.reel/main.js b/js/document/templates/montage-html/main.reel/main.js
deleted file mode 100644
index 019c675e..00000000
--- a/js/document/templates/montage-html/main.reel/main.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-exports.Main = Montage.create(Component, {
-
-    hasTemplate: {
-        value: false
-    },
-
-    /**
-     * Adding window hooks to callback into this object from Ninja.
-     */
-    templateDidLoad: {
-        value: function(){
-            var self = this;
-            window.addComponent = function(element, data, callback) {
-                var component;
-
-                component = require.async(data.path)
-                    .then(function(component) {
-                        var componentRequire = component[data.name];
-                        var componentInstance = componentRequire.create();
-
-                        componentInstance.element = element;
-
-                        componentInstance.needsDraw = true;
-                        componentInstance.ownerComponent = self;
-
-                        callback(componentInstance, element);
-                    })
-                    .end();
-
-            };
-
-            // Dispatch event when this template has loaded.
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-
-            document.body.dispatchEvent( newEvent );
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json
deleted file mode 100755
index c8bc02fb..00000000
--- a/js/document/templates/montage-html/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/"
-       }
-}
\ No newline at end of file
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
deleted file mode 100755
index a1b8b242..00000000
--- a/js/document/templates/montage-web/index.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> -->
- 
- 
-<!-- 
-	NOTE(s):
-	All elements in the head of the document to be exclude from I/O
-	must set the 'data-ninja-template'
-	data-ninja-template="true"
--->
-<html>
-
-	<head>
-        
-       	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
-       		* {
-        		-webkit-transition-duration: 0s !important;
-    			-webkit-animation-duration: 0s !important;
-    			-webkit-animation-name: none !important;
-			}
-			
-			body {
-				margin: 0;
-    			padding: 0;
-				position: absolute;
-				-webkit-transform-style: preserve-3d;
-				-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-			}
-
-            html {
-                overflow: scroll;
-            }
-
-            html, body {
-                width: 100%;
-                height: 100%;
-            }
-			
-			ninjaloadinghack {
-				display: none;
-			}
-
-			.active-element-outline {
-    			outline: #adff2f solid 2px;
-			}
-
-			.nj-preset-transition {
-				-webkit-transition: all 450ms linear !important;
-			}
-        </style>
-        
-        <script type="text/javascript" data-ninja-template="true">
-      		function getElement(x,y) {
-            	return document.elementFromPoint(x,y);
-        	}
-    	</script>
-    	
-    	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
-    
-    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
-
-        <script type="text/montage-serialization" data-ninja-template="true">
-        {
-            "owner": {
-                "prototype": "main"
-            }
-        }
-        </script>
-
-	</head>
-
-	<body></body>
-
-</html>
\ No newline at end of file
diff --git a/js/document/templates/montage-web/main.js b/js/document/templates/montage-web/main.js
deleted file mode 100644
index d5ac88d5..00000000
--- a/js/document/templates/montage-web/main.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-exports.Main = Montage.create(Component, {
-
-    hasTemplate: {
-        value: false
-    },
-
-    /**
-     * Adding window hooks to callback into this object from Ninja.
-     */
-    templateDidLoad: {
-        value: function(){
-            var self = this;
-            window.addComponent = function(element, data, callback) {
-                var component;
-
-                component = require.async(data.path)
-                    .then(function(component) {
-                        var componentRequire = component[data.name];
-                        var componentInstance = componentRequire.create();
-
-                        componentInstance.element = element;
-
-                        componentInstance.needsDraw = true;
-                        componentInstance.ownerComponent = self;
-
-                        callback(componentInstance, element);
-                    })
-                    .end();
-
-            };
-
-            // Dispatch event when this template has loaded.
-            /*
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-            document.body.dispatchEvent( newEvent );
-            */
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/document/templates/montage-web/package.json b/js/document/templates/montage-web/package.json
deleted file mode 100755
index c8bc02fb..00000000
--- a/js/document/templates/montage-web/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/"
-       }
-}
\ No newline at end of file
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 321f93e8..e838dd49 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -21,11 +21,21 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     _callback: {
     	value: null
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+    _template: {
+    	value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	_document: {
         value: null
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	_bodyFragment: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	_headFragment: {
@@ -70,14 +80,20 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
 	//
 	render: {
-        value: function (callback, template) {//TODO: Add support for templates
+        value: function (callback, template) {
+        	//TODO: Remove, this is a temp patch for webRequest API gate
         	this.application.ninja.documentController._hackRootFlag = false;
         	//Storing callback for dispatch ready
         	this._callback = callback;
+        	this._template = template;
         	//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)
-        	this.iframe.src = "js/document/templates/montage-web/index.html";
+			if (template && template.type === 'banner' && template.size) {
+        		this.iframe.src = "js/document/templates/banner/index.html";
+        	} else {
+	        	this.iframe.src = "js/document/templates/html/index.html";
+	        }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -104,27 +120,63 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         			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
-        	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));
-        	//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));
-        	//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);
+        	//Checking to content to be template
+        	if (this._template) {
+        		if (this._template.type === 'banner') {
+        			//Loading contents into a fragment
+        			this._bodyFragment = this.document.createElement('body');
+        			//Listening for content to be ready
+        			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));
+    	    	}
+        	} else {
+    	    	//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
+        		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));
+        		//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));
+    	    	//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>
 			}
-			//TODO: Add attribute copying for <HEAD> and <HTML>
         }
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+    insertBannerContent: {
+    	value: function (e) {
+    		//Getting first element in DOM (assumes it's root)
+    		var banner = this._bodyFragment.getElementsByTagName('*')[1],
+    			ninjaBanner = this.document.body.getElementsByTagName('ninja-banner')[0];
+    		//Copying attributes to maintain same properties as the banner root
+			for (var n in banner.attributes) {
+				if (banner.attributes[n].value) {
+					ninjaBanner.setAttribute(banner.attributes[n].name, banner.attributes[n].value);
+				}
+			}
+			//Adjusting margin per size of document
+			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}';
+			//Setting content in template
+    		ninjaBanner.innerHTML = banner.innerHTML;
+        	//Garbage collection
+        	this._bodyFragment = null;
+        	//Calling standard method to finish opening document
+        	this.bodyContentLoaded(null);
+    	}
+    },
     ////////////////////////////////////////////////////////////////////
 	//
     insertHeadContent: {
-- 
cgit v1.2.3


From d114f222cb48a101ffdb1b88d43823ca16f2c7df Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 11 May 2012 15:15:33 -0700
Subject: Fixing overflow bug for banner templates

Ensuring overflow is visible but saved as hidden.
---
 js/document/document-html.js | 1 -
 js/document/views/design.js  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 7e1f1806..4767271f 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -100,7 +100,6 @@ exports.HtmlDocument = Montage.create(Component, {
             		this._document = this.model.views.design.document;
             		//TODO: Remove usage, seems as not needed
     				if (template && template.type === 'banner') {
-    					//this.documentRoot = this.model.views.design.document.body;
     					this.documentRoot = this.model.views.design.document.body.getElementsByTagName('ninja-banner')[0];
     				} else {
     					this.documentRoot = this.model.views.design.document.body;
diff --git a/js/document/views/design.js b/js/document/views/design.js
index e838dd49..16d1ac06 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -168,7 +168,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 				}
 			}
 			//Adjusting margin per size of document
-			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}';
+			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {overflow: visible !important; margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}';
 			//Setting content in template
     		ninjaBanner.innerHTML = banner.innerHTML;
         	//Garbage collection
-- 
cgit v1.2.3


From d68c1ea5163c67ada54ac24f1da69695cc8dfab5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 11 May 2012 16:22:17 -0700
Subject: Fixing position issue

Need to implement centering document.
---
 js/document/templates/banner/index.html | 4 ++--
 js/document/views/design.js             | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'js/document')

diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 2cd82f51..8e8c96d6 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -60,8 +60,8 @@
 				border: 0;
 				position: absolute;
 				overflow: visible;
-				top: 50%;
-				left: 50%;
+				top: 0;
+				left: 0;
 				background: #FFF;
 			}
         </style>
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 16d1ac06..bff65b7f 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -168,7 +168,8 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 				}
 			}
 			//Adjusting margin per size of document
-			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {overflow: visible !important; margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}';
+			//this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {overflow: visible !important; margin-top: -'+Math.floor(this._template.size.height/2)+'px; margin-left: -'+Math.floor(this._template.size.width/2)+'px}';
+			this.docum