Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts: Makefile
This commit is contained in:
commit
95cb6f07a8
1
Makefile
1
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
|
||||
|
|
|
@ -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
|
||||
|
||||
---
|
||||
|
|
Loading…
Reference in New Issue