Commit graph

1074 commits

Author SHA1 Message Date
rlx
bbdbaf86da keep annotation remove from throwing errors (fixes #452) 2012-02-18 07:22:31 +00:00
rlx
fe87e6ab1c changing vertical-align of table cells to top 2012-02-18 07:09:41 +00:00
rlx
65a3a21d11 resolve an issue with icon list text formatting (fixes #511) 2012-02-18 06:59:34 +00:00
rlx
ab6c1f2234 change color scheme for editable annotations (fixes #502) 2012-02-17 22:08:02 +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
23c319d95a remove special case for FF3.6, Ox.isArguments is fixed 2012-02-17 10:32:32 +00:00
rlx
4f5a2e8072 fix Ox.isArguments 2012-02-17 10:30:47 +00:00
j
f919d64044 fix Ox.App in Firefox 3.6 to show loading screen, fixes #393 2012-02-17 10:24:42 +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
d13d0e3d3f uri decode map query value, fixes #432 2012-02-16 21:46:12 +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
1ea9524cb1 make lists fire select events when updating the query changes, i.e. removes, its previous selection (fixes #238) 2012-02-16 06:41:19 +00:00
rlx
33eb986c59 fix for firefox image drag bug (fixes #387, and drag-and-drop) 2012-02-15 23:08:20 +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
rlx
3007cafcae add 'select' option to editCell method of TextLists (helps fix #445) 2012-02-15 20:59:04 +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
rlx
2be6052276 List: Add selectbefore and selectafter events (fixes #353) 2012-02-15 11:30:01 +00:00
rlx
08423110e9 omit country name from map tooltip (fixes #396) 2012-02-15 10:43:40 +00:00
j
5f1e21f7e2 menu entry to import annotations 2012-02-14 19:06:51 +00:00
j
5173bf62fe limit images by width 2012-02-14 18:52:57 +05:30
j
a976b674f4 - allow links to local images
- allow wiki links to local urls
- disable automatic url / email linking since its broken right now
2012-02-11 17:49:25 +05:30
j
21854f653e do not shorten urls, just turn them into links 2012-02-10 15:22:09 +05:30
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
rlx
63a6bf2cb8 in app, send location.href on init (fixes #352) 2012-02-05 03:10:26 +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
56300ab2db undefined places are now inline 2012-02-01 17:29:15 +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
j
72323febea dont fail if geoname is undefined 2012-02-01 15:25:41 +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
rlx
1ae47b761b support highlighting in icon list text 2012-02-01 11:57:21 +00:00
rlx
4dba56ba87 improve Ox.highlightHTML and annotations CSS 2012-02-01 08:26:06 +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
319608b5ac fix selecting tab via .select in tab panel 2012-01-31 13:23:24 +00:00
j
d10deb81aa disable some debug output 2012-01-31 12:07:31 +00:00
j
9568acd592 highlight html strings without breaking tags 2012-01-31 12:00:34 +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
rolux
1b42a4e7f1 fix a calendar bug 2012-01-30 01:12:53 +05:30
j
e51c4aa847 call gc before focus/blur to remove elements from focus stack that are no longer around 2012-01-21 11:30:16 +00:00
j
05b4d0cf82 ae singleclick 2012-01-29 14:59:30 +05:30
j
46e10fb81b event.metaKey should be ctrl key, patch jquery 2012-01-28 15:42:12 +05:30
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
198e11c59b update jquery.mousewheel.js to work with jquery 1.7 2012-01-27 17:33:01 +05:30
j
8d685a891c update jquery to 1.7.1 2012-01-27 17:05:05 +05:30
j
5f849abee3 update item by reference not index 2012-01-24 15:29:29 +05:30
j
129b8154fb dont fail if no error events are bound 2012-01-21 20:45:31 +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
j
f7755eb303 dont depend on Ox.Element in Ox.Request instantiation 2012-01-19 19:10:35 +05:30
j
216ad5f44f load Ox.Element before Ox.Request, should be a better way to do this 2012-01-19 17:59:29 +05:30
0efc4709a3 LoadingIcon silly errors + link demos to ../dev/ version 2012-01-18 01:26:08 +05:30
rlx
1bf1eae034 minor changes 2012-01-17 23:26:26 +05:30
rlx
2bf92c982a minor changes 2012-01-17 23:08:16 +05:30
rlx
3acc606fa2 minor changes 2012-01-17 23:04:33 +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
rolux
1445824ffd add tests to Ox.formatDateRange 2012-01-17 11:29:32 +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
47061543ea merge 2012-01-16 13:01:48 +05:30
rolux
0e2109a77c merging changes (video editor updates) 2012-01-16 12:58:09 +05:30
rolux
0423800b05 fix issues with type textarea editables 2012-01-16 12:39:16 +05:30
rlx
d156ede914 fix formatting of editables that span multiple lines 2012-01-15 21:08:06 +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
j
36c1cda12a turn request errors into events 2012-01-14 16:18:26 +05:30
rlx
8384fcc913 update video editor (places, events) 2012-01-13 21:55:47 +05:30
rlx
8de69b3173 fix a bug in Ox.Input that would make its change event fire more than once 2012-01-13 16:28:01 +05:30
rlx
923ed92bd7 fix a bug regarding the value of empty array inputs 2012-01-13 15:01:16 +05:30
rolux
30088ad0b1 update map and calendar 2012-01-13 12:27:42 +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
j
b4139a7388 fix selectable 2012-01-09 16:15:59 +05:30
j
82744a14ed make leaves selectable in TreeList, fixed: 226 2012-01-09 16:10:51 +05:30
rolux
1db649bd61 add Function.js, some updates in OxJS 2012-01-07 12:50:02 +05:30
rolux
80f9a1a33d merging changes (timeline, annotations, urls) 2012-01-06 17:32:20 +05:30
rlx
dc4a8bf464 update Ox.URL 2012-01-06 17:28:53 +05:30
rolux
f76ee0cf36 minor changes in OxJS 2012-01-06 17:27:54 +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
rolux
4ca01b2bfa merge updates in VideoEditor, AnnotationsPanel, Editable, Input, etc 2012-01-04 13:15:48 +05:30
rolux
2ef642fdeb misc updates to ox.js 2012-01-04 13:12:48 +05:30
rlx
85652471c6 update VideoEditor/AnnotationPanel/Editable/...; update OxJS array functions 2012-01-04 01:11:50 +05:30
rolux
d64e39c5b2 add Ox.ArrayEditable 2012-01-03 15:57:54 +05:30
rlx
815ae5d253 update video editor / annotation panel 2012-01-03 15:56:15 +05:30
rolux
7d3f72ecc9 add Ox.ArrayEditable 2012-01-03 15:55: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
rlx
0c6541363d fix collapsepanel 2012-01-02 14:25:04 +00:00
rolux
038493d52b fix collapsepanel 2012-01-02 19:46:08 +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
7ca9a4a9e7 update progress bar 2012-01-02 13:55:34 +05:30
rolux
2f740a972a fix for editable elements without tooltip 2012-01-02 11:54:54 +05:30
rolux
812d172e23 fix globals in image module 2012-01-02 11:51:36 +05:30
rolux
a4982ff81b typo in MapMarker 2011-12-31 19:51:32 +05:30
rolux
6279a602fd merge changes in Ox.Resizebar 2011-12-31 18:28:26 +05:30
rolux
34753cb2ed misc updates; add geo demo 2011-12-31 18:27:02 +05:30
j
a048fcc340 tooltip is optional 2011-12-31 17:59:52 +05:30
rolux
09a3537dc1 fix some localStorage bugs 2011-12-31 02:11:54 +05:30
rolux
cd6304d8b7 merge 2011-12-31 02:10:51 +05:30
6789df65e6 merged 2011-12-30 21:45:02 +05:30
962362adb2 show overlay on small timeline on in / out options change 2011-12-30 21:43:56 +05:30
rolux
7f249ff12b fix some localStorage bugs 2011-12-30 21:21:33 +05:30
rolux
64592e7278 fix some localStorage bugs 2011-12-30 21:07:41 +05:30
rolux
45243cb5ff add Ox.localStorage 2011-12-30 20:36:55 +05:30
rolux
11cb7b1dc8 merge 2011-12-30 15:03:42 +05:30
rolux
73f1105692 updating form elements 2011-12-30 15:03:01 +05:30
j
7831dcd77d expand TreeList selecting an item 2011-12-29 17:54:29 +05:30
j
1a7a5985d9 update listLengh in addItems/removeItems 2011-12-29 16:15:59 +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
771d2be37b workaround to make TreeList work, find should really work here 2011-12-29 15:04:13 +05:30
j
bfaea73f1f ; 2011-12-29 13:42:10 +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
rolux
21f703c6c4 remove print statements 2011-12-23 15:35:19 +05:30
rlx
84e7e794f7 misc bugfixes 2011-12-23 09:54:20 +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
e47305c93f fix filter bugs (saving) 2011-12-22 14:42:32 +00:00
rlx
24087ec713 fix filter bugs (setting operators of grouped conditions) 2011-12-22 14:22:07 +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
rlx
d80019a17c form elements rewrite, part 3 2011-12-22 05:52:46 +00:00
rlx
a6c01dd6c6 Api -> API 2011-12-21 15:42:11 +00:00
rlx
fcf1e79ed0 Api -> API 2011-12-21 15:40:06 +00:00
rolux
074902d079 form elements rewrite, part 2 2011-12-21 21:03:52 +05:30
rlx
fe303bf2b0 merging changes (api, app, video) 2011-12-21 13:44:22 +00:00