Commit Graph

90 Commits

Author SHA1 Message Date
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
digital-gnome 3a4a7ada41 progressBar conversion
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
digital-gnome 90d3067cab progressBar offset scope
fixes progressBar offset passing a reference instead of a copy by wrapping it in a function.  also fixes click events endlessly adding when navigating through zms events.
2017-10-11 21:07:45 -04:00
digital-gnome 1c744278e7 rescale fix
everything rescales except the buttons.
2017-10-11 21:05:39 -04:00
digital-gnome f702c841f5 navigation handling
Navigation can now handle going from videojs streams to zms.  It gracefully handles deleting the last event and running out of events.  zms limitations means we still can't see mp4 recordings before they are done but we don't get stuck on them anymore.
2017-10-11 21:04:45 -04:00
digital-gnome b9f9dd721b initialAlarmcues arguements
initialAlarmcues now takes an eventId arg.  Needed to reload when zms streams switch since they don't reload the page
2017-10-11 20:57:13 -04:00
digital-gnome 99dd469a1c alarmCues fixes
use evtStream for width.  progressBar isn't always fully loaded in time.  Combine skewNone and skewAlarm.  Does a more accurate job of keeping everything in line.
2017-10-11 20:49:52 -04:00
digital-gnome 067f8a8089 replayAll fixes
replayAll now handles end of events gracefully.  Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
digital-gnome d5799cbf6f nph-zms alarmcues 2017-10-08 22:36:15 -04:00
digital-gnome 65ce6df622 scalingfix
changing the scale now works with video.js and alarmcues.  some whitespace fixes
2017-10-08 21:46:26 -04:00
digital-gnome c41ef177c2 JS alarmCues 2017-10-08 21:45:05 -04:00
digital-gnome 9b241ee370 Also change class
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
digital-gnome 48a3e5eaa6 Move logic to .js file. 2017-09-30 16:35:03 -04:00
digital-gnome 5f203fc813 JS logic for video.js navigation 2017-09-30 14:24:59 -04:00
Isaac Connor edb7762cf3 Merge branch 'master' into storageareas 2017-09-11 16:57:08 -04:00