From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 11 May 2011 10:41:19 +0000 (+0200)
Subject: Verbesserte Kompatibilität mit Opera, FireFox, InternetExplorer bei Drag & Drop
X-Git-Tag: release-2.6.3~25^2~63
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1b522616312493ada2474275859ca9a9d79a40bb;p=kivitendo-erp.git

Verbesserte Kompatibilität mit Opera, FireFox, InternetExplorer bei Drag & Drop

Wenn Textauswahl mit ".disableSelection()" deaktiviert ist, so kann
man bei den genannten Browsern Text-Eingabefelder nicht mehr
anklicken.

Statt dessen sind nun nur noch die Pfeile drag&drop-bar, der Rest der
Zeile nicht mehr.
---

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index d6c8ca2b7..5a59e025d 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -400,10 +400,11 @@ sub sortable_element {
   my ($self, $selector, @slurp) = @_;
   my %params                    = _hashify(@slurp);
 
-  my %attributes = ( helper => <<JAVASCRIPT );
+  my %attributes = ( distance => 5,
+                     helper   => <<'JAVASCRIPT' );
     function(event, ui) {
       ui.children().each(function() {
-        \$(this).width(\$(this).width());
+        $(this).width($(this).width());
       });
       return ui;
     }
@@ -422,12 +423,14 @@ JAVASCRIPT
 JAVASCRIPT
   }
 
+  $attributes{handle} = "'$params{handle}'" if $params{handle};
+
   my $attr_str = join(', ', map { "${_}: $attributes{$_}" } keys %attributes);
 
   my $code = <<JAVASCRIPT;
 <script type="text/javascript">
   \$(function() {
-    \$( "${selector}" ).sortable({ ${attr_str} }).disableSelection();
+    \$( "${selector}" ).sortable({ ${attr_str} })
   });
 </script>
 JAVASCRIPT
@@ -676,6 +679,13 @@ C<$params{as}> or, missing that, C<$params{with}>.
 Sets the POST parameter name for AJAX request after dropping an
 element (see C<$params{with}>).
 
+=item C<handle>
+
+An optional jQuery selector specifying which part of the child element
+is dragable. If nothing is given then the whole child element is
+dragable, and clicks through to underlying elements like inputs or
+links might not work.
+
 =back
 
 Example:
diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html
index 4d3b3e3e0..9d228d5da 100644
--- a/templates/webpages/am/edit_units.html
+++ b/templates/webpages/am/edit_units.html
@@ -100,7 +100,7 @@
   <tbody>
   [% FOREACH row = UNITS %]
    <tr class="listrow[% loop.count % 2 %]" id="unit_id_[% row.id %]">
-    <td align="center"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
+    <td align="center" class="dragdrop"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
     [% IF row.in_use %]
      <td>
       <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
@@ -145,7 +145,7 @@
 
  </form>
 
- [% L.sortable_element('#unit_list tbody', 'url' => 'controller.pl?action=Unit/reorder', 'with' => 'unit_id') %]
+ [% L.sortable_element('#unit_list tbody', 'url' => 'controller.pl?action=Unit/reorder', 'with' => 'unit_id', handle => '.dragdrop') %]
 
 </body>
 </html>
diff --git a/templates/webpages/am/list_price_factors.html b/templates/webpages/am/list_price_factors.html
index 4c81bbb11..c220a8dd0 100644
--- a/templates/webpages/am/list_price_factors.html
+++ b/templates/webpages/am/list_price_factors.html
@@ -19,7 +19,7 @@
 
    [% FOREACH factor = PRICE_FACTORS %]
    <tr class="listrow[% loop.count % 2 %]" id="price_factor_id_[% factor.id %]">
-    <td align="center"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
+    <td align="center" class="dragdrop"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
     <td><a href="[% url_base %]&action=edit_price_factor&id=[% HTML.url(factor.id) %]">[% HTML.escape(factor.description) %]</a></td>
     <td>[% HTML.escape(factor.factor) %]</td>
    </tr>
@@ -38,7 +38,7 @@
   </form>
  </p>
 
- [% L.sortable_element('#price_factor_list tbody', 'url' => 'controller.pl?action=PriceFactor/reorder', 'with' => 'price_factor_id') %]
+ [% L.sortable_element('#price_factor_list tbody', 'url' => 'controller.pl?action=PriceFactor/reorder', 'with' => 'price_factor_id', handle => '.dragdrop') %]
 
 </body>
 </html>
diff --git a/templates/webpages/am/list_warehouses.html b/templates/webpages/am/list_warehouses.html
index e47e7c241..b791e7de8 100644
--- a/templates/webpages/am/list_warehouses.html
+++ b/templates/webpages/am/list_warehouses.html
@@ -20,7 +20,7 @@
 
    [% FOREACH warehouse = WAREHOUSES %]
    <tr class="listrow[% loop.count % 2 %]" id="warehouse_id_[% warehouse.id %]">
-    <td align="center"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
+    <td align="center" class="dragdrop"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
     <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
     <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
     <td>[% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
@@ -39,7 +39,7 @@
   </form>
  </p>
 
- [% L.sortable_element('#warehouse_list tbody', 'url' => 'controller.pl?action=Warehouse/reorder', 'with' => 'warehouse_id') %]
+ [% L.sortable_element('#warehouse_list tbody', 'url' => 'controller.pl?action=Warehouse/reorder', 'with' => 'warehouse_id', handle => '.dragdrop') %]
 
 </body>
 </html>
diff --git a/templates/webpages/amcvar/list_cvar_configs.html b/templates/webpages/amcvar/list_cvar_configs.html
index 7652a01d6..b2e4b9ab8 100644
--- a/templates/webpages/amcvar/list_cvar_configs.html
+++ b/templates/webpages/amcvar/list_cvar_configs.html
@@ -39,7 +39,7 @@
 
     [%- FOREACH cfg = CONFIGS %]
     <tr class="listrow[% loop.count % 2 %]" id="cvarcfg_id_[% cfg.id %]">
-     <td align="center"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
+     <td align="center" class="dragdrop"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
 
      <td>
       <a href="amcvar.pl?action=edit_cvar_config&module=[% HTML.url(module) %]&id=[% HTML.url(cfg.id) %]&callback=[% HTML.url(callback) %]">
@@ -89,7 +89,7 @@
   </p>
  </form>
 
- [% L.sortable_element('#cvarcfg_list tbody', 'url' => 'controller.pl?action=CustomVariableConfig/reorder', 'with' => 'cvarcfg_id') %]
+ [% L.sortable_element('#cvarcfg_list tbody', 'url' => 'controller.pl?action=CustomVariableConfig/reorder', 'with' => 'cvarcfg_id', handle => '.dragdrop') %]
 
 </body>
 </html>