Commit Graph

10746 Commits

Author SHA1 Message Date
Isaac Connor
4baa2c0554 Remove stills option and add 1/10 and 1/2 rate options 2024-05-28 16:32:06 -04:00
Isaac Connor
1979d6665e Fix seeking by clicking on timeline when using video.js 2024-05-28 16:31:51 -04:00
Isaac Connor
70c6375782 Add 1/10 and 1/2 frame rates and remove stills option as it can be done with pause. Remove zoom info title as it is now in includes/Monitor.php 2024-05-28 10:11:49 -04:00
Isaac Connor
69d5855653 Add another decimal digit to fps displays 2024-05-28 10:11:02 -04:00
Isaac Connor
7543e513fa Replace useless title on image stream with a useful one describing zoom controls. 2024-05-28 10:10:30 -04:00
Isaac Connor
970af4976a Merge pull request #4048 from IgorA100/patch-124
Chore: Mark "const el" as unused (watch.js)
2024-05-28 07:38:44 -04:00
Isaac Connor
110deed20f Merge pull request #4047 from IgorA100/patch-123
Fix: Scrollbar style applied for "html" (skin.css)
2024-05-28 07:38:10 -04:00
IgorA100
d009b14fba Chore: Mark "const el" as unused (watch.js) 2024-05-28 12:28:13 +03:00
IgorA100
6953dbd780 Fix: Scrollbar style applied for "html" (skin.css) 2024-05-28 11:55:46 +03:00
IgorA100
358a0d23ef Replaced tabs with spaces (montage.js) 2024-05-28 00:55:55 +03:00
IgorA100
ab25a105da Use "setMaxFPS(fps)" instead of "streamCommandstreamCommand({command: CMD_MAXFPS, maxfps: fps})" (montage.js) 2024-05-28 00:53:16 +03: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
Isaac Connor
e1a9a2c93b Merge pull request #4044 from IgorA100/patch-120
Feat: Added Rate control on Montage page
2024-05-27 17:07: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
850ac711df Removed extra semicolon (montage.js) 2024-05-27 22:48:42 +03:00
IgorA100
30d7c9a130 Added Rate control on Montage page (montage.php) 2024-05-27 22:43:52 +03:00
IgorA100
8e86879dd3 Added Rate control on Montage page (montage.js) 2024-05-27 22:35:22 +03:00
IgorA100
90ecbb8faf Fix: scale calculation with "scale == 'fit_to_width'" watch.js
If scale == 'fit_to_width', then it is necessary to take into account the width of the screen, not the monitor element, because The monitor has not yet reached the correct size.
2024-05-27 21:23:13 +03:00
IgorA100
075bbfc244 Fix eslint (panzoom.js) 2024-05-27 19:37:49 +03:00
IgorA100
4aeec829b0 PanZoom code has been moved to 'web/js/panzoom.js'' (skin.js) 2024-05-27 19:34:56 +03:00
IgorA100
c582e7ab5b Added file panzoom.js 2024-05-27 19:32:25 +03:00
IgorA100
8256cdef99 Load 'js/panzoom.js' file when needed (functions.php) 2024-05-27 19:31:20 +03:00
IgorA100
b1993f94ca Fix: Changed "monitors[i].setScale" (watch.js)
Requires width & height
2024-05-27 18:46:58 +03:00
IgorA100
9ec5c1ad90 Fix: Calculation of Scale for Watch page (watch.js) 2024-05-27 18:39:16 +03:00
Isaac Connor
f97c453e73 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-27 10:01:33 -04:00
Isaac Connor
8712a0c189 Use parseInt on MaxImageBUffers because '0' is a true value 2024-05-27 10:01:27 -04:00
IgorA100
670a60373a Chore: eslint (skin.js) 2024-05-27 16:20:19 +03:00
IgorA100
4a85901c44 Chore: eslint (skin.js) 2024-05-27 16:17:30 +03:00
IgorA100
eaaa9bfaab Fix: Cursor type (skin.js) 2024-05-27 16:11:55 +03:00
IgorA100
166716e7c9 Moved PanZoom functions to skin.js (watch.js) 2024-05-27 15:41:21 +03:00
IgorA100
8bdb169fca Removed function manageCursor (montage.js) 2024-05-27 15:36:49 +03:00
IgorA100
707ac6f9ec Moved PanZoom functions to skin.js (event.js) 2024-05-27 15:34:44 +03:00
IgorA100
18d30fe0bb Moved PanZoom functions to skin.js (montage.js) 2024-05-27 15:28:16 +03:00
IgorA100
53437b51ed Moved PanZoom functions here (skin.js)
Moved from Montage, Watch & Event page
2024-05-27 15:11:34 +03:00
IgorA100
1b84a83d41 Chore: eslint (montage.js) 2024-05-26 22:35:50 +03:00
IgorA100
c5cd1b23c9 Optimizing code related to GridStack (montage.js)
And fix monitor positioning when switching Ratio
2024-05-26 22:29:30 +03:00
Isaac Connor
e716dca381 For custom layouts use a scale that gets us a width of 480px which is 25% of 1920. 2024-05-25 09:40:58 -04:00
Isaac Connor
2aecef113e Only apply scale guessing if the layout is one of the predefined and hence known good layouts. 2024-05-25 09:27:11 -04:00
Isaac Connor
d00cc6f534 Merge pull request #4039 from IgorA100/patch-117
Fix:  changedMonitors.forEach (montage.js)
2024-05-24 19:07:30 -04:00
IgorA100
f1b13e8eed Update montage.js 2024-05-25 01:09:46 +03:00
IgorA100
d1f3a3f21d Fix: changedMonitors.forEach (montage.js)
Iterating through the array was incorrect
2024-05-24 19:51:51 +03:00
Isaac Connor
00db9788d8 Limit scale to 100 2024-05-23 16:18:28 -04:00
Isaac Connor
84d38592db Code cleanup allowing const variable 2024-05-23 16:18:00 -04:00
Isaac Connor
4fcc69e973 Remove Freeform references and rename default_layout_id to audoLayoutName 2024-05-23 14:07:25 -04:00
Isaac Connor
6243330e68 Merge branch 'master' into patch-115 2024-05-23 14:03:14 -04:00
Isaac Connor
217acd2e5f Merge branch 'master' into patch-114 2024-05-23 13:48:53 -04:00
Isaac Connor
d84d67ee0b Merge branch 'IgorA100-patch-116' 2024-05-23 13:46:34 -04:00
Isaac Connor
7c75356c8d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-23 13:46:28 -04:00
Isaac Connor
4e1396e539 Foot html footer back where it should be and move PRESET_LAYOUT_NAMES to montage.js.php 2024-05-23 13:46:19 -04:00
Isaac Connor
4fcc433880 Only change src if it exists. Fixes non-zms players 2024-05-23 13:45:49 -04:00