diff options
| author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
| commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
| tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/ninja.reel | |
| parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 88361fd9..2a6e49f7 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
| @@ -143,7 +143,6 @@ exports.Ninja = Montage.create(Component, { | |||
| 143 | this.currentDocument = event.detail; | 143 | this.currentDocument = event.detail; |
| 144 | 144 | ||
| 145 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; | 145 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; |
| 146 | |||
| 147 | NJevent("openDocument"); | 146 | NJevent("openDocument"); |
| 148 | } | 147 | } |
| 149 | }, | 148 | }, |