From 3815ab806585afa205c074c0b40ddc31e4314190 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 6 Aug 2015 11:05:13 -0700 Subject: [PATCH 1/5] Added keys to array-based elements and made getMe asynchronous --- web/react/components/post_list.jsx | 14 +++++++------- web/react/components/settings_sidebar.jsx | 3 ++- web/react/components/sidebar_header.jsx | 3 ++- web/react/stores/user_store.jsx | 14 +------------- web/react/utils/async_client.jsx | 2 +- web/react/utils/client.jsx | 14 +++----------- 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index bb1b1704cd..0ee7e99692 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -439,9 +439,9 @@ module.exports = React.createClass({ currentPostDay = utils.getDateForUnixTicks(post.create_at); if (currentPostDay.toDateString() != previousPostDay.toDateString()) { postCtls.push( -
-
-
{currentPostDay.toDateString()}
+
+
+
{currentPostDay.toDateString()}
); } @@ -449,9 +449,9 @@ module.exports = React.createClass({ if (post.create_at > last_viewed && !rendered_last_viewed) { rendered_last_viewed = true; postCtls.push( -
-
-
New Messages
+
+
+
New Messages
); } @@ -459,7 +459,7 @@ module.exports = React.createClass({ previousPostDay = currentPostDay; } } else { - postCtls.push(); + postCtls.push(); } return ( diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx index ae8510cf22..b4d291622a 100644 --- a/web/react/components/settings_sidebar.jsx +++ b/web/react/components/settings_sidebar.jsx @@ -4,6 +4,7 @@ var utils = require('../utils/utils.jsx'); module.exports = React.createClass({ + displayName:'SettingsSidebar', updateTab: function(tab) { this.props.updateTab(tab); $('.settings-modal').addClass('display--content'); @@ -14,7 +15,7 @@ module.exports = React.createClass({
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index ba8f9bacda..023de3a19a 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -87,7 +87,8 @@ var NavbarDropdown = React.createClass({ } }); } - teams.push(
  • Create a New Team
    • ); + teams.push(
  • Create a New Team
    • ); + return (
      diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index aff5a0bed3..85cb4c9ee1 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -4,7 +4,6 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); var EventEmitter = require('events').EventEmitter; var assign = require('object-assign'); -var client = require('../utils/client.jsx'); var Constants = require('../utils/constants.jsx'); var ActionTypes = Constants.ActionTypes; @@ -73,24 +72,13 @@ var UserStore = assign({}, EventEmitter.prototype, { BrowserStore.setGlobalItem("current_user_id", id); } }, - getCurrentId: function(skipFetch) { + getCurrentId: function() { var current_id = this._current_id; if (current_id == null) { current_id = BrowserStore.getGlobalItem("current_user_id"); } - // this is a speical case to force fetch the - // current user if it's missing - // it's synchronous to block rendering - if (current_id == null && !skipFetch) { - var me = client.getMeSynchronous(); - if (me != null) { - this.setCurrentUser(me); - current_id = me.id; - } - } - return current_id; }, getCurrentUser: function(skipFetch) { diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index dc4fc10966..f35b0f6cc8 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -322,7 +322,7 @@ module.exports.getMe = function() { if (isCallInProgress("getMe")) return; callTracker["getMe"] = utils.getTimestamp(); - client.getMeSynchronous( + client.getMe( function(data, textStatus, xhr) { callTracker["getMe"] = 0; diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index b8eda00756..3375da7cfd 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -279,32 +279,24 @@ module.exports.getAudits = function(userId, success, error) { }); }; -module.exports.getMeSynchronous = function(success, error) { - - var current_user = null; +module.exports.getMe = function(success, error) { $.ajax({ - async: false, url: "/api/v1/users/me", dataType: 'json', contentType: 'application/json', type: 'GET', - success: function(data, textStatus, xhr) { - current_user = data; - if (success) success(data, textStatus, xhr); - }, + success: success, error: function(xhr, status, err) { var ieChecker = window.navigator.userAgent; // This and the condition below is used to check specifically for browsers IE10 & 11 to suppress a 200 'OK' error from appearing on login if (xhr.status != 200 || !(ieChecker.indexOf("Trident/7.0") > 0 || ieChecker.indexOf("Trident/6.0") > 0)) { if (error) { - e = handleError("getMeSynchronous", xhr, status, err); + e = handleError("getMe", xhr, status, err); error(e); }; }; } }); - - return current_user; }; module.exports.inviteMembers = function(data, success, error) { From 24b6c6587c6a79d37b0d813eae1b0fdf165dc382 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 6 Aug 2015 11:10:07 -0700 Subject: [PATCH 2/5] fixed the spacing on UserStore --- web/react/stores/user_store.jsx | 422 ++++++++++++++++---------------- 1 file changed, 211 insertions(+), 211 deletions(-) diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 85cb4c9ee1..258635db7f 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -19,231 +19,231 @@ var UserStore = assign({}, EventEmitter.prototype, { _current_id: null, - emitChange: function(userId) { - this.emit(CHANGE_EVENT, userId); - }, - addChangeListener: function(callback) { - this.on(CHANGE_EVENT, callback); - }, - removeChangeListener: function(callback) { - this.removeListener(CHANGE_EVENT, callback); - }, - emitSessionsChange: function() { - this.emit(CHANGE_EVENT_SESSIONS); - }, - addSessionsChangeListener: function(callback) { - this.on(CHANGE_EVENT_SESSIONS, callback); - }, - removeSessionsChangeListener: function(callback) { - this.removeListener(CHANGE_EVENT_SESSIONS, callback); - }, - emitAuditsChange: function() { - this.emit(CHANGE_EVENT_AUDITS); - }, - addAuditsChangeListener: function(callback) { - this.on(CHANGE_EVENT_AUDITS, callback); - }, - removeAuditsChangeListener: function(callback) { - this.removeListener(CHANGE_EVENT_AUDITS, callback); - }, - emitTeamsChange: function() { - this.emit(CHANGE_EVENT_TEAMS); - }, - addTeamsChangeListener: function(callback) { - this.on(CHANGE_EVENT_TEAMS, callback); - }, - removeTeamsChangeListener: function(callback) { - this.removeListener(CHANGE_EVENT_TEAMS, callback); - }, - emitStatusesChange: function() { - this.emit(CHANGE_EVENT_STATUSES); - }, - addStatusesChangeListener: function(callback) { - this.on(CHANGE_EVENT_STATUSES, callback); - }, - removeStatusesChangeListener: function(callback) { - this.removeListener(CHANGE_EVENT_STATUSES, callback); - }, - setCurrentId: function(id) { - this._current_id = id; - if (id == null) { - BrowserStore.removeGlobalItem("current_user_id"); - } else { - BrowserStore.setGlobalItem("current_user_id", id); - } - }, - getCurrentId: function() { - var current_id = this._current_id; + emitChange: function(userId) { + this.emit(CHANGE_EVENT, userId); + }, + addChangeListener: function(callback) { + this.on(CHANGE_EVENT, callback); + }, + removeChangeListener: function(callback) { + this.removeListener(CHANGE_EVENT, callback); + }, + emitSessionsChange: function() { + this.emit(CHANGE_EVENT_SESSIONS); + }, + addSessionsChangeListener: function(callback) { + this.on(CHANGE_EVENT_SESSIONS, callback); + }, + removeSessionsChangeListener: function(callback) { + this.removeListener(CHANGE_EVENT_SESSIONS, callback); + }, + emitAuditsChange: function() { + this.emit(CHANGE_EVENT_AUDITS); + }, + addAuditsChangeListener: function(callback) { + this.on(CHANGE_EVENT_AUDITS, callback); + }, + removeAuditsChangeListener: function(callback) { + this.removeListener(CHANGE_EVENT_AUDITS, callback); + }, + emitTeamsChange: function() { + this.emit(CHANGE_EVENT_TEAMS); + }, + addTeamsChangeListener: function(callback) { + this.on(CHANGE_EVENT_TEAMS, callback); + }, + removeTeamsChangeListener: function(callback) { + this.removeListener(CHANGE_EVENT_TEAMS, callback); + }, + emitStatusesChange: function() { + this.emit(CHANGE_EVENT_STATUSES); + }, + addStatusesChangeListener: function(callback) { + this.on(CHANGE_EVENT_STATUSES, callback); + }, + removeStatusesChangeListener: function(callback) { + this.removeListener(CHANGE_EVENT_STATUSES, callback); + }, + setCurrentId: function(id) { + this._current_id = id; + if (id == null) { + BrowserStore.removeGlobalItem("current_user_id"); + } else { + BrowserStore.setGlobalItem("current_user_id", id); + } + }, + getCurrentId: function() { + var current_id = this._current_id; - if (current_id == null) { - current_id = BrowserStore.getGlobalItem("current_user_id"); - } + if (current_id == null) { + current_id = BrowserStore.getGlobalItem("current_user_id"); + } - return current_id; - }, - getCurrentUser: function(skipFetch) { - if (this.getCurrentId(skipFetch) == null) { - return null; - } + return current_id; + }, + getCurrentUser: function(skipFetch) { + if (this.getCurrentId(skipFetch) == null) { + return null; + } - return this._getProfiles()[this.getCurrentId()]; - }, - setCurrentUser: function(user) { - this.setCurrentId(user.id); - this.saveProfile(user); - }, - getLastEmail: function() { - return BrowserStore.getItem("last_email", ''); - }, - setLastEmail: function(email) { - BrowserStore.setItem("last_email", email); - }, - removeCurrentUser: function() { - this.setCurrentId(null); - }, - hasProfile: function(userId) { - return this._getProfiles()[userId] != null; - }, - getProfile: function(userId) { - return this._getProfiles()[userId]; - }, - getProfileByUsername: function(username) { - return this._getProfilesUsernameMap()[username]; - }, - getProfilesUsernameMap: function() { - return this._getProfilesUsernameMap(); - }, - getProfiles: function() { + return this._getProfiles()[this.getCurrentId()]; + }, + setCurrentUser: function(user) { + this.setCurrentId(user.id); + this.saveProfile(user); + }, + getLastEmail: function() { + return BrowserStore.getItem("last_email", ''); + }, + setLastEmail: function(email) { + BrowserStore.setItem("last_email", email); + }, + removeCurrentUser: function() { + this.setCurrentId(null); + }, + hasProfile: function(userId) { + return this._getProfiles()[userId] != null; + }, + getProfile: function(userId) { + return this._getProfiles()[userId]; + }, + getProfileByUsername: function(username) { + return this._getProfilesUsernameMap()[username]; + }, + getProfilesUsernameMap: function() { + return this._getProfilesUsernameMap(); + }, + getProfiles: function() { - return this._getProfiles(); - }, - getActiveOnlyProfiles: function() { - active = {}; - current = this._getProfiles(); + return this._getProfiles(); + }, + getActiveOnlyProfiles: function() { + active = {}; + current = this._getProfiles(); - for (var key in current) { - if (current[key].delete_at == 0) { - active[key] = current[key]; - } - } + for (var key in current) { + if (current[key].delete_at == 0) { + active[key] = current[key]; + } + } - return active; - }, - saveProfile: function(profile) { - var ps = this._getProfiles(); - ps[profile.id] = profile; - this._storeProfiles(ps); - }, - _storeProfiles: function(profiles) { - BrowserStore.setItem("profiles", profiles); - var profileUsernameMap = {}; - for (var id in profiles) { - profileUsernameMap[profiles[id].username] = profiles[id]; - } - BrowserStore.setItem("profileUsernameMap", profileUsernameMap); - }, - _getProfiles: function() { - return BrowserStore.getItem("profiles", {}); - }, - _getProfilesUsernameMap: function() { - return BrowserStore.getItem("profileUsernameMap", {}); - }, - setSessions: function(sessions) { - BrowserStore.setItem("sessions", sessions); - }, - getSessions: function() { - return BrowserStore.getItem("sessions", {loading: true}); - }, - setAudits: function(audits) { - BrowserStore.setItem("audits", audits); - }, - getAudits: function() { - return BrowserStore.getItem("audits", {loading: true}); - }, - setTeams: function(teams) { - BrowserStore.setItem("teams", teams); - }, - getTeams: function() { - return BrowserStore.getItem("teams", []); - }, - getCurrentMentionKeys: function() { - var user = this.getCurrentUser(); + return active; + }, + saveProfile: function(profile) { + var ps = this._getProfiles(); + ps[profile.id] = profile; + this._storeProfiles(ps); + }, + _storeProfiles: function(profiles) { + BrowserStore.setItem("profiles", profiles); + var profileUsernameMap = {}; + for (var id in profiles) { + profileUsernameMap[profiles[id].username] = profiles[id]; + } + BrowserStore.setItem("profileUsernameMap", profileUsernameMap); + }, + _getProfiles: function() { + return BrowserStore.getItem("profiles", {}); + }, + _getProfilesUsernameMap: function() { + return BrowserStore.getItem("profileUsernameMap", {}); + }, + setSessions: function(sessions) { + BrowserStore.setItem("sessions", sessions); + }, + getSessions: function() { + return BrowserStore.getItem("sessions", {loading: true}); + }, + setAudits: function(audits) { + BrowserStore.setItem("audits", audits); + }, + getAudits: function() { + return BrowserStore.getItem("audits", {loading: true}); + }, + setTeams: function(teams) { + BrowserStore.setItem("teams", teams); + }, + getTeams: function() { + return BrowserStore.getItem("teams", []); + }, + getCurrentMentionKeys: function() { + var user = this.getCurrentUser(); - var keys = []; + var keys = []; + + if (!user) + return keys; + + if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(',')); + if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name); + if (user.notify_props.all === "true") keys.push('@all'); + if (user.notify_props.channel === "true") keys.push('@channel'); - if (!user) return keys; - - if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(',')); - if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name); - if (user.notify_props.all === "true") keys.push('@all'); - if (user.notify_props.channel === "true") keys.push('@channel'); - - return keys; - }, - getLastVersion: function() { - return BrowserStore.getItem("last_version", ''); - }, - setLastVersion: function(version) { - BrowserStore.setItem("last_version", version); - }, - setStatuses: function(statuses) { - this._setStatuses(statuses); - this.emitStatusesChange(); - }, - _setStatuses: function(statuses) { - BrowserStore.setItem("statuses", statuses); - }, - setStatus: function(user_id, status) { - var statuses = this.getStatuses(); - statuses[user_id] = status; - this._setStatuses(statuses); - this.emitStatusesChange(); - }, - getStatuses: function() { - return BrowserStore.getItem("statuses", {}); - }, - getStatus: function(id) { - return this.getStatuses()[id]; - } + }, + getLastVersion: function() { + return BrowserStore.getItem("last_version", ''); + }, + setLastVersion: function(version) { + BrowserStore.setItem("last_version", version); + }, + setStatuses: function(statuses) { + this._setStatuses(statuses); + this.emitStatusesChange(); + }, + _setStatuses: function(statuses) { + BrowserStore.setItem("statuses", statuses); + }, + setStatus: function(user_id, status) { + var statuses = this.getStatuses(); + statuses[user_id] = status; + this._setStatuses(statuses); + this.emitStatusesChange(); + }, + getStatuses: function() { + return BrowserStore.getItem("statuses", {}); + }, + getStatus: function(id) { + return this.getStatuses()[id]; + } }); UserStore.dispatchToken = AppDispatcher.register(function(payload) { - var action = payload.action; + var action = payload.action; - switch(action.type) { - case ActionTypes.RECIEVED_PROFILES: - for(var id in action.profiles) { - // profiles can have incomplete data, so don't overwrite current user - if (id === UserStore.getCurrentId()) continue; - var profile = action.profiles[id]; - UserStore.saveProfile(profile); - UserStore.emitChange(profile.id); - } - break; - case ActionTypes.RECIEVED_ME: - UserStore.setCurrentUser(action.me); - UserStore.emitChange(action.me.id); - break; - case ActionTypes.RECIEVED_SESSIONS: - UserStore.setSessions(action.sessions); - UserStore.emitSessionsChange(); - break; - case ActionTypes.RECIEVED_AUDITS: - UserStore.setAudits(action.audits); - UserStore.emitAuditsChange(); - break; - case ActionTypes.RECIEVED_TEAMS: - UserStore.setTeams(action.teams); - UserStore.emitTeamsChange(); - break; - case ActionTypes.RECIEVED_STATUSES: - UserStore._setStatuses(action.statuses); - UserStore.emitStatusesChange(); - break; + switch(action.type) { + case ActionTypes.RECIEVED_PROFILES: + for(var id in action.profiles) { + // profiles can have incomplete data, so don't overwrite current user + if (id === UserStore.getCurrentId()) continue; + var profile = action.profiles[id]; + UserStore.saveProfile(profile); + UserStore.emitChange(profile.id); + } + break; + case ActionTypes.RECIEVED_ME: + UserStore.setCurrentUser(action.me); + UserStore.emitChange(action.me.id); + break; + case ActionTypes.RECIEVED_SESSIONS: + UserStore.setSessions(action.sessions); + UserStore.emitSessionsChange(); + break; + case ActionTypes.RECIEVED_AUDITS: + UserStore.setAudits(action.audits); + UserStore.emitAuditsChange(); + break; + case ActionTypes.RECIEVED_TEAMS: + UserStore.setTeams(action.teams); + UserStore.emitTeamsChange(); + break; + case ActionTypes.RECIEVED_STATUSES: + UserStore._setStatuses(action.statuses); + UserStore.emitStatusesChange(); + break; - default: - } + default: + } }); UserStore.setMaxListeners(0); From e72d6e6d24d25e7671e6bea31d0c389de340af23 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 6 Aug 2015 11:37:47 -0700 Subject: [PATCH 3/5] Cosmetic refactors, including variable name changes and splitting if statements --- web/react/components/sidebar_header.jsx | 3 +- web/react/stores/user_store.jsx | 89 +++++++++++++++---------- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index 023de3a19a..04e46f8258 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -87,8 +87,7 @@ var NavbarDropdown = React.createClass({ } }); } - teams.push(
    • Create a New Team
      • ); - + teams.push(
    • Create a New Team
      • ); return (
        diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 258635db7f..8bb7850431 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -17,7 +17,7 @@ var CHANGE_EVENT_STATUSES = 'change_statuses'; var UserStore = assign({}, EventEmitter.prototype, { - _current_id: null, + gCurrentId: null, emitChange: function(userId) { this.emit(CHANGE_EVENT, userId); @@ -65,21 +65,22 @@ var UserStore = assign({}, EventEmitter.prototype, { this.removeListener(CHANGE_EVENT_STATUSES, callback); }, setCurrentId: function(id) { - this._current_id = id; + this.gCurrentId = id; if (id == null) { - BrowserStore.removeGlobalItem("current_user_id"); + BrowserStore.removeGlobalItem('current_user_id'); } else { - BrowserStore.setGlobalItem("current_user_id", id); + BrowserStore.setGlobalItem('current_user_id', id); } }, getCurrentId: function() { - var current_id = this._current_id; + var currentId = this.gCurrentId; - if (current_id == null) { - current_id = BrowserStore.getGlobalItem("current_user_id"); + if (currentId == null) { + currentId = BrowserStore.getGlobalItem('current_user_id'); + this.gCurrentId = currentId; } - return current_id; + return currentId; }, getCurrentUser: function(skipFetch) { if (this.getCurrentId(skipFetch) == null) { @@ -93,10 +94,10 @@ var UserStore = assign({}, EventEmitter.prototype, { this.saveProfile(user); }, getLastEmail: function() { - return BrowserStore.getItem("last_email", ''); + return BrowserStore.getItem('last_email', ''); }, setLastEmail: function(email) { - BrowserStore.setItem("last_email", email); + BrowserStore.setItem('last_email', email); }, removeCurrentUser: function() { this.setCurrentId(null); @@ -118,11 +119,11 @@ var UserStore = assign({}, EventEmitter.prototype, { return this._getProfiles(); }, getActiveOnlyProfiles: function() { - active = {}; - current = this._getProfiles(); + var active = {}; + var current = this._getProfiles(); for (var key in current) { - if (current[key].delete_at == 0) { + if (current[key].delete_at === 0) { active[key] = current[key]; } } @@ -135,73 +136,85 @@ var UserStore = assign({}, EventEmitter.prototype, { this._storeProfiles(ps); }, _storeProfiles: function(profiles) { - BrowserStore.setItem("profiles", profiles); + BrowserStore.setItem('profiles', profiles); var profileUsernameMap = {}; for (var id in profiles) { profileUsernameMap[profiles[id].username] = profiles[id]; } - BrowserStore.setItem("profileUsernameMap", profileUsernameMap); + BrowserStore.setItem('profileUsernameMap', profileUsernameMap); }, _getProfiles: function() { - return BrowserStore.getItem("profiles", {}); + return BrowserStore.getItem('profiles', {}); }, _getProfilesUsernameMap: function() { - return BrowserStore.getItem("profileUsernameMap", {}); + return BrowserStore.getItem('profileUsernameMap', {}); }, setSessions: function(sessions) { - BrowserStore.setItem("sessions", sessions); + BrowserStore.setItem('sessions', sessions); }, getSessions: function() { - return BrowserStore.getItem("sessions", {loading: true}); + return BrowserStore.getItem('sessions', {loading: true}); }, setAudits: function(audits) { - BrowserStore.setItem("audits", audits); + BrowserStore.setItem('audits', audits); }, getAudits: function() { - return BrowserStore.getItem("audits", {loading: true}); + return BrowserStore.getItem('audits', {loading: true}); }, setTeams: function(teams) { - BrowserStore.setItem("teams", teams); + BrowserStore.setItem('teams', teams); }, getTeams: function() { - return BrowserStore.getItem("teams", []); + return BrowserStore.getItem('teams', []); }, getCurrentMentionKeys: function() { var user = this.getCurrentUser(); var keys = []; - if (!user) + if (!user || !user.notify_props) { return keys; + } - if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(',')); - if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name); - if (user.notify_props.all === "true") keys.push('@all'); - if (user.notify_props.channel === "true") keys.push('@channel'); + if (user.notify_props.mention_keys) { + keys = keys.concat(user.notify_props.mention_keys.split(',')); + } + + if (user.notify_props.first_name === 'true' && user.first_name) { + keys.push(user.first_name); + } + + if (user.notify_props.all === 'true') { + keys.push('@all'); + } + + if (user.notify_props.channel === 'true') { + keys.push('@channel'); + } return keys; }, getLastVersion: function() { - return BrowserStore.getItem("last_version", ''); + return BrowserStore.getItem('last_version', ''); }, setLastVersion: function(version) { - BrowserStore.setItem("last_version", version); + BrowserStore.setItem('last_version', version); }, setStatuses: function(statuses) { this._setStatuses(statuses); this.emitStatusesChange(); }, _setStatuses: function(statuses) { - BrowserStore.setItem("statuses", statuses); + BrowserStore.setItem('statuses', statuses); }, - setStatus: function(user_id, status) { + setStatus: function(userId, status) { var statuses = this.getStatuses(); - statuses[user_id] = status; + statuses[userId] = status; this._setStatuses(statuses); this.emitStatusesChange(); }, getStatuses: function() { - return BrowserStore.getItem("statuses", {}); + return BrowserStore.getItem('statuses', {}); }, getStatus: function(id) { return this.getStatuses()[id]; @@ -211,11 +224,13 @@ var UserStore = assign({}, EventEmitter.prototype, { UserStore.dispatchToken = AppDispatcher.register(function(payload) { var action = payload.action; - switch(action.type) { + switch (action.type) { case ActionTypes.RECIEVED_PROFILES: - for(var id in action.profiles) { + for (var id in action.profiles) { // profiles can have incomplete data, so don't overwrite current user - if (id === UserStore.getCurrentId()) continue; + if (id === UserStore.getCurrentId()) { + continue; + } var profile = action.profiles[id]; UserStore.saveProfile(profile); UserStore.emitChange(profile.id); From ae744dcb53dde8e068c9e5e4fbfc847ffd083eec Mon Sep 17 00:00:00 2001 From: nickago Date: Fri, 7 Aug 2015 07:54:53 -0700 Subject: [PATCH 4/5] Removed vestigial arguements from refactored code --- web/react/stores/user_store.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 8bb7850431..f8616c6abe 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -82,8 +82,8 @@ var UserStore = assign({}, EventEmitter.prototype, { return currentId; }, - getCurrentUser: function(skipFetch) { - if (this.getCurrentId(skipFetch) == null) { + getCurrentUser: function() { + if (this.getCurrentId() == null) { return null; } From 8297f99209d7947e8cb806e5df918b45d0e06476 Mon Sep 17 00:00:00 2001 From: nickago Date: Mon, 10 Aug 2015 10:52:51 -0700 Subject: [PATCH 5/5] Removed unnecessary keys --- web/react/components/post_list.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 0ee7e99692..83f806b791 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -439,9 +439,9 @@ module.exports = React.createClass({ currentPostDay = utils.getDateForUnixTicks(post.create_at); if (currentPostDay.toDateString() != previousPostDay.toDateString()) { postCtls.push( -
        -
        -
        {currentPostDay.toDateString()}
        +
        +
        +
        {currentPostDay.toDateString()}
        ); } @@ -449,9 +449,9 @@ module.exports = React.createClass({ if (post.create_at > last_viewed && !rendered_last_viewed) { rendered_last_viewed = true; postCtls.push( -
        -
        -
        New Messages
        +
        +
        +
        New Messages
        ); } @@ -459,7 +459,7 @@ module.exports = React.createClass({ previousPostDay = currentPostDay; } } else { - postCtls.push(); + postCtls.push(); } return (