Skip to content

Commit

Permalink
Updated jquery and jquery-ui. Fixes #209.
Browse files Browse the repository at this point in the history
  • Loading branch information
ivmartel committed Mar 1, 2016
1 parent 3364be1 commit 48f8681
Show file tree
Hide file tree
Showing 30 changed files with 45 additions and 47 deletions.
13 changes: 0 additions & 13 deletions ext/jquery-ui/jquery-ui-1.11.2.min.js

This file was deleted.

13 changes: 13 additions & 0 deletions ext/jquery-ui/jquery-ui-1.11.4.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ext/jquery-ui/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Third Party: jquery-ui
======================

* Web: http://jqueryui.com
* Version: [1.11.2](http://blog.jqueryui.com/2014/10/jquery-ui-1-11-2/)
* Date: 16/10/2014
* Version: [1.11.4](http://blog.jqueryui.com/2015/03/jquery-ui-1-11-4/)
* Date: 11/03/2015
* Download: [custom](http://jqueryui.com/download/) (default options with ui-darkness theme)
* License: MIT (see http://jquery.org/license)
* CDN (js): [jquery-ui.min.js](http://code.jquery.com/ui/1.11.2/jquery-ui.min.js)
* CDN (css): [jquery-ui.min.css](http://code.jquery.com/ui/1.11.2/themes/ui-darkness/jquery-ui.min.css)
* CDN (js): [jquery-ui.min.js](http://code.jquery.com/ui/1.11.4/jquery-ui.min.js)
* CDN (css): [jquery-ui.min.css](http://code.jquery.com/ui/1.11.4/themes/ui-darkness/jquery-ui.min.css)
* Description: jQuery UI provides abstractions for low-level interaction and animation,
advanced effects and high-level, themeable widgets, built on top of the jQuery
JavaScript Library, that you can use to build highly interactive web applications.
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions ext/jquery/jquery-2.1.4.min.js

This file was deleted.

4 changes: 4 additions & 0 deletions ext/jquery/jquery-2.2.1.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ext/jquery/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Third Party: jquery
===================

* Web: http://jquery.com
* Version: [2.1.4](http://blog.jquery.com/2015/04/28/jquery-1-11-3-and-2-1-4-released-ios-fail-safe-edition/)
* Date: 28/04/2015
* Version: [2.2.1](http://blog.jquery.com/2016/02/22/jquery-1-12-1-and-2-2-1-released/)
* Date: 22/02/2016
* Download: from CDN
* License: MIT (see http://jquery.org/license)
* CDN: [jquery-2.1.4.min.js](http://code.jquery.com/jquery-2.1.4.min.js)
* CDN: [jquery-2.2.1.min.js](http://code.jquery.com/jquery-2.2.1.min.js)
* Description: jQuery is a fast and concise JavaScript Library that simplifies HTML
document traversing, event handling, animating, and Ajax interactions
for rapid web development.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test": "grunt publish --verbose"
},
"dependencies": {
"jquery": "2.1.4",
"jquery": "2.2.1",
"jquery-ui": "~1.10",
"jquery-mobile": "~1.4",
"kinetic": "~5"
Expand Down
2 changes: 1 addition & 1 deletion resources/dwv-mobile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ body { margin: 10px; padding: 0; }

print([[
<!-- Third party -->
<script type="text/javascript" src="/dwv/ext/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>
<script type="text/javascript" src="/dwv/ext/pdfjs/jpx.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion resources/dwv-simple.lua
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ print([[

print([[
<!-- Third party -->
<script type="text/javascript" src="/dwv/ext/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="/dwv/ext/pdfjs/jpx.js"></script>
<script type="text/javascript" src="/dwv/ext/pdfjs/util.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions resources/dwv-static.lua
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ body { background-color: #222; color: white;
.infotr { color: #333; text-shadow: 0 1px 0 #fff; }
.dropBox { margin: 20px; }
</style>
<link type="text/css" rel="stylesheet" href="/dwv/ext/jquery-ui/themes/ui-darkness/jquery-ui-1.11.2.min.css">
<link type="text/css" rel="stylesheet" href="/dwv/ext/jquery-ui/themes/ui-darkness/jquery-ui-1.11.4.min.css">
]])

print([[
<!-- Third party -->
<script type="text/javascript" src="/dwv/ext/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery-ui/jquery-ui-1.11.2.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery-ui/jquery-ui-1.11.4.min.js"></script>
<script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>
<script type="text/javascript" src="/dwv/ext/pdfjs/jpx.js"></script>
<script type="text/javascript" src="/dwv/ext/pdfjs/util.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions viewers/mobile/cache.manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# v8 2015-11-20
# v9 2016-03-02

CACHE:

Expand Down Expand Up @@ -32,7 +32,7 @@ appgui.js
/dwv/demo/stable/ext/jquery-mobile/images/icons-png/info-white.png
/dwv/demo/stable/ext/jquery-mobile/images/icons-png/grid-black.png
# js
/dwv/demo/stable/ext/jquery/jquery-2.1.4.min.js
/dwv/demo/stable/ext/jquery/jquery-2.2.1.min.js
/dwv/demo/stable/ext/jquery-mobile/jquery.mobile-1.4.5.min.js
/dwv/demo/stable/ext/jquery-mobile/jquery.mobile-1.4.5.min.map
/dwv/demo/stable/ext/pdfjs/jpx.js
Expand Down
2 changes: 1 addition & 1 deletion viewers/mobile/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<link rel="apple-touch-icon" sizes="60x60" href="../../resources/dwv-60.png" />
<link rel="apple-touch-icon" sizes="128x128" href="../../resources/dwv-128.png" />
<!-- Third party -->
<script type="text/javascript" src="../../ext/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="../../ext/jquery/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="../../ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="../../ext/flot/jquery.flot.min.js"></script>
<script type="text/javascript" src="../../ext/kinetic/kinetic-v5.1.1-06.10.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion viewers/simple/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<link rel="apple-touch-icon" sizes="60x60" href="../../resources/dwv-60.png" />
<link rel="apple-touch-icon" sizes="128x128" href="../../resources/dwv-128.png" />
<!-- Third party -->
<script type="text/javascript" src="../../ext/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="../../ext/jquery/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="../../ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
<!-- decoders -->
<script type="text/javascript" src="../../ext/pdfjs/jpx.js"></script>
Expand Down
12 changes: 5 additions & 7 deletions viewers/static/cache.manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# v8 2015-11-20
# v9 2016-03-02

CACHE:

Expand All @@ -19,24 +19,22 @@ appgui.js
# third party

# css
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/jquery-ui-1.11.2.min.css
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/jquery-ui-1.11.4.min.css
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_glass_20_555555_1x400.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-icons_4b8e0b_256x240.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-icons_222222_256x240.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-icons_4b8e0b_256x240.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-icons_a83300_256x240.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-icons_cccccc_256x240.png
/dwv/demo/stable/ext/jquery-ui/themes/ui-darkness/images/ui-icons_ffffff_256x240.png
# js
/dwv/demo/stable/ext/jquery/jquery-2.1.4.min.js
/dwv/demo/stable/ext/jquery-ui/jquery-ui-1.11.2.min.js
/dwv/demo/stable/ext/jquery/jquery-2.2.1.min.js
/dwv/demo/stable/ext/jquery-ui/jquery-ui-1.11.4.min.js
/dwv/demo/stable/ext/pdfjs/jpx.js
/dwv/demo/stable/ext/pdfjs/arithmetic_decoder.js
/dwv/demo/stable/ext/pdfjs/util.js
Expand Down
6 changes: 3 additions & 3 deletions viewers/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
.infotr { color: #333; text-shadow: 0 1px 0 #fff; }
.dropBox { margin: 20px; }
</style>
<link type="text/css" rel="stylesheet" href="../../ext/jquery-ui/themes/ui-darkness/jquery-ui-1.11.2.min.css">
<link type="text/css" rel="stylesheet" href="../../ext/jquery-ui/themes/ui-darkness/jquery-ui-1.11.4.min.css">
<!-- Third party -->
<script type="text/javascript" src="../../ext/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="../../ext/jquery-ui/jquery-ui-1.11.2.min.js"></script>
<script type="text/javascript" src="../../ext/jquery/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="../../ext/jquery-ui/jquery-ui-1.11.4.min.js"></script>
<script type="text/javascript" src="../../ext/flot/jquery.flot.min.js"></script>
<script type="text/javascript" src="../../ext/kinetic/kinetic-v5.1.1-06.10.min.js"></script>
<!-- decoders -->
Expand Down

0 comments on commit 48f8681

Please sign in to comment.