aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/ninja.reel
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html62
-rwxr-xr-xjs/ninja.reel/ninja.js7
2 files changed, 37 insertions, 32 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 3c4a4537..52a6daa2 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -196,6 +196,13 @@
196 } 196 }
197 }, 197 },
198 198
199 "editorViewOptions": {
200 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
201 "properties": {
202 "element": {"#": "editorViewOptions"}
203 }
204 },
205
199 "panelContainer": { 206 "panelContainer": {
200 "prototype": "js/panels/PanelContainer.reel", 207 "prototype": "js/panels/PanelContainer.reel",
201 "properties": { 208 "properties": {
@@ -262,7 +269,6 @@
262 "oneway": true 269 "oneway": true
263 } 270 }
264 } 271 }
265
266 }, 272 },
267 273
268 "documentController1": { 274 "documentController1": {
@@ -311,6 +317,10 @@
311 } 317 }
312 }, 318 },
313 319
320 "codeEditorController": {
321 "prototype": "js/controllers/code-editor-controller"
322 },
323
314 "owner": { 324 "owner": {
315 "prototype": "js/ninja.reel", 325 "prototype": "js/ninja.reel",
316 "properties": { 326 "properties": {
@@ -322,7 +332,6 @@
322 "toolsList": {"@": "toolsList1"}, 332 "toolsList": {"@": "toolsList1"},
323 "toolsProperties": {"@": "toolsProperties1"}, 333 "toolsProperties": {"@": "toolsProperties1"},
324 "stage": {"@": "stage1"}, 334 "stage": {"@": "stage1"},
325 "settings": {"@": "settings1"},
326 "elementMediator": {"@": "elementMediator"}, 335 "elementMediator": {"@": "elementMediator"},
327 "dragDropMediator": {"@": "dragDropMediator"}, 336 "dragDropMediator": {"@": "dragDropMediator"},
328 "undocontroller": {"@": "undocontroller1"}, 337 "undocontroller": {"@": "undocontroller1"},
@@ -336,12 +345,16 @@
336 "newFileController": {"@": "newFileController"}, 345 "newFileController": {"@": "newFileController"},
337 "coreIoApi": {"@": "coreIoApi1"}, 346 "coreIoApi": {"@": "coreIoApi1"},
338 "documentBar": {"@": "documentBar"}, 347 "documentBar": {"@": "documentBar"},
348 "editorViewOptions": {"@": "editorViewOptions"},
339 "ioMediator": {"@": "ioMediator"}, 349 "ioMediator": {"@": "ioMediator"},
340 "timeline": {"@": "timeline"}, 350 "timeline": {"@": "timeline"},
341 "mainMenuController": {"@": "mainMenuController"}, 351 "mainMenuController": {"@": "mainMenuController"},
352 "codeEditorController": {"@": "codeEditorController"},
342 "rightPanelContainer": {"#": "rightPanelContainer" }, 353 "rightPanelContainer": {"#": "rightPanelContainer" },
343 "panelSplitter": {"@": "splitter3"}, 354 "panelSplitter": {"@": "splitter3"},
344 "timelineSplitter": {"@": "splitter4"} 355 "timelineSplitter": {"@": "splitter4"},
356 "toolsSplitter": {"@": "splitter2"},
357 "optionsSplitter": {"@": "splitter1"}
345 } 358 }
346 } 359 }
347 } 360 }
@@ -350,10 +363,10 @@
350</head> 363</head>
351<body> 364<body>
352 365
353 <div id="main" class="main"> 366 <div data-montage-id="main" class="main">
354 367
355 <section id="topMenu"> 368 <section id="topMenu">
356 <nav id="mainMenuBar"></nav> 369 <nav data-montage-id="mainMenuBar"></nav>
357 </section> 370 </section>
358 371
359 <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section> 372 <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section>
@@ -363,22 +376,20 @@
363 <section id="appContainer"> 376 <section id="appContainer">
364 <section data-montage-id="topSplitter" class="topSplitter splitter"></section> 377 <section data-montage-id="topSplitter" class="topSplitter splitter"></section>
365 378
366 <section id="topPanelContainer" class="panelContainer"> 379 <section data-montage-id="topPanelContainer" id="topPanelContainer" class="panelContainer">
367 <div id="topPanel" class="panel"> 380 <div id="topPanel" class="panel">
368 <div id="toolPropertiesPanel"> 381 <div id="toolPropertiesPanel">
369 <div id="toolsProperties"></div> 382 <div data-montage-id="toolsProperties"></div>
370 </div> 383 </div>
371 384
372 <div id="stageMode" class="unselectable marginposition"> 385 <div data-montage-id="stageMode" class="unselectable marginposition"></div>
373 <!--<div id="stageModeImg" class="unselectable editMode"></div>-->
374 </div>
375 </div> 386 </div>
376 </section> 387 </section>
377 388
378 <section id="appWorkspace"> 389 <section id="appWorkspace">
379 <section id="leftPanelContainer" class="panelContainer"> 390 <section data-montage-id="leftPanelContainer" id="leftPanelContainer" class="panelContainer">
380 <section id="toolsPanelContent" class="panel"> 391 <section id="toolsPanelContent" class="panel">
381 <div id="toolsList"></div> 392 <div data-montage-id="toolsList"></div>
382 </section> 393 </section>
383 </section> 394 </section>
384 395
@@ -386,32 +397,33 @@
386 <section class="mainContainerContent"> 397 <section class="mainContainerContent">
387 398
388 <section id="documentTabs"> 399 <section id="documentTabs">
389 <div id="openDocumentsTabComponent"></div> 400 <div data-montage-id="openDocumentsTabComponent" class="openDocumentsTab"></div>
390 </section> 401 </section>
391 402
392 <section id="rulerTop"></section> 403 <section data-montage-id="rulerTop" class="rulerTop"></section>
393 404
394 <section id="mainContent"> 405 <section id="mainContent">
395 <section id="rulerLeft"></section> 406 <section data-montage-id="rulerLeft" class="rulerLeft"></section>
396 <section id="stageAndScenesContainer"></section> 407 <section data-montage-id="stageAndScenesContainer"></section>
397 <section id="pasteboardResizer" class="pasteboardResizer resizeBar"></section> 408 <section data-montage-id="pasteboardResizer" class="pasteboardResizer resizeBar"></section>
398 </section> 409 </section>
399 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 410 <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
400 <section id="stateBar"> 411 <section id="stateBar">
401 <section id="documentBarContainer"> 412 <section id="documentBarContainer">
402 <div id="documentBar" class="documentBar"><a href="#">HTML</a></div> 413 <div data-montage-id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div>
414 <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div>
403 </section> 415 </section>
404 </section> 416 </section>
405 417
406 <section id="breadCrumbComponent"></section> 418 <section data-montage-id="breadCrumbComponent"></section>
407 <div id="timelinePanelComponent" data-montage-id="timelinePanel" class="timelinePanel"></div> 419 <div data-montage-id="timelinePanelComponent" class="timelinePanel"></div>
408 </section> 420 </section>
409 </section> 421 </section>
410 422
411 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> 423 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
412 424
413 <section id="rightPanelContainer" data-montage-id="rightPanelContainer" class="rightPanelContainer panelContainer"> 425 <section data-montage-id="rightPanelContainer" id="rightPanelContainer" class="rightPanelContainer panelContainer">
414 <section id="rightPanelContent" class="rightPanelContent"> 426 <section data-montage-id="rightPanelContent" class="rightPanelContent">
415 </section> 427 </section>
416 </section> 428 </section>
417 </section> 429 </section>
@@ -421,7 +433,7 @@
421 433
422 <div data-montage-id="focus-container" class="hidden"></div> 434 <div data-montage-id="focus-container" class="hidden"></div>
423 435
424 <section id="popupWindows"></section> 436 <section data-montage-id="popupWindows"></section>
425 437
426 </div> 438 </div>
427 439
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index d2d45410..cf7c6cf4 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -104,8 +104,6 @@ exports.Ninja = Montage.create(Component, {
104 104
105 handleResizeEnd: { 105 handleResizeEnd: {
106 value: function(e) { 106 value: function(e) {
107// this.height -= this._resizedHeight;
108// this.width -= this._resizedWidth;
109 this.stage.resizeCanvases = true; 107 this.stage.resizeCanvases = true;
110 this._resizedHeight = 0; 108 this._resizedHeight = 0;
111 this._resizedWidth = 0; 109 this._resizedWidth = 0;
@@ -187,11 +185,6 @@ exports.Ninja = Montage.create(Component, {
187 } 185 }
188 }, 186 },
189 187
190 willDraw: {
191 value: function() {
192 }
193 },
194
195 draw: { 188 draw: {
196 value: function() { 189 value: function() {
197 if(this.isResizing) { 190 if(this.isResizing) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 08:57:02 +0000