e89c608ec9
On error set 'current-mode'='ERROR' (video-stream.js)
2025-08-04 13:11:16 +03:00
cdfa0df471
Set the value of the "current-mode" attribute (video-stream.js)
...
Because it is much easier to track attribute changes than property changes
2025-08-04 13:08:55 +03:00
be84f309e7
Save the current mode in the variable "currentMode" (video-stream.js)
...
Relevant for the "Auto" mode
2025-08-03 23:11:05 +03:00
8cd9212660
Update video-stream.js
2025-08-03 18:19:11 +03:00
34c62f538c
Update MonitorStream.js
2025-08-03 12:02:20 +03:00
9f35ad6b53
Added method "updateStreamInfo()" (MonitorStream.js)
2025-08-03 12:00:35 +03:00
9a51f30da1
Update skin.css
2025-08-03 01:06:44 +03:00
bfda588214
Transferring HTML code from video-stream.js (Monitor.php)
2025-08-03 01:03:33 +03:00
5869998636
Moving HTML code to "\includes\Monitor.php" (video-stream.js)
2025-08-03 00:57:25 +03:00
d2a51e77fc
When stopping, check MonitorStream.activePlayer instead of MonitorStream.player(MonitorStream.js)
...
This is due to the fact that in the "Auto" mode, MonitorStream.player will be empty!!!
2025-08-03 00:33:00 +03:00
9213801ee1
Merge branch 'ZoneMinder:master' into patch-552676
2025-08-03 00:26:44 +03:00
c6efacd3b3
Update MonitorStream.js
2025-08-02 12:44:36 +03:00
4531054898
Merge pull request #4400 from IgorA100/patch-219631
...
Fix: When changing the player and after starting the stream (hiding - displaying the page), you also need to call monitorsSetScale() on Watch page
2025-08-01 13:24:30 -04:00
e7bda62237
After starting the stream (hiding - showing the page), you need to execute monitorsSetScale() (watch.js)
...
You also need to reset the previous state prevStateStarted, otherwise after the first triggering (document.visibilityState != "hidden") after hiding and then displaying the page, the stream will be restarted within 15 seconds, and this should not happen.
2025-08-01 16:59:07 +03:00
6fe174ab4d
Merge branch 'master' into patch-896443
2025-08-01 14:01:51 +03:00
38327f3320
Merge pull request #4402 from IgorA100/patch-453092
...
Fix: For the left sidebar with the menu, you need to increase the z-index so that in collapsed mode the submenu of options is on top of the header table on the Console page (sidebar.css)
2025-07-31 10:26:11 -04:00
18f2efaf69
Fix: For the left sidebar with the menu, you need to increase the z-index so that in collapsed mode the submenu of options is on top of the header table on the Console page (sidebar.css)
2025-07-31 16:59:05 +03:00
d85c3f45e3
Merge pull request #4401 from IgorA100/patch-855671
...
Fix: Actions when pressing the Play and Pause buttons (MonitorStream.js)
2025-07-30 13:44:44 -04:00
b01cbd97d7
Fix: Actions when pressing the Play and Pause buttons (MonitorStream.js)
...
Since we can now change the player type on the viewing page, we need to analyze "MonitorStream.activePlayer" instead of "MonitorStream.RTSP2WebEnabled" and "MonitorStream.Go2RTCEnabled"
2025-07-30 20:03:02 +03:00
d840ff6a8f
Fix: When changing the player, you also need to call monitorsSetScale() (watch.js)
...
Otherwise, there may be problems with the image if we were viewing using "ZMS MJPEG" and then switched, for example, to the Go2RTC secondary channel and we have different image proportions for "ZMS MJPEG" always using the primary channel and Go2RTC using the secondary channel
2025-07-30 19:51:08 +03:00
9f107143c7
Include console in the WEB_LIST_THUMBS description/help
2025-07-30 12:23:57 -04:00
36e0a56da3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-07-30 12:16:26 -04:00
6e280106f2
Add translation for option:router
2025-07-30 11:16:09 -05:00
b3d5fb765b
Fix dhcp-option handling
2025-07-30 11:16:09 -05:00
8c8fa55f88
Fix spacing to make code more readable
2025-07-30 11:16:09 -05:00
18bc77dfe9
Merge pull request #4399 from IgorA100/patch-839848
...
Fix: When changing the stream channel, you also need to call monitorsSetScale() on Watch page
2025-07-30 12:09:54 -04:00
fecfdfddec
Fix: When changing the stream channel, you also need to call monitorsSetScale() (watch.js)
...
Otherwise, the image may not be the correct size if the aspect ratio of the primary and secondary streams differs.
2025-07-30 18:55:12 +03:00
df83cf5d34
Fix: Change stream channel for Player=Auto (watch.js)
2025-07-30 14:46:06 +03:00
8a3220d07e
Added ESLint ignore "web/js/noUiSlider-15.8.1/"
2025-07-30 12:56:11 +03:00
430a591ede
Fix: eslint
2025-07-30 12:50:40 +03:00
068533616a
Fix: Eslint
2025-07-30 12:47:15 +03:00
8a7f703fe5
Merge branch 'ZoneMinder:master' into patch-896443
2025-07-30 12:11:43 +03:00
64f65f5f53
- Use folder "noUiSlider-15.8.1" instead of "noUiSlider"
...
- Load minified files ".j" and ".css"
2025-07-30 11:05:57 +03:00
a59a12de50
For noUiSlider import only the "dist" folder and the "README.md" file
2025-07-30 10:19:07 +03:00
2f3d4c98ee
Merge pull request #4396 from IgorA100/patch-341928
...
Fix: If "Janus" is disabled in the monitor settings, then set disabled in the list of players on the Watch page
2025-07-29 18:45:55 -04:00
b28d6e2a7d
Fix: If "Janus" is disabled in the monitor settings, then set disabled in the list of players on the Watch page (MonitorStream.js)
2025-07-30 01:21:04 +03:00
68e98fc55c
Merge branch 'ZoneMinder:master' into patch-896443
2025-07-30 00:43:26 +03:00
fb4c1fbbf7
Code optimization
2025-07-29 23:54:19 +03:00
1be91c2e55
Event listener "click" for buttons with "id=^controlMute" move to skin.js
2025-07-29 20:57:54 +03:00
03d712f564
Merge pull request #4395 from IgorA100/patch-111435
...
Fix: Added the lost player "Janus" & more correct stopping of the Janus player on Watch page
2025-07-29 12:03:09 -04:00
9dd819335c
Add support for non-ptz Axis cameras doing focus using the opticssetup.cgi
2025-07-29 11:54:08 -04:00
f309d194f6
More correct stopping of the Janus player (MonitorStream.js)
2025-07-29 17:57:59 +03:00
a0529439a3
Added the lost player "Janus" (watch.php)
2025-07-29 17:54:19 +03:00
602d658642
Code for controlling the new audio stream control slider (MonitorStream.js)
2025-07-29 17:33:46 +03:00
48c0e4ba02
noUiSlider
2025-07-29 17:12:53 +03:00
6398d35df8
Removed unused code (watch.js)
2025-07-29 16:59:30 +03:00
b3d9c3cd70
New audio stream control slider style (skin.css)
2025-07-29 16:56:06 +03:00
dde081a540
Code of the new audio stream control slider (watch.php)
2025-07-29 16:53:49 +03:00
207d84dc3b
Loaded "nouislider" (functions.php)
2025-07-29 16:49:33 +03:00
8f8abb70d2
Handle option not existing and so referencing .disabled fails
2025-07-26 12:21:54 -04:00
IgorA100
Isaac Connor
IgorA100