aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorhwc4872012-04-24 09:54:34 -0700
committerhwc4872012-04-24 09:54:34 -0700
commit9d274a93cecc7cba543d27237e65425b2d6a393c (patch)
treeab26a25c360642e48ad27041fc270cae12cb6128 /js/document/html-document.js
parent27c1ba250a7db26cf24dd456d20af9ff1649e638 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-9d274a93cecc7cba543d27237e65425b2d6a393c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Canvas-interaction
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 cce88747..f33a1177 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