Skip to content

Commit

Permalink
Update to upstream alpha 2
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Dec 15, 2015
1 parent 303a643 commit 0bbd14d
Show file tree
Hide file tree
Showing 43 changed files with 420 additions and 325 deletions.
46 changes: 23 additions & 23 deletions assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand All @@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): util.js
* Bootstrap (v4.0.0-alpha.2): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -129,7 +129,7 @@ var Util = (function ($) {

getUID: function getUID(prefix) {
do {
prefix += ~ ~(Math.random() * 1000000);
prefix += ~ ~(Math.random() * 1000000); // "~~" acts like a faster Math.floor() here
} while (document.getElementById(prefix));
return prefix;
},
Expand Down Expand Up @@ -185,7 +185,7 @@ var Util = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): alert.js
* Bootstrap (v4.0.0-alpha.2): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -199,7 +199,7 @@ var Alert = (function ($) {
*/

var NAME = 'alert';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -371,7 +371,7 @@ var Alert = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): button.js
* Bootstrap (v4.0.0-alpha.2): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -385,7 +385,7 @@ var Button = (function ($) {
*/

var NAME = 'button';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.button';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -537,7 +537,7 @@ var Button = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): carousel.js
* Bootstrap (v4.0.0-alpha.2): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -551,7 +551,7 @@ var Carousel = (function ($) {
*/

var NAME = 'carousel';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -1009,7 +1009,7 @@ var Carousel = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): collapse.js
* Bootstrap (v4.0.0-alpha.2): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -1023,7 +1023,7 @@ var Collapse = (function ($) {
*/

var NAME = 'collapse';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -1367,7 +1367,7 @@ var Collapse = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): dropdown.js
* Bootstrap (v4.0.0-alpha.2): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -1381,7 +1381,7 @@ var Dropdown = (function ($) {
*/

var NAME = 'dropdown';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -1654,7 +1654,7 @@ var Dropdown = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): modal.js
* Bootstrap (v4.0.0-alpha.2): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -1668,7 +1668,7 @@ var Modal = (function ($) {
*/

var NAME = 'modal';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -2184,7 +2184,7 @@ var Modal = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): scrollspy.js
* Bootstrap (v4.0.0-alpha.2): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -2198,7 +2198,7 @@ var ScrollSpy = (function ($) {
*/

var NAME = 'scrollspy';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -2498,7 +2498,7 @@ var ScrollSpy = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): tab.js
* Bootstrap (v4.0.0-alpha.2): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -2512,7 +2512,7 @@ var Tab = (function ($) {
*/

var NAME = 'tab';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -2757,7 +2757,7 @@ var Tab = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): tooltip.js
* Bootstrap (v4.0.0-alpha.2): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -2779,7 +2779,7 @@ var Tooltip = (function ($) {
*/

var NAME = 'tooltip';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down Expand Up @@ -3368,7 +3368,7 @@ var Tooltip = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): popover.js
* Bootstrap (v4.0.0-alpha.2): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -3382,7 +3382,7 @@ var Popover = (function ($) {
*/

var NAME = 'popover';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): alert.js
* Bootstrap (v4.0.0-alpha.2): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Alert = (function ($) {
*/

var NAME = 'alert';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/button.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): button.js
* Bootstrap (v4.0.0-alpha.2): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Button = (function ($) {
*/

var NAME = 'button';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.button';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): carousel.js
* Bootstrap (v4.0.0-alpha.2): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Carousel = (function ($) {
*/

var NAME = 'carousel';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): collapse.js
* Bootstrap (v4.0.0-alpha.2): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Collapse = (function ($) {
*/

var NAME = 'collapse';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): dropdown.js
* Bootstrap (v4.0.0-alpha.2): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Dropdown = (function ($) {
*/

var NAME = 'dropdown';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): modal.js
* Bootstrap (v4.0.0-alpha.2): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Modal = (function ($) {
*/

var NAME = 'modal';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): popover.js
* Bootstrap (v4.0.0-alpha.2): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -24,7 +24,7 @@ var Popover = (function ($) {
*/

var NAME = 'popover';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/scrollspy.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): scrollspy.js
* Bootstrap (v4.0.0-alpha.2): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var ScrollSpy = (function ($) {
*/

var NAME = 'scrollspy';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): tab.js
* Bootstrap (v4.0.0-alpha.2): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -20,7 +20,7 @@ var Tab = (function ($) {
*/

var NAME = 'tab';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0): tooltip.js
* Bootstrap (v4.0.0-alpha.2): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -30,7 +30,7 @@ var Tooltip = (function ($) {
*/

var NAME = 'tooltip';
var VERSION = '4.0.0';
var VERSION = '4.0.0-alpha';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down
Loading

0 comments on commit 0bbd14d

Please sign in to comment.