Commit graph

556 commits

Author SHA1 Message Date
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
rlx
02b5b56be8 implement 'show subtitles' functionality for players and timelines 2012-02-19 18:26:57 +00:00
rlx
b5a7b9b28d remove some unused files 2012-02-19 17:24:34 +00:00
rlx
6a9707ed0b fix a bug where pressing delete would not remove an annotation if the video editor had focus (fixes #477) 2012-02-19 14:37:55 +00:00
rlx
bd5b6f8230 fix issues with home and tv 2012-02-19 12:58:55 +00:00
rlx
7d188d8621 make +/- volume keyboard shortcut work in video and timeline views 2012-02-19 11:21:52 +00:00
rlx
529184887a make doubleclicking on non-editable annotation 'open' it, i.e. go to its in point 2012-02-19 11:06:03 +00:00
rlx
94cfbdb45c fix issues with automatically opening annotation folders; add annotations option to video player to make find work for all layers 2012-02-19 10:49:52 +00:00
rlx
61402492c6 make sure doubleclicking on timeline doesn't turn non-editable annotations into editing state 2012-02-19 09:06:57 +00:00
rlx
696741190a only show users in menu if there are annotations 2012-02-19 09:01:13 +00:00
rlx
9558070d8f update list of users on edit annotation (fixes #382) 2012-02-19 08:59:27 +00:00
rlx
0883bc7127 fix a bug in subtitle display on small timeline 2012-02-19 07:41:19 +00:00
rlx
2c2caf8f58 add 'editable' timeline state (fixes #521) 2012-02-19 07:21:40 +00:00
rlx
a66c7c9bdd various fixes related to adding place annotations 2012-02-18 09:56:58 +00:00
rlx
bbdbaf86da keep annotation remove from throwing errors (fixes #452) 2012-02-18 07:22:31 +00:00
rlx
c6e8a84f65 better tooltip for in/out players (fixes #501) 2012-02-17 20:55:00 +00:00
rlx
5383867f70 begin to add some keyboard shortcuts to video view annotation panel 2012-02-17 17:31:39 +00:00
rlx
ba0fe16a07 in video view, update URL when selecting annotation (fixes #479) 2012-02-17 16:29:50 +00:00
rlx
a27ff78730 merge 2012-02-17 16:13:32 +00:00
rlx
e8f370ab7c make video editor handle internal links (fixes #494) 2012-02-17 16:13:08 +00:00
j
7397bead91 switch video source while loading metadata 2012-02-17 13:36:26 +01:00
rlx
c36a3537c0 fix an issue where rendering the edit menu before updating layers would cause add annotation to fail 2012-02-17 12:18:26 +00:00
rlx
3407f36d12 fix #493 (error when removing a not-yet-loaded video from the dom) 2012-02-17 10:41:38 +00:00
j
1a6da64b6b add enableImport flag to VideoEditor 2012-02-17 14:36:26 +05:30
rlx
7d4fd8f706 fix some bugs in insert html dialog 2012-02-16 18:04:25 +00:00
rlx
e1d8e2aeea merge 2012-02-16 16:36:26 +00:00
rlx
4dd2c5706d add InsertHTMLDialog to VideoEditor 2012-02-16 16:35:59 +00:00
j
f28ed7366b keep volume/muted values from current video when changing parts, fixes #200 2012-02-16 22:05:30 +05:30
j
ac25a69aaa update posterFrame in players, fixes #476 2012-02-16 21:14:46 +05:30
rlx
658fca3c76 video editor: highlight-as-you-type (fixes #395) 2012-02-16 12:46:57 +00:00
rlx
73bd672b15 add option to find selected annotation in _this_ video; make sure focus returns after hiding menus 2012-02-16 12:32:52 +00:00
rlx
2bd8c8d13f commiting unsaved changes 2012-02-16 11:56:20 +00:00
rlx
476f8b8d26 don't throw errors when resizing uninitialized map (fixes #480, interestingly) 2012-02-16 11:52:42 +00:00
rlx
8ab8d8d67a some work towards making the edit annotations menu functional 2012-02-16 11:35:03 +00:00
rlx
5b94a68f0f Make 1,2,3,... keyboard shortcuts work when annotations have focus (fixes #473) 2012-02-15 22:41:49 +00:00
rlx
e819ff05df in annotation folder, re-calculate edit points after adding annotation (fixes #472) 2012-02-15 22:31:37 +00:00
rlx
6f3a4d1386 pass video editor keyboard events when annotations have focus (fixes #318) 2012-02-15 22:20:19 +00:00
rlx
c040e48601 beginning to fix #318 2012-02-15 22:06:00 +00:00
rlx
e46b568322 update formatting in video editor 2012-02-15 21:28:03 +00:00
j
75a230d417 fix help message for shift+I 2012-02-16 01:57:28 +05:30
rlx
8b9c5a485b fix a bug in Ox.List where a select event would trigger even though the selection had not changed 2012-02-15 20:21:17 +00:00
rlx
95da27d0db in video editor, keep menu and player size in sync (fixes #405) 2012-02-15 17:29:58 +00:00
rlx
972808eb17 add tooltips to map place info; fix a bug with autocomplete and live updates (fixes #453) 2012-02-15 16:13:09 +00:00
rlx
96db09337c revert changes (reopens #395) 2012-02-15 13:37:33 +00:00
rlx
99f9af5cd2 check for presence of annotations before acting on keyboard input 2012-02-15 13:16:03 +00:00
j
2a47b434a4 update highlight for empty string right away, fixes #395 2012-02-15 17:38:34 +05:30
j
136b2c5fdb only move to position if there are annotations, fixes #379 2012-02-15 17:33:18 +05:30
j
5f1e21f7e2 menu entry to import annotations 2012-02-14 19:06:51 +00:00
j
600dc935f2 enable keyboard shortcuts again, was disabled in [changeset:oxjs,1209] 2012-02-08 15:52:22 +05:30
rlx
89a3a119da honor layer showInfo flag and display creator as part of tooltip (fixes #332) 2012-02-05 11:08:56 +00:00
rlx
ed150f21f5 only display add annotation keyboard shortcuts for editable layers 2012-02-05 10:36:04 +00:00
j
215013e7c8 bind h key 2012-02-05 07:50:17 +05:30
rlx
8d7d1fdf36 don't trigger edit annotation event with temporary id (fixes #369) 2012-02-05 02:07:22 +00:00
rlx
353fce1f14 changes in video editor and list map 2012-02-05 01:56:23 +00:00
rlx
76466e7eeb fix video editor bugs 2012-02-04 11:44:19 +00:00
rlx
3c94f44a99 fix bugs in video editor; begin to implement new list map mode that allows for defining/clearing places 2012-02-04 08:58:46 +00:00
j
ae82696600 events are lower case 2012-02-03 14:43:20 +00:00
j
151c701934 add poster frame controls to menu, fixes #340 2012-02-02 05:15:12 +00:00
rlx
25f7c2a285 fix bugs related to selection of place/event annotations 2012-02-02 02:32:41 +00:00
rlx
bec434a353 fix a bug related to updating autocomplete words when removing an annotation 2012-02-01 22:14:22 +00:00
rlx
1eaf240970 make cursor keys work across annotation folders; make clicking in string annotation folder deselect annotation in other folder 2012-02-01 19:33:10 +00:00
j
2d0607aebd fixed #308 2012-02-01 18:04:42 +00:00
j
2ce6b0af9a undefined places/events 2012-02-01 17:21:10 +00:00
j
8bab6a9c0c check defined 2012-02-01 16:36:18 +00:00
rlx
addd277748 make cycling through matches work, even when matches have the same in/out 2012-02-01 12:47:59 +00:00
j
02e53ed3e0 events are lowercase, VideoPanel defaults 2012-02-01 07:17:47 +00:00
rlx
9b2766bc17 make find next/previous select the annotation 2012-02-01 05:21:29 +00:00
j
d10deb81aa disable some debug output 2012-01-31 12:07:31 +00:00
j
fd96423266 - find in layers
- change upadteAnnotation call to allow id updates
2012-01-31 10:57:09 +00:00
rlx
e8b1362309 fix list calendar bugs 2012-01-30 23:27:27 +00:00
rlx
b19e4c0c79 fix more resize bugs 2012-01-30 22:26:38 +00:00
rlx
93fe766c7b fix resize bugs in calendar, list calendar etc 2012-01-30 22:11:05 +00:00
rlx
70376be049 fix bugs in video preview 2012-01-30 20:59:07 +00:00
rlx
4e615e722d fix and optimize video preview 2012-01-30 20:48:19 +00:00
j
9419e3972e better width/height for textarea editables 2012-01-21 14:58:32 +00:00
j
ed4f7f0c2d various focus/selection fixes 2012-01-27 23:58:44 +05:30
rlx
a7a3f167c9 various annotation-related bugfixes 2012-01-27 19:59:11 +05:30
j
5f849abee3 update item by reference not index 2012-01-24 15:29:29 +05:30
j
d8adee70f7 set value of Ox.Editable 2012-01-20 23:41:07 +05:30
j
7475ef0124 fix Ox.Edidable textarea height, dont add title to links in parseHTML 2012-01-19 22:07:39 +05:30
rlx
1bf1eae034 minor changes 2012-01-17 23:26:26 +05:30
j
f2d7beeb22 add clickLink to video widgets 2012-01-17 21:13:46 +05:30
rlx
41e191f217 scroll to selected annotation on load 2012-01-17 17:54:21 +05:30
rlx
6d63c07ec5 update video editor (maps, calendars) 2012-01-17 17:40:50 +05:30
rlx
961f4f959a update video editor (maps, calendars) 2012-01-17 17:20:31 +05:30
rlx
dc47e901ad update video editor (maps, calendars) 2012-01-17 14:55:58 +05:30
rlx
7da384d03a update video editor 2012-01-16 23:21:53 +05:30
rlx
f5d587cf5b update video editor (maps) 2012-01-16 19:32:30 +05:30
rlx
408ebf54cb update video editor (editables) 2012-01-16 16:52:34 +05:30
rlx
688ae65cf1 update video editor 2012-01-15 20:35:17 +05:30
rlx
56cf323110 make annotation map/calendar size/state sticky 2012-01-14 17:09:55 +05:30
rlx
8384fcc913 update video editor (places, events) 2012-01-13 21:55:47 +05:30
rlx
f61e39a788 update video editor 2012-01-13 00:34:32 +05:30
rlx
b2e8b2ac82 update video editor 2012-01-12 16:09:05 +05:30
rlx
e98696b93d make space work when annotation panel has focus; give focus to video editor when deselecting annotation in panel 2012-01-11 17:34:49 +05:30
rlx
ef82ff8967 update video editor 2012-01-11 17:24:58 +05:30