From 3811f72f8cd8caaa2d13fa695b918f25facb85c5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 9 May 2012 16:28:13 -0700
Subject: Preliminary Montage Template Cleanup

The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save.
---
 js/mediators/io-mediator.js | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

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

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 6d146c97..cf44ab9d 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -10,7 +10,7 @@ var Montage = 			require("montage/core/core").Montage,
 	Component = 		require("montage/ui/component").Component,
 	FileIo = 			require("js/io/system/fileio").FileIo,
 	ProjectIo = 		require("js/io/system/projectio").ProjectIo,
-	TemplateCreator = 	require("node_modules/tools/template-creator").TemplateCreator;
+	TemplateCreator = 	require("node_modules/tools/template/template-creator").TemplateCreator;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.IoMediator = Montage.create(Component, {
@@ -203,20 +203,38 @@ exports.IoMediator = Montage.create(Component, {
             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.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
-            template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
+            //template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
+            //template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
+            
+            
+            
+            //Testing using montage clean up method
+            var mjscode, mjsTemp = TemplateCreator.create();
+        	
+            //mjscode = mjsTemp.initWithHeadAndBodyElements(template.head, template.body);
+            mjscode = mjsTemp.initWithDocument(template.file.content.document);
+            
+            console.log(template.head, mjscode._document.head);
+            template.file.content.document.head.innerHTML = mjscode._document.head.innerHTML.replace(regexRootUrl, '');
+            template.file.content.document.body.innerHTML = mjscode._document.body.innerHTML.replace(regexRootUrl, '');
+            
+            
+            
+            
             //Getting all CSS (style or link) tags
             var styletags = template.file.content.document.getElementsByTagName('style'),
     			linktags = template.file.content.document.getElementsByTagName('link'),
     			toremovetags = [],
-    			njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]'),
-    			basetags = template.file.content.document.getElementsByTagName('base');
+    			njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]');
     		
     		//////////////////////////////////////////////////
-    		//TODO: Remove, temp hack to avoid montage
+    		//TODO: Remove, temp hack, this is to be fixed by Montage
+    		/*
+var basetags = template.file.content.document.getElementsByTagName('base');
     		for (var g in basetags) {
     			if (basetags[g].getAttribute) toremovetags.push(basetags[g]);
     		}
+*/
     		//////////////////////////////////////////////////
     		
     		//
@@ -469,9 +487,9 @@ function loadWebGL (e) {\n\
 
 
             //
-            var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create();
-            //
-            for (var m in template.mjs) {
+            
+            /*
+for (var m in template.mjs) {
                 mjsComponents.push(template.mjs[m]);
                 mjsCounter++;
             }
@@ -509,6 +527,7 @@ function loadWebGL (e) {\n\
                 //
                 mjstag.innerHTML = mjscode;
             }
+*/
 
 
 
@@ -570,7 +589,8 @@ function loadWebGL (e) {\n\
     //
     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, '/'));
+        	//TODO: Add support for model.baseHref (base tag)
+        	return this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
         }
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3