From 35d5f29b82c9d63ae91652698752a00852a399ab Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Mon, 9 May 2016 13:18:07 -0700 Subject: [PATCH] fix(thread-list): Add missing displayName, ES6 --- internal_packages/thread-list/lib/main.cjsx | 69 ---------------- internal_packages/thread-list/lib/main.es6 | 81 +++++++++++++++++++ .../thread-list/lib/message-list-toolbar.jsx | 2 +- 3 files changed, 82 insertions(+), 70 deletions(-) delete mode 100644 internal_packages/thread-list/lib/main.cjsx create mode 100644 internal_packages/thread-list/lib/main.es6 diff --git a/internal_packages/thread-list/lib/main.cjsx b/internal_packages/thread-list/lib/main.cjsx deleted file mode 100644 index 137a87dc8..000000000 --- a/internal_packages/thread-list/lib/main.cjsx +++ /dev/null @@ -1,69 +0,0 @@ -_ = require 'underscore' -React = require "react" -{ComponentRegistry, WorkspaceStore} = require "nylas-exports" - -ThreadList = require './thread-list' -ThreadListToolbar = require('./thread-list-toolbar').default -MessageListToolbar = require('./message-list-toolbar').default -SelectedItemsStack = require('./selected-items-stack').default - -{UpButton, - DownButton, - TrashButton, - ArchiveButton, - MarkAsSpamButton, - ToggleUnreadButton, - ToggleStarredButton} = require "./thread-toolbar-buttons" - -module.exports = - activate: (@state={}) -> - ComponentRegistry.register ThreadList, - location: WorkspaceStore.Location.ThreadList - - ComponentRegistry.register SelectedItemsStack, - location: WorkspaceStore.Location.MessageList - modes: ['split'] - - # Toolbars - ComponentRegistry.register ThreadListToolbar, - location: WorkspaceStore.Location.ThreadList.Toolbar - modes: ['list'] - - ComponentRegistry.register MessageListToolbar, - location: WorkspaceStore.Location.MessageList.Toolbar - - ComponentRegistry.register DownButton, - location: WorkspaceStore.Location.MessageList.Toolbar - modes: ['list'] - - ComponentRegistry.register UpButton, - location: WorkspaceStore.Location.MessageList.Toolbar - modes: ['list'] - - ComponentRegistry.register ArchiveButton, - role: 'ThreadActionsToolbarButton' - - ComponentRegistry.register TrashButton, - role: 'ThreadActionsToolbarButton' - - ComponentRegistry.register MarkAsSpamButton, - role: 'ThreadActionsToolbarButton' - - ComponentRegistry.register ToggleStarredButton, - role: 'ThreadActionsToolbarButton' - - ComponentRegistry.register ToggleUnreadButton, - role: 'ThreadActionsToolbarButton' - - deactivate: -> - ComponentRegistry.unregister ThreadList - ComponentRegistry.unregister SelectedItemsStack - ComponentRegistry.unregister ThreadListToolbar - ComponentRegistry.unregister MessageListToolbar - ComponentRegistry.unregister ArchiveButton - ComponentRegistry.unregister TrashButton - ComponentRegistry.unregister MarkAsSpamButton - ComponentRegistry.unregister ToggleUnreadButton - ComponentRegistry.unregister ToggleStarredButton - ComponentRegistry.unregister UpButton - ComponentRegistry.unregister DownButton diff --git a/internal_packages/thread-list/lib/main.es6 b/internal_packages/thread-list/lib/main.es6 new file mode 100644 index 000000000..836fdaddb --- /dev/null +++ b/internal_packages/thread-list/lib/main.es6 @@ -0,0 +1,81 @@ +import {ComponentRegistry, WorkspaceStore} from "nylas-exports"; + +import ThreadList from './thread-list'; +import ThreadListToolbar from './thread-list-toolbar'; +import MessageListToolbar from './message-list-toolbar'; +import SelectedItemsStack from './selected-items-stack'; + +import { + UpButton, + DownButton, + TrashButton, + ArchiveButton, + MarkAsSpamButton, + ToggleUnreadButton, + ToggleStarredButton, +} from "./thread-toolbar-buttons"; + +export function activate() { + ComponentRegistry.register(ThreadList, { + location: WorkspaceStore.Location.ThreadList, + }); + + ComponentRegistry.register(SelectedItemsStack, { + location: WorkspaceStore.Location.MessageList, + modes: ['split'], + }); + + // Toolbars + ComponentRegistry.register(ThreadListToolbar, { + location: WorkspaceStore.Location.ThreadList.Toolbar, + modes: ['list'], + }); + + ComponentRegistry.register(MessageListToolbar, { + location: WorkspaceStore.Location.MessageList.Toolbar, + }); + + ComponentRegistry.register(DownButton, { + location: WorkspaceStore.Location.MessageList.Toolbar, + modes: ['list'], + }); + + ComponentRegistry.register(UpButton, { + location: WorkspaceStore.Location.MessageList.Toolbar, + modes: ['list'], + }); + + ComponentRegistry.register(ArchiveButton, { + role: 'ThreadActionsToolbarButton', + }); + + ComponentRegistry.register(TrashButton, { + role: 'ThreadActionsToolbarButton', + }); + + ComponentRegistry.register(MarkAsSpamButton, { + role: 'ThreadActionsToolbarButton', + }); + + ComponentRegistry.register(ToggleStarredButton, { + role: 'ThreadActionsToolbarButton', + }); + + ComponentRegistry.register(ToggleUnreadButton, { + role: 'ThreadActionsToolbarButton', + }); +} + +export function deactivate() { + ComponentRegistry.unregister(ThreadList); + ComponentRegistry.unregister(SelectedItemsStack); + ComponentRegistry.unregister(ThreadListToolbar); + ComponentRegistry.unregister(MessageListToolbar); + ComponentRegistry.unregister(ArchiveButton); + ComponentRegistry.unregister(TrashButton); + ComponentRegistry.unregister(MarkAsSpamButton); + ComponentRegistry.unregister(ToggleUnreadButton); + ComponentRegistry.unregister(ToggleStarredButton); + ComponentRegistry.unregister(UpButton); + ComponentRegistry.unregister(DownButton); +} diff --git a/internal_packages/thread-list/lib/message-list-toolbar.jsx b/internal_packages/thread-list/lib/message-list-toolbar.jsx index 47bd08509..0553a0c7d 100644 --- a/internal_packages/thread-list/lib/message-list-toolbar.jsx +++ b/internal_packages/thread-list/lib/message-list-toolbar.jsx @@ -36,7 +36,7 @@ const MessageListToolbar = ({items, injectedButtons}) => { ) } - +MessageListToolbar.displayName = 'MessageListToolbar'; MessageListToolbar.propTypes = { items: PropTypes.array, injectedButtons: PropTypes.element,