bug: disable image (camera) attachment upload unless over HTTPS
Browser restriction: https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#privacy_and_security
This commit is contained in:
Gary Sharp
@@ -46,7 +46,7 @@
|
||||
{
|
||||
<div class="Disco-AttachmentUpload-Progress"></div>
|
||||
<div class="attachmentInput clearfix">
|
||||
<span class="action upload fa fa-upload disabled" title="Attach File"></span><span class="action photo fa fa-camera disabled" title="Capture Image"></span>
|
||||
<span class="action enabled upload fa fa-upload disabled" title="Attach File"></span><span class="action enabled photo fa fa-camera disabled" title="Capture Image"></span>
|
||||
</div>
|
||||
}
|
||||
<script type="text/javascript">
|
||||
@@ -71,20 +71,20 @@
|
||||
$.connection.hub.disconnected(onHubFailed);
|
||||
|
||||
$.connection.hub.reconnecting(function () {
|
||||
$('#AttachmentsContainer').find('span.action').addClass('disabled');
|
||||
$('#AttachmentsContainer').find('span.action.enabled').addClass('disabled');
|
||||
});
|
||||
$.connection.hub.reconnected(function () {
|
||||
$('#AttachmentsContainer').find('span.action').removeClass('disabled');
|
||||
$('#AttachmentsContainer').find('span.action.enabled').removeClass('disabled');
|
||||
});
|
||||
|
||||
// Start Connection
|
||||
$.connection.hub.start(function () {
|
||||
$('#AttachmentsContainer').find('span.action').removeClass('disabled');
|
||||
$('#AttachmentsContainer').find('span.action.enabled').removeClass('disabled');
|
||||
}).fail(onHubFailed);
|
||||
|
||||
function onHubFailed(error) {
|
||||
// Disable UI
|
||||
$('#AttachmentsContainer').find('span.action').addClass('disabled');
|
||||
$('#AttachmentsContainer').find('span.action.enabled').addClass('disabled');
|
||||
|
||||
// Show Dialog Message
|
||||
if ($('.disconnected-dialog').length == 0) {
|
||||
@@ -238,8 +238,16 @@
|
||||
$Attachments.find('.Disco-AttachmentUpload-Progress'));
|
||||
|
||||
var $attachmentInput = $Attachments.find('.attachmentInput');
|
||||
if (window.location.protocol != 'https:') {
|
||||
$attachmentInput.find('.photo')
|
||||
.removeClass('enabled')
|
||||
.addClass('disabled')
|
||||
.attr('title', 'Capture Image: this functionality is only available over a HTTPS connection');
|
||||
}
|
||||
$attachmentInput.find('.photo').click(function () {
|
||||
if ($(this).hasClass('disabled'))
|
||||
if (!$(this).hasClass('enabled'))
|
||||
alert('This functionality is only available over a HTTPS connection');
|
||||
else if ($(this).hasClass('disabled'))
|
||||
alert('Disconnected from the Disco ICT Server, please refresh this page and try again');
|
||||
else
|
||||
attachmentUploader.uploadImage();
|
||||
|
||||
@@ -344,13 +344,13 @@ WriteLiteral(" class=\"attachmentInput clearfix\"");
|
||||
|
||||
WriteLiteral(">\r\n <span");
|
||||
|
||||
WriteLiteral(" class=\"action upload fa fa-upload disabled\"");
|
||||
WriteLiteral(" class=\"action enabled upload fa fa-upload disabled\"");
|
||||
|
||||
WriteLiteral(" title=\"Attach File\"");
|
||||
|
||||
WriteLiteral("></span><span");
|
||||
|
||||
WriteLiteral(" class=\"action photo fa fa-camera disabled\"");
|
||||
WriteLiteral(" class=\"action enabled photo fa fa-camera disabled\"");
|
||||
|
||||
WriteLiteral(" title=\"Capture Image\"");
|
||||
|
||||
@@ -396,40 +396,40 @@ WriteLiteral(@">
|
||||
WriteLiteral("\' };\r\n $.connection.hub.error(onHubFailed);\r\n " +
|
||||
" $.connection.hub.disconnected(onHubFailed);\r\n\r\n " +
|
||||
" $.connection.hub.reconnecting(function () {\r\n " +
|
||||
" $(\'#AttachmentsContainer\').find(\'span.action\').addClass(\'disabled\');\r" +
|
||||
"\n });\r\n $.connection.hub.r" +
|
||||
"econnected(function () {\r\n $(\'#AttachmentsContain" +
|
||||
"er\').find(\'span.action\').removeClass(\'disabled\');\r\n }" +
|
||||
");\r\n\r\n // Start Connection\r\n " +
|
||||
" $.connection.hub.start(function () {\r\n $(\'#Att" +
|
||||
"achmentsContainer\').find(\'span.action\').removeClass(\'disabled\');\r\n " +
|
||||
" }).fail(onHubFailed);\r\n\r\n function onHu" +
|
||||
"bFailed(error) {\r\n // Disable UI\r\n " +
|
||||
" $(\'#AttachmentsContainer\').find(\'span.action\').addClass(\'disabl" +
|
||||
"ed\');\r\n\r\n // Show Dialog Message\r\n " +
|
||||
" if ($(\'.disconnected-dialog\').length == 0) {\r\n " +
|
||||
" $(\'<div>\')\r\n .addClass" +
|
||||
"(\'dialog disconnected-dialog\')\r\n .html(\'<" +
|
||||
"h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-wifi fa-stack-1x\"></i><i class=\"" +
|
||||
"fa fa-ban fa-stack-2x error\"></i></span>Disconnected from the Disco ICT Server</" +
|
||||
"h3><div>This page is not receiving live updates. Please ensure you are connected" +
|
||||
" to the server, then refresh this page to enable features.</div>\')\r\n " +
|
||||
" .dialog({\r\n " +
|
||||
" resizable: false,\r\n title: \'Discon" +
|
||||
"nected\',\r\n width: 400,\r\n " +
|
||||
" modal: true,\r\n " +
|
||||
" buttons: {\r\n \'Refresh No" +
|
||||
"w\': function () {\r\n $(this).d" +
|
||||
"ialog(\'option\', \'buttons\', null);\r\n " +
|
||||
" window.location.reload(true);\r\n " +
|
||||
" },\r\n \'Close\': function () {" +
|
||||
"\r\n $(this).dialog(\'destroy\');" +
|
||||
"\r\n }\r\n " +
|
||||
" }\r\n });\r\n " +
|
||||
" }\r\n }\r\n\r\n " +
|
||||
" function onAddAttachment(id, quick) {\r\n var data" +
|
||||
" = { id: id };\r\n $.ajax({\r\n " +
|
||||
" url: \'");
|
||||
" $(\'#AttachmentsContainer\').find(\'span.action.enabled\').addClass(\'disa" +
|
||||
"bled\');\r\n });\r\n $.connecti" +
|
||||
"on.hub.reconnected(function () {\r\n $(\'#Attachment" +
|
||||
"sContainer\').find(\'span.action.enabled\').removeClass(\'disabled\');\r\n " +
|
||||
" });\r\n\r\n // Start Connection\r\n " +
|
||||
" $.connection.hub.start(function () {\r\n " +
|
||||
" $(\'#AttachmentsContainer\').find(\'span.action.enabled\').removeClass(\'dis" +
|
||||
"abled\');\r\n }).fail(onHubFailed);\r\n\r\n " +
|
||||
" function onHubFailed(error) {\r\n // Dis" +
|
||||
"able UI\r\n $(\'#AttachmentsContainer\').find(\'span.a" +
|
||||
"ction.enabled\').addClass(\'disabled\');\r\n\r\n // Show" +
|
||||
" Dialog Message\r\n if ($(\'.disconnected-dialog\').l" +
|
||||
"ength == 0) {\r\n $(\'<div>\')\r\n " +
|
||||
" .addClass(\'dialog disconnected-dialog\')\r\n " +
|
||||
" .html(\'<h3><span class=\"fa-stack fa-lg\"><i class=\"fa fa-" +
|
||||
"wifi fa-stack-1x\"></i><i class=\"fa fa-ban fa-stack-2x error\"></i></span>Disconne" +
|
||||
"cted from the Disco ICT Server</h3><div>This page is not receiving live updates." +
|
||||
" Please ensure you are connected to the server, then refresh this page to enable" +
|
||||
" features.</div>\')\r\n .dialog({\r\n " +
|
||||
" resizable: false,\r\n " +
|
||||
" title: \'Disconnected\',\r\n " +
|
||||
" width: 400,\r\n modal: true,\r\n " +
|
||||
" buttons: {\r\n " +
|
||||
" \'Refresh Now\': function () {\r\n " +
|
||||
" $(this).dialog(\'option\', \'buttons\', null);\r\n " +
|
||||
" window.location.reload(true);\r\n " +
|
||||
" },\r\n " +
|
||||
" \'Close\': function () {\r\n " +
|
||||
" $(this).dialog(\'destroy\');\r\n " +
|
||||
" }\r\n }\r\n " +
|
||||
" });\r\n }\r\n " +
|
||||
"}\r\n\r\n function onAddAttachment(id, quick) {\r\n " +
|
||||
" var data = { id: id };\r\n " +
|
||||
"$.ajax({\r\n url: \'");
|
||||
|
||||
|
||||
#line 115 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
@@ -641,33 +641,40 @@ WriteLiteral("\r\n //#region Add Attachments\r\n
|
||||
WriteLiteral("\',\r\n $Attachments.find(\'.Disco-AttachmentUpload-DropTa" +
|
||||
"rget\'),\r\n $Attachments.find(\'.Disco-AttachmentUpload-" +
|
||||
"Progress\'));\r\n\r\n var $attachmentInput = $Attachments." +
|
||||
"find(\'.attachmentInput\');\r\n $attachmentInput.find(\'.p" +
|
||||
"hoto\').click(function () {\r\n if ($(this).hasClass" +
|
||||
"(\'disabled\'))\r\n alert(\'Disconnected from the " +
|
||||
"Disco ICT Server, please refresh this page and try again\');\r\n " +
|
||||
" else\r\n attachmentUploader.upload" +
|
||||
"Image();\r\n });\r\n $attachme" +
|
||||
"ntInput.find(\'.upload\').click(function () {\r\n if " +
|
||||
"($(this).hasClass(\'disabled\'))\r\n alert(\'Disco" +
|
||||
"nnected from the Disco ICT Server, please refresh this page and try again\');\r\n " +
|
||||
" else\r\n attachme" +
|
||||
"ntUploader.uploadFiles();\r\n });\r\n\r\n " +
|
||||
" var resourcesTab;\r\n $(document).on(\'dragove" +
|
||||
"r\', function () {\r\n if (!resourcesTab) {\r\n " +
|
||||
" var tabs = $Attachments.closest(\'.ui-tabs\');\r\n " +
|
||||
" resourcesTab = {\r\n " +
|
||||
" tabs: tabs,\r\n resourcesIndex: ta" +
|
||||
"bs.children(\'ul.ui-tabs-nav\').find(\'a[href=\"#UserDetailTab-Resources\"]\').closest" +
|
||||
"(\'li\').index()\r\n };\r\n " +
|
||||
" }\r\n var selectedIndex = resourcesTab.tabs" +
|
||||
".tabs(\'option\', \'active\');\r\n if (resourcesTab.res" +
|
||||
"ourcesIndex !== selectedIndex)\r\n resourcesTab" +
|
||||
".tabs.tabs(\'option\', \'active\', resourcesTab.resourcesIndex);\r\n " +
|
||||
" });\r\n //#endregion\r\n " +
|
||||
" ");
|
||||
"find(\'.attachmentInput\');\r\n if (window.location.proto" +
|
||||
"col != \'https:\') {\r\n $attachmentInput.find(\'.phot" +
|
||||
"o\')\r\n .removeClass(\'enabled\')\r\n " +
|
||||
" .addClass(\'disabled\')\r\n " +
|
||||
" .attr(\'title\', \'Capture Image: this functionality is only available over a HTTP" +
|
||||
"S connection\');\r\n }\r\n $att" +
|
||||
"achmentInput.find(\'.photo\').click(function () {\r\n " +
|
||||
" if (!$(this).hasClass(\'enabled\'))\r\n alert(\'T" +
|
||||
"his functionality is only available over a HTTPS connection\');\r\n " +
|
||||
" else if ($(this).hasClass(\'disabled\'))\r\n " +
|
||||
" alert(\'Disconnected from the Disco ICT Server, please refresh this p" +
|
||||
"age and try again\');\r\n else\r\n " +
|
||||
" attachmentUploader.uploadImage();\r\n }" +
|
||||
");\r\n $attachmentInput.find(\'.upload\').click(function " +
|
||||
"() {\r\n if ($(this).hasClass(\'disabled\'))\r\n " +
|
||||
" alert(\'Disconnected from the Disco ICT Server, plea" +
|
||||
"se refresh this page and try again\');\r\n else\r\n " +
|
||||
" attachmentUploader.uploadFiles();\r\n " +
|
||||
" });\r\n\r\n var resourcesTab;\r\n " +
|
||||
" $(document).on(\'dragover\', function () {\r\n " +
|
||||
" if (!resourcesTab) {\r\n var tabs =" +
|
||||
" $Attachments.closest(\'.ui-tabs\');\r\n resource" +
|
||||
"sTab = {\r\n tabs: tabs,\r\n " +
|
||||
" resourcesIndex: tabs.children(\'ul.ui-tabs-nav\').find(\'a[h" +
|
||||
"ref=\"#UserDetailTab-Resources\"]\').closest(\'li\').index()\r\n " +
|
||||
" };\r\n }\r\n " +
|
||||
" var selectedIndex = resourcesTab.tabs.tabs(\'option\', \'active\');\r\n " +
|
||||
" if (resourcesTab.resourcesIndex !== selectedIndex)\r\n " +
|
||||
" resourcesTab.tabs.tabs(\'option\', \'active\', resource" +
|
||||
"sTab.resourcesIndex);\r\n });\r\n " +
|
||||
" //#endregion\r\n ");
|
||||
|
||||
|
||||
#line 268 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 276 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -676,7 +683,7 @@ WriteLiteral("\',\r\n $Attachments.find(\'.Disco-Atta
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 269 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 277 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
if (canRemoveAnyAttachments || canRemoveOwnAttachments)
|
||||
{
|
||||
|
||||
@@ -710,7 +717,7 @@ WriteLiteral(@"
|
||||
url: '");
|
||||
|
||||
|
||||
#line 295 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 303 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
Write(Url.Action(MVC.API.User.AttachmentRemove()));
|
||||
|
||||
|
||||
@@ -738,7 +745,7 @@ WriteLiteral("\',\r\n dataType: \'jso
|
||||
"/#endregion\r\n ");
|
||||
|
||||
|
||||
#line 323 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 331 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -762,7 +769,7 @@ WriteLiteral(@"
|
||||
$('#UserDetailTabItems').append('<li><a href=""#UserDetailTab-Resources"" id=""UserDetailTab-ResourcesLink"">Attachments [");
|
||||
|
||||
|
||||
#line 339 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 347 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
Write(Model.User.UserAttachments == null ? 0 : Model.User.UserAttachments.Count);
|
||||
|
||||
|
||||
@@ -771,7 +778,7 @@ WriteLiteral(@"
|
||||
WriteLiteral("]</a></li>\');\r\n </script>\r\n</div>\r\n");
|
||||
|
||||
|
||||
#line 342 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 350 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
if (canRemoveAnyAttachments || canRemoveOwnAttachments)
|
||||
{
|
||||
|
||||
@@ -793,7 +800,7 @@ WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
|
||||
WriteLiteral("></i> Are you sure?\r\n </p>\r\n </div>\r\n");
|
||||
|
||||
|
||||
#line 349 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
#line 357 "..\..\Views\User\UserParts\_Resources.cshtml"
|
||||
}
|
||||
|
||||
#line default
|
||||
|
||||
Reference in New Issue
Block a user