Commit Graph
245 Commits
Author SHA1 Message Date
Isaac Connor 53ffcd4121 In play/pause, start/stop rtsp2web as well as zms stream. Also stop status requests. Rework the enable/disable alarms and force alarm buttons when using rtsp2web. 2024-09-25 14:54:58 -04:00
IgorA100 52a5bf2a1f Chore: Eslint (panzoom.js) 2024-09-18 12:30:04 +03:00
IgorA100 edf7f808b0 Fix: Panning didn't work when using "preventDefault" (panzoom.js)
This happened after PR #4137
When Scale panZoom > 1, you need to use "preventDefault" for Panning to work correctly. But at the same time (if Scale panZoom > 1), clicking on the progress bar generated by video.js will not work.
In principle, this is not critical, because when increasing, the progress bar generated by video.js usually goes beyond the visible boundaries.
2024-09-18 12:23:33 +03:00
IgorA100 0ecb9a7754 Fix: Disabled preventDefault() when initializing PanZoom (panzoom.js) 2024-09-17 17:42:41 +03:00
IgorA100 b59c2f564c Chore: Remove extra space (panzoom.js) 2024-09-17 10:53:49 +03:00
IgorA100 6f50c7169e Fix: When executing "setTouchAction: function(el)" check if the element is passed to the function (panzoom.js) 2024-09-17 10:51:57 +03:00
Isaac Connor 2ca08fb546 Track started state for RTSP2Web and Janus as well 2024-09-06 09:33:55 -04:00
Isaac Connor 1e4bb4798e Update auth in zms url when scaling as it may have been running for a while and need updating 2024-08-22 14:57:28 -04:00
IgorA100 0717a2d324 Chore: Removed extra spaces (panzoom.js) 2024-08-20 13:07:00 +03:00
IgorA100 f2323426a0 chore: remove console.log (panzoom.js) 2024-08-20 13:03:08 +03:00
IgorA100 b0511e31fa chore: Enable "touchAction" if Zoom=1 and disable if Zoom<>1 (panzoom.js)
Enable "touchAction" if Zoom=1 and disable if Zoom<>1
This will allow canvas panning when capturing an image on mobile devices with Zoom=1
The issue may be closed: https://forums.zoneminder.com/viewtopic.php?p=135128&sid=7e7685052e5f107a364dfd445565643f#p135128
2024-08-20 12:53:23 +03:00
Isaac Connor 37e7da4dfa Don't keep our own copy of auth credentials. Use the global ones. When getting new auth from status request, update auth_relay as well. 2024-07-30 09:54:37 -04:00
Isaac Connor 43e21a3200 Update auth_hash in zms url 2024-06-28 14:33:59 -04:00
IgorA100 d9b9dfc77f Chore: eslint (panzoom.js) 2024-06-14 15:47:02 +03:00
IgorA100 7fadd6444b Merge branch 'ZoneMinder:master' into patch-144 2024-06-14 15:33:40 +03:00
IgorA100 845049c951 When initializing, specify any PanZoom & more parameters (panzoom.js)
+ During initialization, you can specify any parameters that will later be transferred directly to "Panzoom"

+ Added an experimental function for reducing the block containing the image (Shift+Alt+mouse wheel).
To do this, you need to initialize another object. For example like this:
 "zmPanZoom.init({objString: '.imageFeed', disablePan: true, contain: 'inside', additional: true});"
 The key parameter for additional control (Alt key) is "additional: true"

+ Code optimization
2024-06-14 15:31:19 +03:00
Isaac Connor 22f3910953 Use statusRefreshTimeout instead of delay on status requests. If new auth info is found in statusresponse, use it. 2024-06-06 18:10:53 -04:00
IgorA100 e0bfc12a66 Now addEventListener without an anonymous function (panzoom.js)
+ Now addEventListener without an anonymous function, which allows you to correctly removeEventListener for a specific PanZoom object
+ Disabling ".btn-zoom-in" and ".btn-zoom-out" only for the PanZoom object being disabled, not for all.
2024-06-07 00:13:01 +03:00
IgorA100 ba62d251cd Chore: eslint (panzoom.js) 2024-06-06 20:16:19 +03:00
IgorA100 79073cab23 Added all other event handlers (panzoom.js) 2024-06-06 20:01:35 +03:00
IgorA100 d377d2f5dc Добавил возможность инициализации с параметрами (panzoom.js)
+ Изменять стиль курсора в зависимости от disablePan & disableZoom
+ Добавлена обработка ошибочных ситуаций.
+ Добавлено назначение функций для прослушивания событий "panzoomchange", "panzoomzoom"
2024-06-06 19:54:56 +03:00
IgorA100 c3d4328adb Fix: Avoid error if object was not initialized & more (panzoom.js)
- Do nothing if you click on the image without Ctrl or Shift
2024-06-05 21:12:14 +03:00
Isaac Connor e7eba3d33c Merge pull request #4058 from IgorA100/patch-132
Added Scales = Max 480, 640, 800, 1024, 1280, 1600 px & added settings Stream Quality on Watch, Event & Montage page
2024-06-02 12:39:58 -04:00
IgorA100 4f9657c482 Fix: eslint (panzoom.js) 2024-06-01 23:37:37 +03:00
IgorA100 71a08c94dd Fix: For bind/unbind events use namespaced (panzoom.js)
- When disable, also perform unbind keyup, keydown
- Code optimization.
2024-06-01 23:32:53 +03:00
IgorA100 7d86df0c04 Chore: eslint MonitorStream.js 2024-05-31 01:04:03 +03:00
IgorA100 5706bf2ade Added $streamQuality processing (MonitorStream.js) 2024-05-31 00:51:49 +03:00
Isaac Connor 662fc2baf2 Turn on use strict 2024-05-29 10:26:42 -04:00
Isaac Connor 4a0ea62fa6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-29 10:10:54 -04:00
Isaac Connor 878c8a7687 In kill, turn the url from a streaming url into a single so as to actually stop the stream. 2024-05-29 10:10:36 -04:00
IgorA100 ca40a794d2 Added this.started = true/false when starting/stopping the monitor (MonitorStream.js) 2024-05-29 17:06:33 +03:00
Isaac Connor 69d5855653 Add another decimal digit to fps displays 2024-05-28 10:11:02 -04:00
Isaac Connor faa3ed3aa7 Merge pull request #4042 from IgorA100/patch-119
Chore: Moved PanZoom functions to "web/js/panzoom.js"
2024-05-27 17:08:50 -04:00
IgorA100 f0b13f0c11 Fix: function "this.setMaxFPS" (MonitorStream.js)
The function didn't work!
The parameter "maxfps" was passed to the function, and "currentSpeed" was passed to "streamCommand" instead of "maxfps"
2024-05-27 22:58:41 +03:00
IgorA100 075bbfc244 Fix eslint (panzoom.js) 2024-05-27 19:37:49 +03:00
IgorA100 c582e7ab5b Added file panzoom.js 2024-05-27 19:32:25 +03:00
Isaac Connor 9f730bc0d7 Immediately do a status command when the image loads instead of waiting statusInterval for it. 2024-05-16 15:57:50 -04:00
IgorA100 d72303de48 Fix: eslint (MonitorStream.js) 2024-05-09 20:51:46 +03:00
IgorA100 418a18d59d Changed the "setScale" function to support PanZoom on Montage & Watch page (MonitorStream.js)
\views\js\montage.js is affected
2024-05-09 20:14:16 +03:00
Isaac Connor 4b596b70f3 Fix eslint 2024-05-08 16:22:36 -04:00
IgorA100 a809a92d1f Chore: eslint MonitorStream.js 2024-05-07 20:50:34 +03:00
IgorA100 6d4e6fd401 Added the ability to disable image resizing when changing Scale (MonitorStream.js)
Required when using GridStack & PanZoom on Montage page
2024-05-07 20:23:00 +03:00
IgorA100 d9e12a2e68 Fix: IMG width is now 100% instead of "auto" 2024-04-09 13:16:03 +03:00
IgorA100 d7ae0d9d23 Feat: Mouse moving an enlarged video frame during live viewing
Added mouse movement tracking functions.
2024-04-01 12:56:14 +03:00
Isaac Connor ada974ef51 Fix eslint 2024-03-06 14:21:18 -05:00
Isaac Connor 4ab1aaa1d0 Fix Linked monitor expression not updating 2024-03-05 11:46:42 -05:00
Isaac Connor ed14fc7449 Don't allow linking to ourselves 2024-03-05 11:14:58 -05:00
IgorA100 a18167377e Fix: scaleToFit function
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
Isaac Connor fcac8ec2f2 Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized. 2024-02-07 10:58:39 -05:00
Isaac Connor 314236dea8 Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change. 2024-02-01 17:58:20 -05:00