diff options
author | Jose Antonio Marquez | 2012-03-14 15:17:01 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-14 15:17:01 -0700 |
commit | e7e18f02870a0cfe06e550acf8ffef6eab945231 (patch) | |
tree | c940a63fd47e60f121c42b1823194522c8c2820f /js/ninja.reel | |
parent | ef601b13a2529c207eb782942e918212e5a0805e (diff) | |
parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
download | ninja-e7e18f02870a0cfe06e550acf8ffef6eab945231.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 2 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 8f6f6d7b..3dc45498 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -399,8 +399,6 @@ | |||
399 | 399 | ||
400 | <section id="popupWindows"></section> | 400 | <section id="popupWindows"></section> |
401 | 401 | ||
402 | <div id="modalContainer"></div> | ||
403 | |||
404 | </div> | 402 | </div> |
405 | 403 | ||
406 | </body> | 404 | </body> |
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 | }, |