diff options
| author | hwc487 | 2012-05-01 11:03:56 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-01 11:03:56 -0700 |
| commit | f6983a69649b1c274ce6fe2d278a325994d092b6 (patch) | |
| tree | a360297930c35f3097af16e9f6714ec501bd5894 /js/controllers/document-controller.js | |
| parent | 80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff) | |
| parent | fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff) | |
| download | ninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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; |