+
-\r\n
\r\n
+
-
\r\nAre you sure?
+
\r\n \r\n \r\n\r\n \r\n
\r\n
Are you sure?
@@ -74,6 +74,7 @@
var $CommentOutput = $Comments.find('.commentOutput');
var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
var $CommentInput = $Comments.find('textarea.commentInput');
+ var $dialogRemoveLog;
window.setTimeout(function () {
$CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
@@ -93,14 +94,6 @@
});
$CommentOutput.find('span.remove').click(removePost);
- $dialogRemoveLog = $('#dialogRemoveLog');
- $dialogRemoveLog.dialog({
- resizable: false,
- height: 140,
- modal: true,
- autoOpen: false
- });
-
function postComment() {
var comment = $CommentInput.val();
if (comment != '') {
@@ -130,8 +123,16 @@
$this = $(this);
var data = { id: $this.closest('div').attr('data-logid') };
- $dialogRemoveLog.dialog("enable");
- $dialogRemoveLog.dialog('option', 'buttons', {
+ if (!$dialogRemoveLog) {
+ $dialogRemoveLog = $('#dialogRemoveLog').dialog({
+ resizable: false,
+ height: 140,
+ modal: true,
+ autoOpen: false
+ });
+ }
+
+ $dialogRemoveLog.dialog("enable").dialog('option', 'buttons', {
"Remove": function () {
$dialogRemoveLog.dialog("disable");
$dialogRemoveLog.dialog("option", "buttons", null);
@@ -159,9 +160,7 @@
"Cancel": function () {
$dialogRemoveLog.dialog("close");
}
- });
-
- $dialogRemoveLog.dialog('open');
+ }).dialog('open');
return false;
}
@@ -210,30 +209,12 @@
// - Repository notifications now handles this
document.DiscoFunctions.addAttachment = function () { };
- $Attachments = $('#Attachments');
- $attachmentOutput = $Attachments.find('.attachmentOutput');
+ var $Attachments = $('#Attachments');
+ var $attachmentOutput = $Attachments.find('.attachmentOutput');
+ var $dialogUpload, $dialogRemoveAttachment;
$attachmentOutput.find('span.remove').click(removeLocalAttachment);
- $('#dialogUpload').dialog({
- autoOpen: false,
- draggable: false,
- modal: true,
- resizable: false,
- width: 860,
- height: 550,
- close: function () {
- silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
- }
- });
-
- $('#dialogRemoveAttachment').dialog({
- resizable: false,
- height: 140,
- modal: true,
- autoOpen: false
- });
-
var onLoadNavigation = null;
var isLoaded = null;
Silverlight.createObject(
@@ -252,7 +233,7 @@
'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))'
);
- $attachmentInput = $Attachments.find('.attachmentInput');
+ var $attachmentInput = $Attachments.find('.attachmentInput');
$attachmentInput.find('.photo').click(function () {
showDialog('/WebCam');
});
@@ -260,9 +241,22 @@
showDialog('/File');
});
- silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
+ var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) {
- $('#dialogUpload').dialog('open');
+ if (!$dialogUpload) {
+ $dialogUpload = $('#dialogUpload').dialog({
+ autoOpen: false,
+ draggable: false,
+ modal: true,
+ resizable: false,
+ width: 860,
+ height: 550,
+ close: function () {
+ silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
+ }
+ });
+ }
+ $dialogUpload.dialog('open');
if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
} else {
@@ -271,40 +265,41 @@
};
function addAttachment(id, quick) {
var data = { id: id };
+
$.ajax({
url: '@Url.Action(MVC.API.Job.Attachment())',
- dataType: 'json',
- data: data,
- success: function (d) {
- if (d.Result == 'OK') {
- var a = d.Attachment;
+ dataType: 'json',
+ data: data,
+ success: function (d) {
+ if (d.Result == 'OK') {
+ var a = d.Attachment;
- if (parseInt(a.ParentId) == jobId) {
- var e = $('');
+ if (parseInt(a.ParentId) == jobId) {
+ var e = $('
');
- e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
- e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
- e.find('.comments').text(a.Comments);
- e.find('.author').text(a.Author);
- e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
- e.find('.remove').click(removeLocalAttachment);
- if (!quick)
- e.hide();
- $attachmentOutput.append(e);
- if (!quick)
- e.show('slow');
- if (a.MimeType.toLowerCase().indexOf('image/') == 0)
- e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+ e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
+ e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
+ e.find('.comments').text(a.Comments);
+ e.find('.author').text(a.Author);
+ e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
+ e.find('.remove').click(removeLocalAttachment);
+ if (!quick)
+ e.hide();
+ $attachmentOutput.append(e);
+ if (!quick)
+ e.show('slow');
+ if (a.MimeType.toLowerCase().indexOf('image/') == 0)
+ e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
+ }
+ } else {
+ alert('Unable to add attachment: ' + d.Result);
}
- } else {
- alert('Unable to add attachment: ' + d.Result);
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ alert('Unable to add attachment: ' + textStatus);
}
- },
- error: function (jqXHR, textStatus, errorThrown) {
- alert('Unable to add attachment: ' + textStatus);
- }
- });
- }
+ });
+ }
function removeAttachment(id) {
var $element = $attachmentOutput.find('a[data-attachmentid="' + id + '"]');
if ($element.length > 0) {
@@ -321,9 +316,16 @@
var data = { id: $this.attr('data-attachmentid') };
- var $dialogRemoveAttachment = $('#dialogRemoveAttachment');
- $dialogRemoveAttachment.dialog("enable");
- $dialogRemoveAttachment.dialog('option', 'buttons', {
+ if (!$dialogRemoveAttachment) {
+ $dialogRemoveAttachment = $('#dialogRemoveAttachment').dialog({
+ resizable: false,
+ height: 140,
+ modal: true,
+ autoOpen: false
+ });
+ }
+
+ $dialogRemoveAttachment.dialog("enable").dialog('option', 'buttons', {
"Remove": function () {
$dialogRemoveAttachment.dialog("disable");
$dialogRemoveAttachment.dialog("option", "buttons", null);
@@ -354,9 +356,7 @@
"Cancel": function () {
$dialogRemoveAttachment.dialog("close");
}
- });
-
- $dialogRemoveAttachment.dialog('open');
+ }).dialog('open');
return false;
}
@@ -371,30 +371,32 @@
//#region LiveEvents
function liveMessageRecieved(d) {
if (d) {
- switch (d.EntityTypeName) {
- case 'JobAttachment':
- switch (d.EventType) {
- case 0: // Added
- addAttachment(d.EntityKey[0], false);
- break;
- case 1: // Removed
- removeAttachment(d.EntityKey[0]);
- break;
- }
- break;
- case 'JobLog':
- switch (d.EventType) {
- case 0: // Added
- loadLiveComment(d.EntityKey[0]);
- break;
- case 1: // Removed
- $CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () {
- $(this).remove();
- });
- break;
- }
- break;
- }
+ window.setTimeout(function () {
+ switch (d.EntityTypeName) {
+ case 'JobAttachment':
+ switch (d.EventType) {
+ case 0: // Added
+ addAttachment(d.EntityKey[0], false);
+ break;
+ case 1: // Removed
+ removeAttachment(d.EntityKey[0]);
+ break;
+ }
+ break;
+ case 'JobLog':
+ switch (d.EventType) {
+ case 0: // Added
+ loadLiveComment(d.EntityKey[0]);
+ break;
+ case 1: // Removed
+ $CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () {
+ $(this).remove();
+ });
+ break;
+ }
+ break;
+ }
+ }, 100);
}
}
var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))')
diff --git a/Disco.Web/Views/Job/JobParts/Resources.generated.cs b/Disco.Web/Views/Job/JobParts/Resources.generated.cs
index e548c2c5..e49220e4 100644
--- a/Disco.Web/Views/Job/JobParts/Resources.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/Resources.generated.cs
@@ -375,6 +375,8 @@ WriteLiteral(">\r\n
\r\n
\r\n ');
+ if (parseInt(a.ParentId) == jobId) {
+ var e = $('
');
- e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
+ e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
- #line 285 "..\..\Views\Job\JobParts\Resources.cshtml"
- Write(Url.Action(MVC.API.Job.AttachmentDownload()));
+ #line 280 "..\..\Views\Job\JobParts\Resources.cshtml"
+ Write(Url.Action(MVC.API.Job.AttachmentDownload()));
#line default
#line hidden
-WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
+WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
- #line 286 "..\..\Views\Job\JobParts\Resources.cshtml"
- Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
+ #line 281 "..\..\Views\Job\JobParts\Resources.cshtml"
+ Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
#line default
#line hidden
-WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments);\r\n " +
-" e.find(\'.author\').text(a.Author);\r\n " +
-" e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', a.TimestampF" +
-"ull);\r\n e.find(\'.remove\').click(removeLocalAttachment" +
-");\r\n if (!quick)\r\n e.h" +
-"ide();\r\n $attachmentOutput.append(e);\r\n " +
-" if (!quick)\r\n e.show(\'slow\');\r\n " +
-" if (a.MimeType.toLowerCase().indexOf(\'image/\') == 0)\r\n " +
-" e.shadowbox({ gallery: \'attachments\', player: \'img" +
-"\', title: a.Comments });\r\n }\r\n } else " +
-"{\r\n alert(\'Unable to add attachment: \' + d.Result);\r\n " +
-" }\r\n },\r\n error: function (jqXHR, t" +
-"extStatus, errorThrown) {\r\n alert(\'Unable to add attachment: " +
-"\' + textStatus);\r\n }\r\n });\r\n }\r\n functio" +
-"n removeAttachment(id) {\r\n var $element = $attachmentOutput.find(\'a[d" +
-"ata-attachmentid=\"\' + id + \'\"]\');\r\n if ($element.length > 0) {\r\n " +
-" $element.hide(300).delay(300).queue(function () {\r\n " +
-" if ($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " +
-" Shadowbox.removeCache(this);\r\n $element.r" +
-"emove();\r\n });\r\n }\r\n }\r\n\r\n function remo" +
-"veLocalAttachment() {\r\n $this = $(this).closest(\'a\');\r\n\r\n " +
-"var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r\n var $dialogRe" +
-"moveAttachment = $(\'#dialogRemoveAttachment\');\r\n $dialogRemoveAttachm" +
-"ent.dialog(\"enable\");\r\n $dialogRemoveAttachment.dialog(\'option\', \'but" +
-"tons\', {\r\n \"Remove\": function () {\r\n $dialogRe" +
-"moveAttachment.dialog(\"disable\");\r\n $dialogRemoveAttachment.d" +
-"ialog(\"option\", \"buttons\", null);\r\n $.ajax({\r\n " +
-" url: \'");
+WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments)" +
+";\r\n e.find(\'.author\').text(a.Author);\r\n " +
+" e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', " +
+"a.TimestampFull);\r\n e.find(\'.remove\').click(remov" +
+"eLocalAttachment);\r\n if (!quick)\r\n " +
+" e.hide();\r\n $attachmentOutpu" +
+"t.append(e);\r\n if (!quick)\r\n " +
+" e.show(\'slow\');\r\n if (a.MimeType.t" +
+"oLowerCase().indexOf(\'image/\') == 0)\r\n e.shad" +
+"owbox({ gallery: \'attachments\', player: \'img\', title: a.Comments });\r\n " +
+" }\r\n } else {\r\n " +
+" alert(\'Unable to add attachment: \' + d.Result);\r\n }\r\n " +
+" },\r\n error: function (jqXHR, textStatus, e" +
+"rrorThrown) {\r\n alert(\'Unable to add attachment: \' + text" +
+"Status);\r\n }\r\n });\r\n }\r\n fun" +
+"ction removeAttachment(id) {\r\n var $element = $attachmentOutput.find(" +
+"\'a[data-attachmentid=\"\' + id + \'\"]\');\r\n if ($element.length > 0) {\r\n " +
+" $element.hide(300).delay(300).queue(function () {\r\n " +
+" if ($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n" +
+" Shadowbox.removeCache(this);\r\n $eleme" +
+"nt.remove();\r\n });\r\n }\r\n }\r\n\r\n function " +
+"removeLocalAttachment() {\r\n $this = $(this).closest(\'a\');\r\n\r\n " +
+" var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r\n if (!$dia" +
+"logRemoveAttachment) {\r\n $dialogRemoveAttachment = $(\'#dialogRemo" +
+"veAttachment\').dialog({\r\n resizable: false,\r\n " +
+" height: 140,\r\n modal: true,\r\n autoOpen" +
+": false\r\n });\r\n }\r\n\r\n $dialogRemoveAttachme" +
+"nt.dialog(\"enable\").dialog(\'option\', \'buttons\', {\r\n \"Remove\": fun" +
+"ction () {\r\n $dialogRemoveAttachment.dialog(\"disable\");\r\n " +
+" $dialogRemoveAttachment.dialog(\"option\", \"buttons\", null);\r\n " +
+" $.ajax({\r\n url: \'");
- #line 331 "..\..\Views\Job\JobParts\Resources.cshtml"
+ #line 333 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentRemove()));
@@ -734,32 +750,34 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
"to remove attachment: \' + textStatus);\r\n $dialogRemov" +
"eAttachment.dialog(\"close\");\r\n }\r\n });" +
"\r\n },\r\n \"Cancel\": function () {\r\n " +
-" $dialogRemoveAttachment.dialog(\"close\");\r\n }\r\n });\r" +
-"\n\r\n $dialogRemoveAttachment.dialog(\'open\');\r\n\r\n return fal" +
-"se;\r\n }\r\n\r\n $attachmentOutput.children(\'a\').each(function () {\r\n " +
-" $this = $(this);\r\n if ($this.attr(\'data-mimetype\').toLowerC" +
-"ase().indexOf(\'image/\') == 0)\r\n $this.shadowbox({ gallery: \'attac" +
-"hments\', player: \'img\', title: $this.find(\'.comments\').text() });\r\n });\r\n" +
-" //#endregion\r\n\r\n //#region LiveEvents\r\n function liveMessa" +
-"geRecieved(d) {\r\n if (d) {\r\n switch (d.EntityTypeName)" +
-" {\r\n case \'JobAttachment\':\r\n switch (d" +
-".EventType) {\r\n case 0: // Added\r\n " +
-" addAttachment(d.EntityKey[0], false);\r\n " +
-" break;\r\n case 1: // Removed\r\n " +
-" removeAttachment(d.EntityKey[0]);\r\n b" +
-"reak;\r\n }\r\n break;\r\n " +
-" case \'JobLog\':\r\n switch (d.EventType) {\r\n " +
-" case 0: // Added\r\n loadLiveComm" +
-"ent(d.EntityKey[0]);\r\n break;\r\n " +
-" case 1: // Removed\r\n $CommentOutput.chi" +
-"ldren(\'div[data-logid=\"\' + d.EntityKey[0] + \'\"]\').slideUp(300).delay(300).queue(" +
-"function () {\r\n $(this).remove();\r\n " +
-" });\r\n break;\r\n " +
-" }\r\n break;\r\n }\r\n }\r\n" +
-" }\r\n var liveMessagesConnection = $.connection(\'");
+" $dialogRemoveAttachment.dialog(\"close\");\r\n }\r\n }).d" +
+"ialog(\'open\');\r\n\r\n return false;\r\n }\r\n\r\n $attachmentOut" +
+"put.children(\'a\').each(function () {\r\n $this = $(this);\r\n " +
+"if ($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " +
+" $this.shadowbox({ gallery: \'attachments\', player: \'img\', title: $this.fin" +
+"d(\'.comments\').text() });\r\n });\r\n //#endregion\r\n\r\n //#regio" +
+"n LiveEvents\r\n function liveMessageRecieved(d) {\r\n if (d) {\r\n " +
+" window.setTimeout(function () {\r\n switch (d.En" +
+"tityTypeName) {\r\n case \'JobAttachment\':\r\n " +
+" switch (d.EventType) {\r\n case 0: // A" +
+"dded\r\n addAttachment(d.EntityKey[0], false);\r" +
+"\n break;\r\n cas" +
+"e 1: // Removed\r\n removeAttachment(d.EntityKe" +
+"y[0]);\r\n break;\r\n " +
+"}\r\n break;\r\n case \'JobLog\':\r\n " +
+" switch (d.EventType) {\r\n " +
+" case 0: // Added\r\n loadLiveComment(d.Entit" +
+"yKey[0]);\r\n break;\r\n " +
+" case 1: // Removed\r\n $CommentOutput.ch" +
+"ildren(\'div[data-logid=\"\' + d.EntityKey[0] + \'\"]\').slideUp(300).delay(300).queue" +
+"(function () {\r\n $(this).remove();\r\n " +
+" });\r\n break;\r\n" +
+" }\r\n break;\r\n " +
+" }\r\n }, 100);\r\n }\r\n }\r\n var liveMe" +
+"ssagesConnection = $.connection(\'");
- #line 400 "..\..\Views\Job\JobParts\Resources.cshtml"
+ #line 402 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications"));
diff --git a/Disco.Web/packages.config b/Disco.Web/packages.config
index afde9aae..51e1869f 100644
--- a/Disco.Web/packages.config
+++ b/Disco.Web/packages.config
@@ -10,6 +10,11 @@