浏览代码

Use gravatar when enabled.

j8
Jesse Bickel 9 年前
父节点
当前提交
fd9485b7e5
共有 2 个文件被更改,包括 12 次插入6 次删除
  1. 1
    1
      index.html
  2. 11
    5
      modules/UI/avatar/Avatar.js

+ 1
- 1
index.html 查看文件

@@ -202,7 +202,7 @@
202 202
         </div>
203 203
         <div id="settingsmenu" class="right-panel">
204 204
             <div class="icon-settings" data-i18n="settings.title"></div>
205
-            <img id="avatar" src="https://www.gravatar.com/avatar/87291c37c25be69a072a4514931b1749?d=wavatar&size=30"/>
205
+            <img id="avatar" src="images/avatar2.png"/>
206 206
             <div class="arrow-up"></div>
207 207
             <input type="text" id="setDisplayName" data-i18n="[placeholder]settings.name" placeholder="Name">
208 208
             <input type="text" id="setEmail" placeholder="E-Mail">

+ 11
- 5
modules/UI/avatar/Avatar.js 查看文件

@@ -1,4 +1,6 @@
1
-/* global MD5 */
1
+/* global Strophe, APP, MD5, config */
2
+var Settings = require("../../settings/Settings");
3
+
2 4
 var users = {};
3 5
 
4 6
 var Avatar = {
@@ -53,12 +55,16 @@ var Avatar = {
53 55
             );
54 56
             email = id;
55 57
         }
56
-        return 'https://www.gravatar.com/avatar/' +
57
-            MD5.hexdigest(email.trim().toLowerCase()) +
58
-            "?d=wavatar&size=" + (size || "30");
58
+        if (config.enableThirdPartyRequests === true) {
59
+            return 'https://www.gravatar.com/avatar/' +
60
+                MD5.hexdigest(id.trim().toLowerCase()) +
61
+                "?d=wavatar&size=" + (size || "30");
62
+        } else {
63
+            return 'images/avatar2.png';
64
+        }
59 65
     }
60 66
 
61 67
 };
62 68
 
63 69
 
64
-module.exports = Avatar;
70
+module.exports = Avatar;

正在加载...
取消
保存