From: Cory Chaplin <cory.chaplin@laposte.net>
Date: Fri, 4 Apr 2014 07:56:15 +0000 (+0200)
Subject: Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4bb4a041eb09c0f663061ca24928b698721b600b;p=KiwiIRC.git

Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes

Conflicts:
	client/src/app.js
	client/src/models/member.js
---

4bb4a041eb09c0f663061ca24928b698721b600b
diff --cc client/src/models/member.js
index a472b24,618fd78..88a4f45
--- a/client/src/models/member.js
+++ b/client/src/models/member.js
@@@ -105,14 -148,16 +148,18 @@@ _kiwi.model.Member = Backbone.Model.ext
  
          return display;
      },
 -
 -
 +    getMemberMask: function () {
 +        // Why to use %N and %H is quite clear here. %J is because %I is already for italic and %U for underlines. Better ideas ?
 +        return {'%N': this.get('nick'), '%J': this.get("ident"), '%H': this.get("hostname")};
 +    },
-     isOp: function () {
-         var user_prefixes = _kiwi.gateway.get('user_prefixes'),
+     /**
+      * With the modes set on the user, make note if we have some sort of op status
+      */
+     updateOpStatus: function () {
+         var user_prefixes = this.get('user_prefixes'),
              modes = this.get('modes'),
              o, max_mode;
+ 
          if (modes.length > 0) {
              o = _.indexOf(user_prefixes, _.find(user_prefixes, function (prefix) {
                  return prefix.mode === 'o';