Changeset 2065

Timestamp:

07/23/2007 09:05:56 PM (16 months ago)

Author:

xue

Message:

removed geshi from the other controls.

Location:

trunk/framework

Files:

• Util/TVarDumper.php (modified) (1 diff)
• Web/UI/WebControls/TMarkdown.php (modified) (1 diff)
• Web/UI/WebControls/TTextHighlighter.php (modified) (1 diff)

trunk/framework/Util/TVarDumper.php

@@ -51 +51 @@
                 if($highlight)
                 {
-                        Prado::using('System.3rdParty.geshi.geshi');
-                        $geshi = new GeSHi(self::$_output, 'vardump');
-                        return $geshi->parse_code();
+                        $result=highlight_string("<?php\n".self::$_output,true);
+                        return preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
                 }
                 else

trunk/framework/Web/UI/WebControls/TMarkdown.php

@@ -68 +68 @@
         protected function highlightCode($matches)
         {
-                $geshi=new GeSHi(html_entity_decode($matches[2],ENT_QUOTES,'UTF-8'), $matches[1]);
-                if($this->getShowLineNumbers())
-                        $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
-                $geshi->enable_classes();
-                if($this->getEnableCopyCode())
-                        $geshi->set_header_content($this->getHeaderTemplate());
-
-                return $geshi->parse_code();
+                $text = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+                $this->setLanguage($matches[1]);
+                return parent::processText($text);
         }
 }

trunk/framework/Web/UI/WebControls/TTextHighlighter.php

@@ -27 +27 @@
  * syntax. By setting {@link setShowLineNumbers ShowLineNumbers}
  * to true, the highlighted result may be shown with line numbers.
+ *
+ * Note, TTextHighlighter requires {@link THead} to be placed on the page template
+ * because it needs to insert some CSS styles.
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>