diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/controllers/document-controller.js | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
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 1cb66d3f..6d11bd0e 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; |