aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorEric Guzman2012-02-22 23:19:45 -0800
committerEric Guzman2012-02-22 23:19:45 -0800
commit9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (patch)
treec7b5105153f17aedecd0669c611dbea44be7374c /js/ninja.reel
parenta5ee11857f923d3e49b44c0a8c480e9d0b026d5b (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-9e8cd4448a6d0f809a55c3bdea8b45ed75339794.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html15
-rwxr-xr-xjs/ninja.reel/ninja.js9
2 files changed, 10 insertions, 14 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index c9f17e3b..1393b4b9 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -228,7 +228,15 @@
228 228
229 "selectionController1": { 229 "selectionController1": {
230 "module": "js/controllers/selection-controller", 230 "module": "js/controllers/selection-controller",
231 "name": "SelectionController" 231 "name": "SelectionController",
232 "bindings" : {
233 "selectionContainer": {
234 "boundObject": {"@": "owner"},
235 "boundObjectPropertyPath": "currentSelectedContainer",
236 "oneway": true
237 }
238 }
239
232 }, 240 },
233 241
234 "documentController1": { 242 "documentController1": {
@@ -255,7 +263,7 @@
255 }, 263 },
256 264
257 "filePickerController": { 265 "filePickerController": {
258 "module": "js/components/ui/FilePicker/file-picker-controller", 266 "module": "js/io/ui/file-picker/file-picker-controller",
259 "name": "FilePickerController" 267 "name": "FilePickerController"
260 }, 268 },
261 269
@@ -355,9 +363,6 @@
355 <section id="rulerLeft"></section> 363 <section id="rulerLeft"></section>
356 <section id="stageAndScenesContainer"></section> 364 <section id="stageAndScenesContainer"></section>
357 </section> 365 </section>
358
359 <section id="sceneBar" style="display: none;"></section>
360
361 <section id="stateBar"> 366 <section id="stateBar">
362 <section id="documentBarContainer"> 367 <section id="documentBarContainer">
363 <div id="documentBar" class="documentBar"><a href="#">HTML</a></div> 368 <div id="documentBar" class="documentBar"><a href="#">HTML</a></div>
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 399d7b4d..6efeef8a 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -168,19 +168,10 @@ exports.Ninja = Montage.create(Component, {
168 168
169 this.appModel.show3dGrid = this.currentDocument.draw3DGrid; 169 this.appModel.show3dGrid = this.currentDocument.draw3DGrid;
170 170
171 this.currentDocument._document.body.addEventListener("userTemplateDidLoad", this.userTemplateDidLoad.bind(this), false);
172
173
174 NJevent("openDocument"); 171 NJevent("openDocument");
175 } 172 }
176 }, 173 },
177 174
178 userTemplateDidLoad: {
179 value: function(){
180 this.currentSelectedContainer = this.currentDocument.documentRoot;
181 }
182 },
183
184 executeLivePreview: { 175 executeLivePreview: {
185 value: function() { 176 value: function() {
186 var background, overflow, transitionStopRule; 177 var background, overflow, transitionStopRule;