Item9904: IE reports a css property "auto" ... which can't be used fo…

…r animation git-svn-id: http://svn.foswiki.org/branches/Release01x01@9767 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Oct 27, 2010 · eb16800 · eb16800
1 parent b965406
commit eb16800
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/TwistyPlugin/data/System/TwistyPlugin.txt b/TwistyPlugin/data/System/TwistyPlugin.txt
@@ -488,6 +488,7 @@ You can override some default settings in the plugin by setting the following [[
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change&nbsp;History: | <!-- versions below in reverse order -->&nbsp; |
+|  27 Oct 2010 | 1.6.8 Foswikitask:Item9904: fixed compatibility with IE |
 |  24 Oct 2010 | 1.6.7 Foswikitask:Item9815: Changed random IDs back to predictable IDs if remember option is set |
 |  11 Sep 2010 | 1.6.6 Foswikitask:Item9499: Recoded show/hide animation code for smooth twisties. |
 |  10 Sep 2010 | 1.6.5 Foswikitask:Item9515: Simplified code that shows/hides twisties. |

diff --git a/TwistyPlugin/data/System/VarTWISTY.txt b/TwistyPlugin/data/System/VarTWISTY.txt
@@ -6,7 +6,7 @@ This renders the button as well as the toggled content section contained within
 
 Usage: =%<nop>TWISTY{ ... }% Toggable contents %<nop>ENDTWISTY%=
     | *Parameter*    | *Value* | *Description* | *Remark* |
-    | =id=           | Unique identifier | Used to link [[#VarTWISTYBUTTON][TWISTYBUTTON]] and [[#VarTWISTYTOGGLE][TWISTYTOGGLE]]. Application developers. | optional  |
+    | =id=           | Unique identifier | Used to link [[#VarTWISTYBUTTON][TWISTYBUTTON]] and [[#VarTWISTYTOGGLE][TWISTYTOGGLE]] | optional  |
     | =link=         | Link label | Link label for both show and hide links  | optional |
     | =hidelink=     | Link label | Hide link label  | optional |
     | =showlink=     | Link label | Show link label  | optional |

diff --git a/TwistyPlugin/lib/Foswiki/Plugins/TwistyPlugin.pm b/TwistyPlugin/lib/Foswiki/Plugins/TwistyPlugin.pm
@@ -19,7 +19,7 @@ use vars qw( @twistystack $doneHeader $doneDefaults $twistyCount
 
 our $VERSION = '$Rev$';
 
-our $RELEASE = '1.6.7';
+our $RELEASE = '1.6.8';
 our $SHORTDESCRIPTION =
   'Twisty section Javascript library to open/close content dynamically';
 our $NO_PREFS_IN_TOPIC = 1;

diff --git a/TwistyPlugin/pub/System/TwistyPlugin/jquery.twisty.uncompressed.js b/TwistyPlugin/pub/System/TwistyPlugin/jquery.twisty.uncompressed.js
@@ -193,8 +193,7 @@ if (!foswiki) foswiki = {};
 			},
 			ref.speed,
 			function () {
-				//$elem.css('height', ''); // somehow this doesn't work
-				elem.style.height = '';
+				$elem.css('height', 'auto'); 
 			}
 		);
     };
@@ -363,6 +362,19 @@ if (!foswiki) foswiki = {};
 				ref.marginBottom = $this.css('margin-bottom');
 				ref.paddingTop = $this.css('padding-top');
 				ref.paddingBottom = $this.css('padding-bottom');
+
+            if (ref.marginTop == 'auto') {
+              ref.marginTop = '0px';
+            }
+            if (ref.marginBottom == 'auto') {
+              ref.marginBottom = '0px';
+            }
+            if (ref.paddingTop == 'auto') {
+              ref.paddingTop = '0px';
+            }
+            if (ref.paddingBottom == 'auto') {
+              ref.paddingBottom = '0px';
+            }
 			}	
           });
           $('.twistyTrigger').livequery(function() {