X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_project.js;h=9e76119e6f8c86437b946a83d42f7fcfb4c13fa7;hb=0c050c7650dd6ce44a6f4d7a5592f979582c427e;hp=fb2285fb6d024e9b97cd492da6d2ecc23b3b0c89;hpb=48e32abf9b0af914d6bad46ce7a45f37a65d9946;p=kivitendo-erp.git

diff --git a/js/autocomplete_project.js b/js/autocomplete_project.js
index fb2285fb6..9e76119e6 100644
--- a/js/autocomplete_project.js
+++ b/js/autocomplete_project.js
@@ -1,4 +1,6 @@
 namespace('kivi', function(k){
+  "use strict";
+
   k.ProjectPicker = function($real, options) {
     // short circuit in case someone double inits us
     if ($real.data("project_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:       'projectpicker-picked',
@@ -56,10 +61,9 @@ namespace('kivi', function(k){
         $real.val('');
         $dummy.val('');
       }
-      state                 = STATES.PICKED;
-      last_real             = $real.val();
-      last_dummy            = $dummy.val();
-      last_unverified_dummy = $dummy.val();
+      state      = STATES.PICKED;
+      last_real  = $real.val();
+      last_dummy = $dummy.val();
 
       $real.trigger('change');
       $real.trigger('set_item:ProjectPicker', item);
@@ -71,10 +75,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();
@@ -83,10 +86,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);
       }
     }
@@ -99,7 +101,7 @@ namespace('kivi', function(k){
         }, ajax_data(function(){ var val = $('#project_picker_filter').val(); return val === undefined ? '' : val })),
         success: function(data){ $('#project_picker_result').html(data) }
       });
-    };
+    }
 
     function result_timer (event) {
       if (!$('no_paginate').prop('checked')) {
@@ -135,7 +137,7 @@ namespace('kivi', function(k){
           annotate_state();
         }
       });
-    };
+    }
 
     $dummy.autocomplete({
       source: function(req, rsp) {
@@ -149,6 +151,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.
@@ -165,7 +171,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) {
@@ -181,7 +187,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;
       }
     });