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.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {overflow: visible !important;}';
 			//Setting content in template
     		ninjaBanner.innerHTML = banner.innerHTML;
         	//Garbage collection
-- 
cgit v1.2.3


From 734b6ad96d25bb67d0db4a0a75c331468e194809 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 14 May 2012 12:05:41 -0700
Subject: Fixing 3d to work in banner templates.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/document-html.js            | 2 +-
 js/document/templates/banner/index.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 4767271f..f8e88ede 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -107,7 +107,7 @@ exports.HtmlDocument = Montage.create(Component, {
             		//TODO: Why is this needed?
             		this._liveNodeList = this.model.views.design.document.body.getElementsByTagName('*');
             		//Initiliazing document model
-            		document.application.njUtils.makeElementModel(this.model.views.design.document.body, "Body", "body");
+            		document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
             		//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});
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 8e8c96d6..9da6699b 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -27,8 +27,6 @@
 				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 {
@@ -63,6 +61,9 @@
 				top: 0;
 				left: 0;
 				background: #FFF;
+                -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);
+
 			}
         </style>
         
-- 
cgit v1.2.3


From 8c014c75b7f7ac7cf854af6d2cc2f8d330335858 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 14 May 2012 14:27:55 -0700
Subject: Fixing grid drawing bug.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/document-html.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index f8e88ede..b5203e92 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -105,7 +105,7 @@ exports.HtmlDocument = Montage.create(Component, {
     					this.documentRoot = this.model.views.design.document.body;
     				}
             		//TODO: Why is this needed?
-            		this._liveNodeList = this.model.views.design.document.body.getElementsByTagName('*');
+            		this._liveNodeList = this.documentRoot.getElementsByTagName('*');
             		//Initiliazing document model
             		document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
             		//Adding observer to know when template is ready
-- 
cgit v1.2.3


From cfd3a44bb7aba54c15fab59eff39ecdffcb7ac11 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 14 May 2012 14:38:35 -0700
Subject: Viewport for banner templates so content doesn't push through "body".

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/templates/banner/index.html | 19 +++++++++++++++++--
 js/document/views/design.js             |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'js/document')

diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 9da6699b..7b29c038 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -50,6 +50,18 @@
 			.nj-preset-transition {
 				-webkit-transition: all 450ms linear !important;
 			}
+
+           ninja-viewport {
+               display: block;
+               margin: 0;
+               padding: 0;
+               border: 0;
+               position: absolute;
+               overflow: visible;
+               top: 0;
+               left: 0;
+               background: #FFF;
+           }
 			
 			ninja-banner {
 				display: block;
@@ -60,7 +72,7 @@
 				overflow: visible;
 				top: 0;
 				left: 0;
-				background: #FFF;
+				background: transparent;
                 -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);
 
@@ -89,7 +101,10 @@
 
 	<body>
 		<ninjaloadinghack></ninjaloadinghack>
-		<ninja-banner></ninja-banner>
+        <ninja-viewport>
+            <!--TODO - rename-->
+		    <ninja-banner></ninja-banner>
+        </ninja-viewport>
 	</body>
 
 </html>
\ No newline at end of file
diff --git a/js/document/views/design.js b/js/document/views/design.js
index bff65b7f..3378ad71 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -169,7 +169,7 @@ 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;}';
+			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-banner {overflow: visible !important;} ninja-banner, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
 			//Setting content in template
     		ninjaBanner.innerHTML = banner.innerHTML;
         	//Garbage collection
-- 
cgit v1.2.3


From 150b6eb2be526627d588a0cf7226ddad7a399b8f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 14 May 2012 16:35:09 -0700
Subject: Fixing banner template

Need to implement save, but this cover open and new.
---
 js/document/document-html.js            |  2 +-
 js/document/templates/banner/index.html | 54 ++++++++++++++++-----------------
 js/document/views/design.js             |  7 +++--
 3 files changed, 31 insertions(+), 32 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index b5203e92..9bbea4c9 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -100,7 +100,7 @@ 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.getElementsByTagName('ninja-banner')[0];
+    					this.documentRoot = this.model.views.design.document.body.getElementsByTagName('ninja-content')[0];
     				} else {
     					this.documentRoot = this.model.views.design.document.body;
     				}
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 7b29c038..91ef06de 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -38,10 +38,6 @@
                 height: 100%;
                 background: #666;
             }
-			
-			ninjaloadinghack {
-				display: none;
-			}
 
 			.active-element-outline {
     			outline: #adff2f solid 2px;
@@ -50,32 +46,30 @@
 			.nj-preset-transition {
 				-webkit-transition: all 450ms linear !important;
 			}
-
-           ninja-viewport {
-               display: block;
-               margin: 0;
-               padding: 0;
-               border: 0;
-               position: absolute;
-               overflow: visible;
-               top: 0;
-               left: 0;
-               background: #FFF;
-           }
 			
-			ninja-banner {
+			ninjaloadinghack {
+				display: none;
+			}
+			
+			ninja-viewport, ninja-content {
 				display: block;
-				margin: 0;
-				padding: 0;
-				border: 0;
-				position: absolute;
-				overflow: visible;
-				top: 0;
-				left: 0;
-				background: transparent;
+               	margin: 0;
+               	padding: 0;
+               	border: 0;
+               	position: absolute;
+               	overflow: visible;
+               	top: 0;
+               	left: 0;
+               	background: transparent;
+			}
+			
+			ninja-viewport {
+               	background: #FFF;
+           	}
+			
+			ninja-content {
                 -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);
-
 			}
         </style>
         
@@ -100,11 +94,15 @@
 	</head>
 
 	<body>
+		
 		<ninjaloadinghack></ninjaloadinghack>
+        
         <ninja-viewport>
-            <!--TODO - rename-->
-		    <ninja-banner></ninja-banner>
+		    
+		    <ninja-content></ninja-content>
+		    
         </ninja-viewport>
+        
 	</body>
 
 </html>
\ No newline at end of file
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 3378ad71..4c91ff39 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -159,8 +159,9 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     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];
+    		//TODO: Ensure wrapper logic is proper
+    		var banner = this._bodyFragment.getElementsByTagName('*')[2],
+    			ninjaBanner = this.document.body.getElementsByTagName('ninja-content')[0];
     		//Copying attributes to maintain same properties as the banner root
 			for (var n in banner.attributes) {
 				if (banner.attributes[n].value) {
@@ -169,7 +170,7 @@ 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;} ninja-banner, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
+			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-content {overflow: visible !important;} ninja-content, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
 			//Setting content in template
     		ninjaBanner.innerHTML = banner.innerHTML;
         	//Garbage collection
-- 
cgit v1.2.3


From 77c0f0b369d431f6824906c91753b934f749c5d8 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 15 May 2012 11:15:27 -0700
Subject: Finalizing open for new banner templates

Moving to implement save.
---
 js/document/views/design.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 4c91ff39..48c91aad 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -160,16 +160,23 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     	value: function (e) {
     		//Getting first element in DOM (assumes it's root)
     		//TODO: Ensure wrapper logic is proper
-    		var banner = this._bodyFragment.getElementsByTagName('*')[2],
-    			ninjaBanner = this.document.body.getElementsByTagName('ninja-content')[0];
-    		//Copying attributes to maintain same properties as the banner root
+    		var wrapper =	this._bodyFragment.getElementsByTagName('*')[1],
+    			banner =	this._bodyFragment.getElementsByTagName('*')[2],
+    			ninjaBanner = this.document.body.getElementsByTagName('ninja-content')[0],
+    			ninjaWrapper = this.document.body.getElementsByTagName('ninja-viewport')[0];
+    		//Copying attributes to maintain same properties as the banner wrapper
+			for (var n in wrapper.attributes) {
+				if (wrapper.attributes[n].value) {
+					ninjaWrapper.setAttribute(wrapper.attributes[n].name, wrapper.attributes[n].value);
+				}
+			}
+			//Copying attributes to maintain same properties as the banner content
 			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 {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-content {overflow: visible !important;} ninja-content, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
 			//Setting content in template
     		ninjaBanner.innerHTML = banner.innerHTML;
@@ -204,7 +211,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     		//Removing event, only needed on initial load
     		this._observer.body.disconnect();
     		this._observer.body = null;
-    		//Removing loading container
+    		//Removing loading container (should be removed)
     		this.document.body.removeChild(this.document.getElementsByTagName('ninjaloadinghack')[0]);
    			//Getting style and link tags in document
             var stags = this.document.getElementsByTagName('style'),
@@ -218,8 +225,12 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 				for (i = 0; i < ltags.length; i++) {
 					//
 					if (ltags[i].href) {
-						//TODO: Verify this works for tags in body as well (working in head)
-						this.document.head.insertBefore(this.getStyleTagFromCssFile(ltags[i]), ltags[i]) || this.document.body.insertBefore(this.getStyleTagFromCssFile(ltags[i]), ltags[i]);
+						//Inseting <style> right above of <link> to maintain hierarchy
+						try {
+							this.document.head.insertBefore(this.getStyleTagFromCssFile(ltags[i]), ltags[i])
+						} catch (e) {
+							this.document.body.insertBefore(this.getStyleTagFromCssFile(ltags[i]), ltags[i]);
+						}
 						//Disabling tag once it has been reloaded
 						ltags[i].setAttribute('disabled', 'true');
 					} else {
-- 
cgit v1.2.3


From bffc9b2a4bd3480a6e369a36660ce402f7e16aba Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 15 May 2012 12:01:37 -0700
Subject: File save for banner template

Adding file save for templates, completing I/O.
---
 js/document/models/base.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/document')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 0f58e75c..5f2a5893 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -138,6 +138,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			file: this.file,
         			webgl: this.webGlHelper.glData,
         			styles: this.getStyleSheets(),
+        			template: this.fileTemplate,
         			document: this.views.design.iframe.contentWindow.document,
         			head: this.views.design.iframe.contentWindow.document.head,
         			body: this.views.design.iframe.contentWindow.document.body
@@ -165,6 +166,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			file: this.file,
         			webgl: this.webGlHelper.glData,
         			css: this.getStyleSheets(),
+        			template: this.fileTemplate,
         			document: this.views.design.iframe.contentWindow.document,
         			head: this.views.design.iframe.contentWindow.document.head,
         			body: this.views.design.iframe.contentWindow.document.body
-- 
cgit v1.2.3


From 08935db8b1eca984bd384ef2b8db8ebba9e50091 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 15 May 2012 14:59:22 -0700
Subject: Fixing overflow on open for template documents

---
 js/document/views/design.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 48c91aad..c7aab1d7 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -177,7 +177,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 				}
 			}
 			//Adjusting margin per size of document
-			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-content {overflow: visible !important;} ninja-content, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
+			this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-viewport {overflow: visible !important;} ninja-content, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
 			//Setting content in template
     		ninjaBanner.innerHTML = banner.innerHTML;
         	//Garbage collection
-- 
cgit v1.2.3


From 620ae8f53d4da25c65adb675c0b0ee187e5754fc Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 15 May 2012 16:49:32 -0700
Subject: Adding special preview for templates

---
 js/document/models/base.js                | 14 +++++--
 js/document/templates/preview/banner.html | 64 +++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100755 js/document/templates/preview/banner.html

(limited to 'js/document')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 5f2a5893..e8eba89f 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -93,13 +93,21 @@ exports.BaseDocumentModel = Montage.create(Component, {
         		//Currently only supporting current browser (Chrome, obviously)
         		switch (this.browser) {
         			case 'chrome':
-        				window.open(this.url);
+        				if (this.template.type === 'banner' || this.template.type === 'animation') {
+        					window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
+        				} else {
+        					window.open(this.url);
+        				}
 	        			break;
     	    		default:
-        				window.open(this.url);
+        				if (this.template.type === 'banner' || this.template.type === 'animation') {
+        					window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
+        				} else {
+        					window.open(this.url);
+        				}
         				break;
 	        	}
-        	}.bind({browser: browser, url: url}));
+        	}.bind({browser: browser, url: url, template: this.fileTemplate}));
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/templates/preview/banner.html b/js/document/templates/preview/banner.html
new file mode 100755
index 00000000..5838ec91
--- /dev/null
+++ b/js/document/templates/preview/banner.html
@@ -0,0 +1,64 @@
+<!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>
+        
+       	<style type="text/css">
+       		
+       		html, body {
+       			width: 100%;
+       			height: 100%;
+       			margin: 0;
+       			padding: 0;
+       			background: #333;
+       		}
+       		
+       		.preview {
+       			position: absolute;
+       			top: 50%;
+       			left: 50%;
+       			margin: 0;
+       			padding: 0;
+       			border: 1px solid #000;
+       			background: #FFF;
+       			-webkit-box-shadow: 0 0 16px #000;
+       		}
+       		
+        </style>
+        
+        <script type="text/javascript">
+        	//
+        	window.addEventListener('load', loadBanner, false);
+        	//
+        	function loadBanner (e) {
+        		var iframe = document.getElementsByTagName('iframe')[0];
+        		iframe.src = qs('url');
+        		iframe.style.width = qs('width')+'px';
+        		iframe.style.height = qs('height')+'px';
+        		iframe.style.marginLeft = -1*qs('width')/2+'px';
+        		iframe.style.marginTop = -1*qs('height')/2+'px';
+        	}
+        	/*
+        	Taken from:
+        	http://stackoverflow.com/questions/7731778/jquery-get-query-string-parameters
+        	*/
+        	function qs(key) {
+    			key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars
+    			var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)"));
+		    	return match && decodeURIComponent(match[1]);
+			}
+        </script>
+
+	</head>
+
+	<body>
+		<iframe class="preview"></iframe>
+	</body>
+
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 919a0d0ed35c24b1047281723ddde2ac98fc9a3e Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 15 May 2012 22:36:44 -0700
Subject: document close handler. initial working draft

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/document-html.js | 26 ++++----------------------
 js/document/html-document.js | 39 ---------------------------------------
 js/document/models/base.js   |  3 ++-
 3 files changed, 6 insertions(+), 62 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 9bbea4c9..87c776d5 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -42,13 +42,6 @@ exports.HtmlDocument = Montage.create(Component, {
 	//
     exclusionList: {
         value: ["HTML", "BODY"] //TODO: Update to correct list
-    },
-	////////////////////////////////////////////////////////////////////
-	//
-    uuid: {
-        get: function() {
-            return this._uuid;
-        }
     },
     ////////////////////////////////////////////////////////////////////
 	//
@@ -133,21 +126,10 @@ exports.HtmlDocument = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
 	//
 	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
+		value: function (context, callback) {
+			var closed = this.model.close(null);
+
+            callback.call(context, this);
 		}
 	},
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 9d083dd8..6a84abdf 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -971,45 +971,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this.application.ninja.undocontroller.redoQueue = this.redoStack.slice(0);
 
 
-        }
-    },
-	////////////////////////////////////////////////////////////////////
-    /**
-     *pause videos on switching or closing the document, so that the browser does not keep downloading the media data
-    */
-    pauseVideos:{
-        value:function(){
-            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
-            for(i=0;i<videosArr.length;i++){
-                if(!videosArr[i].paused){
-                    videosArr[i].pause();
-                }
-            }
-        }
-    },
-
-    /**
-     * remove the video src on closing the document, so that the browser does not keep downloading the media data, if the tag does not get garbage collected
-     *removeSrc : boolean to remove the src if the video... set only in the close document flow
-    */
-    stopVideos:{
-        value:function(){
-            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
-            for(i=0;i<videosArr.length;i++){
-                videosArr[i].src = "";
-            }
-        }
-    },
-    pauseAndStopVideos:{
-        value:function(){
-            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
-            for(i=0;i<videosArr.length;i++){
-                if(!videosArr[i].paused){
-                    videosArr[i].pause();
-                }
-                videosArr[i].src = "";
-            }
         }
     }
-    ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 5f2a5893..d34fb2dd 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -206,10 +206,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	if (this.views.design && (!view || view === 'design')) {
         		//
         		this.parentContainer.removeChild(this.views.design.iframe);
+                this.views.design.pauseAndStopVideos();
         		this.views.design = null;
         	}
         	//
-        	if (callback) callback(success);
+        	return success;
         }
     }
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3