瀏覽代碼

Merge pull request #2001 from arendjr/master

Don't rely on :visible and :not(..., ...) selectors which only work with Sizzle
Kevin Brown 11 年之前
父節點
當前提交
e559f92c35
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      select2.js

+ 3 - 2
select2.js

@@ -272,7 +272,8 @@ the specific language governing permissions and limitations under the Apache Lic
 
             /* make sure el received focus so we do not error out when trying to manipulate the caret.
                 sometimes modals or others listeners may steal it after its set */
-            if ($el.is(":visible") && el === document.activeElement) {
+            var isVisible = (el.offsetWidth > 0 || el.offsetHeight > 0);
+            if (isVisible && el === document.activeElement) {
 
                 /* after the focus is set move the caret to the end, necessary when we val()
                     just before setting focus */
@@ -1453,7 +1454,7 @@ the specific language governing permissions and limitations under the Apache Lic
 
         // abstract
         findHighlightableChoices: function() {
-            return this.results.find(".select2-result-selectable:not(.select2-disabled, .select2-selected)");
+            return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)");
         },
 
         // abstract