From ff77f861fba349dd36d6c15c9a545459c3a76583 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 2 Mar 2012 10:34:01 -0800
Subject: Fixing IO RegEx

Fixed parsing files to have correct URLs with RegEx, inner content of CSS files still needs to be fixed.
---
 js/mediators/io-mediator.js | 92 ++++++++++++++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 30 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index e763c67c..cc97db5e 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -41,9 +41,12 @@ exports.IoMediator = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-    appTemplatesUrl: {
+    getAppTemplatesUrlRegEx: {
     	enumerable: false,
-    	value: new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi')
+    	value: function () {
+    		var regex = new RegExp(chrome.extension.getURL('js/document/templates/montage-html').replace(/\//gi, '\\\/'), 'gi');
+    		return regex;
+    	}
     },
 	////////////////////////////////////////////////////////////////////
     //
@@ -211,36 +214,59 @@ exports.IoMediator = Montage.create(Component, {
     	enumerable: false,
     	value: function (template) {
     		//Injecting head and body into old document
-    		template.document.content.document.body.innerHTML = template.body;
     		template.document.content.document.head.innerHTML = template.head;
+    		template.document.content.document.body.innerHTML = template.body;
     		//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('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]);
-    					} catch (e) {
-    						try {
-    							//Checking body if not in head
-    							template.document.content.document.body.removeChild(styletags[j]);
-    						} catch (e) {
-    							//Error, not found!
-    						}
+    			linktags = template.document.content.document.getElementsByTagName('link'),
+    			toremovetags = [];
+    		//Getting styles tags to be removed from document
+    		if (styletags.length) {
+    			for (var j=0; j<styletags.length; j++) {
+    				if (styletags[j].getAttribute) {
+    					if(styletags[j].getAttribute('data-ninja-uri') !== null && !styletags[j].getAttribute('data-ninja-template')) {
+    						toremovetags.push(styletags[j]);
     					}
-    					
     				}
     			}
     		}
-    		//TODO: Add logic to only enble tags we disabled
+    		//Removing styles tags from document
+    		for (var h=0; toremovetags[h]; h++) {
+    			try {
+    				//Checking head first
+    				template.document.content.document.head.removeChild(toremovetags[h]);
+    			} catch (e) {
+    				try {
+    					//Checking body if not in head
+    					template.document.content.document.body.removeChild(toremovetags[h]);
+    				} catch (e) {
+    					//Error, not found!
+    				}
+    			}
+    		}
+    		//Removing disabled tags from tags that were not originally disabled by user (Ninja enables all)
     		for (var l in linktags) {
     			if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {//TODO: Use querySelectorAll
-    				linktags[l].removeAttribute('disabled');
+    				for (var p=0; toremovetags[p]; p++) {
+    					if (toremovetags[p].getAttribute('data-ninja-file-url') === ('/'+linktags[l].getAttribute('href'))) {
+    						if (!toremovetags[p].getAttribute('data-ninja-disabled')) {
+    							linktags[l].removeAttribute('disabled');
+    						}
+    					}
+    				}
     			}
     		}
+    		
+    		
+    		/////////////////////////////////////////////////////////////////////////////////////////
+    		/////////////////////////////////////////////////////////////////////////////////////////
+    		
+    		//TODO: Add logic for parse CSS string correct URLs since referencing is lost
+    		
+    		/////////////////////////////////////////////////////////////////////////////////////////
+    		/////////////////////////////////////////////////////////////////////////////////////////
+    		
+    		
     		//Checking for type of save: styles = <style> only | css = <style> and <link> (all CSS)
     		if (template.styles) {
     			//Getting all style tags
@@ -252,10 +278,12 @@ exports.IoMediator = Montage.create(Component, {
     					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 && !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>
-    							styleCounter++;
+    							if(docStyles[styleCounter]) {
+    								//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++;
+    							}
     						}
     					}
     				}
@@ -281,8 +309,10 @@ exports.IoMediator = Montage.create(Component, {
     					if (template.css[i].ownerNode.getAttribute) {
     						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++;
+    							if (docStyles[styleCounter]) {
+    								docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
+    								styleCounter++;
+    							}
     						} else {
     							//Checking for attributes to be added to tag upon saving
     							for (var k in docLinks) {
@@ -300,8 +330,10 @@ exports.IoMediator = Montage.create(Component, {
     									}
     								}
     							}
+    							var adjCss = this.getCssFromRules(template.css[i].cssRules), cssUrl = template.css[i].ownerNode.getAttribute('data-ninja-uri');
+    							//console.log((template.css[i].ownerNode.getAttribute('data-ninja-uri')));//cssUrl.split(cssUrl.split('/')[cssUrl.split('/').length-1])[0]
     							//Saving data from rules array converted to string into <link> file
-    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: this.getCssFromRules(template.css[i].cssRules)});
+    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: adjCss});
     						}
     					}
     				}
@@ -350,7 +382,7 @@ exports.IoMediator = Montage.create(Component, {
     			webgltag.innerHTML = json;
     		}
     		//
-    		return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(this.appTemplatesUrl, ''));
+    		return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
     	}
     },
     ////////////////////////////////////////////////////////////////////
@@ -368,7 +400,7 @@ exports.IoMediator = Montage.create(Component, {
     			}
     		}
     		//Returning the CSS string
-    		return this.getPrettyCss(css.replace(this.appTemplatesUrl, ''));
+    		return this.getPrettyCss(css.replace(this.getAppTemplatesUrlRegEx(), ''));
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From e24631ecac0772fc51756fe4aff9638de3b95faf Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 2 Mar 2012 14:11:08 -0800
Subject: Fixing CSS URL issues

Only partially, supporting unquoted files under same root.
---
 js/mediators/io-mediator.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index cc97db5e..64210a02 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -313,7 +313,7 @@ exports.IoMediator = Montage.create(Component, {
     								docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
     								styleCounter++;
     							}
-    						} else {
+    						} else if (!template.css[i].ownerNode.getAttribute('data-ninja-template')){
     							//Checking for attributes to be added to tag upon saving
     							for (var k in docLinks) {
     								if (docLinks[k].getAttribute) {
@@ -330,8 +330,27 @@ exports.IoMediator = Montage.create(Component, {
     									}
     								}
     							}
-    							var adjCss = this.getCssFromRules(template.css[i].cssRules), cssUrl = template.css[i].ownerNode.getAttribute('data-ninja-uri');
-    							//console.log((template.css[i].ownerNode.getAttribute('data-ninja-uri')));//cssUrl.split(cssUrl.split('/')[cssUrl.split('/').length-1])[0]
+    							var local, regex, fileCouldDirUrl, adjCss = this.getCssFromRules(template.css[i].cssRules), cssUrl = template.css[i].ownerNode.getAttribute('data-ninja-file-url');
+    							//TODO: Assure logic for local directory
+    							local = cssUrl.split(cssUrl.split('/')[cssUrl.split('/').length-2])[0] || cssUrl.split(cssUrl.split('/')[cssUrl.split('/').length-1])[0] || cssUrl.split(cssUrl.split('/')[0])[0];
+    							//
+    							fileCouldDirUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+local).replace(/\/\//gi, '/'));
+    							//
+    							regex = new RegExp(fileCouldDirUrl.replace(/\//gi, '\\\/'), 'gi');
+    							//
+    							if (local.split('/').length > 1) {
+    								adjCss = adjCss.replace(regex, '../');
+    							} else {
+    								adjCss = adjCss.replace(regex, '');
+    							}
+    							
+    							
+    							//console.log(adjCss);
+    							//console.log(fileCouldDirUrl);
+    							//return;
+    							
+    							
+    							
     							//Saving data from rules array converted to string into <link> file
     							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: adjCss});
     						}
-- 
cgit v1.2.3


From 5c9795958b08c233eb2c4afab8054d55c3a33d98 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 2 Mar 2012 14:52:18 -0800
Subject: Minor logic fixes for URL resolution in CSS

---
 js/mediators/io-mediator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 64210a02..0a851a4d 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -338,7 +338,7 @@ exports.IoMediator = Montage.create(Component, {
     							//
     							regex = new RegExp(fileCouldDirUrl.replace(/\//gi, '\\\/'), 'gi');
     							//
-    							if (local.split('/').length > 1) {
+    							if (local.split('/').length > 2) {
     								adjCss = adjCss.replace(regex, '../');
     							} else {
     								adjCss = adjCss.replace(regex, '');
-- 
cgit v1.2.3


From b2de52888a7c976cc9ae40518e3653cec0aac296 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 4 Mar 2012 11:15:27 -0800
Subject: Improved CSS URL cleaned

Added logic to accommodate any URLs in a CSS file inside the opened document root. Need to add logic for handling linked references above the root. Also need to reformat into a reusable method as it might be needed besides CSS.
---
 js/mediators/io-mediator.js | 66 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 15 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 0a851a4d..5917edba 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -330,29 +330,65 @@ exports.IoMediator = Montage.create(Component, {
     									}
     								}
     							}
-    							var local, regex, fileCouldDirUrl, adjCss = this.getCssFromRules(template.css[i].cssRules), cssUrl = template.css[i].ownerNode.getAttribute('data-ninja-file-url');
-    							//TODO: Assure logic for local directory
-    							local = cssUrl.split(cssUrl.split('/')[cssUrl.split('/').length-2])[0] || cssUrl.split(cssUrl.split('/')[cssUrl.split('/').length-1])[0] || cssUrl.split(cssUrl.split('/')[0])[0];
-    							//
-    							fileCouldDirUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+local).replace(/\/\//gi, '/'));
-    							//
-    							regex = new RegExp(fileCouldDirUrl.replace(/\//gi, '\\\/'), 'gi');
-    							//
-    							if (local.split('/').length > 2) {
-    								adjCss = adjCss.replace(regex, '../');
-    							} else {
-    								adjCss = adjCss.replace(regex, '');
+    														
+    							///////////////////////////////////////////////////////////////////////////////////////////
+    							///////////////////////////////////////////////////////////////////////////////////////////
+    							
+    							
+    							var cleanedCss, fileCouldDirUrl, pathDepth, pathToDocRoot = '../';
+    								dirtyCss = this.getCssFromRules(template.css[i].cssRules),
+    								fileUrl = template.css[i].ownerNode.getAttribute('data-ninja-file-url'),
+    								fileRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0]).replace(/\/\//gi, '/')),
+    								localPath = fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-2])[0] || fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0] || fileUrl.split(fileUrl.split('/')[0])[0],
+    								documentRootURL = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]));    								
+    							
+    							pathDepth = Math.floor(localPath.split('/').length/2);
+    							
+    							for (var p=0; p < pathDepth; p++) {
+    								pathToDocRoot += '../';
+    							}
+    							
+    							fileCouldDirUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+localPath).replace(/\/\//gi, '/'));
+								
+    							cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this));
+    							
+    							function parseNinjaUrl (url) {
+    								//
+    								if (url.indexOf(fileCouldDirUrl) !== -1 || url.indexOf(fileRootUrl) !== -1) {
+    									//
+    									if (pathDepth < 1 || url.indexOf(fileRootUrl) > -1) {
+    										//
+    										url = url.replace(new RegExp(fileRootUrl.replace(/\//gi, '\\\/'), 'gi'), '');
+		    							} else {
+		    								//
+    										url = url.replace(new RegExp(fileCouldDirUrl.replace(/\//gi, '\\\/'), 'gi'), '../');
+    									}
+    								} else {
+    									//
+    									if (url.indexOf(documentRootURL) !== 1) {
+    										url = url.replace(new RegExp(documentRootURL.replace(/\//gi, '\\\/'), 'gi'), pathToDocRoot);
+    									} else if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== 1) {
+    										//TODO: Add logic for files above root document folder
+    									}
+    								}
+    								//console.log("Returning: " + url);
+    								//console.log("-----");
+    								return url;
     							}
     							
+    							//console.log(cleanedCss);
+    							
+    							///////////////////////////////////////////////////////////////////////////////////////////
+    							///////////////////////////////////////////////////////////////////////////////////////////
+    							
     							
-    							//console.log(adjCss);
-    							//console.log(fileCouldDirUrl);
     							//return;
     							
     							
     							
     							//Saving data from rules array converted to string into <link> file
-    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: adjCss});
+    							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: cleanedCss});
+    							//TODO: Add error handling for saving files
     						}
     					}
     				}
-- 
cgit v1.2.3


From 56efed8b1ed9974aade615fce2d96bc214d21540 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 5 Mar 2012 15:55:30 -0800
Subject: Resolved URL path issues in document and CSS

Added logic to allow for files opened and assets linked in any order all under the cloud server root.
---
 js/mediators/io-mediator.js | 63 +++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 5917edba..c02710c2 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -213,9 +213,11 @@ exports.IoMediator = Montage.create(Component, {
     parseNinjaTemplateToHtml: {
     	enumerable: false,
     	value: function (template) {
+    		var regexRootUrl, rootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]));
+    		regexRootUrl = new RegExp(rootUrl.replace(/\//gi, '\\\/'), 'gi');
     		//Injecting head and body into old document
-    		template.document.content.document.head.innerHTML = template.head;
-    		template.document.content.document.body.innerHTML = template.body;
+    		template.document.content.document.head.innerHTML = template.head.replace(regexRootUrl, '');
+    		template.document.content.document.body.innerHTML = template.body.replace(regexRootUrl, '');
     		//Getting all CSS (style or link) tags
     		var styletags = template.document.content.document.getElementsByTagName('style'),
     			linktags = template.document.content.document.getElementsByTagName('link'),
@@ -248,7 +250,7 @@ exports.IoMediator = Montage.create(Component, {
     		for (var l in linktags) {
     			if (linktags[l].getAttribute && linktags[l].getAttribute('disabled')) {//TODO: Use querySelectorAll
     				for (var p=0; toremovetags[p]; p++) {
-    					if (toremovetags[p].getAttribute('data-ninja-file-url') === ('/'+linktags[l].getAttribute('href'))) {
+    					if (toremovetags[p].getAttribute('href') === linktags[l].getAttribute('href')) {
     						if (!toremovetags[p].getAttribute('data-ninja-disabled')) {
     							linktags[l].removeAttribute('disabled');
     						}
@@ -335,55 +337,50 @@ exports.IoMediator = Montage.create(Component, {
     							///////////////////////////////////////////////////////////////////////////////////////////
     							
     							
-    							var cleanedCss, fileCouldDirUrl, pathDepth, pathToDocRoot = '../';
+    							var cleanedCss,
     								dirtyCss = this.getCssFromRules(template.css[i].cssRules),
     								fileUrl = template.css[i].ownerNode.getAttribute('data-ninja-file-url'),
-    								fileRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0]).replace(/\/\//gi, '/')),
-    								localPath = fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-2])[0] || fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0] || fileUrl.split(fileUrl.split('/')[0])[0],
-    								documentRootURL = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]));    								
-    							
-    							pathDepth = Math.floor(localPath.split('/').length/2);
-    							
-    							for (var p=0; p < pathDepth; p++) {
-    								pathToDocRoot += '../';
-    							}
-    							
-    							fileCouldDirUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+localPath).replace(/\/\//gi, '/'));
-								
-    							cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this));
+    								fileRootUrl = this.application.ninja.coreIoApi.rootUrl+fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0],
+    								cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this));
+    							    							
     							
     							function parseNinjaUrl (url) {
+    								//console.log("Getting: " + url);
     								//
-    								if (url.indexOf(fileCouldDirUrl) !== -1 || url.indexOf(fileRootUrl) !== -1) {
+    								if (url.indexOf(fileRootUrl) !== -1) {
+    									url = url.replace(new RegExp(fileRootUrl.replace(/\//gi, '\\\/'), 'gi'), '');
+    								} else {
+    									var assetsDirs = (url.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')).split('/');
+    									var fileDirs = (fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0]).split('/');
+    									var counter = 0;
+    									var path = '';
+    									var newURL = '';
+    									//
+    									for (var p=0; p < fileDirs.length-1; p++) {
+    										if (fileDirs[p] === assetsDirs[p]) {
+    											counter++;
+    										}
+    									}
     									//
-    									if (pathDepth < 1 || url.indexOf(fileRootUrl) > -1) {
-    										//
-    										url = url.replace(new RegExp(fileRootUrl.replace(/\//gi, '\\\/'), 'gi'), '');
-		    							} else {
-		    								//
-    										url = url.replace(new RegExp(fileCouldDirUrl.replace(/\//gi, '\\\/'), 'gi'), '../');
+    									for (var p=0; p < (fileDirs.length-counter)-1; p++) {
+    										path += '../';
     									}
-    								} else {
     									//
-    									if (url.indexOf(documentRootURL) !== 1) {
-    										url = url.replace(new RegExp(documentRootURL.replace(/\//gi, '\\\/'), 'gi'), pathToDocRoot);
-    									} else if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== 1) {
-    										//TODO: Add logic for files above root document folder
+    									for (var p=counter; p < assetsDirs.length; p++) {
+    										newURL += '/'+assetsDirs[p];
     									}
+    									//
+    									url = (path+newURL).replace(/\/\//gi, '/');
     								}
     								//console.log("Returning: " + url);
     								//console.log("-----");
     								return url;
     							}
     							
-    							//console.log(cleanedCss);
-    							
     							///////////////////////////////////////////////////////////////////////////////////////////
     							///////////////////////////////////////////////////////////////////////////////////////////
     							
     							
-    							//return;
-    							
     							
     							
     							//Saving data from rules array converted to string into <link> file
-- 
cgit v1.2.3


From 4c4d49ae7958e2c87764f9319665189cf69c5c0a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 5 Mar 2012 20:06:32 -0800
Subject: Fixed URL parsing issue on actual opened document

Still need to implement CSS loaded from a CDN, currently this would break Ninja.
---
 js/mediators/io-mediator.js | 65 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 3 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c02710c2..d6b4bd37 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -228,6 +228,8 @@ exports.IoMediator = Montage.create(Component, {
     				if (styletags[j].getAttribute) {
     					if(styletags[j].getAttribute('data-ninja-uri') !== null && !styletags[j].getAttribute('data-ninja-template')) {
     						toremovetags.push(styletags[j]);
+    					} else if (styletags[j].getAttribute('data-ninja-external-url')) {
+    						toremovetags.push(styletags[j]);
     					}
     				}
     			}
@@ -342,9 +344,13 @@ exports.IoMediator = Montage.create(Component, {
     								fileUrl = template.css[i].ownerNode.getAttribute('data-ninja-file-url'),
     								fileRootUrl = this.application.ninja.coreIoApi.rootUrl+fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0],
     								cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this));
-    							    							
-    							
+    							  	
     							function parseNinjaUrl (url) {
+    								return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
+    							}
+    							
+    							/*
+function parseNinjaUrl (url) {
     								//console.log("Getting: " + url);
     								//
     								if (url.indexOf(fileRootUrl) !== -1) {
@@ -376,6 +382,7 @@ exports.IoMediator = Montage.create(Component, {
     								//console.log("-----");
     								return url;
     							}
+*/
     							
     							///////////////////////////////////////////////////////////////////////////////////////////
     							///////////////////////////////////////////////////////////////////////////////////////////
@@ -433,8 +440,60 @@ exports.IoMediator = Montage.create(Component, {
     			//Setting string in tag
     			webgltag.innerHTML = json;
     		}
+    		var cleanHTML = template.document.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this));
+    		console.log(this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')));
+    		function parseNinjaRootUrl (url) {
+    			if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
+    				return this.getUrlfromNinjaUrl(url, rootUrl, rootUrl.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')+'file.ext');//Wrong parameters
+    			} else {
+    				return url;
+    			}
+    		}			
+			//console.log(rootUrl, this.application.ninja.coreIoApi.rootUrl, this.application.ninja.documentController.documentHackReference.root, this.application.ninja.coreIoApi.cloudData.root);
+    		//console.log(this.getPrettyHtml(template.document.content.document.documentElement.outerHTML));
+    		return;
+    		//
+    		return this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
+    	}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getUrlfromNinjaUrl: {
+    	enumerable: false,
+    	value: function (url, fileRootUrl, fileUrl) {
+    		//console.log("Params: ", url, fileRootUrl, fileUrl);
+    		//console.log("Getting: " + url);
+    		//
+    		if (url.indexOf(fileRootUrl) !== -1) {
+    			url = url.replace(new RegExp(fileRootUrl.replace(/\//gi, '\\\/'), 'gi'), '');
+    		} else {
+    			//TODO: Clean up vars
+    			var assetsDirs = (url.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')).split('/');
+    			var fileDirs = (fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0]).split('/');
+    			var counter = 0;
+    			var path = '';
+    			var newURL = '';
+    			//
+    			for (var p=0; p < fileDirs.length-1; p++) {
+    				if (fileDirs[p] === assetsDirs[p]) {
+    					counter++;
+    				}
+    			}
+    			//
+    			for (var p=0; p < (fileDirs.length-counter)-1; p++) {
+    				path += '../';
+    			}
+    			//
+    			for (var p=counter; p < assetsDirs.length; p++) {
+    				newURL += '/'+assetsDirs[p];
+    			}
+    			//
+   				url = (path+newURL).replace(/\/\//gi, '/');
+   			}
+    		//console.log("Returning: " + url);
+    		//console.log("-----");
     		//
-    		return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
+    		return url;
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From a68fe3f0180f5ab3304ff201be8da40c4432bd40 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 5 Mar 2012 22:23:59 -0800
Subject: Minor Fix

Forgot to comment out the return, therefore preventing to save.
---
 js/mediators/io-mediator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index d6b4bd37..07a139c0 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -441,7 +441,7 @@ function parseNinjaUrl (url) {
     			webgltag.innerHTML = json;
     		}
     		var cleanHTML = template.document.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this));
-    		console.log(this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')));
+    		//console.log(this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')));
     		function parseNinjaRootUrl (url) {
     			if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
     				return this.getUrlfromNinjaUrl(url, rootUrl, rootUrl.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')+'file.ext');//Wrong parameters
@@ -451,7 +451,7 @@ function parseNinjaUrl (url) {
     		}			
 			//console.log(rootUrl, this.application.ninja.coreIoApi.rootUrl, this.application.ninja.documentController.documentHackReference.root, this.application.ninja.coreIoApi.cloudData.root);
     		//console.log(this.getPrettyHtml(template.document.content.document.documentElement.outerHTML));
-    		return;
+    		//return;
     		//
     		return this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
     	}
-- 
cgit v1.2.3


From 4f274aa5beff735f63905704e52e6ea938c140d9 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 5 Mar 2012 23:18:49 -0800
Subject: Temp support for CDN CSS

Added a temp fix for allow the viewing of CSS on a CDN, however, the styles should not be editable, but will allow for accurate preview of styles. Need to coordinate with the CSS panel and styles manager to insert styles in the appropriate files or tags that have write permission.
---
 js/mediators/io-mediator.js | 48 +--------------------------------------------
 1 file changed, 1 insertion(+), 47 deletions(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 07a139c0..6c2147c8 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -260,17 +260,6 @@ exports.IoMediator = Montage.create(Component, {
     				}
     			}
     		}
-    		
-    		
-    		/////////////////////////////////////////////////////////////////////////////////////////
-    		/////////////////////////////////////////////////////////////////////////////////////////
-    		
-    		//TODO: Add logic for parse CSS string correct URLs since referencing is lost
-    		
-    		/////////////////////////////////////////////////////////////////////////////////////////
-    		/////////////////////////////////////////////////////////////////////////////////////////
-    		
-    		
     		//Checking for type of save: styles = <style> only | css = <style> and <link> (all CSS)
     		if (template.styles) {
     			//Getting all style tags
@@ -313,7 +302,7 @@ exports.IoMediator = Montage.create(Component, {
     					if (template.css[i].ownerNode.getAttribute) {
     						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
-    							if (docStyles[styleCounter]) {
+    							if (docStyles[styleCounter] && !template.css[i].ownerNode.getAttribute('data-ninja-external-url')) {
     								docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
     								styleCounter++;
     							}
@@ -349,41 +338,6 @@ exports.IoMediator = Montage.create(Component, {
     								return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
     							}
     							
-    							/*
-function parseNinjaUrl (url) {
-    								//console.log("Getting: " + url);
-    								//
-    								if (url.indexOf(fileRootUrl) !== -1) {
-    									url = url.replace(new RegExp(fileRootUrl.replace(/\//gi, '\\\/'), 'gi'), '');
-    								} else {
-    									var assetsDirs = (url.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')).split('/');
-    									var fileDirs = (fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0]).split('/');
-    									var counter = 0;
-    									var path = '';
-    									var newURL = '';
-    									//
-    									for (var p=0; p < fileDirs.length-1; p++) {
-    										if (fileDirs[p] === assetsDirs[p]) {
-    											counter++;
-    										}
-    									}
-    									//
-    									for (var p=0; p < (fileDirs.length-counter)-1; p++) {
-    										path += '../';
-    									}
-    									//
-    									for (var p=counter; p < assetsDirs.length; p++) {
-    										newURL += '/'+assetsDirs[p];
-    									}
-    									//
-    									url = (path+newURL).replace(/\/\//gi, '/');
-    								}
-    								//console.log("Returning: " + url);
-    								//console.log("-----");
-    								return url;
-    							}
-*/
-    							
     							///////////////////////////////////////////////////////////////////////////////////////////
     							///////////////////////////////////////////////////////////////////////////////////////////
     							
-- 
cgit v1.2.3


From bee2df0d4da72677aaa2adae669ffdd4ac210dd6 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 6 Mar 2012 11:04:52 -0800
Subject: Changing length of characters per line (pretty function)

---
 js/mediators/io-mediator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 6c2147c8..23668e13 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -491,7 +491,7 @@ exports.IoMediator = Montage.create(Component, {
     //For HTML, including any JS or CSS (single string/file)
     getPrettyHtml: {
     	enumerable: false,
-    	value: function (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 this.getPrettyCss=="function"&&this.getPrettyCss}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("")}
+    	value: function (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||"500";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 this.getPrettyCss=="function"&&this.getPrettyCss}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("")}
     },
     //For CSS (single string/file)
     getPrettyCss: {
-- 
cgit v1.2.3


From 7271c25bf34917b1751f433d284f21485057425b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 6 Mar 2012 11:24:25 -0800
Subject: Fixing WebGL not available bug

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

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 23668e13..097f5975 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -153,7 +153,7 @@ exports.IoMediator = Montage.create(Component, {
     		switch (file.mode) {
     			case 'html':
     				//Copy webGL library if needed
-    				if (file.webgl.length > 0) {
+    				if (file.webgl && file.webgl.length > 0) {
     					for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
 		    				//Checking for RDGE library to be available
 		    				if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
@@ -353,7 +353,7 @@ exports.IoMediator = Montage.create(Component, {
     			}
     		}
     		//Checking for webGL elements in document
-    		if (template.webgl.length) {
+    		if (template.webgl && template.webgl.length) {
     			//
     			var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script');
     			//
-- 
cgit v1.2.3


From eebb7de4d19cddec9c763a073d8cf41d76fe70f7 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 6 Mar 2012 17:02:37 -0800
Subject: Adding CDN support for URLs in linked CSS

---
 js/mediators/io-mediator.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'js/mediators/io-mediator.js')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 097f5975..f44c182c 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -335,7 +335,11 @@ exports.IoMediator = Montage.create(Component, {
     								cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this));
     							  	
     							function parseNinjaUrl (url) {
-    								return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
+    								if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
+    									return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
+    								} else {
+    									return url;
+    								}
     							}
     							
     							///////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3