diff --git a/resources/js/kt-utility.js b/resources/js/kt-utility.js index 675c8fe..498a13f 100644 --- a/resources/js/kt-utility.js +++ b/resources/js/kt-utility.js @@ -2,15 +2,29 @@ * general utility functions for KT */ -function addEvent(obj, event, func) { +var message; + +function addEvent(obj, event, func, capture) { if (obj.attachEvent) { obj.attachEvent('on'+event, func); } - else { obj.addEventListener(event, func, false); } + else { obj.addEventListener(event, func, capture); } } -function confirmDelete(message) { return confirm(message); } +function confirmDelete(e) { + var v = confirm(message); + if (v == false) { + if (e.stopPropagation) { + e.stopPropagation(); + e.preventDefault(); + } + else if (window.event) + return false; + } + return v; +} -function initDeleteProtection(message) { - var fn = partial(confirmDelete, message); +function initDeleteProtection(m) { + var fn = confirmDelete; + message = m; var elements = getElementsByTagAndClassName('A','ktDelete'); function setClickFunction(fn, node) { @@ -21,13 +35,14 @@ function initDeleteProtection(message) { else { return null; } } - addEvent(node, 'click', fn); + addEvent(node, 'click', fn, true); + } forEach(elements, partial(setClickFunction, fn)); - elements = getElementsByTagAndClassName('SPAN', 'ktDelete'); + //elements = getElementsByTagAndClassName('SPAN', 'ktDelete'); - forEach(elements, partial(setClickFunction, fn)); + //forEach(elements, partial(setClickFunction, fn)); } \ No newline at end of file diff --git a/templates/ktcore/principals/useradmin.smarty b/templates/ktcore/principals/useradmin.smarty index c0d8f95..7c53821 100644 --- a/templates/ktcore/principals/useradmin.smarty +++ b/templates/ktcore/principals/useradmin.smarty @@ -53,8 +53,7 @@ very slow if you have many users).{/i18n}