[livejournal] r18799: LJSUP-7813: New thread expander in S2, m...

U   trunk/cgi-bin/LJ/S2.pm

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2011-04-06 02:22:09 UTC (rev 18798)
+++ trunk/cgi-bin/LJ/S2.pm	2011-04-06 03:28:13 UTC (rev 18799)
@@ -3500,16 +3500,16 @@
 
     my $print_expand_link = sub {
         $S2::pout->(
-            " <span id='expand_$this->{talkid}'>" .
-                "(<a href='$this->{thread_url}' onClick=\"ExpanderEx.make(this,'$this->{thread_url}','$this->{talkid}',true);return false;\">$text_expand</a>)" . 
+            "<span id='expand_$this->{talkid}'>" .
+                " (<a href='$this->{thread_url}' onClick=\"ExpanderEx.make(this,'$this->{thread_url}','$this->{talkid}',true);return false;\">$text_expand</a>)" . 
             "</span>"
         );
     };
 
     my $print_collapse_link = sub {
         $S2::pout->(
-            " <span id='collapse_$this->{talkid}'>" .
-                "(<a href='$this->{thread_url}' onClick=\"ExpanderEx.collapse(this,'$this->{thread_url}','$this->{talkid}',true);return false;\">$text_collapse</a>)" . 
+            "<span id='collapse_$this->{talkid}'>" .
+                " (<a href='$this->{thread_url}' onClick=\"ExpanderEx.collapse(this,'$this->{thread_url}','$this->{talkid}',true);return false;\">$text_collapse</a>)" . 
             "</span>"
         );
     };
@@ -3522,12 +3522,13 @@
         return 0;
     };
 
-    if ($show_expand_link->()) {
+    if ($this->{_show_expand_collapse}) {
         $print_expand_link->();
-    }
-    elsif ($this->{_show_collapse_link}) {
         $print_collapse_link->();
     }
+    elsif ($show_expand_link->()) {
+        $print_expand_link->();
+    }
 }
 
 sub Page__print_trusted