Skip to content
GitLab
Commit 35f064f9 authored by Thomas McDonald's avatar Thomas McDonald
Browse files

Merge branch 'v4' of github.com:twbs/derpstrap into v4

parents a8023edf f2ae3ea0
Hide whitespace changes
Inline Side-by-side
Showing
with 207 additions and 213 deletions
+207 -213
js/dist/carousel.js.map
-2 bytes (0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/collapse.js
+ 24
- 25
View file @ 35f064f9
...@@ -42,7 +42,7 @@ var Collapse = (function ($) { ...@@ -42,7 +42,7 @@ var Collapse = (function ($) {
SHOWN: 'shown' + EVENT_KEY, SHOWN: 'shown' + EVENT_KEY,
HIDE: 'hide' + EVENT_KEY, HIDE: 'hide' + EVENT_KEY,
HIDDEN: 'hidden' + EVENT_KEY, HIDDEN: 'hidden' + EVENT_KEY,
CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
}; };
var ClassName = { var ClassName = {
...@@ -88,6 +88,14 @@ var Collapse = (function ($) { ...@@ -88,6 +88,14 @@ var Collapse = (function ($) {
} }
} }
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
// getters
_createClass(Collapse, [{ _createClass(Collapse, [{
key: 'toggle', key: 'toggle',
...@@ -234,11 +242,11 @@ var Collapse = (function ($) { ...@@ -234,11 +242,11 @@ var Collapse = (function ($) {
this._triggerArray = null; this._triggerArray = null;
this._isTransitioning = null; this._isTransitioning = null;
} }
}, {
key: '_getConfig',
// private // private
}, {
key: '_getConfig',
value: function _getConfig(config) { value: function _getConfig(config) {
config = $.extend({}, Default, config); config = $.extend({}, Default, config);
config.toggle = !!config.toggle; // coerce string values config.toggle = !!config.toggle; // coerce string values
...@@ -277,24 +285,11 @@ var Collapse = (function ($) { ...@@ -277,24 +285,11 @@ var Collapse = (function ($) {
} }
} }
} }
}], [{
key: 'VERSION',
// getters
get: function () {
return VERSION;
}
}, {
key: 'Default',
get: function () {
return Default;
}
}, {
key: '_getTargetFromElement',
// static // static
}], [{
key: '_getTargetFromElement',
value: function _getTargetFromElement(element) { value: function _getTargetFromElement(element) {
var selector = Util.getSelectorFromElement(element); var selector = Util.getSelectorFromElement(element);
return selector ? $(selector)[0] : null; return selector ? $(selector)[0] : null;
...@@ -321,17 +316,21 @@ var Collapse = (function ($) { ...@@ -321,17 +316,21 @@ var Collapse = (function ($) {
} }
}); });
} }
}, {
key: 'VERSION',
get: function get() {
return VERSION;
}
}, {
key: 'Default',
get: function get() {
return Default;
}
}]); }]);
return Collapse; return Collapse;
})(); })();
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); event.preventDefault();
...@@ -358,4 +357,4 @@ var Collapse = (function ($) { ...@@ -358,4 +357,4 @@ var Collapse = (function ($) {
return Collapse; return Collapse;
})(jQuery); })(jQuery);
//# sourceMappingURL=collapse.js.map //# sourceMappingURL=collapse.js.map
\ No newline at end of file
js/dist/collapse.js.map
-2 bytes (0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/dropdown.js
+ 20
- 21
View file @ 35f064f9
...@@ -32,8 +32,8 @@ var Dropdown = (function ($) { ...@@ -32,8 +32,8 @@ var Dropdown = (function ($) {
SHOW: 'show' + EVENT_KEY, SHOW: 'show' + EVENT_KEY,
SHOWN: 'shown' + EVENT_KEY, SHOWN: 'shown' + EVENT_KEY,
CLICK: 'click' + EVENT_KEY, CLICK: 'click' + EVENT_KEY,
CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + '' + DATA_API_KEY KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + DATA_API_KEY
}; };
var ClassName = { var ClassName = {
...@@ -67,6 +67,14 @@ var Dropdown = (function ($) { ...@@ -67,6 +67,14 @@ var Dropdown = (function ($) {
this._addEventListeners(); this._addEventListeners();
} }
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
// getters
_createClass(Dropdown, [{ _createClass(Dropdown, [{
key: 'toggle', key: 'toggle',
...@@ -119,27 +127,19 @@ var Dropdown = (function ($) { ...@@ -119,27 +127,19 @@ var Dropdown = (function ($) {
$(this._element).off(EVENT_KEY); $(this._element).off(EVENT_KEY);
this._element = null; this._element = null;
} }
}, {
key: '_addEventListeners',
// private // private
}, {
key: '_addEventListeners',
value: function _addEventListeners() { value: function _addEventListeners() {
$(this._element).on(Event.CLICK, this.toggle); $(this._element).on(Event.CLICK, this.toggle);
} }
}], [{
key: 'VERSION',
// getters
get: function () {
return VERSION;
}
}, {
key: '_jQueryInterface',
// static // static
}], [{
key: '_jQueryInterface',
value: function _jQueryInterface(config) { value: function _jQueryInterface(config) {
return this.each(function () { return this.each(function () {
var data = $(this).data(DATA_KEY); var data = $(this).data(DATA_KEY);
...@@ -248,17 +248,16 @@ var Dropdown = (function ($) { ...@@ -248,17 +248,16 @@ var Dropdown = (function ($) {
items[index].focus(); items[index].focus();
} }
}, {
key: 'VERSION',
get: function get() {
return VERSION;
}
}]); }]);
return Dropdown; return Dropdown;
})(); })();
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
$(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) {
e.stopPropagation(); e.stopPropagation();
}); });
...@@ -278,4 +277,4 @@ var Dropdown = (function ($) { ...@@ -278,4 +277,4 @@ var Dropdown = (function ($) {
return Dropdown; return Dropdown;
})(jQuery); })(jQuery);
//# sourceMappingURL=dropdown.js.map //# sourceMappingURL=dropdown.js.map
\ No newline at end of file
js/dist/dropdown.js.map
-3 bytes (0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/modal.js
+ 27
- 28
View file @ 35f064f9
...@@ -53,7 +53,7 @@ var Modal = (function ($) { ...@@ -53,7 +53,7 @@ var Modal = (function ($) {
KEYDOWN_DISMISS: 'keydown.dismiss' + EVENT_KEY, KEYDOWN_DISMISS: 'keydown.dismiss' + EVENT_KEY,
MOUSEUP_DISMISS: 'mouseup.dismiss' + EVENT_KEY, MOUSEUP_DISMISS: 'mouseup.dismiss' + EVENT_KEY,
MOUSEDOWN_DISMISS: 'mousedown.dismiss' + EVENT_KEY, MOUSEDOWN_DISMISS: 'mousedown.dismiss' + EVENT_KEY,
CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
}; };
var ClassName = { var ClassName = {
...@@ -91,6 +91,14 @@ var Modal = (function ($) { ...@@ -91,6 +91,14 @@ var Modal = (function ($) {
this._scrollbarWidth = 0; this._scrollbarWidth = 0;
} }
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
// getters
_createClass(Modal, [{ _createClass(Modal, [{
key: 'toggle', key: 'toggle',
...@@ -190,11 +198,11 @@ var Modal = (function ($) { ...@@ -190,11 +198,11 @@ var Modal = (function ($) {
this._originalBodyPadding = null; this._originalBodyPadding = null;
this._scrollbarWidth = null; this._scrollbarWidth = null;
} }
}, {
key: '_getConfig',
// private // private
}, {
key: '_getConfig',
value: function _getConfig(config) { value: function _getConfig(config) {
config = $.extend({}, Default, config); config = $.extend({}, Default, config);
Util.typeCheckConfig(NAME, config, DefaultType); Util.typeCheckConfig(NAME, config, DefaultType);
...@@ -312,7 +320,7 @@ var Modal = (function ($) { ...@@ -312,7 +320,7 @@ var Modal = (function ($) {
$(this._backdrop).addClass(animate); $(this._backdrop).addClass(animate);
} }
$(this._backdrop).appendTo(this.$body); $(this._backdrop).appendTo(document.body);
$(this._element).on(Event.CLICK_DISMISS, function (event) { $(this._element).on(Event.CLICK_DISMISS, function (event) {
if (_this6._ignoreBackdropClick) { if (_this6._ignoreBackdropClick) {
...@@ -364,14 +372,14 @@ var Modal = (function ($) { ...@@ -364,14 +372,14 @@ var Modal = (function ($) {
callback(); callback();
} }
} }
}, {
key: '_handleUpdate',
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// the following methods are used to handle overflowing modals // the following methods are used to handle overflowing modals
// todo (fat): these should probably be refactored out of modal.js // todo (fat): these should probably be refactored out of modal.js
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
}, {
key: '_handleUpdate',
value: function _handleUpdate() { value: function _handleUpdate() {
this._adjustDialog(); this._adjustDialog();
} }
...@@ -433,24 +441,11 @@ var Modal = (function ($) { ...@@ -433,24 +441,11 @@ var Modal = (function ($) {
document.body.removeChild(scrollDiv); document.body.removeChild(scrollDiv);
return scrollbarWidth; return scrollbarWidth;
} }
}], [{
key: 'VERSION',
// getters
get: function () {
return VERSION;
}
}, {
key: 'Default',
get: function () {
return Default;
}
}, {
key: '_jQueryInterface',
// static // static
}], [{
key: '_jQueryInterface',
value: function _jQueryInterface(config, relatedTarget) { value: function _jQueryInterface(config, relatedTarget) {
return this.each(function () { return this.each(function () {
var data = $(this).data(DATA_KEY); var data = $(this).data(DATA_KEY);
...@@ -468,17 +463,21 @@ var Modal = (function ($) { ...@@ -468,17 +463,21 @@ var Modal = (function ($) {
} }
}); });
} }
}, {
key: 'VERSION',
get: function get() {
return VERSION;
}
}, {
key: 'Default',
get: function get() {
return Default;
}
}]); }]);
return Modal; return Modal;
})(); })();
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
var _this7 = this; var _this7 = this;
...@@ -526,4 +525,4 @@ var Modal = (function ($) { ...@@ -526,4 +525,4 @@ var Modal = (function ($) {
return Modal; return Modal;
})(jQuery); })(jQuery);
//# sourceMappingURL=modal.js.map //# sourceMappingURL=modal.js.map
\ No newline at end of file
js/dist/modal.js.map
+1 bytes (+0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/popover.js
+ 45
- 45
View file @ 35f064f9
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
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 _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 _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; 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 { _x = parent; _x2 = property; _x3 = 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
...@@ -69,15 +71,19 @@ var Popover = (function ($) { ...@@ -69,15 +71,19 @@ var Popover = (function ($) {
*/ */
var Popover = (function (_Tooltip) { var Popover = (function (_Tooltip) {
_inherits(Popover, _Tooltip);
function Popover() { function Popover() {
_classCallCheck(this, Popover); _classCallCheck(this, Popover);
if (_Tooltip != null) { _get(Object.getPrototypeOf(Popover.prototype), 'constructor', this).apply(this, arguments);
_Tooltip.apply(this, arguments);
}
} }
_inherits(Popover, _Tooltip); /**
* ------------------------------------------------------------------------
* jQuery
* ------------------------------------------------------------------------
*/
_createClass(Popover, [{ _createClass(Popover, [{
key: 'isWithContent', key: 'isWithContent',
...@@ -111,87 +117,81 @@ var Popover = (function ($) { ...@@ -111,87 +117,81 @@ var Popover = (function ($) {
this.cleanupTether(); this.cleanupTether();
} }
}, {
key: '_getContent',
// private // private
}, {
key: '_getContent',
value: function _getContent() { value: function _getContent() {
return this.element.getAttribute('data-content') || (typeof this.config.content == 'function' ? this.config.content.call(this.element) : this.config.content); return this.element.getAttribute('data-content') || (typeof this.config.content == 'function' ? this.config.content.call(this.element) : this.config.content);
} }
// static
}], [{ }], [{
key: '_jQueryInterface',
value: function _jQueryInterface(config) {
return this.each(function () {
var data = $(this).data(DATA_KEY);
var _config = typeof config === 'object' ? config : null;
if (!data && /destroy|hide/.test(config)) {
return;
}
if (!data) {
data = new Popover(this, _config);
$(this).data(DATA_KEY, data);
}
if (typeof config === 'string') {
data[config]();
}
});
}
}, {
key: 'VERSION', key: 'VERSION',
// getters // getters
get: function () { get: function get() {
return VERSION; return VERSION;
} }
}, { }, {
key: 'Default', key: 'Default',
get: function () { get: function get() {
return Default; return Default;
} }
}, { }, {
key: 'NAME', key: 'NAME',
get: function () { get: function get() {
return NAME; return NAME;
} }
}, { }, {
key: 'DATA_KEY', key: 'DATA_KEY',
get: function () { get: function get() {
return DATA_KEY; return DATA_KEY;
} }
}, { }, {
key: 'Event', key: 'Event',
get: function () { get: function get() {
return Event; return Event;
} }
}, { }, {
key: 'EVENT_KEY', key: 'EVENT_KEY',
get: function () { get: function get() {
return EVENT_KEY; return EVENT_KEY;
} }
}, { }, {
key: 'DefaultType', key: 'DefaultType',
get: function () { get: function get() {
return DefaultType; return DefaultType;
} }
}, {
key: '_jQueryInterface',
// static
value: function _jQueryInterface(config) {
return this.each(function () {
var data = $(this).data(DATA_KEY);
var _config = typeof config === 'object' ? config : null;
if (!data && /destroy|hide/.test(config)) {
return;
}
if (!data) {
data = new Popover(this, _config);
$(this).data(DATA_KEY, data);
}
if (typeof config === 'string') {
data[config]();
}
});
}
}]); }]);
return Popover; return Popover;
})(Tooltip); })(Tooltip);
/**
* ------------------------------------------------------------------------
* jQuery
* ------------------------------------------------------------------------
*/
$.fn[NAME] = Popover._jQueryInterface; $.fn[NAME] = Popover._jQueryInterface;
$.fn[NAME].Constructor = Popover; $.fn[NAME].Constructor = Popover;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
...@@ -201,4 +201,4 @@ var Popover = (function ($) { ...@@ -201,4 +201,4 @@ var Popover = (function ($) {
return Popover; return Popover;
})(jQuery); })(jQuery);
//# sourceMappingURL=popover.js.map //# sourceMappingURL=popover.js.map
\ No newline at end of file
js/dist/popover.js.map
+9 bytes (+0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/scrollspy.js
+ 26
- 27
View file @ 35f064f9
...@@ -41,7 +41,7 @@ var ScrollSpy = (function ($) { ...@@ -41,7 +41,7 @@ var ScrollSpy = (function ($) {
var Event = { var Event = {
ACTIVATE: 'activate' + EVENT_KEY, ACTIVATE: 'activate' + EVENT_KEY,
SCROLL: 'scroll' + EVENT_KEY, SCROLL: 'scroll' + EVENT_KEY,
LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY LOAD_DATA_API: 'load' + EVENT_KEY + DATA_API_KEY
}; };
var ClassName = { var ClassName = {
...@@ -75,7 +75,7 @@ var ScrollSpy = (function ($) { ...@@ -75,7 +75,7 @@ var ScrollSpy = (function ($) {
this._element = element; this._element = element;
this._scrollElement = element.tagName === 'BODY' ? window : element; this._scrollElement = element.tagName === 'BODY' ? window : element;
this._config = this._getConfig(config); this._config = this._getConfig(config);
this._selector = '' + this._config.target + ' ' + Selector.NAV_ANCHORS; this._selector = this._config.target + ' ' + Selector.NAV_ANCHORS;
this._offsets = []; this._offsets = [];
this._targets = []; this._targets = [];
this._activeTarget = null; this._activeTarget = null;
...@@ -87,6 +87,14 @@ var ScrollSpy = (function ($) { ...@@ -87,6 +87,14 @@ var ScrollSpy = (function ($) {
this._process(); this._process();
} }
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
// getters
_createClass(ScrollSpy, [{ _createClass(ScrollSpy, [{
key: 'refresh', key: 'refresh',
...@@ -144,11 +152,11 @@ var ScrollSpy = (function ($) { ...@@ -144,11 +152,11 @@ var ScrollSpy = (function ($) {
this._activeTarget = null; this._activeTarget = null;
this._scrollHeight = null; this._scrollHeight = null;
} }
}, {
key: '_getConfig',
// private // private
}, {
key: '_getConfig',
value: function _getConfig(config) { value: function _getConfig(config) {
config = $.extend({}, Default, config); config = $.extend({}, Default, config);
...@@ -215,7 +223,7 @@ var ScrollSpy = (function ($) { ...@@ -215,7 +223,7 @@ var ScrollSpy = (function ($) {
this._clear(); this._clear();
var selector = '' + this._selector + '[data-target="' + target + '"],' + ('' + this._selector + '[href="' + target + '"]'); var selector = this._selector + '[data-target="' + target + '"],' + (this._selector + '[href="' + target + '"]');
// todo (fat): getting all the raw li's up the tree is not great. // todo (fat): getting all the raw li's up the tree is not great.
var parentListItems = $(selector).parents(Selector.LI); var parentListItems = $(selector).parents(Selector.LI);
...@@ -244,24 +252,11 @@ var ScrollSpy = (function ($) { ...@@ -244,24 +252,11 @@ var ScrollSpy = (function ($) {
$(activeParents[i]).removeClass(ClassName.ACTIVE); $(activeParents[i]).removeClass(ClassName.ACTIVE);
} }
} }
}], [{
key: 'VERSION',
// getters
get: function () {
return VERSION;
}
}, {
key: 'Default',
get: function () {
return Default;
}
}, {
key: '_jQueryInterface',
// static // static
}], [{
key: '_jQueryInterface',
value: function _jQueryInterface(config) { value: function _jQueryInterface(config) {
return this.each(function () { return this.each(function () {
var data = $(this).data(DATA_KEY); var data = $(this).data(DATA_KEY);
...@@ -277,17 +272,21 @@ var ScrollSpy = (function ($) { ...@@ -277,17 +272,21 @@ var ScrollSpy = (function ($) {
} }
}); });
} }
}, {
key: 'VERSION',
get: function get() {
return VERSION;
}
}, {
key: 'Default',
get: function get() {
return Default;
}
}]); }]);
return ScrollSpy; return ScrollSpy;
})(); })();
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
$(window).on(Event.LOAD_DATA_API, function () { $(window).on(Event.LOAD_DATA_API, function () {
var scrollSpys = $.makeArray($(Selector.DATA_SPY)); var scrollSpys = $.makeArray($(Selector.DATA_SPY));
...@@ -312,4 +311,4 @@ var ScrollSpy = (function ($) { ...@@ -312,4 +311,4 @@ var ScrollSpy = (function ($) {
return ScrollSpy; return ScrollSpy;
})(jQuery); })(jQuery);
//# sourceMappingURL=scrollspy.js.map //# sourceMappingURL=scrollspy.js.map
\ No newline at end of file
js/dist/scrollspy.js.map
-3 bytes (0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/tab.js
+ 19
- 20
View file @ 35f064f9
...@@ -32,7 +32,7 @@ var Tab = (function ($) { ...@@ -32,7 +32,7 @@ var Tab = (function ($) {
HIDDEN: 'hidden' + EVENT_KEY, HIDDEN: 'hidden' + EVENT_KEY,
SHOW: 'show' + EVENT_KEY, SHOW: 'show' + EVENT_KEY,
SHOWN: 'shown' + EVENT_KEY, SHOWN: 'shown' + EVENT_KEY,
CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
}; };
var ClassName = { var ClassName = {
...@@ -67,6 +67,14 @@ var Tab = (function ($) { ...@@ -67,6 +67,14 @@ var Tab = (function ($) {
this._element = element; this._element = element;
} }
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
// getters
_createClass(Tab, [{ _createClass(Tab, [{
key: 'show', key: 'show',
...@@ -142,11 +150,11 @@ var Tab = (function ($) { ...@@ -142,11 +150,11 @@ var Tab = (function ($) {
$.removeClass(this._element, DATA_KEY); $.removeClass(this._element, DATA_KEY);
this._element = null; this._element = null;
} }
}, {
key: '_activate',
// private // private
}, {
key: '_activate',
value: function _activate(element, container, callback) { value: function _activate(element, container, callback) {
var active = $(container).find(Selector.ACTIVE_CHILD)[0]; var active = $(container).find(Selector.ACTIVE_CHILD)[0];
var isTransitioning = callback && Util.supportsTransitionEnd() && (active && $(active).hasClass(ClassName.FADE) || !!$(container).find(Selector.FADE_CHILD)[0]); var isTransitioning = callback && Util.supportsTransitionEnd() && (active && $(active).hasClass(ClassName.FADE) || !!$(container).find(Selector.FADE_CHILD)[0]);
...@@ -211,19 +219,11 @@ var Tab = (function ($) { ...@@ -211,19 +219,11 @@ var Tab = (function ($) {
callback(); callback();
} }
} }
}], [{
key: 'VERSION',
// getters
get: function () {
return VERSION;
}
}, {
key: '_jQueryInterface',
// static // static
}], [{
key: '_jQueryInterface',
value: function _jQueryInterface(config) { value: function _jQueryInterface(config) {
return this.each(function () { return this.each(function () {
var $this = $(this); var $this = $(this);
...@@ -239,17 +239,16 @@ var Tab = (function ($) { ...@@ -239,17 +239,16 @@ var Tab = (function ($) {
} }
}); });
} }
}, {
key: 'VERSION',
get: function get() {
return VERSION;
}
}]); }]);
return Tab; return Tab;
})(); })();
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
*/
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); event.preventDefault();
Tab._jQueryInterface.call($(this), 'show'); Tab._jQueryInterface.call($(this), 'show');
...@@ -270,4 +269,4 @@ var Tab = (function ($) { ...@@ -270,4 +269,4 @@ var Tab = (function ($) {
return Tab; return Tab;
})(jQuery); })(jQuery);
//# sourceMappingURL=tab.js.map //# sourceMappingURL=tab.js.map
\ No newline at end of file
js/dist/tab.js.map
-3 bytes (0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/tooltip.js
+ 43
- 44
View file @ 35f064f9
...@@ -125,6 +125,14 @@ var Tooltip = (function ($) { ...@@ -125,6 +125,14 @@ var Tooltip = (function ($) {
this._setListeners(); this._setListeners();
} }
/**
* ------------------------------------------------------------------------
* jQuery
* ------------------------------------------------------------------------
*/
// getters
_createClass(Tooltip, [{ _createClass(Tooltip, [{
key: 'enable', key: 'enable',
...@@ -296,11 +304,11 @@ var Tooltip = (function ($) { ...@@ -296,11 +304,11 @@ var Tooltip = (function ($) {
this._hoverState = ''; this._hoverState = '';
} }
}, {
key: 'isWithContent',
// protected // protected
}, {
key: 'isWithContent',
value: function isWithContent() { value: function isWithContent() {
return !!this.getTitle(); return !!this.getTitle();
} }
...@@ -346,11 +354,11 @@ var Tooltip = (function ($) { ...@@ -346,11 +354,11 @@ var Tooltip = (function ($) {
$(this.tip).removeClass(this._removeTetherClasses); $(this.tip).removeClass(this._removeTetherClasses);
} }
} }
}, {
key: '_getAttachment',
// private // private
}, {
key: '_getAttachment',
value: function _getAttachment(placement) { value: function _getAttachment(placement) {
return AttachmentMap[placement.toUpperCase()]; return AttachmentMap[placement.toUpperCase()];
} }
...@@ -509,79 +517,70 @@ var Tooltip = (function ($) { ...@@ -509,79 +517,70 @@ var Tooltip = (function ($) {
return config; return config;
} }
// static
}], [{ }], [{
key: 'VERSION', key: '_jQueryInterface',
value: function _jQueryInterface(config) {
return this.each(function () {
var data = $(this).data(DATA_KEY);
var _config = typeof config === 'object' ? config : null;
if (!data && /destroy|hide/.test(config)) {
return;
}
// getters if (!data) {
data = new Tooltip(this, _config);
$(this).data(DATA_KEY, data);
}
get: function () { if (typeof config === 'string') {
data[config]();
}
});
}
}, {
key: 'VERSION',
get: function get() {
return VERSION; return VERSION;
} }
}, { }, {
key: 'Default', key: 'Default',
get: function () { get: function get() {
return Default; return Default;
} }
}, { }, {
key: 'NAME', key: 'NAME',
get: function () { get: function get() {
return NAME; return NAME;
} }
}, { }, {
key: 'DATA_KEY', key: 'DATA_KEY',
get: function () { get: function get() {
return DATA_KEY; return DATA_KEY;
} }
}, { }, {
key: 'Event', key: 'Event',
get: function () { get: function get() {
return Event; return Event;
} }
}, { }, {
key: 'EVENT_KEY', key: 'EVENT_KEY',
get: function () { get: function get() {
return EVENT_KEY; return EVENT_KEY;
} }
}, { }, {
key: 'DefaultType', key: 'DefaultType',
get: function () { get: function get() {
return DefaultType; return DefaultType;
} }
}, {
key: '_jQueryInterface',
// static
value: function _jQueryInterface(config) {
return this.each(function () {
var data = $(this).data(DATA_KEY);
var _config = typeof config === 'object' ? config : null;
if (!data && /destroy|hide/.test(config)) {
return;
}
if (!data) {
data = new Tooltip(this, _config);
$(this).data(DATA_KEY, data);
}
if (typeof config === 'string') {
data[config]();
}
});
}
}]); }]);
return Tooltip; return Tooltip;
})(); })();
/**
* ------------------------------------------------------------------------
* jQuery
* ------------------------------------------------------------------------
*/
$.fn[NAME] = Tooltip._jQueryInterface; $.fn[NAME] = Tooltip._jQueryInterface;
$.fn[NAME].Constructor = Tooltip; $.fn[NAME].Constructor = Tooltip;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
...@@ -591,4 +590,4 @@ var Tooltip = (function ($) { ...@@ -591,4 +590,4 @@ var Tooltip = (function ($) {
return Tooltip; return Tooltip;
})(jQuery); })(jQuery);
//# sourceMappingURL=tooltip.js.map //# sourceMappingURL=tooltip.js.map
\ No newline at end of file
js/dist/tooltip.js.map
-2 bytes (0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/util.js
+ 2
- 2
View file @ 35f064f9
...@@ -137,7 +137,7 @@ var Util = (function ($) { ...@@ -137,7 +137,7 @@ var Util = (function ($) {
if (value && isElement(value)) valueType = 'element';else valueType = toType(value); if (value && isElement(value)) valueType = 'element';else valueType = toType(value);
if (!new RegExp(expectedTypes).test(valueType)) { if (!new RegExp(expectedTypes).test(valueType)) {
throw new Error('' + componentName.toUpperCase() + ': ' + ('Option "' + property + '" provided type "' + valueType + '" ') + ('but expected type "' + expectedTypes + '".')); throw new Error(componentName.toUpperCase() + ': ' + ('Option "' + property + '" provided type "' + valueType + '" ') + ('but expected type "' + expectedTypes + '".'));
} }
} }
} }
...@@ -148,4 +148,4 @@ var Util = (function ($) { ...@@ -148,4 +148,4 @@ var Util = (function ($) {
return Util; return Util;
})(jQuery); })(jQuery);
//# sourceMappingURL=util.js.map //# sourceMappingURL=util.js.map
\ No newline at end of file
js/dist/util.js.map
+0 bytes (+0%)
View file @ 35f064f9
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/src/modal.js
+ 1
- 1
View file @ 35f064f9
...@@ -313,7 +313,7 @@ const Modal = (($) => { ...@@ -313,7 +313,7 @@ const Modal = (($) => {
$(this._backdrop).addClass(animate) $(this._backdrop).addClass(animate)
} }
$(this._backdrop).appendTo(this.$body) $(this._backdrop).appendTo(document.body)
$(this._element).on(Event.CLICK_DISMISS, (event) => { $(this._element).on(Event.CLICK_DISMISS, (event) => {
if (this._ignoreBackdropClick) { if (this._ignoreBackdropClick) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment