ux/Lightbox.js

[roojs1] / ux / Showdown.js

diff --git a/ux/Showdown.js b/ux/Showdown.js
index e569e0f..18eee4f 100644 (file)
--- a/ux/Showdown.js
+++ b/ux/Showdown.js
@@ -87,14 +87,14 @@ Roo.ux.Showdown.converter = function() {
     var g_list_level = 0;
     
     
-    this.makeHtml = function(text) {
+    this.makeHtml = function(_text) {
     //
     // Main function. The order in which other subs are called here is
     // essential. Link and image substitutions need to happen before
     // _EscapeSpecialCharsWithinTagAttributes(), so that any *'s or _'s in the <a>
     // and <img> tags get encoded.
-    //
-    
+    //v
+            var text = '' + _text;
             // Clear the global hashes. If we don't clear these, you get conflicts
             // from other articles when generating a page which contains more than
             // one article (e.g. an index page that shows the N most recent
@@ -951,14 +951,19 @@ Roo.ux.Showdown.converter = function() {
     // Encode/escape certain characters inside Markdown code runs.
     // The point is that in code, these characters are literals,
     // and lose their special Markdown meanings.
+    
+    // REMOVED - Data going into markdown should be encoded before it enters..
+    
     //
             // Encode all ampersands; HTML entities are not
             // entities within a Markdown code span.
-            text = text.replace(/&/g,"&amp;");
+            
+            
+            //text = text.replace(/&/g,"&amp;");
     
             // Do the angle bracket song and dance:
-            text = text.replace(/</g,"&lt;");
-            text = text.replace(/>/g,"&gt;");
+            //text = text.replace(/</g,"&lt;");
+            //text = text.replace(/>/g,"&gt;");
     
             // Now, escape characters that are magic in Markdown:
             text = escapeCharacters(text,"\*_{}[]\\",false);
@@ -1232,7 +1237,7 @@ Roo.ux.Showdown.converter = function() {
             text = text.replace(/^(\t|[ ]{1,4})/gm,"~0"); // attacklab: g_tab_width
     
             // attacklab: clean up hack
-            text = text.replace(/~0/g,"")
+            text = text.replace(/~0/g,"");
     
             return text;
     }