瀏覽代碼

Better extract width style from inline element :
- Match floating point numbers as well as integers (e.g. "width:99.5%")
- Strip all string spaces, to match styles specified with variable spacing (e.g. " width: 5em ;")

Justin DuJardin 13 年之前
父節點
當前提交
55a257ddba
共有 1 個文件被更改,包括 10 次插入2 次删除
  1. 10 2
      select2.js

+ 10 - 2
select2.js

@@ -607,8 +607,8 @@
         var style = this.opts.element.attr('style');
         var attrs = style.split(';');
         for (var i = 0; i < attrs.length; i++) {
-            var attr = attrs[i].trim();
-            var matches = attr.match(/width:(([0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/);
+            var matches = attrs[i].replace(/\s/g,'')
+                .match(/width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/);
             if(matches == null || matches.length < 1)
                 continue;
             return matches[1];
@@ -827,6 +827,14 @@
         this.search.val("");
     };
 
+    SingleSelect2.prototype.alignDropdown = function () {
+        this.parent.alignDropdown.apply(this,arguments);
+        this.results.css({
+            'margin-top': this.search.height()
+        });
+    };
+
+
     function MultiSelect2(opts) {
 
     }