diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | api/context.go | 1 | ||||
-rw-r--r-- | web/react/pages/channel.jsx | 17 | ||||
-rw-r--r-- | web/react/stores/channel_store.jsx | 56 | ||||
-rw-r--r-- | web/react/stores/preference_store.jsx | 21 | ||||
-rw-r--r-- | web/templates/channel.html | 2 | ||||
-rw-r--r-- | web/templates/head.html | 18 | ||||
-rw-r--r-- | web/web.go | 9 |
8 files changed, 63 insertions, 63 deletions
@@ -197,7 +197,7 @@ travis-init: build-container: @echo Building in container - docker run -e TRAVIS_BUILD_NUMBER=$(TRAVIS_BUILD_NUMBER) --link mattermost-mysql:mysql --link mattermost-postgres:postgres -v `pwd`:/go/src/github.com/mattermost/platform mattermost/builder:latest + cd .. && docker run -e TRAVIS_BUILD_NUMBER=$(TRAVIS_BUILD_NUMBER) --link mattermost-mysql:mysql --link mattermost-postgres:postgres -v `pwd`:/go/src/github.com/mattermost mattermost/builder:latest stop-docker: @echo Stopping docker containers diff --git a/api/context.go b/api/context.go index 41a52fa0c..b91981ecd 100644 --- a/api/context.go +++ b/api/context.go @@ -45,6 +45,7 @@ type Page struct { User *model.User Team *model.Team Channel *model.Channel + Preferences *model.Preferences PostID string SessionTokenIndex int64 Locale string diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 1e28dab8b..bfb95e1fc 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -18,14 +18,8 @@ import RegisterAppModal from '../components/register_app_modal.jsx'; import ImportThemeModal from '../components/user_settings/import_theme_modal.jsx'; import InviteMemberModal from '../components/invite_member_modal.jsx'; -import PreferenceStore from '../stores/preference_store.jsx'; - -import * as Utils from '../utils/utils.jsx'; -import * as AsyncClient from '../utils/async_client.jsx'; import * as EventHelpers from '../dispatcher/event_helpers.jsx'; -import Constants from '../utils/constants.jsx'; - var IntlProvider = ReactIntl.IntlProvider; class Root extends React.Component { @@ -92,12 +86,6 @@ class Root extends React.Component { } } -function onPreferenceChange() { - const selectedFont = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'selected_font', Constants.DEFAULT_FONT); - Utils.applyFont(selectedFont); - PreferenceStore.removeChangeListener(onPreferenceChange); -} - global.window.setup_channel_page = function setup(props, team, channel) { if (props.PostId === '') { EventHelpers.emitChannelClickEvent(channel); @@ -105,11 +93,8 @@ global.window.setup_channel_page = function setup(props, team, channel) { EventHelpers.emitPostFocusEvent(props.PostId); } - PreferenceStore.addChangeListener(onPreferenceChange); - AsyncClient.getAllPreferences(); - ReactDOM.render( <Root map={props} />, document.getElementById('channel_view') ); -};
\ No newline at end of file +}; diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index 93d996e0b..2337a573d 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -36,7 +36,7 @@ class ChannelStoreClass extends EventEmitter { this.get = this.get.bind(this); this.getMember = this.getMember.bind(this); this.getByName = this.getByName.bind(this); - this.pSetPostMode = this.pSetPostMode.bind(this); + this.setPostMode = this.setPostMode.bind(this); this.getPostMode = this.getPostMode.bind(this); this.setUnreadCount = this.setUnreadCount.bind(this); this.setUnreadCounts = this.setUnreadCounts.bind(this); @@ -95,7 +95,7 @@ class ChannelStoreClass extends EventEmitter { this.removeListener(LEAVE_EVENT, callback); } findFirstBy(field, value) { - var channels = this.pGetChannels(); + var channels = this.getChannels(); for (var i = 0; i < channels.length; i++) { if (channels[i][field] === value) { return channels[i]; @@ -114,13 +114,13 @@ class ChannelStoreClass extends EventEmitter { return this.findFirstBy('name', name); } getAll() { - return this.pGetChannels(); + return this.getChannels(); } getAllMembers() { - return this.pGetChannelMembers(); + return this.getChannelMembers(); } getMoreAll() { - return this.pGetMoreChannels(); + return this.getMoreChannels(); } setCurrentId(id) { this.currentId = id; @@ -161,9 +161,9 @@ class ChannelStoreClass extends EventEmitter { return null; } setChannelMember(member) { - var members = this.pGetChannelMembers(); + var members = this.getChannelMembers(); members[member.channel_id] = member; - this.pStoreChannelMembers(members); + this.storeChannelMembers(members); this.emitChange(); } getCurrentExtraInfo() { @@ -173,7 +173,7 @@ class ChannelStoreClass extends EventEmitter { var extra = null; if (channelId) { - extra = this.pGetExtraInfos()[channelId]; + extra = this.getExtraInfos()[channelId]; } if (extra) { @@ -186,7 +186,7 @@ class ChannelStoreClass extends EventEmitter { return extra; } pStoreChannel(channel) { - var channels = this.pGetChannels(); + var channels = this.getChannels(); var found; for (var i = 0; i < channels.length; i++) { @@ -206,42 +206,42 @@ class ChannelStoreClass extends EventEmitter { } channels.sort(Utils.sortByDisplayName); - this.pStoreChannels(channels); + this.storeChannels(channels); } - pStoreChannels(channels) { + storeChannels(channels) { this.channels = channels; } - pGetChannels() { + getChannels() { return this.channels; } pStoreChannelMember(channelMember) { - var members = this.pGetChannelMembers(); + var members = this.getChannelMembers(); members[channelMember.channel_id] = channelMember; - this.pStoreChannelMembers(members); + this.storeChannelMembers(members); } - pStoreChannelMembers(channelMembers) { + storeChannelMembers(channelMembers) { this.channelMembers = channelMembers; } - pGetChannelMembers() { + getChannelMembers() { return this.channelMembers; } - pStoreMoreChannels(channels) { + storeMoreChannels(channels) { this.moreChannels = channels; } - pGetMoreChannels() { + getMoreChannels() { return this.moreChannels; } - pStoreExtraInfos(extraInfos) { + storeExtraInfos(extraInfos) { this.extraInfos = extraInfos; } - pGetExtraInfos() { + getExtraInfos() { return this.extraInfos; } isDefault(channel) { return channel.name === Constants.DEFAULT_CHANNEL; } - pSetPostMode(mode) { + setPostMode(mode) { this.postMode = mode; } @@ -292,21 +292,21 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => { case ActionTypes.CLICK_CHANNEL: ChannelStore.setCurrentId(action.id); ChannelStore.resetCounts(action.id); - ChannelStore.pSetPostMode(ChannelStore.POST_MODE_CHANNEL); + ChannelStore.setPostMode(ChannelStore.POST_MODE_CHANNEL); ChannelStore.emitChange(); break; case ActionTypes.RECIEVED_FOCUSED_POST: { const post = action.post_list.posts[action.postId]; ChannelStore.setCurrentId(post.channel_id); - ChannelStore.pSetPostMode(ChannelStore.POST_MODE_FOCUS); + ChannelStore.setPostMode(ChannelStore.POST_MODE_FOCUS); ChannelStore.emitChange(); break; } case ActionTypes.RECIEVED_CHANNELS: - ChannelStore.pStoreChannels(action.channels); - ChannelStore.pStoreChannelMembers(action.members); + ChannelStore.storeChannels(action.channels); + ChannelStore.storeChannelMembers(action.members); currentId = ChannelStore.getCurrentId(); if (currentId) { ChannelStore.resetCounts(currentId); @@ -329,14 +329,14 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => { break; case ActionTypes.RECIEVED_MORE_CHANNELS: - ChannelStore.pStoreMoreChannels(action.channels); + ChannelStore.storeMoreChannels(action.channels); ChannelStore.emitMoreChange(); break; case ActionTypes.RECIEVED_CHANNEL_EXTRA_INFO: - var extraInfos = ChannelStore.pGetExtraInfos(); + var extraInfos = ChannelStore.getExtraInfos(); extraInfos[action.extra_info.id] = action.extra_info; - ChannelStore.pStoreExtraInfos(extraInfos); + ChannelStore.storeExtraInfos(extraInfos); ChannelStore.emitExtraInfoChange(); break; diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx index 79eab4fe1..7ecaf0a95 100644 --- a/web/react/stores/preference_store.jsx +++ b/web/react/stores/preference_store.jsx @@ -133,6 +133,16 @@ class PreferenceStoreClass extends EventEmitter { return preference; } + setPreferences(newPreferences) { + const preferences = this.getAllPreferences(); + + for (const preference of newPreferences) { + preferences.set(getPreferenceKeyForModel(preference), preference); + } + + this.setAllPreferences(preferences); + } + emitChange() { this.emit(CHANGE_EVENT); } @@ -155,18 +165,11 @@ class PreferenceStoreClass extends EventEmitter { this.emitChange(); break; } - case ActionTypes.RECIEVED_PREFERENCES: { - const preferences = this.getAllPreferences(); - - for (const preference of action.preferences) { - preferences.set(getPreferenceKeyForModel(preference), preference); - } - - this.setAllPreferences(preferences); + case ActionTypes.RECIEVED_PREFERENCES: + this.setPreferences(action.preferences); this.emitChange(); break; } - } } } diff --git a/web/templates/channel.html b/web/templates/channel.html index dcc50115b..94d79a022 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -6,7 +6,7 @@ <body> <div id="channel_view" class='channel-view'></div> <script> -window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}, {{ .User }}); + window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); var modals = $('.modal-body').not('.edit-modal-body'); if($(window).height() > 1200){ diff --git a/web/templates/head.html b/web/templates/head.html index 32bf337bc..14b447325 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -62,14 +62,11 @@ <style id="antiClickjack">body{display:none !important;}</style> <script> - // if ('ReactIntl' in window && 'ReactIntlLocaleData' in window) { - // Object.keys(ReactIntlLocaleData).forEach((lang) => { - // ReactIntl.addLocaleData(ReactIntlLocaleData[lang]); - // }); - // } - - ReactIntl.addLocaleData(ReactIntlLocaleData.en); - ReactIntl.addLocaleData(ReactIntlLocaleData.es); + if ('ReactIntl' in window && 'ReactIntlLocaleData' in window) { + Object.keys(ReactIntlLocaleData).forEach(function(lang) { + ReactIntl.addLocaleData(ReactIntlLocaleData[lang]); + }); + } window.mm_config = {{ .ClientCfg }}; window.mm_license = {{ .ClientLicense }}; @@ -77,6 +74,11 @@ window.mm_user = {{ .User }}; window.mm_channel = {{ .Channel }}; window.mm_locale = {{ .Locale }}; + window.mm_preferences = {{ .Preferences }}; + + $(function() { + PreferenceStore.setPreferences(window.mm_preferences); + }); if ({{.SessionTokenIndex}} >= 0) { window.mm_session_token_index = {{.SessionTokenIndex}}; diff --git a/web/web.go b/web/web.go index 95d6024f5..36349dd5e 100644 --- a/web/web.go +++ b/web/web.go @@ -518,6 +518,7 @@ func checkSessionSwitch(c *api.Context, w http.ResponseWriter, r *http.Request, func doLoadChannel(c *api.Context, w http.ResponseWriter, r *http.Request, team *model.Team, channel *model.Channel, postid string) { userChan := api.Srv.Store.User().Get(c.Session.UserId) + prefChan := api.Srv.Store.Preference().GetAll(c.Session.UserId) var user *model.User if ur := <-userChan; ur.Err != nil { @@ -529,6 +530,13 @@ func doLoadChannel(c *api.Context, w http.ResponseWriter, r *http.Request, team user = ur.Data.(*model.User) } + var preferences model.Preferences + if result := <-prefChan; result.Err != nil { + l4g.Error("Error in getting preferences for id=%v", c.Session.UserId) + } else { + preferences = result.Data.(model.Preferences) + } + page := NewHtmlTemplatePage("channel", "", c.Locale) page.Props["Title"] = channel.DisplayName + " - " + team.DisplayName + " " + page.ClientCfg["SiteName"] page.Props["TeamDisplayName"] = team.DisplayName @@ -538,6 +546,7 @@ func doLoadChannel(c *api.Context, w http.ResponseWriter, r *http.Request, team page.Team = team page.User = user page.Channel = channel + page.Preferences = &preferences page.Render(c, w) } |