From 5da4627fe899c03e885d10a77a5e33bb15875504 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 22 Feb 2012 13:38:09 -0800
Subject: Removed css not needed in Ninja Template

---
 js/document/html-document.js                  | 1 +
 js/document/templates/montage-html/index.html | 1 -
 js/document/templates/montage-html/styles.css | 5 -----
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100755 js/document/templates/montage-html/styles.css

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 02e9918f..ba5eea79 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -425,6 +425,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 								tag = this.iframe.contentWindow.document.createElement('style');
 								tag.setAttribute('ninjauri', fileUri);
 								tag.setAttribute('ninjafileurl', cssUrl);
+								tag.setAttribute('ninjafilename', cssUrl.split('/')[cssUrl.split('/').length-1]);
 								tag.innerHTML = cssData.content;
 								//Looping through DOM to insert style tag at location of link element
 								query = this._templateDocument.html.querySelectorAll(['link']);
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
index 8b3d73bb..edfab2b0 100755
--- a/js/document/templates/montage-html/index.html
+++ b/js/document/templates/montage-html/index.html
@@ -12,7 +12,6 @@
 		<title>Ninja Prototype</title>
 
         <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
-        <link href="styles.css" id="nj-default-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
     
     	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script>
     
diff --git a/js/document/templates/montage-html/styles.css b/js/document/templates/montage-html/styles.css
deleted file mode 100755
index 0441c1cf..00000000
--- a/js/document/templates/montage-html/styles.css
+++ /dev/null
@@ -1,5 +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> */
\ No newline at end of file
-- 
cgit v1.2.3


From 3524a22fa0745bb223ab6bcc312ca970a001157f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 22 Feb 2012 16:45:19 -0800
Subject: Logic to save <style> for a file

Saving CSS in <style> tags, need to implement saving CSS to files.
---
 js/document/html-document.js | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index ba5eea79..564daef3 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -388,6 +388,11 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this._document = this.iframe.contentWindow.document;
             this._window = this.iframe.contentWindow;
             //
+            for (var k in this._document.styleSheets) {
+            	this._document.styleSheets[k].ninjatemplate = true;
+            	//TODO: Add as attribute
+            }
+            //
             if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
             //Inserting user's document into template
             this._templateDocument.head.innerHTML = this._userDocument.content.head;
@@ -423,6 +428,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 								cssData = this.application.ninja.coreIoApi.readFile({uri: fileUri});
 								//Creating tag with file content
 								tag = this.iframe.contentWindow.document.createElement('style');
+								tag.setAttribute('type', 'text/css');
 								tag.setAttribute('ninjauri', fileUri);
 								tag.setAttribute('ninjafileurl', cssUrl);
 								tag.setAttribute('ninjafilename', cssUrl.split('/')[cssUrl.split('/').length-1]);
@@ -440,9 +446,11 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 							}
                     	}
 					}
+					////////////////////////////////////////////////////////////////////////////
+					////////////////////////////////////////////////////////////////////////////
 					
 					//TODO: Revisit this logic
-					this._styles = this._document.styleSheets[1];
+					/* this._styles = this._document.styleSheets[1]; */
 					this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
 					
 					console.log(this._document.styleSheets);
@@ -564,7 +572,34 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     	value: function () {
     		//TODO: Add code view logic and also styles for HTML
     		if (this.currentView === 'design') {
-    			return {mode: 'html', document: this._userDocument, webgl: this.glData, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    			var styles = [];
+    			for (var k in this._document.styleSheets) {
+            		if (!this._document.styleSheets[k].ninjatemplate) {
+            			styles.push(this._document.styleSheets[k]);
+            		}
+            	}
+    			return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		} else if (this.currentView === "code"){
+    			//TODO: Would this get call when we are in code of HTML?
+    		} else {
+    			//Error
+    		}
+    	}
+	},
+	////////////////////////////////////////////////////////////////////
+	//
+	saveAll: {
+		enumerable: false,
+    	value: function () {
+    		//TODO: Add code view logic and also styles for HTML
+    		if (this.currentView === 'design') {
+    			var css = [];
+    			for (var k in this._document.styleSheets) {
+            		if (!this._document.styleSheets[k].ninjatemplate) {
+            			css.push(this._document.styleSheets[k]);
+            		}
+            	}
+    			return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
     		} else if (this.currentView === "code"){
     			//TODO: Would this get call when we are in code of HTML?
     		} else {
-- 
cgit v1.2.3


From 593b2c954cf507bcb61d27f18d63b1406e7364c4 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 22 Feb 2012 22:47:25 -0800
Subject: Cleaning up and commenting CSS IO

---
 js/document/html-document.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 564daef3..3f417ffc 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -389,8 +389,9 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this._window = this.iframe.contentWindow;
             //
             for (var k in this._document.styleSheets) {
-            	this._document.styleSheets[k].ninjatemplate = true;
-            	//TODO: Add as attribute
+            	if (this._document.styleSheets[k].ownerNode && this._document.styleSheets[k].ownerNode.setAttribute) {
+            		this._document.styleSheets[k].ownerNode.setAttribute('ninjatemplate', 'true');
+            	}
             }
             //
             if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
@@ -449,11 +450,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 					////////////////////////////////////////////////////////////////////////////
 					////////////////////////////////////////////////////////////////////////////
 					
-					//TODO: Revisit this logic
-					/* this._styles = this._document.styleSheets[1]; */
-					this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
-					
-					console.log(this._document.styleSheets);
+					//TODO: Check if this is needed
+					this._stylesheets = this._document.styleSheets;
 					
 					////////////////////////////////////////////////////////////////////////////
 					////////////////////////////////////////////////////////////////////////////
@@ -574,8 +572,10 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     		if (this.currentView === 'design') {
     			var styles = [];
     			for (var k in this._document.styleSheets) {
-            		if (!this._document.styleSheets[k].ninjatemplate) {
-            			styles.push(this._document.styleSheets[k]);
+    				if (this._document.styleSheets[k].ownerNode && this._document.styleSheets[k].ownerNode.getAttribute) {
+            			if (this._document.styleSheets[k].ownerNode.getAttribute('ninjatemplate') === null) {
+            				styles.push(this._document.styleSheets[k]);
+            			}
             		}
             	}
     			return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
@@ -595,8 +595,10 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     		if (this.currentView === 'design') {
     			var css = [];
     			for (var k in this._document.styleSheets) {
-            		if (!this._document.styleSheets[k].ninjatemplate) {
-            			css.push(this._document.styleSheets[k]);
+    				if (this._document.styleSheets[k].ownerNode && this._document.styleSheets[k].ownerNode.getAttribute) {
+            			if (this._document.styleSheets[k].ownerNode.getAttribute('ninjatemplate') === null) {
+            				css.push(this._document.styleSheets[k]);
+            			}
             		}
             	}
     			return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
-- 
cgit v1.2.3


From d264092596ba697cd04738566184270dc608be63 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 22 Feb 2012 23:53:38 -0800
Subject: Temp fix for CSS url data

Added a temp fix to parse out the app url that is placed in the CSS styles.
---
 js/document/html-document.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 3f417ffc..143b1598 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -558,7 +558,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     	enumerable: false,
     	value: function () {
     		//TODO: Add logic to handle save before preview
-    		this.save();
+    		this.saveAll();
     		//Launching 'blank' tab for testing movie
     		chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});		
     	}
-- 
cgit v1.2.3


From 31d73bccdda6145c6bbb5c25f6db3e139fcb9e6c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 23 Feb 2012 01:49:33 -0800
Subject: Enabling outline on open documents and parsing doom on open to create
 models.

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

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 9a7755e6..b13dcc1e 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -23,6 +23,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 
     _document: { value: null, enumerable: false },
     _documentRoot: { value: null, enumerable: false },
+    _liveNodeList: { value: null, enumarable: false },
     _stageBG: { value: null, enumerable: false },
     _window: { value: null, enumerable: false },
     _styles: { value: null, enumerable: false },
@@ -396,7 +397,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             // Adding a handler for the main user document reel to finish loading.
             this._document.body.addEventListener("userTemplateDidLoad",  this.userTemplateDidLoad.bind(this), false);
 
-            
+            // Live node list of the current loaded document
+            this._liveNodeList = this.documentRoot.getElementsByTagName('*');
+
+            // TODO Move this to the appropriate location
+            var len = this._liveNodeList.length;
+
+            for(var i = 0; i < len; i++) {
+                NJUtils.makeElementModel2(this._liveNodeList[i]);
+            }
+
             /* this.iframe.contentWindow.document.addEventListener('DOMSubtreeModified', function (e) { */ //TODO: Remove events upon loading once
 
             //TODO: When written, the best way to initialize the document is to listen for the DOM tree being modified
-- 
cgit v1.2.3


From aaa8d05cc3cfd94322d356e265b94b0abb9f6305 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 23 Feb 2012 01:52:34 -0800
Subject: renaming makeElementModel2 to makeModelFromElement

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

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index b13dcc1e..ad0a7eb2 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -404,7 +404,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             var len = this._liveNodeList.length;
 
             for(var i = 0; i < len; i++) {
-                NJUtils.makeElementModel2(this._liveNodeList[i]);
+                NJUtils.makeModelFromElement(this._liveNodeList[i]);
             }
 
             /* this.iframe.contentWindow.document.addEventListener('DOMSubtreeModified', function (e) { */ //TODO: Remove events upon loading once
-- 
cgit v1.2.3