diff options
| author | Mark Otto <[email protected]> | 2012-03-11 17:38:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-11 17:38:23 -0700 |
| commit | 95cb6f07a8fc2410873c59addd3f1aad948e54fd (patch) | |
| tree | 3301949733a3d6500c80a039a1094ae2a53cc51e | |
| parent | 8fd126ba1ba8c76f9b11833380db91554a034794 (diff) | |
| parent | 354252b4b506221f14d3f95627b0c887eb160caa (diff) | |
| download | bootstrap-95cb6f07a8fc2410873c59addd3f1aad948e54fd.tar.xz bootstrap-95cb6f07a8fc2410873c59addd3f1aad948e54fd.zip | |
Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts:
Makefile
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | js/README.md | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -19,7 +19,6 @@ docs: bootstrap cp img/* docs/assets/img/ cp js/*.js docs/assets/js/ cp js/tests/vendor/jquery.js docs/assets/js/ - cp js/tests/vendor/jquery.js docs/assets/js/ # # BUILD SIMPLE BOOTSTRAP DIRECTORY @@ -59,4 +58,4 @@ watch: watchr -e "watch('less/.*\.less') { system 'make' }" -.PHONY: docs watch gh-pages
\ No newline at end of file +.PHONY: docs watch gh-pages diff --git a/js/README.md b/js/README.md index 3aa09c960..1c3ced31f 100644 --- a/js/README.md +++ b/js/README.md @@ -28,7 +28,7 @@ All public APIs should be single, chainable methods, and return the collection a All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior: $("#myModal").modal() // initialized with defaults - $("#myModal").modal({ keyboard: false }) // initialized with now keyboard + $("#myModal").modal({ keyboard: false }) // initialized with no keyboard $("#myModal").modal('show') // initializes and invokes show immediately afterqwe2 --- |