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/mediators/io-mediator.js | 50 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 56869839..de50f387 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -202,10 +202,54 @@ exports.IoMediator = Montage.create(Component, {
     		//
     		template.document.content.document.body.innerHTML = template.body;
     		template.document.content.document.head.innerHTML = template.head;
-    		//TODO: Remove temp fix for styles
-    		if (template.style) {
-    			template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules);
+    		//
+    		var styletags = template.document.content.document.getElementsByTagName('style'),
+    			linktags = template.document.content.document.getElementsByTagName('link');
+    		//
+    		for (var j in styletags) {
+    			if (styletags[j].getAttribute) {
+    				if(styletags[j].getAttribute('ninjauri') !== null) {
+    					try {
+    						template.document.content.document.head.removeChild(styletags[j]);
+    					} catch (e) {
+    						try {
+    							template.document.content.document.body.removeChild(styletags[j]);
+    						} catch (e) {
+    							//
+    						}
+    					}
+    					
+    				}
+    			}
+    		}
+    		//
+    		for (var l in linktags) {
+    			if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {
+    				linktags[l].removeAttribute('disabled');
+    			}
+    		}
+    		//
+    		if (template.styles) {
+    			//
+    			var styleCounter = 0,
+    				docStyles = template.document.content.document.getElementsByTagName('style');
+    			for(var i in template.styles) {
+    				if (template.styles[i].ownerNode) {
+    					if (template.styles[i].ownerNode.getAttribute) {
+    						if (template.styles[i].ownerNode.getAttribute('ninjauri') === null) {
+    							//console.log(docStyles[styleCounter], template.styles[i].cssRules);
+    							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.styles[i].cssRules);
+    							styleCounter++;
+    						}
+    					}
+    				}
+    			}
+    			
+    			//template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules);
+    		} else if (template.css) {
+    			console.log('Save all css and style');
     		}
+    		//
     		return template.document.content.document.documentElement.outerHTML;
     	}
     },
-- 
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/mediators/io-mediator.js | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index de50f387..7606b168 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -199,55 +199,76 @@ exports.IoMediator = Montage.create(Component, {
     parseNinjaTemplateToHtml: {
     	enumerable: false,
     	value: function (template) {
-    		//
+    		//TODO: Clean up variables
+    		//Injecting head and body into old document
     		template.document.content.document.body.innerHTML = template.body;
     		template.document.content.document.head.innerHTML = template.head;
-    		//
+    		//Getting all CSS (style or link) tags
     		var styletags = template.document.content.document.getElementsByTagName('style'),
     			linktags = template.document.content.document.getElementsByTagName('link');
-    		//
+    		//Looping through link tags and removing file recreated elements
     		for (var j in styletags) {
     			if (styletags[j].getAttribute) {
     				if(styletags[j].getAttribute('ninjauri') !== null) {
     					try {
+    						//Checking head first
     						template.document.content.document.head.removeChild(styletags[j]);
     					} catch (e) {
     						try {
+    							//Checking body if not in head
     							template.document.content.document.body.removeChild(styletags[j]);
     						} catch (e) {
-    							//
+    							//Error, not found!
     						}
     					}
     					
     				}
     			}
     		}
-    		//
+    		//TODO: Add logic to only enble tags we disabled
     		for (var l in linktags) {
     			if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {
     				linktags[l].removeAttribute('disabled');
     			}
     		}
-    		//
+    		//Checking for type of save: styles = <style> only | css = <style> and <link> (all CSS)
     		if (template.styles) {
-    			//
+    			//Getting all style tags
     			var styleCounter = 0,
     				docStyles = template.document.content.document.getElementsByTagName('style');
+    			//Looping through all style tags
     			for(var i in template.styles) {
     				if (template.styles[i].ownerNode) {
     					if (template.styles[i].ownerNode.getAttribute) {
+    						//Checking for node not to be loaded from file
     						if (template.styles[i].ownerNode.getAttribute('ninjauri') === null) {
-    							//console.log(docStyles[styleCounter], template.styles[i].cssRules);
+    							//Inseting data from rules array into tag as string
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.styles[i].cssRules);
+    							//Syncing <style> tags count since it might be mixed with <link>
     							styleCounter++;
     						}
     					}
     				}
     			}
-    			
-    			//template.document.content.document.head.getElementsByTagName('style')[0].innerHTML = this.getCssFromRules(template.style.cssRules);
     		} else if (template.css) {
-    			console.log('Save all css and style');
+    			//Getting all style and link tags
+    			var styleCounter = 0,
+    				docStyles = template.document.content.document.getElementsByTagName('style'),
+    				docLinks = template.document.content.document.getElementsByTagName('link');
+    			for(var i in template.css) {
+    				if (template.css[i].ownerNode) {
+    					if (template.css[i].ownerNode.getAttribute) {
+    						if (template.css[i].ownerNode.getAttribute('ninjauri') === null) {
+    							//Inseting data from rules array into <style> as string
+    							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
+    							styleCounter++;
+    						} else {
+    							//Saving data from rules array converted to string into <link> file
+    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('ninjauri'), contents: this.getCssFromRules(template.css[i].cssRules)});
+    						}
+    					}
+    				}
+    			}
     		}
     		//
     		return template.document.content.document.documentElement.outerHTML;
-- 
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/mediators/io-mediator.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 7606b168..4dc29c3c 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -280,7 +280,7 @@ exports.IoMediator = Montage.create(Component, {
     	enumerable: false,
     	value: function (list) {
     		//Variable to store CSS definitions
-    		var i, str, css = '';
+    		var i, str, url, css = '';
     		//Looping through list
     		if (list && list.length > 0) {
     			//Adding each list item to string and also adding breaks
@@ -292,8 +292,10 @@ exports.IoMediator = Montage.create(Component, {
     				css += '\n'+str;
     			}
     		}
+    		//TODO: Add better logic for creating this string
+    		url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
     		//Returning the CSS string
-    		return css;
+    		return css.replace(url, '');
     	}
     }
     ////////////////////////////////////////////////////////////////////
-- 
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/mediators/element-mediator.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 51923f08..127f73e1 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -463,7 +463,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getColor: {
         value: function(el, isFill) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getColor"](el, isFill);
         }
@@ -624,7 +624,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getColor2: {
         value: function(el, prop, mutator) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
 
             return this.getColor(el, (prop === "background"));
@@ -636,7 +636,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     get3DProperty: {
         value: function(el, prop) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["get3DProperty"](el, prop);
         }
@@ -645,7 +645,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     get3DProperties: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
 //            var mat = this.getMatrix(el);
 //            var dist = this.getPerspectiveDist(el);
@@ -658,7 +658,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getMatrix: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getMatrix"](el);
         }
@@ -667,7 +667,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     getPerspectiveDist: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel2(el);
+                NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getPerspectiveDist"](el);
         }
-- 
cgit v1.2.3


From 14a8f4c4e373db213b3d42d30edaea8354ae57e3 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 23 Feb 2012 10:35:12 -0800
Subject: Adding url clean up to HTML on save

---
 js/mediators/io-mediator.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 4dc29c3c..c4f3b361 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -205,7 +205,8 @@ exports.IoMediator = Montage.create(Component, {
     		template.document.content.document.head.innerHTML = template.head;
     		//Getting all CSS (style or link) tags
     		var styletags = template.document.content.document.getElementsByTagName('style'),
-    			linktags = template.document.content.document.getElementsByTagName('link');
+    			linktags = template.document.content.document.getElementsByTagName('link'),
+    			url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
     		//Looping through link tags and removing file recreated elements
     		for (var j in styletags) {
     			if (styletags[j].getAttribute) {
@@ -271,7 +272,7 @@ exports.IoMediator = Montage.create(Component, {
     			}
     		}
     		//
-    		return template.document.content.document.documentElement.outerHTML;
+    		return template.document.content.document.documentElement.outerHTML.replace(url, '');
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 9a87513929290b6f84a090b4b4cca8fab0f2ab81 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 24 Feb 2012 14:51:29 -0800
Subject: Added import/export of RDGE data

This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated.
---
 js/mediators/io-mediator.js | 47 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c4f3b361..e5eb1fc6 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -195,11 +195,10 @@ exports.IoMediator = Montage.create(Component, {
     	}
     },
     ////////////////////////////////////////////////////////////////////
-    //TODO: Expand to allow more templates
+    //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
     	enumerable: false,
     	value: function (template) {
-    		//TODO: Clean up variables
     		//Injecting head and body into old document
     		template.document.content.document.body.innerHTML = template.body;
     		template.document.content.document.head.innerHTML = template.head;
@@ -210,7 +209,7 @@ exports.IoMediator = Montage.create(Component, {
     		//Looping through link tags and removing file recreated elements
     		for (var j in styletags) {
     			if (styletags[j].getAttribute) {
-    				if(styletags[j].getAttribute('ninjauri') !== null) {
+    				if(styletags[j].getAttribute('ninjauri') !== null) {//TODO: Use querySelectorAll
     					try {
     						//Checking head first
     						template.document.content.document.head.removeChild(styletags[j]);
@@ -228,7 +227,7 @@ exports.IoMediator = Montage.create(Component, {
     		}
     		//TODO: Add logic to only enble tags we disabled
     		for (var l in linktags) {
-    			if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {
+    			if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {//TODO: Use querySelectorAll
     				linktags[l].removeAttribute('disabled');
     			}
     		}
@@ -259,7 +258,7 @@ exports.IoMediator = Montage.create(Component, {
     			for(var i in template.css) {
     				if (template.css[i].ownerNode) {
     					if (template.css[i].ownerNode.getAttribute) {
-    						if (template.css[i].ownerNode.getAttribute('ninjauri') === null) {
+    						if (template.css[i].ownerNode.getAttribute('ninjauri') === null) {//TODO: Use querySelectorAll
     							//Inseting data from rules array into <style> as string
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
     							styleCounter++;
@@ -271,6 +270,44 @@ exports.IoMediator = Montage.create(Component, {
     				}
     			}
     		}
+    		//Checking for webGL elements in document
+    		if (template.webgl.length) {
+    			//
+    			var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script');
+    			//
+    			for (var i in scripts) {
+    				if (scripts[i].getAttribute) {
+    					if (scripts[i].getAttribute('data-ninja-webgl') !== null) {//TODO: Use querySelectorAll
+    						matchingtags.push(scripts[i]);
+    					}
+    				}
+    			}
+    			//
+    			if (matchingtags.length) {
+    				if (matchingtags.length === 1) {
+    					webgltag = matchingtags[0];
+    				} else {
+    					//TODO: Add logic to handle multiple tags, perhaps combine to one
+    					webgltag = matchingtags[matchingtags.length-1]; //Saving all data to last one...
+    				}
+    			}
+    			//
+    			if (!webgltag) {
+    				webgltag = template.document.content.document.createElement('script');
+    				webgltag.setAttribute('data-ninja-webgl', 'true');
+    				template.document.content.document.head.appendChild(webgltag);
+    			}
+    			//
+    			json = '\n\t\t({\n\t\t\t"version": "X.X.X.X",\n\t\t\t"data": [';
+    			//
+    			for (var j=0; template.webgl[j]; j++) {
+    				json += '\n\t\t\t\t"'+escape(template.webgl[j])+'"';
+    			}
+    			//
+    			json += ']\n\t\t})\n\t';
+    			//
+    			webgltag.innerHTML = json;
+    		}
     		//
     		return template.document.content.document.documentElement.outerHTML.replace(url, '');
     	}
-- 
cgit v1.2.3


From b056b4bef5982466d80d72e5cbb31e63087990e1 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 24 Feb 2012 15:30:55 -0800
Subject: - added closeDocument event for timeline - minor bug fixes

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/mediators/keyboard-mediator.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'js/mediators')

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index a4bf9baa..f05d3382 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -207,7 +207,13 @@ exports.KeyboardMediator = Montage.create(Component, {
 
             // Check if cmd+s/ctrl+s for Save (Windows/Mac)
             if ((evt.keyCode == Keyboard.S) && (evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {
-                NJevent("executeSave");
+                try{
+                    NJevent("executeSave");
+                }
+                catch(e){
+                    console.warn("Unable to save");
+                    console.log(e.stack);
+                }
                 evt.preventDefault();
                 return;
             }
-- 
cgit v1.2.3


From a8da19dde22332d352213984fcdcd10e36087df1 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 24 Feb 2012 22:43:30 -0800
Subject: Adding prettify code to I/O

This is a possible set of methods to be used to prettify code. Added temporarily until approved.
---
 js/mediators/io-mediator.js | 51 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 10 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index e5eb1fc6..16bb98ea 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -298,18 +298,18 @@ exports.IoMediator = Montage.create(Component, {
     				template.document.content.document.head.appendChild(webgltag);
     			}
     			//
-    			json = '\n\t\t({\n\t\t\t"version": "X.X.X.X",\n\t\t\t"data": [';
+    			json = '\n({\n\t"version": "X.X.X.X",\n\t"data": [';
     			//
     			for (var j=0; template.webgl[j]; j++) {
-    				json += '\n\t\t\t\t"'+escape(template.webgl[j])+'"';
+    				json += '\n\t"'+escape(template.webgl[j])+'"';
     			}
     			//
-    			json += ']\n\t\t})\n\t';
+    			json += ']\n})\n';
     			//
     			webgltag.innerHTML = json;
     		}
     		//
-    		return template.document.content.document.documentElement.outerHTML.replace(url, '');
+    		return this.getPretyHtml(template.document.content.document.documentElement.outerHTML.replace(url, ''));
     	}
     },
     ////////////////////////////////////////////////////////////////////
@@ -323,18 +323,49 @@ exports.IoMediator = Montage.create(Component, {
     		if (list && list.length > 0) {
     			//Adding each list item to string and also adding breaks
     			for (i = 0; list[i]; i++) {
-    				str = list[i].cssText+' ';
-    				str = str.replace( new RegExp( "{", "gi" ), "{\n\t" );
-    				str = str.replace( new RegExp( "}", "gi" ), "}\n" );
-    				str = str.replace( new RegExp( ";", "gi" ), ";\n\t" );
-    				css += '\n'+str;
+    				css += list[i].cssText;
     			}
     		}
     		//TODO: Add better logic for creating this string
     		url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
     		//Returning the CSS string
-    		return css.replace(url, '');
+    		return this.getPretyCss(css.replace(url, ''));
     	}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Using prettification code from http://jsbeautifier.org
+    /*
+    	Copyright (c) 2009 - 2011, Einar Lielmanis
+
+		Permission is hereby granted, free of charge, to any person
+		obtaining a copy of this software and associated documentation
+		files (the "Software"), to deal in the Software without
+		restriction, including without limitation the rights to use,
+		copy, modify, merge, publish, distribute, sublicense, and/or sell
+		copies of the Software, and to permit persons to whom the
+		Software is furnished to do so, subject to the following
+		conditions:
+
+		The above copyright notice and this permission notice shall be
+		included in all copies or substantial portions of the Software.
+
+		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+		EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+		OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+		NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+		HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+		WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+		FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+		OTHER DEALINGS IN THE SOFTWARE.
+    */
+    getPretyHtml: {
+    	enumerable: false,
+    	value: function style_html(a,b){function h(){this.pos=0;this.token="";this.current_mode="CONTENT";this.tags={parent:"parent1",parentcount:1,parent1:""};this.tag_type="";this.token_text=this.last_token=this.last_text=this.token_type="";this.Utils={whitespace:"\n\r\t ".split(""),single_token:"br,input,link,meta,!doctype,basefont,base,area,hr,wbr,param,img,isindex,?xml,embed".split(","),extra_liners:"head,body,/html".split(","),in_array:function(a,b){for(var c=0;c<b.length;c++){if(a===b[c]){return true}}return false}};this.get_content=function(){var a="";var b=[];var c=false;while(this.input.charAt(this.pos)!=="<"){if(this.pos>=this.input.length){return b.length?b.join(""):["","TK_EOF"]}a=this.input.charAt(this.pos);this.pos++;this.line_char_count++;if(this.Utils.in_array(a,this.Utils.whitespace)){if(b.length){c=true}this.line_char_count--;continue}else if(c){if(this.line_char_count>=this.max_char){b.push("\n");for(var d=0;d<this.indent_level;d++){b.push(this.indent_string)}this.line_char_count=0}else{b.push(" ");this.line_char_count++}c=false}b.push(a)}return b.length?b.join(""):""};this.get_contents_to=function(a){if(this.pos==this.input.length){return["","TK_EOF"]}var b="";var c="";var d=new RegExp("</"+a+"\\s*>","igm");d.lastIndex=this.pos;var e=d.exec(this.input);var f=e?e.index:this.input.length;if(this.pos<f){c=this.input.substring(this.pos,f);this.pos=f}return c};this.record_tag=function(a){if(this.tags[a+"count"]){this.tags[a+"count"]++;this.tags[a+this.tags[a+"count"]]=this.indent_level}else{this.tags[a+"count"]=1;this.tags[a+this.tags[a+"count"]]=this.indent_level}this.tags[a+this.tags[a+"count"]+"parent"]=this.tags.parent;this.tags.parent=a+this.tags[a+"count"]};this.retrieve_tag=function(a){if(this.tags[a+"count"]){var b=this.tags.parent;while(b){if(a+this.tags[a+"count"]===b){break}b=this.tags[b+"parent"]}if(b){this.indent_level=this.tags[a+this.tags[a+"count"]];this.tags.parent=this.tags[b+"parent"]}delete this.tags[a+this.tags[a+"count"]+"parent"];delete this.tags[a+this.tags[a+"count"]];if(this.tags[a+"count"]==1){delete this.tags[a+"count"]}else{this.tags[a+"count"]--}}};this.get_tag=function(){var a="";var b=[];var c=false;do{if(this.pos>=this.input.length){return b.length?b.join(""):["","TK_EOF"]}a=this.input.charAt(this.pos);this.pos++;this.line_char_count++;if(this.Utils.in_array(a,this.Utils.whitespace)){c=true;this.line_char_count--;continue}if(a==="'"||a==='"'){if(!b[1]||b[1]!=="!"){a+=this.get_unformatted(a);c=true}}if(a==="="){c=false}if(b.length&&b[b.length-1]!=="="&&a!==">"&&c){if(this.line_char_count>=this.max_char){this.print_newline(false,b);this.line_char_count=0}else{b.push(" ");this.line_char_count++}c=false}b.push(a)}while(a!==">");var d=b.join("");var e;if(d.indexOf(" ")!=-1){e=d.indexOf(" ")}else{e=d.indexOf(">")}var f=d.substring(1,e).toLowerCase();if(d.charAt(d.length-2)==="/"||this.Utils.in_array(f,this.Utils.single_token)){this.tag_type="SINGLE"}else if(f==="script"){this.record_tag(f);this.tag_type="SCRIPT"}else if(f==="style"){this.record_tag(f);this.tag_type="STYLE"}else if(this.Utils.in_array(f,unformatted)){var g=this.get_unformatted("</"+f+">",d);b.push(g);this.tag_type="SINGLE"}else if(f.charAt(0)==="!"){if(f.indexOf("[if")!=-1){if(d.indexOf("!IE")!=-1){var g=this.get_unformatted("-->",d);b.push(g)}this.tag_type="START"}else if(f.indexOf("[endif")!=-1){this.tag_type="END";this.unindent()}else if(f.indexOf("[cdata[")!=-1){var g=this.get_unformatted("]]>",d);b.push(g);this.tag_type="SINGLE"}else{var g=this.get_unformatted("-->",d);b.push(g);this.tag_type="SINGLE"}}else{if(f.charAt(0)==="/"){this.retrieve_tag(f.substring(1));this.tag_type="END"}else{this.record_tag(f);this.tag_type="START"}if(this.Utils.in_array(f,this.Utils.extra_liners)){this.print_newline(true,this.output)}}return b.join("")};this.get_unformatted=function(a,b){if(b&&b.indexOf(a)!=-1){return""}var c="";var d="";var e=true;do{if(this.pos>=this.input.length){return d}c=this.input.charAt(this.pos);this.pos++;if(this.Utils.in_array(c,this.Utils.whitespace)){if(!e){this.line_char_count--;continue}if(c==="\n"||c==="\r"){d+="\n";this.line_char_count=0;continue}}d+=c;this.line_char_count++;e=true}while(d.indexOf(a)==-1);return d};this.get_token=function(){var a;if(this.last_token==="TK_TAG_SCRIPT"||this.last_token==="TK_TAG_STYLE"){var b=this.last_token.substr(7);a=this.get_contents_to(b);if(typeof a!=="string"){return a}return[a,"TK_"+b]}if(this.current_mode==="CONTENT"){a=this.get_content();if(typeof a!=="string"){return a}else{return[a,"TK_CONTENT"]}}if(this.current_mode==="TAG"){a=this.get_tag();if(typeof a!=="string"){return a}else{var c="TK_TAG_"+this.tag_type;return[a,c]}}};this.get_full_indent=function(a){a=this.indent_level+a||0;if(a<1)return"";return Array(a+1).join(this.indent_string)};this.printer=function(a,b,c,d,e){this.input=a||"";this.output=[];this.indent_character=b;this.indent_string="";this.indent_size=c;this.brace_style=e;this.indent_level=0;this.max_char=d;this.line_char_count=0;for(var f=0;f<this.indent_size;f++){this.indent_string+=this.indent_character}this.print_newline=function(a,b){this.line_char_count=0;if(!b||!b.length){return}if(!a){while(this.Utils.in_array(b[b.length-1],this.Utils.whitespace)){b.pop()}}b.push("\n");for(var c=0;c<this.indent_level;c++){b.push(this.indent_string)}};this.print_token=function(a){this.output.push(a)};this.indent=function(){this.indent_level++};this.unindent=function(){if(this.indent_level>0){this.indent_level--}}};return this}var c,d,e,f,g;b=b||{};d=b.indent_size||4;e=b.indent_char||" ";g=b.brace_style||"collapse";f=b.max_char||"70";unformatted=b.unformatted||["a"];c=new h;c.printer(a,e,d,f,g);while(true){var i=c.get_token();c.token_text=i[0];c.token_type=i[1];if(c.token_type==="TK_EOF"){break}switch(c.token_type){case"TK_TAG_START":c.print_newline(false,c.output);c.print_token(c.token_text);c.indent();c.current_mode="CONTENT";break;case"TK_TAG_STYLE":case"TK_TAG_SCRIPT":c.print_newline(false,c.output);c.print_token(c.token_text);c.current_mode="CONTENT";break;case"TK_TAG_END":if(c.last_token==="TK_CONTENT"&&c.last_text===""){var j=c.token_text.match(/\w+/)[0];var k=c.output[c.output.length-1].match(/<\s*(\w+)/);if(k===null||k[1]!==j)c.print_newline(true,c.output)}c.print_token(c.token_text);c.current_mode="CONTENT";break;case"TK_TAG_SINGLE":c.print_newline(false,c.output);c.print_token(c.token_text);c.current_mode="CONTENT";break;case"TK_CONTENT":if(c.token_text!==""){c.print_token(c.token_text)}c.current_mode="TAG";break;case"TK_STYLE":case"TK_SCRIPT":if(c.token_text!==""){c.output.push("\n");var l=c.token_text;if(c.token_type=="TK_SCRIPT"){var m=typeof js_beautify=="function"&&js_beautify}else if(c.token_type=="TK_STYLE"){var m=typeof css_beautify=="function"&&css_beautify}if(b.indent_scripts=="keep"){var n=0}else if(b.indent_scripts=="separate"){var n=-c.indent_level}else{var n=1}var o=c.get_full_indent(n);if(m){l=m(l.replace(/^\s*/,o),b)}else{var p=l.match(/^\s*/)[0];var q=p.match(/[^\n\r]*$/)[0].split(c.indent_string).length-1;var r=c.get_full_indent(n-q);l=l.replace(/^\s*/,o).replace(/\r\n|\r|\n/g,"\n"+r).replace(/\s*$/,"")}if(l){c.print_token(l);c.print_newline(true,c.output)}}c.current_mode="TAG";break}c.last_token=c.token_type;c.last_text=c.token_text}return c.output.join("")}
+    },
+    //
+    getPretyCss: {
+    	enumerable: false,
+    	value: function css_beautify(a,b){function t(){r--;p=p.slice(0,-c)}function s(){r++;p+=q}function o(a,b){return u.slice(-a.length+(b||0),b).join("").toLowerCase()==a}function n(){var b=g;i();while(i()){if(h=="*"&&j()=="/"){g++;break}}return a.substring(b,g+1)}function m(){var a=g;do{}while(e.test(i()));return g!=a+1}function l(){var a=g;while(e.test(j()))g++;return g!=a}function k(b){var c=g;while(i()){if(h=="\\"){i();i()}else if(h==b){break}else if(h=="\n"){break}}return a.substring(c,g+1)}function j(){return a.charAt(g+1)}function i(){return h=a.charAt(++g)}b=b||{};var c=b.indent_size||4;var d=b.indent_char||" ";if(typeof c=="string")c=parseInt(c);var e=/^\s+$/;var f=/[\w$\-_]/;var g=-1,h;var p=a.match(/^[\r\n]*[\t ]*/)[0];var q=Array(c+1).join(d);var r=0;print={};print["{"]=function(a){print.singleSpace();u.push(a);print.newLine()};print["}"]=function(a){print.newLine();u.push(a);print.newLine()};print.newLine=function(a){if(!a)while(e.test(u[u.length-1]))u.pop();if(u.length)u.push("\n");if(p)u.push(p)};print.singleSpace=function(){if(u.length&&!e.test(u[u.length-1]))u.push(" ")};var u=[];if(p)u.push(p);while(true){var v=m();if(!h)break;if(h=="{"){s();print["{"](h)}else if(h=="}"){t();print["}"](h)}else if(h=='"'||h=="'"){u.push(k(h))}else if(h==";"){u.push(h,"\n",p)}else if(h=="/"&&j()=="*"){print.newLine();u.push(n(),"\n",p)}else if(h=="("){u.push(h);l();if(o("url",-1)&&i()){if(h!=")"&&h!='"'&&h!="'")u.push(k(")"));else g--}}else if(h==")"){u.push(h)}else if(h==","){l();u.push(h);print.singleSpace()}else if(h=="]"){u.push(h)}else if(h=="["||h=="="){l();u.push(h)}else{if(v)print.singleSpace();u.push(h)}}var w=u.join("").replace(/[\n ]+$/,"");return w}
     }
     ////////////////////////////////////////////////////////////////////
 });
-- 
cgit v1.2.3


From c6b44313ff8bcc17835ca77793bf425c451a4e75 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 25 Feb 2012 16:18:27 -0800
Subject: Cleaning up ninja-data attributes

Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions.
---
 js/mediators/io-mediator.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 16bb98ea..315fb6a7 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -209,7 +209,7 @@ exports.IoMediator = Montage.create(Component, {
     		//Looping through link tags and removing file recreated elements
     		for (var j in styletags) {
     			if (styletags[j].getAttribute) {
-    				if(styletags[j].getAttribute('ninjauri') !== null) {//TODO: Use querySelectorAll
+    				if(styletags[j].getAttribute('data-ninja-uri') !== null) {//TODO: Use querySelectorAll
     					try {
     						//Checking head first
     						template.document.content.document.head.removeChild(styletags[j]);
@@ -241,7 +241,7 @@ exports.IoMediator = Montage.create(Component, {
     				if (template.styles[i].ownerNode) {
     					if (template.styles[i].ownerNode.getAttribute) {
     						//Checking for node not to be loaded from file
-    						if (template.styles[i].ownerNode.getAttribute('ninjauri') === null) {
+    						if (template.styles[i].ownerNode.getAttribute('data-ninja-uri') === null) {
     							//Inseting data from rules array into tag as string
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.styles[i].cssRules);
     							//Syncing <style> tags count since it might be mixed with <link>
@@ -258,13 +258,13 @@ exports.IoMediator = Montage.create(Component, {
     			for(var i in template.css) {
     				if (template.css[i].ownerNode) {
     					if (template.css[i].ownerNode.getAttribute) {
-    						if (template.css[i].ownerNode.getAttribute('ninjauri') === null) {//TODO: Use querySelectorAll
+    						if (template.css[i].ownerNode.getAttribute('data-ninja-uri') === null) {//TODO: Use querySelectorAll
     							//Inseting data from rules array into <style> as string
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
     							styleCounter++;
     						} else {
     							//Saving data from rules array converted to string into <link> file
-    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('ninjauri'), contents: this.getCssFromRules(template.css[i].cssRules)});
+    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: this.getCssFromRules(template.css[i].cssRules)});
     						}
     					}
     				}
-- 
cgit v1.2.3


From 3638492098a21aef63842366fbfc035fc6414fb0 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 26 Feb 2012 11:32:10 -0800
Subject: Fixed issue with losing track of Ninja template css

Also cleaned up URL getter for app in cleaning string code.
---
 js/mediators/io-mediator.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 315fb6a7..c33ccced 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -205,11 +205,11 @@ exports.IoMediator = Montage.create(Component, {
     		//Getting all CSS (style or link) tags
     		var styletags = template.document.content.document.getElementsByTagName('style'),
     			linktags = template.document.content.document.getElementsByTagName('link'),
-    			url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
+    			url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi');
     		//Looping through link tags and removing file recreated elements
     		for (var j in styletags) {
     			if (styletags[j].getAttribute) {
-    				if(styletags[j].getAttribute('data-ninja-uri') !== null) {//TODO: Use querySelectorAll
+    				if(styletags[j].getAttribute('data-ninja-uri') !== null && !styletags[j].getAttribute('data-ninja-template')) {//TODO: Use querySelectorAll
     					try {
     						//Checking head first
     						template.document.content.document.head.removeChild(styletags[j]);
@@ -241,7 +241,7 @@ exports.IoMediator = Montage.create(Component, {
     				if (template.styles[i].ownerNode) {
     					if (template.styles[i].ownerNode.getAttribute) {
     						//Checking for node not to be loaded from file
-    						if (template.styles[i].ownerNode.getAttribute('data-ninja-uri') === null) {
+    						if (template.styles[i].ownerNode.getAttribute('data-ninja-uri') === null && !template.styles[i].ownerNode.getAttribute('data-ninja-template')) {
     							//Inseting data from rules array into tag as string
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.styles[i].cssRules);
     							//Syncing <style> tags count since it might be mixed with <link>
@@ -258,7 +258,7 @@ exports.IoMediator = Montage.create(Component, {
     			for(var i in template.css) {
     				if (template.css[i].ownerNode) {
     					if (template.css[i].ownerNode.getAttribute) {
-    						if (template.css[i].ownerNode.getAttribute('data-ninja-uri') === null) {//TODO: Use querySelectorAll
+    						if (template.css[i].ownerNode.getAttribute('data-ninja-uri') === null && !template.css[i].ownerNode.getAttribute('data-ninja-template')) {//TODO: Use querySelectorAll
     							//Inseting data from rules array into <style> as string
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
     							styleCounter++;
@@ -327,7 +327,7 @@ exports.IoMediator = Montage.create(Component, {
     			}
     		}
     		//TODO: Add better logic for creating this string
-    		url = new RegExp(window.location.protocol+'//'+window.location.host+'/js/document/templates/montage-html/', 'gi');
+    		url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi');
     		//Returning the CSS string
     		return this.getPretyCss(css.replace(url, ''));
     	}
-- 
cgit v1.2.3


From e67540d23a1bd5d2480ce47634c0cbe523dd5e4a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 26 Feb 2012 11:50:42 -0800
Subject: Cleaning up formatting for webGL data

---
 js/mediators/io-mediator.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c33ccced..30180155 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -297,15 +297,19 @@ exports.IoMediator = Montage.create(Component, {
     				webgltag.setAttribute('data-ninja-webgl', 'true');
     				template.document.content.document.head.appendChild(webgltag);
     			}
-    			//
+    			//TODO: Add version and other data for RDGE
     			json = '\n({\n\t"version": "X.X.X.X",\n\t"data": [';
-    			//
+    			//Looping through data to create escaped array
     			for (var j=0; template.webgl[j]; j++) {
-    				json += '\n\t"'+escape(template.webgl[j])+'"';
+    				if (j === 0) {
+    					json += '\n\t\t\t"'+escape(template.webgl[j])+'"';
+    				} else {
+    					json += ',\n\t\t\t"'+escape(template.webgl[j])+'"';
+    				}
     			}
-    			//
-    			json += ']\n})\n';
-    			//
+    			//Closing array (make-shift JSON string to validate data in <script> tag)
+    			json += '\n\t\t]\n})\n';
+    			//Setting string in tag
     			webgltag.innerHTML = json;
     		}
     		//
-- 
cgit v1.2.3