455 commits

Author	SHA1	Message	Date
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
rlx	43d04f242d	make annotations sortable	2012-01-11 16:41:13 +05:30
rlx	11d9b63dba	add Ox.sortBy	2012-01-11 16:17:06 +05:30
rlx	923f71e6de	make selected annotation scroll into view	2012-01-11 15:02:33 +05:30
rlx	e4dd393834	update video editor and css	2012-01-11 13:22:01 +05:30
rlx	88f31a5ae3	video editor update	2012-01-10 20:19:28 +05:30
j	ba9423462f	blur editing	2012-01-10 01:55:38 +05:30
rlx	dc4a8bf464	update Ox.URL	2012-01-06 17:28:53 +05:30
j	093edd57d0	- remove editItem from Ox.List ... - use ArrayEditable for text too	2012-01-04 22:57:32 +05:30
rolux	66934d22a9	theme.js -> theme.json; make timeline themed	2012-01-04 15:20:07 +05:30
rolux	8097cc7812	Ox.getPositionById() -> Ox.getIndexById()	2012-01-04 13:41:05 +05:30
rlx	85652471c6	update VideoEditor/AnnotationPanel/Editable/...; update OxJS array functions	2012-01-04 01:11:50 +05:30
rlx	815ae5d253	update video editor / annotation panel	2012-01-03 15:56:15 +05:30
j	969daf07e5	toggle size	2012-01-03 13:24:29 +05:30
j	a7b14f9e0a	fix optionsGroupOffset for multiple groups and seperators	2012-01-03 13:05:22 +05:30
j	f8895e259c	flatten video actions and settings menu	2012-01-03 01:50:09 +05:30
j	724d22e14f	inline resolution selection again	2012-01-03 01:37:32 +05:30
j	39f9e9bb4d	implement 'view annotations at position / in selection / all'	2012-01-03 00:36:36 +05:30
rolux	be06c433d1	merge	2012-01-02 19:36:19 +05:30
rolux	b77852296b	misc fixes	2012-01-02 19:35:14 +05:30
j	4600cd9134	timeline is optional	2012-01-02 19:25:15 +05:30
rolux	34753cb2ed	misc updates; add geo demo	2011-12-31 18:27:02 +05:30
Sanj	962362adb2	show overlay on small timeline on in / out options change	2011-12-30 21:43:56 +05:30
j	ac4dd51ed7	Only return Ox.Element if exactly one jquery element is return. ... Fixes use of find, children	2011-12-29 15:40:08 +05:30
j	062547daa1	set default results in Ox.SmallVideoTimeline, make sure self.results is defined in Ox.VideoPlayer	2011-12-29 02:52:51 +05:30
j	109e34725c	resolution is data.checked	2011-12-28 15:59:53 +05:30
rlx	8550cc8442	add zap ui to video player	2011-12-24 06:07:50 +00:00
rlx	423faa5450	add open control to video player	2011-12-23 10:51:35 +00:00
rlx	72fe370492	fix a video player bug	2011-12-23 08:26:51 +00:00
rlx	f062c6001e	fix video player bugs	2011-12-23 07:15:40 +00:00
rlx	e2529916b3	fix bugs in video editor	2011-12-23 06:08:41 +00:00
rlx	e719b6d219	fix bugs in video player	2011-12-23 05:19:02 +00:00
rlx	5803633835	fix bugs in map and video player	2011-12-23 05:05:41 +00:00
rlx	617ad0e5ca	video player bugfixes, fullscreen-related	2011-12-22 18:03:30 +00:00
rlx	60281a666b	misc bugfixes	2011-12-22 17:37:31 +00:00
rlx	02f53a57c1	use new form element syntax, continued	2011-12-22 15:47:46 +00:00
rlx	61c3027ee0	add settings control to video player	2011-12-22 12:40:01 +00:00
rolux	215f1f6c1b	use new form element syntax	2011-12-22 12:54:20 +05:30
rolux	074902d079	form elements rewrite, part 2	2011-12-21 21:03:52 +05:30
j	734b08d9c6	remove extra loop	2011-12-21 16:23:09 +05:30
j	87ba2a10ab	video editor resolution toggle	2011-12-20 19:15:24 +05:30
j	6e0ff7158c	change video resolution, trigger ended event in player	2011-12-20 18:39:26 +05:30
rolux	96b206de1a	use MenuButton	2011-12-20 12:50:37 +05:30
rlx	9f151e2e60	add Ox.MenuButton	2011-12-20 07:07:57 +00:00
rlx	0a79291c58	update video elements	2011-12-19 21:13:11 +00:00
rolux	c1c4441b10	update uses of focusInput()	2011-12-18 15:14:11 +05:30
rlx	6c231c5cd5	fix a bug where in Ox.VideoPanelPlayer, the large timeline would no longer be tied to the small timeline	2011-11-08 19:29:05 +00:00
rlx	d186211453	remove on mouseover/select opacity change in icon lists (would cause video items to briefly go black)	2011-11-08 11:25:44 +00:00
rlx	12622724ee	fix text list so that it doesn't throw errors in its value function	2011-11-07 12:15:10 +00:00
rlx	1cf7566eeb	in video player, while playing, fire a position event for every full minute, reducing the need for saving the video position on unload	2011-11-06 09:05:21 +00:00
rlx	e6b634ddef	in button, react to change of tooltip option	2011-11-06 00:04:27 +00:00
rlx	c0f2473346	reinsert 'use strict'	2011-11-05 22:18:26 +00:00
rlx	8eac8c20d7	in video panel player, rename showControls to showTimeline	2011-11-05 22:15:10 +00:00
rlx	2b3d8807d9	fix bugs in video panel player	2011-11-05 20:14:24 +00:00
rolux	56370aa0a7	'use strict';	2011-11-05 17:46:53 +01:00
rlx	291b75c43b	in video player, separate playing event from position event, so controls that need live updates can bind to playing, while others can safely bind to position	2011-11-05 16:03:13 +00:00
rlx	d152c4b48b	in video player, trigger muted event also if caused indirectly by setting volume to zero or turning volume up while muted	2011-11-05 15:27:53 +00:00
rlx	1e8edb8388	in video player, set muted/volume of video element	2011-11-05 15:16:36 +00:00
rlx	49adfa57ae	in video editor, pass muted/volume options downwards and muted/volume events upwards	2011-11-05 15:01:18 +00:00
rlx	730712e9ba	fix bugs regarding the state of the video player volume and mute buttons	2011-11-05 14:54:13 +00:00
j	1d09d19423	some redesign for better garbage collection of elements	2011-11-04 22:14:30 +00:00
rlx	01f02d9730	disable currently not implemented menu options	2011-11-04 18:12:38 +00:00
j	dce2843303	use Ox.Log	2011-11-04 16:54:28 +01:00
rlx	e2c2eeed43	update video form element css	2011-11-04 15:13:51 +00:00
rolux	094b1a59ec	cleanup, again	2011-11-03 16:42:41 +01:00
rlx	b056a22172	update css (collapse panel extras, video editor bars, video find element)	2011-11-03 12:14:18 +00:00
rlx	fea1eed168	add OxFullscreen class to video player	2011-11-02 20:58:44 +00:00
rlx	bfac98643d	pass fullscreen option down to and up from video player	2011-11-02 20:51:54 +00:00
rlx	4bb3196c03	fix form validation bug	2011-11-02 17:27:20 +00:00
rlx	dfe12646e6	fix a bug where the interface of a block video timeline would be stacked above a dialog	2011-11-02 09:03:11 +00:00
rlx	aca33124d0	improved handling of find in video editor	2011-10-30 13:57:01 +00:00
rlx	462b335416	make video editor and player trigger find events	2011-10-30 09:49:58 +00:00
rlx	ec7ec4d707	resolve focus issues with video player find element	2011-10-29 10:01:28 +00:00
rlx	a949ad2cf4	use Ox.Editable in Ox.AnnotationPanel	2011-10-27 13:13:28 +00:00
rlx	4dd5107a48	adjust DRM for laptop screens	2011-10-24 16:38:19 +00:00
j	3bb224a022	add some ;, remove print statement	2011-10-24 15:13:00 +02:00
rlx	1954a7a799	add 'DRM'	2011-10-22 21:03:42 +00:00
rlx	4dfa708d05	populate find in video editor	2011-10-20 13:32:53 +00:00
rlx	bd3ebf5e33	make subtitles on BlockVideoTimeline optional	2011-10-20 13:04:04 +00:00
rlx	73883cba11	update css	2011-10-20 12:59:36 +00:00
rlx	b3ed2db267	fix a bug where after playing in to out, the video position would be set to the very end of the video	2011-10-19 12:01:45 +00:00
rlx	4c6a6333b2	some changes to enable clips view in pandora; fix video player to allow for paused=false and playInToOut=true	2011-10-19 10:49:19 +00:00
rlx	5d669f42e3	update infolist	2011-10-17 10:23:16 +00:00
rlx	768dd6c7aa	fix tooltip of splitpanel resizebar; allow for setting the showannotations option of video player and editor panels from outside	2011-10-13 10:10:39 +00:00
rlx	efca832c76	some work on ListCalendar	2011-10-09 21:13:16 +00:00
rlx	66b9d41450	use minify in build script; add unicode module	2011-10-05 17:07:21 +00:00
rlx	df3ea541b3	make map controls work	2011-10-04 02:26:24 +00:00
rlx	90085aaf2f	add rewind option to video player	2011-10-03 10:59:09 +00:00
rlx	f2dbfbd1e5	add some more documentation, pass some more tests	2011-10-01 02:21:55 +00:00
rlx	c6d67420a8	some fixes for map, range and videopreview	2011-09-30 10:34:33 +00:00
rlx	8ea49fab73	misc fixes	2011-09-29 17:25:50 +00:00
rlx	3965eed153	url controller updates, list bugfixes	2011-09-28 17:31:35 +00:00
rlx	ef9040ba24	fix video widget listeners and triggers	2011-09-26 19:45:36 +00:00
rlx	f2c8644001	update Ox.URL, add Ox.Event	2011-09-23 10:43:57 +00:00
rlx	d50e37588b	updating dialog and filter	2011-09-19 12:29:06 +00:00
rlx	17d842c64c	splitpanel update (allow for animation, improve performance)	2011-09-18 21:17:39 +00:00
rlx	7abc26fd0d	updating VideoPreview	2011-09-18 06:50:54 +00:00
rlx	ef1fa5fe84	some bugfixes	2011-09-17 11:49:29 +00:00
rolux	4cc754a28d	remove Ox.each, , $.extend, $.map and $.merge	2011-09-17 20:36:09 +02:00
rolux	da9e5dbb29	fix event handlers and split panel resize event	2011-09-17 19:39:38 +02:00
rlx	3f90e96c3a	updating video elements (fixes bugs with positions and points)	2011-09-17 07:09:17 +00:00
j	4768dcfe8e	add some docstrings	2011-09-14 10:34:33 -04:00