Permalink
Browse files

Push to 6.3.1 with minor gridmanager bugfix from @aibram

  • Loading branch information...
1 parent dcc8490 commit 5aad0be11e6022e03cca486ac6c0bbf415120128 Dane Springmeyer committed Jun 28, 2012
Showing with 37 additions and 19 deletions.
  1. +6 −0 CHANGELOG.md
  2. +3 −1 dist/wax.esri.js
  3. +2 −2 dist/wax.esri.min.js
  4. +3 −1 dist/wax.g.js
  5. +2 −2 dist/wax.g.min.js
  6. +3 −1 dist/wax.leaf.js
  7. +2 −2 dist/wax.leaf.min.js
  8. +3 −1 dist/wax.mm.js
  9. +2 −2 dist/wax.mm.min.js
  10. +3 −1 dist/wax.ol.js
  11. +2 −2 dist/wax.ol.min.js
  12. +3 −1 dist/wax.p.js
  13. +2 −2 dist/wax.p.min.js
  14. +1 −1 package.json
View
@@ -1,5 +1,11 @@
## Changelog
+## 6.3.1
+
+* Fix bug where an interaction template does not get removed
+ if the interaction object is set to use a new tilejson without
+ a template.
+
## 6.3.0
* Adds Hash control for Leaflet by @thegreat
View
@@ -1,4 +1,4 @@
-/* wax - 6.3.0 - 1.0.4-593-g285abac */
+/* wax - 6.3.0 - v6.0.4-23-gdcc8490 */
!function (name, context, definition) {
@@ -2321,6 +2321,8 @@ wax.gm = function() {
manager.template(x.template);
} else if (x.formatter) {
manager.formatter(x.formatter);
+ } else {
+ formatter = undefined;
}
if (x.grids) manager.gridUrl(x.grids);
if (x.resolution) resolution = x.resolution;
Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 6.3.0 - 1.0.4-593-g285abac */
+/* wax - 6.3.0 - v6.0.4-23-gdcc8490 */
!function (name, context, definition) {
@@ -2321,6 +2321,8 @@ wax.gm = function() {
manager.template(x.template);
} else if (x.formatter) {
manager.formatter(x.formatter);
+ } else {
+ formatter = undefined;
}
if (x.grids) manager.gridUrl(x.grids);
if (x.resolution) resolution = x.resolution;
View
Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 6.3.0 - 1.0.4-593-g285abac */
+/* wax - 6.3.0 - v6.0.4-23-gdcc8490 */
!function (name, context, definition) {
@@ -2321,6 +2321,8 @@ wax.gm = function() {
manager.template(x.template);
} else if (x.formatter) {
manager.formatter(x.formatter);
+ } else {
+ formatter = undefined;
}
if (x.grids) manager.gridUrl(x.grids);
if (x.resolution) resolution = x.resolution;
Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 6.3.0 - 1.0.4-593-g285abac */
+/* wax - 6.3.0 - v6.0.4-23-gdcc8490 */
!function (name, context, definition) {
@@ -2321,6 +2321,8 @@ wax.gm = function() {
manager.template(x.template);
} else if (x.formatter) {
manager.formatter(x.formatter);
+ } else {
+ formatter = undefined;
}
if (x.grids) manager.gridUrl(x.grids);
if (x.resolution) resolution = x.resolution;
View
Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 6.3.0 - 1.0.4-593-g285abac */
+/* wax - 6.3.0 - v6.0.4-23-gdcc8490 */
!function (name, context, definition) {
@@ -2342,6 +2342,8 @@ wax.gm = function() {
manager.template(x.template);
} else if (x.formatter) {
manager.formatter(x.formatter);
+ } else {
+ formatter = undefined;
}
if (x.grids) manager.gridUrl(x.grids);
if (x.resolution) resolution = x.resolution;
View
Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 6.3.0 - 1.0.4-593-g285abac */
+/* wax - 6.3.0 - v6.0.4-23-gdcc8490 */
!function (name, context, definition) {
@@ -2321,6 +2321,8 @@ wax.gm = function() {
manager.template(x.template);
} else if (x.formatter) {
manager.formatter(x.formatter);
+ } else {
+ formatter = undefined;
}
if (x.grids) manager.gridUrl(x.grids);
if (x.resolution) resolution = x.resolution;
View
Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "wax",
- "version": "6.3.0",
+ "version": "6.3.1",
"description": "Tools for improving web maps.",
"repository": {
"type": "git",

0 comments on commit 5aad0be

Please sign in to comment.