aboutsummaryrefslogtreecommitdiff
path: root/js/stage
Commit message (Collapse)AuthorAge
* userContentLeft and userContentTop need to set scroll offsets for 0 also.Nivesh Rajbhandari2012-05-14
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #203 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-08
|\ | | | | Get clicked element when body is scrolled. Also fixed zoom code's iframe reference.
| * Get clicked element when body is scrolled.Nivesh Rajbhandari2012-05-08
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
|\ \ | |/ |/|
| * removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Stage should update scroll offsets when scrolled. Note that this is not ↵Nivesh Rajbhandari2012-05-08
| | | | | | | | | | | | always correct because we don't get a scroll end event. Updating Pan Tool to update scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\ \
| * | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| |\|
| | * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\
| | | * | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | code cleanupValerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | |/ | | |/| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| | |/ | |/|
* | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
| |/ |/| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\|
| * Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| |/ | | | | | | preparation for montage converting to the new "prototype" format fully
* | set up different activeline colors for different themesAnanya Sen2012-04-30
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
| | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | increasing z-indem of code hinting dropdown to appear above the disabled panelsAnanya Sen2012-04-26
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\| | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\
| | * adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * more backup fixes for the old stageValerio Virgillito2012-04-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * initial stage web templateValerio Virgillito2012-04-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| |/ | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | IKNINJA-1551 - added editor support for other file typesAnanya Sen2012-04-26
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1529 : zooming such that cursor position can be calculated accuratelyAnanya Sen2012-04-24
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1528 : temporarily disabling active line color for thisAnanya Sen2012-04-23
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixed ugly scroll coming in the middle of the page for a short fileAnanya Sen2012-04-23
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | set editor background color as per the selected themeAnanya Sen2012-04-20
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - fixed the text cursorAnanya Sen2012-04-19
| | | | | | | | | | | | - code cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
|\|
| * 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>
| | | * IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | IKNINJA-1378 - Line Tool's drawing preview changes tool canvas's line style.Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | We should draw tag outlines only for nodeType = 1.Nivesh Rajbhandari2012-03-21
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | - code editor view options barAnanya Sen2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete - font zoom hottext Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | - added configurability of code completion with the file typeAnanya Sen2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | | - added logic to toggle between automatic code completion and manually triggered code completion [ UI pending ] Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Ananya Sen2012-04-04
|\ \ \ \ | | |/ / | |/| | | | | | Codeview-improvements
| * | | 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>
* | | - fix for current line highlighting for version 2.23Ananya Sen2012-04-04
| | | | | | | | | | | | | | | | | | - changes to not show autocomplete dropdown for brackets Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 02:13:20 +0000