diff --git a/Makefile b/Makefile index 92afa1578ed364e82239755351c61a7bad7723f4..768d59e1f3387d5c0cbd251e42fe5be1d3a433e7 100644 --- a/Makefile +++ b/Makefile @@ -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 3aa09c960f5257f7ba9073115ba459fc37a90676..1c3ced31f8a9d91c84a548d15a08f877b88d750a 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 ---