Commit graph

651 commits

Author SHA1 Message Date
j
41f37fee36 dont start playing if paused and hitting next 2013-07-14 19:15:56 +00:00
rlx
f472dfb022 cosmetic changes 2013-07-14 19:11:32 +00:00
rlx
99eddfb806 add status bar text to edit 2013-07-14 18:58:31 +00:00
j
5b29e4348b add chapter support to VideoPlayer, use for next/previous in VideoEditPanel 2013-07-14 18:52:26 +00:00
rlx
19b9b14dfc VideoPlayer: fix loop while playing in to out; VideoEditPanel: add play in to out control 2013-07-14 17:58:45 +00:00
rlx
34a734e9f6 cosmetic changes 2013-07-14 17:46:03 +00:00
rlx
cd0e9c8151 make 'add to clipboard' work in player and editor 2013-07-14 16:37:35 +00:00
rlx
410e157cac video panel: suport in/out/copy; video edit panel: support in/out 2013-07-14 16:24:19 +00:00
j
155ada7992 no longer seeking on play 2013-07-14 15:26:37 +00:00
rlx
db3ebf7663 video edit panel: handle open event 2013-07-14 15:13:46 +00:00
j
cae1875f44 pass sort and item updates 2013-07-14 14:56:41 +00:00
j
d7786e79a5 only index+ is sortable 2013-07-14 13:48:41 +00:00
rlx
7dc86d3ca2 clean up video panels 2013-07-14 13:42:09 +00:00
j
728f81bc91 trigger sort with array 2013-07-14 12:48:39 +00:00
j
d61f8e38d3 fix ClipPanel merge conficts 2013-07-14 11:39:20 +00:00
rlx
7aa2b95a56 ClipPanel: add menu 2013-07-14 10:24:38 +00:00
rlx
1c969a7c2f Video Edit Panel: handle width/height update 2013-07-14 10:23:43 +00:00
rlx
667d22efa4 cosmetic changes 2013-07-14 10:22:26 +00:00
j
fd7352edac fix adding,removing,sorting video items and related updates 2013-07-14 10:41:30 +00:00
j
1d3c17d4b2 use isSortable 2013-07-14 10:39:32 +00:00
j
92e49fe41a dont set current time if not needed 2013-07-14 09:34:15 +00:00
j
76fc986e97 durationchange no longer calles loadedmetadata; support updating video element to no items 2013-07-14 09:16:39 +00:00
j
a0b92c16e5 fix large timeline 2013-07-14 09:14:23 +00:00
j
72f1b47e1c add VideoEditPanel, ClipPanel 2013-07-13 23:07:25 +00:00
j
079114c598 support updating video 2013-07-13 23:06:44 +00:00
j
2403cd269d fix updating items 2013-07-13 23:06:07 +00:00
rlx
74d4c16e3a video editor: trigger copy events 2013-07-13 21:05:04 +00:00
rlx
861dabfb43 allow for updating small video timeline url 2013-07-13 21:03:05 +00:00
rlx
305dd4cec1 allow for asynchronous large video timeline 2013-07-13 13:58:52 +00:00
rlx
902b91f921 allow for small video timeline without image 2013-07-13 13:58:10 +00:00
rolux
d64f499034 cosmetic changes 2013-07-13 15:56:02 +02:00
rlx
7572c105d7 fix loop icon 2013-07-12 20:30:07 +00:00
rlx
0fdd110f11 Ox.VideoPlayer: add loop option and control 2013-07-12 14:43:30 +00:00
j
1759fa6b69 loop or stop if going to item -1, fixes #1637 2013-07-10 13:34:31 +00:00
j
538d45ce57 check if same item is in new items on update item, fire durationchanged fixes #1640 2013-07-10 13:29:48 +00:00
j
f938f281f1 rewrite Ox.VideoElement 2013-07-09 22:48:22 +00:00
rlx
675e45df18 add doubleclick-to-scroll-up to editor menubar 2013-07-09 18:30:44 +00:00
rlx
7bfa671ebf video panel: set timeline in/out on load 2013-07-09 10:01:38 +00:00
j
59f4c0d3ed trigger playing instead of position event while playing 2013-07-08 12:10:44 +00:00
rlx
cc1cede9bc AnnotationPanel: add doubleclick-on-title-bar-to-scroll-up functionality 2013-07-08 10:52:11 +00:00
j
58e078e3bb log as Video not VIDEO 2013-06-14 16:39:38 +00:00
rolux
4950898b34 some more tabs to spaces 2013-06-02 22:19:36 +02:00
j
2560d503d7 add all untranslated Ox.UI strings to locale.de.json 2013-05-20 14:39:04 +00:00
j
907d41642b typo 2013-05-10 11:59:39 +00:00
j
535c04d386 wrap more strings in Ox._ 2013-05-10 10:45:24 +00:00
j
4d8c716d0b add localization to Ox 2013-05-09 13:03:33 +00:00
rlx
74e6c12904 selectbefore/selectafter -> selectprevious/selectnext 2013-05-08 16:53:33 +00:00
j
4f37ff8783 remove debug 2013-05-01 12:40:39 +00:00
j
11b9301337 fix changing resolution for multi part videos, fixes #1491 2013-05-01 12:34:07 +00:00
rolux
7eb8cf66c6 fix a bug in annotation panel 2013-03-09 18:32:30 +05:30
rolux
0b155c4bb2 typo 2013-03-08 16:50:53 +05:30
rolux
e7e20ecc3c update annotation folder 2013-03-08 16:48:20 +05:30
rolux
317b433a5c change capitalization 2013-03-08 16:44:11 +05:30
rolux
c5f75d98c9 annotation folder: improve 'no items' message when range is not 'all' 2013-03-08 16:33:13 +05:30
rolux
c8135f4556 typo 2013-03-08 15:44:41 +05:30
rolux
b63adeeb01 cosmetic changes 2013-03-08 08:42:36 +00:00
rlx
a8c7239da6 AnnotationPanel: add methods addLayer, removeLayer, updateLayer 2013-03-07 12:49:20 +00:00
rolux
a34c8b5b11 cosmetic changes 2013-03-06 12:26:57 +00:00
j
4b0a55b43a fix changing resolution(how long was that broken?), dont seek before item is loaded 2013-03-02 08:56:15 +00:00
j
ccc50be7de only focus if elment is in dom 2013-03-02 08:07:02 +00:00
rolux
36e3dcd264 in video player, make sure poster is below loading icon 2013-03-01 17:01:21 +05:30
rolux
cadad32440 add 'disabled' option to large video timeline 2013-02-25 11:02:18 +05:30
rolux
31fa5f5386 Video Player: trigger timeline event 2013-02-21 13:11:20 +05:30
rolux
d98cf99714 make border of video box in video timeline player themed 2013-02-21 12:29:45 +05:30
rolux
51881d98b9 typo 2013-02-21 01:55:24 +05:30
rolux
e20fe9f2fe fix a bug in video player 2013-02-21 01:54:18 +05:30
rolux
bdddabeb3f fix a bug in video player 2013-02-21 01:44:12 +05:30
rolux
35d2aecc4a VideoPlayer: add timelineType and timelineTypes options, update settings menu 2013-02-21 01:29:49 +05:30
rolux
235b47c1d1 VideoPlayer: support spaceX control, where X is an integer indicating the width 2013-02-20 23:49:21 +05:30
rolux
5c7ee541d0 update large video timeline 2013-02-20 16:48:05 +05:30
rolux
2fc340d9bd add showInToOut option to LargeVideoTimeline 2013-02-20 16:27:38 +05:30
rolux
092f27ca19 fix timeline tile offset 2013-02-15 11:21:17 +05:30
rolux
88981fd836 remove print statement 2013-02-15 10:53:46 +05:30
rolux
f078af1c05 in VideoPlayer, pass playInToOut as showInToOut to SmallVideoTimeline 2013-02-15 10:50:15 +05:30
rolux
57ca8e44b4 add showInToOut option to SmallVideoTimeline 2013-02-15 10:49:33 +05:30
rolux
4bdae7eb1e add showInToOut option to SmallVideoTimelineImage 2013-02-15 10:47:49 +05:30
rolux
4583f7bd77 fix video player poster aspect ratio 2013-02-14 12:42:18 +05:30
rolux
ab06286f8c document 'enableSubtitles' option 2013-02-12 13:57:22 +05:30
rolux
c5f038a526 typo in docs 2013-02-12 13:35:30 +05:30
rolux
fe8160484b update docs 2013-02-12 12:38:53 +05:30
rolux
4f39c96e2d typo 2013-02-12 12:33:43 +05:30
rolux
d3e74f85f8 video player: add internal getPositionWidth method 2013-02-12 12:31:13 +05:30
rolux
17bdb6ccd9 fix potential off-by-one 2013-02-12 12:10:49 +05:30
rolux
37fd8b2ce9 add 'invertHighlight' option to video player 2013-02-12 11:58:52 +05:30
rolux
bf09fb2d90 update docs 2013-02-12 07:01:30 +05:30
rolux
ac5aa63d5a typo 2013-02-11 12:53:12 +05:30
rolux
4627b2e344 rename tooltip to videoTooltip 2013-02-11 12:03:40 +05:30
rolux
c567a80a44 VideoPreview: accept tooltip function 2013-02-11 11:57:37 +05:30
rolux
61ca7657b1 VideoPreview: accept tooltip function 2013-02-11 11:56:04 +05:30
rolux
e002e2a566 fix video preview tooltip layout 2013-02-11 11:36:24 +05:30
rolux
c0e4dc6e01 add tooltip option to Ox.VideoPreview 2013-02-11 11:19:05 +05:30
rolux
f2d93c7001 video loading icon should always be white 2013-02-09 16:03:42 +05:30
rolux
dc8bde4f73 fix video buttons 2013-01-31 17:28:35 +05:30
rolux
45c3ee5658 add missing OxMedia class in video panel 2013-01-31 16:11:45 +05:30
rolux
6f4a928bf3 add 'OxMedia' class to video widgets 2012-12-29 17:43:32 +01:00
rolux
641a3043cb use themed timeline colors 2012-12-28 17:59:34 +01:00
rolux
9efb64e620 use new getImageURL method 2012-12-28 17:58:01 +01:00
j
b20d6a6e59 trigger setSizes in VideoPlayer on Ox.Fullscreen, add Ox.Fullscreen.available to check if fullscreen support is present(i.e. in iframe) 2012-12-20 18:30:48 +00:00
rolux
568119cae8 cosmetic changes 2012-12-09 01:42:57 +01:00
rlx
5075e3de7e VideoPanel: Pass down correct value on fullscreen option update 2012-11-01 12:36:00 +00:00
j
790e0c4500 dont add ?rand to empty string in Ox.VideoElement 2012-10-12 13:00:22 +02:00
j
1c02b95f82 dont reset video.src on stop, this happens in GC on dom removal now, fixes #1003 2012-09-22 22:02:00 +02:00
j
2a7a6da95d sort text bins by create instead of value as 3rd sort value, fixes #995 2012-09-18 21:26:53 +02:00
rlx
926410d663 cleanup Resizebar; make tooltips in VideoEditor, VideoPanel and VideoTimelinePanel configurable 2012-09-17 08:36:21 +00:00
rolux
bda90f6b6b remove Ox.Break 2012-07-05 10:58:08 +02:00
rolux
a0867f0da6 update widget documentation (arguments first) 2012-07-04 13:29:18 +02:00
rolux
f6a767b6cb test for existence of before looping over it 2012-07-02 15:45:18 +02:00
rlx
d30cda0cfd bind to 'select', not 'selectplace' 2012-06-30 14:59:52 +00:00
rolux
244591d57e appendTo(that.$element) -> appendTo(that) 2012-06-26 18:21:39 +02:00
rolux
969e0553b4 use [0] instead of .[0] 2012-06-26 18:01:47 +02:00
rolux
f5782c475b Ox.divideInt -> Ox.splitInt 2012-06-25 16:43:03 +02:00
j
d2e05200da document events 2012-06-18 00:38:26 +02:00
rlx
8f4e08063e in play loop, return false instead of calling Ox.Break 2012-06-16 20:47:17 +00:00
rlx
3fc8a47bf4 return original string when highlight is called without query; lazy format annotation date 2012-06-16 16:17:28 +00:00
rlx
165bd0457a remove log statements 2012-06-16 10:06:59 +00:00
rlx
a87d193ac4 fix #847 (<i> tag in subtitle); test for before looping over it 2012-06-15 19:50:04 +00:00
j
2a58661c9a subtitles are html, fixes #845 2012-06-15 18:26:18 +02:00
j
e443888eba dont set widht to 0 for videos that are exactly one hour 2012-06-15 17:20:17 +02:00
rlx
94355eb792 typo 2012-06-15 13:29:06 +00:00
rlx
856ea3b1d3 enable timeline types 2012-06-15 13:20:07 +00:00
rolux
fbeb434e27 remove print statements 2012-06-15 11:47:18 +02:00
rolux
8bc8c57373 use base 10 in parseInt, use Math.floor for numbers 2012-06-13 10:28:21 +02:00
rolux
6a7fce5bcf cleanup 2012-06-10 20:18:03 +02:00
rolux
639847da07 don't set timeline state twice 2012-06-06 16:31:44 +02:00
rlx
73551a469d fix #821: select cut correctly when an annotation is selected 2012-06-06 14:25:44 +00:00
rolux
3ec610076a minor reformatting 2012-06-03 11:07:35 +02:00
rolux
4ba06fde41 use Ox.highlight; minor reformatting 2012-06-03 10:41:18 +02:00
j
ac82c3b30e Ox.VideoPreview, make timeline optional, fix width/height if not scale to fit 2012-05-31 20:15:44 +02:00
rolux
8c347d9009 update documentation (classes) 2012-05-31 12:32:54 +02:00
j
19dba40ec8 always set enabledUsers 2012-05-30 17:20:58 +02:00
j
91e1065aab rename Ox.UI source files, remove Ox. prefix 2012-05-28 19:44:12 +00:00
j
005d50c389 self.setOption ~> that.update 2012-05-28 19:35:41 +00:00
rolux
461a237880 .bind -> .on, .unbind -> .off 2012-05-28 16:06:22 +02:00
rolux
c41afd2f5d Ox.parseHTML -> Ox.sanitizeHTML, Ox.encodeHTML -> Ox.encodeHTMLEntities, Ox.decodeHTML -> Ox.decodeHTMLEntities 2012-05-27 12:40:02 +02:00
j
ba724933e8 fix setting position and paused state on timeline panel and player 2012-05-26 19:01:05 +00:00
j
68d50978ba trailing comma removal, 2012-05-26 15:48:19 +00:00
j
0fc0e671e1 allow changing options.paused before metadata is loaded, trigger loadedmetadata event 2012-05-26 13:32:31 +00:00
j
033155cc51 expose paused as option in VideoEdito and VideoPlayerPanel 2012-05-26 11:52:08 +00:00
j
d49847593b use Ox.LoadingIcon in Ox.VideoPlayer, fixes #798 2012-05-25 11:37:08 +02:00
rolux
147d637b7b typos 2012-05-25 09:46:34 +02:00
rolux
544e117cb3 Ox.break -> Ox.Break 2012-05-24 19:20:29 +02:00
rolux
d5da610c18 use Ox.break 2012-05-24 12:02:32 +02:00
rolux
1608664bb6 rather use ''.slice than ''.substr 2012-05-24 11:47:33 +02:00
rolux
f990f3b857 use [].slice, not Ox.sub 2012-05-24 11:02:59 +02:00
rolux
1c40fb007b use [].concat, not Ox.merge 2012-05-24 09:45:33 +02:00
rolux
12cf77cef5 less obscure Ox.map 2012-05-22 16:29:37 +02:00
j
b9e80c9d75 cleanup docs, fix children/find calls 2012-05-22 15:14:40 +02:00
rolux
04784630d3 use Ox.break 2012-05-22 09:11:26 +02:00
rolux
344d7ec40d use Ox.indexOf, not Ox.getObject 2012-05-21 09:41:57 +03:00
rolux
503c2b5978 use [].some, not Ox.getObject 2012-05-21 09:40:40 +03:00
j
520eac7a22 more documentation, more semicolons, some fixmes 2012-05-21 21:23:16 +02:00
j
509745407b add documentation stubs 2012-05-21 12:38:18 +02:00
j
2198d0b1ec pass options.timeline, there is no options.type 2012-05-19 15:24:00 +02:00
j
ac35d761ac fix AnnotationFolder 2012-05-19 15:14:04 +02:00
rolux
cb9a5fda2d in AnnotationFolder, simplify crossesPoint() 2012-05-10 12:12:34 +02:00
rlx
d7f0464ee6 add missing public togglePaused method to Ox.VideoTimelinePlayer 2012-04-24 08:18:08 +00:00
rlx
aae7ba2485 fix a bug where tooltips would not retain their width near the right edge of the screen, fixes #568 2012-04-23 11:16:46 +00:00
rlx
c0c4031825 in video editor, rename 'posterFrameControls' option to 'enableSetPosterFrame', always include 'Go to Poster Frame' menu entry, and correctly enable/disable 'Set Poster Frame' menu entry 2012-04-23 09:53:29 +00:00
rlx
cb1fffa491 add some comments in video timeline player 2012-04-23 08:11:34 +00:00
rlx
a56329064d pass info event in player and timeline panels 2012-04-22 11:13:06 +00:00
rlx
a1c82cb262 don't trigger 'censored' event on doubleclick 2012-04-22 10:16:07 +00:00
rlx
f0d4043fd4 make 'censored' icon/link/tooltip configurable (fixes #252) 2012-04-22 09:57:17 +00:00
rlx
bdab9b8a7d in video editor, pass position along with in and out when triggering a point event 2012-04-22 08:54:44 +00:00
j
486e933926 add some more links to about 2012-04-19 16:09:28 +02:00
rlx
018dc69939 set width of timelines player timelines to the correct value after resize 2012-04-19 13:03:16 +00:00
rlx
ae33784cc1 correctly compute if scrollbar is visible 2012-04-19 12:25:39 +00:00
j
461cd3d686 only add uid to http urls, this breaks for file:// or blob urls 2012-04-19 13:26:46 +02:00
rlx
3db8dd4688 remove reference to pandora, fixes #594 2012-04-19 10:30:39 +00:00
rlx
88d25817c1 fix a bug in timeline player where the video would not be muted when loaded in muted state 2012-04-19 08:00:12 +00:00
rlx
fb64474545 timeline player: fix mute button, add scroll button 2012-04-19 07:54:30 +00:00
rlx
01b4840fd6 in timeline player, only show vertical scrollbar if needed - should fix #759, but can't be tested locally 2012-04-19 07:15:35 +00:00
rlx
821e8d1a4e make sure timeline player has a bottom margin of 8px (not 4px) 2012-04-19 07:00:04 +00:00
rlx
c7d8d68607 implement 'censored' option in timeline player 2012-04-18 11:21:06 +00:00
rlx
c70271573a in timeline view, react to selecting an annotation 2012-04-18 09:30:49 +00:00
rlx
02696ae741 add 'uncheckItem' method to menus and menubuttons, fix toggleSize in video editor 2012-04-18 07:57:59 +00:00
rlx
132e8d2207 rename various options of video widgets to allow for different timeline types 2012-04-18 07:43:32 +00:00
rlx
71d82c87f9 pass playing/position event from video player to timeline panel 2012-04-17 14:53:21 +00:00
rlx
7d3ea51e4b slightly improved line above and below video 2012-04-17 13:52:45 +00:00
rlx
3ecfcd0f3f implement 'follow player while playing' 2012-04-17 13:42:46 +00:00
rlx
0e8bfd1348 update timeline panel and timeline player 2012-04-17 12:01:24 +00:00
rlx
c6bfa97c68 rename a variable in video editor 2012-04-17 11:59:08 +00:00
rlx
7e8f5bef32 fix bugs in video player: allow for setting volume from outside, only show volume control if enabled 2012-04-17 11:58:17 +00:00
rlx
8c963339fd add first version of Ox.VideoTimelinePanel, update Ox.VideoTimelinePlayer 2012-04-17 07:52:37 +00:00
rlx
c6f0308a17 in Ox.VideoPanel, use setElement(...), not that. = ... 2012-04-17 07:51:32 +00:00
rlx
c5af338d2d update Ox.Chart 2012-03-26 19:26:28 +00:00
rlx
5d1b204e45 when reaching full minute, round position to full minute 2012-03-25 21:49:36 +00:00
rlx
8e6787be97 move full minute check from player into panel and editor, should fix #716 2012-03-25 21:45:39 +00:00
rlx
17aca54e7a temporary fix for video skipping bug (#716); add third parameter (index) to forEach callback; add Geo colors 2012-03-25 21:23:03 +00:00
j
429d5c744b comment out some Ox.print calls 2012-03-23 19:03:56 +01:00
rlx
bc3fedb125 fix alphabetical order of annotations with tags, fixes #681 2012-03-20 09:34:50 +00:00
rlx
53f57939ec fix a bug with toggling paused state 2012-03-14 10:38:32 +00:00
rlx
8521eb36ba add video timeline player and demo 2012-03-14 10:35:46 +00:00
j
3551e73249 dont fail if previously selected id was removed 2012-03-13 13:26:13 +01:00
j
9e7a639ada consistantly use ?uid for video source 2012-03-09 23:27:48 +01:00
rlx
68ca199ae3 properly escape user names and list names 2012-02-22 10:14:25 +00:00
j
01d975878b dont fail if selected annotation is not present 2012-02-21 17:00:35 +05:30
rlx
202d11177b some work towards making places and events editable from annotations panel (#561) 2012-02-21 10:10:39 +00:00
j
7019a7994b show clones, fixes #567 2012-02-20 21:51:08 +00:00
j
56c1bf2af0 enable download, fixed #467 2012-02-19 19:06:25 +00:00
rlx
8964fdcd58 in timeline view, after sumbitting find, make editor gain focus (fixes #539) 2012-02-19 18:51:53 +00:00