Commit Graph

204 Commits

Author SHA1 Message Date
Andrew Bauer f32a7aaff5 deploy insertModalHtml 2020-10-14 15:58:39 -05:00
Andrew Bauer ec040b1bfd don't set popup flag in event view 2020-10-14 13:59:15 -05:00
Isaac Connor 03c8e86908 update some quotes 2020-10-10 11:09:51 -04:00
Isaac Connor 9cc7f0d360 Merge branch 'release-1.34' 2020-10-08 09:28:25 -04:00
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 95b09ad182 Add samesite=strict to all Cookie setting 2020-10-07 11:26:18 -04:00
Isaac Connor ae7ed5a342 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-06 16:51:24 -04:00
Isaac Connor 9abde9ee06 Merge branch 'release-1.34' 2020-10-06 16:51:12 -04:00
Isaac Connor 044ce61ddb Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-06 16:47:51 -04:00
Andrew Bauer 9c7ebf8c9e unpopup video view 2020-10-05 15:44:07 -05:00
Andrew Bauer 47e5a26da4 eslint 2020-09-27 07:41:05 -05:00
Andrew Bauer a6413ccd7f call modal when edit btn is clicked on event view 2020-09-27 07:12:32 -05:00
Andrew Bauer 2655118cbd change call to popup -> view in event.js 2020-09-26 21:21:29 -05:00
Andrew Bauer 9d2450d55d load export view, rather than popup 2020-09-26 21:15:50 -05:00
Andrew Bauer 1d1b0e58d2 consolidate getJson fail callbacks to one function 2020-09-20 08:41:16 -05:00
Andrew Bauer 0c8bb25889 eslint 2020-09-11 16:49:36 -05:00
Andrew Bauer 2ee70442c0 use done() and fail() callbacks for getJSON 2020-09-11 14:30:36 -05:00
Isaac Connor b34c6dcfc2 correct log, code docs 2020-09-07 13:29:36 -04:00
Isaac Connor 0ced21dda7 Persist video volume in a cookie so that subsequent events remember the volume level.
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Isaac Connor f71926c736 Merge branch 'release-1.34' 2020-06-05 10:09:07 -04:00
Isaac Connor 20870e22fa fix eslint errors 2020-05-29 13:28:33 -04:00
Isaac Connor a9cec3ebbd spacing 2020-05-23 16:13:29 -04:00
Isaac Connor bf99daf494 Merge branch 'rate_dropdown' 2020-04-23 16:36:34 -04:00
Isaac Connor 25cd13f8ad When sending eventCmdReq, pass eventCmdParms since it might have been updated. 2020-04-23 16:25:35 -04:00
Isaac Connor 5bf068791b Merge branch 'rate_dropdown' into release-1.34 2020-04-23 16:11:59 -04:00
Isaac Connor a6f5ae2601 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-04-23 15:42:30 -04:00
Isaac Connor f8fa0340fc fix eslint 2020-03-14 09:27:07 -04:00
Isaac Connor 9a3127da06 Merge branch 'rate_dropdown' 2020-03-10 18:47:19 -04:00
Isaac Connor 59bd658a96 replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc. 2020-03-10 18:46:20 -04:00
Isaac Connor dce4d17b51 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-02-25 13:17:02 -05:00
Isaac Connor 8a83449fba Handle a zero value for scale 2020-02-25 11:18:13 -05:00
Isaac Connor 1c197db619 Merge branch 'master' into rate_dropdown 2020-01-07 14:49:58 -05:00
Isaac Connor 00f8a450de spaces and quotes 2020-01-05 14:59:25 -05:00
Isaac Connor d87bf5a156 replace the rate display with a dropdown 2019-12-20 11:02:12 -05:00
Isaac Connor 524a39a224 changeCodec no longer needs to be passed this 2019-10-18 13:40:29 -04:00
Isaac Connor dfb65d23bf Fix eslint warnings 2019-08-27 16:48:42 -04:00
Isaac Connor 7768d39eb9 Add auth to streamParms so that multi-server event viewing works 2019-08-26 16:19:44 -04:00
Isaac Connor 7598654740 add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms 2019-08-23 17:58:40 -04:00
Isaac Connor d4353af8af Fix eslint errors 2019-03-20 14:51:39 -04:00
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Matt N 9675367e03 event.js: Wait for delete request to succeed before navigating. Fixes #2384 (#2515) 2019-02-11 09:34:51 -05:00
Isaac Connor a2d4dc974b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-21 11:19:07 -05:00
Isaac Connor e663397816 spacing 2019-01-21 11:17:21 -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
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 f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor 1130d6650a Fix spacing and pass popup to previous/next event so that popups stay as popups 2018-12-21 10:50:19 -05:00
Andrew Bauer c530337c50
Merge pull request #2331 from connortechnology/fix_ios9
Fix ios9
2018-12-11 09:29:50 -06:00
Isaac Connor 1e8c4276bb fix #2319 some more. This is fixing rate sticking across gapless events and reload 2018-12-10 17:32:17 -05:00
Isaac Connor 18ce7c9ea0 Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead. 2018-12-03 15:17:16 -05:00
Isaac Connor 4272225a17 Merge branch 'master' into h265 2018-11-30 16:42:16 -05:00
Isaac Connor 605397b565 Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319 2018-11-29 09:43:21 -05:00
Isaac Connor e24a308481 Merge branch 'master' into h265 2018-11-14 17:15:37 -05:00
Isaac Connor 3be31020b7 Automatically add width to frames view when thumbnails are turned on. 2018-11-14 15:54:01 -05:00
Isaac Connor a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Isaac Connor c481fc868f be more robust when curFrames is empty. 2018-09-28 11:25:19 -04:00
Isaac Connor 6181e52c47 gracefully handle non-existence of imageFeed 2018-09-20 09:07:28 -04:00
Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -04:00
Isaac Connor 0ee261fae3 get rid of code that hid the close/back button on events if there was no history. 2018-09-10 15:11:41 -04:00
Isaac Connor 03f769eacc Rough in codec specification for Events 2018-09-10 12:22:55 -04:00
Isaac Connor 9ec415b30a Just reload the event view instead of dynamically updating the stream. Fixes #2196 2018-08-31 15:56:21 -04:00
Isaac Connor 666005fb5d fix single event replay by fixing the reference to player which should be vid 2018-01-11 14:42:00 -05:00
digital-gnome 0743a283da Remove back/close if opened in new tab 2017-12-13 12:34:31 -05:00
digital-gnome e0c2061954 Fix back if window is opened in new tab. 2017-12-13 10:20:02 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
digital-gnome f8d3c07586 Add h264 event view functionality and new feature alarmCues (#2012)
* Fix nearEventsQuery

Removed dbEscape from getNearEvents previous event because it only returns 0.  Now matches next.  Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch.  Also added start times to allow for videoJS replaymode.

* Unescape filters

Filters need to be unescaped

* Add initial values to page load

* Add replay modes to videojs

* rough in figuring out a frame in between bulk frames

* Add alarmCues

Add a graphical indication of where alarm frames happened in an event.  Similar to what zmNinja shows.

* Add remaining buttons to videojs

Functionality for all buttons on videojs streams.  FF/RW buttons show as active when they are active.

* Whitespace and fix Bulkframe calcs

* Fix zms events trying to generate with mp4 code

ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed

* ZMS scrub bar

Move zms scrub bar to bottom of image feed.  Make it simpler and more like videojs style.

* Wrap event feeds properly

* Fix dvrControls on watch view

* Add scaleToFit

Add a scaleToFit option to event view

* Add navigation for videoJS streams

Disables nav buttons at beginning and end of events.  Handles switching from zms to videojs.  If zms crashes changes next event function to reload page instead of ajax.

* Add scaleToFit to watch and frame view

Adds scaleToFit to watch view.  Since frame view uses the watch cookie this required changes to frame view

* Add transition to zoom

* Change stills view to match stream

Move stills slider bar to match scrub bar on streams.  Allow it to resize, make it larger.  Add alarmcues.

* Add Stills for every event

Add stills for every event.  Match size to stream size

* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome 9d1bbfab42 Remove unused code from event 2017-12-02 12:28:05 -05:00
Isaac Connor 9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
digital-gnome 0a995aea78 Add navbar refresh to all pages that use it 2017-11-30 16:33:46 -05:00
digital-gnome 18dc515ba4 stills view loads image when slider used
Stills view now loads the selected image if an image is being viewed and the slider is used.
2017-11-26 19:08:07 -05:00
digital-gnome 136f0e90f5 Fix autoscale on stills view
Switching from stills view and changing the window would make stream view go crazy.  Changed to autoscale on switch
2017-11-26 19:08:07 -05:00
digital-gnome b506466a70 Change alarmcues to accept arbitrary containing element 2017-11-26 19:08:07 -05:00
digital-gnome 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
digital-gnome 3920420aa9 Convert scaleToFit to shared function 2017-11-26 19:08:06 -05:00
digital-gnome c7ecb71810 Fix progressbar on short events
Fixes rounding errors at the end of events due to zms only returning integers.  Especially noticable on short events.
2017-11-17 22:29:10 -05:00
digital-gnome 64346a031d alarmCues to status.php
Switched alarm cues from API to ajax/status.php.  Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
digital-gnome 617a92e33e Re-Add streamstatus pause
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
digital-gnome a7b02ea3ba Fix eventVideo and content div wrapping properly
Wrap eventVideo div around both videojs and zms.  Consolidate control buttons/status to common set with default values.
2017-11-14 23:04:05 -05:00
digital-gnome ef6cb42c5f Cleanup 2017-11-11 14:49:43 -05:00
digital-gnome 1b8ae2bb45 Fix autoscale for ZMS
ZMS zoom would display broken jpegs with arbitrary scale.  When using scaleToFit set zms scale to nearest regular scale and let the browser handle the rest.
2017-11-11 14:49:43 -05:00
digital-gnome 44c8299faa Consolidate initPage 2017-11-11 14:49:43 -05:00
digital-gnome 91c3e3573c ZMS controls for videojs
Add ZMS style controls to videojs page.  Zoom, fast forward, fast reverse, frame skip, play/pause.  Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
digital-gnome 21949f5426 Cleanup vjsReplay 2017-11-11 14:49:43 -05:00
digital-gnome 1b6992ea6b Fix stills
Event stills fits on the page without a phantom scroll.  Still image is scaled to fit the window instead of being full event size.
2017-11-11 14:49:43 -05:00
digital-gnome 81a57b086e Add stills window for everything
Stills can work for every event since frames can be generated after the fact by ffmpeg
2017-11-11 14:49:43 -05:00
digital-gnome 5e9aacfc09 Stills path fix 2017-11-11 14:49:42 -05:00
digital-gnome 1ae3fca599 Fast forward and rewind show active
FF and RW show as active if they are active
2017-11-11 14:49:42 -05:00
digital-gnome 95622cc3b0 pause on delete
Pausing on delete lets a slow network user know that the click worked.
2017-11-11 14:49:42 -05:00
digital-gnome 1bddec1548 Bypass refreshParentWindow
This hasn't worked for a while.  It looks like it's the result of a fix for filter window redirecting.  It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00
digital-gnome 298085ae93 Fix archive nulling vid src 2017-10-22 15:02:36 -04:00
digital-gnome 3fe46cbaff Scale to Fit
Added a scale to fit option.  When navigating between events of different size they will fill the window.  Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
digital-gnome ecb980c66f Navigation
Videojs navigation now uses ajax.  Feels and is faster.  Some improvements, namely if zms ever crashes we can still navigate.  Both zms and videojs update the address bar so refreshing a page doesn't return you to the first event.
2017-10-21 22:14:46 -04:00
digital-gnome ff8d067639 alarmCues improvements
Consolidate selectors and improve edge cases where skew could cause overflow
2017-10-21 22:14:46 -04:00
digital-gnome f2f2aa8720 Replay improvement and overlays 2017-10-21 22:14:46 -04:00
digital-gnome c6373d3dca whitespace and jquery 2017-10-21 22:14:46 -04:00
digital-gnome 8c3c5e4d50 google code style 2017-10-15 16:52:43 -04:00
digital-gnome 3a7eee58df improve navigation
Condensed navigation if structure and added handling for crashed zms.  Will now reload whatever event is next.
2017-10-15 16:49:50 -04:00
digital-gnome 10cdbf30ea reduce extra ajax calls 2017-10-15 16:46:58 -04:00