Preserve leading spaces when using the Quote function (#35677).

Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@21170 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/javascripts/jstoolbar/markdown.js b/public/javascripts/jstoolbar/markdown.js
index ae27252693cf19df429ee3f36d4dc9354523a5f7..902babab639199b22f000c8287bc196252b5fec8 100644 (file)
--- a/public/javascripts/jstoolbar/markdown.js
+++ b/public/javascripts/jstoolbar/markdown.js
@@ -153,7 +153,7 @@ jsToolBar.prototype.elements.bq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+        return str.replace(/(\n|^)( *)([^\n]*)/g,"$1> $2$3");
       });
     }
   }
@@ -167,7 +167,7 @@ jsToolBar.prototype.elements.unbq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+        return str.replace(/(\n|^) *(> ?)?( *)([^\n]*)/g,"$1$3$4");
       });
     }
   }

diff --git a/public/javascripts/jstoolbar/textile.js b/public/javascripts/jstoolbar/textile.js
index 76d2170cc299dbc4e99e5a1a7fd5bfcd12cce7fa..bc994d2883c1f849616d45d54f9100b57556af71 100644 (file)
--- a/public/javascripts/jstoolbar/textile.js
+++ b/public/javascripts/jstoolbar/textile.js
@@ -153,7 +153,7 @@ jsToolBar.prototype.elements.bq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+        return str.replace(/(\n|^)( *)([^\n]*)/g,"$1> $2$3");
       });
     }
   }
@@ -167,7 +167,7 @@ jsToolBar.prototype.elements.unbq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+        return str.replace(/(\n|^) *(> ?)?( *)([^\n]*)/g,"$1$3$4");
       });
     }
   }