diff options
author | John Mayhew | 2012-05-07 16:30:19 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/controllers/document-controller.js | |
parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/controllers/document-controller.js')
-rwxr-xr-x | js/controllers/document-controller.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 4be0767a..6d11bd0e 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -483,11 +483,16 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
483 | 483 | ||
484 | if(!this.webTemplate) { | 484 | if(!this.webTemplate) { |
485 | this._showCurrentDocument(); | 485 | this._showCurrentDocument(); |
486 | } else { | ||
487 | this.application.ninja.stage.stageView.showRulers(); | ||
486 | } | 488 | } |
487 | 489 | ||
488 | this.webTemplate = false; | 490 | this.webTemplate = false; |
489 | 491 | ||
490 | NJevent("onOpenDocument", doc); | 492 | NJevent("onOpenDocument", doc); |
493 | |||
494 | this.application.ninja.stage.stageView.showCodeViewBar(false); | ||
495 | this.application.ninja.stage.stageView.restoreAllPanels(); | ||
491 | } | 496 | } |
492 | }, | 497 | }, |
493 | 498 | ||