Item8358: fix with {JQueryPlugin}{NoConflict} enabled; fix ascii high…

…lighting; update release history git-svn-id: http://svn.foswiki.org/trunk/DpSyntaxHighlighterPlugin@9774 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Oct 27, 2010 · a6605ae · a6605ae
1 parent c2c15ab
commit a6605ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/data/System/DpSyntaxHighlighterPlugin.txt b/data/System/DpSyntaxHighlighterPlugin.txt
@@ -98,7 +98,7 @@ function hello () {
 %ENDCODE%
 
 ---+++ NatSkin users
-BaseStyle.css sets 
+!BaseStyle.css sets 
 %CODE{"css"}%.natMainContents {
     min-height: 40em;
 }%ENDCODE%
@@ -118,6 +118,7 @@ You should add an override to your CSS customisations that has the following eff
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 |  Dp Syntax Highlighter License: | [[http://www.gnu.org/copyleft/lesser.html][LGPL 3 (Gnu Lesser General Public License)]] |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  27 Oct 2010 | 2.0: Fix for Foswiki 1.1 (Foswikitask:Item9883); Fix when ={JQueryPlugin}{NoConflict}= enabled (Foswikitask:Item8358); Fix =ascii= highlighting -- Foswiki:Main.AndrewJones |
 |  31 Jul 2010 | 1.9: Fix Perl warning in logs (Foswikitask:Item9414) -- Foswiki:Main.AndrewJones |
 |  30 Apr 2010 | 1.8: Improve JQueryPlugin+ZonePlugin support, added CSS notes for NatSkin users, ship .gz compressed CSS and JS files, address some perlcritic-isms (Foswikitask:Item8654) -- Foswiki:Main.PaulHarvey |
 |  07 Jan 2010 | 1.7: Add =noautolinks= parameter; Doc updates. Thanks to Foswiki:Main.AleksandarJelenak (Foswikitask:Item8363) -- Foswiki:Main.AndrewJones |

diff --git a/lib/Foswiki/Plugins/DpSyntaxHighlighterPlugin.pm b/lib/Foswiki/Plugins/DpSyntaxHighlighterPlugin.pm
@@ -21,7 +21,7 @@ use warnings;
 use vars qw( $VERSION $RELEASE $NO_PREFS_IN_TOPIC $SHORTDESCRIPTION $pluginName $rootDir $doneHead );
 
 our $VERSION = '$Rev$';
-our $RELEASE = '1.9';
+our $RELEASE = '2.0';
 our $pluginName = 'DpSyntaxHighlighterPlugin';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'Client side syntax highlighting using the [[http://code.google.com/p/syntaxhighlighter/][dp.SyntaxHighlighter]]';
@@ -192,7 +192,7 @@ SyntaxHighlighter.render = function(){
 }
 if (typeof jQuery != 'undefined') {
   // jQuery
-  \$(document).ready(SyntaxHighlighter.render);
+  jQuery(document).ready(SyntaxHighlighter.render);
 } else if (typeof YAHOO != "undefined") {
   // YUI
   YAHOO.util.Event.onDOMReady(SyntaxHighlighter.render);

diff --git a/pub/System/DpSyntaxHighlighterPlugin/dp.SyntaxHighlighter/scripts/shBrushPlain.js b/pub/System/DpSyntaxHighlighterPlugin/dp.SyntaxHighlighter/scripts/shBrushPlain.js
@@ -32,4 +32,4 @@ SyntaxHighlighter.brushes.Plain = function()
 };
 
 SyntaxHighlighter.brushes.Plain.prototype = new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.Plain.aliases = ['text', 'plain'];
+SyntaxHighlighter.brushes.Plain.aliases = ['text', 'plain', 'ascii'];