aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
|\ | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| |
| * Removed unused SubSelect ToolJohn Mayhew2012-05-08
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* | | changing @change to propertyChangeListenerValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Fixing preview bugJose Antonio Marquez2012-05-16
| | | | | | | | | | | | Also setting up for Montage component serialization.
* | | Saving body attributesJose Antonio Marquez2012-05-15
| | |
* | | File save for banner templateJose Antonio Marquez2012-05-15
| | | | | | | | | | | | Adding file save for templates, completing I/O.
* | | Adding animation sub-category to new fileJose Antonio Marquez2012-05-15
| | | | | | | | | | | | Adding animation sub-category to template in new file.
* | | Fixing banner templateJose Antonio Marquez2012-05-14
| | | | | | | | | | | | Need to implement save, but this cover open and new.
* | | Fixing 3d to work in banner templates.Nivesh Rajbhandari2012-05-14
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Fixing overflow bug for banner templatesJose Antonio Marquez2012-05-11
| | | | | | | | | | | | Ensuring overflow is visible but saved as hidden.
* | | Adding support for new templatesJose Antonio Marquez2012-05-11
| | | | | | | | | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
* | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Temp removing montage clean upJose Antonio Marquez2012-05-09
| | |
* | | Preliminary Montage Template CleanupJose Antonio Marquez2012-05-09
| | | | | | | | | | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save.
* | | Adding SAVE for I/OJose Antonio Marquez2012-05-08
| | | | | | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up...
* | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | |/ | |/| | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
|\ \ \ | | |/ | |/|
| * | minor formattingValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Dom ManipulationKruti Shah2012-05-03
| |/ | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
|\|
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
| |\
| * | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
|\ \ \ | | |/ | |/|
| * | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | |
| * | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| |/
* | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-24
|\|
| * Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\ | | | | | | Drag and drop of images and components should not add 3d values by default
| | * Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
| |\ \ | | | | | | | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for PaintBucket, InkBottle and Eyedropper tools.
| | * | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ↵Nivesh Rajbhandari2012-04-13
| | |/ | | | | | | | | | | | | | | | PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | collapsing the history panel by default and commenting out the undo for the ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | 3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | CleanupValerio Virgillito2012-04-13
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / Clean upJose Antonio Marquez2012-04-19
|/
* Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * IKNinja-1375 - After WebGL conversion from PI, Selection tool gets ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | deactivated or becomes non-functional to the shape. Need to set elementModel.isIn2DSnapCache to false when replacing element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:41:04 +0000