Skip to content

Commit d74dfe1

Browse files
committed
Merge pull request #5 from conipto/master
Update demo + main JS file to work with jQuery 2.1 and jQueryUI 1.10.4
2 parents 7c5fe1f + 4558265 commit d74dfe1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

assets/js/jquery.desktop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ var JQD = (function($, window, document, undefined) {
102102

103103
// Cancel mousedown.
104104
d.mousedown(function(ev) {
105-
var tags = ['a', 'button', 'input', 'select', 'textarea', 'tr'];
105+
var tags = "a,button,input,select,textarea,tr";
106106

107107
if (!$(ev.target).closest(tags).length) {
108108
JQD.util.clear_active();

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,8 +1084,8 @@
10841084
</a>
10851085
</div>
10861086
</div>
1087-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
1088-
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
1087+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
1088+
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
10891089
<script>
10901090
!window.jQuery && document.write(unescape('%3Cscript src="assets/js/jquery.js"%3E%3C/script%3E'));
10911091
!window.jQuery.ui && document.write(unescape('%3Cscript src="assets/js/jquery.ui.js"%3E%3C/script%3E'));

0 commit comments

Comments
 (0)