From 05f259cee85258858d907480e676625f68a68b91 Mon Sep 17 00:00:00 2001 From: Eston Bond Date: Mon, 6 Dec 2010 16:11:19 -0800 Subject: [PATCH] Change regexes in language definitions to strip trailing spaces in Windows textareas --- .../javascript/gollum-editor/langs/asciidoc.js | 15 +++++++-------- .../javascript/gollum-editor/langs/markdown.js | 18 +++++++++--------- .../javascript/gollum-editor/langs/pod.js | 6 +++--- .../javascript/gollum-editor/langs/rdoc.js | 7 +++---- .../javascript/gollum-editor/langs/textile.js | 9 ++++----- .../frontend/public/javascript/gollum.js | 7 +------ 6 files changed, 27 insertions(+), 35 deletions(-) mode change 100644 => 100755 lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js mode change 100644 => 100755 lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/asciidoc.js b/lib/gollum/frontend/public/javascript/gollum-editor/langs/asciidoc.js index a97ff53b..b1fb5a90 100755 --- a/lib/gollum/frontend/public/javascript/gollum-editor/langs/asciidoc.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/langs/asciidoc.js @@ -8,33 +8,32 @@ var ASCIIDoc = { 'function-bold' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "*$1*$2" }, 'function-italic' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "_$1_$2" }, 'function-code' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "+$1+$2" }, 'function-ul' : { - search: /(.+)([\n]?)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "* $1$2" }, - - /* This looks silly but is completely valid Markdown */ + 'function-ol' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: ". $1$2" }, 'function-blockquote' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "----\n$1$2\n----\n" }, diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/markdown.js b/lib/gollum/frontend/public/javascript/gollum-editor/langs/markdown.js index 91b575fc..5f136b9f 100755 --- a/lib/gollum/frontend/public/javascript/gollum-editor/langs/markdown.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/langs/markdown.js @@ -22,17 +22,17 @@ var MarkDown = { 'function-bold' : { - search: /([^\n]+)([\n]*)/gi, + search: /([^\n]+)([\n\s]*)/g, replace: "**$1**$2" }, 'function-italic' : { - search: /([^\n]+)([\n]*)/gi, + search: /([^\n]+)([\n\s]*)/g, replace: "_$1_$2" }, 'function-code' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "`$1`$2" }, @@ -41,33 +41,33 @@ var MarkDown = { }, 'function-ul' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "* $1$2" }, /* This looks silly but is completely valid Markdown */ 'function-ol' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "1. $1$2" }, 'function-blockquote' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "> $1$2" }, 'function-h1' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "# $1$2" }, 'function-h2' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "## $1$2" }, 'function-h3' : { - search: /(.+)([\n]?)/gi, + search: /(.+)([\n]?)/g, replace: "### $1$2" }, diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/pod.js b/lib/gollum/frontend/public/javascript/gollum-editor/langs/pod.js index d50dd1f0..e706088b 100755 --- a/lib/gollum/frontend/public/javascript/gollum-editor/langs/pod.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/langs/pod.js @@ -6,17 +6,17 @@ var Pod = { 'function-bold' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "B<$1>$2" }, 'function-italic' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "I<$1>$2" }, 'function-code' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "C<$1>$2" }, diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js b/lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js old mode 100644 new mode 100755 index 592af965..f701ed47 --- a/lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js @@ -22,11 +22,11 @@ var RDoc = { 'function-bold' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "((*$1*))$2" } 'function-code' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "(({$1}))$2" }, @@ -34,8 +34,7 @@ var RDoc = { search: /(.+)([\n]?)/gi, replace: "* $1$2" }, - - /* This looks silly but is completely valid Markdown */ + 'function-ol' : { exec: function( txt, selText, $field ) { var count = 1; diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js b/lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js old mode 100644 new mode 100755 index 5411106b..3af32c29 --- a/lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js @@ -6,12 +6,12 @@ var Textile = { 'function-bold' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "*$1*$2" }, 'function-italic' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "_$1_$2" }, @@ -20,7 +20,7 @@ var Textile = { }, 'function-code' : { - search: /([^\n]+)([\n]*)/gi, + search: /(^\n]+)([\n\s]*)/g, replace: "
$1
$2" }, @@ -28,8 +28,7 @@ var Textile = { search: /(.+)([\n]?)/gi, replace: "* $1$2" }, - - /* This looks silly but is completely valid Markdown */ + 'function-ol' : { search: /(.+)([\n]?)/gi, replace: "# $1$2" diff --git a/lib/gollum/frontend/public/javascript/gollum.js b/lib/gollum/frontend/public/javascript/gollum.js index 679c4fb9..acd37458 100755 --- a/lib/gollum/frontend/public/javascript/gollum.js +++ b/lib/gollum/frontend/public/javascript/gollum.js @@ -69,12 +69,7 @@ $(document).ready(function() { $(this).unbind('submit'); $(this).submit(); }); - } - - if ( window.MathJax ) { - - } - + } }); var nodeSelector = {