mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of https://github.com/twbs/bootstrap/pull/7786 AKA https://github.com/twitter/bootstrap/pull/7786 originally by @seriema @mokkabonna @jojohess Rebased by @cvrebert
This commit is contained in:
parent
995add132e
commit
0d33455ef4
@ -1,3 +1,5 @@
|
|||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- 0.6
|
- 0.8
|
||||||
|
before_script:
|
||||||
|
- npm install -g grunt-cli
|
124
Gruntfile.js
Normal file
124
Gruntfile.js
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
module.exports = function(grunt) {
|
||||||
|
|
||||||
|
// Project configuration.
|
||||||
|
grunt.initConfig({
|
||||||
|
// Metadata.
|
||||||
|
pkg: grunt.file.readJSON('package.json'),
|
||||||
|
banner: '/**\n' +
|
||||||
|
'* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
|
||||||
|
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
||||||
|
'* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
|
||||||
|
'*/\n',
|
||||||
|
// Task configuration.
|
||||||
|
clean: {
|
||||||
|
dist: ['dist']
|
||||||
|
},
|
||||||
|
concat: {
|
||||||
|
options: {
|
||||||
|
banner: '<%= banner %>',
|
||||||
|
stripBanners: false
|
||||||
|
},
|
||||||
|
bootstrap: {
|
||||||
|
src: ['js/*.js'],
|
||||||
|
dest: 'dist/js/<%= pkg.name %>.js'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
jshint: {
|
||||||
|
options: {
|
||||||
|
jshintrc: 'js/.jshintrc'
|
||||||
|
},
|
||||||
|
gruntfile: {
|
||||||
|
src: 'Gruntfile.js'
|
||||||
|
},
|
||||||
|
src: {
|
||||||
|
src: ['js/*.js']
|
||||||
|
},
|
||||||
|
test: {
|
||||||
|
src: ['js/tests/unit/*.js']
|
||||||
|
}
|
||||||
|
},
|
||||||
|
recess: {
|
||||||
|
options: {
|
||||||
|
compile: true
|
||||||
|
},
|
||||||
|
bootstrap: {
|
||||||
|
files: {
|
||||||
|
'dist/css/bootstrap.css': ['less/bootstrap.less']
|
||||||
|
}
|
||||||
|
},
|
||||||
|
min: {
|
||||||
|
options: {
|
||||||
|
compress: true
|
||||||
|
},
|
||||||
|
files: {
|
||||||
|
'dist/css/bootstrap.min.css': ['less/bootstrap.less']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
uglify: {
|
||||||
|
options: {
|
||||||
|
banner: '<%= banner %>'
|
||||||
|
},
|
||||||
|
bootstrap: {
|
||||||
|
files: {
|
||||||
|
'dist/js/<%= pkg.name %>.min.js': ['<%= concat.bootstrap.dest %>']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
qunit: {
|
||||||
|
options: {
|
||||||
|
inject: 'js/tests/unit/phantom.js'
|
||||||
|
},
|
||||||
|
files: ['js/tests/*.html']
|
||||||
|
},
|
||||||
|
connect: {
|
||||||
|
server: {
|
||||||
|
options: {
|
||||||
|
port: 3000,
|
||||||
|
base: '.'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
src: {
|
||||||
|
files: '<%= jshint.src.src %>',
|
||||||
|
tasks: ['jshint:src', 'qunit']
|
||||||
|
},
|
||||||
|
test: {
|
||||||
|
files: '<%= jshint.test.src %>',
|
||||||
|
tasks: ['jshint:test', 'qunit']
|
||||||
|
},
|
||||||
|
recess: {
|
||||||
|
files: 'less/*.less',
|
||||||
|
tasks: ['recess']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// These plugins provide necessary tasks.
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-connect');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-clean');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-concat');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-jshint');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-uglify');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-qunit');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||||
|
grunt.loadNpmTasks('grunt-recess');
|
||||||
|
|
||||||
|
|
||||||
|
// Test task.
|
||||||
|
grunt.registerTask('test', ['jshint', 'qunit']);
|
||||||
|
|
||||||
|
// JS distribution task.
|
||||||
|
grunt.registerTask('dist-js', ['concat', 'uglify']);
|
||||||
|
|
||||||
|
// CSS distribution task.
|
||||||
|
grunt.registerTask('dist-css', ['recess']);
|
||||||
|
|
||||||
|
// Full distribution task.
|
||||||
|
grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']);
|
||||||
|
|
||||||
|
// Default task.
|
||||||
|
grunt.registerTask('default', ['test', 'dist']);
|
||||||
|
};
|
107
Makefile
107
Makefile
@ -1,107 +0,0 @@
|
|||||||
BOOTSTRAP ?= ./dist/css/bootstrap.css
|
|
||||||
BOOTSTRAP_MIN ?= ./dist/css/bootstrap.min.css
|
|
||||||
BOOTSTRAP_LESS ?= ./less/bootstrap.less
|
|
||||||
DATE=$(shell date +%I:%M%p)
|
|
||||||
CHECK=\033[32m✔ Done\033[39m
|
|
||||||
HR=\033[37m--------------------------------------------------\033[39m
|
|
||||||
PATH := ./node_modules/.bin:$(PATH)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# BUILD DOCS
|
|
||||||
#
|
|
||||||
|
|
||||||
build:
|
|
||||||
@echo "\n\n"
|
|
||||||
@echo "\033[36mBuilding Bootstrap...\033[39m"
|
|
||||||
@echo "${HR}"
|
|
||||||
@printf "Running JSHint on JavaScript..."
|
|
||||||
@jshint js/*.js --config js/.jshintrc
|
|
||||||
@jshint js/tests/unit/*.js --config js/.jshintrc
|
|
||||||
@echo " ${CHECK}"
|
|
||||||
@printf "Compiling LESS with Recess..."
|
|
||||||
@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
|
|
||||||
@recess --compress ${BOOTSTRAP_LESS} > ${BOOTSTRAP_MIN}
|
|
||||||
@echo " ${CHECK}"
|
|
||||||
@printf "Prepping documentation assets..."
|
|
||||||
@cp js/tests/vendor/jquery.js assets/js/
|
|
||||||
@echo " ${CHECK}"
|
|
||||||
@printf "Compiling and minifying JavaScript..."
|
|
||||||
@echo "if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n" | cat - js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js
|
|
||||||
@uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.tmp.js
|
|
||||||
@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > dist/js/copyright.js
|
|
||||||
@cat dist/js/copyright.js dist/js/bootstrap.min.tmp.js > dist/js/bootstrap.min.js
|
|
||||||
@rm dist/js/copyright.js dist/js/bootstrap.min.tmp.js
|
|
||||||
@echo " ${CHECK}"
|
|
||||||
@echo "${HR}"
|
|
||||||
@echo "\033[36mSuccess!\n\033[39m"
|
|
||||||
@echo "\033[37mThanks for using Bootstrap,"
|
|
||||||
@echo "<3 @mdo and @fat\n\033[39m"
|
|
||||||
|
|
||||||
#
|
|
||||||
# RUN JSHINT & QUNIT TESTS IN PHANTOMJS
|
|
||||||
#
|
|
||||||
|
|
||||||
test:
|
|
||||||
jshint js/*.js --config js/.jshintrc
|
|
||||||
jshint js/tests/unit/*.js --config js/.jshintrc
|
|
||||||
node js/tests/server.js &
|
|
||||||
phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
|
|
||||||
kill -9 `cat js/tests/pid.txt`
|
|
||||||
rm js/tests/pid.txt
|
|
||||||
|
|
||||||
#
|
|
||||||
# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
|
|
||||||
#
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -r bootstrap
|
|
||||||
|
|
||||||
#
|
|
||||||
# BUILD SIMPLE BOOTSTRAP DIRECTORY
|
|
||||||
# recess & uglifyjs are required
|
|
||||||
#
|
|
||||||
|
|
||||||
bootstrap: bootstrap-css bootstrap-js
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# JS COMPILE
|
|
||||||
#
|
|
||||||
bootstrap-js: bootstrap/js/*.js
|
|
||||||
|
|
||||||
bootstrap/js/*.js: js/*.js
|
|
||||||
mkdir -p bootstrap/js
|
|
||||||
cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > bootstrap/js/bootstrap.js
|
|
||||||
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
|
|
||||||
echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
|
|
||||||
cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
|
|
||||||
rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
|
|
||||||
|
|
||||||
#
|
|
||||||
# CSS COMPILE
|
|
||||||
#
|
|
||||||
|
|
||||||
bootstrap-css: bootstrap/css/*.css
|
|
||||||
|
|
||||||
bootstrap/css/*.css: less/*.less
|
|
||||||
mkdir -p bootstrap/css
|
|
||||||
recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
|
|
||||||
recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
|
|
||||||
|
|
||||||
#
|
|
||||||
# WATCH LESS FILES
|
|
||||||
#
|
|
||||||
|
|
||||||
watch:
|
|
||||||
echo "Watching less files..."; \
|
|
||||||
watchr -e "watch('less/.*\.less') { system 'make' }"
|
|
||||||
|
|
||||||
#
|
|
||||||
# BUILD AND START SERVER
|
|
||||||
#
|
|
||||||
|
|
||||||
run: build
|
|
||||||
jekyll build && jekyll server
|
|
||||||
|
|
||||||
.PHONY: docs watch gh-pages bootstrap-css bootstrap-js
|
|
25
README.md
25
README.md
@ -46,33 +46,36 @@ Documentation for v2.3.2 has been made available for the time being at [http://g
|
|||||||
|
|
||||||
## Compiling CSS and JavaScript
|
## Compiling CSS and JavaScript
|
||||||
|
|
||||||
Bootstrap includes a [makefile](Makefile) with convenient methods for working with the framework. Before getting started, install [the necessary local dependencies](package.json):
|
Bootstrap uses [GruntJS](http://gruntjs.com/) with convenient methods for working with the framework. Before getting started, be sure to have `grunt-cli` installed globally (`npm install -g grunt-cli`) and then install [the necessary local dependencies](package.json):
|
||||||
|
|
||||||
```
|
```
|
||||||
|
# if grunt-cli isn't already installed
|
||||||
|
$ npm install -g grunt-cli
|
||||||
|
|
||||||
$ npm install
|
$ npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
When completed, you'll be able to run the various make commands provided.
|
When completed, you'll be able to run the various grunt commands provided.
|
||||||
|
|
||||||
**Unfamiliar with `npm`? Don't have node installed?** That's a-okay. npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js. [Download and install node.js](http://nodejs.org/download/) before proceeding.
|
**Unfamiliar with `npm`? Don't have node installed?** That's a-okay. npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js. [Download and install node.js](http://nodejs.org/download/) before proceeding.
|
||||||
|
|
||||||
### Available makefile commands
|
### Available grunt commands
|
||||||
|
|
||||||
#### Build - `make`
|
#### Build - `grunt`
|
||||||
`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.**
|
`grunt` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.**
|
||||||
|
|
||||||
#### Compile CSS, JS, and fonts - `make bootstrap`
|
#### Compile CSS, JS, and fonts - `grunt bootstrap`
|
||||||
`make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
|
`grunt bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
|
||||||
|
|
||||||
#### Tests - `make test`
|
#### Tests - `grunt test`
|
||||||
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
|
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
|
||||||
|
|
||||||
#### Watch - `make watch`
|
#### Watch - `grunt watch`
|
||||||
This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the watchr gem.**
|
This is a convenience method for watching just Less files and automatically building them whenever you save.
|
||||||
|
|
||||||
### Troubleshooting dependencies
|
### Troubleshooting dependencies
|
||||||
|
|
||||||
Should you encounter problems with installing dependencies or running makefile commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
|
Should you encounter problems with installing dependencies or running grunt commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
2
dist/css/bootstrap.css
vendored
2
dist/css/bootstrap.css
vendored
@ -4668,4 +4668,4 @@ td.visible-print {
|
|||||||
td.hidden-print {
|
td.hidden-print {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
1065
dist/js/bootstrap.js
vendored
1065
dist/js/bootstrap.js
vendored
@ -1,11 +1,13 @@
|
|||||||
if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
/**
|
||||||
|
* bootstrap.js v3.0.0 by @fat and @mdo
|
||||||
|
* Copyright 2013 Twitter Inc.
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*/
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: transition.js v3.0.0
|
* Bootstrap: affix.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#transitions
|
* http://twbs.github.com/bootstrap/javascript.html#affix
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -23,39 +25,111 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
|
|
||||||
+function ($) { "use strict";
|
+function ($) { "use strict";
|
||||||
|
|
||||||
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
|
// AFFIX CLASS DEFINITION
|
||||||
// ============================================================
|
// ======================
|
||||||
|
|
||||||
function transitionEnd() {
|
var Affix = function (element, options) {
|
||||||
var el = document.createElement('bootstrap')
|
this.options = $.extend({}, Affix.DEFAULTS, options)
|
||||||
|
this.$window = $(window)
|
||||||
|
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
|
||||||
|
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
|
||||||
|
|
||||||
var transEndEventNames = {
|
this.$element = $(element)
|
||||||
'WebkitTransition' : 'webkitTransitionEnd'
|
this.affixed =
|
||||||
, 'MozTransition' : 'transitionend'
|
this.unpin = null
|
||||||
, 'OTransition' : 'oTransitionEnd otransitionend'
|
|
||||||
, 'transition' : 'transitionend'
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var name in transEndEventNames) {
|
this.checkPosition()
|
||||||
if (el.style[name] !== undefined) {
|
}
|
||||||
return { end: transEndEventNames[name] }
|
|
||||||
}
|
Affix.RESET = 'affix affix-top affix-bottom'
|
||||||
|
|
||||||
|
Affix.DEFAULTS = {
|
||||||
|
offset: 0
|
||||||
|
}
|
||||||
|
|
||||||
|
Affix.prototype.checkPositionWithEventLoop = function () {
|
||||||
|
setTimeout($.proxy(this.checkPosition, this), 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
Affix.prototype.checkPosition = function () {
|
||||||
|
if (!this.$element.is(':visible')) return
|
||||||
|
|
||||||
|
var scrollHeight = $(document).height()
|
||||||
|
var scrollTop = this.$window.scrollTop()
|
||||||
|
var position = this.$element.offset()
|
||||||
|
var offset = this.options.offset
|
||||||
|
var offsetTop = offset.top
|
||||||
|
var offsetBottom = offset.bottom
|
||||||
|
|
||||||
|
if (typeof offset != 'object') offsetBottom = offsetTop = offset
|
||||||
|
if (typeof offsetTop == 'function') offsetTop = offset.top()
|
||||||
|
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
|
||||||
|
|
||||||
|
var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false :
|
||||||
|
offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
|
||||||
|
offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false
|
||||||
|
|
||||||
|
if (this.affixed === affix) return
|
||||||
|
if (this.unpin) this.$element.css('top', '')
|
||||||
|
|
||||||
|
this.affixed = affix
|
||||||
|
this.unpin = affix == 'bottom' ? position.top - scrollTop : null
|
||||||
|
|
||||||
|
this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
|
||||||
|
|
||||||
|
if (affix == 'bottom') {
|
||||||
|
this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// http://blog.alexmaccaw.com/css-transitions
|
|
||||||
$.fn.emulateTransitionEnd = function (duration) {
|
// AFFIX PLUGIN DEFINITION
|
||||||
var called = false, $el = this
|
// =======================
|
||||||
$(this).one('webkitTransitionEnd', function () { called = true })
|
|
||||||
var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
|
var old = $.fn.affix
|
||||||
setTimeout(callback, duration)
|
|
||||||
|
$.fn.affix = function (option) {
|
||||||
|
return this.each(function () {
|
||||||
|
var $this = $(this)
|
||||||
|
var data = $this.data('bs.affix')
|
||||||
|
var options = typeof option == 'object' && option
|
||||||
|
|
||||||
|
if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
|
||||||
|
if (typeof option == 'string') data[option]()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
$(function () {
|
$.fn.affix.Constructor = Affix
|
||||||
$.support.transition = transitionEnd()
|
|
||||||
|
|
||||||
|
// AFFIX NO CONFLICT
|
||||||
|
// =================
|
||||||
|
|
||||||
|
$.fn.affix.noConflict = function () {
|
||||||
|
$.fn.affix = old
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// AFFIX DATA-API
|
||||||
|
// ==============
|
||||||
|
|
||||||
|
$(window).on('load', function () {
|
||||||
|
$('[data-spy="affix"]').each(function () {
|
||||||
|
var $spy = $(this)
|
||||||
|
var data = $spy.data()
|
||||||
|
|
||||||
|
data.offset = data.offset || {}
|
||||||
|
|
||||||
|
if (data.offsetBottom) data.offset.bottom = data.offsetBottom
|
||||||
|
if (data.offsetTop) data.offset.top = data.offsetTop
|
||||||
|
|
||||||
|
$spy.affix(data)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: alert.js v3.0.0
|
* Bootstrap: alert.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#alerts
|
* http://twbs.github.com/bootstrap/javascript.html#alerts
|
||||||
@ -154,6 +228,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
|
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: button.js v3.0.0
|
* Bootstrap: button.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#buttons
|
* http://twbs.github.com/bootstrap/javascript.html#buttons
|
||||||
@ -261,6 +336,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: carousel.js v3.0.0
|
* Bootstrap: carousel.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#carousel
|
* http://twbs.github.com/bootstrap/javascript.html#carousel
|
||||||
@ -474,6 +550,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: collapse.js v3.0.0
|
* Bootstrap: collapse.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#collapse
|
* http://twbs.github.com/bootstrap/javascript.html#collapse
|
||||||
@ -642,6 +719,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: dropdown.js v3.0.0
|
* Bootstrap: dropdown.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
|
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
|
||||||
@ -796,6 +874,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: modal.js v3.0.0
|
* Bootstrap: modal.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#modals
|
* http://twbs.github.com/bootstrap/javascript.html#modals
|
||||||
@ -1037,6 +1116,414 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
.on('hidden.bs.modal', '.modal', function () { $body.removeClass('modal-open') })
|
.on('hidden.bs.modal', '.modal', function () { $body.removeClass('modal-open') })
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
|
/* ========================================================================
|
||||||
|
* Bootstrap: popover.js v3.0.0
|
||||||
|
* http://twbs.github.com/bootstrap/javascript.html#popovers
|
||||||
|
* ========================================================================
|
||||||
|
* 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.
|
||||||
|
* 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";
|
||||||
|
|
||||||
|
// POPOVER PUBLIC CLASS DEFINITION
|
||||||
|
// ===============================
|
||||||
|
|
||||||
|
var Popover = function (element, options) {
|
||||||
|
this.init('popover', element, options)
|
||||||
|
}
|
||||||
|
|
||||||
|
Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
|
||||||
|
placement: 'right'
|
||||||
|
, trigger: 'click'
|
||||||
|
, content: ''
|
||||||
|
, template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
// NOTE: POPOVER EXTENDS tooltip.js
|
||||||
|
// ================================
|
||||||
|
|
||||||
|
Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
|
||||||
|
|
||||||
|
Popover.prototype.constructor = Popover
|
||||||
|
|
||||||
|
Popover.prototype.getDefaults = function () {
|
||||||
|
return Popover.DEFAULTS
|
||||||
|
}
|
||||||
|
|
||||||
|
Popover.prototype.setContent = function () {
|
||||||
|
var $tip = this.tip()
|
||||||
|
var title = this.getTitle()
|
||||||
|
var content = this.getContent()
|
||||||
|
|
||||||
|
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
|
||||||
|
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
|
||||||
|
|
||||||
|
$tip.removeClass('fade top bottom left right in')
|
||||||
|
|
||||||
|
$tip.find('.popover-title:empty').hide()
|
||||||
|
}
|
||||||
|
|
||||||
|
Popover.prototype.hasContent = function () {
|
||||||
|
return this.getTitle() || this.getContent()
|
||||||
|
}
|
||||||
|
|
||||||
|
Popover.prototype.getContent = function () {
|
||||||
|
var $e = this.$element
|
||||||
|
var o = this.options
|
||||||
|
|
||||||
|
return $e.attr('data-content')
|
||||||
|
|| (typeof o.content == 'function' ?
|
||||||
|
o.content.call($e[0]) :
|
||||||
|
o.content)
|
||||||
|
}
|
||||||
|
|
||||||
|
Popover.prototype.tip = function () {
|
||||||
|
if (!this.$tip) this.$tip = $(this.options.template)
|
||||||
|
return this.$tip
|
||||||
|
}
|
||||||
|
|
||||||
|
Popover.prototype.destroy = function () {
|
||||||
|
this.hide().$element.off('.' + this.type).removeData(this.type)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// POPOVER PLUGIN DEFINITION
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
var old = $.fn.popover
|
||||||
|
|
||||||
|
$.fn.popover = function (option) {
|
||||||
|
return this.each(function () {
|
||||||
|
var $this = $(this)
|
||||||
|
var data = $this.data('bs.popover')
|
||||||
|
var options = typeof option == 'object' && option
|
||||||
|
|
||||||
|
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
|
||||||
|
if (typeof option == 'string') data[option]()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
$.fn.popover.Constructor = Popover
|
||||||
|
|
||||||
|
|
||||||
|
// POPOVER NO CONFLICT
|
||||||
|
// ===================
|
||||||
|
|
||||||
|
$.fn.popover.noConflict = function () {
|
||||||
|
$.fn.popover = old
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
}(window.jQuery);
|
||||||
|
|
||||||
|
/* ========================================================================
|
||||||
|
* Bootstrap: scrollspy.js v3.0.0
|
||||||
|
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
|
||||||
|
* ========================================================================
|
||||||
|
* 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.
|
||||||
|
* 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";
|
||||||
|
|
||||||
|
// SCROLLSPY CLASS DEFINITION
|
||||||
|
// ==========================
|
||||||
|
|
||||||
|
function ScrollSpy(element, options) {
|
||||||
|
var href
|
||||||
|
var process = $.proxy(this.process, this)
|
||||||
|
var $element = $(element).is('body') ? $(window) : $(element)
|
||||||
|
|
||||||
|
this.$body = $('body')
|
||||||
|
this.$scrollElement = $element.on('scroll.bs.scroll-spy.data-api', process)
|
||||||
|
this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
|
||||||
|
this.selector = (this.options.target
|
||||||
|
|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||||
|
|| '') + ' .nav li > a'
|
||||||
|
this.offsets = $([])
|
||||||
|
this.targets = $([])
|
||||||
|
this.activeTarget = null
|
||||||
|
|
||||||
|
this.refresh()
|
||||||
|
this.process()
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollSpy.DEFAULTS = {
|
||||||
|
offset: 10
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollSpy.prototype.refresh = function () {
|
||||||
|
this.offsets = $([])
|
||||||
|
this.targets = $([])
|
||||||
|
|
||||||
|
var self = this
|
||||||
|
var $targets = this.$body
|
||||||
|
.find(this.selector)
|
||||||
|
.map(function () {
|
||||||
|
var $el = $(this)
|
||||||
|
var href = $el.data('target') || $el.attr('href')
|
||||||
|
var $href = /^#\w/.test(href) && $(href)
|
||||||
|
|
||||||
|
return ($href
|
||||||
|
&& $href.length
|
||||||
|
&& [[ $href.offset().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
|
||||||
|
})
|
||||||
|
.sort(function (a, b) { return a[0] - b[0] })
|
||||||
|
.each(function () {
|
||||||
|
self.offsets.push(this[0])
|
||||||
|
self.targets.push(this[1])
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollSpy.prototype.process = function () {
|
||||||
|
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
|
||||||
|
var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
|
||||||
|
var maxScroll = scrollHeight - this.$scrollElement.height()
|
||||||
|
var offsets = this.offsets
|
||||||
|
var targets = this.targets
|
||||||
|
var activeTarget = this.activeTarget
|
||||||
|
var 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.activate( targets[i] )
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollSpy.prototype.activate = function (target) {
|
||||||
|
this.activeTarget = target
|
||||||
|
|
||||||
|
$(this.selector)
|
||||||
|
.parents('.active')
|
||||||
|
.removeClass('active')
|
||||||
|
|
||||||
|
var selector = this.selector
|
||||||
|
+ '[data-target="' + target + '"],'
|
||||||
|
+ this.selector + '[href="' + target + '"]'
|
||||||
|
|
||||||
|
var active = $(selector)
|
||||||
|
.parents('li')
|
||||||
|
.addClass('active')
|
||||||
|
|
||||||
|
if (active.parent('.dropdown-menu').length) {
|
||||||
|
active = active
|
||||||
|
.closest('li.dropdown')
|
||||||
|
.addClass('active')
|
||||||
|
}
|
||||||
|
|
||||||
|
active.trigger('activate')
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// SCROLLSPY PLUGIN DEFINITION
|
||||||
|
// ===========================
|
||||||
|
|
||||||
|
var old = $.fn.scrollspy
|
||||||
|
|
||||||
|
$.fn.scrollspy = function (option) {
|
||||||
|
return this.each(function () {
|
||||||
|
var $this = $(this)
|
||||||
|
var data = $this.data('bs.scrollspy')
|
||||||
|
var options = typeof option == 'object' && option
|
||||||
|
|
||||||
|
if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
|
||||||
|
if (typeof option == 'string') data[option]()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
$.fn.scrollspy.Constructor = ScrollSpy
|
||||||
|
|
||||||
|
|
||||||
|
// SCROLLSPY NO CONFLICT
|
||||||
|
// =====================
|
||||||
|
|
||||||
|
$.fn.scrollspy.noConflict = function () {
|
||||||
|
$.fn.scrollspy = old
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// SCROLLSPY DATA-API
|
||||||
|
// ==================
|
||||||
|
|
||||||
|
$(window).on('load', function () {
|
||||||
|
$('[data-spy="scroll"]').each(function () {
|
||||||
|
var $spy = $(this)
|
||||||
|
$spy.scrollspy($spy.data())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
}(window.jQuery);
|
||||||
|
|
||||||
|
/* ========================================================================
|
||||||
|
* Bootstrap: tab.js v3.0.0
|
||||||
|
* http://twbs.github.com/bootstrap/javascript.html#tabs
|
||||||
|
* ========================================================================
|
||||||
|
* 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.
|
||||||
|
* 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";
|
||||||
|
|
||||||
|
// TAB CLASS DEFINITION
|
||||||
|
// ====================
|
||||||
|
|
||||||
|
var Tab = function (element) {
|
||||||
|
this.element = $(element)
|
||||||
|
}
|
||||||
|
|
||||||
|
Tab.prototype.show = function () {
|
||||||
|
var $this = this.element
|
||||||
|
var $ul = $this.closest('ul:not(.dropdown-menu)')
|
||||||
|
var selector = $this.attr('data-target')
|
||||||
|
|
||||||
|
if (!selector) {
|
||||||
|
selector = $this.attr('href')
|
||||||
|
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this.parent('li').hasClass('active')) return
|
||||||
|
|
||||||
|
var previous = $ul.find('.active:last a')[0]
|
||||||
|
var e = $.Event('show.bs.tab', {
|
||||||
|
relatedTarget: previous
|
||||||
|
})
|
||||||
|
|
||||||
|
$this.trigger(e)
|
||||||
|
|
||||||
|
if (e.isDefaultPrevented()) return
|
||||||
|
|
||||||
|
var $target = $(selector)
|
||||||
|
|
||||||
|
this.activate($this.parent('li'), $ul)
|
||||||
|
this.activate($target, $target.parent(), function () {
|
||||||
|
$this.trigger({
|
||||||
|
type: 'shown.bs.tab'
|
||||||
|
, relatedTarget: previous
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Tab.prototype.activate = function (element, container, callback) {
|
||||||
|
var $active = container.find('> .active')
|
||||||
|
var transition = callback
|
||||||
|
&& $.support.transition
|
||||||
|
&& $active.hasClass('fade')
|
||||||
|
|
||||||
|
function next() {
|
||||||
|
$active
|
||||||
|
.removeClass('active')
|
||||||
|
.find('> .dropdown-menu > .active')
|
||||||
|
.removeClass('active')
|
||||||
|
|
||||||
|
element.addClass('active')
|
||||||
|
|
||||||
|
if (transition) {
|
||||||
|
element[0].offsetWidth // reflow for transition
|
||||||
|
element.addClass('in')
|
||||||
|
} else {
|
||||||
|
element.removeClass('fade')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (element.parent('.dropdown-menu')) {
|
||||||
|
element.closest('li.dropdown').addClass('active')
|
||||||
|
}
|
||||||
|
|
||||||
|
callback && callback()
|
||||||
|
}
|
||||||
|
|
||||||
|
transition ?
|
||||||
|
$active
|
||||||
|
.one($.support.transition.end, next)
|
||||||
|
.emulateTransitionEnd(150) :
|
||||||
|
next()
|
||||||
|
|
||||||
|
$active.removeClass('in')
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// TAB PLUGIN DEFINITION
|
||||||
|
// =====================
|
||||||
|
|
||||||
|
var old = $.fn.tab
|
||||||
|
|
||||||
|
$.fn.tab = function ( option ) {
|
||||||
|
return this.each(function () {
|
||||||
|
var $this = $(this)
|
||||||
|
var data = $this.data('bs.tab')
|
||||||
|
|
||||||
|
if (!data) $this.data('bs.tab', (data = new Tab(this)))
|
||||||
|
if (typeof option == 'string') data[option]()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
$.fn.tab.Constructor = Tab
|
||||||
|
|
||||||
|
|
||||||
|
// TAB NO CONFLICT
|
||||||
|
// ===============
|
||||||
|
|
||||||
|
$.fn.tab.noConflict = function () {
|
||||||
|
$.fn.tab = old
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// TAB DATA-API
|
||||||
|
// ============
|
||||||
|
|
||||||
|
$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
||||||
|
e.preventDefault()
|
||||||
|
$(this).tab('show')
|
||||||
|
})
|
||||||
|
|
||||||
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: tooltip.js v3.0.0
|
* Bootstrap: tooltip.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#affix
|
* http://twbs.github.com/bootstrap/javascript.html#affix
|
||||||
@ -1401,11 +1888,12 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
}
|
}
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: popover.js v3.0.0
|
* Bootstrap: transition.js v3.0.0
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#popovers
|
* http://twbs.github.com/bootstrap/javascript.html#transitions
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -1423,511 +1911,36 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
|||||||
|
|
||||||
+function ($) { "use strict";
|
+function ($) { "use strict";
|
||||||
|
|
||||||
// POPOVER PUBLIC CLASS DEFINITION
|
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
|
||||||
// ===============================
|
// ============================================================
|
||||||
|
|
||||||
var Popover = function (element, options) {
|
function transitionEnd() {
|
||||||
this.init('popover', element, options)
|
var el = document.createElement('bootstrap')
|
||||||
}
|
|
||||||
|
|
||||||
Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
|
var transEndEventNames = {
|
||||||
placement: 'right'
|
'WebkitTransition' : 'webkitTransitionEnd'
|
||||||
, trigger: 'click'
|
, 'MozTransition' : 'transitionend'
|
||||||
, content: ''
|
, 'OTransition' : 'oTransitionEnd otransitionend'
|
||||||
, template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
|
, 'transition' : 'transitionend'
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
// NOTE: POPOVER EXTENDS tooltip.js
|
|
||||||
// ================================
|
|
||||||
|
|
||||||
Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
|
|
||||||
|
|
||||||
Popover.prototype.constructor = Popover
|
|
||||||
|
|
||||||
Popover.prototype.getDefaults = function () {
|
|
||||||
return Popover.DEFAULTS
|
|
||||||
}
|
|
||||||
|
|
||||||
Popover.prototype.setContent = function () {
|
|
||||||
var $tip = this.tip()
|
|
||||||
var title = this.getTitle()
|
|
||||||
var content = this.getContent()
|
|
||||||
|
|
||||||
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
|
|
||||||
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
|
|
||||||
|
|
||||||
$tip.removeClass('fade top bottom left right in')
|
|
||||||
|
|
||||||
$tip.find('.popover-title:empty').hide()
|
|
||||||
}
|
|
||||||
|
|
||||||
Popover.prototype.hasContent = function () {
|
|
||||||
return this.getTitle() || this.getContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
Popover.prototype.getContent = function () {
|
|
||||||
var $e = this.$element
|
|
||||||
var o = this.options
|
|
||||||
|
|
||||||
return $e.attr('data-content')
|
|
||||||
|| (typeof o.content == 'function' ?
|
|
||||||
o.content.call($e[0]) :
|
|
||||||
o.content)
|
|
||||||
}
|
|
||||||
|
|
||||||
Popover.prototype.tip = function () {
|
|
||||||
if (!this.$tip) this.$tip = $(this.options.template)
|
|
||||||
return this.$tip
|
|
||||||
}
|
|
||||||
|
|
||||||
Popover.prototype.destroy = function () {
|
|
||||||
this.hide().$element.off('.' + this.type).removeData(this.type)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// POPOVER PLUGIN DEFINITION
|
|
||||||
// =========================
|
|
||||||
|
|
||||||
var old = $.fn.popover
|
|
||||||
|
|
||||||
$.fn.popover = function (option) {
|
|
||||||
return this.each(function () {
|
|
||||||
var $this = $(this)
|
|
||||||
var data = $this.data('bs.popover')
|
|
||||||
var options = typeof option == 'object' && option
|
|
||||||
|
|
||||||
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
|
|
||||||
if (typeof option == 'string') data[option]()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
$.fn.popover.Constructor = Popover
|
|
||||||
|
|
||||||
|
|
||||||
// POPOVER NO CONFLICT
|
|
||||||
// ===================
|
|
||||||
|
|
||||||
$.fn.popover.noConflict = function () {
|
|
||||||
$.fn.popover = old
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
}(window.jQuery);
|
|
||||||
/* ========================================================================
|
|
||||||
* Bootstrap: scrollspy.js v3.0.0
|
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
|
|
||||||
* ========================================================================
|
|
||||||
* 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.
|
|
||||||
* 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";
|
|
||||||
|
|
||||||
// SCROLLSPY CLASS DEFINITION
|
|
||||||
// ==========================
|
|
||||||
|
|
||||||
function ScrollSpy(element, options) {
|
|
||||||
var href
|
|
||||||
var process = $.proxy(this.process, this)
|
|
||||||
var $element = $(element).is('body') ? $(window) : $(element)
|
|
||||||
|
|
||||||
this.$body = $('body')
|
|
||||||
this.$scrollElement = $element.on('scroll.bs.scroll-spy.data-api', process)
|
|
||||||
this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
|
|
||||||
this.selector = (this.options.target
|
|
||||||
|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
|
||||||
|| '') + ' .nav li > a'
|
|
||||||
this.offsets = $([])
|
|
||||||
this.targets = $([])
|
|
||||||
this.activeTarget = null
|
|
||||||
|
|
||||||
this.refresh()
|
|
||||||
this.process()
|
|
||||||
}
|
|
||||||
|
|
||||||
ScrollSpy.DEFAULTS = {
|
|
||||||
offset: 10
|
|
||||||
}
|
|
||||||
|
|
||||||
ScrollSpy.prototype.refresh = function () {
|
|
||||||
this.offsets = $([])
|
|
||||||
this.targets = $([])
|
|
||||||
|
|
||||||
var self = this
|
|
||||||
var $targets = this.$body
|
|
||||||
.find(this.selector)
|
|
||||||
.map(function () {
|
|
||||||
var $el = $(this)
|
|
||||||
var href = $el.data('target') || $el.attr('href')
|
|
||||||
var $href = /^#\w/.test(href) && $(href)
|
|
||||||
|
|
||||||
return ($href
|
|
||||||
&& $href.length
|
|
||||||
&& [[ $href.offset().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
|
|
||||||
})
|
|
||||||
.sort(function (a, b) { return a[0] - b[0] })
|
|
||||||
.each(function () {
|
|
||||||
self.offsets.push(this[0])
|
|
||||||
self.targets.push(this[1])
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
ScrollSpy.prototype.process = function () {
|
|
||||||
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
|
|
||||||
var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
|
|
||||||
var maxScroll = scrollHeight - this.$scrollElement.height()
|
|
||||||
var offsets = this.offsets
|
|
||||||
var targets = this.targets
|
|
||||||
var activeTarget = this.activeTarget
|
|
||||||
var i
|
|
||||||
|
|
||||||
if (scrollTop >= maxScroll) {
|
|
||||||
return activeTarget != (i = targets.last()[0]) && this.activate(i)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = offsets.length; i--;) {
|
for (var name in transEndEventNames) {
|
||||||
activeTarget != targets[i]
|
if (el.style[name] !== undefined) {
|
||||||
&& scrollTop >= offsets[i]
|
return { end: transEndEventNames[name] }
|
||||||
&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
|
|
||||||
&& this.activate( targets[i] )
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ScrollSpy.prototype.activate = function (target) {
|
|
||||||
this.activeTarget = target
|
|
||||||
|
|
||||||
$(this.selector)
|
|
||||||
.parents('.active')
|
|
||||||
.removeClass('active')
|
|
||||||
|
|
||||||
var selector = this.selector
|
|
||||||
+ '[data-target="' + target + '"],'
|
|
||||||
+ this.selector + '[href="' + target + '"]'
|
|
||||||
|
|
||||||
var active = $(selector)
|
|
||||||
.parents('li')
|
|
||||||
.addClass('active')
|
|
||||||
|
|
||||||
if (active.parent('.dropdown-menu').length) {
|
|
||||||
active = active
|
|
||||||
.closest('li.dropdown')
|
|
||||||
.addClass('active')
|
|
||||||
}
|
|
||||||
|
|
||||||
active.trigger('activate')
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// SCROLLSPY PLUGIN DEFINITION
|
|
||||||
// ===========================
|
|
||||||
|
|
||||||
var old = $.fn.scrollspy
|
|
||||||
|
|
||||||
$.fn.scrollspy = function (option) {
|
|
||||||
return this.each(function () {
|
|
||||||
var $this = $(this)
|
|
||||||
var data = $this.data('bs.scrollspy')
|
|
||||||
var options = typeof option == 'object' && option
|
|
||||||
|
|
||||||
if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
|
|
||||||
if (typeof option == 'string') data[option]()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
$.fn.scrollspy.Constructor = ScrollSpy
|
|
||||||
|
|
||||||
|
|
||||||
// SCROLLSPY NO CONFLICT
|
|
||||||
// =====================
|
|
||||||
|
|
||||||
$.fn.scrollspy.noConflict = function () {
|
|
||||||
$.fn.scrollspy = old
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// SCROLLSPY DATA-API
|
|
||||||
// ==================
|
|
||||||
|
|
||||||
$(window).on('load', function () {
|
|
||||||
$('[data-spy="scroll"]').each(function () {
|
|
||||||
var $spy = $(this)
|
|
||||||
$spy.scrollspy($spy.data())
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
}(window.jQuery);
|
|
||||||
/* ========================================================================
|
|
||||||
* Bootstrap: tab.js v3.0.0
|
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#tabs
|
|
||||||
* ========================================================================
|
|
||||||
* 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.
|
|
||||||
* 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";
|
|
||||||
|
|
||||||
// TAB CLASS DEFINITION
|
|
||||||
// ====================
|
|
||||||
|
|
||||||
var Tab = function (element) {
|
|
||||||
this.element = $(element)
|
|
||||||
}
|
|
||||||
|
|
||||||
Tab.prototype.show = function () {
|
|
||||||
var $this = this.element
|
|
||||||
var $ul = $this.closest('ul:not(.dropdown-menu)')
|
|
||||||
var selector = $this.attr('data-target')
|
|
||||||
|
|
||||||
if (!selector) {
|
|
||||||
selector = $this.attr('href')
|
|
||||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this.parent('li').hasClass('active')) return
|
|
||||||
|
|
||||||
var previous = $ul.find('.active:last a')[0]
|
|
||||||
var e = $.Event('show.bs.tab', {
|
|
||||||
relatedTarget: previous
|
|
||||||
})
|
|
||||||
|
|
||||||
$this.trigger(e)
|
|
||||||
|
|
||||||
if (e.isDefaultPrevented()) return
|
|
||||||
|
|
||||||
var $target = $(selector)
|
|
||||||
|
|
||||||
this.activate($this.parent('li'), $ul)
|
|
||||||
this.activate($target, $target.parent(), function () {
|
|
||||||
$this.trigger({
|
|
||||||
type: 'shown.bs.tab'
|
|
||||||
, relatedTarget: previous
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
Tab.prototype.activate = function (element, container, callback) {
|
|
||||||
var $active = container.find('> .active')
|
|
||||||
var transition = callback
|
|
||||||
&& $.support.transition
|
|
||||||
&& $active.hasClass('fade')
|
|
||||||
|
|
||||||
function next() {
|
|
||||||
$active
|
|
||||||
.removeClass('active')
|
|
||||||
.find('> .dropdown-menu > .active')
|
|
||||||
.removeClass('active')
|
|
||||||
|
|
||||||
element.addClass('active')
|
|
||||||
|
|
||||||
if (transition) {
|
|
||||||
element[0].offsetWidth // reflow for transition
|
|
||||||
element.addClass('in')
|
|
||||||
} else {
|
|
||||||
element.removeClass('fade')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (element.parent('.dropdown-menu')) {
|
|
||||||
element.closest('li.dropdown').addClass('active')
|
|
||||||
}
|
|
||||||
|
|
||||||
callback && callback()
|
|
||||||
}
|
|
||||||
|
|
||||||
transition ?
|
|
||||||
$active
|
|
||||||
.one($.support.transition.end, next)
|
|
||||||
.emulateTransitionEnd(150) :
|
|
||||||
next()
|
|
||||||
|
|
||||||
$active.removeClass('in')
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TAB PLUGIN DEFINITION
|
|
||||||
// =====================
|
|
||||||
|
|
||||||
var old = $.fn.tab
|
|
||||||
|
|
||||||
$.fn.tab = function ( option ) {
|
|
||||||
return this.each(function () {
|
|
||||||
var $this = $(this)
|
|
||||||
var data = $this.data('bs.tab')
|
|
||||||
|
|
||||||
if (!data) $this.data('bs.tab', (data = new Tab(this)))
|
|
||||||
if (typeof option == 'string') data[option]()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
$.fn.tab.Constructor = Tab
|
|
||||||
|
|
||||||
|
|
||||||
// TAB NO CONFLICT
|
|
||||||
// ===============
|
|
||||||
|
|
||||||
$.fn.tab.noConflict = function () {
|
|
||||||
$.fn.tab = old
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TAB DATA-API
|
|
||||||
// ============
|
|
||||||
|
|
||||||
$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
|
||||||
e.preventDefault()
|
|
||||||
$(this).tab('show')
|
|
||||||
})
|
|
||||||
|
|
||||||
}(window.jQuery);
|
|
||||||
/* ========================================================================
|
|
||||||
* Bootstrap: affix.js v3.0.0
|
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#affix
|
|
||||||
* ========================================================================
|
|
||||||
* 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.
|
|
||||||
* 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";
|
|
||||||
|
|
||||||
// AFFIX CLASS DEFINITION
|
|
||||||
// ======================
|
|
||||||
|
|
||||||
var Affix = function (element, options) {
|
|
||||||
this.options = $.extend({}, Affix.DEFAULTS, options)
|
|
||||||
this.$window = $(window)
|
|
||||||
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
|
|
||||||
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
|
|
||||||
|
|
||||||
this.$element = $(element)
|
|
||||||
this.affixed =
|
|
||||||
this.unpin = null
|
|
||||||
|
|
||||||
this.checkPosition()
|
|
||||||
}
|
|
||||||
|
|
||||||
Affix.RESET = 'affix affix-top affix-bottom'
|
|
||||||
|
|
||||||
Affix.DEFAULTS = {
|
|
||||||
offset: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
Affix.prototype.checkPositionWithEventLoop = function () {
|
|
||||||
setTimeout($.proxy(this.checkPosition, this), 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
Affix.prototype.checkPosition = function () {
|
|
||||||
if (!this.$element.is(':visible')) return
|
|
||||||
|
|
||||||
var scrollHeight = $(document).height()
|
|
||||||
var scrollTop = this.$window.scrollTop()
|
|
||||||
var position = this.$element.offset()
|
|
||||||
var offset = this.options.offset
|
|
||||||
var offsetTop = offset.top
|
|
||||||
var offsetBottom = offset.bottom
|
|
||||||
|
|
||||||
if (typeof offset != 'object') offsetBottom = offsetTop = offset
|
|
||||||
if (typeof offsetTop == 'function') offsetTop = offset.top()
|
|
||||||
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
|
|
||||||
|
|
||||||
var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false :
|
|
||||||
offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
|
|
||||||
offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false
|
|
||||||
|
|
||||||
if (this.affixed === affix) return
|
|
||||||
if (this.unpin) this.$element.css('top', '')
|
|
||||||
|
|
||||||
this.affixed = affix
|
|
||||||
this.unpin = affix == 'bottom' ? position.top - scrollTop : null
|
|
||||||
|
|
||||||
this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
|
|
||||||
|
|
||||||
if (affix == 'bottom') {
|
|
||||||
this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// http://blog.alexmaccaw.com/css-transitions
|
||||||
// AFFIX PLUGIN DEFINITION
|
$.fn.emulateTransitionEnd = function (duration) {
|
||||||
// =======================
|
var called = false, $el = this
|
||||||
|
$(this).one('webkitTransitionEnd', function () { called = true })
|
||||||
var old = $.fn.affix
|
var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
|
||||||
|
setTimeout(callback, duration)
|
||||||
$.fn.affix = function (option) {
|
|
||||||
return this.each(function () {
|
|
||||||
var $this = $(this)
|
|
||||||
var data = $this.data('bs.affix')
|
|
||||||
var options = typeof option == 'object' && option
|
|
||||||
|
|
||||||
if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
|
|
||||||
if (typeof option == 'string') data[option]()
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$.fn.affix.Constructor = Affix
|
$(function () {
|
||||||
|
$.support.transition = transitionEnd()
|
||||||
|
|
||||||
// AFFIX NO CONFLICT
|
|
||||||
// =================
|
|
||||||
|
|
||||||
$.fn.affix.noConflict = function () {
|
|
||||||
$.fn.affix = old
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// AFFIX DATA-API
|
|
||||||
// ==============
|
|
||||||
|
|
||||||
$(window).on('load', function () {
|
|
||||||
$('[data-spy="affix"]').each(function () {
|
|
||||||
var $spy = $(this)
|
|
||||||
var data = $spy.data()
|
|
||||||
|
|
||||||
data.offset = data.offset || {}
|
|
||||||
|
|
||||||
if (data.offsetBottom) data.offset.bottom = data.offsetBottom
|
|
||||||
if (data.offsetTop) data.offset.top = data.offsetTop
|
|
||||||
|
|
||||||
$spy.affix(data)
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
8
dist/js/bootstrap.min.js
vendored
8
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -11,9 +11,6 @@
|
|||||||
<link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
|
<link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
|
||||||
<script src="vendor/qunit.js"></script>
|
<script src="vendor/qunit.js"></script>
|
||||||
|
|
||||||
<!-- phantomjs logging script-->
|
|
||||||
<script src="unit/phantom.js"></script>
|
|
||||||
|
|
||||||
<!-- plugin sources -->
|
<!-- plugin sources -->
|
||||||
<script src="../../js/transition.js"></script>
|
<script src="../../js/transition.js"></script>
|
||||||
<script src="../../js/alert.js"></script>
|
<script src="../../js/alert.js"></script>
|
||||||
|
@ -40,14 +40,15 @@ $(function () {
|
|||||||
ok(btn.hasClass('disabled'), 'btn has disabled class')
|
ok(btn.hasClass('disabled'), 'btn has disabled class')
|
||||||
start()
|
start()
|
||||||
stop()
|
stop()
|
||||||
|
btn.button('reset')
|
||||||
|
equals(btn.html(), 'mdo', 'btn text equals mdo')
|
||||||
|
setTimeout(function () {
|
||||||
|
ok(!btn.attr('disabled'), 'btn is not disabled')
|
||||||
|
ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
|
||||||
|
start()
|
||||||
|
}, 0)
|
||||||
}, 0)
|
}, 0)
|
||||||
btn.button('reset')
|
|
||||||
equals(btn.html(), 'mdo', 'btn text equals mdo')
|
|
||||||
setTimeout(function () {
|
|
||||||
ok(!btn.attr('disabled'), 'btn is not disabled')
|
|
||||||
ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
|
|
||||||
start()
|
|
||||||
}, 0)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
test("should toggle active", function () {
|
test("should toggle active", function () {
|
||||||
|
@ -1,21 +1,69 @@
|
|||||||
// Logging setup for phantom integration
|
/*
|
||||||
// adapted from Modernizr
|
* grunt-contrib-qunit
|
||||||
|
* http://gruntjs.com/
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013 "Cowboy" Ben Alman, contributors
|
||||||
|
* Licensed under the MIT license.
|
||||||
|
*/
|
||||||
|
|
||||||
QUnit.begin = function () {
|
/*global QUnit:true, alert:true*/
|
||||||
console.log("Starting test suite")
|
(function () {
|
||||||
console.log("================================================\n")
|
'use strict';
|
||||||
}
|
|
||||||
|
|
||||||
QUnit.moduleDone = function (opts) {
|
// Don't re-order tests.
|
||||||
if (opts.failed === 0) {
|
QUnit.config.reorder = false
|
||||||
console.log("\u2714 All tests passed in '" + opts.name + "' module")
|
// Run tests serially, not in parallel.
|
||||||
} else {
|
QUnit.config.autorun = false
|
||||||
console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module")
|
|
||||||
|
// Send messages to the parent PhantomJS process via alert! Good times!!
|
||||||
|
function sendMessage() {
|
||||||
|
var args = [].slice.call(arguments)
|
||||||
|
alert(JSON.stringify(args))
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
QUnit.done = function (opts) {
|
// These methods connect QUnit to PhantomJS.
|
||||||
console.log("\n================================================")
|
QUnit.log = function(obj) {
|
||||||
console.log("Tests completed in " + opts.runtime + " milliseconds")
|
// What is this I don’t even
|
||||||
console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.")
|
if (obj.message === '[object Object], undefined:undefined') { return }
|
||||||
}
|
// Parse some stuff before sending it.
|
||||||
|
var actual = QUnit.jsDump.parse(obj.actual)
|
||||||
|
var expected = QUnit.jsDump.parse(obj.expected)
|
||||||
|
// Send it.
|
||||||
|
sendMessage('qunit.log', obj.result, actual, expected, obj.message, obj.source)
|
||||||
|
}
|
||||||
|
|
||||||
|
QUnit.testStart = function(obj) {
|
||||||
|
sendMessage('qunit.testStart', obj.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
QUnit.testDone = function(obj) {
|
||||||
|
sendMessage('qunit.testDone', obj.name, obj.failed, obj.passed, obj.total)
|
||||||
|
}
|
||||||
|
|
||||||
|
QUnit.moduleStart = function(obj) {
|
||||||
|
sendMessage('qunit.moduleStart', obj.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
QUnit.begin = function () {
|
||||||
|
sendMessage('qunit.begin')
|
||||||
|
console.log("Starting test suite")
|
||||||
|
console.log("================================================\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
QUnit.moduleDone = function (opts) {
|
||||||
|
if (opts.failed === 0) {
|
||||||
|
console.log("\r\u2714 All tests passed in '" + opts.name + "' module")
|
||||||
|
} else {
|
||||||
|
console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module")
|
||||||
|
}
|
||||||
|
sendMessage('qunit.moduleDone', opts.name, opts.failed, opts.passed, opts.total)
|
||||||
|
}
|
||||||
|
|
||||||
|
QUnit.done = function (opts) {
|
||||||
|
console.log("\n================================================")
|
||||||
|
console.log("Tests completed in " + opts.runtime + " milliseconds")
|
||||||
|
console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.")
|
||||||
|
sendMessage('qunit.done', opts.failed, opts.passed, opts.total, opts.runtime)
|
||||||
|
}
|
||||||
|
|
||||||
|
}())
|
||||||
|
15
package.json
15
package.json
@ -5,7 +5,7 @@
|
|||||||
, "keywords": ["bootstrap", "css"]
|
, "keywords": ["bootstrap", "css"]
|
||||||
, "homepage": "http://twbs.github.com/bootstrap/"
|
, "homepage": "http://twbs.github.com/bootstrap/"
|
||||||
, "author": "Twitter Inc."
|
, "author": "Twitter Inc."
|
||||||
, "scripts": { "test": "make test" }
|
, "scripts": { "test": "grunt test" }
|
||||||
, "repository": {
|
, "repository": {
|
||||||
"type": "git"
|
"type": "git"
|
||||||
, "url": "https://github.com/twbs/bootstrap.git"
|
, "url": "https://github.com/twbs/bootstrap.git"
|
||||||
@ -17,9 +17,14 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
, "devDependencies": {
|
, "devDependencies": {
|
||||||
"uglify-js": "1.3.4"
|
"grunt": "~0.4.1"
|
||||||
, "jshint": "2.1.2"
|
, "grunt-contrib-connect": "~0.3.0"
|
||||||
, "recess": "1.1.7"
|
, "grunt-contrib-clean": "~0.5.0"
|
||||||
, "connect": "2.1.3"
|
, "grunt-contrib-concat": "~0.3.0"
|
||||||
|
, "grunt-contrib-jshint": "~0.6.0"
|
||||||
|
, "grunt-contrib-uglify": "~0.2.2"
|
||||||
|
, "grunt-contrib-qunit": "~0.2.2"
|
||||||
|
, "grunt-contrib-watch": "~0.5.1"
|
||||||
|
, "grunt-recess": "~0.3.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user