Text theme fixes

diff --git a/client/assets/text_themes/default.json b/client/assets/text_themes/default.json
index 4df00ac860431a6f57b8a69ba1089e0d22d32143..44dc8db75dcafde199146c75c39c8ad46cdcbc77 100644 (file)
--- a/client/assets/text_themes/default.json
+++ b/client/assets/text_themes/default.json
@@ -1,19 +1,3 @@
-/**
- * TEXT THEMES SYNTAX
- * 
- * %N: nickname
- * %C[digit]: color
- * %C: channel
- * %J: ident
- * %H: host
- * %R: realname
- * %B: bold
- * %I: italic
- * %U: underline
- * %O: cancel styles
- * %T: translated text
- **/
-
 {
   "client_models_channel_join": "== %N %T",
   "client_models_channel_part": "== %N %T",

diff --git a/client/src/models/network.js b/client/src/models/network.js
index 23987bfe83e48cfbd1f45f067a48f0609b94da6d..dcb2780ca3bb5e8b2d479251b2f76c68050c15f2 100644 (file)
--- a/client/src/models/network.js
+++ b/client/src/models/network.js
@@ -168,11 +168,6 @@
                 // Trim any whitespace off the name
                 channel_name = channel_name.trim();
 
-                // If not a valid channel name, display a warning
-                if (!that.isChannelName(channel_name)) {
-                    that.panels.server.addMsg('', styleText('client_models_network_channel_invalid_name', {'%T': translateText('client_models_network_channel_invalid_name'), '%C': channel_name}));
-                    _kiwi.app.message.text(channel_name + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(), {timeout: 5000});
-                    return;
                 // Add channel_prefix in front of the first channel if missing
                 if (that.get('channel_prefix').indexOf(channel_name[0]) === -1) {
                     // Could be many prefixes but '#' is highly likely the required one
@@ -191,6 +186,7 @@
                 that.gateway.join(channel_name, channel_key);
             });
 
+
             return panels;
         },
 

diff --git a/client/src/views/texttheme.js b/client/src/views/texttheme.js
index ec56cf17ee3ad7bc515d535df27df849d2957c4d..c85f1c2271b74282f3d95593c248765e15d60330 100644 (file)
--- a/client/src/views/texttheme.js
+++ b/client/src/views/texttheme.js
@@ -1,3 +1,19 @@
+/**
+ * TEXT THEMES SYNTAX
+ * 
+ * %N: nickname
+ * %C[digit]: color
+ * %C: channel
+ * %J: ident
+ * %H: host
+ * %R: realname
+ * %B: bold
+ * %I: italic
+ * %U: underline
+ * %O: cancel styles
+ * %T: translated text
+ **/
+
 _kiwi.view.TextTheme = _kiwi.view.Panel.extend({
        initialize: function(text_theme) {
                this.text_theme = text_theme;

diff --git a/config.example.js b/config.example.js
index 1314152faca35ffd7e098867d91271a7372bcfea..96efa1c46f4108e8973844966b735b613711e2bc 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -178,6 +178,7 @@ conf.client = {
     nick:    'kiwi_?',
     settings: {
         theme: 'relaxed',
+        text_theme: 'default',
         channel_list_style: 'tabs',
         scrollback: 250,
         show_joins_parts: true,