ca24b43f36
Fix typo
2024-10-16 10:23:37 -04:00
f3fd03209e
Fix missing auth_relay on alarm xhr
2023-06-29 11:35:16 -04:00
3406d15dbd
restore fps reporting
2023-02-20 18:00:42 -05:00
1546fabfc8
Don't start the statusCmdQuery on streaming start, because it is used when doing still updates. If we start it too fast, zms may not have started yet
2023-02-16 14:48:07 -05:00
4bcfc2360d
Remove stopping the statusCmdTimer, it isn't used.
2023-01-02 17:06:35 -05:00
ed98fec9d3
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
2022-11-02 10:09:36 -04:00
36ed68590d
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:36:57 -04:00
7e78dadb91
Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs
2022-10-07 11:10:14 -04:00
7e5c4d4a76
Only set onclick if a new function is given
2022-06-02 13:54:48 -04:00
7def1944b6
Always force width and height on img to sane values
2022-05-31 14:18:56 -04:00
cb11ce100f
Include connKey is debug line
2022-05-31 13:57:41 -04:00
a26042ea02
Don't change width if it is a percent
2022-05-31 12:00:17 -04:00
e7e692ddbf
Use global config vale for ZM_WEB_POPUP_ON_ALARM
2022-05-26 16:33:38 -04:00
eacc7edf15
Re-instate setting the class of the monitor div on alarm
2022-05-25 16:06:42 -04:00
f61e0b3e8f
Merge in MonitorStream from master, after removing janus
2022-05-25 15:10:58 -04:00
7bf2383772
Add ajaxQueue
2022-05-24 12:53:43 -04:00
56e121e9bb
Don't clear img.src after sending QUIT. QUIT will do the job and killing the stream first might mean that it gets lost
2022-05-12 12:05:02 -04:00
0d29864d36
Start the query status timer on img.load
2022-05-12 10:51:27 -04:00
68367d8d61
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 10:37:29 -04:00
65c9df9fca
Rough in lots of stuff from master. setStreamScale to set src of stream img's. Handle ajax errors better. Send CMD_QUIT when changing img.src. These changes reduce errors from zms.
2022-04-27 17:40:51 -04:00
614acc3757
You must close the stream first or we get leftovew zms processes
2022-04-14 18:17:34 -04: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
Isaac Connor
Andrew Bauer
Matthew Noorenberghe