From 0efbbf8287517b755be1774f6aa49947bed50a0d Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 7 Jun 2012 11:24:29 -0700
Subject: Adding unique ID to canvas data folders

Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
---
 js/document/mediators/template.js | 49 ++++++++++++++++++++++-----------------
 js/document/models/base.js        | 33 ++++++++++++++++++++++++--
 js/mediators/io-mediator.js       | 10 +++++---
 3 files changed, 66 insertions(+), 26 deletions(-)

(limited to 'js')

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 068a1f48..c9d46f79 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -8,7 +8,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage = 			require("montage/core/core").Montage,
 	Component = 		require("montage/ui/component").Component,
-	TemplateCreator = 	require("node_modules/tools/template/template-creator").TemplateCreator;
+	TemplateCreator = 	require("node_modules/tools/template/template-creator").TemplateCreator,
+	ClassUuid = 		require("js/components/core/class-uuid").ClassUuid;
 ////////////////////////////////////////////////////////////////////////
 //	
 exports.TemplateDocumentMediator = Montage.create(Component, {
@@ -93,7 +94,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
-        value: function (template, ninjaWrapper, libCopyCallback) {
+        value: function (saveExternalData, template, ninjaWrapper, libCopyCallback) {
         	//TODO: Improve reference for rootUrl
             var regexRootUrl,
             	rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
@@ -328,7 +329,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             
             
             
-            //TODO: Make proper webGL/Canvas method
+            
             
             //
             var webgltag, webgllibtag, webglrdgetag, mjstag, mjslibtag, matchingtags = [],
@@ -357,19 +358,33 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                     }
                 }
             }
+            
+            
+            
+            
+            //TODO: Make proper webGL/Canvas method
+            
+            
             //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, cvsDataDir = this.getCanvasDirectory(template.file.root), fileCvsDir, fileCvsDirAppend, cvsDirCounter = 1, fileOrgDataSrc;
                 //
                 if (cvsDataDir && !matchingtags.length && !webgllibtag) {
-                	fileCvsDir = cvsDataDir+template.file.name.split('.'+template.file.extension)[0];
+                	
+                	if (template.libs.canvasId) {
+	                	libsobserver.canvasId = template.libs.canvasId;
+                	} else {
+	                	libsobserver.canvasId = ClassUuid.generate();
+                	}
+                	
+                	//Creating data directory, will include materials at a later time
+                	fileCvsDir = cvsDataDir+template.file.name.split('.'+template.file.extension)[0]+'_'+libsobserver.canvasId;
+                	
                 	if (!this._getUserDirectory(fileCvsDir)) {
-                		fileCvsDirAppend = fileCvsDir+cvsDirCounter;
-                		while (!this._getUserDirectory(fileCvsDirAppend)) {
-                			fileCvsDirAppend = fileCvsDir+(cvsDirCounter++);
-                		}
+                		//TODO: create proper logic not to overwrite files
+                		console.log('error');
                 	}
-                	//TODO: Allow user overwrite
+                	
                 	fileCvsDir += '/';
                 } else if (webgllibtag && webgllibtag.getAttribute && webgllibtag.getAttribute('data-ninja-canvas-json') !== null) {
                 	fileOrgDataSrc = template.file.root+webgllibtag.getAttribute('data-ninja-canvas-json');
@@ -437,17 +452,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                 //Looping through data to create escaped array
                 for (var j = 0; template.webgl[j]; j++) {
                     if (j === 0) {
-                    	//if (fileCvsDir) {
-                    	//	json += '\n\t\t\t"' + template.webgl[j] + '"';
-                    	//} else {
-                    		json += '\n\t\t\t"' + escape(template.webgl[j]) + '"';
-                    	//}
+                    	json += '\n\t\t\t"' + escape(template.webgl[j]) + '"';
                     } else {
-                    	//if (fileCvsDir) {
-                    	//	json += ',\n\t\t\t"' + template.webgl[j] + '"';
-                    	//} else {
-                    		json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"';
-                    	//}
+                    	json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"';
                     }
                 }
                 //Closing array (make-shift JSON string to validate data in <script> tag)
@@ -590,9 +597,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             }
             //
             if (libsobserver.montage || libsobserver.canvas) {
-            	return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: true};
+            	return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: true, montageId: libsobserver.montageId, canvasId: libsobserver.canvasId};
             } else {
-	            return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: false};
+	            return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: false, montageId: libsobserver.montageId, canvasId: libsobserver.canvasId};
             }
         }
     },
diff --git a/js/document/models/base.js b/js/document/models/base.js
index a3644815..c69c54a9 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -90,6 +90,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
 	views: {
         value: null
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	libs: {
+        value: {montage: false, canvas: false, montageId: null, canvasId: null}
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	switchViewTo: {
@@ -167,8 +172,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	//
         	if (this.currentView === this.views.design) {
             	//
-        		this.application.ninja.ioMediator.fileSave({
+        		var save = this.application.ninja.ioMediator.fileSave({
         			mode: 'html',
+        			libs: this.libs,
         			file: this.file,
         			webgl: this.webGlHelper.glData,
         			styles: this.getStyleSheets(),
@@ -178,6 +184,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			body: this.views.design.iframe.contentWindow.document.body,
         			mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
         		}, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
+        		//TODO: Improve detection during save routine
+        		if (save) {
+	        		if (save.montageId) {
+		        		this.libs.montageId = save.montageId;
+		        		this.libs.montage = true;
+	        		}
+	        		if (save.canvasId) {
+		        		this.libs.canvasId = save.canvasId;
+		        		this.libs.canvas = true;
+	        		}
+        		}
         	} else {
         		//TODO: Add logic to save code view data
         	}
@@ -196,8 +213,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	//
         	if (this.currentView === this.views.design) {
             	//
-        		this.application.ninja.ioMediator.fileSave({
+        		var save = this.application.ninja.ioMediator.fileSave({
         			mode: 'html',
+        			libs: this.libs,
         			file: this.file,
         			webgl: this.webGlHelper.glData,
         			css: this.getStyleSheets(),
@@ -207,6 +225,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			body: this.views.design.iframe.contentWindow.document.body,
         			mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
         		}, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
+        		//TODO: Improve detection during save routine
+        		if (save) {
+	        		if (save.montageId) {
+		        		this.libs.montageId = save.montageId;
+		        		this.libs.montage = true;
+	        		}
+	        		if (save.canvasId) {
+		        		this.libs.canvasId = save.canvasId;
+		        		this.libs.canvas = true;
+	        		}
+        		}
         	} else {
         		//TODO: Add logic to save code view data
         	}
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c9e10896..c487fef5 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -162,9 +162,9 @@ exports.IoMediator = Montage.create(Component, {
                 case 'html':
                     //Getting content from function to properly handle saving assets (as in external if flagged)
                     if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) {
-                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(doc, true, libCopyCallback);
+                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback);
                     } else {
-                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(doc, false, libCopyCallback);
+                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback);
                     }
                     break;
                 default:
@@ -176,13 +176,17 @@ exports.IoMediator = Montage.create(Component, {
             	save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content});
             	//Checking for callback
             	if (callback) callback(save);
+            	//Checking for libraries, making callback if specified
+            	if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true);
             	//
-            	if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true); 
+            	return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId};
             } else {
 	            //Making call to save file
             	save = this.fio.saveFile({uri: doc.file.uri, contents: content});
             	//Checking for callback
             	if (callback) callback(save);
+            	//
+            	return null;
             }
         }
     },
-- 
cgit v1.2.3


From 8da49b093e01a62c5b2009da075c2ccd2b1b6f5a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 7 Jun 2012 14:39:12 -0700
Subject: Fixing unique ID store

---
 js/document/models/base.js | 10 +++-------
 js/document/models/html.js |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'js')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index c69c54a9..5fa06259 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -68,12 +68,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     selection: {
-        get: function() {
-            return this._selection;
-        },
-        set: function(value) {
-            this._selection = value;
-        }
+        get: function() {return this._selection;},
+        set: function(value) {this._selection = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -93,7 +89,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
 	//
 	libs: {
-        value: {montage: false, canvas: false, montageId: null, canvasId: null}
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
 	//
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 6bdc6546..7064c6e3 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -23,6 +23,8 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value:function() {
         	//Creating instance of the webGL helper for this model
         	this.webGlHelper = webGlDocumentHelper.create();
+        	//
+        	this.libs = {montage: false, canvas: false, montageId: null, canvasId: null};
 		}           
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 1698e3b0c99ff972da61d915074f1f7f1646f641 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 7 Jun 2012 14:44:10 -0700
Subject: Adding support for html and head tags attributes

Both on open and close, Chrome randomly changes order of attributes, so this is browser induced bug.
---
 js/document/mediators/template.js | 47 ++++++++++++++++++++++++++++++---------
 js/document/views/design.js       | 14 +++++++++++-
 2 files changed, 50 insertions(+), 11 deletions(-)

(limited to 'js')

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index c9d46f79..5692ca2d 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -84,9 +84,22 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     parseHtmlToNinjaTemplate: {
         value: function (html) {
             //Creating temp object to mimic HTML
-            var doc = window.document.implementation.createHTMLDocument(), template;
+            var doc = window.document.implementation.createHTMLDocument(), template, docHtmlTag,
+            	hackHtml = document.createElement('html'), hackTag;
             //Setting content to temp
             doc.getElementsByTagName('html')[0].innerHTML = html;
+            //TODO: Improve this, very bad way of copying attributes (in a pinch to get it working)
+            hackHtml.innerHTML = html.replace(/html/gi, 'ninjahtmlhack');
+            hackTag = hackHtml.getElementsByTagName('ninjahtmlhack')[0];
+            docHtmlTag = doc.getElementsByTagName('html')[0];
+            //Looping through the attributes to copy them
+            for (var m in hackTag.attributes) {
+				if (hackTag.attributes[m].value) {
+					docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html'));
+				}
+			}
+			//Garbage collection
+            hackHtml = hackTag = null;
             //Creating return object
             return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc};
         }
@@ -117,20 +130,34 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             	template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
 	            template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
             }
+            //Removes all attributes from node
+            function wipeAttributes (node) {
+	            for (var f in node.attributes) {
+		            node.removeAttribute(node.attributes[f].name);
+			    }
+            }
             //Copying attributes to maintain same properties as the <body>
+            wipeAttributes(template.file.content.document.body);
 			for (var n in template.body.attributes) {
 				if (template.body.attributes[n].value) {
-					//
 					template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value);
 				}				
 			}
-            
-            
-            
-            //TODO: Add attribute copying for <HEAD> and <HTML>
-            
-            
-            
+			wipeAttributes(template.file.content.document.head);
+            //Copying attributes to maintain same properties as the <head>
+			for (var m in template.document.head.attributes) {
+				if (template.document.head.attributes[m].value) {
+					template.file.content.document.head.setAttribute(template.document.head.attributes[m].name, template.document.head.attributes[m].value);
+				}
+			}
+            //Copying attributes to maintain same properties as the <html>
+			var htmlTagMem = template.document.getElementsByTagName('html')[0], htmlTagDoc = template.file.content.document.getElementsByTagName('html')[0];
+			wipeAttributes(htmlTagDoc);
+			for (var m in htmlTagMem.attributes) {
+				if (htmlTagMem.attributes[m].value) {
+					htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value.replace(/ montage-app-bootstrapping/gi, ''));
+				}
+			}
             //Getting list of current nodes (Ninja DOM)
             presentNodes = template.file.content.document.getElementsByTagName('*');
             //Looping through nodes to determine origin and removing if not inserted by Ninja
@@ -370,7 +397,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                 var rdgeDirName, rdgeVersion, cvsDataDir = this.getCanvasDirectory(template.file.root), fileCvsDir, fileCvsDirAppend, cvsDirCounter = 1, fileOrgDataSrc;
                 //
                 if (cvsDataDir && !matchingtags.length && !webgllibtag) {
-                	
+                
                 	if (template.libs.canvasId) {
 	                	libsobserver.canvasId = template.libs.canvasId;
                 	} else {
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 3d11e138..1a5b071e 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -204,7 +204,19 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 						this.document.body.setAttribute(this.content.document.body.attributes[n].name, this.content.document.body.attributes[n].value);
 					}
 				}
-				//TODO: Add attribute copying for <HEAD> and <HTML>
+				//Copying attributes to maintain same properties as the <head>
+				for (var m in this.content.document.head.attributes) {
+					if (this.content.document.head.attributes[m].value) {
+						this.document.head.setAttribute(this.content.document.head.attributes[m].name, this.content.document.head.attributes[m].value);
+					}
+				}
+				//Copying attributes to maintain same properties as the <html>
+				var htmlTagMem = this.content.document.getElementsByTagName('html')[0], htmlTagDoc = this.document.getElementsByTagName('html')[0];
+				for (var m in htmlTagMem.attributes) {
+					if (htmlTagMem.attributes[m].value) {
+						htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value);
+					}
+				}
 			}
         }
     },
-- 
cgit v1.2.3


From 5f780df3b5410386f9cf7691ebdf05969770759f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 7 Jun 2012 15:09:16 -0700
Subject: Minor fixes

Ensuring montage style is removed and doctype is included.
---
 js/document/mediators/template.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 5692ca2d..560f8c45 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -155,7 +155,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
 			wipeAttributes(htmlTagDoc);
 			for (var m in htmlTagMem.attributes) {
 				if (htmlTagMem.attributes[m].value) {
-					htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value.replace(/ montage-app-bootstrapping/gi, ''));
+					htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value.replace(/montage-app-bootstrapping/gi, ''));
 				}
 			}
             //Getting list of current nodes (Ninja DOM)
@@ -609,6 +609,8 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             } else {
             	cleanHTML = template.file.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));
       	    }
+      	    //TODO: Remove, this is a temp hack
+      	    cleanHTML = '<!DOCTYPE html>\n'+cleanHTML;
             //
             function parseNinjaRootUrl(url) {
                 if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
-- 
cgit v1.2.3


From 25fa6978470c296bd40321d5aa3046d34062ecd8 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 7 Jun 2012 15:59:51 -0700
Subject: Fixing empty property bug with montage class on HTML tag

---
 js/document/mediators/template.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 560f8c45..e04c16d9 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -155,7 +155,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
 			wipeAttributes(htmlTagDoc);
 			for (var m in htmlTagMem.attributes) {
 				if (htmlTagMem.attributes[m].value) {
-					htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value.replace(/montage-app-bootstrapping/gi, ''));
+					if (htmlTagMem.attributes[m].value.replace(/montage-app-bootstrapping/gi, '').length>0) {
+						htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value.replace(/ montage-app-bootstrapping/gi, ''));
+					}
 				}
 			}
             //Getting list of current nodes (Ninja DOM)
-- 
cgit v1.2.3