aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-14 15:17:01 -0700
committerJose Antonio Marquez2012-03-14 15:17:01 -0700
commite7e18f02870a0cfe06e550acf8ffef6eab945231 (patch)
treec940a63fd47e60f121c42b1823194522c8c2820f /js/ninja.reel
parentef601b13a2529c207eb782942e918212e5a0805e (diff)
parent089534a80c64226bf7d124ab9147afce386fdb5c (diff)
downloadninja-e7e18f02870a0cfe06e550acf8ffef6eab945231.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html2
-rwxr-xr-xjs/ninja.reel/ninja.js1
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 },