[polari] connections: Trim whitespace from user input
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] connections: Trim whitespace from user input
- Date: Mon, 2 Mar 2015 22:16:01 +0000 (UTC)
commit 68213ad4fd85c168e4ef3ec1f83244b71e7b6652
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Mar 2 22:45:46 2015 +0100
connections: Trim whitespace from user input
Surrounding whitespace may be odd-but-harmless at best, but will
cause connection problems when used with the server address.
Just trim whitespace from all entries before processing them.
https://bugzilla.gnome.org/show_bug.cgi?id=743988
src/connections.js | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/connections.js b/src/connections.js
index 17d701e..b7fc45c 100644
--- a/src/connections.js
+++ b/src/connections.js
@@ -197,19 +197,22 @@ const ConnectionDetails = new Lang.Class({
},
_getParams: function() {
+ let serverText = this._serverEntry.text.trim();
+ let descText = this._descEntry.text.trim();
+
let serverRegEx = /(.*?)(?::(\d{1,5}))?$/;
- let [, server, port] = this._serverEntry.text.match(serverRegEx);
+ let [, server, port] = serverText.match(serverRegEx);
let params = {
- name: this._descEntry.text.length ? this._descEntry.text : server,
+ name: descText.length ? descText : server,
server: server,
- account: this._nickEntry.text
+ account: this._nickEntry.text.trim()
};
if (port)
params.port = port;
if (this._realnameEntry.text)
- params.fullname = this._realnameEntry.text;
+ params.fullname = this._realnameEntry.text.trim();
return params;
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]