- fix a ... very annoying bug in firefox (return false) handling.

- don't duplicate javascript. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4811 c91229c3-7414-0410-bfa2-8a42b809f60b

- fix a ... very annoying bug in firefox (return false) handling.
- don't duplicate javascript. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4811 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 6a288fbe
Showing 2 changed files with 24 additions and 10 deletions
resources/js/kt-utility.js
templates/ktcore/principals/useradmin.smarty
@@ -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
@@ -53,8 +53,7 @@ very slow if you have many users).{/i18n}&lt;/p&gt;
         <td>{$oUser->getName()}</td>
         <td>{$oUser->getUsername()}</td>
         <td><a href="{addQS}action=editUser&user_id={$oUser->getId()}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
-        <td><a onclick="javascript:return confirm('{i18n}Are you sure
-you wish to delete this user?{/i18n}');" href="{addQS}action=deleteuser&user_id={$oUser->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
+        <td><a href="{addQS}action=deleteuser&user_id={$oUser->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
         <td><a href="{addQS}action=editgroups&user_id={$oUser->getId()}{/addQS}">{i18n}Groups{/i18n}</a></td>  
      </tr>   
      {/foreach}