ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,823 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

52 Commits

Author SHA1 Message Date
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 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
Isaac Connor d1c61a252f fix whitspace/braces 2017-05-18 13:50:56 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Isaac Connor d611840750 whitespace, handle NaN in limitArea 2017-04-05 16:09:40 -04:00
Matthew Noorenberghe c7955cd1b6 Add eslint configuration files extending Google's rules 2017-03-18 00:02:17 -07:00
Isaac Connor 0c82e82ae2 Don't update x in updateY and don't update y in updateX as they are not defined. 2016-06-16 12:00:00 -04:00
Isaac Connor 83ac4cd061 change the input handler from onchange to oninput. Disable form submit when hitting enter 2016-06-13 09:40:04 -04:00
Isaac Connor 632ec38d7d Put back in neccessary callt o updateArea 2016-06-12 16:10:24 -04:00
Isaac Connor 4f2e0edb44 remove unnecssary updateAreas 
remove unnecessary updateZoneImage
 2016-06-07 21:23:30 -04:00
Isaac Connor 593fe2b0c5 update area when points move 2016-06-07 11:40:53 -04:00
Isaac Connor 1d1cedce95 use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode 2016-06-20 12:40:33 -04:00
Andy Bauer fbb2a527e6 remove setButtonState. it is not needed. 2016-04-10 07:55:45 -05:00
Andy Bauer e7d35d16bc add monitor alarm state and fps to zone edit view 2016-04-09 21:34:30 -05:00
Isaac Connor f20945bf84 update zone points in SVG 2016-04-08 13:13:10 -04:00
Isaac Connor 256df08af4 update SVG polygon points on point update 2016-04-08 12:32:26 -04:00
Robin Daermann dc8a3769e7 Make the capture process restart if a Privacy zone got changed 2015-08-27 09:45:12 +02:00
Robin Daermann 5b465194f8 Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
Robin Daermann b5fc6a9091 Make web correctly recognize new zone type 2015-08-20 15:09:02 +02:00
m-bene 2345889d64 include ExtendAlarmFrames in Presets and enable input for preclusive zones only 2014-03-20 09:53:47 +01:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stagecoach b7d8f58929 Changed from 
div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onSuccess': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );

to

div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onComplete': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );

So that motion detection areas are properly re-computed and updated in Zone config pages and db.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3144 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-12 22:50:49 +00:00
stan 97ba7a6684 Corrected some Mootools issues, autoCancel => link: cancel and onComplete => onSuccess. Also fixed montage alarm state class handling 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2986 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-16 17:13:16 +00:00
stan b044291233 More mootools 1.2 migration mods. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2833 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 14:06:13 +00:00