Bug Fix: Webcam Attachment in <= Win 7
Flash video overlay was hiding the Comments model dialog. The flash object is now hidden where <= Win 7 is detected (navigator.userAgent).
This commit is contained in:
@@ -490,9 +490,9 @@ Webcam.init();
|
||||
// Setup Dialog
|
||||
var dialog = $('<div>')
|
||||
.attr({
|
||||
id: 'disco_attachmentUpload_imageDialog',
|
||||
id: 'Disco_AttachmentUpload_ImageDialog',
|
||||
title: 'Upload Image',
|
||||
'class': 'dialog disco-attachmentUpload-imageDialog'
|
||||
'class': 'dialog Disco-AttachmentUpload-ImageDialog'
|
||||
});
|
||||
dialog.dialog({
|
||||
autoOpen: true,
|
||||
@@ -548,7 +548,7 @@ Webcam.init();
|
||||
var dialog = $('<div>')
|
||||
.attr({
|
||||
title: 'Upload File',
|
||||
'class': 'dialog disco-attachmentUpload-commentDialog'
|
||||
'class': 'dialog Disco-AttachmentUpload-CommentDialog'
|
||||
});
|
||||
dialog.html('<table><tr><th>File Name:</th><td class="filename"></td></tr><tr><th>Comments:</th><td><input class="comments" type="text"></input></td></tr><tr><td class="thumbnail" colspan="2"><img /></td></tr></table>');
|
||||
|
||||
@@ -591,6 +591,10 @@ Webcam.init();
|
||||
};
|
||||
|
||||
self._uploadImage = function (dataUri) {
|
||||
|
||||
if (self._hideFlashVideoOverlay())
|
||||
$('#webcam_movie_obj, #webcam_movie_embed').css('display', 'none');
|
||||
|
||||
var imageData = dataUri.replace(/^data\:image\/\w+\;base64\,/, '');
|
||||
|
||||
var imageBlob = new Blob([Webcam.base64DecToArr(imageData)], { type: 'image/jpeg' });
|
||||
@@ -601,6 +605,9 @@ Webcam.init();
|
||||
img.attr('src', dataUri);
|
||||
return true;
|
||||
}, function (result, comments) {
|
||||
if (self._hideFlashVideoOverlay())
|
||||
$('#webcam_movie_obj, #webcam_movie_embed').css('display', '');
|
||||
|
||||
if (!result)
|
||||
return;
|
||||
|
||||
@@ -664,6 +671,23 @@ Webcam.init();
|
||||
};
|
||||
// #endregion
|
||||
|
||||
// Flash Video hides Dom elements (comment dialog) in <= Win7
|
||||
self.__hideFlashVideoOverlay = null;
|
||||
self._hideFlashVideoOverlay = function () {
|
||||
if (self.__hideFlashVideoOverlay === null) {
|
||||
self.__hideFlashVideoOverlay = false;
|
||||
|
||||
// Test for: <= Windows 7
|
||||
try {
|
||||
var match = /(windows nt) ([\w.]+)/.exec(navigator.userAgent.toLowerCase());
|
||||
if (!!match && parseFloat(match[2]) <= 6.2)
|
||||
self.__hideFlashVideoOverlay = true;
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
return self.__hideFlashVideoOverlay;
|
||||
}
|
||||
|
||||
return self;
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+27
-3
@@ -89,9 +89,9 @@
|
||||
// Setup Dialog
|
||||
var dialog = $('<div>')
|
||||
.attr({
|
||||
id: 'disco_attachmentUpload_imageDialog',
|
||||
id: 'Disco_AttachmentUpload_ImageDialog',
|
||||
title: 'Upload Image',
|
||||
'class': 'dialog disco-attachmentUpload-imageDialog'
|
||||
'class': 'dialog Disco-AttachmentUpload-ImageDialog'
|
||||
});
|
||||
dialog.dialog({
|
||||
autoOpen: true,
|
||||
@@ -147,7 +147,7 @@
|
||||
var dialog = $('<div>')
|
||||
.attr({
|
||||
title: 'Upload File',
|
||||
'class': 'dialog disco-attachmentUpload-commentDialog'
|
||||
'class': 'dialog Disco-AttachmentUpload-CommentDialog'
|
||||
});
|
||||
dialog.html('<table><tr><th>File Name:</th><td class="filename"></td></tr><tr><th>Comments:</th><td><input class="comments" type="text"></input></td></tr><tr><td class="thumbnail" colspan="2"><img /></td></tr></table>');
|
||||
|
||||
@@ -190,6 +190,10 @@
|
||||
};
|
||||
|
||||
self._uploadImage = function (dataUri) {
|
||||
|
||||
if (self._hideFlashVideoOverlay())
|
||||
$('#webcam_movie_obj, #webcam_movie_embed').css('display', 'none');
|
||||
|
||||
var imageData = dataUri.replace(/^data\:image\/\w+\;base64\,/, '');
|
||||
|
||||
var imageBlob = new Blob([Webcam.base64DecToArr(imageData)], { type: 'image/jpeg' });
|
||||
@@ -200,6 +204,9 @@
|
||||
img.attr('src', dataUri);
|
||||
return true;
|
||||
}, function (result, comments) {
|
||||
if (self._hideFlashVideoOverlay())
|
||||
$('#webcam_movie_obj, #webcam_movie_embed').css('display', '');
|
||||
|
||||
if (!result)
|
||||
return;
|
||||
|
||||
@@ -263,6 +270,23 @@
|
||||
};
|
||||
// #endregion
|
||||
|
||||
// Flash Video hides Dom elements (comment dialog) in <= Win7
|
||||
self.__hideFlashVideoOverlay = null;
|
||||
self._hideFlashVideoOverlay = function () {
|
||||
if (self.__hideFlashVideoOverlay === null) {
|
||||
self.__hideFlashVideoOverlay = false;
|
||||
|
||||
// Test for: <= Windows 7
|
||||
try {
|
||||
var match = /(windows nt) ([\w.]+)/.exec(navigator.userAgent.toLowerCase());
|
||||
if (!!match && parseFloat(match[2]) <= 6.2)
|
||||
self.__hideFlashVideoOverlay = true;
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
return self.__hideFlashVideoOverlay;
|
||||
}
|
||||
|
||||
return self;
|
||||
};
|
||||
|
||||
|
||||
@@ -4790,10 +4790,10 @@ p.fa-p > i:first-child {
|
||||
width: 1.28em;
|
||||
margin-right: 0.2em;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget {
|
||||
div.Disco-AttachmentUpload-DropTarget {
|
||||
display: none;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight {
|
||||
display: block;
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
@@ -4804,66 +4804,66 @@ div.disco-attachmentUpload-dropTarget.dragHighlight {
|
||||
background-color: rgba(251, 218, 152, 0.5);
|
||||
border: 3px dashed #f0a30a;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight h2 {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight h2 {
|
||||
margin-top: 3em !important;
|
||||
color: #2c1e02;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight.dragHover {
|
||||
background-color: rgba(173, 235, 110, 0.5);
|
||||
border: 3px dashed #60a917;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover h2 {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight.dragHover h2 {
|
||||
color: #000000;
|
||||
}
|
||||
div.disco-attachmentUpload-progress {
|
||||
div.Disco-AttachmentUpload-Progress {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
bottom: 48px;
|
||||
}
|
||||
div.disco-attachmentUpload-progress > div {
|
||||
div.Disco-AttachmentUpload-Progress > div {
|
||||
background-color: #fafafa;
|
||||
padding: 4px 8px;
|
||||
}
|
||||
div.disco-attachmentUpload-progress > div i {
|
||||
div.Disco-AttachmentUpload-Progress > div i {
|
||||
color: #1e6dab;
|
||||
margin-right: 4px;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog {
|
||||
div.Disco-AttachmentUpload-CommentDialog {
|
||||
padding: 0.25em 0.5em !important;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table {
|
||||
div.Disco-AttachmentUpload-CommentDialog table {
|
||||
border: solid 1px #f4f4f4;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > td {
|
||||
border: solid 1px #f4f4f4;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr:nth-child(odd) > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:nth-child(odd) > td {
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > thead > tr > th,
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr > th {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > thead > tr > th,
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > th {
|
||||
background-color: #f4f4f4;
|
||||
border: solid 1px #f4f4f4;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover > td {
|
||||
background-color: #fefefe;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover:nth-child(odd) > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover:nth-child(odd) > td {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tfoot > tr > th,
|
||||
div.disco-attachmentUpload-commentDialog table > tfoot > tr > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > th,
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > td {
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table th {
|
||||
div.Disco-AttachmentUpload-CommentDialog table th {
|
||||
width: 80px;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table td.filename {
|
||||
div.Disco-AttachmentUpload-CommentDialog table td.filename {
|
||||
font-family: Consolas, "Courier New", monospace;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
@@ -4871,19 +4871,19 @@ div.disco-attachmentUpload-commentDialog table td.filename {
|
||||
-o-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table input.comments {
|
||||
div.Disco-AttachmentUpload-CommentDialog table input.comments {
|
||||
width: calc(100% - 5px);
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table td.thumbnail {
|
||||
div.Disco-AttachmentUpload-CommentDialog table td.thumbnail {
|
||||
display: none;
|
||||
text-align: center;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table td.thumbnail img {
|
||||
div.Disco-AttachmentUpload-CommentDialog table td.thumbnail img {
|
||||
border: 1px solid #9e9e9e;
|
||||
max-height: 250px;
|
||||
max-width: 374px;
|
||||
}
|
||||
div.disco-attachmentUpload-imageDialog {
|
||||
div.Disco-AttachmentUpload-ImageDialog {
|
||||
background-color: #000000 !important;
|
||||
padding: 0 !important;
|
||||
overflow: hidden !important;
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -1129,10 +1129,10 @@ p.fa-p > i:first-child {
|
||||
width: 1.28em;
|
||||
margin-right: 0.2em;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget {
|
||||
div.Disco-AttachmentUpload-DropTarget {
|
||||
display: none;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight {
|
||||
display: block;
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
@@ -1143,66 +1143,66 @@ div.disco-attachmentUpload-dropTarget.dragHighlight {
|
||||
background-color: rgba(251, 218, 152, 0.5);
|
||||
border: 3px dashed #f0a30a;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight h2 {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight h2 {
|
||||
margin-top: 3em !important;
|
||||
color: #2c1e02;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight.dragHover {
|
||||
background-color: rgba(173, 235, 110, 0.5);
|
||||
border: 3px dashed #60a917;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover h2 {
|
||||
div.Disco-AttachmentUpload-DropTarget.dragHighlight.dragHover h2 {
|
||||
color: #000000;
|
||||
}
|
||||
div.disco-attachmentUpload-progress {
|
||||
div.Disco-AttachmentUpload-Progress {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
bottom: 48px;
|
||||
}
|
||||
div.disco-attachmentUpload-progress > div {
|
||||
div.Disco-AttachmentUpload-Progress > div {
|
||||
background-color: #fafafa;
|
||||
padding: 4px 8px;
|
||||
}
|
||||
div.disco-attachmentUpload-progress > div i {
|
||||
div.Disco-AttachmentUpload-Progress > div i {
|
||||
color: #1e6dab;
|
||||
margin-right: 4px;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog {
|
||||
div.Disco-AttachmentUpload-CommentDialog {
|
||||
padding: 0.25em 0.5em !important;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table {
|
||||
div.Disco-AttachmentUpload-CommentDialog table {
|
||||
border: solid 1px #f4f4f4;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > td {
|
||||
border: solid 1px #f4f4f4;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr:nth-child(odd) > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:nth-child(odd) > td {
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > thead > tr > th,
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr > th {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > thead > tr > th,
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > th {
|
||||
background-color: #f4f4f4;
|
||||
border: solid 1px #f4f4f4;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover > td {
|
||||
background-color: #fefefe;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover:nth-child(odd) > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover:nth-child(odd) > td {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table > tfoot > tr > th,
|
||||
div.disco-attachmentUpload-commentDialog table > tfoot > tr > td {
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > th,
|
||||
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > td {
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table th {
|
||||
div.Disco-AttachmentUpload-CommentDialog table th {
|
||||
width: 80px;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table td.filename {
|
||||
div.Disco-AttachmentUpload-CommentDialog table td.filename {
|
||||
font-family: Consolas, "Courier New", monospace;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
@@ -1210,19 +1210,19 @@ div.disco-attachmentUpload-commentDialog table td.filename {
|
||||
-o-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table input.comments {
|
||||
div.Disco-AttachmentUpload-CommentDialog table input.comments {
|
||||
width: calc(100% - 5px);
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table td.thumbnail {
|
||||
div.Disco-AttachmentUpload-CommentDialog table td.thumbnail {
|
||||
display: none;
|
||||
text-align: center;
|
||||
}
|
||||
div.disco-attachmentUpload-commentDialog table td.thumbnail img {
|
||||
div.Disco-AttachmentUpload-CommentDialog table td.thumbnail img {
|
||||
border: 1px solid #9e9e9e;
|
||||
max-height: 250px;
|
||||
max-width: 374px;
|
||||
}
|
||||
div.disco-attachmentUpload-imageDialog {
|
||||
div.Disco-AttachmentUpload-ImageDialog {
|
||||
background-color: #000000 !important;
|
||||
padding: 0 !important;
|
||||
overflow: hidden !important;
|
||||
|
||||
@@ -1137,7 +1137,7 @@ p.fa-p {
|
||||
}
|
||||
|
||||
// Attachment Uploader
|
||||
div.disco-attachmentUpload-dropTarget {
|
||||
div.Disco-AttachmentUpload-DropTarget {
|
||||
display: none;
|
||||
|
||||
&.dragHighlight {
|
||||
@@ -1169,7 +1169,7 @@ div.disco-attachmentUpload-dropTarget {
|
||||
}
|
||||
}
|
||||
|
||||
div.disco-attachmentUpload-progress {
|
||||
div.Disco-AttachmentUpload-Progress {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
bottom: 48px;
|
||||
@@ -1185,7 +1185,7 @@ div.disco-attachmentUpload-progress {
|
||||
}
|
||||
}
|
||||
|
||||
div.disco-attachmentUpload-commentDialog {
|
||||
div.Disco-AttachmentUpload-CommentDialog {
|
||||
padding: 0.25em 0.5em !important;
|
||||
|
||||
table {
|
||||
@@ -1222,7 +1222,7 @@ div.disco-attachmentUpload-commentDialog {
|
||||
}
|
||||
}
|
||||
|
||||
div.disco-attachmentUpload-imageDialog {
|
||||
div.Disco-AttachmentUpload-ImageDialog {
|
||||
background-color: @black !important;
|
||||
padding: 0 !important;
|
||||
overflow: hidden !important;
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -20,7 +20,7 @@
|
||||
<tr>
|
||||
<td id="AttachmentsContainer">
|
||||
<div id="Attachments" class="@(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments")">
|
||||
<div class="disco-attachmentUpload-dropTarget">
|
||||
<div class="Disco-AttachmentUpload-DropTarget">
|
||||
<h2>Drop Attachments Here</h2>
|
||||
</div>
|
||||
<div class="attachmentOutput">
|
||||
@@ -44,7 +44,7 @@
|
||||
</div>
|
||||
@if (canAddAttachments)
|
||||
{
|
||||
<div class="disco-attachmentUpload-progress"></div>
|
||||
<div class="Disco-AttachmentUpload-Progress"></div>
|
||||
<div class="attachmentInput clearfix">
|
||||
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
|
||||
</div>
|
||||
@@ -204,8 +204,8 @@
|
||||
//#region Add Attachments
|
||||
var attachmentUploader = new document.Disco.AttachmentUploader(
|
||||
'@(Url.Action(MVC.API.Device.AttachmentUpload(Model.Device.SerialNumber, null)))',
|
||||
$Attachments.find('.disco-attachmentUpload-dropTarget'),
|
||||
$Attachments.find('.disco-attachmentUpload-progress'));
|
||||
$Attachments.find('.Disco-AttachmentUpload-DropTarget'),
|
||||
$Attachments.find('.Disco-AttachmentUpload-Progress'));
|
||||
|
||||
var $attachmentInput = $Attachments.find('.attachmentInput');
|
||||
$attachmentInput.find('.photo').click(function () {
|
||||
|
||||
@@ -95,7 +95,7 @@ WriteAttribute("class", Tuple.Create(" class=\"", 888), Tuple.Create("\"", 963)
|
||||
|
||||
WriteLiteral(">\r\n <div");
|
||||
|
||||
WriteLiteral(" class=\"disco-attachmentUpload-dropTarget\"");
|
||||
WriteLiteral(" class=\"Disco-AttachmentUpload-DropTarget\"");
|
||||
|
||||
WriteLiteral(">\r\n <h2>Drop Attachments Here</h2>\r\n </" +
|
||||
"div>\r\n <div");
|
||||
@@ -335,7 +335,7 @@ WriteLiteral(" </div>\r\n");
|
||||
#line hidden
|
||||
WriteLiteral(" <div");
|
||||
|
||||
WriteLiteral(" class=\"disco-attachmentUpload-progress\"");
|
||||
WriteLiteral(" class=\"Disco-AttachmentUpload-Progress\"");
|
||||
|
||||
WriteLiteral("></div>\r\n");
|
||||
|
||||
@@ -619,9 +619,9 @@ WriteLiteral("\r\n //#region Add Attachments\r\n
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("\',\r\n $Attachments.find(\'.disco-attachmentUpload-dropTa" +
|
||||
"rget\'),\r\n $Attachments.find(\'.disco-attachmentUpload-" +
|
||||
"progress\'));\r\n\r\n var $attachmentInput = $Attachments." +
|
||||
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 attachmentUploader.u" +
|
||||
"ploadImage();\r\n });\r\n $att" +
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
{
|
||||
<td id="AttachmentsContainer">
|
||||
<div id="Attachments" class="@(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments")">
|
||||
<div class="disco-attachmentUpload-dropTarget">
|
||||
<div class="Disco-AttachmentUpload-DropTarget">
|
||||
<h2>Drop Attachments Here</h2>
|
||||
</div>
|
||||
<div class="attachmentOutput">
|
||||
@@ -75,7 +75,7 @@
|
||||
</div>
|
||||
@if (canAddAttachments)
|
||||
{
|
||||
<div class="disco-attachmentUpload-progress"></div>
|
||||
<div class="Disco-AttachmentUpload-Progress"></div>
|
||||
<div class="attachmentInput clearfix">
|
||||
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
|
||||
</div>
|
||||
@@ -309,8 +309,8 @@
|
||||
//#region Add Attachments
|
||||
var attachmentUploader = new document.Disco.AttachmentUploader(
|
||||
'@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))',
|
||||
$Attachments.find('.disco-attachmentUpload-dropTarget'),
|
||||
$Attachments.find('.disco-attachmentUpload-progress'));
|
||||
$Attachments.find('.Disco-AttachmentUpload-DropTarget'),
|
||||
$Attachments.find('.Disco-AttachmentUpload-Progress'));
|
||||
|
||||
var $attachmentInput = $Attachments.find('.attachmentInput');
|
||||
$attachmentInput.find('.photo').click(function () {
|
||||
|
||||
@@ -336,7 +336,7 @@ WriteAttribute("class", Tuple.Create(" class=\"", 2939), Tuple.Create("\"", 3014
|
||||
|
||||
WriteLiteral(">\r\n <div");
|
||||
|
||||
WriteLiteral(" class=\"disco-attachmentUpload-dropTarget\"");
|
||||
WriteLiteral(" class=\"Disco-AttachmentUpload-DropTarget\"");
|
||||
|
||||
WriteLiteral(">\r\n <h2>Drop Attachments Here</h2>\r\n </" +
|
||||
"div>\r\n <div");
|
||||
@@ -573,7 +573,7 @@ WriteLiteral(" </div>\r\n");
|
||||
#line hidden
|
||||
WriteLiteral(" <div");
|
||||
|
||||
WriteLiteral(" class=\"disco-attachmentUpload-progress\"");
|
||||
WriteLiteral(" class=\"Disco-AttachmentUpload-Progress\"");
|
||||
|
||||
WriteLiteral("></div>\r\n");
|
||||
|
||||
@@ -1015,8 +1015,8 @@ WriteLiteral("\r\n //#region Add Attachments\r\n var attac
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral(@"',
|
||||
$Attachments.find('.disco-attachmentUpload-dropTarget'),
|
||||
$Attachments.find('.disco-attachmentUpload-progress'));
|
||||
$Attachments.find('.Disco-AttachmentUpload-DropTarget'),
|
||||
$Attachments.find('.Disco-AttachmentUpload-Progress'));
|
||||
|
||||
var $attachmentInput = $Attachments.find('.attachmentInput');
|
||||
$attachmentInput.find('.photo').click(function () {
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<tr>
|
||||
<td id="AttachmentsContainer">
|
||||
<div id="Attachments" class="@(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments")">
|
||||
<div class="disco-attachmentUpload-dropTarget">
|
||||
<div class="Disco-AttachmentUpload-DropTarget">
|
||||
<h2>Drop Attachments Here</h2>
|
||||
</div>
|
||||
<div class="attachmentOutput">
|
||||
@@ -44,7 +44,7 @@
|
||||
</div>
|
||||
@if (canAddAttachments)
|
||||
{
|
||||
<div class="disco-attachmentUpload-progress"></div>
|
||||
<div class="Disco-AttachmentUpload-Progress"></div>
|
||||
<div class="attachmentInput clearfix">
|
||||
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
|
||||
</div>
|
||||
@@ -201,8 +201,8 @@
|
||||
//#region Add Attachments
|
||||
var attachmentUploader = new document.Disco.AttachmentUploader(
|
||||
'@(Url.Action(MVC.API.User.AttachmentUpload(Model.User.UserId, null)))',
|
||||
$Attachments.find('.disco-attachmentUpload-dropTarget'),
|
||||
$Attachments.find('.disco-attachmentUpload-progress'));
|
||||
$Attachments.find('.Disco-AttachmentUpload-DropTarget'),
|
||||
$Attachments.find('.Disco-AttachmentUpload-Progress'));
|
||||
|
||||
var $attachmentInput = $Attachments.find('.attachmentInput');
|
||||
$attachmentInput.find('.photo').click(function () {
|
||||
|
||||
@@ -95,7 +95,7 @@ WriteAttribute("class", Tuple.Create(" class=\"", 872), Tuple.Create("\"", 947)
|
||||
|
||||
WriteLiteral(">\r\n <div");
|
||||
|
||||
WriteLiteral(" class=\"disco-attachmentUpload-dropTarget\"");
|
||||
WriteLiteral(" class=\"Disco-AttachmentUpload-DropTarget\"");
|
||||
|
||||
WriteLiteral(">\r\n <h2>Drop Attachments Here</h2>\r\n </" +
|
||||
"div>\r\n <div");
|
||||
@@ -335,7 +335,7 @@ WriteLiteral(" </div>\r\n");
|
||||
#line hidden
|
||||
WriteLiteral(" <div");
|
||||
|
||||
WriteLiteral(" class=\"disco-attachmentUpload-progress\"");
|
||||
WriteLiteral(" class=\"Disco-AttachmentUpload-Progress\"");
|
||||
|
||||
WriteLiteral("></div>\r\n");
|
||||
|
||||
@@ -613,9 +613,9 @@ WriteLiteral("\r\n //#region Add Attachments\r\n
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("\',\r\n $Attachments.find(\'.disco-attachmentUpload-dropTa" +
|
||||
"rget\'),\r\n $Attachments.find(\'.disco-attachmentUpload-" +
|
||||
"progress\'));\r\n\r\n var $attachmentInput = $Attachments.find" +
|
||||
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(\'.photo\').c" +
|
||||
"lick(function () {\r\n attachmentUploader.uploadImage()" +
|
||||
";\r\n });\r\n $attachmentInput.find(\'." +
|
||||
|
||||
Reference in New Issue
Block a user