diff options
| author | Eric Guzman | 2012-05-01 11:16:22 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-01 11:16:22 -0700 |
| commit | 0ad52cd1ba6987446b9959e399c5ad14b8c631ee (patch) | |
| tree | 2d8198be86b3d3e7e812f3f3175c27ba2993fb5b /js/controllers/document-controller.js | |
| parent | 9a94c6fb5f82d18139b48341788a0ffca23ae0af (diff) | |
| parent | fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff) | |
| download | ninja-0ad52cd1ba6987446b9959e399c5ad14b8c631ee.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/controllers/document-controller.js')
| -rwxr-xr-x | js/controllers/document-controller.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 4be0767a..7795a74d 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
| @@ -483,6 +483,8 @@ 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; |