X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_chart.js;fp=js%2Fautocomplete_chart.js;h=c3d4cbd2ef4220a7661f914cfa73d5e76aa0785e;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=2caabf70045307e9e517196af1b4c679f4d0e6e7;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;p=kivitendo-erp.git

diff --git a/js/autocomplete_chart.js b/js/autocomplete_chart.js
index 2caabf700..c3d4cbd2e 100644
--- a/js/autocomplete_chart.js
+++ b/js/autocomplete_chart.js
@@ -1,4 +1,6 @@
 namespace('kivi', function(k){
+  "use strict";
+
   k.ChartPicker = function($real, options) {
     // short circuit in case someone double inits us
     if ($real.data("chart_picker"))
@@ -12,6 +14,9 @@ namespace('kivi', function(k){
       RIGHT:  39,
       PAGE_UP: 33,
       PAGE_DOWN: 34,
+      SHIFT:     16,
+      CTRL:      17,
+      ALT:       18,
     };
     var CLASSES = {
       PICKED:       'chartpicker-picked',
@@ -94,7 +99,6 @@ namespace('kivi', function(k){
       state = STATES.PICKED;
       last_real = $real.val();
       last_dummy = $dummy.val();
-      last_unverified_dummy = $dummy.val();
       $real.trigger('change');
 
       if (o.fat_set_item && item.id) {
@@ -115,10 +119,9 @@ namespace('kivi', function(k){
       if (state == STATES.PICKED) {
         annotate_state();
         return true
-      } else if (state == STATES.UNDEFINED && $dummy.val() == '')
+      } else if (state == STATES.UNDEFINED && $dummy.val() === '')
         set_item({})
       else {
-        last_unverified_dummy = $dummy.val();
         set_item({ id: last_real, name: last_dummy })
       }
       annotate_state();
@@ -127,10 +130,9 @@ namespace('kivi', function(k){
     function annotate_state () {
       if (state == STATES.PICKED)
         $dummy.removeClass(STATES.UNDEFINED).addClass(STATES.PICKED);
-      else if (state == STATES.UNDEFINED && $dummy.val() == '')
+      else if (state == STATES.UNDEFINED && $dummy.val() === '')
         $dummy.removeClass(STATES.UNDEFINED).addClass(STATES.PICKED);
       else {
-        last_unverified_dummy = $dummy.val();
         $dummy.addClass(STATES.UNDEFINED).removeClass(STATES.PICKED);
       }
     }
@@ -143,7 +145,7 @@ namespace('kivi', function(k){
         }, ajax_data(function(){ var val = $('#chart_picker_filter').val(); return val === undefined ? '' : val })),
         success: function(data){ $('#chart_picker_result').html(data) }
       });
-    };
+    }
 
     function result_timer (event) {
       if (!$('hide_chart_details').prop('checked')) {
@@ -162,7 +164,28 @@ namespace('kivi', function(k){
 
     function close_popup() {
       $('#chart_selection').dialog('close');
-    };
+    }
+
+    function handle_changed_text(callbacks) {
+      $.ajax({
+        url: 'controller.pl?action=Chart/ajax_autocomplete',
+        dataType: "json",
+        data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),
+        success: function (data) {
+          if (data.length == 1) {
+            set_item(data[0]);
+            if (callbacks && callbacks.match_one) callbacks.match_one(data[0]);
+          } else if (data.length > 1) {
+            state = STATES.UNDEFINED;
+            if (callbacks && callbacks.match_many) callbacks.match_many(data);
+          } else {
+            state = STATES.UNDEFINED;
+            if (callbacks &&callbacks.match_none) callbacks.match_none();
+          }
+          annotate_state();
+        }
+      });
+    }
 
     $dummy.autocomplete({
       source: function(req, rsp) {
@@ -177,6 +200,10 @@ namespace('kivi', function(k){
       select: function(event, ui) {
         set_item(ui.item);
       },
+      search: function(event, ui) {
+        if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))
+          event.preventDefault();
+      }
     });
     /*  In case users are impatient and want to skip ahead:
      *  Capture <enter> key events and check if it's a unique hit.
@@ -193,48 +220,43 @@ namespace('kivi', function(k){
     $dummy.keydown(function(event){
       if (event.which == KEY.ENTER || event.which == KEY.TAB) {
         // if string is empty assume they want to delete
-        if ($dummy.val() == '') {
+        if ($dummy.val() === '') {
           set_item({});
           return true;
         } else if (state == STATES.PICKED) {
           return true;
         }
-        if (event.which == KEY.TAB) event.preventDefault();
-        $.ajax({
-          url: 'controller.pl?action=Chart/ajax_autocomplete',
-          dataType: "json",
-          data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),
-          success: function (data) {
-            if (data.length == 1) {
-              set_item(data[0]);
-              if (event.which == KEY.ENTER)
-                $('#update_button').click();
-            } else if (data.length > 1) {
-             if (event.which == KEY.ENTER)
-                open_dialog();
-            } else {
-            }
-            annotate_state();
-          }
-        });
-        if (event.which == KEY.ENTER)
+        if (event.which == KEY.TAB) {
+          event.preventDefault();
+          handle_changed_text();
+        }
+        if (event.which == KEY.ENTER) {
+          handle_changed_text({
+            match_one:  function(){$('#update_button').click();},
+            match_many: function(){open_dialog();}
+          });
           return false;
-      } else {
+        }
+      } else if ((event.which != KEY.SHIFT) && (event.which != KEY.CTRL) && (event.which != KEY.ALT)) {
         state = STATES.UNDEFINED;
       }
     });
 
+    $dummy.on('paste', function(){
+      setTimeout(function() {
+        handle_changed_text();
+      }, 1);
+    });
+
     $dummy.blur(function(){
       window.clearTimeout(timer);
       timer = window.setTimeout(annotate_state, 100);
     });
 
     // now add a picker div after the original input
-    var pcont  = $('<span>').addClass('position-absolute');
-    var picker = $('<div>');
-    $dummy.after(pcont);
-    pcont.append(picker);
-    picker.addClass('icon16 search').click(open_dialog);
+    var popup_button = $('<span>').addClass('cpc_popup_button');
+    $dummy.after(popup_button);
+    popup_button.click(open_dialog);
 
     var cp = {
       real:           function() { return $real },