Changeset 3986 for trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm

Timestamp:

05/27/09 19:54:07 (3 years ago)

Author:

MichaelTempest

Message:

Item1667: perltidy

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm (modified) (4 diffs)

trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm

@@ -361 +361 @@
     return $text;
 }
+
 # collapse adjacent nodes together, if they share the same class
-sub _collapseOneClass
-{
-    my $node = shift;
-        my $class = shift;
-        if ( defined( $node->{tag} ) && $node->hasClass($class) ) {
-                my $next = $node->{next};
-                my @edible;
-                my $collapsible;
-                while (
-                        $next
-                        && (
-                                ( !$next->{tag} && $next->{text} =~ /^\s*$/ )
-                                || (   $node->{tag} eq $next->{tag}
-                                        && $next->hasClass($class) )
-                        )
-                  )
-                {
-                        push( @edible, $next );
-                        $collapsible ||= $next->hasClass($class);
-                        $next = $next->{next};
-                }
-                if ($collapsible) {
-                        foreach my $meal (@edible) {
-                                $meal->_remove();
-                                if ( $meal->{tag} ) {
-                                        require Foswiki::Plugins::WysiwygPlugin::HTML2TML::Leaf;
-                                        $node->addChild(
-                                                new Foswiki::Plugins::WysiwygPlugin::HTML2TML::Leaf(
-                                                        $WC::NBBR)
-                                        );
-                                        $node->_eat($meal);
-                                }
-                        }
-                }
-        }
-}
-
+sub _collapseOneClass {
+    my $node  = shift;
+    my $class = shift;
+    if ( defined( $node->{tag} ) && $node->hasClass($class) ) {
+        my $next = $node->{next};
+        my @edible;
+        my $collapsible;
+        while (
+            $next
+            && (
+                ( !$next->{tag} && $next->{text} =~ /^\s*$/ )
+                || (   $node->{tag} eq $next->{tag}
+                    && $next->hasClass($class) )
+            )
+          )
+        {
+            push( @edible, $next );
+            $collapsible ||= $next->hasClass($class);
+            $next = $next->{next};
+        }
+        if ($collapsible) {
+            foreach my $meal (@edible) {
+                $meal->_remove();
+                if ( $meal->{tag} ) {
+                    require Foswiki::Plugins::WysiwygPlugin::HTML2TML::Leaf;
+                    $node->addChild(
+                        new Foswiki::Plugins::WysiwygPlugin::HTML2TML::Leaf(
+                            $WC::NBBR)
+                    );
+                    $node->_eat($meal);
+                }
+            }
+        }
+    }
+}
 
 # Collapse adjacent VERBATIM nodes together
@@ -411 +410 @@
     while ( scalar(@jobs) ) {
         my $node = shift(@jobs);
-                _collapseOneClass($node, 'TMLverbatim');
-                _collapseOneClass($node, 'WYSIWYG_STICKY');
+        _collapseOneClass( $node, 'TMLverbatim' );
+        _collapseOneClass( $node, 'WYSIWYG_STICKY' );
         if (   $node->{tag} eq 'p'
             && $node->{head}
@@ -418 +417 @@
         {
             my $kid = $node->{head};
-            if (   uc($kid->{tag}) eq 'SPAN'
+            if ( uc( $kid->{tag} ) eq 'SPAN'
                 && $kid->hasClass('WYSIWYG_PROTECTED') )
             {
@@ -465 +464 @@
     {
 
-                my %new_attrs = ( class => $class );
+        my %new_attrs = ( class => $class );
         $new_attrs{style} = $this->{attrs}->{style}
           if exists $this->{attrs}->{style};