vendor/assets/javascripts/twitter/bootstrap/alert.js in anjlab-bootstrap-rails-2.3.1.2 vs vendor/assets/javascripts/twitter/bootstrap/alert.js in anjlab-bootstrap-rails-3.0.0.0.alpha1
- old
+ new
@@ -1,10 +1,10 @@
-/* ==========================================================
- * bootstrap-alert.js v2.3.1
+/* ========================================================================
+ * Bootstrap: alert.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
+ * ========================================================================
+ * 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
*
@@ -13,87 +13,84 @@
* 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 ($) {
++function ($) { "use strict";
- "use strict"; // jshint ;_;
+ // ALERT CLASS DEFINITION
+ // ======================
-
- /* ALERT CLASS DEFINITION
- * ====================== */
-
var dismiss = '[data-dismiss="alert"]'
- , Alert = function (el) {
- $(el).on('click', dismiss, this.close)
- }
+ var Alert = function (el) {
+ $(el).on('click', dismiss, this.close)
+ }
Alert.prototype.close = function (e) {
- var $this = $(this)
- , selector = $this.attr('data-target')
- , $parent
+ var $this = $(this)
+ var selector = $this.attr('data-target')
if (!selector) {
selector = $this.attr('href')
- selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
}
- $parent = $(selector)
+ var $parent = $(selector)
- e && e.preventDefault()
+ if (e) e.preventDefault()
- $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+ if (!$parent.length) {
+ $parent = $this.hasClass('alert') ? $this : $this.parent()
+ }
- $parent.trigger(e = $.Event('close'))
+ $parent.trigger(e = $.Event('close.bs.alert'))
if (e.isDefaultPrevented()) return
$parent.removeClass('in')
function removeElement() {
- $parent
- .trigger('closed')
- .remove()
+ $parent.trigger('closed.bs.alert').remove()
}
$.support.transition && $parent.hasClass('fade') ?
$parent.on($.support.transition.end, removeElement) :
removeElement()
}
- /* ALERT PLUGIN DEFINITION
- * ======================= */
+ // ALERT PLUGIN DEFINITION
+ // =======================
var old = $.fn.alert
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
- , data = $this.data('alert')
- if (!data) $this.data('alert', (data = new Alert(this)))
+ var data = $this.data('bs.alert')
+
+ if (!data) $this.data('bs.alert', (data = new Alert(this)))
if (typeof option == 'string') data[option].call($this)
})
}
$.fn.alert.Constructor = Alert
- /* ALERT NO CONFLICT
- * ================= */
+ // ALERT NO CONFLICT
+ // =================
$.fn.alert.noConflict = function () {
$.fn.alert = old
return this
}
- /* ALERT DATA-API
- * ============== */
+ // ALERT DATA-API
+ // ==============
- $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+ $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-}(window.jQuery);
\ No newline at end of file
+}(window.jQuery);