From 9cb68d376870eea3db3636c30e5fa09d9f71c8cf Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Sun, 18 Mar 2012 18:07:40 -0700 Subject: Tests and clean-up --- js/mediators/io-mediator.js | 14 ++++++++------ node_modules/tools/template-creator.js | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 01879bac..18a517a5 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js @@ -462,17 +462,17 @@ function loadWebGL (e) {\n\ + + + // var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create(); + // for (var m in template.mjs) { mjsComponents.push(template.mjs[m]); mjsCounter++; } - -// console.log(mjsComponents); - - //console.log(TemplateCreator.) - + // 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; @@ -483,7 +483,7 @@ function loadWebGL (e) {\n\ 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 + //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 @@ -511,6 +511,8 @@ function loadWebGL (e) {\n\ + + //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)); // diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template-creator.js index ba4cdc7a..e312cd32 100644 --- a/node_modules/tools/template-creator.js +++ b/node_modules/tools/template-creator.js @@ -40,7 +40,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le self = this; this._objectNamesIndex = {}; - doc = this._document = document.implementation.createHTMLDocument(""); + //doc = this._document = document.implementation.createHTMLDocument(""); /* function copyNode(sourceNode, targetNode, isRootNode) { @@ -65,7 +65,8 @@ function copyNode(sourceNode, targetNode, isRootNode) { } */ - if (head) { + /* +if (head) { doc.head.innerHTML = head.innerHTML; } if (montageJsPath) { @@ -84,11 +85,12 @@ function copyNode(sourceNode, targetNode, isRootNode) { // the first child is the title doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild); } +*/ //copyNode(body, this._document.body, true); this._ownerSerialization = serializer.serialize(components); this._externalObjects = serializer.getExternalObjects(); - + return this; } }, -- cgit v1.2.3