rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Browse Source
This commit is contained in:
Mark Otto 2012-04-23 10:06:45 -07:00
commit f805a6080c
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -4,6 +4,7 @@ BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
DATE=$(shell date +%I:%M%p) DATE=$(shell date +%I:%M%p)
CHECK=\033[32m✔\033[39m CHECK=\033[32m✔\033[39m
HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
# #
@ -11,9 +12,9 @@ CHECK=\033[32m✔\033[39m
# #
build: build:
@echo "\n##################################################" @echo "\n${HR}"
@echo "Building Bootstrap..." @echo "Building Bootstrap..."
@echo "##################################################\n" @echo "${HR}\n"
@jshint js/*.js --config js/.jshintrc @jshint js/*.js --config js/.jshintrc
@jshint js/tests/unit/*.js --config js/.jshintrc @jshint js/tests/unit/*.js --config js/.jshintrc
@echo "Running JSHint on javascript... ${CHECK} Done" @echo "Running JSHint on javascript... ${CHECK} Done"
@ -31,9 +32,9 @@ build:
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
@echo "Compiling and minifying javascript... ${CHECK} Done" @echo "Compiling and minifying javascript... ${CHECK} Done"
@echo "\n##################################################" @echo "\n${HR}"
@echo "Bootstrap successfully built at ${DATE}." @echo "Bootstrap successfully built at ${DATE}."
@echo "##################################################\n" @echo "${HR}\n"
@echo "Thanks for using Bootstrap," @echo "Thanks for using Bootstrap,"
@echo "<3 @mdo and @fat\n" @echo "<3 @mdo and @fat\n"

6
js/tests/phantom.js
View File

@ -2,15 +2,15 @@
// Adapted from Modernizr // Adapted from Modernizr
function waitFor(testFx, onReady, timeOutMillis) { function waitFor(testFx, onReady, timeOutMillis) {
var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001 //< Default Max Timout is 3s var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 5001 //< Default Max Timout is 5s
, start = new Date().getTime() , start = new Date().getTime()
, condition = false , condition = false
, interval = setInterval(function() { , interval = setInterval(function () {
if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) {
// If not time-out yet and condition not yet fulfilled // If not time-out yet and condition not yet fulfilled
condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code
} else { } else {
if(!condition) { if (!condition) {
// If condition still not fulfilled (timeout but condition is 'false') // If condition still not fulfilled (timeout but condition is 'false')
console.log("'waitFor()' timeout") console.log("'waitFor()' timeout")
phantom.exit(1) phantom.exit(1)

12
js/tests/server.js
View File

@ -4,15 +4,11 @@
*/ */
var connect = require('connect') var connect = require('connect')
, args = process.argv.slice(2) , http = require('http')
, fs = require('fs') , fs = require('fs')
, folder = '/../../' , app = connect()
, port = '3000' .use(connect.static(__dirname + '/../../'));
var server = connect.createServer( http.createServer(app).listen(3000);
connect.static(__dirname + folder)
).listen(port)
fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')
console.log("Server started on port %s in %s", port, folder)

8
package.json
View File

@ -17,9 +17,9 @@
} }
] ]
, "devDependencies": { , "devDependencies": {
"uglify-js": "*" "uglify-js": "1.2.6"
, "jshint": "*" , "jshint": "0.6.1"
, "recess": "*" , "recess": "1.0.3"
, "connect": "*" , "connect": "2.1.3"
} }
} }