aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
...
* | | Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with oneJon Reid2012-04-02
| | | | | | | | | | | | | | | layer in focus whose name is empty, Ninja creates an empty name layer for the element."
* | | Timeline: Autoscrolling when dragging a layer within a scrollable layerJon Reid2012-04-02
| | | | | | | | | | | | list.
* | | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix:Jon Reid2012-03-30
| | | | | | | | | | | | better handling of drag-and-drop finish events and cleanup of helper.
* | | Timeline: Link layerDragEnd and layerDrop events to better handle end ofJon Reid2012-03-30
| | | | | | | | | | | | drag-and-drop events.
* | | Timeline: Bug fixes.Jon Reid2012-03-30
|/ /
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-03-29
|\ \
| * | Timeline: Stability fixes for drag-and-drop and page switching.Jon Reid2012-03-27
| | |
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
|\ \ \ | |/ / |/| / | |/
| * Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵Jonathan Duran2012-03-27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Timeline : Breadcrumb FixKruti Shah2012-03-26
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Timeline : Adding Zoom SliderKruti Shah2012-03-26
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Timeline: Change dragIcon to be a data-uri.Jon Reid2012-03-26
| | |
* | | Timeline: Drag and Drop of layers.Jon Reid2012-03-26
| | |
* | | Remove console logsJonathan Duran2012-03-26
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
|/ / | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| |
* | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵Jon Reid2012-03-21
| | | | | | | | console.log calls in hintable component.
* | Fix: Change click handler to mousedown for better responsiveness in layer ↵Jon Reid2012-03-21
| | | | | | | | selection UI.
* | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| |
* | Timeline: Re-enable adding/removing styles to layers. New methods in ↵Jon Reid2012-03-19
| | | | | | | | TimelinePanel for creating new styles on document load.
* | Fix layer order and selection on reopenJonathan Duran2012-03-16
| | | | | | | | | | | | Layer order should be in the same order as created. Nothing should be selected with opening a doc. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
|\ \
| * \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| | * | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | |
| | * | Timeline: remove comment.Jon Reid2012-03-15
| | | |
| | * | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | |
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | |\ \
| | * | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| | | | |
* | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | CleanupJonathan Duran2012-03-16
|/ / / / | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Bug fix and cleanupJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | Cleaning up unneeded code for one element per layer support and fixing some bugs with selection and layer sync. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Fix layer select on selection changeJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Start enforcing one element per layerJonathan Duran2012-03-16
| |_|/ |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: remove comment.Jonathan Duran2012-03-15
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: Fix for layer selection problems on file open and switch.Jonathan Duran2012-03-15
| |/ |/| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix element delete causes keyframe addition failJonathan Duran2012-03-15
|/ | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Optimize Tween component needsDraw callsJonathan Duran2012-03-14
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix unassigned track element on document switchJonathan Duran2012-03-13
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline : Fixing deleting the layers and hash table and removing while ↵Jonathan Duran2012-03-12
| | | | | | | loops replacing with for loops Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: new enablePanel() method on TimelinePanel class.Jon Reid2012-03-09
|
* Timeline: Fixes for deleting layers, layer selection, persisting layer name ↵Jon Reid2012-03-09
| | | | edits and selection between document switching.
* Timeline: Fix for Open/close/switch document problems. Partial fix for ↵Jon Reid2012-03-09
| | | | selecting layer problem when first opening a document (or switching to it).
* Squashed commit of the following:Jonathan Duran2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3a9c7a57a227a36ec47c6635fc6a0bd4c4b7f9c3 Merge: 5940b22 caa0825 Author: Valerio Virgillito <valerio@motorola.com> Date: Thu Mar 8 15:51:58 2012 -0800 Merge pull request #102 from dhg637/Panels Fixed Some Calculation issues and bugs & appended disabled state when no documents exist commit 5940b22e01de4fc36e5c5de5f3ed074f08fadb07 Merge: 9b006ac 130cd6d Author: Valerio Virgillito <valerio@motorola.com> Date: Thu Mar 8 13:39:11 2012 -0800 Merge pull request #104 from ananyasen/integration-candidate IKNINJA-1270: fixed browser crashing when you close a document while playing a video commit 130cd6d4b99c9db344ec0ab44a54a59d11b31d2f Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Mar 8 13:29:58 2012 -0800 IKNINJA-1270: fixed browser crashing when you close a document while playing a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit caa08250663007bea76faf555f166b42cf4c76fb Author: Armen Kesablyan <armen@motorola.com> Date: Thu Mar 8 12:09:13 2012 -0800 Disabled State is now darker Signed-off-by: Armen Kesablyan <armen@motorola.com> commit 21cb7af351e738f446458af5b896c84e03fa5c17 Author: Armen Kesablyan <armen@motorola.com> Date: Thu Mar 8 12:05:43 2012 -0800 Z-Index issue of disabled state with file open dialog Signed-off-by: Armen Kesablyan <armen@motorola.com> commit 9b006acf1f6c2be5abc54f94a8bee7e684f106f9 Merge: 0637a6d 1c61c69 Author: Valerio Virgillito <valerio@motorola.com> Date: Thu Mar 8 11:04:02 2012 -0800 Merge pull request #100 from imix23ways/TimelineUber Timeline uber commit 0637a6d9cc9fbe074145ad6beaa4725f5e7eb212 Merge: cef0708 d981394 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Mar 7 19:32:38 2012 -0800 Merge pull request #103 from joseeight/FileIO-Build-Candidate File I/O Fixed commit d9813946dc28d8c28033a68b68300b9d9eda115c Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Mar 7 19:22:05 2012 -0800 Image data fix on Open Fixed a bug with data-uris not opening correctly. commit 8b0988b6dd2fe7f5977f70f651f7155c78ee872b Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Mar 7 19:04:19 2012 -0800 Adding To-do comments for CDN stylesheets Removed inserting CDN styles into head as it was proper because the hierarchy would be lost, and there is no current fast-alternative to achieve a preview. commit bb83bfb7af1e82dfbce7661fe2eb7612ff730c6f Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Wed Mar 7 18:36:31 2012 -0800 Removing temp viewing of CDN styles It's not done correctly, we really need the proxy for this. commit 1c61c69265b9c0230b834c0d4d7c78a11f9d5b19 Author: Kruti Shah <kruti.shah@motorola.com> Date: Wed Mar 7 16:19:05 2012 -0800 Timeline Bug Fix: IKNINJA-1283 Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit 84931583f1da8da29784074978f146b281b8efa3 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 16:08:36 2012 -0800 Disabled state for panels Signed-off-by: Armen Kesablyan <armen@motorola.com> commit d18d91946627c53c646a6f167855551a1891f8f4 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 14:33:09 2012 -0800 Reordering and resizing now works Signed-off-by: Armen Kesablyan <armen@motorola.com> commit e3a5626b21ac8b906638bed9eb96aca5fadd26d8 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 11:41:10 2012 -0800 Fixed: Collapsed panels would collapse panels below Signed-off-by: Armen Kesablyan <armen@motorola.com> commit c7b07a9663ac1553fb10d8541b25274e522e07f7 Author: Armen Kesablyan <armen@motorola.com> Date: Wed Mar 7 10:39:23 2012 -0800 Fixed Collapsing and resizing window with panels Signed-off-by: Armen Kesablyan <armen@motorola.com> commit cef07085443b7c31e878daaad083b7408c57e104 Merge: 2e3943a fca9290 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Mar 6 17:08:28 2012 -0800 Merge pull request #99 from joseeight/FileIO-Build-Candidate File IO Updates commit fca92904597895675ddd216399cd235f3c5a7cfa Merge: ec7cbc9 eebb7de Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 17:02:44 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit eebb7de4d19cddec9c763a073d8cf41d76fe70f7 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 17:02:37 2012 -0800 Adding CDN support for URLs in linked CSS commit f6a60f50ca9cd09713baa27f2990eda9346496fc Merge: 7271c25 2e3943a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 16:19:59 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO Conflicts: js/controllers/selection-controller.js commit 7271c25bf34917b1751f433d284f21485057425b Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:24:25 2012 -0800 Fixing WebGL not available bug commit 3c4967fa93b3abc529fc404115707307ba72d5cd Merge: bee2df0 84332ab Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:18:30 2012 -0800 Merge branch 'refs/heads/Ninja-Internal' into FileIO commit ec7cbc95de031d2be667c2a8629a9d63e91f7e1a Merge: 97176d4 bee2df0 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:05:04 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit bee2df0d4da72677aaa2adae669ffdd4ac210dd6 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Tue Mar 6 11:04:52 2012 -0800 Changing length of characters per line (pretty function) commit 97176d466bb0d217f1bc5f45e362ed15c3066507 Merge: de26ba9 887e555 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:35:08 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 887e555d00939a99fd13d0fc8fe081a4feb5d677 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:34:54 2012 -0800 CSS on CDN preview fix commit de26ba991c1d6351dfed4a81c246f62d40f075d6 Merge: 478c50e 4f274aa Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:19:08 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 4f274aa5beff735f63905704e52e6ea938c140d9 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 23:18:49 2012 -0800 Temp support for CDN CSS Added a temp fix for allow the viewing of CSS on a CDN, however, the styles should not be editable, but will allow for accurate preview of styles. Need to coordinate with the CSS panel and styles manager to insert styles in the appropriate files or tags that have write permission. commit 478c50ee0ce0291c13c4f1e469a234b64946413e Merge: 869f5f1 a68fe3f Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 22:24:20 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit a68fe3f0180f5ab3304ff201be8da40c4432bd40 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 22:23:59 2012 -0800 Minor Fix Forgot to comment out the return, therefore preventing to save. commit 869f5f1ca66b976ba07049b1180882cb8ccb9630 Merge: 0913cd5 4c4d49a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 20:07:10 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 4c4d49ae7958e2c87764f9319665189cf69c5c0a Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 20:06:32 2012 -0800 Fixed URL parsing issue on actual opened document Still need to implement CSS loaded from a CDN, currently this would break Ninja. commit 0913cd53a13083119a6e6bfc2ee939e6becd40e0 Merge: 4505203 56efed8 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 16:16:34 2012 -0800 Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate commit 56efed8b1ed9974aade615fce2d96bc214d21540 Author: Jose Antonio Marquez <kgq387@motorola.com> Date: Mon Mar 5 15:55:30 2012 -0800