RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-26 23:06:02 +03:00
Code Issues Projects Releases Wiki Activity

fix placeholder sizing. fixes #430

Browse Source
This commit is contained in:
Igor Vaynberg 2013-02-14 01:05:28 -08:00
parent 179ba17174
commit 76cd145380
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
select2.js
View File

@ -626,7 +626,6 @@ the specific language governing permissions and limitations under the Apache Lic
// initialize the container // initialize the container
this.initContainer(); this.initContainer();
this.initContainerWidth();
installFilteredMouseMove(this.results); installFilteredMouseMove(this.results);
this.dropdown.delegate(resultsSelector, "mousemove-filtered touchstart touchmove touchend", this.bind(this.highlightUnderEvent)); this.dropdown.delegate(resultsSelector, "mousemove-filtered touchstart touchmove touchend", this.bind(this.highlightUnderEvent));
@ -1728,6 +1727,8 @@ the specific language governing permissions and limitations under the Apache Lic
this.search.bind("focus", this.bind(function(){ this.search.bind("focus", this.bind(function(){
this.container.addClass("select2-container-active"); this.container.addClass("select2-container-active");
})) }))
this.initContainerWidth();
this.setPlaceholder(); this.setPlaceholder();
}, },
@ -2137,6 +2138,8 @@ the specific language governing permissions and limitations under the Apache Lic
this.clearPlaceholder(); this.clearPlaceholder();
})); }));
this.initContainerWidth();
// set the placeholder if necessary // set the placeholder if necessary
this.clearSearch(); this.clearSearch();
}, },
@ -2417,7 +2420,6 @@ the specific language governing permissions and limitations under the Apache Lic
// multi // multi
resizeSearch: function () { resizeSearch: function () {
var minimumWidth, left, maxWidth, containerLeft, searchWidth, var minimumWidth, left, maxWidth, containerLeft, searchWidth,
sideBorderPadding = getSideBorderPadding(this.search); sideBorderPadding = getSideBorderPadding(this.search);
@ -2429,6 +2431,7 @@ the specific language governing permissions and limitations under the Apache Lic
containerLeft = this.selection.offset().left; containerLeft = this.selection.offset().left;
searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding; searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
if (searchWidth < minimumWidth) { if (searchWidth < minimumWidth) {
searchWidth = maxWidth - sideBorderPadding; searchWidth = maxWidth - sideBorderPadding;
} }