Converted markup to use markdown syntax.

Author: wsams

README.md

@@ -12,7 +12,7 @@ This chat application is designed for for use within a web browser and is focuse
 * Slash commands similar to IRC. Implement `CommandPlugin` for custom slash commands. e.g. /help
 * User is typing notification.
 * Growl messages for events such as: status changes, sign on, sign off, user is typing, ...
-* Messages formatting with markdown syntax.
+* Messages formatted with markdown syntax using the [showdown](https://github.com/showdownjs/showdown) library. Here's a populate [markdown cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
 
 ## INSTALL
 
@@ -159,52 +159,6 @@ e.g. https://www.example.com/talk2me/#room@username!
 
 *Note, a username may only be a member of one room at any time.*
 
-### Message Filtering (Wiki like syntax)
-
-Embed YouTube videos.
-
-    {youtube}https://www.youtube.com/watch?v=mgMn68Rgva0{/youtube}
-
-Insert image.
-
-    {http://www.example.com/image.jpg}
-
-Insert hyper link with custom text.
-
-    [http://www.example.com | This is a link]
-
-Insert a hyper link.
-
-    [http://www.example.com]
-
-Bold text.
-
-    '''make me bold'''
-
-Italic text.
-
-    ''make me italic''
-
-Strikethrough text.
-
-    {-strike me-}
-
-Monospace code font.
-
-    @@This will be monospace@@
-
-Create a line break. i.e. <br />
-
-    {br}
-
-Code blocks.
-
-    {code}
-    function foo() {
-        console.log('hello world');
-    }
-    {/code}
-
 ## Command Plugin
 
 To enable the command plugin copy `src/Talk2Me/example.CommandPlugin.php` to `src/Talk2Me/CommandPlugin.php`.

html/index.html

@@ -112,8 +112,8 @@ <h1><span style="color:#930000">t</span><span style="color:#aa1717">a</span><spa
         <script src="js/tinycon.min.js"></script>
         <script src="js/livequery/jquery.livequery.min.js"></script>
         <script src="js/highlight/highlight.pack.js"></script>
-        <script src="js/wwiki.min.js"></script>
         <script src="js/Autolinker.min.js"></script>
+        <script src="js/showdown.min.js"></script>
         <script src="js/talk2me.js"></script>
     </body>
 </html>

html/js/showdown.min.js

@@ -23,6 +23,7 @@
         twitter: false,
         urls: true
     });
+    var converter = new showdown.Converter();
 
     function random(min, max) {
         "use strict";
@@ -343,7 +344,7 @@
 
                             if (v.item.message) {
                                 $(".messages").append("<div class=\"well well-sm message\">"
-                                        + Wwiki.render(linker.link(htmlMessage)) + "</div>");
+                                        + linker.link(converter.makeHtml(htmlMessage)) + "</div>");
                             }
                         });
                         var s = $(jsonObj.messages).size();
@@ -414,7 +415,7 @@
         if (encrypted) {
             msg = getMessageLockHTML() + " " + msg;
         }
-        $(".messages").prepend("<div class=\"well well-sm message\">" + Wwiki.render(linker.link(msg)) + "</div>");
+        $(".messages").prepend("<div class=\"well well-sm message\">" + linker.link(converter.makeHtml(msg)) + "</div>");
     }
 
     function appendParsedMessage(msg, encrypted) {
@@ -444,7 +445,7 @@
         var htmlMessage = "<span class=\"room-user-message\">@" + username + "</span> "
             + message + " <span class=\"timestamp\">" + timestamp + "</span>";
         // TODO: end: create function for this (#duplicateParsedMessage)
-        $(".messages").prepend("<div class=\"well well-sm message\">" + Wwiki.render(linker.link(htmlMessage)) + "</div>");
+        $(".messages").prepend("<div class=\"well well-sm message\">" + linker.link(converter.makeHtml(htmlMessage)) + "</div>");
         growl('@' + username + ': ' + jsonMessage.msg, "from-message-" + username);
     }
 
@@ -795,7 +796,7 @@
                 // TODO: end: create function for this (#duplicateParsedMessage)
 
                 $(".messages").append("<div class=\"well well-sm message\">"
-                        + Wwiki.render(linker.link(htmlMessage)) + "</div>");
+                        + linker.link(converter.makeHtml(htmlMessage)) + "</div>");
             });
             var s = $(jsonObj.messages).size();
             messagesShown += s;