Isaac Connor
8a1284e2fa
Can't use a decimal step. Has to be any because browsers suck.
2021-03-21 12:30:56 -04:00
Andrew Bauer
9e9860d6c0
replace mootools getelement and addevent
2021-01-11 09:06:21 -06:00
Andrew Bauer
9d7f738f61
replace mootools in MonitorStream
2021-01-06 14:19:25 -06:00
Andrew Bauer
a1b26c8f61
WIP replace with jquery
2021-01-04 10:28:16 -06:00
Andrew Bauer
5ad8e90dda
eslint
2021-01-02 13:48:40 -06:00
Andrew Bauer
f0610b5eb7
eslint
2021-01-02 13:25:38 -06:00
Andrew Bauer
809e67d352
eslint
2021-01-02 12:24:12 -06:00
Andrew Bauer
e9bdaa988e
eslint
2021-01-02 12:06:02 -06:00
Andrew Bauer
cc69b150de
WIP replace mootools in zone.js
2021-01-02 11:58:03 -06:00
Andrew Bauer
62575c0d0e
WIP replace mootools in zone.js
2021-01-02 11:33:21 -06:00
Andrew Bauer
ebad6194ee
remove replace mootools in drawZonePoints function
2021-01-02 10:52:17 -06:00
Isaac Connor
e2b76257eb
Merge branch 'release-1.34'
2020-10-19 09:10:28 -04:00
Isaac Connor
220a89b459
fix eslint
2020-10-17 16:17:30 -04:00
Isaac Connor
8c7c4c4b1b
add a call to drawZonePoints to handle case where image doesn't load. Remove debug and dead code
2020-10-16 12:21:12 -04:00
Andrew Bauer
8018bd4ed9
add back & refresh buttons to zone view
2020-09-25 13:37:06 -05:00
Isaac Connor
8f3b3466af
setup onblur function for presetSelector
2020-09-17 20:58:18 -04:00
Matthew Noorenberghe
77cca7efac
eslint --fix
2020-09-04 10:02:43 -04:00
Isaac Connor
8d2ced0fbb
use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points.
2020-09-02 14:44:11 -04:00
Isaac Connor
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
Andrew Bauer
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
Isaac Connor
c2d6b8f493
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
2020-08-19 14:39:15 -04:00
Isaac Connor
d0c21995cd
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-19 14:14:32 -04:00
Isaac Connor
efec1e7d4f
remove debug
2020-08-19 14:13:48 -04:00
Isaac Connor
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
Isaac Connor
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
Isaac Connor
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
Isaac Connor
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
Isaac Connor
89f975e646
remove code to play a sound on alarm. Not going to support that when editing a zone.
2020-07-07 16:40:33 -04:00
Isaac Connor
33d4680f02
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-07-07 16:35:37 -04:00
Isaac Connor
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
Isaac Connor
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
Isaac Connor
7e6b0058d2
Update Zone buttons. Fix double submit. Fixes #2671
2019-08-02 08:04:38 -04:00
Isaac Connor
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
Isaac Connor
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
montagdude
4da95369f9
Fix zone area calculation ( #2437 )
...
Previous method resulted in bogus zone areas (in the range of
1000s of % of frame area) when entering points with the keyboard, even
after applying commit 4937a68650
. This
change implements the method here:
http://mathworld.wolfram.com/PolygonArea.html
It has been tested on ZoneMinder 1.32.3 and works correctly when
either entering coordinates with the keyboard or dragging points with
the mouse.
2019-01-23 10:35:18 -05:00
Isaac Connor
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
Matt N
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -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
Isaac Connor
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -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
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
Isaac Connor
101f24feb5
Update area when editing x and y coords ( #2366 )
2018-12-27 14:28:14 -05:00
Isaac Connor
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
Isaac Connor
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
Isaac Connor
9cf31eafa0
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
2018-10-24 12:43:43 -04:00
Isaac Connor
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
Isaac Connor
995809ccb7
fix play/pause while editing zone
2017-10-04 10:48:14 -04:00
Isaac Connor
4763ace165
Merge branch 'master' into storageareas
2017-05-18 14:24:09 -04:00
Isaac Connor
da33cbe1f9
fix
2017-05-18 14:09:46 -04:00
Isaac Connor
8b0f319834
fix whitespace
2017-05-18 14:06:13 -04:00