Skip to content

Commit

Permalink
changed getdeps.sh to use jQueryUI 1.9m6 and jQuery 1.6.2
Browse files Browse the repository at this point in the history
This required all references to jQuery 1.4.4 in the HTML files to be changed to 1.6.2
  • Loading branch information
stvno committed Jan 17, 2012
1 parent a050553 commit b4bb1fd
Show file tree
Hide file tree
Showing 27 changed files with 29 additions and 41 deletions.
2 changes: 1 addition & 1 deletion demo/basic.html
Expand Up @@ -6,7 +6,7 @@
<title>MapQuery basic example</title>
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
2 changes: 1 addition & 1 deletion demo/bing.html
Expand Up @@ -6,7 +6,7 @@
<title>MapQuery bing maps example</title>
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion demo/google.html
Expand Up @@ -9,7 +9,7 @@
<script src="http://maps.google.com/maps/api/js?v=3.5&amp;sensor=false" type="text/javascript"></script>
<!--This example needs googleNG layer from openlayers which is not yet available in the releases-->
<script src="http://mapquery.org/0.1/lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion demo/reservates_json.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/tms.html
Expand Up @@ -6,7 +6,7 @@
<title>MapQuery TMS example</title>
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqFeatureInfo.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel="stylesheet" type="text/css" href="../style/style.css" />
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqLayerManager.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='../style/style.css'/>
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqMousePosition.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='../style/style.css'/>
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqOverviewMap.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='../style/style.css'/>
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqPopup.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel="stylesheet" type="text/css" href="../style/style.css" />
<script src="../../lib/openlayers/lib/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqTemplateOverride.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='../style/altstyle.css'/>
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqZoomButtons.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='../style/style.css'/>
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/widgets/mqZoomSlider.html
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../lib/jquery/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel='StyleSheet' type='text/css' href='../style/style.css'/>
<script src="../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../src/jquery.mapquery.core.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/wms.html
Expand Up @@ -6,7 +6,7 @@
<title>MapQuery WMS example</title>
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
2 changes: 1 addition & 1 deletion demo/wms28992.html
Expand Up @@ -6,7 +6,7 @@
<title>MapQuery WMS other projection example</title>
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>
<script type="text/javascript" src="http://proj4js.org/lib/proj4js-combined.js"></script> <!--You need to include proj4js if you use different coordinate systems, TODO: smo 20110614 do this automatically?-->

Expand Down
2 changes: 1 addition & 1 deletion demo/wms900913.html
Expand Up @@ -6,7 +6,7 @@
<title>MapQuery WMS Spherical mercator example</title>
<link rel='StyleSheet' type='text/css' href='style/style.css'/>
<script src="../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../src/jquery.mapquery.core.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
8 changes: 4 additions & 4 deletions lib/getdeps.sh
Expand Up @@ -3,11 +3,11 @@
mkdir -p download tmp

# I need the _super() function (in jquery.ui.widget.js) from 1.9
curl --location -o "download/jquery-ui-1.9m4.tar.gz" "https://github.com/jquery/jquery-ui/tarball/1.9m4"
tar zxvf download/jquery-ui-1.9m4.tar.gz -C tmp
curl --location -o "download/jquery-ui-1.9m6.tar.gz" "https://github.com/jquery/jquery-ui/tarball/1.9m6"
tar zxvf download/jquery-ui-1.9m6.tar.gz -C tmp
# minification just takes too long => don't do it
ant -file tmp/jquery-jquery-ui-7b43b32/build/build.xml copy concatenate
mv tmp/jquery-jquery-ui-7b43b32/build/dist/jquery-ui-1.9m4/ jquery
ant -file tmp/jquery-jquery-ui-ae119ce/build/build.xml copy concatenate
mv tmp/jquery-jquery-ui-ae119ce/build/dist/jquery-ui-1.9m6/ jquery

# Get OpenLayers
curl -o "download/OpenLayers-2.11.tar.gz" "http://openlayers.org/download/OpenLayers-2.11.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Tests</title>
<link rel="stylesheet" href="../themes/base/jquery.ui.all.css" type="text/css" />
<script type="text/javascript" src="../jquery-1.4.4.js"></script>
<script type="text/javascript" src="../jquery-1.6.2.js"></script>
<link rel="stylesheet" href="tests.css" type="text/css" />
<script type="text/javascript" src="tests.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/core/core.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Core Test Suite</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="http://maps.google.com/maps/api/js?v=3.5&amp;sensor=false" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
12 changes: 0 additions & 12 deletions tests/unit/core/testMapQuery.js
Expand Up @@ -121,18 +121,6 @@ test("Google layer can be created (works only with dev-build of openlayers)", fu
ok(map.layersList.mapquery0.olLayer.type=='roadmap',
'Google layer was loaded (type is roadmap)');
});
test("TMS can be created", function() {
expect(1);

var map = $('#map_tms').mapQuery().data('mapQuery');
map.layers({
type: 'tms',
url:'http://tilecache.osgeo.org/wms-c/Basic.py/',
layer:'xkcd-onlinecommunities'
});
ok(map.layersList.mapquery0.olLayer.type=='roadmap',
'Google layer was loaded (type is roadmap)');
});
test("Bing layer can be created", function() {
expect(1);

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/featureinfo/featureinfo.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Popup Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/layermanager/layermanager.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Layermanager Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/mouseposition/mouseposition.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Mouseposition Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/overviewmap/overviewmap.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Overviewmap Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/popup/popup.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Popup Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/zoombuttons/zoombuttons.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Zoombutton Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/zoomslider/zoomslider.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<title>MapQuery Zoombslider Widget Tests</title>

<script src="../../../lib/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../../../lib/jquery/ui/jquery-ui.js" type="text/javascript"></script>
<script src="../../../lib/jquery/jquery.tmpl.js" type="text/javascript"></script>
<script src="../../../lib/openlayers/OpenLayers.js" type="text/javascript"></script>
Expand Down

0 comments on commit b4bb1fd

Please sign in to comment.