summaryrefslogtreecommitdiffstats
path: root/webapp/utils
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-23 12:09:56 -0400
committerGitHub <noreply@github.com>2017-06-23 12:09:56 -0400
commitca8d57c4dbfe839db28b583caa7d599c0cfc023a (patch)
tree0a4fc6eabf8b8d7f87fdb687b03cc4da7e48d2c3 /webapp/utils
parentb01da39887b990b8c57484f53643a3c0ea5d531b (diff)
downloadchat-ca8d57c4dbfe839db28b583caa7d599c0cfc023a.tar.gz
chat-ca8d57c4dbfe839db28b583caa7d599c0cfc023a.tar.bz2
chat-ca8d57c4dbfe839db28b583caa7d599c0cfc023a.zip
PLT-6890 Fix various scrolling issues (#6727)
* Fix various scrolling issues * Move reaction scrolling to reaction list * Handle scrolling when RHS opens * Only run scroll update code when posts change
Diffstat (limited to 'webapp/utils')
-rw-r--r--webapp/utils/constants.jsx2
-rw-r--r--webapp/utils/event_types.jsx8
-rw-r--r--webapp/utils/global_event_emitter.jsx27
-rw-r--r--webapp/utils/markdown.jsx7
4 files changed, 40 insertions, 4 deletions
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 9b18b52f9..9dbc43f60 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import keyMirror from 'key-mirror/keyMirror.js';
+import keyMirror from 'key-mirror';
import audioIcon from 'images/icons/audio.png';
import videoIcon from 'images/icons/video.png';
diff --git a/webapp/utils/event_types.jsx b/webapp/utils/event_types.jsx
new file mode 100644
index 000000000..1d43f4290
--- /dev/null
+++ b/webapp/utils/event_types.jsx
@@ -0,0 +1,8 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import keyMirror from 'key-mirror';
+
+export default keyMirror({
+ POST_LIST_SCROLL_CHANGE: null
+});
diff --git a/webapp/utils/global_event_emitter.jsx b/webapp/utils/global_event_emitter.jsx
new file mode 100644
index 000000000..0d231d2a2
--- /dev/null
+++ b/webapp/utils/global_event_emitter.jsx
@@ -0,0 +1,27 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
+
+import EventTypes from 'utils/event_types.jsx';
+
+class GlobalEventEmitterClass extends EventEmitter {
+ constructor() {
+ super();
+ this.dispatchToken = AppDispatcher.register(this.handleEventPayload);
+ }
+
+ handleEventPayload = (payload) => {
+ const {type, value, ...args} = payload.action; //eslint-disable-line no-use-before-define
+
+ switch (type) {
+ case EventTypes.POST_LIST_SCROLL_CHANGE:
+ this.emit(type, value, args);
+ break;
+ }
+ }
+}
+
+const GlobalEventEmitter = new GlobalEventEmitterClass();
+export default GlobalEventEmitter;
diff --git a/webapp/utils/markdown.jsx b/webapp/utils/markdown.jsx
index f47c45d10..60ccbd246 100644
--- a/webapp/utils/markdown.jsx
+++ b/webapp/utils/markdown.jsx
@@ -4,11 +4,11 @@
import * as TextFormatting from './text_formatting.jsx';
import * as SyntaxHighlighting from './syntax_highlighting.jsx';
+import {postListScrollChange} from 'actions/global_actions.jsx';
+
import marked from 'marked';
import katex from 'katex';
-import ScrollStore from 'stores/scroll_store.jsx';
-
function markdownImageLoaded(image) {
if (image.hasAttribute('height') && image.attributes.height.value !== 'auto') {
const maxHeight = parseInt(global.getComputedStyle(image).maxHeight, 10);
@@ -22,7 +22,8 @@ function markdownImageLoaded(image) {
} else {
image.style.height = 'auto';
}
- ScrollStore.emitPostScroll();
+
+ postListScrollChange();
}
global.markdownImageLoaded = markdownImageLoaded;