1de8d76cae
Remove debug of forceAlarmButton
2024-10-29 13:31:11 -04:00
ce1a1b87e9
Only try to send a command to enable analysis frames if we are streaming through zms. prevents an error being logged
2024-10-22 16:18:31 -04:00
c2fe3ce1e8
Fix eslint
2024-10-15 18:10:05 -04:00
e306dcf972
Merge pull request #4163 from IgorA100/patch-180200
...
Chore: Removed the use of the "delay" constant as it is no longer used when starting monitors on the Montage page
2024-10-03 06:51:14 -04:00
5790a0d03b
Recovered spaces that I accidentally deleted (MonitorStream.js)
2024-10-02 19:35:54 +03:00
701d485773
Removed the "delay" argument from the "start" function as it is no longer used (MonitorStream.js)
2024-10-02 19:33:37 +03:00
8843d8c18a
Fix: Restored monitors start with delay (MonitorStream.js)
...
Probably it broke at some point. Or maybe it never worked, but in montage.js monitors start with a delay:
"monitor.start(delay);"
2024-10-02 13:37:05 +03:00
35f2dee620
add setGridStack. Rework logic on enable/disable motion anf force/cancel alarm to match when using rtsp2web. Add support for score and analysing in status response.
2024-10-01 17:13:30 -04:00
506cdc5e66
Only show non-deleted monitors
2024-09-30 09:32:35 -04:00
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
52a5bf2a1f
Chore: Eslint (panzoom.js)
2024-09-18 12:30:04 +03:00
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
0ecb9a7754
Fix: Disabled preventDefault() when initializing PanZoom (panzoom.js)
2024-09-17 17:42:41 +03:00
b59c2f564c
Chore: Remove extra space (panzoom.js)
2024-09-17 10:53:49 +03:00
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
2ca08fb546
Track started state for RTSP2Web and Janus as well
2024-09-06 09:33:55 -04:00
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
0717a2d324
Chore: Removed extra spaces (panzoom.js)
2024-08-20 13:07:00 +03:00
f2323426a0
chore: remove console.log (panzoom.js)
2024-08-20 13:03:08 +03:00
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
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
43e21a3200
Update auth_hash in zms url
2024-06-28 14:33:59 -04:00
d9b9dfc77f
Chore: eslint (panzoom.js)
2024-06-14 15:47:02 +03:00
7fadd6444b
Merge branch 'ZoneMinder:master' into patch-144
2024-06-14 15:33:40 +03:00
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
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
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
ba62d251cd
Chore: eslint (panzoom.js)
2024-06-06 20:16:19 +03:00
79073cab23
Added all other event handlers (panzoom.js)
2024-06-06 20:01:35 +03:00
d377d2f5dc
Добавил возможность инициализации с параметрами (panzoom.js)
...
+ Изменять стиль курсора в зависимости от disablePan & disableZoom
+ Добавлена обработка ошибочных ситуаций.
+ Добавлено назначение функций для прослушивания событий "panzoomchange", "panzoomzoom"
2024-06-06 19:54:56 +03:00
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
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
4f9657c482
Fix: eslint (panzoom.js)
2024-06-01 23:37:37 +03:00
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
7d86df0c04
Chore: eslint MonitorStream.js
2024-05-31 01:04:03 +03:00
5706bf2ade
Added $streamQuality processing (MonitorStream.js)
2024-05-31 00:51:49 +03:00
662fc2baf2
Turn on use strict
2024-05-29 10:26:42 -04:00
4a0ea62fa6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-29 10:10:54 -04:00
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
ca40a794d2
Added this.started = true/false when starting/stopping the monitor (MonitorStream.js)
2024-05-29 17:06:33 +03:00
69d5855653
Add another decimal digit to fps displays
2024-05-28 10:11:02 -04:00
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
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
075bbfc244
Fix eslint (panzoom.js)
2024-05-27 19:37:49 +03:00
c582e7ab5b
Added file panzoom.js
2024-05-27 19:32:25 +03:00
9f730bc0d7
Immediately do a status command when the image loads instead of waiting statusInterval for it.
2024-05-16 15:57:50 -04:00
d72303de48
Fix: eslint (MonitorStream.js)
2024-05-09 20:51:46 +03:00
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
4b596b70f3
Fix eslint
2024-05-08 16:22:36 -04:00
a809a92d1f
Chore: eslint MonitorStream.js
2024-05-07 20:50:34 +03:00
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
d9e12a2e68
Fix: IMG width is now 100% instead of "auto"
2024-04-09 13:16:03 +03:00
d7ae0d9d23
Feat: Mouse moving an enlarged video frame during live viewing
...
Added mouse movement tracking functions.
2024-04-01 12:56:14 +03:00
ada974ef51
Fix eslint
2024-03-06 14:21:18 -05:00
4ab1aaa1d0
Fix Linked monitor expression not updating
2024-03-05 11:46:42 -05:00
ed14fc7449
Don't allow linking to ourselves
2024-03-05 11:14:58 -05:00
a18167377e
Fix: scaleToFit function
...
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
fcac8ec2f2
Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.
2024-02-07 10:58:39 -05:00
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
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
8ca1436224
If img has a fix width set, clear it when we change scale
2024-01-24 12:54:13 -05:00
6ba09c6f0d
Finish switch to using Intervals instead of Timeouts
2024-01-24 09:28:12 -05:00
bd90711aa6
Use an interval instead of calling Timeout from callback
2024-01-22 14:25:57 -05:00
6812f2efe7
Fix eslint
2024-01-16 09:56:28 -05:00
ee9e03a7c1
Fix FPS values when getting status from web instead of ZMS.
2024-01-02 16:28:49 -05:00
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
07d4fb2099
Set default delay, add starting statusCmdTimer when using rtsp2web
2023-11-21 11:35:04 -05:00
ea76a03043
Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay
2023-10-15 17:55:44 -04:00
93f5378f4e
Fix undefined reference to startPlay
2023-10-15 17:55:44 -04:00
1e200abf16
Remove support for browsers not supporting TextDecoder to fix eslint
2023-08-08 13:01:42 -04:00
80c145dca4
Add support for HTTPS connections to RTSP2Web
2023-07-31 00:16:51 -05:00
af42398070
Fix ESLint issues in RTSP2Web work
2023-07-30 16:54:22 -05:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
e96d2a6acc
No longer abort when sending a command... no streaming ajax should take any significant time.
2023-07-11 17:27:52 -04:00
14eb38a00b
add timeout value to debug, only send scale command if it is > 0
2023-06-08 10:30:01 -04:00
4f416edf93
Fix missing auth_relay on alarm xhr
2023-06-05 09:57:12 -04:00
31d9342918
Assume reverse proxy setup for janus for http as well
2023-05-31 17:01:45 -04:00
9a13312e4e
Fix eslint
2023-05-25 14:15:32 -04:00
d0fead5b06
Add setMaxFPS and fix streamCommand so that data doesn't pollute other commands data
2023-05-12 14:10:52 -04:00
7dd09ea55e
When killing stream, stop and abort
2023-05-12 12:50:35 -04:00
81fd2dcb08
Don't pollute streamCmdParams
2023-05-12 12:48:31 -04:00
c4c3dddbe3
add in setMaxFPS
2023-05-12 12:46:16 -04:00
9fbf140fc3
fix eslint
2023-05-11 10:23:12 -04:00
a31887634a
Inlcude port in url to janus
2023-05-11 10:23:04 -04:00
8ae4783a33
If monitor is assigned to a server, use that server for janus url.
2023-05-11 10:13:20 -04:00
2a2c192562
Add urlToJanus function to Server class
2023-05-11 10:13:04 -04:00
a608b18e8b
Limit auto-calculated scale to 25%. Just looks bad less than that. When no bottom Element, adjust height as well. Don't need to change img.src on scale if streaming. Can just tell it to. Fix applying scale and will auto-reapply if needed.
2023-04-27 10:43:06 -04:00
1f11493266
Don't need to add auth_hash if we have auth_relay
2023-04-13 10:13:27 -04:00
b85b7e462e
When testing ZM_ALARM_ON_SOUND, use string comparison as the config value is a string. Also add log if other config options are not set
2023-04-10 13:13:36 -04:00
0a84cd0327
fix(alarmSound): Use Audio.play() for alarm sound
2023-04-07 10:55:09 -04:00
7a254b42f5
Fix use of auth_relay when PLAIN
2023-03-21 09:52:50 -04:00
18403bf33e
Move users list from options into an include. Add Email, Phone, Name fields
2023-02-28 13:59:16 -05:00
8a6f0cbe1b
Add ServerStats to api
2023-02-26 17:04:05 -05:00
1cdd1325bf
Fix eslint
2023-02-25 16:26:19 -05:00
afcf55608e
Move map generation into an Object so it can be reused.
2023-02-25 13:04:49 -05:00
4979d299a6
Cleanup code style
2023-02-25 12:40:54 -05:00
cbabf9d5ce
Add getFromApi
2023-02-25 12:40:41 -05:00
74a0790c56
Use const instead of var, code comment fix
2023-02-19 17:29:32 -05:00
292f3a0cc2
Remove reference to zm.connortechnology.com
2023-01-13 12:48:26 -05:00
2e6f465055
eslint doesn't like function names that start with a capital
2023-01-12 09:38:13 -05:00
99d9d70a39
Update code, remove console.log debugging
2023-01-03 19:19:13 -05:00
50f87be9d9
Detach streams when killing the monitor stream to reduce console logging
2022-12-07 14:14:00 -05:00
0f2afdcff7
Fix eslint and use const on port
2022-11-30 13:42:17 -05:00
cdfe38cc31
Add UrltoZMS and UrltoAPI methods to Server js class
2022-11-30 13:19:02 -05:00
0c0269b2cc
Fix eslint
2022-11-01 12:41:27 -04:00
2859634aaa
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
2022-11-01 08:22:53 -04:00
f0cd36989b
Spacing, use const and let instead of var
2022-10-21 18:11:46 -04:00
5a5a665cdf
Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined
2022-10-12 19:34:05 -04:00
cb3fc5907d
Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs
2022-10-06 14:52:39 -04:00
11a4735082
Update MonitorLinkExpression.js
...
Trailing spaces lead to eslint error. Removed them
2022-09-17 10:08:07 +02:00
419a44f8ed
Merge branch 'iiot'
2022-09-13 18:23:44 -04:00
d079439005
Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports
2022-09-12 19:40:27 +02:00
c35bbc8c30
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
2022-09-07 15:49:47 -05:00
4eeb49d09a
Merge branch 'master' into reports
2022-08-31 18:38:08 +02:00
62a8b72dc4
Fix add monitorlink to not prepend a | onto and empty expr
2022-08-30 20:03:55 +02:00
e24432ee4d
Merge branch 'master' into reports
2022-08-30 19:40:14 +02:00
3005ddff49
Still parse even if no tokens
2022-08-30 19:36:43 +02:00
48377334fe
Gracefully handle when FrameRate is empty
2022-08-26 14:12:51 -04:00
f202e82b78
Remove no longer used code to protect percentage widths
2022-08-19 13:33:22 -04:00
331e3f483a
Handle width=100% and remove code that worked around montage layouts with width=%.
2022-08-19 13:33:22 -04:00
e2ebccc9aa
fix eslint
2022-08-19 13:33:20 -04:00
071147fba7
Remove no longer used code to protect percentage widths
2022-08-15 13:04:50 -04:00
de5b8bd893
Handle width=100% and remove code that worked around montage layouts with width=%.
2022-08-15 13:01:49 -04:00
294fd9b3c7
Always populate add MonitorLink dropdown.
2022-08-08 10:05:15 -04:00
f794077d71
Only add or operator if monitorlinks has content
2022-08-08 10:02:20 -04:00
dc52105c8f
Allow to link to ourself
2022-08-03 14:44:44 -04:00
6c292dd0e3
Improve adding parenthesis, rename function to snake case
2022-08-03 14:30:18 -04:00
eb4b097560
fix eslint
2022-08-03 13:52:01 -04:00
2e5d7ee167
Improve adding parenthesis, rename function to snake case
2022-08-03 13:38:56 -04:00
6f146d1af0
Add MonitorLinkExpression.js
2022-08-03 12:14:51 -04:00
4ab58f5f22
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-06-16 09:58:49 -04:00
58fedd8c35
Fix streamQuery => streamCmdQuery. Fixes #3507
2022-06-16 09:58:26 -04:00
17562671c1
fix eslint
2022-06-15 13:18:11 -04:00
a5cbe65d70
watchdog is not available everywhere yet. comment out its use
2022-06-15 13:08:38 -04:00
5188346086
Institute a status timer to be used when not streaming from zms.
2022-06-15 12:34:55 -04:00
ba2b18f8a9
Fix eslint
2022-06-03 15:00:23 -04:00
edfaffb88f
Only set onclick if a new function is given
2022-06-02 15:11:59 -04:00
c68f9f5fe8
Include connKey is debug line
2022-06-01 08:58:58 -04:00
516967e054
Don't set width if it already has a value. Fix state setting on state label.
2022-05-30 13:37:27 -04:00
331aca149b
If the response contained a message, alert it
2022-05-30 10:34:08 -04:00
e1c80a710b
Use global config vale for ZM_WEB_POPUP_ON_ALARM
2022-05-30 10:17:20 -04:00
544c1a248c
Only set monitor_frame width if it is auto
2022-05-26 13:00:13 -04:00
53025e1572
set src='' before new value. Firefox needs it. set scale to 100 when 0, just for consistency. Remove stream_frame which is unused, fixup parenthesis
2022-05-26 12:37:36 -04:00
57bd502bb9
test for 0 before setting width and height
2022-05-26 12:32:26 -04:00
082fff850f
Re-instate setting the class of the monitor div on alarm
2022-05-26 12:28:12 -04:00
a7f586a46d
fix eslint
2022-05-13 11:02:12 -04:00
0ede5cec85
remove duplication of onload, onerror. Introduce a kill function to be called when we browse away to stop all the ajax.
2022-05-13 10:33:35 -04:00
59898caf59
Start the query status timer on img.load
2022-05-12 11:00:50 -04:00
eb3806f482
Don't close initial stream. The QUIT gets lost. Add onload debugging
2022-05-07 11:39:17 -04:00
085da5c1fb
fix eslint
2022-05-02 10:01:14 -04:00
Isaac Connor
Isaac Connor
IgorA100
Jonathan Bennett
Simpler1
VikingGer