From 5c35c2631e59f895a7b0fb6761c1cae7aee60466 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 18:10:08 -0500 Subject: Upgrading ESLint and adding some more rules. Refactoring to meet these new rules --- web/react/utils/channel_intro_mssages.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react/utils') diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx index 28a458e3f..281c65b1b 100644 --- a/web/react/utils/channel_intro_mssages.jsx +++ b/web/react/utils/channel_intro_mssages.jsx @@ -71,7 +71,7 @@ export function createDMIntroMessage(channel) { ); } -export function createOffTopicIntroMessage(channel, showInviteModal) { +export function createOffTopicIntroMessage(channel, showInviteModal) { //eslint-disable-line react/no-multi-comp return (

{'Beginning of ' + channel.display_name}

@@ -101,7 +101,7 @@ export function createOffTopicIntroMessage(channel, showInviteModal) { ); } -export function createDefaultIntroMessage(channel) { +export function createDefaultIntroMessage(channel) { //eslint-disable-line react/no-multi-comp const team = TeamStore.getCurrent(); let inviteModalLink; if (team.type === Constants.INVITE_TEAM) { @@ -154,7 +154,7 @@ export function createDefaultIntroMessage(channel) { ); } -export function createStandardIntroMessage(channel, showInviteModal) { +export function createStandardIntroMessage(channel, showInviteModal) { //eslint-disable-line react/no-multi-comp var uiName = channel.display_name; var creatorName = ''; -- cgit v1.2.3-1-g7c22 From 55b831e4e1d3db3ffcf1d40247018783ca76af8d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 21:12:56 -0500 Subject: Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system. --- web/react/utils/async_client.jsx | 18 ++++----- web/react/utils/channel_intro_mssages.jsx | 12 +++--- web/react/utils/client.jsx | 6 +-- web/react/utils/constants.jsx | 4 +- web/react/utils/highlight.jsx | 51 ------------------------ web/react/utils/markdown.jsx | 64 +++++++++++++++++++++++++++---- web/react/utils/text_formatting.jsx | 12 +++--- web/react/utils/utils.jsx | 20 +++++----- 8 files changed, 92 insertions(+), 95 deletions(-) delete mode 100644 web/react/utils/highlight.jsx (limited to 'web/react/utils') diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index b39648bf0..fac4cd009 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var client = require('./client.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var PostStore = require('../stores/post_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var utils = require('./utils.jsx'); - -var Constants = require('./constants.jsx'); +import * as client from './client.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import * as utils from './utils.jsx'; + +import Constants from './constants.jsx'; var ActionTypes = Constants.ActionTypes; // Used to track in progress async calls diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx index 281c65b1b..aef1593dc 100644 --- a/web/react/utils/channel_intro_mssages.jsx +++ b/web/react/utils/channel_intro_mssages.jsx @@ -2,12 +2,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('./utils.jsx'); -const InviteMemberModal = require('../components/invite_member_modal.jsx'); -const UserProfile = require('../components/user_profile.jsx'); -const ChannelStore = require('../stores/channel_store.jsx'); -const Constants = require('../utils/constants.jsx'); -const TeamStore = require('../stores/team_store.jsx'); +import * as Utils from './utils.jsx'; +import InviteMemberModal from '../components/invite_member_modal.jsx'; +import UserProfile from '../components/user_profile.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import Constants from '../utils/constants.jsx'; +import TeamStore from '../stores/team_store.jsx'; export function createChannelIntroMessage(channel, showInviteModal) { if (channel.type === 'D') { diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index d27fe16cf..e6c24aa9c 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -1,8 +1,8 @@ // See License.txt for license information. -var BrowserStore = require('../stores/browser_store.jsx'); -var TeamStore = require('../stores/team_store.jsx'); -var ErrorStore = require('../stores/error_store.jsx'); +import BrowserStore from '../stores/browser_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; +import ErrorStore from '../stores/error_store.jsx'; export function track(category, action, label, property, value) { global.window.analytics.track(action, {category, label, property, value}); diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 80c0cf0ee..958bfa8d2 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var keyMirror = require('keymirror'); +import keyMirror from 'keymirror'; -module.exports = { +export default { ActionTypes: keyMirror({ RECIEVED_ERROR: null, diff --git a/web/react/utils/highlight.jsx b/web/react/utils/highlight.jsx deleted file mode 100644 index 68fef7930..000000000 --- a/web/react/utils/highlight.jsx +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -const highlightJs = require('highlight.js/lib/highlight.js'); -const highlightJsDiff = require('highlight.js/lib/languages/diff.js'); -const highlightJsApache = require('highlight.js/lib/languages/apache.js'); -const highlightJsMakefile = require('highlight.js/lib/languages/makefile.js'); -const highlightJsHttp = require('highlight.js/lib/languages/http.js'); -const highlightJsJson = require('highlight.js/lib/languages/json.js'); -const highlightJsMarkdown = require('highlight.js/lib/languages/markdown.js'); -const highlightJsJavascript = require('highlight.js/lib/languages/javascript.js'); -const highlightJsCss = require('highlight.js/lib/languages/css.js'); -const highlightJsNginx = require('highlight.js/lib/languages/nginx.js'); -const highlightJsObjectivec = require('highlight.js/lib/languages/objectivec.js'); -const highlightJsPython = require('highlight.js/lib/languages/python.js'); -const highlightJsXml = require('highlight.js/lib/languages/xml.js'); -const highlightJsPerl = require('highlight.js/lib/languages/perl.js'); -const highlightJsBash = require('highlight.js/lib/languages/bash.js'); -const highlightJsPhp = require('highlight.js/lib/languages/php.js'); -const highlightJsCoffeescript = require('highlight.js/lib/languages/coffeescript.js'); -const highlightJsCs = require('highlight.js/lib/languages/cs.js'); -const highlightJsCpp = require('highlight.js/lib/languages/cpp.js'); -const highlightJsSql = require('highlight.js/lib/languages/sql.js'); -const highlightJsGo = require('highlight.js/lib/languages/go.js'); -const highlightJsRuby = require('highlight.js/lib/languages/ruby.js'); -const highlightJsJava = require('highlight.js/lib/languages/java.js'); -const highlightJsIni = require('highlight.js/lib/languages/ini.js'); - -highlightJs.registerLanguage('diff', highlightJsDiff); -highlightJs.registerLanguage('apache', highlightJsApache); -highlightJs.registerLanguage('makefile', highlightJsMakefile); -highlightJs.registerLanguage('http', highlightJsHttp); -highlightJs.registerLanguage('json', highlightJsJson); -highlightJs.registerLanguage('markdown', highlightJsMarkdown); -highlightJs.registerLanguage('javascript', highlightJsJavascript); -highlightJs.registerLanguage('css', highlightJsCss); -highlightJs.registerLanguage('nginx', highlightJsNginx); -highlightJs.registerLanguage('objectivec', highlightJsObjectivec); -highlightJs.registerLanguage('python', highlightJsPython); -highlightJs.registerLanguage('xml', highlightJsXml); -highlightJs.registerLanguage('perl', highlightJsPerl); -highlightJs.registerLanguage('bash', highlightJsBash); -highlightJs.registerLanguage('php', highlightJsPhp); -highlightJs.registerLanguage('coffeescript', highlightJsCoffeescript); -highlightJs.registerLanguage('cs', highlightJsCs); -highlightJs.registerLanguage('cpp', highlightJsCpp); -highlightJs.registerLanguage('sql', highlightJsSql); -highlightJs.registerLanguage('go', highlightJsGo); -highlightJs.registerLanguage('ruby', highlightJsRuby); -highlightJs.registerLanguage('java', highlightJsJava); -highlightJs.registerLanguage('ini', highlightJsIni); diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 4d1a35d19..7957ea31b 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -1,14 +1,62 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -require('./highlight.jsx'); -const TextFormatting = require('./text_formatting.jsx'); -const Utils = require('./utils.jsx'); - -const highlightJs = require('highlight.js/lib/highlight.js'); -const marked = require('marked'); - -const HighlightedLanguages = require('../utils/constants.jsx').HighlightedLanguages; +import highlightJs from 'highlight.js/lib/highlight.js'; +import highlightJsDiff from 'highlight.js/lib/languages/diff.js'; +import highlightJsApache from 'highlight.js/lib/languages/apache.js'; +import highlightJsMakefile from 'highlight.js/lib/languages/makefile.js'; +import highlightJsHttp from 'highlight.js/lib/languages/http.js'; +import highlightJsJson from 'highlight.js/lib/languages/json.js'; +import highlightJsMarkdown from 'highlight.js/lib/languages/markdown.js'; +import highlightJsJavascript from 'highlight.js/lib/languages/javascript.js'; +import highlightJsCss from 'highlight.js/lib/languages/css.js'; +import highlightJsNginx from 'highlight.js/lib/languages/nginx.js'; +import highlightJsObjectivec from 'highlight.js/lib/languages/objectivec.js'; +import highlightJsPython from 'highlight.js/lib/languages/python.js'; +import highlightJsXml from 'highlight.js/lib/languages/xml.js'; +import highlightJsPerl from 'highlight.js/lib/languages/perl.js'; +import highlightJsBash from 'highlight.js/lib/languages/bash.js'; +import highlightJsPhp from 'highlight.js/lib/languages/php.js'; +import highlightJsCoffeescript from 'highlight.js/lib/languages/coffeescript.js'; +import highlightJsCs from 'highlight.js/lib/languages/cs.js'; +import highlightJsCpp from 'highlight.js/lib/languages/cpp.js'; +import highlightJsSql from 'highlight.js/lib/languages/sql.js'; +import highlightJsGo from 'highlight.js/lib/languages/go.js'; +import highlightJsRuby from 'highlight.js/lib/languages/ruby.js'; +import highlightJsJava from 'highlight.js/lib/languages/java.js'; +import highlightJsIni from 'highlight.js/lib/languages/ini.js'; + +highlightJs.registerLanguage('diff', highlightJsDiff); +highlightJs.registerLanguage('apache', highlightJsApache); +highlightJs.registerLanguage('makefile', highlightJsMakefile); +highlightJs.registerLanguage('http', highlightJsHttp); +highlightJs.registerLanguage('json', highlightJsJson); +highlightJs.registerLanguage('markdown', highlightJsMarkdown); +highlightJs.registerLanguage('javascript', highlightJsJavascript); +highlightJs.registerLanguage('css', highlightJsCss); +highlightJs.registerLanguage('nginx', highlightJsNginx); +highlightJs.registerLanguage('objectivec', highlightJsObjectivec); +highlightJs.registerLanguage('python', highlightJsPython); +highlightJs.registerLanguage('xml', highlightJsXml); +highlightJs.registerLanguage('perl', highlightJsPerl); +highlightJs.registerLanguage('bash', highlightJsBash); +highlightJs.registerLanguage('php', highlightJsPhp); +highlightJs.registerLanguage('coffeescript', highlightJsCoffeescript); +highlightJs.registerLanguage('cs', highlightJsCs); +highlightJs.registerLanguage('cpp', highlightJsCpp); +highlightJs.registerLanguage('sql', highlightJsSql); +highlightJs.registerLanguage('go', highlightJsGo); +highlightJs.registerLanguage('ruby', highlightJsRuby); +highlightJs.registerLanguage('java', highlightJsJava); +highlightJs.registerLanguage('ini', highlightJsIni); + +import * as TextFormatting from './text_formatting.jsx'; +import * as Utils from './utils.jsx'; + +import marked from 'marked'; + +import Constants from '../utils/constants.jsx'; +const HighlightedLanguages = Constants.HighlightedLanguages; function markdownImageLoaded(image) { image.style.height = 'auto'; diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 7f1d7175d..3a912fd75 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Autolinker = require('autolinker'); -const Constants = require('./constants.jsx'); -const Emoticons = require('./emoticons.jsx'); -const Markdown = require('./markdown.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const Utils = require('./utils.jsx'); +import Autolinker from 'autolinker'; +import Constants from './constants.jsx'; +import * as Emoticons from './emoticons.jsx'; +import * as Markdown from './markdown.jsx'; +import UserStore from '../stores/user_store.jsx'; +import * as Utils from './utils.jsx'; // Performs formatting of user posts including highlighting mentions and search terms and converting urls, hashtags, and // @mentions to links by taking a user's message and returning a string of formatted html. Also takes a number of options diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index cd347f7d6..668d8100f 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1,17 +1,17 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var PreferenceStore = require('../stores/preference_store.jsx'); -var TeamStore = require('../stores/team_store.jsx'); -var Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; +import Constants from '../utils/constants.jsx'; var ActionTypes = Constants.ActionTypes; -var Client = require('./client.jsx'); -var AsyncClient = require('./async_client.jsx'); -var client = require('./client.jsx'); -var Autolinker = require('autolinker'); +import * as Client from './client.jsx'; +import * as AsyncClient from './async_client.jsx'; +import * as client from './client.jsx'; +import Autolinker from 'autolinker'; export function isEmail(email) { //var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/; -- cgit v1.2.3-1-g7c22