v.2.6.0, minor changes

Author: Nikos M

README.md

@@ -128,8 +128,8 @@ var xml_mode = PrismGrammar.getMode( xml_grammar );
 // output escaped html code, to work properly (Prism.version 1.2.0+)
 xml_mode.escapeHtml = true;
 
-// 3. use it with Prism for
-xml_mode.hook( Prism, "xml" );
+// 3. use it with Prism
+xml_mode.hook( "xml", Prism );
 
 // mode can be unhooked also
 // xml_mode.unhook();

build/prism_grammar.js

@@ -3224,16 +3224,19 @@ var PrismParser = Class(Parser, {
     }
 });
 
-function get_mode( grammar ) 
+
+function esc_token( i, tokens )
+{
+    var t = tokens[i];
+    if ( t.content ) t.content = esc_html( t.content, 1 );
+    else t = esc_html( t, 1 );
+    tokens[i] = t;
+}
+
+function get_mode( grammar, Prism ) 
 {
-    var prism_highlighter, is_hooked = 0, $Prism$,
+    var prism_highlighter, is_hooked = 0, $Prism$ = Prism,
 
-    esc_token = function( i, tokens ) {
-        var t = tokens[i];
-        if ( t.content ) t.content = esc_html( t.content, 1 );
-        else t = esc_html( t, 1 );
-        tokens[i] = t;
-    },
     highlighter$ = {
         'before-highlight': function( env ) {
             // use the custom parser for the grammar to highlight
@@ -3268,16 +3271,24 @@ function get_mode( grammar )
         ,$parser: new PrismGrammar.Parser( parse_grammar( grammar ) )
 
         ,$lang: null
+        
         // have escapeHtml flag true by default
         ,escapeHtml: true
 
         // TODO:  a way to highlight in worker (like default prism async flag)
         // post a request to prism repository?????
         ,$async: false
 
-        ,hook: function( Prism, language ) {
+        ,hook: function( language, Prism ) {
             if ( is_hooked ) prism_highlighter.unhook();
-            $Prism$ = Prism;
+            if ( T_STR & get_type(Prism) )
+            {
+                // arguments given in different order
+                var tmp = language;
+                language = Prism;
+                Prism = tmp;
+            }
+            $Prism$ = Prism || $Prism$;
             prism_highlighter.$lang = language;
             for (var hook in highlighter$ )
             {

build/prism_grammar.min.js

@@ -53,16 +53,19 @@ var PrismParser = Class(Parser, {
     }
 });
 
-function get_mode( grammar ) 
+
+function esc_token( i, tokens )
+{
+    var t = tokens[i];
+    if ( t.content ) t.content = esc_html( t.content, 1 );
+    else t = esc_html( t, 1 );
+    tokens[i] = t;
+}
+
+function get_mode( grammar, Prism ) 
 {
-    var prism_highlighter, is_hooked = 0, $Prism$,
+    var prism_highlighter, is_hooked = 0, $Prism$ = Prism,
 
-    esc_token = function( i, tokens ) {
-        var t = tokens[i];
-        if ( t.content ) t.content = esc_html( t.content, 1 );
-        else t = esc_html( t, 1 );
-        tokens[i] = t;
-    },
     highlighter$ = {
         'before-highlight': function( env ) {
             // use the custom parser for the grammar to highlight
@@ -97,16 +100,24 @@ function get_mode( grammar )
         ,$parser: new PrismGrammar.Parser( parse_grammar( grammar ) )
 
         ,$lang: null
+        
         // have escapeHtml flag true by default
         ,escapeHtml: true
 
         // TODO:  a way to highlight in worker (like default prism async flag)
         // post a request to prism repository?????
         ,$async: false
 
-        ,hook: function( Prism, language ) {
+        ,hook: function( language, Prism ) {
             if ( is_hooked ) prism_highlighter.unhook();
-            $Prism$ = Prism;
+            if ( T_STR & get_type(Prism) )
+            {
+                // arguments given in different order
+                var tmp = language;
+                language = Prism;
+                Prism = tmp;
+            }
+            $Prism$ = Prism || $Prism$;
             prism_highlighter.$lang = language;
             for (var hook in highlighter$ )
             {

src/main.js

@@ -3,7 +3,7 @@ function prism_grammar_demo(code, lang, grammar, escapeHtml)
     document.getElementById('editor-version').innerHTML = '1.2.0';
     document.getElementById('grammar-version').innerHTML = PrismGrammar.VERSION;
     var mode = PrismGrammar.getMode( grammar );
-    mode.escapeHtml = !!escapeHtml; // whether to escape html code to output properly, Prism.version 1.2.0+
-    mode.hook( Prism, lang );
+    mode.escapeHtml = true; // whether to escape html code to output properly, Prism.version 1.2.0+
+    mode.hook( lang, Prism );
     Prism.highlightElement( code );
 }

test/demo.js

@@ -65,7 +65,7 @@ <h3>Prism (v.<span id="editor-version">0</span>) Grammar (v.<span id="grammar-ve
 
         <script>
         // <![CDATA[
-        prism_grammar_demo(document.getElementById('code'), "markup", xml_grammar, true /*html-ecsape output code*/);
+        prism_grammar_demo(document.getElementById('code'), "markup", xml_grammar);
         // ]]>
         </script>
     </body>