aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
|\ | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
| |\
| | * 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>
| * | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
| |\ \ | | |/ | |/|
| | * Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| | |
| | * Re-added Radial Blur and Raiders materialshwc4872012-07-19
| | |
| * | 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>
* | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | FIx 3D animation workflowJonathan Duran2012-07-19
| | | | | | | | | | | | Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
|\ \ | |/ |/|
| * The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Fixing chrome preview shortcutValerio Virgillito2012-07-18
| | | | | | | | | | | | The menu update broke the chrome preview shortcut. Updated the function name in the keyboard handler. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'menu-fixes' of https://github.com/mencio/ninjaValerio Virgillito2012-07-18
|\ \
| * | fixed highlight of file icons and grid menuValerio Virgillito2012-07-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixed more menu bugsValerio Virgillito2012-07-18
| | | | | | | | | | | | | | | | | | | | | - Adding top right round corner on submenu - Fixed wrong checkmark on draw 3d grid. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixed some issues with the menu-fixesValerio Virgillito2012-07-18
| | | | | | | | | | | | | | | | | | | | | - Fixed the dark background on file open - Fixed the copy/paste/cut menu not working. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/master' into menu-fixesValerio Virgillito2012-07-18
| |\ \
| * | | adding a missing semicolonValerio Virgillito2012-07-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | resolved a bad merge while removing comments.Valerio Virgillito2012-07-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'menu-fixes' of github.com:mencio/ninja into menu-fixesValerio Virgillito2012-07-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ui/menu/menu-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | menu design update and bug fixes - Moved Preview to the document barValerio Virgillito2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Redesigned the menu and improved DOM structure. - Removed un-used entires - Fixed layout and snap entries - Moved the preview button to the document bar. - Fixes for bugs: #1750, #1867, #1876, #1895 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | removed left over comments.Valerio Virgillito2012-07-17
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'Tracking' of https://github.com/joseeight/ninjaValerio Virgillito2012-07-18
|\ \ \ \
| * \ \ \ Merge branch 'refs/heads/Ninja-Master' into TrackingJose Antonio Marquez2012-07-18
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix: Improved download UX for cloud appJose Antonio Marquez2012-07-18
| | | | | | | | | | | | | | | | | | | | Added a fix to prevent the on close dialog of Chrome from appearing when an user has to download the Ninja Cloud app. Everything should work the same, only no dialog appears when clicking on download.
* | | | | Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninjaValerio Virgillito2012-07-18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | perform clipboard operations only if selection tool is selected since other ↵Ananya Sen2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools have different conflicting session state Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-18
| |\| | |
| * | | | removing iframes from pasted content to prevent frame injection attackAnanya Sen2012-07-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Try pasting the binary image first, since Windows Chrome places both binary ↵Ananya Sen2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and html for copying an image. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-17
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fixes : resize wrapper for content, prevent duplicate pastesAnanya Sen2012-07-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Fixed copy paste from external applicationsAnanya Sen2012-07-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-18
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
| | |/ | |/| | | | | | | Fixed an issue where alpha value was not checked for value and was evaluated in an if statement causing false to trigger, although it had a value. Oversight, this checked allow setting/getting 0 alpha value from chip and fixes issues with the gradient stops not handling 0 alpha.
* | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-17
|\ \ \
| * | | Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-17
|\| | |
| * | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
| |\| |
| | * | upgrade to codemirror 2.3Ananya Sen2012-07-16
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | / Timeline: Possible fix for new file/new style crash problem.Jon Reid2012-07-17
|/ /
* | Timeline: Style zoom slider.Jon Reid2012-07-17
| |
* | Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
| | | | | | | | function key.
* | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17