keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

remove bulk edit view and related stuff unused

Browse Source
pull/1387/head
Audric Ackermann 5 years ago
parent e0fd910fa4
commit a30ae8903b
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
9 changed files with 0 additions and 236 deletions
Show Stats Download Patch File Download Diff File

1
background.html
Unescape Escape View File

@ -231,7 +231,6 @@
<script type='text/javascript' src='js/views/session_confirm_view.js'></script> <script type='text/javascript' src='js/views/session_confirm_view.js'></script>
<script type='text/javascript' src='js/views/list_view.js'></script> <script type='text/javascript' src='js/views/list_view.js'></script>
<script type='text/javascript' src='js/views/member_list_view.js'></script> <script type='text/javascript' src='js/views/member_list_view.js'></script>
<script type='text/javascript' src='js/views/bulk_edit_view.js'></script>
<script type='text/javascript' src='js/views/group_member_list_view.js'></script> <script type='text/javascript' src='js/views/group_member_list_view.js'></script>
<script type='text/javascript' src='js/views/recorder_view.js'></script> <script type='text/javascript' src='js/views/recorder_view.js'></script>
<script type='text/javascript' src='js/views/inbox_view.js'></script> <script type='text/javascript' src='js/views/inbox_view.js'></script>

1
background_test.html
Unescape Escape View File

@ -231,7 +231,6 @@
<script type='text/javascript' src='js/views/session_confirm_view.js'></script> <script type='text/javascript' src='js/views/session_confirm_view.js'></script>
<script type='text/javascript' src='js/views/list_view.js'></script> <script type='text/javascript' src='js/views/list_view.js'></script>
<script type='text/javascript' src='js/views/member_list_view.js'></script> <script type='text/javascript' src='js/views/member_list_view.js'></script>
<script type='text/javascript' src='js/views/bulk_edit_view.js'></script>
<script type='text/javascript' src='js/views/group_member_list_view.js'></script> <script type='text/javascript' src='js/views/group_member_list_view.js'></script>
<script type='text/javascript' src='js/views/recorder_view.js'></script> <script type='text/javascript' src='js/views/recorder_view.js'></script>
<script type='text/javascript' src='js/views/inbox_view.js'></script> <script type='text/javascript' src='js/views/inbox_view.js'></script>

2
js/modules/signal.js
Unescape Escape View File

@ -44,7 +44,6 @@ const {
const { Lightbox } = require('../../ts/components/Lightbox'); const { Lightbox } = require('../../ts/components/Lightbox');
const { LightboxGallery } = require('../../ts/components/LightboxGallery'); const { LightboxGallery } = require('../../ts/components/LightboxGallery');
const { MemberList } = require('../../ts/components/conversation/MemberList'); const { MemberList } = require('../../ts/components/conversation/MemberList');
const { BulkEdit } = require('../../ts/components/conversation/BulkEdit');
const { const {
CreateGroupDialog, CreateGroupDialog,
} = require('../../ts/components/conversation/CreateGroupDialog'); } = require('../../ts/components/conversation/CreateGroupDialog');
@ -292,7 +291,6 @@ exports.setup = (options = {}) => {
AddModeratorsDialog, AddModeratorsDialog,
RemoveModeratorsDialog, RemoveModeratorsDialog,
GroupInvitation, GroupInvitation,
BulkEdit,
SessionConversation, SessionConversation,
SessionToast, SessionToast,
SessionToggle, SessionToggle,

37
js/views/bulk_edit_view.js
Unescape Escape View File

@ -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();
},
});
})();

86
js/views/conversation_view.js
Unescape Escape View File

@ -343,12 +343,6 @@
this.memberView.render(); 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.$messageField = this.$('.send-message');
this.onResize = this.forceUpdateMessageFieldSize.bind(this); 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) { async sendMessage(e) {
this.removeLastSeenIndicator(); this.removeLastSeenIndicator();
this.model.clearTypingTimers(); this.model.clearTypingTimers();

29
js/views/inbox_view.js
Unescape Escape View File

@ -21,16 +21,7 @@
Whisper.ConversationStack = Whisper.View.extend({ Whisper.ConversationStack = Whisper.View.extend({
className: 'conversation-stack', className: 'conversation-stack',
open(conversation) { open(conversation) {
// const container = $('#main-view .conversation-stack');
// container.html('');
this.setupSessionConversation(conversation.id); this.setupSessionConversation(conversation.id);
// const sessionConversationView = new Whisper.SessionConversationView({
// el: container,
// conversationKey: conversation.id,
// });
// sessionConversationView.render();
conversation.trigger('opened'); conversation.trigger('opened');
}, },
close(conversation) { close(conversation) {
@ -190,26 +181,6 @@
this.openConversationAction = openConversationExternal; 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.fetchHandleMessageSentData = this.fetchHandleMessageSentData.bind(
this this
); );

35
stylesheets/_conversation.scss
Unescape Escape View File

@ -141,41 +141,6 @@
align-self: flex-end; 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 { .typing-bubble-wrapper {
margin-bottom: 20px; margin-bottom: 20px;

1
test/index.html
Unescape Escape View File

@ -268,7 +268,6 @@
<script type="text/javascript" src="../js/views/session_confirm_view.js"></script> <script type="text/javascript" src="../js/views/session_confirm_view.js"></script>
<script type="text/javascript" src="../js/views/list_view.js"></script> <script type="text/javascript" src="../js/views/list_view.js"></script>
<script type="text/javascript" src="../js/views/member_list_view.js"></script> <script type="text/javascript" src="../js/views/member_list_view.js"></script>
<script type="text/javascript" src="../js/views/bulk_edit_view.js"></script>
<script type="text/javascript" src="../js/views/group_member_list_view.js"></script> <script type="text/javascript" src="../js/views/group_member_list_view.js"></script>
<script type="text/javascript" src="../js/views/recorder_view.js"></script> <script type="text/javascript" src="../js/views/recorder_view.js"></script>
<script type="text/javascript" src="../js/views/inbox_view.js"></script> <script type="text/javascript" src="../js/views/inbox_view.js"></script>

44
ts/components/conversation/BulkEdit.tsx
Unescape Escape View File

@ -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<Props> {
constructor(props: any) {
super(props);
}
public render() {
const classes = ['bulk-edit-container'];
if (this.props.messageCount === 0) {
classes.push('hidden');
}
return (
<div className={classNames(classes)}>
<span
className="delete-button"
role="button"
onClick={this.props.onDelete}
>
Delete
</span>
<span className="message-counter">
Messages selected: {this.props.messageCount}
</span>
<span
className="cancel-button"
role="button"
onClick={this.props.onCancel}
>
Cancel
</span>
</div>
);
}
}
Write Preview
Loading…
Cancel
Save