http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.ttf ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.ttf b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.ttf index 67fa00b..1413fc6 100644 Binary files a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.ttf and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.ttf differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff index 8c54182..9e61285 100644 Binary files a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff2 ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.woff2 differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js index deea294..aaebc8c 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.1 + * Bootstrap: affix.js v3.3.2 * http://getbootstrap.com/javascript/#affix * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -28,7 +28,7 @@ this.checkPosition() } - Affix.VERSION = '3.3.1' + Affix.VERSION = '3.3.2' Affix.RESET = 'affix affix-top affix-bottom' @@ -53,7 +53,7 @@ var colliderTop = initializing ? scrollTop : position.top var colliderHeight = initializing ? targetHeight : height - if (offsetTop != null && colliderTop <= offsetTop) return 'top' + if (offsetTop != null && scrollTop <= offsetTop) return 'top' if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' return false http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js index 7b775dd..e8212ca 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: alert.js v3.3.1 + * Bootstrap: alert.js v3.3.2 * http://getbootstrap.com/javascript/#alerts * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -18,7 +18,7 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.1' + Alert.VERSION = '3.3.2' Alert.TRANSITION_DURATION = 150 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js index 7b1e134..4d56901 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: button.js v3.3.1 + * Bootstrap: button.js v3.3.2 * http://getbootstrap.com/javascript/#buttons * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -19,7 +19,7 @@ this.isLoading = false } - Button.VERSION = '3.3.1' + Button.VERSION = '3.3.2' Button.DEFAULTS = { loadingText: 'loading...' http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js index 282d618..450e181 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.3.1 + * Bootstrap: carousel.js v3.3.2 * http://getbootstrap.com/javascript/#carousel * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -30,7 +30,7 @@ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.1' + Carousel.VERSION = '3.3.2' Carousel.TRANSITION_DURATION = 600 @@ -70,8 +70,11 @@ } Carousel.prototype.getItemForDirection = function (direction, active) { - var delta = direction == 'prev' ? -1 : 1 var activeIndex = this.getItemIndex(active) + var willWrap = (direction == 'prev' && activeIndex === 0) + || (direction == 'next' && activeIndex == (this.$items.length - 1)) + if (willWrap && !this.options.wrap) return active + var delta = direction == 'prev' ? -1 : 1 var itemIndex = (activeIndex + delta) % this.$items.length return this.$items.eq(itemIndex) } @@ -116,14 +119,8 @@ var $next = next || this.getItemForDirection(type, $active) var isCycling = this.interval var direction = type == 'next' ? 'left' : 'right' - var fallback = type == 'next' ? 'first' : 'last' var that = this - if (!$next.length) { - if (!this.options.wrap) return - $next = this.$element.find('.item')[fallback]() - } - if ($next.hasClass('active')) return (this.sliding = false) var relatedTarget = $next[0] http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js index b2cc125..2bc30e7 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.3.1 + * Bootstrap: collapse.js v3.3.2 * http://getbootstrap.com/javascript/#collapse * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -28,7 +28,7 @@ if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.1' + Collapse.VERSION = '3.3.2' Collapse.TRANSITION_DURATION = 350 @@ -46,7 +46,7 @@ if (this.transitioning || this.$element.hasClass('in')) return var activesData - var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing') + var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') if (actives && actives.length) { activesData = actives.data('bs.collapse') http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js index 69a40f6..200e1c6 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.3.1 + * Bootstrap: dropdown.js v3.3.2 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -19,7 +19,7 @@ $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.1' + Dropdown.VERSION = '3.3.2' Dropdown.prototype.toggle = function (e) { var $this = $(this) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js index 93891aa..e7704b8 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: modal.js v3.3.1 + * Bootstrap: modal.js v3.3.2 * http://getbootstrap.com/javascript/#modals * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -30,7 +30,7 @@ } } - Modal.VERSION = '3.3.1' + Modal.VERSION = '3.3.2' Modal.TRANSITION_DURATION = 300 Modal.BACKDROP_TRANSITION_DURATION = 150 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js index db272bd..be65b11 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: popover.js v3.3.1 + * Bootstrap: popover.js v3.3.2 * http://getbootstrap.com/javascript/#popovers * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -19,7 +19,7 @@ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - Popover.VERSION = '3.3.1' + Popover.VERSION = '3.3.2' Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { placement: 'right', @@ -86,18 +86,12 @@ function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option - var selector = options && options.selector + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option if (!data && option == 'destroy') return - if (selector) { - if (!data) $this.data('bs.popover', (data = {})) - if (!data[selector]) data[selector] = new Popover(this, options) - } else { - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) - } + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js index c468262..0987177 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.1 + * Bootstrap: scrollspy.js v3.3.2 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -30,7 +30,7 @@ this.process() } - ScrollSpy.VERSION = '3.3.1' + ScrollSpy.VERSION = '3.3.2' ScrollSpy.DEFAULTS = { offset: 10 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js index d59827f..ddb7fc9 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: tab.js v3.3.1 + * Bootstrap: tab.js v3.3.2 * http://getbootstrap.com/javascript/#tabs * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -17,7 +17,7 @@ this.element = $(element) } - Tab.VERSION = '3.3.1' + Tab.VERSION = '3.3.2' Tab.TRANSITION_DURATION = 150 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js index cda147d..1856df5 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js @@ -1,9 +1,9 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.1 + * Bootstrap: tooltip.js v3.3.2 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -25,7 +25,7 @@ this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.1' + Tooltip.VERSION = '3.3.2' Tooltip.TRANSITION_DURATION = 150 @@ -346,10 +346,10 @@ } Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } } @@ -445,18 +445,12 @@ function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option - var selector = options && options.selector + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option if (!data && option == 'destroy') return - if (selector) { - if (!data) $this.data('bs.tooltip', (data = {})) - if (!data[selector]) data[selector] = new Tooltip(this, options) - } else { - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) - } + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js index 68c2bd6..ec9ab68 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: transition.js v3.3.1 + * Bootstrap: transition.js v3.3.2 * http://getbootstrap.com/javascript/#transitions * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot b/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot index 4a4ca86..b93a495 100644 Binary files a/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot and b/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot differ
