diff options
| author | Valerio Virgillito | 2012-03-21 13:30:51 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-21 13:30:51 -0700 |
| commit | 21a88a93f039bb7470c10d77efc01e549c4ae6dc (patch) | |
| tree | 44c53c6911b71c1fd749dd733a02cce3d8ce318a /js/document | |
| parent | 3888d7bce9bc9936cad2db4ed6e2f05b87265515 (diff) | |
| parent | 44b66216531a872f8dba6a11f1cf13c612c90247 (diff) | |
| download | ninja-21a88a93f039bb7470c10d77efc01e549c4ae6dc.tar.gz | |
Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/html-document.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index d4db6e2f..be1f89e2 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
| @@ -905,7 +905,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
| 905 | } | 905 | } |
| 906 | } | 906 | } |
| 907 | } | 907 | } |
| 908 | return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | 908 | return {mode: 'html', document: this._userDocument, mjs: this._userComponents, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; |
| 909 | } else if (this.currentView === "code"){ | 909 | } else if (this.currentView === "code"){ |
| 910 | //TODO: Would this get call when we are in code of HTML? | 910 | //TODO: Would this get call when we are in code of HTML? |
| 911 | } else { | 911 | } else { |
| @@ -928,7 +928,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
| 928 | } | 928 | } |
| 929 | } | 929 | } |
| 930 | } | 930 | } |
| 931 | return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | 931 | return {mode: 'html', document: this._userDocument, mjs: this._userComponents, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; |
| 932 | } else if (this.currentView === "code"){ | 932 | } else if (this.currentView === "code"){ |
| 933 | //TODO: Would this get call when we are in code of HTML? | 933 | //TODO: Would this get call when we are in code of HTML? |
| 934 | } else { | 934 | } else { |