Commit Graph

178 Commits

Author SHA1 Message Date
Jonathan Bennett 2beffeb1b4 Add Janus to Cycle view. Remove debug Alert() messages 2022-01-12 22:47:35 -06:00
Jonathan Bennett 50c824f3bb Janus cleanup, adds support to the "watch" view 2022-01-11 21:21:58 -06:00
Isaac Connor c081637036 Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON. 2021-12-16 16:38:15 -05:00
Isaac Connor f1db88510e remove debug, fix eslint 2021-12-15 09:23:21 -05:00
Isaac Connor f6d0274f74 Fix PrevCycle because monIdx was empty. 2021-12-14 17:05:56 -05:00
Isaac Connor 5d8db0a320 Merge cycle functionality into watch view. Add period dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and don't use status ajax unless we are in still mode. Apply some min-width to fps so they don't jump around. Only update their content if it has changed (fewer browser renders). 2021-12-10 15:34:35 -05:00
Isaac Connor 5d0bd978e4 Implement Exit Fullscreen using same button 2021-11-10 14:22:05 -05:00
Isaac Connor 30d4900b45 rough in fullscreen mode in watch view 2021-11-09 17:01:13 -05:00
Isaac Connor a55bd23bf6 Add some extra parenthesis to make sure the logic works right 2021-10-25 16:55:23 -04:00
Isaac Connor 26ac52aaa9 Fix scaling the image after changeScale. Limit stream scale to 100, let browser do the scaling 2021-10-14 13:00:49 -04:00
Isaac Connor e394248baf Add ajax controls to realtime change the v4l2 ctrls 2021-10-05 19:49:42 -04:00
Isaac Connor 2640791b89 spacing 2021-08-23 18:13:19 -04:00
Isaac Connor 44823e0c94 spacing remove dead code 2021-08-18 18:40:25 -04:00
Isaac Connor f3b4ccf758 Fix scaling when scale to fit 2021-05-10 11:08:16 -04:00
Peter Keresztes Schmidt 1dbfa0790a web: fix eslint errors 2021-04-24 01:42:13 +02:00
root f3ea08c4a1 Merge branch 'continuous' into cont_mast 2021-04-16 11:27:48 -04:00
Isaac Connor c880618d5f If no button is associated with the event, assume it is a mouseup 2021-04-16 10:24:48 -04:00
Isaac Connor 492a352bed Use updated auth_hash when sending alarm requests 2021-04-09 18:33:32 -04:00
Isaac Connor c35869fd30 Use jquery offset() to get image position 2021-02-02 23:19:53 -05:00
Isaac Connor 69b9e40b59 Fix textstatus=>textStatus 2021-01-31 10:09:22 -05:00
Isaac Connor c444e5cf07 spacing 2021-01-29 14:05:04 -05:00
Isaac Connor 7dd9188b3b fix eslint 2021-01-26 18:09:19 -05:00
Isaac Connor 410b9840d1 fix eslint 2021-01-26 17:44:23 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Andrew Bauer e3fdfa659a fix typo and disable settings btn rather than hide 2021-01-19 10:32:18 -06:00
Andrew Bauer c13d2ea99f make watch view event list more efficient 2021-01-19 10:10:51 -06:00
Isaac Connor cb90c06cde Merge branch 'master' into zma_to_thread 2021-01-17 17:38:34 -05:00
Isaac Connor d98dde4aee Use auth hash in event loading. Use monitorURL in ajax calls that need to talk to zms. Use bindButton to handle the non-existence of settings button. 2021-01-16 13:17:46 -05:00
Isaac Connor 7d08f24895 use pageX and pageY instead of page.x and page.y 2021-01-14 12:56:54 -05:00
Isaac Connor 16db59ecb1 use pageX and pageY instead of page.x and page.y 2021-01-14 10:33:03 -05:00
Isaac Connor 8de122ef26 remove await that we can't use 2021-01-12 14:13:42 -05:00
Isaac Connor c6cf1da47d Merge branch 'master' into zma_to_thread 2021-01-11 17:08:44 -05:00
Isaac Connor a51dfe552b Remove auth_hash var that overlaps global auth_hash var. Use attr('src') instead of src 2021-01-11 16:41:43 -05:00
Isaac Connor bb50de268b Fix setting img.src to new url. Won't have any effect here as we are reloading the whole page. 2021-01-11 15:21:39 -05:00
Isaac Connor 8204d2d7eb Introduce sleep() function. Use it on ajax error to wait 1 second before reloading page 2021-01-11 13:57:39 -05:00
Andrew Bauer 638e801c07 replace mootools .delay method 2021-01-11 13:46:50 -05:00
Andrew Bauer a1678f5ea4 replace mootool Cookie object with plain JS 2021-01-11 13:46:50 -05:00
Andrew Bauer d2cc65c8a3 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer a6964f66e2 use JS instead of Mootools to detect IE browser 2021-01-11 13:46:50 -05:00
Isaac Connor 6d9fa27b37 Fix changeScale not updating zms url when the page initially loads as not scale to fit 2021-01-11 13:46:50 -05:00
Andrew Bauer 9ec09c0c85 replace mootools .delay method 2021-01-08 12:25:17 -06:00
Andrew Bauer f816c72517 replace mootool Cookie object with plain JS 2021-01-08 10:04:46 -06:00
Andrew Bauer d0f035596c eslint 2021-01-08 08:50:57 -06:00
Andrew Bauer d3a71aff14 use JS instead of Mootools to detect IE browser 2021-01-08 08:27:06 -06:00
Isaac Connor de38c29e83 Fix lack of # for zoomvalue 2020-12-15 15:56:41 -05:00
Isaac Connor 99e7ae3505 Merge branch 'master' into rtsp_server 2020-12-15 10:14:19 -05:00
Andrew Bauer 237335c022 watch.js - finish mootools replacement 2020-12-12 12:45:36 -06:00
Andrew Bauer 3a4cdb7e50 eslint 2020-12-09 20:06:38 -06:00
Andrew Bauer 026b8cfb0c eslint 2020-12-09 17:58:46 -06:00
Isaac Connor 28a3868069 report both capture_fps and analysis_fps 2020-12-09 15:03:33 -05:00