Fix showing of avatar in commenting form. (248f3eda) · Commits · extjs / jsduck

comments/app.js

+8 −11

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ var MySQLStore = require('connect-mysql-session')(express);
		var config = require('./config');
		var Request = require('./lib/request');
		var Auth = require('./lib/auth');
		var ApiAdapter = require('./lib/api_adapter');

		var app = express();

		@@ -78,11 +79,9 @@ app.get('/auth/session', function(req, res) {
		app.get('/auth/session_new', function(req, res) {
		new Request(req).getUser(function(user) {
		if (user) {
		res.json({
		userName: user.username,
		mod: user.moderator,
		sessionID: req.sessionID
		});
		var json = ApiAdapter.userToJson(user);
		json.sessionID = req.sessionID;
		res.json(json);
		}
		else {
		res.json({sessionID: req.sessionID});
		@@ -92,12 +91,10 @@ app.get('/auth/session_new', function(req, res) {

		app.post('/auth/login', Auth.attemptLogin, function(req, res) {
		new Request(req).getUser(function(user) {
		res.json({
		userName: user.username,
		mod: user.moderator,
		sessionID: req.sessionID,
		success: true
		});
		var json = ApiAdapter.userToJson(user);
		json.sessionID = req.sessionID;
		json.success = true;
		res.json(json);
		});
		});

comments/lib/api_adapter.js

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,9 +32,9 @@ module.exports = {
		userToJson: function(user) {
		return {
		id: user.id,
		username: user.username,
		userName: user.username,
		score: user.score,
		moderator: user.moderator,
		mod: user.moderator,
		emailHash: crypto.createHash('md5').update(user.email).digest("hex")
		};
		},

template/app/view/comments/Users.js

+5 −5

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ Ext.define('Docs.view.comments.Users', {
		cls: "iScroll users-list",
		autoScroll: true,
		store: Ext.create('Ext.data.Store', {
		fields: ["username", "score", "emailHash", "moderator"]
		fields: ["userName", "score", "emailHash", "mod"]
		}),
		allowDeselect: true,
		tpl: [
		@@ -70,7 +70,7 @@ Ext.define('Docs.view.comments.Users', {
		'<span class="score">{score}</span>',
		'<img class="avatar" width="25" height="25" src="http://www.gravatar.com/avatar/{emailHash}',
		'?s=25&r=PG&d=http://www.sencha.com/img/avatar.png">',
		'<span class="username <tpl if="moderator">moderator</tpl>">{username}</span>',
		'<span class="username <tpl if="mod">moderator</tpl>">{userName}</span>',
		'</li>',
		'</tpl>',
		'</ul>'
		@@ -105,7 +105,7 @@ Ext.define('Docs.view.comments.Users', {
		onFilter: function(pattern) {
		this.list.getSelectionModel().deselectAll();
		this.list.getStore().clearFilter(true);
		this.list.getStore().filter({property: "username", value: pattern, anyMatch: true});
		this.list.getStore().filter({property: "userName", value: pattern, anyMatch: true});
		},

		/**
		@@ -117,7 +117,7 @@ Ext.define('Docs.view.comments.Users', {

		onSelect: function(user) {
		this.selectedUser = user;
		this.fireEvent("select", user.get("username"));
		this.fireEvent("select", user.get("userName"));
		},

		onDeselect: function() {
		@@ -140,7 +140,7 @@ Ext.define('Docs.view.comments.Users', {
		loadUsers: function(users) {
		this.list.getStore().loadData(users);
		if (this.selectedUser) {
		var index = this.list.getStore().findExact("username", this.selectedUser.get("username"));
		var index = this.list.getStore().findExact("username", this.selectedUser.get("userName"));
		this.list.getSelectionModel().select(index, false, true);
		}
		}