X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_part.js;h=04af286b2d8950859b5c9196671775a232d2ed09;hb=ad0096b7c71511665bdf9fec9f3ecaae638072cd;hp=b9ef3e92476cd7f0cb60d1db8ebb62f6eb90bcba;hpb=df33875fc30c508b60af9421d0061e66cdc0d55a;p=kivitendo-erp.git

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index b9ef3e924..04af286b2 100644
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -1,6 +1,14 @@
 namespace('kivi', function(k){
-  k.PartPickerCache = { }
   k.PartPicker = function($real, options) {
+    // short circuit in case someone double inits us
+    if ($real.data("part_picker"))
+      return $real.data("part_picker");
+
+    var KEY = {
+      ESCAPE: 27,
+      ENTER:  13,
+      TAB:    9,
+    };
     var o = $.extend({
       limit: 20,
       delay: 50,
@@ -18,16 +26,20 @@ namespace('kivi', function(k){
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();
-    var open_dialog = function(){
-      open_jqm_window({
+    var timer;
+
+    function open_dialog () {
+      k.popup_dialog({
         url: 'controller.pl?action=Part/part_picker_search',
         data: $.extend({
           real_id: real_id,
         }, ajax_data($dummy.val())),
         id: 'part_selection',
+        dialog: { title: k.t8('Part picker') }
       });
+      window.clearTimeout(timer);
       return true;
-    };
+    }
 
     function ajax_data(term) {
       var data = {
@@ -81,8 +93,13 @@ namespace('kivi', function(k){
       });
     };
 
+    function result_timer (event) {
+      window.clearTimeout(timer);
+      timer = window.setTimeout(update_results, 100);
+    }
+
     function close_popup() {
-      $('#part_selection').jqmClose()
+      $('#part_selection').dialog('close');
     };
 
     $dummy.autocomplete({
@@ -106,8 +123,14 @@ namespace('kivi', function(k){
      *  to fire a tab event later on, so we'd have to reimplement the "find
      *  next active element in tabindex order and focus it".
      */
-    $dummy.keypress(function(event){
-      if (event.keyCode == 13 || event.keyCode == 9) { // enter or tab or tab
+    /* note:
+     *  event.which does not contain tab events in keypressed in firefox but will report 0
+     *  chrome does not fire keypressed at all on tab or escape
+     *  TODO: users expect tab to work on keydown but enter to trigger on keyup,
+     *        should be handled seperately
+     */
+    $dummy.keydown(function(event){
+      if (event.which == KEY.ENTER || event.which == KEY.TAB) { // enter or tab or tab
         // if string is empty assume they want to delete
         if ($dummy.val() == '') {
           set_item({});
@@ -122,27 +145,30 @@ namespace('kivi', function(k){
           success: function (data){
             if (data.length == 1) {
               set_item(data[0]);
-              if (event.keyCode == 13)
+              if (event.which == KEY.ENTER)
                 $('#update_button').click();
             } else if (data.length > 1) {
-             if (event.keyCode == 13)
+             if (event.which == KEY.ENTER)
                 open_dialog();
               else
                 make_defined_state();
             } else {
-              if (event.keyCode == 9)
+              if (event.which == KEY.TAB)
                 make_defined_state();
             }
           }
         });
-        if (event.keyCode == 13)
+        if (event.which == KEY.ENTER)
           return false;
       } else {
         state = STATES.UNDEFINED;
       }
     });
 
-//    $dummy.blur(make_defined_state);  // blur triggers also on open_jqm_dialog
+    $dummy.blur(function(){
+      window.clearTimeout(timer);
+      timer = window.setTimeout(make_defined_state, 100);
+    });
 
     // now add a picker div after the original input
     var pcont  = $('<span>').addClass('position-absolute');
@@ -151,7 +177,7 @@ namespace('kivi', function(k){
     pcont.append(picker);
     picker.addClass('icon16 CRM--Schnellsuche').click(open_dialog);
 
-    return {
+    var pp = {
       real:           function() { return $real },
       dummy:          function() { return $dummy },
       type:           function() { return $type },
@@ -159,6 +185,7 @@ namespace('kivi', function(k){
       convertible_unit: function() { return $convertible_unit },
       column:         function() { return $column },
       update_results: update_results,
+      result_timer:   result_timer,
       set_item:       set_item,
       reset:          make_defined_state,
       init_results:    function () {
@@ -172,19 +199,21 @@ namespace('kivi', function(k){
             return true;
           });
         });
-        $('#part_selection').keypress(function(e){
-           if (e.keyCode == 27) { // escape
+        $('#part_selection').keydown(function(e){
+           if (e.which == KEY.ESCAPE) {
              close_popup();
              $dummy.focus();
            }
         });
       }
     }
+    $real.data('part_picker', pp);
+    return pp;
   }
 });
 
 $(function(){
   $('input.part_autocomplete').each(function(i,real){
-    kivi.PartPickerCache[real.id] = new kivi.PartPicker($(real));
+    kivi.PartPicker($(real));
   })
 });