aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-24 08:29:30 -0700
committerPushkar Joshi2012-04-24 08:29:30 -0700
commite7bbd9b08b4cd87530596b370366d994ca766650 (patch)
tree8862827848c55b36cc2e2bc0bb0c07a5e50dc1ca /js/document/html-document.js
parentf57727d36709bbda03b45788dc12faf31a591b40 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-e7bbd9b08b4cd87530596b370366d994ca766650.tar.gz
Merge branch 'master' into pentool
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 da775405..3876670c 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -408,7 +408,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
408 this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"]; 408 this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
409 this.currentView = "design"; 409 this.currentView = "design";
410 // 410 //
411 this.iframe.src = this._htmlTemplateUrl; 411
412 this.iframe.src = this._htmlTemplateUrl;
412 this.iframe.addEventListener("load", this, true); 413 this.iframe.addEventListener("load", this, true);
413 } 414 }
414 }, 415 },
@@ -532,8 +533,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
532 value: 0 533 value: 0
533 }, 534 },
534*/ 535*/
535
536
537 //////////////////////////////////////////////////////////////////// 536 ////////////////////////////////////////////////////////////////////
538 // 537 //
539 handleEvent: { 538 handleEvent: {
@@ -831,7 +830,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
831 // Setting up the currentSelectedContainer to the document body. 830 // Setting up the currentSelectedContainer to the document body.
832 userTemplateDidLoad: { 831 userTemplateDidLoad: {
833 value: function(){ 832 value: function(){
834 this.application.ninja.currentSelectedContainer = this.documentRoot; 833 //this.application.ninja.currentSelectedContainer = this.documentRoot;
835 } 834 }
836 }, 835 },
837 836