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

only switch right to left drop when enough room available

Browse Source
This commit is contained in:
Rhodri Pugh 2014-08-07 11:25:10 +01:00
parent 3c17d3b5bb
commit d2c9b9aac3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
select2.js
View File

@ -1222,9 +1222,10 @@ the specific language governing permissions and limitations under the Apache Lic
// abstract // abstract
positionDropdown: function() { positionDropdown: function() {
var $dropdown = this.dropdown, var $dropdown = this.dropdown,
offset = this.container.offset(), container = this.container,
height = this.container.outerHeight(false), offset = container.offset(),
width = this.container.outerWidth(false), height = container.outerHeight(false),
width = container.outerWidth(false),
dropHeight = $dropdown.outerHeight(false), dropHeight = $dropdown.outerHeight(false),
$window = $(window), $window = $(window),
windowWidth = $window.width(), windowWidth = $window.width(),
@ -1236,7 +1237,12 @@ the specific language governing permissions and limitations under the Apache Lic
enoughRoomBelow = dropTop + dropHeight <= viewportBottom, enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(), enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(),
dropWidth = $dropdown.outerWidth(false), dropWidth = $dropdown.outerWidth(false),
enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight, enoughRoomOnRight = function() {
return dropLeft + dropWidth <= viewPortRight;
},
enoughRoomOnLeft = function() {
return offset.left + viewPortLeft + container.outerWidth(false) > dropWidth;
},
aboveNow = $dropdown.hasClass("select2-drop-above"), aboveNow = $dropdown.hasClass("select2-drop-above"),
bodyOffset, bodyOffset,
above, above,
@ -1271,7 +1277,6 @@ the specific language governing permissions and limitations under the Apache Lic
dropTop = offset.top + height; dropTop = offset.top + height;
dropLeft = offset.left; dropLeft = offset.left;
dropWidth = $dropdown.outerWidth(false); dropWidth = $dropdown.outerWidth(false);
enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight;
$dropdown.show(); $dropdown.show();
// fix so the cursor does not move to the left within the search-textbox in IE // fix so the cursor does not move to the left within the search-textbox in IE
@ -1286,7 +1291,6 @@ the specific language governing permissions and limitations under the Apache Lic
dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width); dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
dropWidth > width ? width = dropWidth : dropWidth = width; dropWidth > width ? width = dropWidth : dropWidth = width;
dropHeight = $dropdown.outerHeight(false); dropHeight = $dropdown.outerHeight(false);
enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight;
} }
else { else {
this.container.removeClass('select2-drop-auto-width'); this.container.removeClass('select2-drop-auto-width');
@ -1302,7 +1306,7 @@ the specific language governing permissions and limitations under the Apache Lic
dropLeft -= bodyOffset.left; dropLeft -= bodyOffset.left;
} }
if (!enoughRoomOnRight) { if (!enoughRoomOnRight() && enoughRoomOnLeft()) {
dropLeft = offset.left + this.container.outerWidth(false) - dropWidth; dropLeft = offset.left + this.container.outerWidth(false) - dropWidth;
} }