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

fixes #1557 ...again...

Browse Source
This commit is contained in:
Igor Vaynberg 2013-10-08 20:33:08 -07:00
parent 0d0882942f
commit 2982be4ec9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
select2.js
View File

@ -1758,7 +1758,7 @@ the specific language governing permissions and limitations under the Apache Lic
// abstract // abstract
initContainerWidth: function () { initContainerWidth: function () {
function resolveContainerWidth() { function resolveContainerWidth() {
var style, attrs, matches, i, l; var style, attrs, matches, i, l, attr;
if (this.opts.width === "off") { if (this.opts.width === "off") {
return null; return null;
@ -1770,8 +1770,9 @@ the specific language governing permissions and limitations under the Apache Lic
if (style !== undefined) { if (style !== undefined) {
attrs = style.split(';'); attrs = style.split(';');
for (i = 0, l = attrs.length; i < l; i = i + 1) { for (i = 0, l = attrs.length; i < l; i = i + 1) {
matches = attrs[i].replace(/\s/g, '') attr = attrs[i].replace(/\s/g, '');
.match(/[^-]width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i); attr = " " + attr; // need the style to start with a space because we match [^-]width which would not match width in the beginning
matches = attr.match(/[^-]width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
if (matches !== null && matches.length >= 1) if (matches !== null && matches.length >= 1)
return matches[1]; return matches[1];
} }