diff --git a/background.html b/background.html
index 156a7b3f4..cab13db12 100644
--- a/background.html
+++ b/background.html
@@ -231,7 +231,6 @@
-
diff --git a/background_test.html b/background_test.html
index f5fe916ed..aeec40bd4 100644
--- a/background_test.html
+++ b/background_test.html
@@ -231,7 +231,6 @@
-
diff --git a/js/modules/signal.js b/js/modules/signal.js
index c6ce379e0..6c39b009c 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -44,7 +44,6 @@ const {
const { Lightbox } = require('../../ts/components/Lightbox');
const { LightboxGallery } = require('../../ts/components/LightboxGallery');
const { MemberList } = require('../../ts/components/conversation/MemberList');
-const { BulkEdit } = require('../../ts/components/conversation/BulkEdit');
const {
CreateGroupDialog,
} = require('../../ts/components/conversation/CreateGroupDialog');
@@ -292,7 +291,6 @@ exports.setup = (options = {}) => {
AddModeratorsDialog,
RemoveModeratorsDialog,
GroupInvitation,
- BulkEdit,
SessionConversation,
SessionToast,
SessionToggle,
diff --git a/js/views/bulk_edit_view.js b/js/views/bulk_edit_view.js
deleted file mode 100644
index ec6b37301..000000000
--- a/js/views/bulk_edit_view.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* global Whisper, */
-
-// eslint-disable-next-line func-names
-(function() {
- 'use strict';
-
- window.Whisper = window.Whisper || {};
-
- Whisper.BulkEditView = Whisper.View.extend({
- initialize(options) {
- this.memberView = null;
- this.props = {
- onCancel: options.onCancel,
- onDelete: options.onDelete,
- messageCount: 0,
- };
- },
- render() {
- if (this.memberView) {
- this.memberView.update(this.props);
- return;
- }
- this.memberView = new Whisper.ReactWrapperView({
- className: 'bulk-edit-view',
- Component: window.Signal.Components.BulkEdit,
- props: this.props,
- });
-
- this.$el.append(this.memberView.el);
- },
-
- update(selectionSize) {
- this.props.messageCount = selectionSize;
- this.render();
- },
- });
-})();
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index a083261c7..5416babc1 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -343,12 +343,6 @@
this.memberView.render();
- this.bulkEditView = new Whisper.BulkEditView({
- el: this.$('#bulk-edit-view'),
- onCancel: this.resetMessageSelection.bind(this),
- onDelete: this.deleteSelectedMessages.bind(this),
- });
-
this.$messageField = this.$('.send-message');
this.onResize = this.forceUpdateMessageFieldSize.bind(this);
@@ -1452,86 +1446,6 @@
}
},
- resetMessageSelection() {
- this.model.resetMessageSelection();
- },
-
- onKeyDown(event) {
- if (event.key !== 'Escape') {
- return;
- }
-
- // TODO: this view is not always in focus (e.g. after I've selected a message),
- // so need to make Esc more robust
- // Perhaps look into ConversationHeader.tsx and add an event listener in there.
- // Up and down arrows should scroll
- // Alt + up and down should swap between conversations / setting categories
- this.model.resetMessageSelection();
- },
-
- async setQuoteMessage(message) {
- this.quote = null;
- this.quotedMessage = message;
-
- if (this.quoteHolder) {
- this.quoteHolder.unload();
- this.quoteHolder = null;
- }
-
- if (message) {
- const quote = await this.model.makeQuote(message);
- this.quote = quote;
-
- this.focusMessageFieldAndClearDisabled();
- }
-
- this.renderQuotedMessage();
- },
-
- renderQuotedMessage() {
- if (this.quoteView) {
- this.quoteView.remove();
- this.quoteView = null;
- }
- if (!this.quotedMessage) {
- this.view.restoreBottomOffset();
- this.updateMessageFieldSize({});
- return;
- }
-
- const message = new Whisper.Message({
- conversationId: this.model.id,
- quote: this.quote,
- });
- message.quotedMessage = this.quotedMessage;
- this.quoteHolder = message;
-
- const props = message.getPropsForQuote();
-
- this.listenTo(message, 'scroll-to-message', this.scrollToMessage);
-
- const contact = this.quotedMessage.getContact();
- if (contact) {
- this.listenTo(contact, 'change', this.renderQuotedMesage);
- }
-
- this.quoteView = new Whisper.ReactWrapperView({
- className: 'quote-wrapper',
- Component: window.Signal.Components.Quote,
- elCallback: el => this.$('.send').prepend(el),
- props: Object.assign({}, props, {
- withContentAbove: true,
- onClose: () => {
- this.setQuoteMessage(null);
- },
- }),
- onInitialRender: () => {
- this.view.restoreBottomOffset();
- this.updateMessageFieldSize({});
- },
- });
- },
-
async sendMessage(e) {
this.removeLastSeenIndicator();
this.model.clearTypingTimers();
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 7c503fd24..6e926b62d 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -21,16 +21,7 @@
Whisper.ConversationStack = Whisper.View.extend({
className: 'conversation-stack',
open(conversation) {
- // const container = $('#main-view .conversation-stack');
- // container.html('');
-
this.setupSessionConversation(conversation.id);
- // const sessionConversationView = new Whisper.SessionConversationView({
- // el: container,
- // conversationKey: conversation.id,
- // });
- // sessionConversationView.render();
-
conversation.trigger('opened');
},
close(conversation) {
@@ -190,26 +181,6 @@
this.openConversationAction = openConversationExternal;
- // In the future this listener will be added by the conversation view itself. But
- // because we currently have multiple converations open at once, we install just
- // one global handler.
- // $(document).on('keydown', event => {
- // const { ctrlKey, key } = event;
-
- // We can add Command-E as the Mac shortcut when we add it to our Electron menus:
- // https://stackoverflow.com/questions/27380018/when-cmd-key-is-kept-pressed-keyup-is-not-triggered-for-any-other-key
- // For now, it will stay as CTRL-E only
- // if (key === 'e' && ctrlKey) {
- // const state = this.store.getState();
- // const selectedId = state.conversations.selectedConversation;
- // const conversation = ConversationController.get(selectedId);
-
- // if (conversation && !conversation.get('isArchived')) {
- // conversation.setArchived(true);
- // conversation.trigger('unload');
- // }
- // }
- // });
this.fetchHandleMessageSentData = this.fetchHandleMessageSentData.bind(
this
);
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 1f1e7cc4e..5df211c42 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -141,41 +141,6 @@
align-self: flex-end;
}
-.bulk-edit-container {
- display: flex;
- border-top: solid;
- border-width: 0.8px;
- border-color: #80808090;
-
- &.hidden {
- display: none;
- }
-
- .delete-button {
- color: orangered;
- padding: 18px;
- // This makes sure the message counter is right in the center
- width: 80px;
- margin-inline-end: -80px;
- user-select: none;
- }
-
- .cancel-button {
- padding: 18px;
- width: 80px;
- margin-inline-start: -80px;
- user-select: none;
- }
-
- .message-counter {
- color: darkgrey;
- display: flex;
- align-items: center;
- user-select: none;
- margin-inline-start: auto;
- margin-inline-end: auto;
- }
-}
.typing-bubble-wrapper {
margin-bottom: 20px;
diff --git a/test/index.html b/test/index.html
index 3738f7bd9..347acdbf9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -268,7 +268,6 @@
-
diff --git a/ts/components/conversation/BulkEdit.tsx b/ts/components/conversation/BulkEdit.tsx
deleted file mode 100644
index 57aac2a17..000000000
--- a/ts/components/conversation/BulkEdit.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-
-interface Props {
- messageCount: number;
- onCancel: any;
- onDelete: any;
-}
-
-export class BulkEdit extends React.Component {
- constructor(props: any) {
- super(props);
- }
-
- public render() {
- const classes = ['bulk-edit-container'];
-
- if (this.props.messageCount === 0) {
- classes.push('hidden');
- }
-
- return (
-
-
- Delete
-
-
- Messages selected: {this.props.messageCount}
-
-
- Cancel
-
-
- );
- }
-}