aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-04-04
|\ | | | | | | | | Conflicts: js/tools/PenTool.js
| * Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
| |\ | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element from SnapManager's cache.
| | * Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ | | | | | | | | Bug fixes
| | * | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\|
| | * | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Resizing BugsArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: js/controllers/presets-controller.js
| | * | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| | | |
| * | | Presets Controller - Remove unused method callEric Guzman2012-03-30
| | | |
| * | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\ \ \
| * | | | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | | | | draw the path overlay (and anchor points) taking into account the ↵Pushkar Joshi2012-04-04
| | | | | | | | | | | | | | | | | | | | transformation applied to the element canvas and the stage canvas. Still quite buggy.
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \ \ | | | | | | | | | | | | added text paste detection and updated some menu items
| | * | | | - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | detect paste from context menu for new file and save as dialogAnanya Sen2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| | |_|/ | |/| |
| * | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ | | |/ / | |/| | Brushtool
| * | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ | | | | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| | * | | fixed logical error in triggering menu itemAnanya Sen2012-03-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | disable more menus if the active document is not in design viewAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | - removed menu-data boundObj path support for nowAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed error on clicking on disabled menu item Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | KNINJA-1302 : refactored fixed as per requestAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1302 : close on ESC even if text field is focussedAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path includes the full filename Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1361: autofocus and auto-select file name on open of new file and ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1302 : more fixAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | file picker - added size unitAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file - don't disable OK is file exists Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triggers Cancel button and 'Enter' key now triggers OK button. For File picker, the 'ESC' now triggers the Cancel button. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-workflow-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | working File I/O for pen tool created paths and some minor bug fixes ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
* | | | | track the canvas top left position instead of the center position to figure ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | out when to translate the subpath per canvas translation...this one seems to not drift (no floating point issues uncovered so far)
* | | | | First attempt at preventing the drifting of the canvas due to floating point ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | roundoff errors when constantly changing stroke width
* | | | | render the pen path with local coordinates, but use stage world coordinates ↵Pushkar Joshi2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working
* | | | | adjust the position for the pen tool feedback cursor AND fix a bug where ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | everything selected gets deleted (even if we have a selected subpath)
* | | | | change cursors for pen tool realtime feedback....still need to position the ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | cursors correctly over the exact mouse position AND reduce the radius (distance threshold) for picking paths
* | | | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-28
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| |\| | |
| | * | | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| | |\ \ \ | | | | |/ | | | |/| Presets - Adding presets controller
| | | * | Text Tool - Remove inline style from user documentEric Guzman2012-03-27
| | | | |
| | | * | Presets Controller - Removing test background from transition classEric Guzman2012-03-27
| | | | |
| | | * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | | |\ \
| | | * | | Presets Panel - Adding presets controller to serializationEric Guzman2012-03-22
| | | | | |
| | | * | | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | | |/ | | | |/| | | | | | | | | | | panel code