aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-26 11:32:10 -0800
committerJose Antonio Marquez2012-02-26 11:32:10 -0800
commit3638492098a21aef63842366fbfc035fc6414fb0 (patch)
tree9270e3e7f2bb638fd1c9a126d6410ac0b30ba680 /js/document
parentd4ac479796f0341163e02ba50fa892773212a445 (diff)
downloadninja-3638492098a21aef63842366fbfc035fc6414fb0.tar.gz
Fixed issue with losing track of Ninja template css
Also cleaned up URL getter for app in cleaning string code.
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 472d15de..76436732 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -465,7 +465,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
465 } 465 }
466 } 466 }
467 } else { 467 } else {
468 //None local stylesheet, probably on a CDN (locked) 468 /*
469//None local stylesheet, probably on a CDN (locked)
469 tag = this.iframe.contentWindow.document.createElement('style'); 470 tag = this.iframe.contentWindow.document.createElement('style');
470 tag.setAttribute('type', 'text/css'); 471 tag.setAttribute('type', 'text/css');
471 tag.setAttribute('data-ninja-external-url', this._document.styleSheets[i].href); 472 tag.setAttribute('data-ninja-external-url', this._document.styleSheets[i].href);
@@ -473,8 +474,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
473 tag.setAttribute('data-ninja-file-name', this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1]); 474 tag.setAttribute('data-ninja-file-name', this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1]);
474 475
475 //TODO: Figure out cross-domain XHR issue, might need cloud to handle 476 //TODO: Figure out cross-domain XHR issue, might need cloud to handle
476 /* 477 var xhr = new XMLHttpRequest();
477var xhr = new XMLHttpRequest();
478 xhr.open("GET", this._document.styleSheets[i].href, true); 478 xhr.open("GET", this._document.styleSheets[i].href, true);
479 xhr.send(); 479 xhr.send();
480 // 480 //
@@ -482,7 +482,6 @@ var xhr = new XMLHttpRequest();
482 console.log(xhr); 482 console.log(xhr);
483 } 483 }
484 //tag.innerHTML = xhr.responseText //xhr.response; 484 //tag.innerHTML = xhr.responseText //xhr.response;
485*/
486 485
487 //Currently no external styles will load if unable to load via XHR request 486 //Currently no external styles will load if unable to load via XHR request
488 487
@@ -496,6 +495,7 @@ var xhr = new XMLHttpRequest();
496 this._templateDocument.head.insertBefore(tag, query[j]); 495 this._templateDocument.head.insertBefore(tag, query[j]);
497 } 496 }
498 } 497 }
498*/
499 } 499 }
500 } 500 }
501 } 501 }