Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Mobius1 committed Feb 24, 2017
1 parent d8e635d commit 260ca09
Showing 1 changed file with 25 additions and 24 deletions.
49 changes: 25 additions & 24 deletions selectr.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,18 @@
}
},
getBoundingRect: function(el) {
var x = window.screenX;
var y = window.screenY;
var win = window;
var rect = el.getBoundingClientRect();
var offsetX = win.pageXOffset !== undefined ? win.pageXOffset : (doc.documentElement || body.parentNode || body).scrollLeft;
var offsetY = win.pageYOffset !== undefined ? win.pageYOffset : (doc.documentElement || body.parentNode || body).scrollTop;

return {
top: rect.top + y,
left: rect.left + x,
right: rect.right + x,
bottom: rect.bottom + y,
width: rect.width,
bottom: rect.bottom + offsetY,
height: rect.height,
left : rect.left + offsetX,
right : rect.right + offsetX,
top : rect.top + offsetY,
width : rect.width
};
},
preventDefault: function(e) {
Expand Down Expand Up @@ -275,8 +276,8 @@
util.append(optsContainer, _.inputContainer);
}

util.append(optsContainer, _.optsOptions);
util.append(optsContainer, _.notice);
util.append(optsContainer, _.optsOptions);

util.append(_.container, _.selected);
util.append(_.container, optsContainer);
Expand Down Expand Up @@ -333,7 +334,7 @@

_.requiresPagination = _.settings.data && _.settings.data.length > _.settings.pagination;

_.handleDismiss = _.dismiss.bind(_);
_.handleDismiss = dismiss.bind(_);

// Global listener
util.listen(_.container, 'click', function(e) {
Expand Down Expand Up @@ -694,6 +695,14 @@
}
};

var dismiss = function(e) {
var target = e.target;
if (!this.container.contains(target) && (this.opened || this.container.classList.contains("notice"))) {
this.close();
}
};


var match = function(query, opt, text) {
var result = new RegExp(query, 'i').exec(text);
if ( result ) {
Expand Down Expand Up @@ -901,7 +910,7 @@
});

if (!_.searchList.length) {
_.notify("No results.");
_.setMessage("No results.");
_.input.focus();
} else {
_.open();
Expand Down Expand Up @@ -932,10 +941,10 @@

util.addClass(this.container, "open");

var rect = util.getBoundingRect(_.optsOptions);
_.optsRect = util.getBoundingRect(_.optsOptions);
var wh = window.innerHeight;

if (rect.bottom > wh) {
if (_.optsRect.bottom > wh) {
util.addClass(this.container, "inverted");
} else {
util.removeClass(this.container, "inverted");
Expand Down Expand Up @@ -977,16 +986,6 @@
this.emit("selectr.close");
};

/**
* Close the dropdown when clicking outside the container
*/
Selectr.prototype.dismiss = function(e) {
var target = e.target;
if (!this.container.contains(target) && (this.opened || this.container.classList.contains("notice"))) {
this.close();
}
};

/**
* Clear all selections and reset search
*/
Expand All @@ -1009,8 +1008,10 @@
* Display a message
* @param {string} message The message
*/
Selectr.prototype.notify = function(message) {
this.close();
Selectr.prototype.setMessage = function(message, close) {
if ( close ) {
this.close();
}
util.addClass(this.container, "notice");
this.notice.textContent = message;
};
Expand Down

0 comments on commit 260ca09

Please sign in to comment.