Browse Source

Change how the results are highlighted

Previously, a result was no longer highlighted when the mouse was
no longer over it. While this was useful for resetting the
highlight automatically, we started doing this when a new result
was highlighted to make sure that we never had multiple options
highlighted.

Now, a result will always be highlighted until the highlight is
removed when the next result is highlighted. While this shouldn't
affect many users, it is closer to how native select boxes work.
This also allows users using keyboard navigation to jump between
mouse and keyboard navigation without the highlight reseting to
the top of the results.
Kevin Brown 10 years ago
parent
commit
cee8c18c23

+ 0 - 7
dist/js/select2.amd.full.js

@@ -511,13 +511,6 @@ define('select2/results',[
         element: $(this)
         element: $(this)
       });
       });
     });
     });
-
-    this.$results.on('mouseleave', '.option', function (evt) {
-      if ($(this).hasClass('highlighted')) {
-        $(this).removeClass('highlighted');
-        self.$results.removeAttr('aria-activedescendant');
-      }
-    });
   };
   };
 
 
   Results.prototype.destroy = function () {
   Results.prototype.destroy = function () {

+ 0 - 7
dist/js/select2.amd.js

@@ -511,13 +511,6 @@ define('select2/results',[
         element: $(this)
         element: $(this)
       });
       });
     });
     });
-
-    this.$results.on('mouseleave', '.option', function (evt) {
-      if ($(this).hasClass('highlighted')) {
-        $(this).removeClass('highlighted');
-        self.$results.removeAttr('aria-activedescendant');
-      }
-    });
   };
   };
 
 
   Results.prototype.destroy = function () {
   Results.prototype.destroy = function () {

+ 0 - 7
dist/js/select2.full.js

@@ -10046,13 +10046,6 @@ define('select2/results',[
         element: $(this)
         element: $(this)
       });
       });
     });
     });
-
-    this.$results.on('mouseleave', '.option', function (evt) {
-      if ($(this).hasClass('highlighted')) {
-        $(this).removeClass('highlighted');
-        self.$results.removeAttr('aria-activedescendant');
-      }
-    });
   };
   };
 
 
   Results.prototype.destroy = function () {
   Results.prototype.destroy = function () {

File diff suppressed because it is too large
+ 0 - 0
dist/js/select2.full.min.js


+ 0 - 7
dist/js/select2.js

@@ -939,13 +939,6 @@ define('select2/results',[
         element: $(this)
         element: $(this)
       });
       });
     });
     });
-
-    this.$results.on('mouseleave', '.option', function (evt) {
-      if ($(this).hasClass('highlighted')) {
-        $(this).removeClass('highlighted');
-        self.$results.removeAttr('aria-activedescendant');
-      }
-    });
   };
   };
 
 
   Results.prototype.destroy = function () {
   Results.prototype.destroy = function () {

File diff suppressed because it is too large
+ 0 - 0
dist/js/select2.min.js


+ 0 - 7
src/js/select2/results.js

@@ -357,13 +357,6 @@ define([
         element: $(this)
         element: $(this)
       });
       });
     });
     });
-
-    this.$results.on('mouseleave', '.option', function (evt) {
-      if ($(this).hasClass('highlighted')) {
-        $(this).removeClass('highlighted');
-        self.$results.removeAttr('aria-activedescendant');
-      }
-    });
   };
   };
 
 
   Results.prototype.destroy = function () {
   Results.prototype.destroy = function () {

Some files were not shown because too many files changed in this diff