aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/io-mediator.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-09 18:13:07 -0700
committerNivesh Rajbhandari2012-05-09 18:13:07 -0700
commit454ba956b0d6f48d37a5ad3f50eb00aaaaa7271b (patch)
treeb3826880c843435cdaf2d8981400909127466313 /js/mediators/io-mediator.js
parent9ff89d41048d056ddab4c15b4e9e74bc5417c883 (diff)
parent2e9a6b271439d934439514f6386424567853f93c (diff)
downloadninja-454ba956b0d6f48d37a5ad3f50eb00aaaaa7271b.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/mediators/io-mediator.js')
-rw-r--r--js/mediators/io-mediator.js37
1 files changed, 29 insertions, 8 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 6d146c97..dae0f359 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -10,7 +10,7 @@ var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component, 10 Component = require("montage/ui/component").Component,
11 FileIo = require("js/io/system/fileio").FileIo, 11 FileIo = require("js/io/system/fileio").FileIo,
12 ProjectIo = require("js/io/system/projectio").ProjectIo, 12 ProjectIo = require("js/io/system/projectio").ProjectIo,
13 TemplateCreator = require("node_modules/tools/template-creator").TemplateCreator; 13 TemplateCreator = require("node_modules/tools/template/template-creator").TemplateCreator;
14//////////////////////////////////////////////////////////////////////// 14////////////////////////////////////////////////////////////////////////
15// 15//
16exports.IoMediator = Montage.create(Component, { 16exports.IoMediator = Montage.create(Component, {
@@ -205,15 +205,34 @@ exports.IoMediator = Montage.create(Component, {
205 //Injecting head and body into old document 205 //Injecting head and body into old document
206 template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, ''); 206 template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
207 template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, ''); 207 template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
208
209
210
211 /*
212//Testing using montage clean up method
213 var mjscode, mjsTemp = TemplateCreator.create();
214
215 //mjscode = mjsTemp.initWithHeadAndBodyElements(template.head, template.body);
216 //mjscode = mjsTemp.initWithDocument(template.file.content.document);
217 mjscode = mjsTemp.initWithDocument(template.document);
218
219 console.log(template.head, mjscode._document.head);
220 template.file.content.document.head.innerHTML = mjscode._document.head.innerHTML.replace(regexRootUrl, '');
221 template.file.content.document.body.innerHTML = mjscode._document.body.innerHTML.replace(regexRootUrl, '');
222*/
223
224
225
226
208 //Getting all CSS (style or link) tags 227 //Getting all CSS (style or link) tags
209 var styletags = template.file.content.document.getElementsByTagName('style'), 228 var styletags = template.file.content.document.getElementsByTagName('style'),
210 linktags = template.file.content.document.getElementsByTagName('link'), 229 linktags = template.file.content.document.getElementsByTagName('link'),
211 toremovetags = [], 230 toremovetags = [],
212 njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]'), 231 njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]');
213 basetags = template.file.content.document.getElementsByTagName('base');
214 232
215 ////////////////////////////////////////////////// 233 //////////////////////////////////////////////////
216 //TODO: Remove, temp hack to avoid montage 234 //TODO: Remove, temp hack, this is to be fixed by Montage
235 var basetags = template.file.content.document.getElementsByTagName('base');
217 for (var g in basetags) { 236 for (var g in basetags) {
218 if (basetags[g].getAttribute) toremovetags.push(basetags[g]); 237 if (basetags[g].getAttribute) toremovetags.push(basetags[g]);
219 } 238 }
@@ -469,9 +488,9 @@ function loadWebGL (e) {\n\
469 488
470 489
471 // 490 //
472 var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create(); 491
473 // 492 /*
474 for (var m in template.mjs) { 493for (var m in template.mjs) {
475 mjsComponents.push(template.mjs[m]); 494 mjsComponents.push(template.mjs[m]);
476 mjsCounter++; 495 mjsCounter++;
477 } 496 }
@@ -509,6 +528,7 @@ function loadWebGL (e) {\n\
509 // 528 //
510 mjstag.innerHTML = mjscode; 529 mjstag.innerHTML = mjscode;
511 } 530 }
531*/
512 532
513 533
514 534
@@ -570,7 +590,8 @@ function loadWebGL (e) {\n\
570 // 590 //
571 getDocRootUrl: { 591 getDocRootUrl: {
572 value: function () { 592 value: function () {
573 return this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/')); 593 //TODO: Add support for model.baseHref (base tag)
594 return this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
574 } 595 }
575 }, 596 },
576 //////////////////////////////////////////////////////////////////// 597 ////////////////////////////////////////////////////////////////////