diff options
| author | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
| commit | ce2d581894f9e433a7b73e4b622352a657b6ddaa (patch) | |
| tree | bbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/controllers/document-controller.js | |
| parent | 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff) | |
| parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
| download | ninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts:
js/document/templates/montage-web/default_html.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers/document-controller.js')
| -rwxr-xr-x | js/controllers/document-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 6d11bd0e..803519a7 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
| @@ -366,7 +366,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
| 366 | case 'html': | 366 | case 'html': |
| 367 | //Open in designer view | 367 | //Open in designer view |
| 368 | this._hackRootFlag = false; | 368 | this._hackRootFlag = false; |
| 369 | Montage.create(Document).init(doc, this, this._onOpenDocument); | 369 | Montage.create(Document).init(doc, this, this._onOpenDocument, 'design'); |
| 370 | break; | 370 | break; |
| 371 | default: | 371 | default: |
| 372 | //Open in code view | 372 | //Open in code view |