aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-23 17:09:31 -0700
committerValerio Virgillito2012-04-23 17:09:31 -0700
commit55e6d621b9555abac06ab4adff44dfe29a78ec4e (patch)
tree3f383cb4b9e92dcb7f80eed62ff6cbc467062448 /js/document/html-document.js
parent5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
parent4ab2a55ba2175c72f859c428122a166f8af74140 (diff)
downloadninja-55e6d621b9555abac06ab4adff44dfe29a78ec4e.tar.gz
Merge pull request #173 from mencio/stage-document-architecture
Stage document architecture - Initial commit to support opening Web template
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-xjs/document/html-document.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 2531465d..54db9eaa 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -404,7 +404,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
404 this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"]; 404 this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
405 this.currentView = "design"; 405 this.currentView = "design";
406 // 406 //
407 this.iframe.src = this._htmlTemplateUrl; 407
408 this.iframe.src = this._htmlTemplateUrl;
408 this.iframe.addEventListener("load", this, true); 409 this.iframe.addEventListener("load", this, true);
409 } 410 }
410 }, 411 },
@@ -528,8 +529,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
528 value: 0 529 value: 0
529 }, 530 },
530*/ 531*/
531
532
533 //////////////////////////////////////////////////////////////////// 532 ////////////////////////////////////////////////////////////////////
534 // 533 //
535 handleEvent: { 534 handleEvent: {
@@ -827,7 +826,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
827 // Setting up the currentSelectedContainer to the document body. 826 // Setting up the currentSelectedContainer to the document body.
828 userTemplateDidLoad: { 827 userTemplateDidLoad: {
829 value: function(){ 828 value: function(){
830 this.application.ninja.currentSelectedContainer = this.documentRoot; 829 //this.application.ninja.currentSelectedContainer = this.documentRoot;
831 } 830 }
832 }, 831 },
833 832