Commit Graph

80 Commits

Author SHA1 Message Date
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
Isaac Connor
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
Isaac Connor
fe96ba0a2a cleanup and revert adding Event stack trace 2020-04-10 11:14:46 -04:00
Isaac Connor
d7ea798c09 add modern stracktrace to log messages 2020-03-20 11:06:32 -04:00
Isaac Connor
d30480e31e add passive to addEventListener 2020-03-05 14:10:35 -05:00
Matt N
19c272061a Replace MooTools usage for adding window event listeners (#2429) 2019-01-21 11:14:32 -05:00
Matt N
f0b33145f5 Log CSP violations in ZM logs in supported browsers (#2431) 2019-01-21 11:12:17 -05:00
Matt N
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
Matt N
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
Isaac Connor
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
Isaac Connor
ebe55cf6a4 Include new Server.js 2018-07-09 14:10:06 -04:00
Isaac Connor
1e50df741f fix some memleaks 2017-11-28 09:50:09 -05:00
Isaac Connor
fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Matthew Noorenberghe
c7955cd1b6 Add eslint configuration files extending Google's rules 2017-03-18 00:02:17 -07:00
Isaac Connor
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
SteveGilvarry
5ff427d9e9 Removed Autotools Makefile.am
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Michael
e6e1427c48 added missing videojs.zoomrotate.js file
added missing videojs.zoomrotate.js file
2015-07-28 23:06:03 +10:00
user
46204c2768 local storage of video js plugin 2015-07-28 23:03:59 +10:00
Isaac Connor
ebe35c2135 handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
Isaac Connor
ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00