From 47cedd68d6f8c5dfd9c5af826e29342080759b61 Mon Sep 17 00:00:00 2001 From: nickago Date: Wed, 5 Aug 2015 14:43:40 -0700 Subject: Removed all functionality required for removing used mentions from auto-complete --- web/react/stores/post_store.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/stores/post_store.jsx') diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx index ecf54ede6..4aa6ebb3a 100644 --- a/web/react/stores/post_store.jsx +++ b/web/react/stores/post_store.jsx @@ -193,7 +193,7 @@ PostStore.dispatchToken = AppDispatcher.register(function(payload) { PostStore.emitSelectedPostChange(action.from_search); break; case ActionTypes.RECIEVED_MENTION_DATA: - PostStore.emitMentionDataChange(action.id, action.mention_text, action.exclude_list); + PostStore.emitMentionDataChange(action.id, action.mention_text); break; case ActionTypes.RECIEVED_ADD_MENTION: PostStore.emitAddMention(action.id, action.username); -- cgit v1.2.3-1-g7c22 From 1e40abbdeaf898eb3efa88d789c41e615b0b4577 Mon Sep 17 00:00:00 2001 From: nickago Date: Mon, 10 Aug 2015 08:31:55 -0700 Subject: Removed vetigial argument and properly aligned post_store --- web/react/stores/post_store.jsx | 352 ++++++++++++++++++++-------------------- 1 file changed, 176 insertions(+), 176 deletions(-) (limited to 'web/react/stores/post_store.jsx') diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx index 4aa6ebb3a..ab8831eea 100644 --- a/web/react/stores/post_store.jsx +++ b/web/react/stores/post_store.jsx @@ -21,185 +21,185 @@ var ADD_MENTION_EVENT = 'add_mention'; var PostStore = assign({}, EventEmitter.prototype, { - emitChange: function() { - this.emit(CHANGE_EVENT); - }, - - addChangeListener: function(callback) { - this.on(CHANGE_EVENT, callback); - }, - - removeChangeListener: function(callback) { - this.removeListener(CHANGE_EVENT, callback); - }, - - emitSearchChange: function() { - this.emit(SEARCH_CHANGE_EVENT); - }, - - addSearchChangeListener: function(callback) { - this.on(SEARCH_CHANGE_EVENT, callback); - }, - - removeSearchChangeListener: function(callback) { - this.removeListener(SEARCH_CHANGE_EVENT, callback); - }, - - emitSearchTermChange: function(doSearch, isMentionSearch) { - this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch); - }, - - addSearchTermChangeListener: function(callback) { - this.on(SEARCH_TERM_CHANGE_EVENT, callback); - }, - - removeSearchTermChangeListener: function(callback) { - this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback); - }, - - emitSelectedPostChange: function(from_search) { - this.emit(SELECTED_POST_CHANGE_EVENT, from_search); - }, - - addSelectedPostChangeListener: function(callback) { - this.on(SELECTED_POST_CHANGE_EVENT, callback); - }, - - removeSelectedPostChangeListener: function(callback) { - this.removeListener(SELECTED_POST_CHANGE_EVENT, callback); - }, - - emitMentionDataChange: function(id, mentionText, excludeList) { - this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText, excludeList); - }, - - addMentionDataChangeListener: function(callback) { - this.on(MENTION_DATA_CHANGE_EVENT, callback); - }, - - removeMentionDataChangeListener: function(callback) { - this.removeListener(MENTION_DATA_CHANGE_EVENT, callback); - }, - - emitAddMention: function(id, username) { - this.emit(ADD_MENTION_EVENT, id, username); - }, - - addAddMentionListener: function(callback) { - this.on(ADD_MENTION_EVENT, callback); - }, - - removeAddMentionListener: function(callback) { - this.removeListener(ADD_MENTION_EVENT, callback); - }, - - getCurrentPosts: function() { - var currentId = ChannelStore.getCurrentId(); - - if (currentId != null) - return this.getPosts(currentId); - else - return null; - }, - storePosts: function(channelId, posts) { - this._storePosts(channelId, posts); - this.emitChange(); - }, - _storePosts: function(channelId, posts) { - BrowserStore.setItem("posts_" + channelId, posts); - }, - getPosts: function(channelId) { - return BrowserStore.getItem("posts_" + channelId); - }, - storeSearchResults: function(results, is_mention_search) { - BrowserStore.setItem("search_results", results); - is_mention_search = is_mention_search ? true : false; // force to bool - BrowserStore.setItem("is_mention_search", is_mention_search); - }, - getSearchResults: function() { - return BrowserStore.getItem("search_results"); - }, - getIsMentionSearch: function() { - return BrowserStore.getItem("is_mention_search"); - }, - storeSelectedPost: function(post_list) { - BrowserStore.setItem("select_post", post_list); - }, - getSelectedPost: function() { - return BrowserStore.getItem("select_post"); - }, - storeSearchTerm: function(term) { - BrowserStore.setItem("search_term", term); - }, - getSearchTerm: function() { - return BrowserStore.getItem("search_term"); - }, - storeCurrentDraft: function(draft) { - var channel_id = ChannelStore.getCurrentId(); - BrowserStore.setItem("draft_" + channel_id, draft); - }, - getCurrentDraft: function() { - var channel_id = ChannelStore.getCurrentId(); - return BrowserStore.getItem("draft_" + channel_id); - }, - storeDraft: function(channel_id, draft) { - BrowserStore.setItem("draft_" + channel_id, draft); - }, - getDraft: function(channel_id) { - return BrowserStore.getItem("draft_" + channel_id); - }, - storeCommentDraft: function(parent_post_id, draft) { - BrowserStore.setItem("comment_draft_" + parent_post_id, draft); - }, - getCommentDraft: function(parent_post_id) { - return BrowserStore.getItem("comment_draft_" + parent_post_id); - }, - clearDraftUploads: function() { - BrowserStore.actionOnItemsWithPrefix("draft_", function (key, value) { - if (value) { - value.uploadsInProgress = 0; - BrowserStore.setItem(key, value); - } - }); - }, - clearCommentDraftUploads: function() { - BrowserStore.actionOnItemsWithPrefix("comment_draft_", function (key, value) { - if (value) { - value.uploadsInProgress = 0; - BrowserStore.setItem(key, value); - } - }); - } + emitChange: function() { + this.emit(CHANGE_EVENT); + }, + + addChangeListener: function(callback) { + this.on(CHANGE_EVENT, callback); + }, + + removeChangeListener: function(callback) { + this.removeListener(CHANGE_EVENT, callback); + }, + + emitSearchChange: function() { + this.emit(SEARCH_CHANGE_EVENT); + }, + + addSearchChangeListener: function(callback) { + this.on(SEARCH_CHANGE_EVENT, callback); + }, + + removeSearchChangeListener: function(callback) { + this.removeListener(SEARCH_CHANGE_EVENT, callback); + }, + + emitSearchTermChange: function(doSearch, isMentionSearch) { + this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch); + }, + + addSearchTermChangeListener: function(callback) { + this.on(SEARCH_TERM_CHANGE_EVENT, callback); + }, + + removeSearchTermChangeListener: function(callback) { + this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback); + }, + + emitSelectedPostChange: function(from_search) { + this.emit(SELECTED_POST_CHANGE_EVENT, from_search); + }, + + addSelectedPostChangeListener: function(callback) { + this.on(SELECTED_POST_CHANGE_EVENT, callback); + }, + + removeSelectedPostChangeListener: function(callback) { + this.removeListener(SELECTED_POST_CHANGE_EVENT, callback); + }, + + emitMentionDataChange: function(id, mentionText) { + this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText); + }, + + addMentionDataChangeListener: function(callback) { + this.on(MENTION_DATA_CHANGE_EVENT, callback); + }, + + removeMentionDataChangeListener: function(callback) { + this.removeListener(MENTION_DATA_CHANGE_EVENT, callback); + }, + + emitAddMention: function(id, username) { + this.emit(ADD_MENTION_EVENT, id, username); + }, + + addAddMentionListener: function(callback) { + this.on(ADD_MENTION_EVENT, callback); + }, + + removeAddMentionListener: function(callback) { + this.removeListener(ADD_MENTION_EVENT, callback); + }, + + getCurrentPosts: function() { + var currentId = ChannelStore.getCurrentId(); + + if (currentId != null) + return this.getPosts(currentId); + else + return null; + }, + storePosts: function(channelId, posts) { + this._storePosts(channelId, posts); + this.emitChange(); + }, + _storePosts: function(channelId, posts) { + BrowserStore.setItem("posts_" + channelId, posts); + }, + getPosts: function(channelId) { + return BrowserStore.getItem("posts_" + channelId); + }, + storeSearchResults: function(results, is_mention_search) { + BrowserStore.setItem("search_results", results); + is_mention_search = is_mention_search ? true : false; // force to bool + BrowserStore.setItem("is_mention_search", is_mention_search); + }, + getSearchResults: function() { + return BrowserStore.getItem("search_results"); + }, + getIsMentionSearch: function() { + return BrowserStore.getItem("is_mention_search"); + }, + storeSelectedPost: function(post_list) { + BrowserStore.setItem("select_post", post_list); + }, + getSelectedPost: function() { + return BrowserStore.getItem("select_post"); + }, + storeSearchTerm: function(term) { + BrowserStore.setItem("search_term", term); + }, + getSearchTerm: function() { + return BrowserStore.getItem("search_term"); + }, + storeCurrentDraft: function(draft) { + var channel_id = ChannelStore.getCurrentId(); + BrowserStore.setItem("draft_" + channel_id, draft); + }, + getCurrentDraft: function() { + var channel_id = ChannelStore.getCurrentId(); + return BrowserStore.getItem("draft_" + channel_id); + }, + storeDraft: function(channel_id, draft) { + BrowserStore.setItem("draft_" + channel_id, draft); + }, + getDraft: function(channel_id) { + return BrowserStore.getItem("draft_" + channel_id); + }, + storeCommentDraft: function(parent_post_id, draft) { + BrowserStore.setItem("comment_draft_" + parent_post_id, draft); + }, + getCommentDraft: function(parent_post_id) { + return BrowserStore.getItem("comment_draft_" + parent_post_id); + }, + clearDraftUploads: function() { + BrowserStore.actionOnItemsWithPrefix("draft_", function (key, value) { + if (value) { + value.uploadsInProgress = 0; + BrowserStore.setItem(key, value); + } + }); + }, + clearCommentDraftUploads: function() { + BrowserStore.actionOnItemsWithPrefix("comment_draft_", function (key, value) { + if (value) { + value.uploadsInProgress = 0; + BrowserStore.setItem(key, value); + } + }); + } }); PostStore.dispatchToken = AppDispatcher.register(function(payload) { - var action = payload.action; - - switch(action.type) { - case ActionTypes.RECIEVED_POSTS: - PostStore._storePosts(action.id, action.post_list); - PostStore.emitChange(); - break; - case ActionTypes.RECIEVED_SEARCH: - PostStore.storeSearchResults(action.results, action.is_mention_search); - PostStore.emitSearchChange(); - break; - case ActionTypes.RECIEVED_SEARCH_TERM: - PostStore.storeSearchTerm(action.term); - PostStore.emitSearchTermChange(action.do_search, action.is_mention_search); - break; - case ActionTypes.RECIEVED_POST_SELECTED: - PostStore.storeSelectedPost(action.post_list); - PostStore.emitSelectedPostChange(action.from_search); - break; - case ActionTypes.RECIEVED_MENTION_DATA: - PostStore.emitMentionDataChange(action.id, action.mention_text); - break; - case ActionTypes.RECIEVED_ADD_MENTION: - PostStore.emitAddMention(action.id, action.username); - break; - default: - } + var action = payload.action; + + switch(action.type) { + case ActionTypes.RECIEVED_POSTS: + PostStore._storePosts(action.id, action.post_list); + PostStore.emitChange(); + break; + case ActionTypes.RECIEVED_SEARCH: + PostStore.storeSearchResults(action.results, action.is_mention_search); + PostStore.emitSearchChange(); + break; + case ActionTypes.RECIEVED_SEARCH_TERM: + PostStore.storeSearchTerm(action.term); + PostStore.emitSearchTermChange(action.do_search, action.is_mention_search); + break; + case ActionTypes.RECIEVED_POST_SELECTED: + PostStore.storeSelectedPost(action.post_list); + PostStore.emitSelectedPostChange(action.from_search); + break; + case ActionTypes.RECIEVED_MENTION_DATA: + PostStore.emitMentionDataChange(action.id, action.mention_text); + break; + case ActionTypes.RECIEVED_ADD_MENTION: + PostStore.emitAddMention(action.id, action.username); + break; + default: + } }); module.exports = PostStore; -- cgit v1.2.3-1-g7c22 From 96fc2a455283217013e00dd1461550ccc7b057f6 Mon Sep 17 00:00:00 2001 From: nickago Date: Mon, 10 Aug 2015 09:07:44 -0700 Subject: further cosmetic refactoring --- web/react/stores/post_store.jsx | 132 ++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 67 deletions(-) (limited to 'web/react/stores/post_store.jsx') diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx index ab8831eea..ea1e75ecb 100644 --- a/web/react/stores/post_store.jsx +++ b/web/react/stores/post_store.jsx @@ -6,7 +6,6 @@ var EventEmitter = require('events').EventEmitter; var assign = require('object-assign'); var ChannelStore = require('../stores/channel_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); var BrowserStore = require('../stores/browser_store.jsx'); var Constants = require('../utils/constants.jsx'); @@ -21,149 +20,148 @@ var ADD_MENTION_EVENT = 'add_mention'; var PostStore = assign({}, EventEmitter.prototype, { - emitChange: function() { + emitChange: function emitChange() { this.emit(CHANGE_EVENT); }, - addChangeListener: function(callback) { + addChangeListener: function addChangeListener(callback) { this.on(CHANGE_EVENT, callback); }, - removeChangeListener: function(callback) { + removeChangeListener: function removeChangeListener(callback) { this.removeListener(CHANGE_EVENT, callback); }, - emitSearchChange: function() { + emitSearchChange: function emitSearchChange() { this.emit(SEARCH_CHANGE_EVENT); }, - addSearchChangeListener: function(callback) { + addSearchChangeListener: function addSearchChangeListener(callback) { this.on(SEARCH_CHANGE_EVENT, callback); }, - removeSearchChangeListener: function(callback) { + removeSearchChangeListener: function removeSearchChangeListener(callback) { this.removeListener(SEARCH_CHANGE_EVENT, callback); }, - emitSearchTermChange: function(doSearch, isMentionSearch) { + emitSearchTermChange: function emitSearchTermChange(doSearch, isMentionSearch) { this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch); }, - addSearchTermChangeListener: function(callback) { + addSearchTermChangeListener: function addSearchTermChangeListener(callback) { this.on(SEARCH_TERM_CHANGE_EVENT, callback); }, - removeSearchTermChangeListener: function(callback) { + removeSearchTermChangeListener: function removeSearchTermChangeListener(callback) { this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback); }, - emitSelectedPostChange: function(from_search) { - this.emit(SELECTED_POST_CHANGE_EVENT, from_search); + emitSelectedPostChange: function emitSelectedPostChange(fromSearch) { + this.emit(SELECTED_POST_CHANGE_EVENT, fromSearch); }, - addSelectedPostChangeListener: function(callback) { + addSelectedPostChangeListener: function addSelectedPostChangeListener(callback) { this.on(SELECTED_POST_CHANGE_EVENT, callback); }, - removeSelectedPostChangeListener: function(callback) { + removeSelectedPostChangeListener: function removeSelectedPostChangeListener(callback) { this.removeListener(SELECTED_POST_CHANGE_EVENT, callback); }, - emitMentionDataChange: function(id, mentionText) { + emitMentionDataChange: function emitMentionDataChange(id, mentionText) { this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText); }, - addMentionDataChangeListener: function(callback) { + addMentionDataChangeListener: function addMentionDataChangeListener(callback) { this.on(MENTION_DATA_CHANGE_EVENT, callback); }, - removeMentionDataChangeListener: function(callback) { + removeMentionDataChangeListener: function removeMentionDataChangeListener(callback) { this.removeListener(MENTION_DATA_CHANGE_EVENT, callback); }, - emitAddMention: function(id, username) { + emitAddMention: function emitAddMention(id, username) { this.emit(ADD_MENTION_EVENT, id, username); }, - addAddMentionListener: function(callback) { + addAddMentionListener: function addAddMentionListener(callback) { this.on(ADD_MENTION_EVENT, callback); }, - removeAddMentionListener: function(callback) { + removeAddMentionListener: function removeAddMentionListener(callback) { this.removeListener(ADD_MENTION_EVENT, callback); }, - getCurrentPosts: function() { + getCurrentPosts: function getCurrentPosts() { var currentId = ChannelStore.getCurrentId(); - if (currentId != null) + if (currentId != null) { return this.getPosts(currentId); - else - return null; + } + return null; }, - storePosts: function(channelId, posts) { - this._storePosts(channelId, posts); + storePosts: function storePosts(channelId, posts) { + this.pStorePosts(channelId, posts); this.emitChange(); }, - _storePosts: function(channelId, posts) { - BrowserStore.setItem("posts_" + channelId, posts); + pStorePosts: function pStorePosts(channelId, posts) { + BrowserStore.setItem('posts_' + channelId, posts); }, - getPosts: function(channelId) { - return BrowserStore.getItem("posts_" + channelId); + getPosts: function getPosts(channelId) { + return BrowserStore.getItem('posts_' + channelId); }, - storeSearchResults: function(results, is_mention_search) { - BrowserStore.setItem("search_results", results); - is_mention_search = is_mention_search ? true : false; // force to bool - BrowserStore.setItem("is_mention_search", is_mention_search); + storeSearchResults: function storeSearchResults(results, isMentionSearch) { + BrowserStore.setItem('search_results', results); + BrowserStore.setItem('is_mention_search', Boolean(isMentionSearch)); }, - getSearchResults: function() { - return BrowserStore.getItem("search_results"); + getSearchResults: function getSearchResults() { + return BrowserStore.getItem('search_results'); }, - getIsMentionSearch: function() { - return BrowserStore.getItem("is_mention_search"); + getIsMentionSearch: function getIsMentionSearch() { + return BrowserStore.getItem('is_mention_search'); }, - storeSelectedPost: function(post_list) { - BrowserStore.setItem("select_post", post_list); + storeSelectedPost: function storeSelectedPost(postList) { + BrowserStore.setItem('select_post', postList); }, - getSelectedPost: function() { - return BrowserStore.getItem("select_post"); + getSelectedPost: function getSelectedPost() { + return BrowserStore.getItem('select_post'); }, - storeSearchTerm: function(term) { - BrowserStore.setItem("search_term", term); + storeSearchTerm: function storeSearchTerm(term) { + BrowserStore.setItem('search_term', term); }, - getSearchTerm: function() { - return BrowserStore.getItem("search_term"); + getSearchTerm: function getSearchTerm() { + return BrowserStore.getItem('search_term'); }, - storeCurrentDraft: function(draft) { - var channel_id = ChannelStore.getCurrentId(); - BrowserStore.setItem("draft_" + channel_id, draft); + storeCurrentDraft: function storeCurrentDraft(draft) { + var channelId = ChannelStore.getCurrentId(); + BrowserStore.setItem('draft_' + channelId, draft); }, - getCurrentDraft: function() { - var channel_id = ChannelStore.getCurrentId(); - return BrowserStore.getItem("draft_" + channel_id); + getCurrentDraft: function getCurrentDraft() { + var channelId = ChannelStore.getCurrentId(); + return BrowserStore.getItem('draft_' + channelId); }, - storeDraft: function(channel_id, draft) { - BrowserStore.setItem("draft_" + channel_id, draft); + storeDraft: function storeDraft(channelId, draft) { + BrowserStore.setItem('draft_' + channelId, draft); }, - getDraft: function(channel_id) { - return BrowserStore.getItem("draft_" + channel_id); + getDraft: function getDraft(channelId) { + return BrowserStore.getItem('draft_' + channelId); }, - storeCommentDraft: function(parent_post_id, draft) { - BrowserStore.setItem("comment_draft_" + parent_post_id, draft); + storeCommentDraft: function storeCommentDraft(parentPostId, draft) { + BrowserStore.setItem('comment_draft_' + parentPostId, draft); }, - getCommentDraft: function(parent_post_id) { - return BrowserStore.getItem("comment_draft_" + parent_post_id); + getCommentDraft: function getCommentDraft(parentPostId) { + return BrowserStore.getItem('comment_draft_' + parentPostId); }, - clearDraftUploads: function() { - BrowserStore.actionOnItemsWithPrefix("draft_", function (key, value) { + clearDraftUploads: function clearDraftUploads() { + BrowserStore.actionOnItemsWithPrefix('draft_', function clearUploads(key, value) { if (value) { value.uploadsInProgress = 0; BrowserStore.setItem(key, value); } }); }, - clearCommentDraftUploads: function() { - BrowserStore.actionOnItemsWithPrefix("comment_draft_", function (key, value) { + clearCommentDraftUploads: function clearCommentDraftUploads() { + BrowserStore.actionOnItemsWithPrefix('comment_draft_', function clearUploads(key, value) { if (value) { value.uploadsInProgress = 0; BrowserStore.setItem(key, value); @@ -172,12 +170,12 @@ var PostStore = assign({}, EventEmitter.prototype, { } }); -PostStore.dispatchToken = AppDispatcher.register(function(payload) { +PostStore.dispatchToken = AppDispatcher.register(function registry(payload) { var action = payload.action; - switch(action.type) { + switch (action.type) { case ActionTypes.RECIEVED_POSTS: - PostStore._storePosts(action.id, action.post_list); + PostStore.pStorePosts(action.id, action.post_list); PostStore.emitChange(); break; case ActionTypes.RECIEVED_SEARCH: -- cgit v1.2.3-1-g7c22