Changeset 30312

Timestamp:

2015-11-04T15:14:22+13:00 (8 years ago)

Author:

jmt12

Message:

Match and hide any HTML comments that appear within a TABAREA block

File:

• documentation/trunk/wiki/plugins/simpletabs/syntax.php (modified) (5 diffs)

documentation/trunk/wiki/plugins/simpletabs/syntax.php

@@ -133 +133 @@
     $this->Lexer->addPattern('<TAB>', 'plugin_simpletabs');
     $this->Lexer->addPattern('</TAB>', 'plugin_simpletabs');
+    // Hide comments always (sometimes used as separator)
+    $this->Lexer->addPattern('<!--.*?-->', 'plugin_simpletabs');
     // Special things inside the content we want to manually handle.
     $this->Lexer->addPattern( '^[ \t]*={2,6}\s?[^\n]+={2,6}[ \t]*(?=\n)', 'plugin_simpletabs');
@@ -230 +232 @@
                                    'bytepos' => $pos + strlen($match)));
       }
+      if (preg_match('/<!--(.*)?-->/s', $match, $matches))
+      {
+          $this->_debugPrint("Handler=>comment: " . htmlspecialchars($matches[1]));
+          $params = array();
+          $params['action'] = 'comment';
+          $params['comment'] = $matches[1];
+          return array($state, $params);
+      }
       if (preg_match('/(={2,6})\s*(.+?)\s*={2,6}/', $match, $matches))
       {
@@ -249 +259 @@
 
     case DOKU_LEXER_UNMATCHED:
-        $this->_debugPrint("Handler=>unmatched: " . $match);
+        $this->_debugPrint("Handler=>unmatched: " . htmlspecialchars($match));
       return array($state, $match);
       break;
@@ -313 +323 @@
               if ($this->divide_edit_section && method_exists($renderer, 'startSectionEdit'))
               {
-                  $extra_classy = $renderer->startSectionEdit($params['bytepos'], 'plugin_simpletabs');
+                  $extra_classy = ' ' . $renderer->startSectionEdit($params['bytepos'], 'plugin_simpletabs');
               }
-              $renderer->doc .= '  <div id="simpletabs-tc' . $params['tab_area_id'] . '_' . $params['tab_number'] . '" class="tab ' . $extra_classy . '" ';
+              $renderer->doc .= '  <div id="simpletabs-tc' . $params['tab_area_id'] . '_' . $params['tab_number'] . '" class="tab' . $extra_classy . '"';
               if (!$params['active'])
               {
@@ -332 +342 @@
               $renderer->doc .= '</div>';
               break;
+          case 'comment':
+              $renderer->doc .= '<!-- ' . $params['comment'] . ' -->';
+              break;
           case 'heading':
               $renderer->doc .= '<h' . $params['level'] . '>' . $params['title'] . '</h' . $params['level'] . '>';