RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-03 21:59:24 +03:00
Code Issues Projects Releases Wiki Activity

Deal with non-existent style attributes, and returning calculated pixel widths as a fallback.

Browse Source
This commit is contained in:
Justin DuJardin 2012-03-31 10:20:49 -07:00
parent fa41027264
commit c5d6cb1327
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
select2.js
View File

@ -1,4 +1,4 @@
/*
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@ -603,16 +603,18 @@
AbstractSelect2.prototype.getContainerWidth = function() {
if (this.opts.width !== undefined)
return this.opts.width;
var style = this.opts.element.attr('style');
var attrs = style.split(';');
for (var i = 0; i < attrs.length; i++) {
var matches = attrs[i].replace(/\s/g,'')
if(style !== undefined){
var attrs = style.split(';');
for (var i = 0; i < attrs.length; i++) {
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)
return matches[1];
if(matches != null && matches.length >= 1)
return matches[1];
}
}
return this.opts.element.width();
return this.opts.element.width() + 'px';
};