aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\
| * Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
* | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\| | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | We need to guard against cases where some PI controls are using HottextUnit ↵Nivesh Rajbhandari2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | but don't actually allow uses to change those units. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | |/ | |/| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
|\| |
| * | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\| | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * fixing selection when switching documentsValerio Virgillito2012-05-31
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the timeline current document bindingsValerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixing the close document.Valerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * document bindings phase 1Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\| | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * fix for the id and class controls in the piValerio Virgillito2012-05-25
| | | | | | | | | | | | the id and class did not set values from the pi because of the removals of all id's on element. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
| * fixing the undefined 'color' issueValerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * enabling basic document switchingValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * adding a null check.Valerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * reverting a pi width changeValerio Virgillito2012-05-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the body piValerio Virgillito2012-05-14
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * 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.
| * Partially fixing the body pi and fixing the selection controllerValerio Virgillito2012-05-10
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change).
* | Squashed commit of the following:Jonathan Duran2012-05-14
|/ | | | | | | | | | | | | | | | | | | | commit b23502b8ed6856981d09577d4cf24283e5db8afa Author: Kruti Shah <kruti.shah@motorola.com> Date: Mon May 14 10:48:16 2012 -0700 Removed Debugger Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit c0b531a074e9cf9a964da0cda496bba8d7453ec1 Author: Kruti Shah <kruti.shah@motorola.com> Date: Fri May 11 13:55:18 2012 -0700 Changing Doc Layer Name Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* code cleanupValerio Virgillito2012-05-02
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | 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>
* reverting old template to current working status. New template work.Valerio 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>
* setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | | | Signed-off-by: Valerio Virgillito <valerio@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>
| * 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>
* | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | IKNINJA-758 - The rotation value of the stage is not updated in the ↵Nivesh Rajbhandari2012-03-22
|/ | | | | | properties panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/master' into pi-fixesValerio Virgillito2012-03-15
|\
| * Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| |
* | 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>
* 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/master' into stage-fixesValerio Virgillito2012-03-01
|
* Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
- Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>