Permalink
Browse files

Push dev10 with backwards-compatibility for wax css

  • Loading branch information...
1 parent be8ba88 commit 24f6938e8436e87be5934dd0256b8c2ff05fff86 @tmcw tmcw committed Aug 29, 2012
View
@@ -1,3 +1,3 @@
-/* wax - 7.0.0dev9 - v6.0.4-98-ga4cc6d6 */
+/* wax - 7.0.0dev10 - v6.0.4-99-gbe8ba88 */
View
@@ -27,10 +27,10 @@ wax.legend = function() {
legend.add = function() {
container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'map-legends wax-legends';
element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'map-legend wax-legend';
element.style.display = 'none';
return legend;
};
View
@@ -20,7 +20,7 @@ wax.tooltip = function() {
// Hide any tooltips on layers underneath this one.
function getTooltip(feature) {
var tooltip = document.createElement('div');
- tooltip.className = 'map-tooltip map-tooltip-0';
+ tooltip.className = 'map-tooltip map-tooltip-0 wax-tooltip';
tooltip.innerHTML = feature;
return tooltip;
}
@@ -68,7 +68,7 @@ wax.tooltip = function() {
hide();
parent.style.cursor = 'pointer';
var tt = parent.appendChild(getTooltip(content));
- tt.className += ' map-popup';
+ tt.className += ' map-popup wax-popup';
var close = tt.appendChild(document.createElement('a'));
close.href = '#close';
View
@@ -6,10 +6,10 @@ wax.mm.legend = function() {
l = {};
var container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'wax-legends map-legends';
var element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'wax-legend map-legend';
element.style.display = 'none';
l.content = function(x) {
View
@@ -1,4 +1,4 @@
-/* wax - 7.0.0dev9 - v6.0.4-98-ga4cc6d6 */
+/* wax - 7.0.0dev10 - v6.0.4-99-gbe8ba88 */
!function (name, context, definition) {
@@ -2654,10 +2654,10 @@ wax.legend = function() {
legend.add = function() {
container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'map-legends wax-legends';
element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'map-legend wax-legend';
element.style.display = 'none';
return legend;
};
@@ -2905,7 +2905,7 @@ wax.tooltip = function() {
// Hide any tooltips on layers underneath this one.
function getTooltip(feature) {
var tooltip = document.createElement('div');
- tooltip.className = 'map-tooltip map-tooltip-0';
+ tooltip.className = 'map-tooltip map-tooltip-0 wax-tooltip';
tooltip.innerHTML = feature;
return tooltip;
}
@@ -2953,7 +2953,7 @@ wax.tooltip = function() {
hide();
parent.style.cursor = 'pointer';
var tt = parent.appendChild(getTooltip(content));
- tt.className += ' map-popup';
+ tt.className += ' map-popup wax-popup';
var close = tt.appendChild(document.createElement('a'));
close.href = '#close';
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 7.0.0dev9 - v6.0.4-98-ga4cc6d6 */
+/* wax - 7.0.0dev10 - v6.0.4-99-gbe8ba88 */
!function (name, context, definition) {
@@ -2654,10 +2654,10 @@ wax.legend = function() {
legend.add = function() {
container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'map-legends wax-legends';
element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'map-legend wax-legend';
element.style.display = 'none';
return legend;
};
@@ -2905,7 +2905,7 @@ wax.tooltip = function() {
// Hide any tooltips on layers underneath this one.
function getTooltip(feature) {
var tooltip = document.createElement('div');
- tooltip.className = 'map-tooltip map-tooltip-0';
+ tooltip.className = 'map-tooltip map-tooltip-0 wax-tooltip';
tooltip.innerHTML = feature;
return tooltip;
}
@@ -2953,7 +2953,7 @@ wax.tooltip = function() {
hide();
parent.style.cursor = 'pointer';
var tt = parent.appendChild(getTooltip(content));
- tt.className += ' map-popup';
+ tt.className += ' map-popup wax-popup';
var close = tt.appendChild(document.createElement('a'));
close.href = '#close';
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 7.0.0dev9 - v6.0.4-98-ga4cc6d6 */
+/* wax - 7.0.0dev10 - v6.0.4-99-gbe8ba88 */
!function (name, context, definition) {
@@ -2654,10 +2654,10 @@ wax.legend = function() {
legend.add = function() {
container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'map-legends wax-legends';
element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'map-legend wax-legend';
element.style.display = 'none';
return legend;
};
@@ -2905,7 +2905,7 @@ wax.tooltip = function() {
// Hide any tooltips on layers underneath this one.
function getTooltip(feature) {
var tooltip = document.createElement('div');
- tooltip.className = 'map-tooltip map-tooltip-0';
+ tooltip.className = 'map-tooltip map-tooltip-0 wax-tooltip';
tooltip.innerHTML = feature;
return tooltip;
}
@@ -2953,7 +2953,7 @@ wax.tooltip = function() {
hide();
parent.style.cursor = 'pointer';
var tt = parent.appendChild(getTooltip(content));
- tt.className += ' map-popup';
+ tt.className += ' map-popup wax-popup';
var close = tt.appendChild(document.createElement('a'));
close.href = '#close';
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 7.0.0dev9 - v6.0.4-98-ga4cc6d6 */
+/* wax - 7.0.0dev10 - v6.0.4-99-gbe8ba88 */
!function (name, context, definition) {
@@ -2654,10 +2654,10 @@ wax.legend = function() {
legend.add = function() {
container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'map-legends wax-legends';
element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'map-legend wax-legend';
element.style.display = 'none';
return legend;
};
@@ -2905,7 +2905,7 @@ wax.tooltip = function() {
// Hide any tooltips on layers underneath this one.
function getTooltip(feature) {
var tooltip = document.createElement('div');
- tooltip.className = 'map-tooltip map-tooltip-0';
+ tooltip.className = 'map-tooltip map-tooltip-0 wax-tooltip';
tooltip.innerHTML = feature;
return tooltip;
}
@@ -2953,7 +2953,7 @@ wax.tooltip = function() {
hide();
parent.style.cursor = 'pointer';
var tt = parent.appendChild(getTooltip(content));
- tt.className += ' map-popup';
+ tt.className += ' map-popup wax-popup';
var close = tt.appendChild(document.createElement('a'));
close.href = '#close';
@@ -3639,10 +3639,10 @@ wax.mm.legend = function() {
l = {};
var container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'wax-legends map-legends';
var element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'wax-legend map-legend';
element.style.display = 'none';
l.content = function(x) {
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-/* wax - 7.0.0dev9 - v6.0.4-98-ga4cc6d6 */
+/* wax - 7.0.0dev10 - v6.0.4-99-gbe8ba88 */
!function (name, context, definition) {
@@ -2675,10 +2675,10 @@ wax.legend = function() {
legend.add = function() {
container = document.createElement('div');
- container.className = 'map-legends';
+ container.className = 'map-legends wax-legends';
element = container.appendChild(document.createElement('div'));
- element.className = 'map-legend';
+ element.className = 'map-legend wax-legend';
element.style.display = 'none';
return legend;
};
@@ -2926,7 +2926,7 @@ wax.tooltip = function() {
// Hide any tooltips on layers underneath this one.
function getTooltip(feature) {
var tooltip = document.createElement('div');
- tooltip.className = 'map-tooltip map-tooltip-0';
+ tooltip.className = 'map-tooltip map-tooltip-0 wax-tooltip';
tooltip.innerHTML = feature;
return tooltip;
}
@@ -2974,7 +2974,7 @@ wax.tooltip = function() {
hide();
parent.style.cursor = 'pointer';
var tt = parent.appendChild(getTooltip(content));
- tt.className += ' map-popup';
+ tt.className += ' map-popup wax-popup';
var close = tt.appendChild(document.createElement('a'));
close.href = '#close';
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "wax",
- "version": "7.0.0dev9",
+ "version": "7.0.0dev10",
"description": "Tools for improving web maps.",
"repository": {
"type": "git",
View
@@ -33,10 +33,11 @@ describe('zoomer', function() {
});
it('marks as unzoomable when zoom is eighteen', function() {
+ map.setZoomRange(0, 18);
runs(function() {
map.setZoom(18);
});
- waits(100);
+ waits(200);
runs(function() {
expect($('.zoomin', map.parent).hasClass('zoomdisabled')).toEqual(true);
});

0 comments on commit 24f6938

Please sign in to comment.