f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
e4265bd075
spaces
2019-09-26 16:13:49 -04:00
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
2da9edf0ff
add onchange to scale
2019-09-19 14:57:17 -04:00
a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists ( #2662 )
2019-07-24 11:39:21 -04:00
1241761683
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
2019-06-11 10:58:54 -04:00
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
675b4975b0
Fix control presets
2019-03-01 13:37:34 -05:00
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -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
6128d2a4d9
fix #2317 by updating the url encoding of a filter to match events for that monitor
2018-11-23 15:34:23 -05:00
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
799b34eee8
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
2018-08-31 10:34:54 -04:00
084f1ab1d6
Add missing reloadWebSite js function
...
Somehow this went missing when the new website monitor type was merged
2018-07-05 08:43:21 -05:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
36b8cfb115
test element so that processing will continue if buton doesn't exist
2018-04-18 12:29:59 -04:00
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
b793e6659b
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:32:02 -08:00
d001ce467e
use get for status JSON requests
2018-01-26 10:31:55 -05:00
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
e0c2061954
Fix back if window is opened in new tab.
2017-12-13 10:20:02 -05:00
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -05:00
55699a9b9b
Change scaleToFit to choose what to fit
...
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
68e54400e2
Add scaleToFit to watch view
2017-11-26 19:08:06 -05:00
7cb4090d7d
can't use jquery like that
2017-08-03 12:41:43 -04:00
1e21beb1cd
use instead of document.getElementById
2017-07-05 14:25:44 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
f88abfcb4d
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
2017-05-30 11:26:57 -04:00
4763ace165
Merge branch 'master' into storageareas
2017-05-18 14:24:09 -04:00
d1c61a252f
fix whitspace/braces
2017-05-18 13:50:56 -04:00
3ec4e1bfe7
fix merge
2017-05-18 12:59:09 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
cb99d709c5
add debug
2017-05-05 16:37:12 -04:00
64193c3368
turn status ajax calls to gets instead of posts
2017-05-05 16:18:12 -04:00
3b6cf74ed3
add auth_hash to ajax calls
2017-05-05 11:53:40 -04:00
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
6840031ee3
fix auth timeout and user session[username] when checking auth hash for speedup
2016-09-27 11:51:55 -04:00
e04266600e
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:04:12 -04:00
4ce531099c
add an auth field to request=stream results to give the client a new auth hash to use
2016-09-27 11:03:12 -04:00
167214cb01
Merge branch 'cookie_scale' into storageareas
2016-09-27 10:05:16 -04:00
Andrew Bauer
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Andrew Bauer
Isaac Connor
digital-gnome
Isaac Connor
Kyle Johnson
Isaac Connor