aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.js
Commit message (Collapse)AuthorAge
* Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| | | | | | | | - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed commit of the following:Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0285afe3d4bd458a51f11241f13ea6ffdb0283ed Merge: 2f9f5e3 16d06ba Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jul 19 10:54:25 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit 2f9f5e369eb96f6c81b5e4bcbe09b418825e2864 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jul 18 17:15:19 2012 -0700 Fixed selection bounds not drawing in nested tags. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit b0a3507f9d27579ad511c69314a09136d7f7c6a0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jul 18 11:07:44 2012 -0700 Layout info needs to redraw if stage is updated. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 63c5e0bf52c33706ba597cb69f7794e287bd0f06 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jul 17 15:40:54 2012 -0700 Per feedback from QE, we are still going to draw tool feedback on each mouse move so the selection bounds are not out of sync with the elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 0599a742092b985c4002977e501e3b457173f1d9 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jul 17 15:28:25 2012 -0700 Fixed grid not drawing correctly when switching documents and when adding/removing elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit fd9410606ee6358910d65b2cb5f71812fd44a7c4 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jul 17 11:36:09 2012 -0700 Updated drawing feedback to handle matrix 2d values entered via CSS Panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 559c16c7ac8c9f40b94a011a6f932d4f97df66a7 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jul 16 17:14:28 2012 -0700 IKNinja-751 - Selection boundary doesn't follow the transform applied in the CSS Panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit e2da5340159db5cd6f75bf6c9b7eb9cbf959e5cd Merge: 7cc5de3 5146f22 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jul 16 15:36:28 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit 7cc5de39e41b4220f53c91b15b0cf0ed53e0b0f6 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jul 16 14:52:06 2012 -0700 Check if ownerDocument.defaultValue is null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5ae97995a28a4b06fb7f8703eb8090ea16d88acd Merge: d17974d 0ede302 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jul 16 09:27:22 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit d17974d77273bb635311cb6466f4427cf4d9e5d4 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jul 16 08:45:05 2012 -0700 Pass in selectedElements array directly to drawUtils when drawing selection bounds instead of creating a duplicate array. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 0b1ea3144cb3e2c1d272f60da32423d0604ace3b Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Fri Jul 13 14:03:40 2012 -0700 Fixed line tool not drawing the width and height info. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit b9c70e8d9ae324aa21fa5490edc71d8503bcefbc Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Fri Jul 13 12:42:25 2012 -0700 Used cached offsetWidth and offsetHeight. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 9e17ac7124745ba745014efe149b31dee4fe658f Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jul 12 16:25:41 2012 -0700 Converting tabs to spaces … again! Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 351726c951bb73c28f0e15ea1ab32e85cc735688 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jul 12 16:14:31 2012 -0700 Tabs should be 4 spaces. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 250c419aa2dbcb10f012817ee7039aca77cb2518 Merge: 3f8d61a 2880e1d Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jul 12 16:08:31 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit 3f8d61a676da3992947ed9a2ed0e449780fcfbe0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jul 12 15:53:44 2012 -0700 Rotate tool was not working immediately after switching selection and selection bounds were not drawing after resizing canvases. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit e2e1f81e3b6917e1032e1b99b79c266937f3bb25 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jul 12 12:15:59 2012 -0700 Single draw cycle for stage updates and tool drawings. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 95a90b4c95ee3163c97bea317144366674e49ade Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jun 18 11:46:38 2012 -0700 Single draw cycle for the stage and layout. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 21966b1515d80d2161a14e5a19bc66f3f49a92ce Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Fri Jun 15 13:33:14 2012 -0700 Cache element offsets, including offsetParent. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 80c563c8ba06149691c6c1e754dd9a5e43bc7d4b Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Jul 9 17:30:00 2012 -0700 Open materials editor popup next to PI button. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* BSD LicenseKris Kowal2012-07-09
|
* Remove trailing spacesKris Kowal2012-07-06
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
|\ | | | | Binding View - Binding Tool & Binding Panel
| * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Binding View - validate over hudsArmen Kesablyan2012-06-18
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge pull request #338 from mencio/IKNINJA-1615Valerio Virgillito2012-06-26
|\ \ \ \ | | | | | | | | | | Fix for IKNINJA-1615: Enable mouse up event on top of the user document scrollbar
| * | | | Fix for IKNINJA-1615: Enable mouse up event on top of the user document ↵Valerio Virgillito2012-06-25
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | IKNinja-1688 - Creating a banner file after a code file causes body div to ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | shift to the right and has different scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
|\ \ \ \ | |/ / / |/| | | Reclaim negative padding when moving items back into positive direction.
| * | | When reclaiming stage's negative scroll padding, we need to use the ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | template's left and top padding as the minimum values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Reclaim negative padding when moving items back into positive direction.Nivesh Rajbhandari2012-06-21
| | |/ | |/| | | | | | | | | | | | | Note that we only do this on elementChange and not elementChanging since it is a potentially slow routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\| |
| * | IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\ \ \ \ | | |/ / | |/| |
| * | | removing console logValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | |/ | |/| | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / | - removed extra selection change event,Ananya Sen2012-06-11
|/ / | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
|\ \ | | | | | | Bugfix master
| * | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| |/ | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* / handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
|/ | | | selection change handler
* Moving styles controller higher in ninja's serialization so its bindings ↵Nivesh Rajbhandari2012-06-01
| | | | | | will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
|\ | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * making the document bar handle the current document to hide/show itselfValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | SnapManager.setupDragPlaneFromPlane must happen after StylesController has ↵Nivesh Rajbhandari2012-06-01
|/ | | | | | finished initializeRootStyles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fixing scroll offsets when switching between documents.Nivesh Rajbhandari2012-05-31
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing unused scroll model save/restore.Nivesh Rajbhandari2012-05-31
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* fixing the switching between various types of documentsValerio Virgillito2012-05-31
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* removing the last closeDocument handlerValerio Virgillito2012-05-31
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding back the stage references in the 3d classes.Nivesh Rajbhandari2012-05-31
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into ↵Valerio Virgillito2012-05-30
|\ | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixed bug with scrolling too much when moving objects in negative space.Nivesh Rajbhandari2012-05-29
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Moving layout and stageDeps' handleOpenDocument into stage.Nivesh Rajbhandari2012-05-29
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Sped up user-interaction by moving grid drawing into its own canvas so the ↵Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | layout code doesn't have to be run when modifying selected elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing the close document.Valerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fixing the menu bindings and some cleanup of the stageValerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fix for the document tab close button and rulers on initial documentValerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | document bindings phase 1Valerio Virgillito2012-05-29
|/ | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
|\ | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| * Fixed selection bug when switching/opening documents. Also, use saved scroll ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update stage to handle switching between documents.Nivesh Rajbhandari2012-05-24
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixed scrolling and centering stage code. Also, moved liveNodeList into the ↵Nivesh Rajbhandari2012-05-23
| | | | | | | | | | | | design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
|/ | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.