Changeset 1130:9d57df031a12

Timestamp:

03/26/13 14:37:00 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Antispam plugin now uses jQuery UI sortable for filters ordering via drag'n'drop

Location:

plugins/antispam

Files:

• antispam.js (modified) (1 diff)
• index.php (modified) (3 diffs)

plugins/antispam/antispam.js

@@ -1 @@
-var dragsort = ToolMan.dragsort();
 $(function() {
-     $("#filters-list").each(function() {
-          dragsort.makeTableSortable(this,dotclear.sortable.setHandle, dotclear.sortable.saveOrder);
+     $("#filters-list").sortable({'cursor':'move'});
+     $("#filters-list tr").hover(function () {
+          $(this).css({'cursor':'move'});
+     }, function () {
+          $(this).css({'cursor':'auto'});
      });
-     $('form input[type=submit][name=delete_all]').click(function(){
-          return window.confirm(dotclear.msg.confirm_spam_delete);
+     $('#filters-form').submit(function() {
+          var order=[];
+          $("#filters-list tr td input.position").each(function() {
+               order.push(this.name.replace(/^f_order\[([^\]]+)\]$/,'$1'));
+          });
+          $("input[name=filters_order]")[0].value = order.join(',');
+          return true;
      });
+     $("#filters-list tr td input.position").hide();
+     $("#filters-list tr td.handle").addClass('handler');
 });
-
-dotclear.sortable = {
-     setHandle: function(item) {
-          var handle = $(item).find('td.handle').get(0);
-          while (handle.firstChild) {
-               handle.removeChild(handle.firstChild);
-          }
-          
-          item.toolManDragGroup.setHandle(handle);
-          $(handle).addClass('handler');
-     },
-     
-     saveOrder: function(item) {
-          var group = item.toolManDragGroup;
-          var order = $('#filters_order').get(0);
-          group.register('dragend', function() {
-               order.value = '';
-               items = item.parentNode.getElementsByTagName('tr');
-               
-               for (var i=0; i<items.length; i++) {
-                    order.value += items[i].id.substr(2)+',';
-               }
-          });
-     }
-};

plugins/antispam/index.php

@@ -108 +108 @@
   </script>
   <?php
-  echo
-  dcPage::jsToolMan().
-  dcPage::jsPageTabs($default_tab);
-  $core->auth->user_prefs->addWorkspace('accessibility'); 
-  $user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
-  if (!$user_dm_nodragdrop) {
-     echo dcPage::jsLoad('index.php?pf=antispam/antispam.js');
+  echo dcPage::jsPageTabs($default_tab);
+  $core->auth->user_prefs->addWorkspace('accessibility');
+  if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+     echo
+          dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+          dcPage::jsLoad('index.php?pf=antispam/antispam.js');
   }
   ?>
@@ -171 +170 @@
      # Filters
      echo
-     '<form action="'.$p_url.'" method="post" class="fieldset">';
+     '<form action="'.$p_url.'" method="post" class="fieldset" id="filters-form">';
 
      if (!empty($_GET['upd'])) {
@@ -202 +201 @@
           echo
           '<tr class="line'.($f->active ? '' : ' offline').'" id="f_'.$fid.'">'.
-          '<td class="handle">'.form::field(array('f_order['.$fid.']'),2,5,(string) $i, '', '', false, 'title="'.__('position').'"').'</td>'.
+          '<td class="handle">'.form::field(array('f_order['.$fid.']'),2,5,(string) $i, 'position', '', false, 'title="'.__('position').'"').'</td>'.
           '<td class="nowrap">'.form::checkbox(array('filters_active[]'),$fid,$f->active, '', '', false, 'title="'.__('Active').'"').'</td>'.
           '<td class="nowrap">'.form::checkbox(array('filters_auto_del[]'),$fid,$f->auto_delete, '', '', false, 'title="'.__('Auto Del.').'"').'</td>'.