From c95cb1e50e776b20112c16bbcdf04c258dfc70d3 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 15 Jul 2013 12:22:45 +0200 Subject: [PATCH] Moved to bootstrap 2.3.2. --- .../app/lib/bootstrap/bootstrap-button.js | 2 +- .../app/lib/bootstrap/bootstrap-collapse.js | 8 +- .../app/lib/bootstrap/bootstrap-dropdown.js | 28 +- .../app/lib/bootstrap/bootstrap-modal.js | 26 +- .../app/lib/bootstrap/bootstrap-popover.js | 10 +- .../app/lib/bootstrap/bootstrap-tab.js | 2 +- .../app/lib/bootstrap/bootstrap-tooltip.js | 134 +++++-- .../app/lib/bootstrap/bootstrap-transition.js | 2 +- app/assets/stylesheets/bootstrap.css | 366 ++++++++++++------ 9 files changed, 395 insertions(+), 183 deletions(-) diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-button.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-button.js index 39b83399e..ce4599164 100644 --- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-button.js +++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.2.2 + * bootstrap-button.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-collapse.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-collapse.js index 6ac0191a5..74a73a890 100644 --- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-collapse.js +++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-collapse.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-collapse.js v2.2.2 + * bootstrap-collapse.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -52,7 +52,7 @@ , actives , hasData - if (this.transitioning) return + if (this.transitioning || this.$element.hasClass('in')) return dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-')) @@ -72,7 +72,7 @@ , hide: function () { var dimension - if (this.transitioning) return + if (this.transitioning || !this.$element.hasClass('in')) return dimension = this.dimension() this.reset(this.$element[dimension]()) this.transition('removeClass', $.Event('hide'), 'hidden') @@ -129,7 +129,7 @@ return this.each(function () { var $this = $(this) , data = $this.data('collapse') - , options = typeof option == 'object' && option + , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) if (!data) $this.data('collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-dropdown.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-dropdown.js index 900355d5b..6cc122113 100644 --- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-dropdown.js +++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.2.2 + * bootstrap-dropdown.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -52,6 +52,10 @@ clearMenus() if (!isActive) { + if ('ontouchstart' in document.documentElement) { + // if mobile we we use a backdrop because click events don't delegate + $('