Isaac Connor
|
cdfe38cc31
|
Add UrltoZMS and UrltoAPI methods to Server js class
|
2022-11-30 13:19:02 -05:00 |
|
Isaac Connor
|
0c0269b2cc
|
Fix eslint
|
2022-11-01 12:41:27 -04:00 |
|
Isaac Connor
|
2859634aaa
|
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
|
2022-11-01 08:22:53 -04:00 |
Isaac Connor
|
f0cd36989b
|
Spacing, use const and let instead of var
|
2022-10-21 18:11:46 -04:00 |
|
Isaac Connor
|
5a5a665cdf
|
Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined
|
2022-10-12 19:34:05 -04:00 |
|
Isaac Connor
|
cb3fc5907d
|
Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs
|
2022-10-06 14:52:39 -04:00 |
VikingGer
|
11a4735082
|
Update MonitorLinkExpression.js
Trailing spaces lead to eslint error. Removed them
|
2022-09-17 10:08:07 +02:00 |
|
Isaac Connor
|
419a44f8ed
|
Merge branch 'iiot'
|
2022-09-13 18:23:44 -04:00 |
|
Isaac Connor
|
d079439005
|
Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports
|
2022-09-12 19:40:27 +02:00 |
Jonathan Bennett
|
c35bbc8c30
|
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
|
2022-09-07 15:49:47 -05:00 |
|
Isaac Connor
|
4eeb49d09a
|
Merge branch 'master' into reports
|
2022-08-31 18:38:08 +02:00 |
|
Isaac Connor
|
62a8b72dc4
|
Fix add monitorlink to not prepend a | onto and empty expr
|
2022-08-30 20:03:55 +02:00 |
|
Isaac Connor
|
e24432ee4d
|
Merge branch 'master' into reports
|
2022-08-30 19:40:14 +02:00 |
|
Isaac Connor
|
3005ddff49
|
Still parse even if no tokens
|
2022-08-30 19:36:43 +02:00 |
|
Isaac Connor
|
48377334fe
|
Gracefully handle when FrameRate is empty
|
2022-08-26 14:12:51 -04:00 |
|
Isaac Connor
|
f202e82b78
|
Remove no longer used code to protect percentage widths
|
2022-08-19 13:33:22 -04:00 |
|
Isaac Connor
|
331e3f483a
|
Handle width=100% and remove code that worked around montage layouts with width=%.
|
2022-08-19 13:33:22 -04:00 |
|
Isaac Connor
|
e2ebccc9aa
|
fix eslint
|
2022-08-19 13:33:20 -04:00 |
|
Isaac Connor
|
071147fba7
|
Remove no longer used code to protect percentage widths
|
2022-08-15 13:04:50 -04:00 |
|
Isaac Connor
|
de5b8bd893
|
Handle width=100% and remove code that worked around montage layouts with width=%.
|
2022-08-15 13:01:49 -04:00 |
|
Isaac Connor
|
294fd9b3c7
|
Always populate add MonitorLink dropdown.
|
2022-08-08 10:05:15 -04:00 |
|
Isaac Connor
|
f794077d71
|
Only add or operator if monitorlinks has content
|
2022-08-08 10:02:20 -04:00 |
|
Isaac Connor
|
dc52105c8f
|
Allow to link to ourself
|
2022-08-03 14:44:44 -04:00 |
|
Isaac Connor
|
6c292dd0e3
|
Improve adding parenthesis, rename function to snake case
|
2022-08-03 14:30:18 -04:00 |
|
Isaac Connor
|
eb4b097560
|
fix eslint
|
2022-08-03 13:52:01 -04:00 |
|
Isaac Connor
|
2e5d7ee167
|
Improve adding parenthesis, rename function to snake case
|
2022-08-03 13:38:56 -04:00 |
|
Isaac Connor
|
6f146d1af0
|
Add MonitorLinkExpression.js
|
2022-08-03 12:14:51 -04:00 |
|
Isaac Connor
|
4ab58f5f22
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-06-16 09:58:49 -04:00 |
|
Isaac Connor
|
58fedd8c35
|
Fix streamQuery => streamCmdQuery. Fixes #3507
|
2022-06-16 09:58:26 -04:00 |
|
Isaac Connor
|
17562671c1
|
fix eslint
|
2022-06-15 13:18:11 -04:00 |
|
Isaac Connor
|
a5cbe65d70
|
watchdog is not available everywhere yet. comment out its use
|
2022-06-15 13:08:38 -04:00 |
|
Isaac Connor
|
5188346086
|
Institute a status timer to be used when not streaming from zms.
|
2022-06-15 12:34:55 -04:00 |
|
Isaac Connor
|
ba2b18f8a9
|
Fix eslint
|
2022-06-03 15:00:23 -04:00 |
|
Isaac Connor
|
edfaffb88f
|
Only set onclick if a new function is given
|
2022-06-02 15:11:59 -04:00 |
|
Isaac Connor
|
c68f9f5fe8
|
Include connKey is debug line
|
2022-06-01 08:58:58 -04:00 |
|
Isaac Connor
|
516967e054
|
Don't set width if it already has a value. Fix state setting on state label.
|
2022-05-30 13:37:27 -04:00 |
|
Isaac Connor
|
331aca149b
|
If the response contained a message, alert it
|
2022-05-30 10:34:08 -04:00 |
|
Isaac Connor
|
e1c80a710b
|
Use global config vale for ZM_WEB_POPUP_ON_ALARM
|
2022-05-30 10:17:20 -04:00 |
|
Isaac Connor
|
544c1a248c
|
Only set monitor_frame width if it is auto
|
2022-05-26 13:00:13 -04:00 |
|
Isaac Connor
|
53025e1572
|
set src='' before new value. Firefox needs it. set scale to 100 when 0, just for consistency. Remove stream_frame which is unused, fixup parenthesis
|
2022-05-26 12:37:36 -04:00 |
|
Isaac Connor
|
57bd502bb9
|
test for 0 before setting width and height
|
2022-05-26 12:32:26 -04:00 |
|
Isaac Connor
|
082fff850f
|
Re-instate setting the class of the monitor div on alarm
|
2022-05-26 12:28:12 -04:00 |
|
Isaac Connor
|
a7f586a46d
|
fix eslint
|
2022-05-13 11:02:12 -04:00 |
|
Isaac Connor
|
0ede5cec85
|
remove duplication of onload, onerror. Introduce a kill function to be called when we browse away to stop all the ajax.
|
2022-05-13 10:33:35 -04:00 |
|
Isaac Connor
|
59898caf59
|
Start the query status timer on img.load
|
2022-05-12 11:00:50 -04:00 |
|
Isaac Connor
|
eb3806f482
|
Don't close initial stream. The QUIT gets lost. Add onload debugging
|
2022-05-07 11:39:17 -04:00 |
|
Isaac Connor
|
085da5c1fb
|
fix eslint
|
2022-05-02 10:01:14 -04:00 |
|
Isaac Connor
|
01a5ab2621
|
Replace msieVer with something more modern. Don't change monitor_=frame.style.width when auto-scaling and no bottom element. We do not want to change the css, just calculate a scale
|
2022-04-29 18:13:25 -04:00 |
|
Isaac Connor
|
dd95ebb34a
|
ZM_SOUND_ON_ALARM is actually ZM_WEB_SOUND_ON_ALARM
|
2022-04-29 17:52:51 -04:00 |
|
Isaac Connor
|
99fa0a71cf
|
SOUND_ON_ALARM is now included in ZM_SOUND_ON_ALARM
|
2022-04-29 17:51:02 -04:00 |
|
Isaac Connor
|
9e39cbf3e9
|
add px's where appropriate, document setScale a bit more, use streamCOmmand for statusQuery
|
2022-04-28 19:18:40 -04:00 |
|
Isaac Connor
|
ac3fa65577
|
MonitorStream doesn't know about MONTAGE. Hiding fields should be done in php. Use toLocaleString to format fps values with 1 decimal.
|
2022-04-28 17:05:32 -04:00 |
|
Isaac Connor
|
2fb44769b6
|
split setScale into setStreamScale so we can set the img.src without altering the frame
|
2022-04-22 15:50:55 -04:00 |
|
Isaac Connor
|
0d176b133a
|
Stop and restart statusCmdReq around rescaling img stream. Deprecate auto as a value for scale. Make another attempt as sanely applying scale
|
2022-04-22 12:34:49 -04:00 |
|
Isaac Connor
|
8170ce2b8d
|
Check error instead of textStatus for Unauthorized. Set streamCmdParams.auth when auth_hash changes. Fixes auth timing out in ajax
|
2022-04-20 18:47:57 -04:00 |
|
Isaac Connor
|
c2dcaab744
|
fix eslint
|
2022-04-20 10:00:47 -04:00 |
|
Isaac Connor
|
0501f464c5
|
Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari
|
2022-04-19 19:30:27 -04:00 |
|
Isaac Connor
|
21716e994b
|
Keep better track of timers. Add img_onerror to report when image breaks. setScale is a mess. Add some more code to guess image scale. Browser can't handle 4k jpeg streams. scaling is a must.
|
2022-04-19 16:56:21 -04:00 |
|
Isaac Connor
|
a1f0ac2e48
|
width=auto,height=auto,scale=fixed operates the same as scale=auto. Don't set height. Height is ONLY set when a specific height is chosen. Which may go away for an aspect ratio dropdown instead.
|
2022-04-10 17:30:34 -04:00 |
|
Isaac Connor
|
8db08f5a10
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-03-04 12:09:44 -05:00 |
|
Isaac Connor
|
920f5470a8
|
Don't set width&height on img. img is always 100% of container. Don't show zoom unless it is != 1.0. Only update buttons if there is a change, to reduce redraws
|
2022-03-04 12:07:32 -05:00 |
|
Jonathan Bennett
|
c28c043773
|
Adds support for Janus 1.x
|
2022-02-28 18:05:17 -06:00 |
|
Jonathan Bennett
|
1749afc8e2
|
Add additional Firefox streaming workaround
|
2022-02-28 14:17:19 -06:00 |
|
Isaac Connor
|
a40b305065
|
Merge branch 'master' into replace_function_concept
|
2022-02-20 09:52:03 -05:00 |
|
Isaac Connor
|
002b2c39aa
|
fix button assignments. Don't abort ajax, as it might be important
|
2022-02-18 17:11:18 -05:00 |
|
Isaac Connor
|
dcf6e5da46
|
If there is an ajax error, and the error is unauthorized, then reload the page.
|
2022-02-08 11:20:54 -05:00 |
|
Isaac Connor
|
8e62562afd
|
Move onclick to the surrounding div instead of the img. Fixes clicking on montage
|
2022-01-26 21:39:29 -05:00 |
|
Jonathan Bennett
|
2e9bda1af1
|
Add firefox specific workaround for Janus streaming
|
2022-01-21 23:21:41 -06:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
2da9c20c08
|
Add ajaxQueue
|
2022-01-20 11:49:59 -05:00 |
|
Isaac Connor
|
22b6337752
|
Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI
|
2022-01-20 11:47:28 -05:00 |
|
Isaac Connor
|
388735e942
|
Fix relating auth_hash causing repeated reloads. If https, then assume a reverse proxy setup to janus. If video feed is not an img, log it and return
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
24c2efeb00
|
fix eslint
|
2022-01-17 16:19:27 -05:00 |
|
Jonathan Bennett
|
5026008482
|
Changes due to janus packaging
|
2022-01-16 19:55:53 -06:00 |
|
Jonathan Bennett
|
59056b4103
|
Refactor Montage view js -- Janus in MonitorStream
|
2022-01-15 01:33:17 -06:00 |
|
Jonathan Bennett
|
50c824f3bb
|
Janus cleanup, adds support to the "watch" view
|
2022-01-11 21:21:58 -06:00 |
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
Isaac Connor
|
c8bc0661b1
|
Have to clear src before resetting or some browsers won't load the new image
|
2022-01-08 12:14:28 -05:00 |
|
Isaac Connor
|
939f165b22
|
rename analyze to analyse
|
2022-01-07 16:05:52 -05:00 |
|
Isaac Connor
|
6f5eee6c0f
|
Add show_analyze_frames function to tell zms to send analysis frames
|
2022-01-07 13:53:49 -05:00 |
|
Isaac Connor
|
474f65cff3
|
Implement getElement, setScale in MonitorStream.js
|
2021-11-10 14:20:19 -05:00 |
|
Isaac Connor
|
1c8a850acf
|
Handle stream having something other than an img as it's display
|
2021-03-23 13:53:45 -04:00 |
|
Isaac Connor
|
478d11e6f2
|
Update the auth in streamCmdParams on every request. It wasn't picking up updates
|
2021-03-13 12:12:20 -05:00 |
Andrew Bauer
|
68819a86a0
|
remove mootools from zoneminder
|
2021-01-18 07:31:43 -06:00 |
|
Isaac Connor
|
3639593ae5
|
use js.post instead of getJSON.
|
2021-01-11 15:22:15 -05:00 |
|
Andrew Bauer
|
9968a65ee6
|
bind this to streamCmdQuery
|
2021-01-10 14:21:52 -06:00 |
|
Andrew Bauer
|
c67c1ce6a0
|
replace Mootool delay with setTimeout
|
2021-01-08 13:06:56 -06:00 |
|
Andrew Bauer
|
72eaf267c1
|
eslint
|
2021-01-08 10:45:59 -06:00 |
|
Andrew Bauer
|
c0431eca86
|
eslint
|
2021-01-08 10:42:45 -06:00 |
|
Andrew Bauer
|
55d99e8e7c
|
eslint
|
2021-01-08 10:10:47 -06:00 |
|
Andrew Bauer
|
b56883a985
|
add reference to browserInfo function
|
2021-01-08 09:35:32 -06:00 |
|
Andrew Bauer
|
62fc1fb1aa
|
replace Mootools Browser object with our own
|
2021-01-08 09:32:51 -06:00 |
|
Andrew Bauer
|
a431f08133
|
eslint
|
2021-01-06 15:57:30 -06:00 |
|
Andrew Bauer
|
9d7f738f61
|
replace mootools in MonitorStream
|
2021-01-06 14:19:25 -06:00 |
|
Andrew Bauer
|
51132cb5e1
|
old overlay code is no longer used
|
2021-01-04 13:51:03 -06:00 |
|
Andrew Bauer
|
9209f40daa
|
eslint
|
2020-12-24 14:59:27 -06:00 |
|
Andrew Bauer
|
3fd50bb01d
|
reorganize logger.js and use jquery
|
2020-12-24 14:32:23 -06:00 |
|
Andrew Bauer
|
332ec2032a
|
replace createPopup with location.assign
|
2020-10-12 12:37:23 -05:00 |
Matthew Noorenberghe
|
77cca7efac
|
eslint --fix
|
2020-09-04 10:02:43 -04:00 |
|
Isaac Connor
|
a88dcfe78c
|
During start, switch from mode=single if required. Add play/stop/pause
|
2020-09-02 14:37:48 -04:00 |