* Fixed overlfow in user list, removed usless EM.defer, small bug fixes

jamez01 · Dec 1, 2014 · b36da85 · b36da85
1 parent 88330c5
commit b36da85
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/lib/commands.rb b/lib/commands.rb
@@ -8,9 +8,7 @@ def parse_command(hash)
       args = hash['args']
       puts "Invalid command: command_#{command}".to_sym unless self.respond_to?("command_#{command}")
       begin
-        EM.defer {
-          self.method("command_#{command}".to_sym).call(args)
-        } if self.respond_to?("command_#{command}")
+          self.method("command_#{command}".to_sym).call(args) if self.respond_to?("command_#{command}")
       rescue
       end
     end

diff --git a/lib/plugins/join.rb b/lib/plugins/join.rb
@@ -16,13 +16,15 @@ def initialize(*)
       def on_join(m)
         @webclient.send_command(:join, nick: m.user.nick, channel: m.channel, host: m.user.host)
         @webclient.names(m.channel)
-        @webclient.send_command(:topic, nick: m.user.nick, channel: m.channel, topic: m.channel.topic) if m.user.nick == @webclient.nick # Update topic
+        @webclient.send_command(:topic, nick: m.user.nick, channel: m.channel, topic: m.channel.topic) if m.user.nick == @webclient.nick  # Update topic
       end
 
       def on_part(m)
-        # @webclient.on_part(m.user,m.channel)
-        @webclient.send_command(:part, nick: m.user.nick, channel: m.channel, host: m.user.host)
-        @webclient.names(m.channel) unless m.user.nick == bot.nick
+        puts [m.user.nick,@webclient.nick].inspect
+        unless m.user.nick == @webclient.nick
+          @webclient.send_command(:part, nick: m.user.nick, channel: m.channel, host: m.user.host)
+          @webclient.names(m.channel) unless m.user.nick == bot.nick
+        end
       end
 
       def on_topic(m)

diff --git a/public/webric.css b/public/webric.css
@@ -33,10 +33,17 @@ body {
   width: 100%;
   border-bottom-style: groove;
 }
-#users { border-left-style: groove; padding-left: 15px; }
+#users {
+  border-left-style: groove;
+  padding-left: 15px;
+  overflow-x: auto;
+  overflow-y: auto;
+  word-wrap: normal;
+  white-space: normal;
+}
 #inputRow { margin-top: 15px; }
 #chatCol {
-  overflow-x: auto;
+  overflow-x: none;
   overflow-y: auto;
   word-wrap: normal;
   white-space: normal;

diff --git a/public/webric.js b/public/webric.js
@@ -25,7 +25,7 @@ var WebRic = {
     });
     var queryOptions = new URI(window.location.href).search(true);
     // Hide any any configuration UI elements that are pre-defined in init configuration as these should not be overided
-    if ( 'userOptions' in conf) {
+    if ( conf && 'userOptions' in conf) {
       for(var key in conf['userOptions'])  {
         if(typeof key == 'string') {
           var elementName = '#'+key+'Group';