Skip to content

Commit 782c200

Browse files
mar10mar10
committed
Use jQuery 3 / jQuery UI 1.12 as default demo
1 parent 641c967 commit 782c200

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎demo/index-1-10.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@
177177
<h1>jquery.ui-contextmenu.js</h1>
178178

179179
<p>
180-
<a href="index.html">Demo with jQuery UI 1.11</a>
180+
<b>Demo with jQuery UI 1.10</b>
181181
&mdash;
182-
<a href="index-1-12.html">Demo with jQuery UI 1.12</a>
182+
<a href="index-1-11.html">Demo with jQuery UI 1.11</a>
183183
&mdash;
184-
<b>Demo with jQuery UI 1.10</b>
184+
<a href="index.html">Demo with jQuery UI 1.12</a>
185185
</p>
186186

187187
<div>

‎demo/index-1-12.html renamed to ‎demo/index-1-11.html

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
<html>
33
<head>
44
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
5-
<title>jquery.ui-contextmenu.js - Demo (jQuery UI 1.12)</title>
5+
<title>jquery.ui-contextmenu.js - Demo</title>
66

7-
<link href="//code.jquery.com/ui/1.12.0-rc.2/themes/base/jquery-ui.css" rel="stylesheet" />
7+
<link href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" />
88

99
<!-- <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> -->
1010
<script src="//code.jquery.com/jquery-1.12.4.min.js"></script>
1111
<!-- <script src="//code.jquery.com/jquery-3.0.0.min.js"></script> -->
1212
<!-- <script src="//code.jquery.com/jquery-migrate-3.0.0.min.js"></script> -->
1313

14-
<script src="//code.jquery.com/ui/1.12.0-rc.2/jquery-ui.min.js"></script>
14+
<script src="//code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
1515

1616
<!-- Optional custom library to enable 'taphold' events -->
17-
<script src="jquery-taphold/taphold.js"></script>
17+
<script src="jquery-taphold/taphold.js" type="text/javascript"></script>
1818

1919
<!-- Just for this demo: Custom library to add a dynamic themeroller switcher -->
2020
<script src="../lib/Super-Theme-Switcher/jquery.themeswitcher.js"></script>
@@ -72,10 +72,10 @@
7272
$(function(){
7373
/* Enable a themeroller theme-switching using a combobox. */
7474
$("#switcher").themeswitcher({
75-
jqueryuiversion: "1.12.0-rc.2",
75+
jqueryuiversion: "1.11.2",
7676
themepath: "//code.jquery.com/ui/",
7777
imgpath: "../lib/Super-Theme-Switcher/images/",
78-
loadTheme: "Base"
78+
loadTheme: "Smoothness"
7979
});
8080

8181
/* Menu 1: init by passing an array of entries. */
@@ -119,9 +119,7 @@
119119

120120
// console.log("beforeOpen", event, ui, event.originalEvent.type);
121121

122-
// NOTE: zIndex() was removed in jQuery 1.12:
123-
// https://jqueryui.com/upgrade-guide/1.12/#removed-zindex
124-
// ui.menu.zIndex( $(event.target).zIndex() + 1);
122+
ui.menu.zIndex( $(event.target).zIndex() + 1);
125123

126124
$(document)
127125
// .contextmenu("replaceMenu", [{title: "aaa"}, {title: "bbb"}])
@@ -193,11 +191,11 @@ <h1>jquery.ui-contextmenu.js</h1>
193191
</iframe>
194192

195193
<p>
196-
<a href="index.html">Demo with jQuery UI 1.11</a>
194+
<a href="index-1-10.html">Demo with jQuery UI 1.10</a>
197195
&mdash;
198-
<b>Demo with jQuery UI 1.12</b>
196+
<b>Demo with jQuery UI 1.11</b>
199197
&mdash;
200-
<a href="index-1-10.html">Demo with jQuery UI 1.10</a>
198+
<a href="index.html">Demo with jQuery UI 1.12</a>
201199
</p>
202200

203201
<div>
@@ -236,21 +234,21 @@ <h3>Sample 2</h3>
236234
</div>
237235

238236
<ul id="options" style="display: none;">
239-
<li data-command="action1"><div><span class="ui-icon custom-icon-firefox"></span>Action 1</div></li>
240-
<li data-command="action2"><div><span class="ui-icon ui-icon-heart"></span>Action 2</div></li>
241-
<li data-command="action3" class="ui-state-disabled"><div>Action 3</div></li>
237+
<li data-command="action1"><span class="ui-icon custom-icon-firefox"></span>Action 1</li>
238+
<li data-command="action2"><span class="ui-icon ui-icon-heart"></span>Action 2</li>
239+
<li data-command="action3" class="ui-state-disabled">Action 3</li>
242240
<li>----</li>
243241
<li>Extra
244242
<ul>
245-
<li data-command="action4"><div>sub4</div></li>
246-
<li data-command="action5"><div>sub5</div></li>
243+
<li data-command="action4">sub4</li>
244+
<li data-command="action5">sub5</li>
247245
</ul>
248246
</li>
249247
</ul>
250248

251249
<ul id="options2" class="ui-helper-hidden">
252-
<li data-command="action2"><span class="ui-icon ui-icon-heart"></span>Action 2</li>
253-
<li data-command="action3" class="ui-state-disabled">Action 3</li>
250+
<li data-command="action2"><span class="ui-icon ui-icon-heart"></span>Action 2
251+
<li data-command="action3" class="ui-state-disabled">Action 3
254252
</ul>
255253

256254
<h3>Sample 3</h3>

‎demo/index.html

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
<html>
33
<head>
44
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
5-
<title>jquery.ui-contextmenu.js - Demo</title>
5+
<title>jquery.ui-contextmenu.js - Demo (jQuery UI 1.12)</title>
66

7-
<link href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" />
7+
<link href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet" />
88

99
<!-- <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> -->
10-
<script src="//code.jquery.com/jquery-1.12.4.min.js"></script>
11-
<!-- <script src="//code.jquery.com/jquery-3.0.0.min.js"></script> -->
10+
<!-- <script src="//code.jquery.com/jquery-1.12.4.min.js"></script> -->
11+
<script src="//code.jquery.com/jquery-3.2.1.min.js"></script>
1212
<!-- <script src="//code.jquery.com/jquery-migrate-3.0.0.min.js"></script> -->
1313

14-
<script src="//code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
14+
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
1515

1616
<!-- Optional custom library to enable 'taphold' events -->
17-
<script src="jquery-taphold/taphold.js" type="text/javascript"></script>
17+
<script src="jquery-taphold/taphold.js"></script>
1818

1919
<!-- Just for this demo: Custom library to add a dynamic themeroller switcher -->
2020
<script src="../lib/Super-Theme-Switcher/jquery.themeswitcher.js"></script>
@@ -72,10 +72,10 @@
7272
$(function(){
7373
/* Enable a themeroller theme-switching using a combobox. */
7474
$("#switcher").themeswitcher({
75-
jqueryuiversion: "1.11.2",
75+
jqueryuiversion: "1.12.0-rc.2",
7676
themepath: "//code.jquery.com/ui/",
7777
imgpath: "../lib/Super-Theme-Switcher/images/",
78-
loadTheme: "Smoothness"
78+
loadTheme: "Base"
7979
});
8080

8181
/* Menu 1: init by passing an array of entries. */
@@ -119,7 +119,9 @@
119119

120120
// console.log("beforeOpen", event, ui, event.originalEvent.type);
121121

122-
ui.menu.zIndex( $(event.target).zIndex() + 1);
122+
// NOTE: zIndex() was removed in jQuery 1.12:
123+
// https://jqueryui.com/upgrade-guide/1.12/#removed-zindex
124+
// ui.menu.zIndex( $(event.target).zIndex() + 1);
123125

124126
$(document)
125127
// .contextmenu("replaceMenu", [{title: "aaa"}, {title: "bbb"}])
@@ -191,11 +193,11 @@ <h1>jquery.ui-contextmenu.js</h1>
191193
</iframe>
192194

193195
<p>
194-
<b>Demo with jQuery UI 1.11</b>
196+
<a href="index-1-10.html">Demo with jQuery UI 1.10</a>
195197
&mdash;
196-
<a href="index-1-12.html">Demo with jQuery UI 1.12</a>
198+
<a href="index-1-11.html">Demo with jQuery UI 1.11</a>
197199
&mdash;
198-
<a href="index-1-10.html">Demo with jQuery UI 1.10</a>
200+
<b>Demo with jQuery UI 1.12</b>
199201
</p>
200202

201203
<div>
@@ -234,21 +236,21 @@ <h3>Sample 2</h3>
234236
</div>
235237

236238
<ul id="options" style="display: none;">
237-
<li data-command="action1"><span class="ui-icon custom-icon-firefox"></span>Action 1</li>
238-
<li data-command="action2"><span class="ui-icon ui-icon-heart"></span>Action 2</li>
239-
<li data-command="action3" class="ui-state-disabled">Action 3</li>
239+
<li data-command="action1"><div><span class="ui-icon custom-icon-firefox"></span>Action 1</div></li>
240+
<li data-command="action2"><div><span class="ui-icon ui-icon-heart"></span>Action 2</div></li>
241+
<li data-command="action3" class="ui-state-disabled"><div>Action 3</div></li>
240242
<li>----</li>
241243
<li>Extra
242244
<ul>
243-
<li data-command="action4">sub4</li>
244-
<li data-command="action5">sub5</li>
245+
<li data-command="action4"><div>sub4</div></li>
246+
<li data-command="action5"><div>sub5</div></li>
245247
</ul>
246248
</li>
247249
</ul>
248250

249251
<ul id="options2" class="ui-helper-hidden">
250-
<li data-command="action2"><span class="ui-icon ui-icon-heart"></span>Action 2
251-
<li data-command="action3" class="ui-state-disabled">Action 3
252+
<li data-command="action2"><span class="ui-icon ui-icon-heart"></span>Action 2</li>
253+
<li data-command="action3" class="ui-state-disabled">Action 3</li>
252254
</ul>
253255

254256
<h3>Sample 3</h3>

0 commit comments

Comments
 (0)