فهرست منبع

Don't check the cache in getVCard since we don't call it so often anymore

JC Brand 12 سال پیش
والد
کامیت
6f5ff13055
1فایلهای تغییر یافته به همراه8 افزوده شده و 23 حذف شده
  1. 8 23
      converse.js

+ 8 - 23
converse.js

@@ -1043,7 +1043,6 @@
                 partner_jid = from;
                 resource = Strophe.getResourceFromJid(message_from);
             }
-
             chatbox = this.get(partner_jid);
             if (!chatbox) {
                 xmppchat.getVCard(
@@ -1222,28 +1221,14 @@
     });
 
     xmppchat.getVCard = function (jid, callback, errback) {
-        /* First we check if we don't already have a RosterItem, since it will
-         * contain all the vCard details.
-         */
-        var model = xmppchat.roster.getItem(jid);
-        if (model) {
-            callback(
-                model.get('jid'), 
-                model.get('fullname'), 
-                model.get('image'),
-                model.get('image_type'), 
-                model.get('url')
-            );
-        } else {
-            xmppchat.connection.vcard.get($.proxy(function (iq) {
-                $vcard = $(iq).find('vCard');
-                var fullname = $vcard.find('FN').text(),
-                    img = $vcard.find('BINVAL').text(),
-                    img_type = $vcard.find('TYPE').text(),
-                    url = $vcard.find('URL').text();
-                callback(jid, fullname, img, img_type, url);
-            }, this), jid, errback);
-        }
+        xmppchat.connection.vcard.get($.proxy(function (iq) {
+            $vcard = $(iq).find('vCard');
+            var fullname = $vcard.find('FN').text(),
+                img = $vcard.find('BINVAL').text(),
+                img_type = $vcard.find('TYPE').text(),
+                url = $vcard.find('URL').text();
+            callback(jid, fullname, img, img_type, url);
+        }, this), jid, errback);
     }
 
     xmppchat.RosterItems = Backbone.Collection.extend({