diff options
author | Jon Reid | 2012-03-06 14:15:18 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:15:18 -0800 |
commit | 78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3 (patch) | |
tree | c395b703f21431dcb4432c725f4c860431add61b /js/document | |
parent | fa8b81d4f436c0b8564c8dcdd22d8dd6d5bccfaa (diff) | |
parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
download | ninja-78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3.tar.gz |
Merge branch 'Timeline-uber' into timeline-serialized
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 5d507476..536fca47 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -668,7 +668,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
668 | } | 668 | } |
669 | } | 669 | } |
670 | } | 670 | } |
671 | return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | 671 | //return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; |
672 | return {mode: 'html', document: this._userDocument, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | ||
672 | } else if (this.currentView === "code"){ | 673 | } else if (this.currentView === "code"){ |
673 | //TODO: Would this get call when we are in code of HTML? | 674 | //TODO: Would this get call when we are in code of HTML? |
674 | } else { | 675 | } else { |
@@ -691,7 +692,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
691 | } | 692 | } |
692 | } | 693 | } |
693 | } | 694 | } |
694 | return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | 695 | //return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; |
696 | return {mode: 'html', document: this._userDocument, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | ||
695 | } else if (this.currentView === "code"){ | 697 | } else if (this.currentView === "code"){ |
696 | //TODO: Would this get call when we are in code of HTML? | 698 | //TODO: Would this get call when we are in code of HTML? |
697 | } else { | 699 | } else { |