From 3632388c3f585dc6f301ee95e29fecab7e094f1d Mon Sep 17 00:00:00 2001 From: Eileen Date: Sat, 28 Sep 2013 05:13:47 -0400 Subject: [PATCH] CRM-13379 fix merge bug --- templates/CRM/Contact/Form/Task/EmailCommon.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js index acbb4c49d6..1c4dfa0f02 100644 --- a/templates/CRM/Contact/Form/Task/EmailCommon.js +++ b/templates/CRM/Contact/Form/Task/EmailCommon.js @@ -2,17 +2,4 @@ cj(function ($) { //do not copy & paste this - find a way to generalise it 'use strict'; $().crmAccordions(); -<<<<<<< HEAD - // NOTE: Might be safer to say $('[name=_qf_Email_upload]') - $('.form-submit').not('.cancel').on("click", function() { - $('.form-submit').not('.cancel').attr({value: ts('Processing')}); - // CRM-13449 : setting a 0 ms timeout is needed - // for some browsers like chrome. Used for purpose of - // submit the form and stop accidental multiple clicks - setTimeout(function(){ - $('.form-submit').not('.cancel').attr({disabled: 'disabled'}); - }, 0); - }); -======= ->>>>>>> CRM-13379 js, contribution form - generalise button double submit protection and add to contribution.main to prevent double submits where people have no confirm page }); -- 2.25.1