diff options
author | Eric Guzman | 2012-04-23 22:39:22 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-23 22:39:22 -0700 |
commit | 1538514aad2d249a11152789cd06f5e00386d7d7 (patch) | |
tree | c61fcc980d29d762a1ff2a3c5717b62991ed0a43 /js/document/html-document.js | |
parent | 64b9c65ddee456a717bae0872a54e0593f1cd482 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-1538514aad2d249a11152789cd06f5e00386d7d7.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-x | js/document/html-document.js | 7 |
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 | ||