aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorhwc4872012-03-06 16:03:26 -0800
committerhwc4872012-03-06 16:03:26 -0800
commit855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch)
tree60d7f091fcf0870495aeaa63748492dbd558619d /js/document
parent1207735f05f202b5bdc5f70c73445f8e0934a227 (diff)
parent4f498b43264327f5886e0370bd3536453d47570a (diff)
downloadninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/preloader/Preloader.js
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 00cf0164..8592a445 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -789,7 +789,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
789 } 789 }
790 } 790 }
791 } 791 }
792 return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; 792 //return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
793 return {mode: 'html', document: this._userDocument, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
793 } else if (this.currentView === "code"){ 794 } else if (this.currentView === "code"){
794 //TODO: Would this get call when we are in code of HTML? 795 //TODO: Would this get call when we are in code of HTML?
795 } else { 796 } else {
@@ -812,7 +813,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
812 } 813 }
813 } 814 }
814 } 815 }
815 return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; 816 //return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
817 return {mode: 'html', document: this._userDocument, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
816 } else if (this.currentView === "code"){ 818 } else if (this.currentView === "code"){
817 //TODO: Would this get call when we are in code of HTML? 819 //TODO: Would this get call when we are in code of HTML?
818 } else { 820 } else {