Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Start to work on new generation combo box.

Browse Source
This commit is contained in:
Laurent Destailleur
2014-12-05 13:26:47 +01:00
parent 168e97e6ee
commit ceba894d57
11 changed files with 161 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/jquery/plugins/select2/select2.js vendored
View File

@@ -1912,7 +1912,7 @@ the specific language governing permissions and limitations under the Apache Lic
if (this.opts.width === "off") {
return null;
} else if (this.opts.width === "element"){
return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
return this.opts.element.outerWidth(false) === 0 ? 'auto' : 20+this.opts.element.outerWidth(false) + 'px';
} else if (this.opts.width === "copy" || this.opts.width === "resolve") {
// check if there is inline style on the element that contains width
style = this.opts.element.attr('style');
@@ -1933,7 +1933,7 @@ the specific language governing permissions and limitations under the Apache Lic
if (style.indexOf("%") > 0) return style;
// finally, fallback on the calculated width of the element
return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
return (this.opts.element.outerWidth(false) === 0 ? 'auto' : 20+this.opts.element.outerWidth(false) + 'px');
}
return null;