Permalink
Browse files

new wax library added

  • Loading branch information...
1 parent 12ecc88 commit c4ca323701ceced486b441df8ae8de395aa1decd @xavijam xavijam committed Jun 21, 2012
View
@@ -1,5 +1,7 @@
+
[v 0.48]
- New function, setOptions, to change any param at the same time.
+- Wax 6.2.3 touched and added.
[v 0.47]
- Touch events supported
View
@@ -193,7 +193,7 @@ First of all add the necessary script and css files:
<!--[if lte IE 8]><link rel="stylesheet" href="http://code.leafletjs.com/leaflet-0.3.1/leaflet.ie.css" /><![endif]-->
<link href="css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
-<script type="text/javascript" src="js/wax.leaf.min-6.0.5-touched.js"></script>
+<script type="text/javascript" src="js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript" src="dist/cartodb-popup.js"></script>
```
@@ -12,7 +12,7 @@
<link href="../css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
- <script type="text/javascript" src="../js/wax.leaf.min-6.0.5-touched.js"></script>
+ <script type="text/javascript" src="../js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="../dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript" src="../dist/cartodb-popup-min.js"></script>
@@ -12,7 +12,7 @@
<link href="../css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
- <script type="text/javascript" src="../js/wax.leaf.min-6.0.5-touched.js"></script>
+ <script type="text/javascript" src="../js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="../dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript" src="../dist/cartodb-popup-min.js"></script>
@@ -28,7 +28,7 @@
// Initialize hover point
, point = new L.GeoJSON(null)
// Hover point style
- , hover_style = {radius:8, color:"#333", weight:3, opacity:1, fillColor: "#F96700", fillOpacity:1, clickable:false}
+ , hover_style = {radius:8, color:"#333", weight:3, opacity:1, fillColor: "#FFCC00", fillOpacity:1, clickable:false}
// Create the CartoDB layer
, nyc_wifi = new L.CartoDBLayer({
map: map,
@@ -12,7 +12,7 @@
<link href="../css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
- <script type="text/javascript" src="../js/wax.leaf.js"></script>
+ <script type="text/javascript" src="../js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="../dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript" src="../dist/cartodb-popup-min.js"></script>
@@ -28,7 +28,7 @@
// Initialize hover polygon
, polygon = new L.GeoJSON(null)
// Hover polygon style
- , polygon_style = {color: "#333", weight: 2, opacity:1, fillOpacity: 0, clickable:false}
+ , polygon_style = {color: "#333", weight: 2, opacity:1, fillOpacity: 1, fillColor:"#FFCC00", clickable:false}
// Create the CartoDB layer
, nyc_parks = new L.CartoDBLayer({
map: map,
@@ -12,7 +12,7 @@
<link href="../css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
- <script type="text/javascript" src="../js/wax.leaf.min-6.0.5-touched.js"></script>
+ <script type="text/javascript" src="../js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="../dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript" src="../dist/cartodb-popup-min.js"></script>
@@ -12,7 +12,7 @@
<link href="../css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
- <script type="text/javascript" src="../js/wax.leaf.min-6.0.5-touched.js"></script>
+ <script type="text/javascript" src="../js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="../dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript" src="../dist/cartodb-popup-min.js"></script>
View
@@ -44,7 +44,7 @@ <h1 class="left">
<!--[if lt IE 9]> <link rel="stylesheet" href="http://code.leafletjs.com/leaflet-0.3.1/leaflet.ie.css" /> <![endif]-->
<link href="css/cartodb-leaflet.css" rel="stylesheet" type="text/css">
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
- <script type="text/javascript" src="js/wax.leaf.min-6.0.5-touched.js"></script>
+ <script type="text/javascript" src="js/wax.leaf.min-6.2.3-touched.js"></script>
<script type="text/javascript" src="dist/cartodb-leaflet-min.js"></script>
<script type="text/javascript">
@@ -304,7 +304,7 @@ <h5 class="margin30">Example</h5>
&#60;!--[if lt IE 9]&#62; &#60;link rel="stylesheet" href="http://code.leafletjs.com/leaflet-0.3.1/leaflet.ie.css" /&#62; &#60;![endif]--&#62;
&#60;link href="css/cartodb-leaflet.css" rel="stylesheet" type="text/css"&#62;
&#60;script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"&#62;&#60;/script&#62;
-&#60;script type="text/javascript" src="js/wax.leaf.min-6.0.5-touched.js"&#62;&#60;/script&#62;
+&#60;script type="text/javascript" src="js/wax.leaf.min-6.2.3-touched.js"&#62;&#60;/script&#62;
&#60;script type="text/javascript" src="dist/cartodb-leaflet-min.js"&#62;&#60;/script&#62;
</pre>
View
@@ -3300,6 +3300,7 @@ wax.leaf.connector = L.TileLayer.extend({
options = options || {};
options.minZoom = options.minzoom || 0;
options.maxZoom = options.maxzoom || 22;
+ options.opacity = options.opacity || 1;
L.TileLayer.prototype.initialize.call(this, options.tiles[0], options);
}
});
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c4ca323

Please sign in to comment.