Skip to content
This repository was archived by the owner on Aug 14, 2021. It is now read-only.

Support for jquery ui 1.11 #61

Merged
merged 7 commits into from
Jul 6, 2014
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Modified the demo page to use the data-command attribute instead of t…
…he href
  • Loading branch information
gvas committed Jul 4, 2014
commit c4e7d52cb75e87b801915d9a3addef3d621813e6
17 changes: 8 additions & 9 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
<link type="text/css" rel="stylesheet" href="http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css" />
<script src="http://code.jquery.com/jquery-1.7.js" type="text/javascript"></script>
<script src="http://code.jquery.com/ui/1.9.0/jquery-ui.js" type="text/javascript"></script>
-->
-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js" type="text/javascript"></script>

<!-- Some custom library to enable 'taphold' events -->
<script src="jquery-taphold/taphold.js" type="text/javascript"></script>

Expand Down Expand Up @@ -217,20 +216,20 @@ <h3>Sample 2</h3>
</div>

<ul id="options" style="display: none;">
<li><a href="#action1"><span class="ui-icon custom-icon-firefox"></span>Action 1</a>
<li><a href="#action2"><span class="ui-icon ui-icon-heart"></span>Action 2</a>
<li class="ui-state-disabled"><a href="#action3">Action 3</a>
<li data-command="action1"><a href="#"><span class="ui-icon custom-icon-firefox"></span>Action 1</a>
<li data-command="action2"><a href="#"><span class="ui-icon ui-icon-heart"></span>Action 2</a>
<li data-command="action3" class="ui-state-disabled"><a href="#">Action 3</a>
<li>----
<li><a>Extra</a>
<ul>
<li><a href="#action4">sub4</a>
<li><a href="#action5">sub5</a>
<li data-command="action4"><a href="#">sub4</a>
<li data-command="action5"><a href="#">sub5</a>
</ul>
</ul>

<ul id="options2" class="ui-helper-hidden">
<li><a href="#action2"><span class="ui-icon ui-icon-heart"></span>Action 2</a>
<li class="ui-state-disabled"><a href="#action3">Action 3</a>
<li data-command="action2"><a href="#action2"><span class="ui-icon ui-icon-heart"></span>Action 2</a>
<li data-command="action3" class="ui-state-disabled"><a href="#">Action 3</a>
</ul>

<h3>Sample 3</h3>
Expand Down