aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\
| * Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fixing the map styles and temporary disabling the 3d styles for elements.Valerio Virgillito2012-03-17
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Removing the name attribute from the PI. Fixing the ID and Class attribute ↵Valerio Virgillito2012-03-14
| | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
|\ | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool
| * Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| |\ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| |\ \
| * | | gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-07
| |\ \ \
| * | | | preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Temp Gradient FixJose Antonio Marquez2012-03-09
| | |_|/ | |/| | | | | | | | | | Temporary fix for getting gradient mode.
| * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | |/ | |/| | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | minor fixesAnanya Sen2012-03-07
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | added close file menu itemAnanya Sen2012-03-06
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
|\| | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| |/ | | | | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| | | | | | | | | | | | - integrated save as Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
|\|
| * Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-01
|\|
| * stage and elements fixesValerio Virgillito2012-03-01
| | | | | | | | | | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| | | | | | | | Modified the way the webRequest maps to the file.
* | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
|\| | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| |\ | | | | | | Fix for performance issue when moving shapes.
| | * Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Squashed commit of the following:Jonathan Duran2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |