Skip to content

Commit

Permalink
Version 79:
Browse files Browse the repository at this point in the history
* Fixed a bug where UI3 could have the wrong coordinates for cameras in a group if that group's layout changed recently.
* Updated documentation a little.
  • Loading branch information
bp2008 committed Jun 18, 2019
1 parent e0b3183 commit 0abe6be
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ui3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
};
</script>
<script type="text/javascript">
var ui_version = "78";
var ui_version = "79";
var bi_version = "%%VERSION%%";
var combined_version = ui_version + "-" + bi_version;
//if (!!navigator.userAgent.match(/ Android /))
Expand Down
Binary file modified ui3/help/img/GroupProperties.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 22 additions & 4 deletions ui3/ui3.js
Original file line number Diff line number Diff line change
Expand Up @@ -8723,9 +8723,9 @@ function CameraListLoader()

if (!firstCameraListLoaded && numCameras > 1 && settings.ui3_webcasting_disabled_dontShowAgain != "1")
{
webcastingWarning = toaster.Info('Webcasting may not be enabled for some of your camera groups.<br><br>'
+ camsNotInGroup.length + ' camera' + (camsNotInGroup.length == 1 ? ' has' : 's have')
+ ' been individually added to the Current Group dropdown list.<br><br>'
webcastingWarning = toaster.Info(camsNotInGroup.length + ' camera' + (camsNotInGroup.length == 1 ? ' has' : 's have')
+ ' been individually added to the Current Group dropdown list because ' + (camsNotInGroup.length == 1 ? 'it was' : 'they were')
+ ' not found in any group that has webcasting enabled.<br><br>'
+ '<input type="button" class="simpleTextButton btnGreen" value="Learn more" onclick="UIHelp.LearnMore(\'Camera Group Webcasting\')" /><br><br>'
+ '<input type="button" class="simpleTextButton btnRed" value="Do not warn again" onclick="DontShowWebcastingWarningAgain()" />'
, 60000, true);
Expand Down Expand Up @@ -9092,6 +9092,23 @@ function VideoPlayerController()
, imageRenderer.CamImgDragMove
, imageRenderer.CamImgDragEnd
);

BI_CustomEvent.AddListener("CameraListLoaded", UpdatedCurrentCameraData);
}
var UpdatedCurrentCameraData = function ()
{
currentlyLoadingCamera = GetUpdatedCameraData(currentlyLoadingCamera);
currentlyLoadedCamera = GetUpdatedCameraData(currentlyLoadedCamera);
}
var GetUpdatedCameraData = function (currentCameraData)
{
if (currentCameraData)
{
var updatedCameraData = cameraListLoader.GetCameraWithId(currentCameraData.optionValue);
if (updatedCameraData)
return updatedCameraData;
}
return currentCameraData;
}
var IsDoubleClickFullscreenEnabled = function ()
{
Expand Down Expand Up @@ -20735,8 +20752,9 @@ function UIHelpTool()
var $root = $('<div class="UIHelp">'
+ 'This interface is easier to use when all your camera groups have webcasting enabled.<br><br>'
+ 'Enable webcasting for your groups using the group settings panel. This panel is found in the lower-left corner of the Blue Iris console (only when PTZ controls are enabled):<br><br>'
+ 'Some other configurations may also lead to this message being shown.<br><br>'
+ '</div>');
var $img = $('<img src="ui3/help/img/GroupProperties.png' + currentServer.GetLocalSessionArg("?") + '" style="width:400px; height:320px;" />');
var $img = $('<img src="ui3/help/img/GroupProperties.png' + currentServer.GetLocalSessionArg("?") + '" style="width:380px; height:255px;" />');
$root.append($img);
$img.lightbox();
$root.modalDialog({ title: 'Camera Group Webcasting', closeOnOverlayClick: true });
Expand Down

0 comments on commit 0abe6be

Please sign in to comment.