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 ;")
This commit is contained in:
parent
26baca110b
commit
55a257ddba
12
select2.js
12
select2.js
@ -607,8 +607,8 @@
|
|||||||
var style = this.opts.element.attr('style');
|
var style = this.opts.element.attr('style');
|
||||||
var attrs = style.split(';');
|
var attrs = style.split(';');
|
||||||
for (var i = 0; i < attrs.length; i++) {
|
for (var i = 0; i < attrs.length; i++) {
|
||||||
var attr = attrs[i].trim();
|
var matches = attrs[i].replace(/\s/g,'')
|
||||||
var matches = attr.match(/width:(([0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/);
|
.match(/width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/);
|
||||||
if(matches == null || matches.length < 1)
|
if(matches == null || matches.length < 1)
|
||||||
continue;
|
continue;
|
||||||
return matches[1];
|
return matches[1];
|
||||||
@ -827,6 +827,14 @@
|
|||||||
this.search.val("");
|
this.search.val("");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
SingleSelect2.prototype.alignDropdown = function () {
|
||||||
|
this.parent.alignDropdown.apply(this,arguments);
|
||||||
|
this.results.css({
|
||||||
|
'margin-top': this.search.height()
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
function MultiSelect2(opts) {
|
function MultiSelect2(opts) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user