Skip to content

Commit

Permalink
Build v3.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jasny committed Apr 19, 2014
1 parent 2856890 commit e822b1b
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 35 deletions.
16 changes: 8 additions & 8 deletions dist/css/jasny-bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/jasny-bootstrap.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/jasny-bootstrap.min.css

Large diffs are not rendered by default.

83 changes: 70 additions & 13 deletions dist/js/jasny-bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,64 @@
/*!
* Jasny Bootstrap v3.1.1 (http://jasny.github.io/bootstrap)
* Jasny Bootstrap v3.1.2 (http://jasny.github.io/bootstrap)
* Copyright 2012-2014 Arnold Daniels
* Licensed under Apache-2.0 (https://github.com/jasny/bootstrap/blob/master/LICENSE)
*/

if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScript requires jQuery') }

/* ========================================================================
* Bootstrap: offcanvas.js v3.1.1
* Bootstrap: transition.js v3.1.2
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */


+function ($) {
'use strict';

// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// ============================================================

function transitionEnd() {
var el = document.createElement('bootstrap')

var transEndEventNames = {
WebkitTransition : 'webkitTransitionEnd',
MozTransition : 'transitionend',
OTransition : 'oTransitionEnd otransitionend',
transition : 'transitionend'
}

for (var name in transEndEventNames) {
if (el.style[name] !== undefined) {
return { end: transEndEventNames[name] }
}
}

return false // explicit for ie8 ( ._.)
}

if ($.support.transition !== undefined) return // Prevent conflict with Twitter Bootstrap

// http://blog.alexmaccaw.com/css-transitions
$.fn.emulateTransitionEnd = function (duration) {
var called = false, $el = this
$(this).one($.support.transition.end, function () { called = true })
var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
setTimeout(callback, duration)
return this
}

$(function () {
$.support.transition = transitionEnd()
})

}(window.jQuery);

/* ========================================================================
* Bootstrap: offcanvas.js v3.1.2
* http://jasny.github.io/bootstrap/javascript/#offcanvas
* ========================================================================
* Copyright 2013-2014 Arnold Daniels
Expand Down Expand Up @@ -45,6 +96,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
$(document).on('click', $.proxy(this.autohide, this))

if (this.options.toggle) this.toggle()

if (this.options.disablescrolling) {
this.options.disableScrolling = this.options.disablescrolling
delete this.options.disablescrolling
}
}

OffCanvas.DEFAULTS = {
Expand Down Expand Up @@ -319,7 +375,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
}(window.jQuery);

/* ============================================================
* Bootstrap: rowlink.js v3.1.1
* Bootstrap: rowlink.js v3.1.2
* http://jasny.github.io/bootstrap/javascript/#rowlink
* ============================================================
* Copyright 2012-2014 Arnold Daniels
Expand Down Expand Up @@ -395,7 +451,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
// ==================

$(document).on('click.bs.rowlink.data-api', '[data-link="row"]', function (e) {
if ($(e.target).closest('.rowlink-skip')) return
if ($(e.target).closest('.rowlink-skip').length !== 0) return

var $this = $(this)
if ($this.data('rowlink')) return
Expand Down Expand Up @@ -439,7 +495,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
if (isAndroid) return // No support because caret positioning doesn't work on Android

this.$element = $(element)
this.options = $.extend({}, Inputmask.DEFAULS, options)
this.options = $.extend({}, Inputmask.DEFAULTS, options)
this.mask = String(this.options.mask)

this.init()
Expand All @@ -448,7 +504,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
this.checkVal() //Perform initial check for existing values
}

Inputmask.DEFAULS = {
Inputmask.DEFAULTS = {
mask: "",
placeholder: "_",
definitions: {
Expand Down Expand Up @@ -767,7 +823,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
}(window.jQuery);

/* ===========================================================
* Bootstrap: fileinput.js v3.1.1
* Bootstrap: fileinput.js v3.1.2
* http://jasny.github.com/bootstrap/javascript/#fileinput
* ===========================================================
* Copyright 2012-2014 Arnold Daniels
Expand Down Expand Up @@ -802,14 +858,15 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr

this.$hidden = this.$element.find('input[type=hidden][name="' + this.name + '"]')
if (this.$hidden.length === 0) {
this.$hidden = $('<input type="hidden" />')
this.$element.prepend(this.$hidden)
this.$hidden = $('<input type="hidden">').insertBefore(this.$input)
}

this.$preview = this.$element.find('.fileinput-preview')
var height = this.$preview.css('height')
if (this.$preview.css('display') != 'inline' && height != '0px' && height != 'none') this.$preview.css('line-height', height)

if (this.$preview.css('display') !== 'inline' && height !== '0px' && height !== 'none') {
this.$preview.css('line-height', height)
}

this.original = {
exists: this.$element.hasClass('fileinput-exists'),
preview: this.$preview.html(),
Expand Down Expand Up @@ -896,14 +953,14 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
this.$element.find('.fileinput-filename').text('')
this.$element.addClass('fileinput-new').removeClass('fileinput-exists')

if (e !== false) {
if (e !== undefined) {
this.$input.trigger('change')
this.$element.trigger('clear.bs.fileinput')
}
},

Fileinput.prototype.reset = function() {
this.clear(false)
this.clear()

this.$hidden.val(this.original.hiddenVal)
this.$preview.html(this.original.preview)
Expand Down
4 changes: 2 additions & 2 deletions dist/js/jasny-bootstrap.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/customize.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/assets/js/raw-files.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/css/jasny-bootstrap.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit e822b1b

Please sign in to comment.