diff options
-rw-r--r-- | webapp/components/login/login.jsx | 7 | ||||
-rw-r--r-- | webapp/images/emoji/1f1e8-1f1e6.png | bin | 0 -> 4339 bytes | |||
-rw-r--r-- | webapp/images/emoji/1f1f5-1f1f0.png | bin | 0 -> 4604 bytes | |||
-rw-r--r-- | webapp/images/emoji/1f1ff-1e1e6.png | bin | 0 -> 6547 bytes | |||
-rw-r--r-- | webapp/images/emoji/1f641.png | bin | 0 -> 6388 bytes | |||
-rw-r--r-- | webapp/images/emoji/1f642.png | bin | 0 -> 6362 bytes | |||
-rw-r--r-- | webapp/images/emoji/1f643.png | bin | 0 -> 6519 bytes | |||
-rw-r--r-- | webapp/root.jsx | 2 | ||||
-rw-r--r-- | webapp/stores/error_store.jsx | 1 | ||||
-rw-r--r-- | webapp/utils/client.jsx | 8 | ||||
-rw-r--r-- | webapp/utils/emoji.json | 58 | ||||
-rw-r--r-- | webapp/utils/emoticons.jsx | 4 |
12 files changed, 69 insertions, 11 deletions
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx index 7b370a939..e867af47a 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login.jsx @@ -27,7 +27,9 @@ export default class Login extends React.Component { this.preSubmit = this.preSubmit.bind(this); this.submit = this.submit.bind(this); - this.state = this.getStateFromStores(); + const state = this.getStateFromStores(); + state.doneCheckLogin = false; + this.state = state; } componentDidMount() { TeamStore.addChangeListener(this.onTeamChange); @@ -44,8 +46,7 @@ export default class Login extends React.Component { } getStateFromStores() { return { - currentTeam: TeamStore.getByName(this.props.params.team), - doneCheckLogin: false + currentTeam: TeamStore.getByName(this.props.params.team) }; } onTeamChange() { diff --git a/webapp/images/emoji/1f1e8-1f1e6.png b/webapp/images/emoji/1f1e8-1f1e6.png Binary files differnew file mode 100644 index 000000000..57f487c22 --- /dev/null +++ b/webapp/images/emoji/1f1e8-1f1e6.png diff --git a/webapp/images/emoji/1f1f5-1f1f0.png b/webapp/images/emoji/1f1f5-1f1f0.png Binary files differnew file mode 100644 index 000000000..17c4f6db5 --- /dev/null +++ b/webapp/images/emoji/1f1f5-1f1f0.png diff --git a/webapp/images/emoji/1f1ff-1e1e6.png b/webapp/images/emoji/1f1ff-1e1e6.png Binary files differnew file mode 100644 index 000000000..8909fe82a --- /dev/null +++ b/webapp/images/emoji/1f1ff-1e1e6.png diff --git a/webapp/images/emoji/1f641.png b/webapp/images/emoji/1f641.png Binary files differnew file mode 100644 index 000000000..7041b0804 --- /dev/null +++ b/webapp/images/emoji/1f641.png diff --git a/webapp/images/emoji/1f642.png b/webapp/images/emoji/1f642.png Binary files differnew file mode 100644 index 000000000..abd534797 --- /dev/null +++ b/webapp/images/emoji/1f642.png diff --git a/webapp/images/emoji/1f643.png b/webapp/images/emoji/1f643.png Binary files differnew file mode 100644 index 000000000..3cb9f962f --- /dev/null +++ b/webapp/images/emoji/1f643.png diff --git a/webapp/root.jsx b/webapp/root.jsx index adabe3fa3..9c2708506 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -142,6 +142,8 @@ function preLoggedIn(nextState, replace, callback) { const d2 = AsyncClient.getChannels(); + ErrorStore.clearLastError(); + $.when(d1, d2).done(() => { callback(); }); diff --git a/webapp/stores/error_store.jsx b/webapp/stores/error_store.jsx index 7c695a335..715029185 100644 --- a/webapp/stores/error_store.jsx +++ b/webapp/stores/error_store.jsx @@ -59,6 +59,7 @@ class ErrorStoreClass extends EventEmitter { clearLastError() { BrowserStore.removeGlobalItem('last_error'); BrowserStore.removeGlobalItem('last_error_conn'); + this.emitChange(); } } diff --git a/webapp/utils/client.jsx b/webapp/utils/client.jsx index a596d1e14..854aa31dc 100644 --- a/webapp/utils/client.jsx +++ b/webapp/utils/client.jsx @@ -50,12 +50,8 @@ function handleError(methodName, xhr, status, err) { track('api', 'api_weberror', methodName, 'message', msg); if (xhr.status === 401) { - if (window.location.href.indexOf('/channels') === 0) { - browserHistory.push('/login?extra=expired&redirect=' + encodeURIComponent(window.location.pathname + window.location.search)); - } else { - var teamURL = window.location.pathname.split('/channels')[0]; - browserHistory.push(teamURL + '/login?extra=expired&redirect=' + encodeURIComponent(window.location.pathname + window.location.search)); - } + const team = window.location.pathname.split('/')[1]; + browserHistory.push('/' + team + '/login?extra=expired&redirect=' + encodeURIComponent(window.location.pathname + window.location.search)); } return e; diff --git a/webapp/utils/emoji.json b/webapp/utils/emoji.json index 1ccb129f2..c01f5b679 100644 --- a/webapp/utils/emoji.json +++ b/webapp/utils/emoji.json @@ -8124,6 +8124,64 @@ ] } , { + "emoji": "π¨π¦" + , "description": "regional indicator symbol letter c + regional indicator symbol letter a" + , "aliases": [ + "ca", + "eh" + ] + , "tags": [ + "canada" + ] + } +, { + "emoji": "π΅π°" + , "description": "regional indicator symbol letter p + regional indicator symbol letter k" + , "aliases": [ + "pk" + ] + , "tags": [ + "pakistan" + ] + } +, { + "emoji": "πΏπ¦" + , "description": "regional indicator symbol letter z + regional indicator symbol letter a" + , "aliases": [ + "za" + ] + , "tags": [ + "south_africa" + ] + } +, { + "emoji": "π" + , "description": "slightly smiling face" + , "aliases": [ + "slightly_smiling_face" + ] + , "tags": [ + ] + } +, { + "emoji": "π" + , "description": "slightly frowning face" + , "aliases": [ + "slightly_frowning_face" + ] + , "tags": [ + ] + } +, { + "emoji": "π" + , "description": "upside-down face" + , "aliases": [ + "upside_down_face" + ] + , "tags": [ + ] + } +, { "aliases": [ "basecamp" ] diff --git a/webapp/utils/emoticons.jsx b/webapp/utils/emoticons.jsx index d3afe372a..86f7a5b7b 100644 --- a/webapp/utils/emoticons.jsx +++ b/webapp/utils/emoticons.jsx @@ -7,7 +7,7 @@ import Constants from './constants.jsx'; import emojis from './emoji.json'; const emoticonPatterns = { - smile: /(^|\s)(:-?\))(?=$|\s)/g, // :) + slightly_smiling_face: /(^|\s)(:-?\))(?=$|\s)/g, // :) wink: /(^|\s)(;-?\))(?=$|\s)/g, // ;) open_mouth: /(^|\s)(:o)(?=$|\s)/gi, // :o scream: /(^|\s)(:-o)(?=$|\s)/gi, // :-o @@ -16,7 +16,7 @@ const emoticonPatterns = { stuck_out_tongue_closed_eyes: /(^|\s)(x-d)(?=$|\s)/gi, // x-d stuck_out_tongue: /(^|\s)(:-?p)(?=$|\s)/gi, // :p rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@ - frowning: /(^|\s)(:-?\()(?=$|\s)/g, // :( + slightly_frowning_face: /(^|\s)(:-?\()(?=$|\s)/g, // :( cry: /(^|\s)(:['β]-?\(|:'\(|:'\()(?=$|\s)/g, // :`( confused: /(^|\s)(:-?\/)(?=$|\s)/g, // :/ confounded: /(^|\s)(:-?s)(?=$|\s)/gi, // :s |