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 |
|
Isaac Connor
|
05d605fe55
|
change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin.
|
2024-01-30 19:57:18 -05:00 |
|
Isaac Connor
|
8ca1436224
|
If img has a fix width set, clear it when we change scale
|
2024-01-24 12:54:13 -05:00 |
|
Isaac Connor
|
6ba09c6f0d
|
Finish switch to using Intervals instead of Timeouts
|
2024-01-24 09:28:12 -05:00 |
|
Isaac Connor
|
bd90711aa6
|
Use an interval instead of calling Timeout from callback
|
2024-01-22 14:25:57 -05:00 |
|
Isaac Connor
|
6812f2efe7
|
Fix eslint
|
2024-01-16 09:56:28 -05:00 |
|
Isaac Connor
|
ee9e03a7c1
|
Fix FPS values when getting status from web instead of ZMS.
|
2024-01-02 16:28:49 -05:00 |
|
Isaac Connor
|
88db0e9854
|
Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor.
|
2023-12-07 13:17:08 -05:00 |
|
Isaac Connor
|
07d4fb2099
|
Set default delay, add starting statusCmdTimer when using rtsp2web
|
2023-11-21 11:35:04 -05:00 |
|
Isaac Connor
|
ea76a03043
|
Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
93f5378f4e
|
Fix undefined reference to startPlay
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
1e200abf16
|
Remove support for browsers not supporting TextDecoder to fix eslint
|
2023-08-08 13:01:42 -04:00 |
|
Jonathan Bennett
|
80c145dca4
|
Add support for HTTPS connections to RTSP2Web
|
2023-07-31 00:16:51 -05:00 |
|
Jonathan Bennett
|
af42398070
|
Fix ESLint issues in RTSP2Web work
|
2023-07-30 16:54:22 -05:00 |
|
Jonathan Bennett
|
5c9588c012
|
Adds RTSP2Web support for live view
|
2023-07-29 23:46:31 -05:00 |
|
Isaac Connor
|
e96d2a6acc
|
No longer abort when sending a command... no streaming ajax should take any significant time.
|
2023-07-11 17:27:52 -04:00 |
|
Isaac Connor
|
14eb38a00b
|
add timeout value to debug, only send scale command if it is > 0
|
2023-06-08 10:30:01 -04:00 |
|
Isaac Connor
|
4f416edf93
|
Fix missing auth_relay on alarm xhr
|
2023-06-05 09:57:12 -04:00 |
|
Isaac Connor
|
31d9342918
|
Assume reverse proxy setup for janus for http as well
|
2023-05-31 17:01:45 -04:00 |
|
Isaac Connor
|
9a13312e4e
|
Fix eslint
|
2023-05-25 14:15:32 -04:00 |
|
Isaac Connor
|
d0fead5b06
|
Add setMaxFPS and fix streamCommand so that data doesn't pollute other commands data
|
2023-05-12 14:10:52 -04:00 |
|
Isaac Connor
|
7dd09ea55e
|
When killing stream, stop and abort
|
2023-05-12 12:50:35 -04:00 |
|
Isaac Connor
|
81fd2dcb08
|
Don't pollute streamCmdParams
|
2023-05-12 12:48:31 -04:00 |
|
Isaac Connor
|
c4c3dddbe3
|
add in setMaxFPS
|
2023-05-12 12:46:16 -04:00 |
|
Isaac Connor
|
9fbf140fc3
|
fix eslint
|
2023-05-11 10:23:12 -04:00 |
|
Isaac Connor
|
a31887634a
|
Inlcude port in url to janus
|
2023-05-11 10:23:04 -04:00 |
|
Isaac Connor
|
8ae4783a33
|
If monitor is assigned to a server, use that server for janus url.
|
2023-05-11 10:13:20 -04:00 |
|
Isaac Connor
|
2a2c192562
|
Add urlToJanus function to Server class
|
2023-05-11 10:13:04 -04:00 |
|