diff options
| author | Mark Otto <[email protected]> | 2012-03-31 12:31:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-31 12:31:56 -0700 |
| commit | 56ecc6ba96550d8e66d0484c21fc20da5f8e52e6 (patch) | |
| tree | 0f7723bd1c73c7b1e27e4863af3b7ddc468a39f4 /docs | |
| parent | 37745cd8997bdc1d0bb21c276a7aa671bb018eed (diff) | |
| download | bootstrap-56ecc6ba96550d8e66d0484c21fc20da5f8e52e6.tar.xz bootstrap-56ecc6ba96550d8e66d0484c21fc20da5f8e52e6.zip | |
clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56907 -> 56907 bytes | |||
| -rw-r--r-- | docs/javascript.html | 14 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 14 |
3 files changed, 28 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 8711ab2e7..7f95f01c6 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/javascript.html b/docs/javascript.html index 4f777e031..2a0f3d861 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -493,6 +493,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul></pre> + <p>To keep URLs intact, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p> +<pre class="prettyprint linenums"> +<ul class="nav nav-pills"> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html"> + Dropdown + <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + ... + </ul> + </li> +</ul> +</pre> <h3>Methods</h3> <h4>$().dropdown()</h4> <p>A programatic api for activating menus for a given navbar or tabbed navigation.</p> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index d61a364f0..bb25f0957 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -416,6 +416,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul></pre> + <p>{{_i}}To keep URLs intact, use the <code>data-target</code> attribute instead of <code>href="#"</code>.{{/i}}</p> +<pre class="prettyprint linenums"> +<ul class="nav nav-pills"> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html"> + {{_i}}Dropdown{{/i}} + <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + ... + </ul> + </li> +</ul> +</pre> <h3>{{_i}}Methods{{/i}}</h3> <h4>$().dropdown()</h4> <p>{{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}</p> |
