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

Timestamp:

05/27/09 19:49:34 (3 years ago)

Author:

MichaelTempest

Message:

Item1667: Merge adjacent <sticky> regions - so that you can edit <sticky> regions that contain code (e.g. DirectedGraphPlugin code) in TMCE

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm (modified) (3 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);
+                                }
+                        }
+                }
+        }
+}
+
 
 # Collapse adjacent VERBATIM nodes together
+# Collapse adjacent STICKY nodes together
 # Collapse a <p> that contains only a protected span into a protected P
 # Collapse em in em
@@ -372 +411 @@
     while ( scalar(@jobs) ) {
         my $node = shift(@jobs);
-        if ( defined( $node->{tag} ) && $node->hasClass('TMLverbatim') ) {
-            my $next = $node->{next};
-            my @edible;
-            my $collapsible;
-            while (
-                $next
-                && (
-                    ( !$next->{tag} && $next->{text} =~ /^\s*$/ )
-                    || (   $node->{tag} eq $next->{tag}
-                        && $next->hasClass('TMLverbatim') )
-                )
-              )
-            {
-                push( @edible, $next );
-                $collapsible ||= $next->hasClass('TMLverbatim');
-                $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);
-                    }
-                }
-            }
-        }
+                _collapseOneClass($node, 'TMLverbatim');
+                _collapseOneClass($node, 'WYSIWYG_STICKY');
         if (   $node->{tag} eq 'p'
             && $node->{head}
@@ -408 +418 @@
         {
             my $kid = $node->{head};
-            if (   $kid->{tag} eq 'SPAN'
+            if (   uc($kid->{tag}) eq 'SPAN'
                 && $kid->hasClass('WYSIWYG_PROTECTED') )
             {