From 257edc9ea3b25328aa44098e963815c3c3d25312 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 29 Aug 2017 09:54:02 -0400 Subject: Experimental implementation for webapp plugins (#7185) * Start of experimental implementation for webapp plugins * Updates to webapp plugin architecture * Update pluggable test * Remove debug code --- webapp/components/at_mention/at_mention.jsx | 17 ++++++++++------- webapp/components/profile_picture.jsx | 24 ++++++++++++++---------- webapp/components/user_profile.jsx | 21 ++++++++++++--------- 3 files changed, 36 insertions(+), 26 deletions(-) (limited to 'webapp/components') diff --git a/webapp/components/at_mention/at_mention.jsx b/webapp/components/at_mention/at_mention.jsx index 9bb2d2aad..668222cc2 100644 --- a/webapp/components/at_mention/at_mention.jsx +++ b/webapp/components/at_mention/at_mention.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. import ProfilePopover from 'components/profile_popover.jsx'; +import Pluggable from 'plugins/pluggable'; import {Client4} from 'mattermost-redux/client'; import React from 'react'; @@ -79,13 +80,15 @@ export default class AtMention extends React.PureComponent { placement='right' rootClose={true} overlay={ - + + + } > {'@' + user.username} diff --git a/webapp/components/profile_picture.jsx b/webapp/components/profile_picture.jsx index fbaa46127..90cea9d34 100644 --- a/webapp/components/profile_picture.jsx +++ b/webapp/components/profile_picture.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. + import ProfilePopover from './profile_popover.jsx'; +import Pluggable from 'plugins/pluggable'; import * as Utils from 'utils/utils.jsx'; import PropTypes from 'prop-types'; @@ -56,16 +58,18 @@ export default class ProfilePicture extends React.Component { placement='right' rootClose={true} overlay={ - - } + + + + } > + + + } >