Skip to content

Add beforeOpen #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lincolndbryant wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add beforeOpen #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f282751
add a beforeOpen callback, that prevents the Drop from opening if ret…
lincolndbryant Jul 13, 2015
12db58a
bump to 1.2.3
lincolndbryant Jul 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tether-drop",
"version": "1.2.2",
"version": "1.2.3",
"homepage": "https://github.com/HubSpot/drop",
"authors": [
"Adam Schwartz <adam.flynn.schwartz@gmail.com>",
Expand Down
37 changes: 22 additions & 15 deletions dist/js/drop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

'use strict';

var _bind = Function.prototype.bind;
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })();
var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
var _bind = Function.prototype.bind;

var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

Expand Down Expand Up @@ -147,9 +147,9 @@ function createContext() {
}

if (anyOpen) {
addClass(document.body, drop.classPrefix + '-open');
addClass(document.body, '' + drop.classPrefix + '-open');
} else {
removeClass(document.body, drop.classPrefix + '-open');
removeClass(document.body, '' + drop.classPrefix + '-open');
}
};

Expand Down Expand Up @@ -205,7 +205,7 @@ function createContext() {
}

this.content = document.createElement('div');
addClass(this.content, drop.classPrefix + '-content');
addClass(this.content, '' + drop.classPrefix + '-content');

if (typeof this.options.content === 'function') {
var generateAndSetContent = function generateAndSetContent() {
Expand Down Expand Up @@ -369,7 +369,7 @@ function createContext() {
key: 'isOpened',
value: function isOpened() {
if (this.drop) {
return hasClass(this.drop, drop.classPrefix + '-open');
return hasClass(this.drop, '' + drop.classPrefix + '-open');
}
}
}, {
Expand All @@ -390,6 +390,13 @@ function createContext() {
return;
}

if (typeof this.options.beforeOpen === 'function') {
var shouldOpen = this.options.beforeOpen();
if (shouldOpen === false) {
return;
}
}

if (!this.drop.parentNode) {
document.body.appendChild(this.drop);
}
Expand All @@ -398,12 +405,12 @@ function createContext() {
this.tether.enable();
}

addClass(this.drop, drop.classPrefix + '-open');
addClass(this.drop, drop.classPrefix + '-open-transitionend');
addClass(this.drop, '' + drop.classPrefix + '-open');
addClass(this.drop, '' + drop.classPrefix + '-open-transitionend');

setTimeout(function () {
if (_this3.drop) {
addClass(_this3.drop, drop.classPrefix + '-after-open');
addClass(_this3.drop, '' + drop.classPrefix + '-after-open');
}
});

Expand All @@ -422,8 +429,8 @@ function createContext() {
return;
}

if (!hasClass(this.drop, drop.classPrefix + '-open')) {
removeClass(this.drop, drop.classPrefix + '-open-transitionend');
if (!hasClass(this.drop, '' + drop.classPrefix + '-open')) {
removeClass(this.drop, '' + drop.classPrefix + '-open-transitionend');
}
this.drop.removeEventListener(transitionEndEvent, this.transitionEndHandler);
}
Expand Down Expand Up @@ -452,8 +459,8 @@ function createContext() {
return;
}

removeClass(this.drop, drop.classPrefix + '-open');
removeClass(this.drop, drop.classPrefix + '-after-open');
removeClass(this.drop, '' + drop.classPrefix + '-open');
removeClass(this.drop, '' + drop.classPrefix + '-after-open');

this.drop.addEventListener(transitionEndEvent, this.transitionEndHandler);

Expand Down
Loading