Author: buildbot
Date: Mon Apr 22 21:36:43 2013
New Revision: 859513
Log:
Staging update by buildbot for tomee
Modified:
websites/staging/tomee/trunk/cgi-bin/ (props changed)
websites/staging/tomee/trunk/content/ (props changed)
websites/staging/tomee/trunk/content/resources/js/bootstrap-dropdown.js
websites/staging/tomee/trunk/content/resources/js/bootstrap-modal.js
websites/staging/tomee/trunk/content/resources/js/bootstrap-popover.js
websites/staging/tomee/trunk/content/resources/js/bootstrap-scrollspy.js
Propchange: websites/staging/tomee/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 22 21:36:43 2013
@@ -1 +1 @@
-1470722
+1470728
Propchange: websites/staging/tomee/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 22 21:36:43 2013
@@ -1 +1 @@
-1470722
+1470728
Modified:
websites/staging/tomee/trunk/content/resources/js/bootstrap-dropdown.js
==============================================================================
--- websites/staging/tomee/trunk/content/resources/js/bootstrap-dropdown.js
(original)
+++ websites/staging/tomee/trunk/content/resources/js/bootstrap-dropdown.js Mon
Apr 22 21:36:43 2013
@@ -1,8 +1,8 @@
/* ============================================================
- * bootstrap-dropdown.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#dropdown
+ * bootstrap-dropdown.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,38 +18,83 @@
* ============================================================ */
-!function( $ ){
+!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')
+ })
+ }
+
+ Dropdown.prototype = {
+
+ constructor: Dropdown
+
+ , toggle: function (e) {
+ var $this = $(this)
+ , $parent
+ , selector
+ , isActive
+
+ if ($this.is('.disabled, :disabled')) return
+
+ selector = $this.attr('data-target')
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip
for ie7
+ }
+
+ $parent = $(selector)
+ $parent.length || ($parent = $this.parent())
+
+ isActive = $parent.hasClass('open')
+
+ clearMenus()
+
+ if (!isActive) $parent.toggleClass('open')
+
+ return false
+ }
+
+ }
+
+ function clearMenus() {
+ $(toggle).parent().removeClass('open')
+ }
- "use strict"
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
- $.fn.dropdown = function ( selector ) {
+ $.fn.dropdown = function (option) {
return this.each(function () {
- $(this).delegate(selector || d, 'click', function (e) {
- var li = $(this).parent('li')
- , isActive = li.hasClass('open')
-
- clearMenus()
- !isActive && li.toggleClass('open')
- return false
- })
+ var $this = $(this)
+ , data = $this.data('dropdown')
+ if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+ if (typeof option == 'string') data[option].call($this)
})
}
- /* APPLY TO STANDARD DROPDOWN ELEMENTS
- * =================================== */
+ $.fn.dropdown.Constructor = Dropdown
- var d = 'a.menu, .dropdown-toggle'
- function clearMenus() {
- $(d).parent('li').removeClass('open')
- }
+ /* APPLY TO STANDARD DROPDOWN ELEMENTS
+ * =================================== */
$(function () {
- $('html').bind("click", clearMenus)
- $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown]
.dropdown-toggle' )
+ $('html').on('click.dropdown.data-api', clearMenus)
+ $('body')
+ .on('click.dropdown', '.dropdown form', function (e) {
e.stopPropagation() })
+ .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
-}( window.jQuery || window.ender );
+}(window.jQuery);
\ No newline at end of file
Modified: websites/staging/tomee/trunk/content/resources/js/bootstrap-modal.js
==============================================================================
--- websites/staging/tomee/trunk/content/resources/js/bootstrap-modal.js
(original)
+++ websites/staging/tomee/trunk/content/resources/js/bootstrap-modal.js Mon
Apr 22 21:36:43 2013
@@ -1,8 +1,8 @@
/* =========================================================
- * bootstrap-modal.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#modal
+ * bootstrap-modal.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,71 +18,49 @@
* ========================================================= */
-!function( $ ){
+!function ($) {
- "use strict"
+ "use strict"; // jshint ;_;
- /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
- * ======================================================= */
- var transitionEnd
+ /* MODAL CLASS DEFINITION
+ * ====================== */
- $(document).ready(function () {
-
- $.support.transition = (function () {
- var thisBody = document.body || document.documentElement
- , thisStyle = thisBody.style
- , support = thisStyle.transition !== undefined ||
thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !==
undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !==
undefined
- return support
- })()
-
- // set CSS transition event type
- if ( $.support.transition ) {
- transitionEnd = "TransitionEnd"
- if ( $.browser.webkit ) {
- transitionEnd = "webkitTransitionEnd"
- } else if ( $.browser.mozilla ) {
- transitionEnd = "transitionend"
- } else if ( $.browser.opera ) {
- transitionEnd = "oTransitionEnd"
- }
- }
-
- })
-
-
- /* MODAL PUBLIC CLASS DEFINITION
- * ============================= */
-
- var Modal = function ( content, options ) {
- this.settings = $.extend({}, $.fn.modal.defaults, options)
+ var Modal = function (content, options) {
+ this.options = options
this.$element = $(content)
- .delegate('.close', 'click.modal', $.proxy(this.hide, this))
-
- if ( this.settings.show ) {
- this.show()
- }
-
- return this
+ .delegate('[data-dismiss="modal"]', 'click.dismiss.modal',
$.proxy(this.hide, this))
}
Modal.prototype = {
- toggle: function () {
+ constructor: Modal
+
+ , toggle: function () {
return this[!this.isShown ? 'show' : 'hide']()
}
, show: function () {
var that = this
+ , e = $.Event('show')
+
+ this.$element.trigger(e)
+
+ if (this.isShown || e.isDefaultPrevented()) return
+
+ $('body').addClass('modal-open')
+
this.isShown = true
- this.$element.trigger('show')
escape.call(this)
backdrop.call(this, function () {
var transition = $.support.transition &&
that.$element.hasClass('fade')
+ if (!that.$element.parent().length) {
+ that.$element.appendTo(document.body) //don't move modals dom
position
+ }
+
that.$element
- .appendTo(document.body)
.show()
if (transition) {
@@ -92,35 +70,34 @@
that.$element.addClass('in')
transition ?
- that.$element.one(transitionEnd, function () {
that.$element.trigger('shown') }) :
+ that.$element.one($.support.transition.end, function () {
that.$element.trigger('shown') }) :
that.$element.trigger('shown')
})
-
- return this
}
, hide: function (e) {
e && e.preventDefault()
- if ( !this.isShown ) {
- return this
- }
-
var that = this
+
+ e = $.Event('hide')
+
+ this.$element.trigger(e)
+
+ if (!this.isShown || e.isDefaultPrevented()) return
+
this.isShown = false
+ $('body').removeClass('modal-open')
+
escape.call(this)
- this.$element
- .trigger('hide')
- .removeClass('in')
+ this.$element.removeClass('in')
$.support.transition && this.$element.hasClass('fade') ?
hideWithTransition.call(this) :
hideModal.call(this)
-
- return this
}
}
@@ -130,20 +107,19 @@
* ===================== */
function hideWithTransition() {
- // firefox drops transitionEnd events :{o
var that = this
, timeout = setTimeout(function () {
- that.$element.unbind(transitionEnd)
+ that.$element.off($.support.transition.end)
hideModal.call(that)
}, 500)
- this.$element.one(transitionEnd, function () {
+ this.$element.one($.support.transition.end, function () {
clearTimeout(timeout)
hideModal.call(that)
})
}
- function hideModal (that) {
+ function hideModal(that) {
this.$element
.hide()
.trigger('hidden')
@@ -151,38 +127,37 @@
backdrop.call(this)
}
- function backdrop ( callback ) {
+ function backdrop(callback) {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
- if ( this.isShown && this.settings.backdrop ) {
+
+ if (this.isShown && this.options.backdrop) {
var doAnimate = $.support.transition && animate
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body)
- if ( this.settings.backdrop != 'static' ) {
+ if (this.options.backdrop != 'static') {
this.$backdrop.click($.proxy(this.hide, this))
}
- if ( doAnimate ) {
- this.$backdrop[0].offsetWidth // force reflow
- }
+ if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
this.$backdrop.addClass('in')
doAnimate ?
- this.$backdrop.one(transitionEnd, callback) :
+ this.$backdrop.one($.support.transition.end, callback) :
callback()
- } else if ( !this.isShown && this.$backdrop ) {
+ } else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in')
$.support.transition && this.$element.hasClass('fade')?
- this.$backdrop.one(transitionEnd, $.proxy(removeBackdrop, this)) :
+ this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop,
this)) :
removeBackdrop.call(this)
- } else if ( callback ) {
- callback()
+ } else if (callback) {
+ callback()
}
}
@@ -193,14 +168,12 @@
function escape() {
var that = this
- if ( this.isShown && this.settings.keyboard ) {
- $(document).bind('keyup.modal', function ( e ) {
- if ( e.which == 27 ) {
- that.hide()
- }
+ if (this.isShown && this.options.keyboard) {
+ $(document).on('keyup.dismiss.modal', function ( e ) {
+ e.which == 27 && that.hide()
})
- } else if ( !this.isShown ) {
- $(document).unbind('keyup.modal')
+ } else if (!this.isShown) {
+ $(document).off('keyup.dismiss.modal')
}
}
@@ -208,53 +181,38 @@
/* MODAL PLUGIN DEFINITION
* ======================= */
- $.fn.modal = function ( options ) {
- var modal = this.data('modal')
-
- if (!modal) {
-
- if (typeof options == 'string') {
- options = {
- show: /show|toggle/.test(options)
- }
- }
-
- return this.each(function () {
- $(this).data('modal', new Modal(this, options))
- })
- }
-
- if ( options === true ) {
- return modal
- }
-
- if ( typeof options == 'string' ) {
- modal[options]()
- } else if ( modal ) {
- modal.toggle()
- }
-
- return this
+ $.fn.modal = function (option) {
+ return this.each(function () {
+ var $this = $(this)
+ , data = $this.data('modal')
+ , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof
option == 'object' && option)
+ if (!data) $this.data('modal', (data = new Modal(this, options)))
+ if (typeof option == 'string') data[option]()
+ else if (options.show) data.show()
+ })
}
- $.fn.modal.Modal = Modal
-
$.fn.modal.defaults = {
- backdrop: false
- , keyboard: false
- , show: false
+ backdrop: true
+ , keyboard: true
+ , show: true
}
+ $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+ * ============== */
- /* MODAL DATA- IMPLEMENTATION
- * ========================== */
+ $(function () {
+ $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e
) {
+ var $this = $(this), href
+ , $target = $($this.attr('data-target') || (href = $this.attr('href'))
&& href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+ , option = $target.data('modal') ? 'toggle' : $.extend({},
$target.data(), $this.data())
- $(document).ready(function () {
- $('body').delegate('[data-controls-modal]', 'click', function (e) {
e.preventDefault()
- var $this = $(this).data('show', true)
- $('#' + $this.attr('data-controls-modal')).modal( $this.data() )
+ $target.modal(option)
})
})
-}( window.jQuery || window.ender );
+}(window.jQuery);
\ No newline at end of file
Modified: websites/staging/tomee/trunk/content/resources/js/bootstrap-popover.js
==============================================================================
--- websites/staging/tomee/trunk/content/resources/js/bootstrap-popover.js
(original)
+++ websites/staging/tomee/trunk/content/resources/js/bootstrap-popover.js Mon
Apr 22 21:36:43 2013
@@ -1,8 +1,8 @@
/* ===========================================================
- * bootstrap-popover.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#popover
+ * bootstrap-popover.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,27 +18,35 @@
* =========================================================== */
-!function( $ ) {
+!function ($) {
- "use strict"
+ "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+ * =============================== */
var Popover = function ( element, options ) {
- this.$element = $(element)
- this.options = options
- this.enabled = true
- this.fixTitle()
+ this.init('popover', element, options)
}
- /* NOTE: POPOVER EXTENDS BOOTSTRAP-TWIPSY.js
- ========================================= */
- Popover.prototype = $.extend({}, $.fn.twipsy.Twipsy.prototype, {
+ /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+ ========================================== */
+
+ Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
- setContent: function () {
+ constructor: Popover
+
+ , setContent: function () {
var $tip = this.tip()
- $tip.find('.title')[this.options.html ? 'html' : 'text'](this.getTitle())
- $tip.find('.content p')[this.options.html ? 'html' :
'text'](this.getContent())
- $tip[0].className = 'popover'
+ , title = this.getTitle()
+ , content = this.getContent()
+
+ $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
+ $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' :
'text'](content)
+
+ $tip.removeClass('fade top bottom left right in')
}
, hasContent: function () {
@@ -47,21 +55,18 @@
, getContent: function () {
var content
- , $e = this.$element
- , o = this.options
+ , $e = this.$element
+ , o = this.options
+
+ content = $e.attr('data-content')
+ || (typeof o.content == 'function' ? o.content.call($e[0]) :
o.content)
- if (typeof this.options.content == 'string') {
- content = this.options.content
- } else if (typeof this.options.content == 'function') {
- content = this.options.content.call(this.$element[0])
- }
return content
}
- , tip: function() {
+ , tip: function () {
if (!this.$tip) {
- this.$tip = $('<div class="popover" />')
- .html(this.options.template)
+ this.$tip = $(this.options.template)
}
return this.$tip
}
@@ -72,15 +77,22 @@
/* POPOVER PLUGIN DEFINITION
* ======================= */
- $.fn.popover = function (options) {
- if (typeof options == 'object') options = $.extend({},
$.fn.popover.defaults, options)
- $.fn.twipsy.initWith.call(this, options, Popover, 'popover')
- return this
+ $.fn.popover = function (option) {
+ return this.each(function () {
+ var $this = $(this)
+ , data = $this.data('popover')
+ , options = typeof option == 'object' && option
+ if (!data) $this.data('popover', (data = new Popover(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
}
- $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
+ $.fn.popover.Constructor = Popover
+
+ $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
placement: 'right'
- , template: '<div class="arrow"></div><div class="inner"><h3
class="title"></h3><div class="content"><p></p></div></div>'
+ , content: ''
+ , template: '<div class="popover"><div class="arrow"></div><div
class="popover-inner"><h3 class="popover-title"></h3><div
class="popover-content"><p></p></div></div></div>'
})
-}( window.jQuery || window.ender );
\ No newline at end of file
+}(window.jQuery);
\ No newline at end of file
Modified:
websites/staging/tomee/trunk/content/resources/js/bootstrap-scrollspy.js
==============================================================================
--- websites/staging/tomee/trunk/content/resources/js/bootstrap-scrollspy.js
(original)
+++ websites/staging/tomee/trunk/content/resources/js/bootstrap-scrollspy.js
Mon Apr 22 21:36:43 2013
@@ -1,8 +1,8 @@
/* =============================================================
- * bootstrap-scrollspy.js v1.4.0
+ * bootstrap-scrollspy.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,90 +18,134 @@
* ============================================================== */
-!function ( $ ) {
+!function ($) {
- "use strict"
+ "use strict"; // jshint ;_;
- var $window = $(window)
- function ScrollSpy( topbar, selector ) {
- var processScroll = $.proxy(this.processScroll, this)
- this.$topbar = $(topbar)
- this.selector = selector || 'li > a'
+ /* SCROLLSPY CLASS DEFINITION
+ * ========================== */
+
+ function ScrollSpy( element, options) {
+ var process = $.proxy(this.process, this)
+ , $element = $(element).is('body') ? $(window) : $(element)
+ , href
+ this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+ this.$scrollElement = $element.on('scroll.scroll.data-api', process)
+ this.selector = (this.options.target
+ || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/,
'')) //strip for ie7
+ || '') + ' .nav li > a'
+ this.$body = $('body')
this.refresh()
- this.$topbar.delegate(this.selector, 'click', processScroll)
- $window.scroll(processScroll)
- this.processScroll()
+ this.process()
}
ScrollSpy.prototype = {
- refresh: function () {
- this.targets = this.$topbar.find(this.selector).map(function () {
- var href = $(this).attr('href')
- return /^#\w/.test(href) && $(href).length ? href : null
- })
-
- this.offsets = $.map(this.targets, function (id) {
- return $(id).offset().top
- })
+ constructor: ScrollSpy
+
+ , refresh: function () {
+ var self = this
+ , $targets
+
+ this.offsets = $([])
+ this.targets = $([])
+
+ $targets = this.$body
+ .find(this.selector)
+ .map(function () {
+ var $el = $(this)
+ , href = $el.data('target') || $el.attr('href')
+ , $href = /^#\w/.test(href) && $(href)
+ return ( $href
+ && href.length
+ && [[ $href.position().top, href ]] ) || null
+ })
+ .sort(function (a, b) { return a[0] - b[0] })
+ .each(function () {
+ self.offsets.push(this[0])
+ self.targets.push(this[1])
+ })
}
- , processScroll: function () {
- var scrollTop = $window.scrollTop() + 10
+ , process: function () {
+ var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+ , scrollHeight = this.$scrollElement[0].scrollHeight ||
this.$body[0].scrollHeight
+ , maxScroll = scrollHeight - this.$scrollElement.height()
, offsets = this.offsets
, targets = this.targets
, activeTarget = this.activeTarget
, i
+ if (scrollTop >= maxScroll) {
+ return activeTarget != (i = targets.last()[0])
+ && this.activate ( i )
+ }
+
for (i = offsets.length; i--;) {
activeTarget != targets[i]
&& scrollTop >= offsets[i]
&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
- && this.activateButton( targets[i] )
+ && this.activate( targets[i] )
}
}
- , activateButton: function (target) {
+ , activate: function (target) {
+ var active
+ , selector
+
this.activeTarget = target
- this.$topbar
- .find(this.selector).parent('.active')
+ $(this.selector)
+ .parent('.active')
.removeClass('active')
- this.$topbar
- .find(this.selector + '[href="' + target + '"]')
+ selector = this.selector
+ + '[data-target="' + target + '"],'
+ + this.selector + '[href="' + target + '"]'
+
+ active = $(selector)
.parent('li')
.addClass('active')
+
+ if (active.parent('.dropdown-menu')) {
+ active = active.closest('li.dropdown').addClass('active')
+ }
+
+ active.trigger('activate')
}
}
- /* SCROLLSPY PLUGIN DEFINITION
- * =========================== */
- $.fn.scrollSpy = function( options ) {
- var scrollspy = this.data('scrollspy')
+ /* SCROLLSPY PLUGIN DEFINITION
+ * =========================== */
+
+ $.fn.scrollspy = function ( option ) {
+ return this.each(function () {
+ var $this = $(this)
+ , data = $this.data('scrollspy')
+ , options = typeof option == 'object' && option
+ if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
- if (!scrollspy) {
- return this.each(function () {
- $(this).data('scrollspy', new ScrollSpy( this, options ))
- })
- }
-
- if ( options === true ) {
- return scrollspy
- }
-
- if ( typeof options == 'string' ) {
- scrollspy[options]()
- }
+ $.fn.scrollspy.Constructor = ScrollSpy
- return this
+ $.fn.scrollspy.defaults = {
+ offset: 10
}
- $(document).ready(function () {
- $('body').scrollSpy('[data-scrollspy] li > a')
+
+ /* SCROLLSPY DATA-API
+ * ================== */
+
+ $(function () {
+ $('[data-spy="scroll"]').each(function () {
+ var $spy = $(this)
+ $spy.scrollspy($spy.data())
+ })
})
-}( window.jQuery || window.ender );
\ No newline at end of file
+}(window.jQuery);
\ No newline at end of file
