From b8b1a358e95f7ffde38a2eb0da41f758e8863c94 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 29 May 2013 20:30:56 -0400 Subject: [PATCH] more animation fixes. --- js/id/ui/preset/localized.js | 15 ++++++--------- js/id/ui/preset_list.js | 6 +++--- js/id/ui/tag_reference.js | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/js/id/ui/preset/localized.js b/js/id/ui/preset/localized.js index e02678929..f356aca2a 100644 --- a/js/id/ui/preset/localized.js +++ b/js/id/ui/preset/localized.js @@ -137,7 +137,6 @@ iD.ui.preset.localized = function(field, context) { d3.select(this.parentNode) .style('top','0') .style('max-height','240px') - .style('overflow','hidden') .transition() .style('opacity', '0') .style('max-height','0px') @@ -148,11 +147,11 @@ iD.ui.preset.localized = function(field, context) { }); innerWrap.transition() - .style('margin-top','0') - .style('max-height', '0') - .style('padding', '0') + .style('margin-top','0px') + .style('max-height', '0px') + .style('padding', '0px') .style('opacity', '0') - .style('border-width', '0') + .style('border-width', '0px') .transition() .duration(200) .style('margin-top','10px') @@ -166,11 +165,9 @@ iD.ui.preset.localized = function(field, context) { });; wraps.exit() - .style('top','0') - .style('overflow','hidden') - .style('max-height','240px') .transition() - .style('max-height','0') + .duration(200) + .style('max-height','0px') .style('opacity', '0') .style('top','-10px') .remove(); diff --git a/js/id/ui/preset_list.js b/js/id/ui/preset_list.js index 51eb34ba8..a21e290b2 100644 --- a/js/id/ui/preset_list.js +++ b/js/id/ui/preset_list.js @@ -139,7 +139,7 @@ iD.ui.PresetList = function(context) { box = selection.append('div') .attr('class', 'subgrid col12') - .style('max-height', '0'); + .style('max-height', '0px'); box.append('div') .attr('class', 'arrow'); @@ -154,8 +154,8 @@ iD.ui.PresetList = function(context) { box.transition() .duration(200) .style('opacity', '0') - .style('max-height', '0') - .style('padding-bottom', '0'); + .style('max-height', '0px') + .style('padding-bottom', '0px'); } else { shown = true; sublist.call(drawList, preset.members); diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js index 0ec2060de..f7d9f3903 100644 --- a/js/id/ui/tag_reference.js +++ b/js/id/ui/tag_reference.js @@ -127,7 +127,7 @@ iD.ui.TagReference = function(tag) { tagReference.hide = function() { body.transition() .duration(200) - .style('max-height', '0') + .style('max-height', '0px') .style('opacity', '0'); showing = false;