X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_chart.js;h=c3d4cbd2ef4220a7661f914cfa73d5e76aa0785e;hb=42985d5fd1375d137ddcb32b2601fa7b0f98f042;hp=557b94557edf72848a7f450e215ffb7a09db0df6;hpb=b3c6dbe164451c917298f6e72f92a040426a3a00;p=kivitendo-erp.git

diff --git a/js/autocomplete_chart.js b/js/autocomplete_chart.js
index 557b94557..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,7 @@ namespace('kivi', function(k){
 
     function close_popup() {
       $('#chart_selection').dialog('close');
-    };
+    }
 
     function handle_changed_text(callbacks) {
       $.ajax({
@@ -183,7 +185,7 @@ namespace('kivi', function(k){
           annotate_state();
         }
       });
-    };
+    }
 
     $dummy.autocomplete({
       source: function(req, rsp) {
@@ -198,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.
@@ -214,7 +220,7 @@ 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) {
@@ -231,7 +237,7 @@ namespace('kivi', function(k){
           });
           return false;
         }
-      } else {
+      } else if ((event.which != KEY.SHIFT) && (event.which != KEY.CTRL) && (event.which != KEY.ALT)) {
         state = STATES.UNDEFINED;
       }
     });
@@ -248,11 +254,9 @@ namespace('kivi', function(k){
     });
 
     // 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 },