From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Tue, 5 Mar 2013 11:15:20 +0000 (+0000)
Subject: Merge branch 'client_plugins' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8f56a32e476ed93ab2cc58cf9d1539318ec3b950;p=KiwiIRC.git

Merge branch 'client_plugins' into development
---

8f56a32e476ed93ab2cc58cf9d1539318ec3b950
diff --cc client/assets/dev/model_application.js
index 2c4b2d3,f8d37c7..c6400ba
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@@ -826,22 -817,20 +822,22 @@@ _kiwi.model.Application = function () 
                  _kiwi.gateway.changeNick(ev.params[0]);
              });
  
-             controlbox.on('command_query', queryCommand);
+             controlbox.on('command:query', queryCommand);
  
-             controlbox.on('command_topic', topicCommand);
+             controlbox.on('command:topic', topicCommand);
  
-             controlbox.on('command_notice', noticeCommand);
+             controlbox.on('command:notice', noticeCommand);
  
-             controlbox.on('command_quote', quoteCommand);
+             controlbox.on('command:quote', quoteCommand);
  
-             controlbox.on('command_kick', kickCommand);
+             controlbox.on('command:kick', kickCommand);
  
-             controlbox.on('command_clear', clearCommand);
+             controlbox.on('command:clear', clearCommand);
  
 +            controlbox.on('command_ctcp', ctcpCommand);
 +
  
-             controlbox.on('command_css', function (ev) {
+             controlbox.on('command:css', function (ev) {
                  var queryString = '?reload=' + new Date().getTime();
                  $('link[rel="stylesheet"]').each(function () {
                      this.href = this.href.replace(/\?.*|$/, queryString);