aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-24 10:06:53 -0700
committerJose Antonio Marquez2012-04-24 10:06:53 -0700
commit4c15e77bdb7f4e0558f3749994a8a37b207b97ae (patch)
tree593ab4917fb5cc3ef8ee36822b56c6edd30c33a5 /js/document/html-document.js
parent36d50b6599ab98559c76e1fe57b1bb131c4433da (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-4c15e77bdb7f4e0558f3749994a8a37b207b97ae.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
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