Prechádzať zdrojové kódy

Merge pull request #352 from kchung/master

Reevaluate dropdownCss when calling positioning dropdown.
Igor Vaynberg 12 rokov pred
rodič
commit
9003c2dd18
1 zmenil súbory, kde vykonal 5 pridanie a 6 odobranie
  1. 5 6
      select2.js

+ 5 - 6
select2.js

@@ -895,11 +895,11 @@
                 this.dropdown.removeClass("select2-drop-above");
                 this.dropdown.removeClass("select2-drop-above");
             }
             }
 
 
-            css = {
-                top:dropTop,
-                left:offset.left,
-                width:width
-            };
+            css = $.extend({
+                top: dropTop,
+                left: offset.left,
+                width: width
+            }, evaluate(this.opts.dropdownCss));
 
 
             this.dropdown.css(css);
             this.dropdown.css(css);
         },
         },
@@ -979,7 +979,6 @@
             this.dropdown.show();
             this.dropdown.show();
 
 
             this.positionDropdown();
             this.positionDropdown();
-            this.dropdown.css(evaluate(this.opts.dropdownCss));
             this.dropdown.addClass("select2-drop-active");
             this.dropdown.addClass("select2-drop-active");
 
 
             this.ensureHighlightVisible();
             this.ensureHighlightVisible();