From 2557f463c1cfe2d0dd8ea187c184755bd141dab4 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 10:38:44 -0700
Subject: IKNINJA-1302 :  For File>New and File>SaveAll dialogs, 'ESC' key now
 triggers Cancel button and 'Enter' key now triggers OK button. For File
 picker, the 'ESC' now triggers the Cancel button.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

Conflicts:

	js/io/ui/new-file-dialog/new-file-workflow-controller.js

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

(limited to 'js/mediators')

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 65dd34cd..63dcfa88 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -246,6 +246,35 @@ exports.KeyboardMediator = Montage.create(Component, {
                 return;
             }
 
+            // check for ENTER key
+            if((evt.keyCode == Keyboard.ENTER) && !(evt.ctrlKey || evt.metaKey)) {
+                //new file
+                if((this.application.ninja.newFileController.newFileOptionsNav !== null)
+                    && !this.application.ninja.newFileController.newFileOptionsNav.okButton.hasAttribute("disabled")){
+
+                    this.application.ninja.newFileController.newFileOptionsNav.handleOkButtonAction();
+                }
+                //save as
+                if((this.application.ninja.newFileController.saveAsDialog !== null)
+                    && !this.application.ninja.newFileController.saveAsDialog.okButton.hasAttribute("disabled")){
+
+                    this.application.ninja.newFileController.saveAsDialog.handleOkButtonAction();
+                }
+                return;
+            }
+            //ESC key
+            if(evt.keyCode === Keyboard.ESCAPE){
+                if(this.application.ninja.filePickerController.pickerNavChoices !== null){
+                    this.application.ninja.filePickerController.pickerNavChoices.handleCancelButtonAction();
+                }
+                if(this.application.ninja.newFileController.newFileOptionsNav !== null){
+                    this.application.ninja.newFileController.newFileOptionsNav.handleCancelButtonAction();
+                }
+                if(this.application.ninja.newFileController.saveAsDialog !== null){
+                    this.application.ninja.newFileController.saveAsDialog.handleCancelButtonAction();
+                }
+                return;
+            }
 
         }
     },
-- 
cgit v1.2.3


From 80ceeffeb3dd3227008714b8b56383f9556ff409 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 14:49:17 -0700
Subject: KNINJA-1302 : refactored fixed as per request

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/mediators/keyboard-mediator.js | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 63dcfa88..fc0d0f6a 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -245,37 +245,6 @@ exports.KeyboardMediator = Montage.create(Component, {
                 //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar");
                 return;
             }
-
-            // check for ENTER key
-            if((evt.keyCode == Keyboard.ENTER) && !(evt.ctrlKey || evt.metaKey)) {
-                //new file
-                if((this.application.ninja.newFileController.newFileOptionsNav !== null)
-                    && !this.application.ninja.newFileController.newFileOptionsNav.okButton.hasAttribute("disabled")){
-
-                    this.application.ninja.newFileController.newFileOptionsNav.handleOkButtonAction();
-                }
-                //save as
-                if((this.application.ninja.newFileController.saveAsDialog !== null)
-                    && !this.application.ninja.newFileController.saveAsDialog.okButton.hasAttribute("disabled")){
-
-                    this.application.ninja.newFileController.saveAsDialog.handleOkButtonAction();
-                }
-                return;
-            }
-            //ESC key
-            if(evt.keyCode === Keyboard.ESCAPE){
-                if(this.application.ninja.filePickerController.pickerNavChoices !== null){
-                    this.application.ninja.filePickerController.pickerNavChoices.handleCancelButtonAction();
-                }
-                if(this.application.ninja.newFileController.newFileOptionsNav !== null){
-                    this.application.ninja.newFileController.newFileOptionsNav.handleCancelButtonAction();
-                }
-                if(this.application.ninja.newFileController.saveAsDialog !== null){
-                    this.application.ninja.newFileController.saveAsDialog.handleCancelButtonAction();
-                }
-                return;
-            }
-
         }
     },
 
-- 
cgit v1.2.3


From 350d290d5fd0903289d55a7f4a6e643040e3d65e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 3 Apr 2012 10:56:53 -0700
Subject: IKNinja-1375 - After WebGL conversion from PI, Selection tool gets
 deactivated or becomes non-functional to the shape.

Need to set elementModel.isIn2DSnapCache to false when replacing element.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/mediators/element-mediator.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/mediators')

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index d62fa1f8..3eeab9c4 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -132,6 +132,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
         value: function(el, el2) {
             el2.elementModel = el.elementModel;
             this.application.ninja.currentDocument.documentRoot.replaceChild(el2, el);
+            el2.elementModel.isIn2DSnapCache = false;
         }
     },
 
-- 
cgit v1.2.3


From d5d4dcac78ebf8ba3163a8c7055d783b6397a435 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 12:55:54 -0700
Subject: Namespaced the canvas runtime file and updated all dependencies

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

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 1efbb8bb..82bb31c4 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -440,7 +440,7 @@ window.addEventListener('load', loadWebGL, false);\n\
 function loadWebGL (e) {\n\
 	window.removeEventListener('load', loadWebGL, false);\n\
 	//Calling method to initialize all webGL/canvas(es)\n\
-	initWebGl("+rootElement+", '"+rdgeDirName+"/');\n\
+	NinjaCvsRt.initWebGl(" + rootElement + ", '" + rdgeDirName + "/');\n\
 }\
     			";
     			//TODO: This data should be saved to a JSON file eventually
-- 
cgit v1.2.3


From 7433f0bfbc3a7ea44320550ed2c1d90dc5e6f170 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 16:27:01 -0700
Subject: Removed the dependence on an "assets" directory for the RDGE runtime.
 Now Ninja does not need to create duplicate files when it sets up the users
 Ninja Projects directory for RDGE support.

---
 js/mediators/io-mediator.js | 1094 +++++++++++++++++++++----------------------
 1 file changed, 543 insertions(+), 551 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 82bb31c4..057a849d 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -14,427 +14,419 @@ var Montage = 			require("montage/core/core").Montage,
 ////////////////////////////////////////////////////////////////////////
 //
 exports.IoMediator = Montage.create(Component, {
-	////////////////////////////////////////////////////////////////////
-	//
-	hasTemplate: {
-		enumerable: false,
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
+        enumerable: false,
         value: false
     },
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
-	deserializedFromTemplate: {
-		enumerable: false,
-		value: function () {
-			//
-		}
-	},
-	////////////////////////////////////////////////////////////////////
+    deserializedFromTemplate: {
+        enumerable: false,
+        value: function () {
+            //
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
     //
     fio: {
-    	enumerable: false,
-    	value: FileIo
+        enumerable: false,
+        value: FileIo
     },
     ////////////////////////////////////////////////////////////////////
     //
     pio: {
-    	enumerable: false,
-    	value: ProjectIo
+        enumerable: false,
+        value: ProjectIo
     },
     ////////////////////////////////////////////////////////////////////
     //
     getAppTemplatesUrlRegEx: {
-    	enumerable: false,
-    	value: function () {
-    		var regex = new RegExp(chrome.extension.getURL('js/document/templates/montage-html').replace(/\//gi, '\\\/'), 'gi');
-    		return regex;
-    	}
+        enumerable: false,
+        value: function () {
+            var regex = new RegExp(chrome.extension.getURL('js/document/templates/montage-html').replace(/\//gi, '\\\/'), 'gi');
+            return regex;
+        }
     },
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
     fileNew: {
-    	enumerable: false,
-    	value: function (file, template, callback) {
-    		//Loading template from template URL
-    		var xhr = new XMLHttpRequest(), result;
-    		xhr.open("GET", template, false);
+        enumerable: false,
+        value: function (file, template, callback) {
+            //Loading template from template URL
+            var xhr = new XMLHttpRequest(), result;
+            xhr.open("GET", template, false);
             xhr.send();
-    		if (xhr.readyState === 4) {
-    			//Making call to create file, checking for return code
-    			switch (this.fio.newFile({uri: file, contents: xhr.response})) {
-    				case 201:
-    					result = {status: 201, success: true, uri: file};
-    					break;
-    				case 204:
-    					result = {status: 204, success: false, uri: file};
-    					break;
-    				case 400:
-    					result = {status: 400, success: false, uri: file};
-    					break;
-    				default:
-    					result = {status: 500, success: false, uri: file};
-    					break;
-    			}
-    		} else {
-    			result = {status: 500, success: false, uri: file};
-    		}
-    		//Sending result to callback if requested for handling
-    		if (callback) callback(result);
-    		//Codes
-    		//	204: File exists | 400: File exists
-		    //	201: File succesfully created | 500: Unknown (Probably cloud API not running)
-    	}
+            if (xhr.readyState === 4) {
+                //Making call to create file, checking for return code
+                switch (this.fio.newFile({ uri: file, contents: xhr.response })) {
+                    case 201:
+                        result = { status: 201, success: true, uri: file };
+                        break;
+                    case 204:
+                        result = { status: 204, success: false, uri: file };
+                        break;
+                    case 400:
+                        result = { status: 400, success: false, uri: file };
+                        break;
+                    default:
+                        result = { status: 500, success: false, uri: file };
+                        break;
+                }
+            } else {
+                result = { status: 500, success: false, uri: file };
+            }
+            //Sending result to callback if requested for handling
+            if (callback) callback(result);
+            //Codes
+            //	204: File exists | 400: File exists
+            //	201: File succesfully created | 500: Unknown (Probably cloud API not running)
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     fileOpen: {
-    	enumerable: false,
-    	value: function (file, callback) {
-    		//Reading file (Ninja doesn't really open a file, all in browser memory)
-    		var read = this.fio.readFile({uri: file}), result;
-    		//Checking for status
-    		switch(read.status) {
-    			case 204:
-    				//Creating and formatting result object for callbak
-    				result = read.file.details;
-    				result.root = read.file.details.uri.replace(read.file.details.name, "");
-    				//Checking for type of content to returns
-    				if (result.extension !== 'html' && result.extension !== 'htm') {
-    					//Simple string
-    					result.content = read.file.content;
-    				} else {
-    					//Object to be used by Ninja Template
-						result.content = this.parseHtmlToNinjaTemplate(read.file.content);
-    				}
-    				//Status of call
-    				result.status = read.status;
-    				//Calling back with result
-    				if (callback) callback(result);
-    				break;
-    			case 404:
-    				//File does not exists
-    				if (callback) callback({status: read.status});
-    				break;
-    			default:
-    				//Unknown
-    				if (callback) callback({status: 500});
-    				break;
-    		}
-    		/*
-    		////////////////////////////////////////////////////////////
-    		////////////////////////////////////////////////////////////
-    		//Return Object Description
-    		Object.status (Always presents for handling)
-    		204: File exists (Success)
-    		404: File does not exists (Failure)
-    		500: Unknown (Probably cloud API not running)
+        enumerable: false,
+        value: function (file, callback) {
+            //Reading file (Ninja doesn't really open a file, all in browser memory)
+            var read = this.fio.readFile({ uri: file }), result;
+            //Checking for status
+            switch (read.status) {
+                case 204:
+                    //Creating and formatting result object for callbak
+                    result = read.file.details;
+                    result.root = read.file.details.uri.replace(read.file.details.name, "");
+                    //Checking for type of content to returns
+                    if (result.extension !== 'html' && result.extension !== 'htm') {
+                        //Simple string
+                        result.content = read.file.content;
+                    } else {
+                        //Object to be used by Ninja Template
+                        result.content = this.parseHtmlToNinjaTemplate(read.file.content);
+                    }
+                    //Status of call
+                    result.status = read.status;
+                    //Calling back with result
+                    if (callback) callback(result);
+                    break;
+                case 404:
+                    //File does not exists
+                    if (callback) callback({ status: read.status });
+                    break;
+                default:
+                    //Unknown
+                    if (callback) callback({ status: 500 });
+                    break;
+            }
+            /*
+            ////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////
+            //Return Object Description
+            Object.status (Always presents for handling)
+            204: File exists (Success)
+            404: File does not exists (Failure)
+            500: Unknown (Probably cloud API not running)
     		
-    		(Below only present if succesfull 204)
+            (Below only present if succesfull 204)
     		
-    		Object.content
-    		Object.extension
-    		Object.name
-    		Object.uri
-    		Object.creationDate
-    		Object.modifiedDate
-    		Object.readOnly
-    		Object.size
-    		////////////////////////////////////////////////////////////
-    		////////////////////////////////////////////////////////////
-    		*/
-    	}
+            Object.content
+            Object.extension
+            Object.name
+            Object.uri
+            Object.creationDate
+            Object.modifiedDate
+            Object.readOnly
+            Object.size
+            ////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////
+            */
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     fileSave: {
-    	enumerable: false,
-    	value: function (file, callback) {
-    		//
-    		var contents, save;
-    		//
-    		switch (file.mode) {
-    			case 'html':
-    				
-    				
-    				//TODO: Add check for Monatage library to copy
-    				
-    				//Getting content from function to properly handle saving assets (as in external if flagged)
-    				contents = this.parseNinjaTemplateToHtml(file);
-    				break;
-    			default:
-    				contents = file.content;
-    				break;
-    		}
-    		//Making call to save file
-    		save = this.fio.saveFile({uri: file.document.uri, contents: contents});
+        enumerable: false,
+        value: function (file, callback) {
+            //
+            var contents, save;
+            //
+            switch (file.mode) {
+                case 'html':
+
+
+                    //TODO: Add check for Monatage library to copy
+
+                    //Getting content from function to properly handle saving assets (as in external if flagged)
+                    contents = this.parseNinjaTemplateToHtml(file);
+                    break;
+                default:
+                    contents = file.content;
+                    break;
+            }
+            //Making call to save file
+            save = this.fio.saveFile({ uri: file.document.uri, contents: contents });
             //Checking for callback
             if (callback) callback(save);
-    	}
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     fileSaveAs: {
-    	enumerable: false,
-    	value: function (copyTo, copyFrom, callback) {
-    		//TODO: Implement Save As functionality
-    	}
+        enumerable: false,
+        value: function (copyTo, copyFrom, callback) {
+            //TODO: Implement Save As functionality
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     fileDelete: {
-    	enumerable: false,
-    	value: function (file, callback) {
-    		//TODO: Implement Delete functionality
-    	}
+        enumerable: false,
+        value: function (file, callback) {
+            //TODO: Implement Delete functionality
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     parseHtmlToNinjaTemplate: {
-    	enumerable: false,
-    	value: function (html) {
-    		//Creating temp object to mimic HTML
-    		var doc = window.document.implementation.createHTMLDocument(), template;
-    		//Setting content to temp
-    		doc.getElementsByTagName('html')[0].innerHTML = html;
-    		//Creating return object
-    		return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc};
-    	}
+        enumerable: false,
+        value: function (html) {
+            //Creating temp object to mimic HTML
+            var doc = window.document.implementation.createHTMLDocument(), template;
+            //Setting content to temp
+            doc.getElementsByTagName('html')[0].innerHTML = html;
+            //Creating return object
+            return { head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc };
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //TODO: Expand to allow more templates, clean up variables
     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.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'),
+        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.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'),
     			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]);
-    					} else if (styletags[j].getAttribute('data-ninja-external-url')) {
-    						toremovetags.push(styletags[j]);
-    					}
-    				}
-    			}
-    		}
-    		//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
-    				for (var p=0; toremovetags[p]; p++) {
-    					if (toremovetags[p].getAttribute('href') === linktags[l].getAttribute('href')) {
-    						if (!toremovetags[p].getAttribute('data-ninja-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,
+            //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]);
+                        } else if (styletags[j].getAttribute('data-ninja-external-url')) {
+                            toremovetags.push(styletags[j]);
+                        }
+                    }
+                }
+            }
+            //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
+                    for (var p = 0; toremovetags[p]; p++) {
+                        if (toremovetags[p].getAttribute('href') === linktags[l].getAttribute('href')) {
+                            if (!toremovetags[p].getAttribute('data-ninja-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('data-ninja-uri') === null && !template.styles[i].ownerNode.getAttribute('data-ninja-template')) {
-    							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++;
-    							}
-    						}
-    					}
-    				}
-    			}
-    		} else if (template.css) {
-    			//Getting all style and link tags
-    			var styleCounter = 0,
+                //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('data-ninja-uri') === null && !template.styles[i].ownerNode.getAttribute('data-ninja-template')) {
+                                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++;
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if (template.css) {
+                //Getting all style and link tags
+                var styleCounter = 0,
     				docStyles = template.document.content.document.getElementsByTagName('style'),
     				docLinks = template.document.content.document.getElementsByTagName('link');
-    			//Removing Ninja Data Attributes
-    			for (var n in docLinks) {
-    				if (docLinks[n].attributes) {
-    					for (var m in docLinks[n].attributes) {
-							if (docLinks[n].attributes[m].name && docLinks[n].attributes[m].name.indexOf('data-ninja')!=-1) {
-								docLinks[n].removeAttribute(docLinks[n].attributes[m].name);
-							}
-						}
-    				}
-    			}
-    			//
-    			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 && !template.css[i].ownerNode.getAttribute('data-ninja-template')) {//TODO: Use querySelectorAll
-    							//Inseting data from rules array into <style> as string
-    							if (docStyles[styleCounter] && !template.css[i].ownerNode.getAttribute('data-ninja-external-url')) {
-    								docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
-    								styleCounter++;
-    							}
-    						} 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) {
-    									if (docLinks[k].getAttribute('href') && ('/'+docLinks[k].getAttribute('href')) === template.css[i].ownerNode.getAttribute('data-ninja-file-url')) {
-    										for (var l in template.css[i].ownerNode.attributes) {
-    											if (template.css[i].ownerNode.attributes[l].value) {
-    												if (template.css[i].ownerNode.attributes[l].name.indexOf('data-ninja')!=-1) {
-    													//Ninja attribute...
-    												} else {
-    													docLinks[k].setAttribute(template.css[i].ownerNode.attributes[l].name, template.css[i].ownerNode.attributes[l].value);
-    												}
-    											}
-    										}
-    									}
-    								}
-    							}
-    														
-    							///////////////////////////////////////////////////////////////////////////////////////////
-    							///////////////////////////////////////////////////////////////////////////////////////////
-    							
-    							
-    							var cleanedCss,
+                //Removing Ninja Data Attributes
+                for (var n in docLinks) {
+                    if (docLinks[n].attributes) {
+                        for (var m in docLinks[n].attributes) {
+                            if (docLinks[n].attributes[m].name && docLinks[n].attributes[m].name.indexOf('data-ninja') != -1) {
+                                docLinks[n].removeAttribute(docLinks[n].attributes[m].name);
+                            }
+                        }
+                    }
+                }
+                //
+                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 && !template.css[i].ownerNode.getAttribute('data-ninja-template')) {//TODO: Use querySelectorAll
+                                //Inseting data from rules array into <style> as string
+                                if (docStyles[styleCounter] && !template.css[i].ownerNode.getAttribute('data-ninja-external-url')) {
+                                    docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
+                                    styleCounter++;
+                                }
+                            } 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) {
+                                        if (docLinks[k].getAttribute('href') && ('/' + docLinks[k].getAttribute('href')) === template.css[i].ownerNode.getAttribute('data-ninja-file-url')) {
+                                            for (var l in template.css[i].ownerNode.attributes) {
+                                                if (template.css[i].ownerNode.attributes[l].value) {
+                                                    if (template.css[i].ownerNode.attributes[l].name.indexOf('data-ninja') != -1) {
+                                                        //Ninja attribute...
+                                                    } else {
+                                                        docLinks[k].setAttribute(template.css[i].ownerNode.attributes[l].name, template.css[i].ownerNode.attributes[l].value);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                ///////////////////////////////////////////////////////////////////////////////////////////
+                                ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+                                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+fileUrl.split(fileUrl.split('/')[fileUrl.split('/').length-1])[0],
+    								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) {
-    								if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
-    									return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
-    								} else {
-    									return url;
-    								}
-    							}
-    							
-    							///////////////////////////////////////////////////////////////////////////////////////////
-    							///////////////////////////////////////////////////////////////////////////////////////////
-    							
-    							
-    							
-    							
-    							//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: cleanedCss});
-    							//TODO: Add error handling for saving files
-    						}
-    					}
-    				}
-    			}
-    		}
-    		//Checking for webGL elements in document
-    		if (template.webgl && template.webgl.length  > 1) {//TODO: Should be length 0, hack for a temp fix
-    			var rdgeDirName, rdgeVersion;
-    			//Copy webGL library if needed
-    			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') {
-		    			rdgeDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
-    					rdgeVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
-    					this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, rdgeDirName, hackRename.bind(this));
-    					//TODO: Remove, this is copying the library into a static name
-    					function hackRename (status) {
-    						if (status) {
-    							setTimeout(function () {
-    								this.application.ninja.coreIoApi.copyDirectory({sourceUri: template.document.root+rdgeDirName, destUri: template.document.root+'assets'});
-    							}.bind(this), 3000);
-    						}
-    					}
-    				} else {
-    					//TODO: Error handle no available library to copy
-    				}
-    			}
-    			//
-    			var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'), webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
-    			//
-    			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 (scripts[i].getAttribute('data-ninja-webgl-js') !== null) {
-    						webgljstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-    					}
-    					if (scripts[i].getAttribute('data-ninja-webgl-lib') !== null) {
-    						webgllibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-    					}
-    					if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
-    						webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-    					}
-    					if (scripts[i].getAttribute('type') !== 'text/montage-serialization') {
-    						mjstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-    					}
-    					if (scripts[i].getAttribute('data-mjs-lib') !== null) {
-    						mjslibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-    					}
-    				}
-    			}
-    			//
-    			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 (!webglrdgetag) {
-    				webglrdgetag = template.document.content.document.createElement('script');
-    				webglrdgetag.setAttribute('type', 'text/javascript');
-    				webglrdgetag.setAttribute('src', rdgeDirName+'/rdge-compiled.js');
-    				webglrdgetag.setAttribute('data-ninja-webgl-rdge', 'true');
-    				template.document.content.document.head.appendChild(webglrdgetag);
-    			}
-    			//
-    			if (!webgllibtag) {
-    				webgllibtag = template.document.content.document.createElement('script');
-    				webgllibtag.setAttribute('type', 'text/javascript');
-    				webgllibtag.setAttribute('src', rdgeDirName+'/canvas-runtime.js');
-    				webgllibtag.setAttribute('data-ninja-webgl-lib', 'true');
-    				template.document.content.document.head.appendChild(webgllibtag);
-    			}
-    			//
-    			if (!webgltag) {
-    				webgltag = template.document.content.document.createElement('script');
-    				webgltag.setAttribute('data-ninja-webgl', 'true');
-    				template.document.content.document.head.appendChild(webgltag);
-    			}
-    			//TODO: Remove this tag and place inside JS file
-    			if (!webgljstag) {
-    				webgljstag = template.document.content.document.createElement('script');
-    				webgljstag.setAttribute('type', 'text/javascript');
-    				webgljstag.setAttribute('data-ninja-webgl-js', 'true');
-    				template.document.content.document.head.appendChild(webgljstag);
-    			}
-    			//TODO: Decide if this should be over-writter or only written on creation
-    			var rootElement = 'document.body'; //TODO: Set actual root element
-    			webgljstag.innerHTML = "\
+
+                                function parseNinjaUrl(url) {
+                                    if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
+                                        return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
+                                    } else {
+                                        return url;
+                                    }
+                                }
+
+                                ///////////////////////////////////////////////////////////////////////////////////////////
+                                ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+
+                                //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: cleanedCss });
+                                //TODO: Add error handling for saving files
+                            }
+                        }
+                    }
+                }
+            }
+            //Checking for webGL elements in document
+            if (template.webgl && template.webgl.length > 1) {//TODO: Should be length 0, hack for a temp fix
+                var rdgeDirName, rdgeVersion;
+                //Copy webGL library if needed
+                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') {
+                        rdgeDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name + this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
+                        rdgeVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
+                        this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, rdgeDirName);
+                    } else {
+                        //TODO: Error handle no available library to copy
+                    }
+                }
+                //
+                var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'), webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
+                //
+                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 (scripts[i].getAttribute('data-ninja-webgl-js') !== null) {
+                            webgljstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                        }
+                        if (scripts[i].getAttribute('data-ninja-webgl-lib') !== null) {
+                            webgllibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                        }
+                        if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
+                            webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                        }
+                        if (scripts[i].getAttribute('type') !== 'text/montage-serialization') {
+                            mjstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                        }
+                        if (scripts[i].getAttribute('data-mjs-lib') !== null) {
+                            mjslibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                        }
+                    }
+                }
+                //
+                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 (!webglrdgetag) {
+                    webglrdgetag = template.document.content.document.createElement('script');
+                    webglrdgetag.setAttribute('type', 'text/javascript');
+                    webglrdgetag.setAttribute('src', rdgeDirName + '/rdge-compiled.js');
+                    webglrdgetag.setAttribute('data-ninja-webgl-rdge', 'true');
+                    template.document.content.document.head.appendChild(webglrdgetag);
+                }
+                //
+                if (!webgllibtag) {
+                    webgllibtag = template.document.content.document.createElement('script');
+                    webgllibtag.setAttribute('type', 'text/javascript');
+                    webgllibtag.setAttribute('src', rdgeDirName + '/canvas-runtime.js');
+                    webgllibtag.setAttribute('data-ninja-webgl-lib', 'true');
+                    template.document.content.document.head.appendChild(webgllibtag);
+                }
+                //
+                if (!webgltag) {
+                    webgltag = template.document.content.document.createElement('script');
+                    webgltag.setAttribute('data-ninja-webgl', 'true');
+                    template.document.content.document.head.appendChild(webgltag);
+                }
+                //TODO: Remove this tag and place inside JS file
+                if (!webgljstag) {
+                    webgljstag = template.document.content.document.createElement('script');
+                    webgljstag.setAttribute('type', 'text/javascript');
+                    webgljstag.setAttribute('data-ninja-webgl-js', 'true');
+                    template.document.content.document.head.appendChild(webgljstag);
+                }
+                //TODO: Decide if this should be over-writter or only written on creation
+                var rootElement = 'document.body'; //TODO: Set actual root element
+                webgljstag.innerHTML = "\
 //Loading webGL/canvas data on window load\n\
 window.addEventListener('load', loadWebGL, false);\n\
 function loadWebGL (e) {\n\
@@ -443,225 +435,225 @@ function loadWebGL (e) {\n\
 	NinjaCvsRt.initWebGl(" + rootElement + ", '" + rdgeDirName + "/');\n\
 }\
     			";
-    			//TODO: This data should be saved to a JSON file eventually
-    			json = '\n({\n\t"version": "'+rdgeVersion+'",\n\t"directory": "'+rdgeDirName+'/",\n\t"data": [';
-    			//Looping through data to create escaped array
-    			for (var j=0; template.webgl[j]; j++) {
-    				if (j === 0) {
-    					json += '\n\t\t\t"'+escape(template.webgl[j])+'"';
-    				} else {
-    					json += ',\n\t\t\t"'+escape(template.webgl[j])+'"';
-    				}
-    			}
-    			//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;
-    		}
-    		
-    		
-    		
-    		
-    		
-    		
-    		
-    		//
-    		var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create();
-    		//
-    		for (var m in template.mjs) {
-    			mjsComponents.push(template.mjs[m]);
-    			mjsCounter++;
-    		}
-    		//
-    		if (template.mjs && mjsCounter > 0) {
-    			var mjsDirName, mjsVersion,
+                //TODO: This data should be saved to a JSON file eventually
+                json = '\n({\n\t"version": "' + rdgeVersion + '",\n\t"directory": "' + rdgeDirName + '/",\n\t"data": [';
+                //Looping through data to create escaped array
+                for (var j = 0; template.webgl[j]; j++) {
+                    if (j === 0) {
+                        json += '\n\t\t\t"' + escape(template.webgl[j]) + '"';
+                    } else {
+                        json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"';
+                    }
+                }
+                //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;
+            }
+
+
+
+
+
+
+
+            //
+            var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create();
+            //
+            for (var m in template.mjs) {
+                mjsComponents.push(template.mjs[m]);
+                mjsCounter++;
+            }
+            //
+            if (template.mjs && mjsCounter > 0) {
+                var mjsDirName, mjsVersion,
     				mjscode = temp.initWithHeadAndBodyElements(template.document.content.document.documentElement.head, template.document.content.document.documentElement.body, mjsComponents)._ownerSerialization;
-    			//Copy Montage library if needed
-    			for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
-		    		//Checking for Montage library to be available
-		    		if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Montage') {
-		    			mjsDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
-    					mjsVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
-    					this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, mjsDirName);
-    					//TODO: Fix to allow no overwrite and nested locations
-    					var packjson = this.application.ninja.coreIoApi.createFile({uri: template.document.root+'package.json', contents: '{"mappings": {"montage": "'+mjsDirName+'/"}}'});
-    				} else {
-    					//TODO: Error handle no available library to copy
-    				}
-    			}
-    			//
-    			if (!mjslibtag) {
-    				mjslibtag = template.document.content.document.createElement('script');
-    				mjslibtag.setAttribute('type', 'text/javascript');
-    				mjslibtag.setAttribute('src', mjsDirName+'/montage.js');
-    				mjslibtag.setAttribute('data-mjs-lib', 'true');
-    				template.document.content.document.head.appendChild(mjslibtag);
-    			}
-    			//
-    			if (!mjstag) {
-    				mjstag = template.document.content.document.createElement('script');
-    				mjstag.setAttribute('type', 'text/montage-serialization');
-    				template.document.content.document.head.appendChild(mjstag);
-    			}
-    			//
-    			mjstag.innerHTML = mjscode;
-    		}
-    		
-    		
-    		
-    		
-    		
-    		
-    		
-    		//Cleaning URLs from HTML
-    		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));
-    		//
-    		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');
-    			} else {
-    				return url;
-    			}
-    		}
-    		//
-    		return this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
-    	}
+                //Copy Montage library if needed
+                for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
+                    //Checking for Montage library to be available
+                    if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Montage') {
+                        mjsDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name + this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
+                        mjsVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
+                        this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, mjsDirName);
+                        //TODO: Fix to allow no overwrite and nested locations
+                        var packjson = this.application.ninja.coreIoApi.createFile({ uri: template.document.root + 'package.json', contents: '{"mappings": {"montage": "' + mjsDirName + '/"}}' });
+                    } else {
+                        //TODO: Error handle no available library to copy
+                    }
+                }
+                //
+                if (!mjslibtag) {
+                    mjslibtag = template.document.content.document.createElement('script');
+                    mjslibtag.setAttribute('type', 'text/javascript');
+                    mjslibtag.setAttribute('src', mjsDirName + '/montage.js');
+                    mjslibtag.setAttribute('data-mjs-lib', 'true');
+                    template.document.content.document.head.appendChild(mjslibtag);
+                }
+                //
+                if (!mjstag) {
+                    mjstag = template.document.content.document.createElement('script');
+                    mjstag.setAttribute('type', 'text/montage-serialization');
+                    template.document.content.document.head.appendChild(mjstag);
+                }
+                //
+                mjstag.innerHTML = mjscode;
+            }
+
+
+
+
+
+
+
+            //Cleaning URLs from HTML
+            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));
+            //
+            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');
+                } else {
+                    return url;
+                }
+            }
+            //
+            return this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getUrlfromNinjaUrl: {
-    	enumerable: false,
-    	value: function (url, fileRootUrl, fileUrl) {
-    		//
-    		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, '/');
-   			}
-    		//
-    		return url;
-    	}
+        enumerable: false,
+        value: function (url, fileRootUrl, fileUrl) {
+            //
+            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, '/');
+            }
+            //
+            return url;
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getDocRootUrl: {
-    	value: function () {
-    		return this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
-    	}
+        value: function () {
+            return this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getNinjaPropUrlRedirect: {
-    	enumerable: false,
-    	value: function (prop/* , root */) {
-    		//Checking for property value to not contain a full direct URL
+        enumerable: false,
+        value: function (prop/* , root */) {
+            //Checking for property value to not contain a full direct URL
             if (!prop.match(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi)) {
-           		//Checking for attributes and type of source
-            	if (prop.indexOf('href') !== -1 || prop.indexOf('src') !== -1) {
-            		//From HTML attribute
-            		//if (root) {
-            			//prop = (root+prop).replace(/"([^"]*)"/gi, this.getNinjaUrlPrepend.bind(this));
-            		//} else {
-            			prop = prop.replace(/"([^"]*)"/gi, this.getNinjaUrlPrepend.bind(this));
-            		//}
-	            } else if (prop.indexOf('url') !== -1) {
-	            	//From CSS property
-	            	//if (root) {
-	            		//prop = (root+prop).replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl.bind(this));
-	            	//} else {
-    	        		prop = prop.replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl.bind(this));
-    	        	//}
-    	        	function cssUrlToNinjaUrl (s) {
-    	       			if (s !== 'url') {
-    	       				s = this.getDocRootUrl() + s;
-    	       			}
-    	       			return s;
-    	       		}
-        	    }
-       		}
+                //Checking for attributes and type of source
+                if (prop.indexOf('href') !== -1 || prop.indexOf('src') !== -1) {
+                    //From HTML attribute
+                    //if (root) {
+                    //prop = (root+prop).replace(/"([^"]*)"/gi, this.getNinjaUrlPrepend.bind(this));
+                    //} else {
+                    prop = prop.replace(/"([^"]*)"/gi, this.getNinjaUrlPrepend.bind(this));
+                    //}
+                } else if (prop.indexOf('url') !== -1) {
+                    //From CSS property
+                    //if (root) {
+                    //prop = (root+prop).replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl.bind(this));
+                    //} else {
+                    prop = prop.replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl.bind(this));
+                    //}
+                    function cssUrlToNinjaUrl(s) {
+                        if (s !== 'url') {
+                            s = this.getDocRootUrl() + s;
+                        }
+                        return s;
+                    }
+                }
+            }
             return prop;
-    	}
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getNinjaUrlPrepend: {
-    	enumerable: false,
-    	value: function (url) {
-    		if (url.indexOf('data:') !== -1) {
-            	return url;
+        enumerable: false,
+        value: function (url) {
+            if (url.indexOf('data:') !== -1) {
+                return url;
             } else {
-            	return '"'+this.getDocRootUrl()+url.replace(/\"/gi, '')+'"';
+                return '"' + this.getDocRootUrl() + url.replace(/\"/gi, '') + '"';
             }
-    	}
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Method to return a string from CSS rules (to be saved to a file)
     getCssFromRules: {
-    	enumerable: false,
-    	value: function (list) {
-    		//Variable to store CSS definitions
-    		var i, str, css = '';
-    		//Looping through list
-    		if (list && list.length > 0) {
-    			//Adding each list item to string and also adding breaks
-    			for (i = 0; list[i]; i++) {
-    				css += list[i].cssText;
-    			}
-    		}
-    		//Returning the CSS string
-    		return this.getPrettyCss(css.replace(this.getAppTemplatesUrlRegEx(), ''));
-    	}
+        enumerable: false,
+        value: function (list) {
+            //Variable to store CSS definitions
+            var i, str, css = '';
+            //Looping through list
+            if (list && list.length > 0) {
+                //Adding each list item to string and also adding breaks
+                for (i = 0; list[i]; i++) {
+                    css += list[i].cssText;
+                }
+            }
+            //Returning the CSS string
+            return this.getPrettyCss(css.replace(this.getAppTemplatesUrlRegEx(), ''));
+        }
     },
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
     //Pretty methods (minified)
     /*
-		is-beautify javascript code courtesy of Einar Lielmanis:
-		Code from https://github.com/einars/js-beautify
-		License https://github.com/einars/js-beautify/blob/master/license.txt
-		Used with author's permission, as stated below
+    is-beautify javascript code courtesy of Einar Lielmanis:
+    Code from https://github.com/einars/js-beautify
+    License https://github.com/einars/js-beautify/blob/master/license.txt
+    Used with author's permission, as stated below
 		
-		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.
-	*/
+    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.
+    */
     //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