aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Clean upKruti Shah2012-06-12
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Squashed commit of the following:Jonathan Duran2012-06-11
| | | | | | | | | | | | | | | | | | | | commit 8e98ce012f55576ddb979969a3a1d834301af0c7 Author: Jon Reid <tjh487@motorola.com> Date: Fri Jun 8 18:08:38 2012 -0700 Timeline: New feature: Only one easing menu can be open at a time. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| |\
| | * IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | |\
| | | * fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| | |/ | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * removing all model creators.Valerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | changes to reopen sub property functionsJonathan Duran2012-06-11
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| |\|
| | * Merge pull request #266 from mencio/element-model-fixesValerio Virgillito2012-06-05
| | |\ | | | | | | | | components fix: adding a first draw event to components
| | | * components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Fix error when opening file with no animationsJonathan Duran2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Timeline: Merge branch 'pull-request' into timeline-localJon Reid2012-06-05
| |\| | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| | * | Timeline: Fix line endings, set to UNIX.Jon Reid2012-06-05
| | | |
| | * | Timeline: Fixes to timeline to handle document switching & breadcrumbJon Reid2012-06-04
| | |/ | | | | | | | | | interactions under new DOM Architecture.
| * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-05
| |\ \
| | * | Timeline: Better style selection and deselection. Automatic re-selection ofJon Reid2012-06-01
| | | | | | | | | | | | | | | | previously selected style when parent layer is reselected.
| | * | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| | | | | | | | | | | | | | | | correctly.
| * | | 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>
| | * Merge pull request #264 from mencio/document-bindings-fixValerio Virgillito2012-06-04
| | |\ | | | | | | | | Document bindings fix - Changing the documents architecture to use bindings instead of events
| | | * fix for the css panelValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-05-31
| | | |\ | | | | | | | | | | | | | | | document-bindings-fix
| | | * | fixing selection when switching documentsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | fixing the closing of documentsValerio Virgillito2012-05-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-05-30
| | | |\ \ | | | | | | | | | | | | | | | | | | into document-bindings-fix
| | | | * | PI's 3d section was not binding correctly to the current document.Nivesh Rajbhandari2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
| | * | | removing the search bar componentValerio Virgillito2012-06-01
| | | |/ | | |/| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-29
| | |\| | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * | CSS Panel - Handle focus after editing selectorEric Guzman2012-05-29
| | | |
| | * | CSS Panel - Find correct previously-rendered rule list after selection.Eric Guzman2012-05-29
| | | |
| | * | CSS Panel - Prevent Animation on New StyleEric Guzman2012-05-27
| | | |
* | | | Sub PropsKruti Shah2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Color chip in TPKruti Shah2012-06-08
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Sub propertyKruti Shah2012-06-07
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | LCKruti Shah2012-06-04
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | LayerControlKruti Shah2012-06-01
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Clean upKruti Shah2012-06-01
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Layer ControlsKruti Shah2012-06-01
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Color ChipKruti Shah2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | fix doc model in prop trackJonathan Duran2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>