From 392de396dfff91ad496912252079a0ed70c7b0b0 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 23 Apr 2014 12:59:28 +1000 Subject: [PATCH] Bug Fix: Pointer/Touch events triggered navigate When using touch the anchor navigates immediately even though the Click event has preventDefault() --- Disco.Web/Views/Job/JobParts/Queues.cshtml | 2 +- .../Views/Job/JobParts/Queues.generated.cs | 71 +++++++++++-------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/Disco.Web/Views/Job/JobParts/Queues.cshtml b/Disco.Web/Views/Job/JobParts/Queues.cshtml index 056b435f..41fce8f4 100644 --- a/Disco.Web/Views/Job/JobParts/Queues.cshtml +++ b/Disco.Web/Views/Job/JobParts/Queues.cshtml @@ -75,7 +75,7 @@ } else if (jq.Item1.CanRemove()) { - @Html.ActionLinkSmallButton("Remove", MVC.API.JobQueueJob.RemoveJob(jq.Item1.Id, null), null, (jq.Item1.CanCloseJobNormallyAfterRemoved() ? "remove canCloseNormally" : "remove")) + Remove } else { diff --git a/Disco.Web/Views/Job/JobParts/Queues.generated.cs b/Disco.Web/Views/Job/JobParts/Queues.generated.cs index 951534db..6b6cf09d 100644 --- a/Disco.Web/Views/Job/JobParts/Queues.generated.cs +++ b/Disco.Web/Views/Job/JobParts/Queues.generated.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34011 +// Runtime Version:4.0.30319.34014 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -470,20 +470,31 @@ WriteLiteral("\r\n"); } else if (jq.Item1.CanRemove()) { - - - #line default - #line hidden - - #line 78 "..\..\Views\Job\JobParts\Queues.cshtml" - Write(Html.ActionLinkSmallButton("Remove", MVC.API.JobQueueJob.RemoveJob(jq.Item1.Id, null), null, (jq.Item1.CanCloseJobNormallyAfterRemoved() ? "remove canCloseNormally" : "remove"))); #line default #line hidden +WriteLiteral(" (jq.Item1.CanCloseJobNormallyAfterRemoved() ? "canCloseNormally" : null + + #line default + #line hidden +, 3973), false) +); + +WriteLiteral(">Remove\r\n"); + + + #line 79 "..\..\Views\Job\JobParts\Queues.cshtml" } else { @@ -506,29 +517,29 @@ WriteLiteral(">In Progress\r\n"); #line hidden WriteLiteral(" \r\n (overdue ? "overdue" : null +, Tuple.Create(Tuple.Create(" ", 4279), Tuple.Create(overdue ? "overdue" : null #line default #line hidden -, 4334), false) +, 4280), false) #line 85 "..\..\Views\Job\JobParts\Queues.cshtml" -, Tuple.Create(Tuple.Create(" ", 4363), Tuple.Create(jq.Item1.CanEditSla() ? "canEditSLA" : null +, Tuple.Create(Tuple.Create(" ", 4309), Tuple.Create(jq.Item1.CanEditSla() ? "canEditSLA" : null #line default #line hidden -, 4364), false) +, 4310), false) #line 85 "..\..\Views\Job\JobParts\Queues.cshtml" - , Tuple.Create(Tuple.Create(" ", 4410), Tuple.Create(jq.Item1.CanEditPriority() ? "canEditPriority" : null + , Tuple.Create(Tuple.Create(" ", 4356), Tuple.Create(jq.Item1.CanEditPriority() ? "canEditPriority" : null #line default #line hidden -, 4411), false) +, 4357), false) ); WriteLiteral(" data-priority=\""); @@ -586,28 +597,28 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (jq.Item1.Priority.ToString().ToLower() +, Tuple.Create(Tuple.Create("", 4809), Tuple.Create(jq.Item1.Priority.ToString().ToLower() #line default #line hidden -, 4863), false) +, 4809), false) ); -WriteAttribute("title", Tuple.Create(" title=\"", 4905), Tuple.Create("\"", 4957) +WriteAttribute("title", Tuple.Create(" title=\"", 4851), Tuple.Create("\"", 4903) #line 90 "..\..\Views\Job\JobParts\Queues.cshtml" - , Tuple.Create(Tuple.Create("", 4913), Tuple.Create(jq.Item1.Priority.ToString() + , Tuple.Create(Tuple.Create("", 4859), Tuple.Create(jq.Item1.Priority.ToString() #line default #line hidden -, 4913), false) -, Tuple.Create(Tuple.Create(" ", 4944), Tuple.Create("Job", 4945), true) -, Tuple.Create(Tuple.Create(" ", 4948), Tuple.Create("Priority", 4949), true) +, 4859), false) +, Tuple.Create(Tuple.Create(" ", 4890), Tuple.Create("Job", 4891), true) +, Tuple.Create(Tuple.Create(" ", 4894), Tuple.Create("Priority", 4895), true) ); WriteLiteral(">\r\n"); @@ -998,14 +1009,14 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (priorityItem +, Tuple.Create(Tuple.Create("", 8694), Tuple.Create(priorityItem #line default #line hidden -, 8748), false) +, 8694), false) ); WriteLiteral(">");