From f9a2a601d18fdd30bae93f8c20108ea35e844e76 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 11 May 2010 15:47:39 -0400
Subject: [PATCH] - Fix signatures get added instead of replaced in plain text mode (#1486730)
---
program/js/app.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 5a4d349..4e7db32 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2798,8 +2798,9 @@
if (!is_html) {
// remove the 'old' signature
if (show_sig && sig && this.env.signatures && this.env.signatures[sig]) {
+
sig = this.env.signatures[sig].is_html ? this.env.signatures[sig].plain_text : this.env.signatures[sig].text;
- sig = sig.replace(/\r\n/, '\n');
+ sig = sig.replace(/\r\n/g, '\n');
if (!sig.match(/^--[ -]\n/))
sig = sig_separator + '\n' + sig;
@@ -2811,7 +2812,7 @@
// add the new signature string
if (show_sig && this.env.signatures && this.env.signatures[id]) {
sig = this.env.signatures[id]['is_html'] ? this.env.signatures[id]['plain_text'] : this.env.signatures[id]['text'];
- sig = sig.replace(/\r\n/, '\n');
+ sig = sig.replace(/\r\n/g, '\n');
if (!sig.match(/^--[ -]\n/))
sig = sig_separator + '\n' + sig;
@@ -4167,7 +4168,7 @@
/********* GUI functionality *********/
/*********************************************************/
- // eable/disable buttons for page shifting
+ // enable/disable buttons for page shifting
this.set_page_buttons = function()
{
this.enable_command('nextpage', (this.env.pagecount > this.env.current_page));
--
Gitblit v1.9.1