3005ddff49
Still parse even if no tokens
2022-08-30 19:36:43 +02:00
48377334fe
Gracefully handle when FrameRate is empty
2022-08-26 14:12:51 -04:00
f202e82b78
Remove no longer used code to protect percentage widths
2022-08-19 13:33:22 -04:00
331e3f483a
Handle width=100% and remove code that worked around montage layouts with width=%.
2022-08-19 13:33:22 -04:00
e2ebccc9aa
fix eslint
2022-08-19 13:33:20 -04:00
071147fba7
Remove no longer used code to protect percentage widths
2022-08-15 13:04:50 -04:00
de5b8bd893
Handle width=100% and remove code that worked around montage layouts with width=%.
2022-08-15 13:01:49 -04:00
294fd9b3c7
Always populate add MonitorLink dropdown.
2022-08-08 10:05:15 -04:00
f794077d71
Only add or operator if monitorlinks has content
2022-08-08 10:02:20 -04:00
dc52105c8f
Allow to link to ourself
2022-08-03 14:44:44 -04:00
6c292dd0e3
Improve adding parenthesis, rename function to snake case
2022-08-03 14:30:18 -04:00
eb4b097560
fix eslint
2022-08-03 13:52:01 -04:00
2e5d7ee167
Improve adding parenthesis, rename function to snake case
2022-08-03 13:38:56 -04:00
6f146d1af0
Add MonitorLinkExpression.js
2022-08-03 12:14:51 -04:00
4ab58f5f22
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-06-16 09:58:49 -04:00
58fedd8c35
Fix streamQuery => streamCmdQuery. Fixes #3507
2022-06-16 09:58:26 -04:00
17562671c1
fix eslint
2022-06-15 13:18:11 -04:00
a5cbe65d70
watchdog is not available everywhere yet. comment out its use
2022-06-15 13:08:38 -04:00
5188346086
Institute a status timer to be used when not streaming from zms.
2022-06-15 12:34:55 -04:00
ba2b18f8a9
Fix eslint
2022-06-03 15:00:23 -04:00
edfaffb88f
Only set onclick if a new function is given
2022-06-02 15:11:59 -04:00
c68f9f5fe8
Include connKey is debug line
2022-06-01 08:58:58 -04:00
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
331aca149b
If the response contained a message, alert it
2022-05-30 10:34:08 -04:00
e1c80a710b
Use global config vale for ZM_WEB_POPUP_ON_ALARM
2022-05-30 10:17:20 -04:00
544c1a248c
Only set monitor_frame width if it is auto
2022-05-26 13:00:13 -04:00
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
57bd502bb9
test for 0 before setting width and height
2022-05-26 12:32:26 -04:00
082fff850f
Re-instate setting the class of the monitor div on alarm
2022-05-26 12:28:12 -04:00
a7f586a46d
fix eslint
2022-05-13 11:02:12 -04:00
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
59898caf59
Start the query status timer on img.load
2022-05-12 11:00:50 -04:00
eb3806f482
Don't close initial stream. The QUIT gets lost. Add onload debugging
2022-05-07 11:39:17 -04:00
085da5c1fb
fix eslint
2022-05-02 10:01:14 -04:00
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
dd95ebb34a
ZM_SOUND_ON_ALARM is actually ZM_WEB_SOUND_ON_ALARM
2022-04-29 17:52:51 -04:00
99fa0a71cf
SOUND_ON_ALARM is now included in ZM_SOUND_ON_ALARM
2022-04-29 17:51:02 -04:00
9e39cbf3e9
add px's where appropriate, document setScale a bit more, use streamCOmmand for statusQuery
2022-04-28 19:18:40 -04:00
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
2fb44769b6
split setScale into setStreamScale so we can set the img.src without altering the frame
2022-04-22 15:50:55 -04:00
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
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
c2dcaab744
fix eslint
2022-04-20 10:00:47 -04:00
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
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
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
8db08f5a10
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-03-04 12:09:44 -05:00
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
c28c043773
Adds support for Janus 1.x
2022-02-28 18:05:17 -06:00
1749afc8e2
Add additional Firefox streaming workaround
2022-02-28 14:17:19 -06:00
a40b305065
Merge branch 'master' into replace_function_concept
2022-02-20 09:52:03 -05:00
002b2c39aa
fix button assignments. Don't abort ajax, as it might be important
2022-02-18 17:11:18 -05:00
dcf6e5da46
If there is an ajax error, and the error is unauthorized, then reload the page.
2022-02-08 11:20:54 -05:00
8e62562afd
Move onclick to the surrounding div instead of the img. Fixes clicking on montage
2022-01-26 21:39:29 -05:00
2e9bda1af1
Add firefox specific workaround for Janus streaming
2022-01-21 23:21:41 -06:00
52e48c02b6
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
2022-01-21 22:23:41 -06:00
2da9c20c08
Add ajaxQueue
2022-01-20 11:49:59 -05:00
22b6337752
Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI
2022-01-20 11:47:28 -05:00
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
24c2efeb00
fix eslint
2022-01-17 16:19:27 -05:00
5026008482
Changes due to janus packaging
2022-01-16 19:55:53 -06:00
59056b4103
Refactor Montage view js -- Janus in MonitorStream
2022-01-15 01:33:17 -06:00
50c824f3bb
Janus cleanup, adds support to the "watch" view
2022-01-11 21:21:58 -06:00
3a9c16aeea
First working Janus build
2022-01-10 23:22:37 -06:00
c8bc0661b1
Have to clear src before resetting or some browsers won't load the new image
2022-01-08 12:14:28 -05:00
939f165b22
rename analyze to analyse
2022-01-07 16:05:52 -05:00
6f5eee6c0f
Add show_analyze_frames function to tell zms to send analysis frames
2022-01-07 13:53:49 -05:00
474f65cff3
Implement getElement, setScale in MonitorStream.js
2021-11-10 14:20:19 -05:00
1c8a850acf
Handle stream having something other than an img as it's display
2021-03-23 13:53:45 -04:00
478d11e6f2
Update the auth in streamCmdParams on every request. It wasn't picking up updates
2021-03-13 12:12:20 -05:00
68819a86a0
remove mootools from zoneminder
2021-01-18 07:31:43 -06:00
3639593ae5
use js.post instead of getJSON.
2021-01-11 15:22:15 -05:00
9968a65ee6
bind this to streamCmdQuery
2021-01-10 14:21:52 -06:00
c67c1ce6a0
replace Mootool delay with setTimeout
2021-01-08 13:06:56 -06:00
72eaf267c1
eslint
2021-01-08 10:45:59 -06:00
c0431eca86
eslint
2021-01-08 10:42:45 -06:00
55d99e8e7c
eslint
2021-01-08 10:10:47 -06:00
b56883a985
add reference to browserInfo function
2021-01-08 09:35:32 -06:00
62fc1fb1aa
replace Mootools Browser object with our own
2021-01-08 09:32:51 -06:00
a431f08133
eslint
2021-01-06 15:57:30 -06:00
9d7f738f61
replace mootools in MonitorStream
2021-01-06 14:19:25 -06:00
51132cb5e1
old overlay code is no longer used
2021-01-04 13:51:03 -06:00
9209f40daa
eslint
2020-12-24 14:59:27 -06:00
3fd50bb01d
reorganize logger.js and use jquery
2020-12-24 14:32:23 -06:00
332ec2032a
replace createPopup with location.assign
2020-10-12 12:37:23 -05:00
77cca7efac
eslint --fix
2020-09-04 10:02:43 -04:00
a88dcfe78c
During start, switch from mode=single if required. Add play/stop/pause
2020-09-02 14:37:48 -04:00
762bea0761
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
2020-08-31 18:30:05 -04:00
fe96ba0a2a
cleanup and revert adding Event stack trace
2020-04-10 11:14:46 -04:00
d7ea798c09
add modern stracktrace to log messages
2020-03-20 11:06:32 -04:00
d30480e31e
add passive to addEventListener
2020-03-05 14:10:35 -05:00
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -05:00
f0b33145f5
Log CSP violations in ZM logs in supported browsers ( #2431 )
2019-01-21 11:12:17 -05:00
a1a42345e3
More eslint fixes; eslint in php; add eslint to travis ( #2419 )
...
* Add eslint to travis.yml
* Update eslint package versions and apply new indent rules
* Enable the brace-style and block-style eslint rules
* Enable the 'curly' eslint rule
* Enable the 'keyword-spacing' eslint rule
* Enable the 'key-spacing' eslint rule
* Enable the 'object-curly-spacing' eslint rule
* Enable the 'no-new-object' eslint rule
* Only disable the no-caller eslint rule in the one affected file
* Enable the 'no-unused-vars' eslint rule for local variables
* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
deaf651aad
Fix eslint violations ( #2416 )
...
* Add more JS libraries to eslintignore
* eslint . --fix
Automatic fixes only
* frame.js: eslint fixes
* events.js: manual eslint fixes
* skin.js: manual eslint fixes
* watch.js: manual eslint fixes
* Remove some tabs used for indentation in JS
* state.js: Fix new-cap eslint violation
* Disable guard-for-in eslint rule to get everything passing
2019-01-18 10:00:55 -05:00
27d4ba9e5f
use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it
2018-12-03 15:16:47 -05:00
ebe55cf6a4
Include new Server.js
2018-07-09 14:10:06 -04:00
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -05:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
Isaac Connor
Isaac Connor
Jonathan Bennett
Andrew Bauer
Matthew Noorenberghe