Isaac Connor
65da80d6ae
remove extra space
2024-06-21 15:49:53 -04:00
Isaac Connor
eea0e8fe64
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2024-06-20 20:58:33 -04:00
Isaac Connor
d8e15f19c2
Add options for h264_v4l2m2m encoder
2024-06-20 20:58:21 -04:00
Isaac Connor
420aa9a525
fix eslint
2024-06-19 09:39:01 -04:00
Isaac Connor
48dc523eee
Merge pull request #4068 from IgorA100/patch-141
...
Changed the flip panel control "data-flip-control-object" (skin.js)
2024-06-19 09:21:53 -04:00
Isaac Connor
ba833006ef
Merge pull request #4082 from IgorA100/patch-151
...
Fix: If "opts.focal" - calculate coordinates taking into account the planned Scale, and not just the calculated Scale (jquery.panzoom.js)
2024-06-19 09:21:02 -04:00
Isaac Connor
9a87e2976f
Fix js error when clicking play/pause when using video.js as viewer
2024-06-17 14:51:02 -04:00
IgorA100
54d363bf85
Fix: If "opts.focal" - calculate coordinates taking into account the planned Scale, and not just the calculated Scale (jquery.panzoom.js)
...
I created a PR in the author's repository, but there is no feedback yet.
https://github.com/timmywil/panzoom/pull/669
2024-06-17 11:16:11 +03:00
IgorA100
ae36a1f502
More compact display of Frame information (event.js.php)
2024-06-15 23:47:29 +03:00
IgorA100
1e34f5aee6
More compact display of Frame information (event.js)
2024-06-15 23:44:53 +03:00
Isaac Connor
081c3900a1
Merge pull request #4079 from IgorA100/patch-149
...
TotScore, AvgScore, MaxScore display in one line Event page
2024-06-15 14:15:26 -04:00
Isaac Connor
a5aef97464
Floor the scaling value % 5
2024-06-15 13:34:02 -04:00
Isaac Connor
ecc947a71d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-15 13:30:12 -04:00
Isaac Connor
b36d67c002
Set a cookie for speed value so that it persists over reloads
2024-06-15 13:30:04 -04:00
IgorA100
12b84255ee
From "eventDataStrings" instead of "MaxScore" process "Score" (event.js)
2024-06-15 00:50:37 +03:00
Isaac Connor
04c743d888
Merge pull request #4072 from IgorA100/patch-144
...
Added the ability to initialize with parameters (PanZoom)
2024-06-14 17:46:26 -04:00
IgorA100
0587cdc7a9
Update event.js.php
2024-06-15 00:41:21 +03:00
IgorA100
c57af2c8ca
Fix: Added getStat execution error handling (frame.js)
2024-06-15 00:28:53 +03:00
IgorA100
b1a35c339e
Chore: Fix extra space & lost semicolon (skin.js)
2024-06-14 19:35:45 +03:00
IgorA100
730c3b5161
Changing the icon control for the hide/show panel button (skin.js)
...
+ Part of the code for controlling the icon of the button to hide/show the panel has been moved to the "changeButtonIcon" function
+ Added support for the "data-initial-state-icon" attribute to make it possible not to use cookies when initially opening a page.
2024-06-14 19:29:17 +03:00
IgorA100
576dc6a652
Merge branch 'ZoneMinder:master' into patch-141
2024-06-14 19:23:35 +03:00
IgorA100
038b3b2886
Chore: eslint (watch.js)
2024-06-14 15:49:13 +03:00
IgorA100
d9b9dfc77f
Chore: eslint (panzoom.js)
2024-06-14 15:47:02 +03:00
IgorA100
5c3f244a9a
Added initialization of the experimental PanZoom function for reducing a block containing an image (Shift+Alt+mouse wheel) (watch.js)
2024-06-14 15:39:42 +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
cb3b29dd8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-13 09:28:38 -04:00
Isaac Connor
b0081d93d6
Make code a little more robust when expected attributes are not found. Mitigates #4076
2024-06-13 09:28:25 -04:00
IgorA100
fe9cc6d2a7
Don't change skin.js now, it will cause problems in other places
...
Additional research is required in a quiet environment.
2024-06-12 00:14:44 +03:00
IgorA100
a4443bb0a7
Update watch.js
2024-06-11 23:17:01 +03:00
IgorA100
073bbfc316
dataOnClick is called with a delay, because DOM change occurs (watch.js)
2024-06-11 23:06:59 +03:00
IgorA100
02a66983a5
Merge branch 'master' into patch-147
2024-06-11 22:58:32 +03:00
IgorA100
6308ceaf0c
Update watch.js
2024-06-11 22:48:02 +03:00
IgorA100
e874fd9c1f
Chore: code optimization (watch.js)
2024-06-11 22:33:20 +03:00
IgorA100
5e3bfbb392
Call dataOnClick() when switching to new next camera (watch.js)
...
Necessary because we change the DOM
2024-06-11 21:54:01 +03:00
IgorA100
add8eb4be3
Temporarily added dataOnClick() when initializing the page (watch.js)
2024-06-11 21:18:47 +03:00
Isaac Connor
6bf2c2653f
Merge pull request #4074 from IgorA100/patch-146
...
currentMonitor variable is now global for the Watch page
2024-06-11 14:03:02 -04:00
Isaac Connor
e85078ca2d
Handle when ptzToggle does not exist because OPT_CONTROL is off
2024-06-11 14:00:01 -04:00
Isaac Connor
8fe2da13fb
Fix use of validFloat which doesn't exist
2024-06-11 13:59:46 -04:00
IgorA100
f40cf5866e
Fix: addEventListener used after page load (skin.js)
...
This will be more correct!
This solves the problem https://forums.zoneminder.com/viewtopic.php?p=134573#p134573
I hope no other problems arise in connection with the code transfer.
2024-06-11 20:31:36 +03:00
IgorA100
abc72ff7dc
Fix: Include the file "includes/control_functions.php" only once (watch.php)
2024-06-11 19:50:32 +03:00
IgorA100
25b6fa8488
Fix: Limit scope for "handleClick" (watch.js)
2024-06-11 19:21:20 +03:00
IgorA100
68cbfe0160
currentMonitor variable is now global for the Watch page (watch.js)
2024-06-11 11:43:58 +03:00
IgorA100
ddb82112ee
Fix: Unified style for Buttons=disabled (light theme skin.css)
2024-06-10 11:52:14 +03:00
IgorA100
2c583a386e
Fix: Unified style for Buttons=disabled (dark theme skin.css)
2024-06-10 11:45:44 +03:00
Isaac Connor
2734827d21
validHtmlStr isn't strong enought o prevent injection. Use validFloat on maxfps.
2024-06-09 10:26:52 -04:00
Isaac Connor
e5367621cf
Use disabled instead of hiding/unhiding the ptz toggle. Fix passing monitorStream instead of currentMonitor to applyMonitorControllable
2024-06-09 10:26:18 -04:00
Isaac Connor
538cfacac9
Merge pull request #4062 from IgorA100/patch-135
...
When viewing in a cycle, move to the next stream without reloading Watch page
2024-06-07 15:54:13 -04:00
IgorA100
da8882b67f
Chore: Code optimization (watch.js)
2024-06-07 22:08:25 +03:00
IgorA100
cbf3812a30
After pressing Play, do not reset the time countdown if pause was enabled before (watch.js)
2024-06-07 21:56:02 +03:00
