From e0c9b2e7fefb336a9557c25acf2bbcb0be5972fa Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 9 Mar 2015 22:30:54 +0000 Subject: [PATCH] Update bootstrap code --- Vendorfile | 4 +- vendor/assets/bootstrap/bootstrap.dropdown.js | 208 +++--- vendor/assets/bootstrap/bootstrap.tooltip.js | 645 ++++++++++-------- 3 files changed, 480 insertions(+), 377 deletions(-) diff --git a/Vendorfile b/Vendorfile index ae46dc171..097f557aa 100644 --- a/Vendorfile +++ b/Vendorfile @@ -6,8 +6,8 @@ folder 'vendor/assets' do end folder 'bootstrap' do - file 'bootstrap.tooltip.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js' - file 'bootstrap.dropdown.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js' + file 'bootstrap.tooltip.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v3.3.2/js/tooltip.js' + file 'bootstrap.dropdown.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v3.3.2/js/dropdown.js' end folder 'leaflet' do diff --git a/vendor/assets/bootstrap/bootstrap.dropdown.js b/vendor/assets/bootstrap/bootstrap.dropdown.js index d04da5d7b..200e1c67b 100644 --- a/vendor/assets/bootstrap/bootstrap.dropdown.js +++ b/vendor/assets/bootstrap/bootstrap.dropdown.js @@ -1,155 +1,145 @@ -/* ============================================================ - * bootstrap-dropdown.js v2.3.2 - * http://getbootstrap.com/2.3.2/javascript.html#dropdowns - * ============================================================ - * Copyright 2013 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } +/* ======================================================================== + * Bootstrap: dropdown.js v3.3.2 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ - Dropdown.prototype = { - constructor: Dropdown ++function ($) { + 'use strict'; - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle="dropdown"]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.VERSION = '3.3.2' - if ($this.is('.disabled, :disabled')) return + Dropdown.prototype.toggle = function (e) { + var $this = $(this) - $parent = getParent($this) + if ($this.is('.disabled, :disabled')) return - isActive = $parent.hasClass('open') + var $parent = getParent($this) + var isActive = $parent.hasClass('open') - clearMenus() + clearMenus() - if (!isActive) { - if ('ontouchstart' in document.documentElement) { - // if mobile we we use a backdrop because click events don't delegate - $('