remove qrDialogView unused
This commit is contained in:
parent
1eb8f8e6b1
commit
a03132f088
|
@ -381,7 +381,6 @@
|
|||
<script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/password_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/qr_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/beta_release_disclaimer_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/identicon_svg_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/banner_view.js'></script>
|
||||
|
|
|
@ -391,7 +391,6 @@
|
|||
<script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/password_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/qr_dialog_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/beta_release_disclaimer_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/identicon_svg_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/banner_view.js'></script>
|
||||
|
|
|
@ -698,7 +698,6 @@
|
|||
confirmDialog.render();
|
||||
};
|
||||
|
||||
window.showQRDialog = window.owsDesktopApp.appView.showQRDialog;
|
||||
window.showSeedDialog = window.owsDesktopApp.appView.showSeedDialog;
|
||||
window.showPasswordDialog = window.owsDesktopApp.appView.showPasswordDialog;
|
||||
window.showEditProfileDialog = async callback => {
|
||||
|
@ -1109,13 +1108,6 @@
|
|||
}
|
||||
});
|
||||
|
||||
Whisper.events.on('showQRDialog', async () => {
|
||||
if (appView) {
|
||||
const ourNumber = textsecure.storage.user.getNumber();
|
||||
appView.showQRDialog(ourNumber);
|
||||
}
|
||||
});
|
||||
|
||||
Whisper.events.on('showDevicePairingDialog', async (options = {}) => {
|
||||
if (appView) {
|
||||
appView.showDevicePairingDialog(options);
|
||||
|
|
|
@ -60,9 +60,6 @@ const {
|
|||
const { SessionToast } = require('../../ts/components/session/SessionToast');
|
||||
const { SessionToggle } = require('../../ts/components/session/SessionToggle');
|
||||
const { SessionModal } = require('../../ts/components/session/SessionModal');
|
||||
const {
|
||||
SessionQRModal,
|
||||
} = require('../../ts/components/session/SessionQRModal');
|
||||
const {
|
||||
SessionSeedModal,
|
||||
} = require('../../ts/components/session/SessionSeedModal');
|
||||
|
@ -304,7 +301,6 @@ exports.setup = (options = {}) => {
|
|||
SessionToggle,
|
||||
SessionConfirm,
|
||||
SessionModal,
|
||||
SessionQRModal,
|
||||
SessionSeedModal,
|
||||
SessionPasswordModal,
|
||||
SessionPasswordPrompt,
|
||||
|
|
|
@ -169,12 +169,6 @@
|
|||
const dialog = new Whisper.SeedDialogView();
|
||||
this.el.prepend(dialog.el);
|
||||
},
|
||||
showQRDialog(string) {
|
||||
const dialog = new Whisper.QRDialogView({
|
||||
value: string,
|
||||
});
|
||||
this.el.append(dialog.el);
|
||||
},
|
||||
showDevicePairingDialog(options) {
|
||||
const dialog = new Whisper.DevicePairingDialogView(options);
|
||||
this.el.prepend(dialog.el);
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
/* global Whisper */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.QRDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog qr-dialog modal',
|
||||
initialize(options) {
|
||||
this.value = options.value || '';
|
||||
this.close = this.close.bind(this);
|
||||
|
||||
this.render();
|
||||
},
|
||||
|
||||
render() {
|
||||
this.dialogView = new Whisper.ReactWrapperView({
|
||||
className: 'qr-dialog-wrapper',
|
||||
Component: window.Signal.Components.SessionQRModal,
|
||||
props: {
|
||||
value: this.value,
|
||||
onClose: this.close,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(this.dialogView.el);
|
||||
return this;
|
||||
},
|
||||
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
});
|
||||
})();
|
|
@ -423,7 +423,6 @@
|
|||
<script type="text/javascript" src="../js/views/nickname_dialog_view.js"></script>
|
||||
<script type="text/javascript" src="../js/views/password_dialog_view.js"></script>
|
||||
<script type="text/javascript" src="../js/views/seed_dialog_view.js"></script>
|
||||
<script type="text/javascript" src="../js/views/qr_dialog_view.js"></script>
|
||||
<script type="text/javascript" src="../js/views/beta_release_disclaimer_view.js"></script>
|
||||
<script type="text/javascript" src="../js/views/identicon_svg_view.js"></script>
|
||||
<script type="text/javascript" src="../js/views/banner_view.js"></script>
|
||||
|
|
|
@ -134,7 +134,7 @@ export class EditProfileDialog extends React.Component<Props, State> {
|
|||
<SessionButton
|
||||
text={window.i18n('save')}
|
||||
buttonType={SessionButtonType.BrandOutline}
|
||||
buttonColor={SessionButtonColor.White}
|
||||
buttonColor={SessionButtonColor.Green}
|
||||
onClick={this.onClickOK}
|
||||
/>
|
||||
)}
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
import React from 'react';
|
||||
import { QRCode } from 'react-qr-svg';
|
||||
|
||||
import { SessionModal } from './SessionModal';
|
||||
import { SessionButton } from './SessionButton';
|
||||
import { SessionHtmlRenderer } from './SessionHTMLRenderer';
|
||||
|
||||
interface Props {
|
||||
value: string;
|
||||
onClose: any;
|
||||
}
|
||||
|
||||
export class SessionQRModal extends React.Component<Props> {
|
||||
constructor(props: any) {
|
||||
super(props);
|
||||
}
|
||||
public render() {
|
||||
const { value, onClose } = this.props;
|
||||
|
||||
// Foreground equivalent to .session-modal background color
|
||||
const bgColor = '#FFFFFF';
|
||||
const fgColor = '#1B1B1B';
|
||||
|
||||
return (
|
||||
<SessionModal
|
||||
title={window.i18n('QRCodeTitle')}
|
||||
onOk={() => null}
|
||||
onClose={onClose}
|
||||
>
|
||||
<div className="spacer-sm" />
|
||||
|
||||
<div className="qr-dialog__description subtle">
|
||||
<SessionHtmlRenderer html={window.i18n('QRCodeDescription')} />
|
||||
</div>
|
||||
<div className="spacer-lg" />
|
||||
|
||||
<div id="qr">
|
||||
<QRCode value={value} bgColor={bgColor} fgColor={fgColor} level="L" />
|
||||
</div>
|
||||
|
||||
<div className="spacer-lg" />
|
||||
<div className="session-modal__button-group">
|
||||
<SessionButton text={window.i18n('close')} onClick={onClose} />
|
||||
</div>
|
||||
</SessionModal>
|
||||
);
|
||||
}
|
||||
}
|
|
@ -79,7 +79,6 @@ declare global {
|
|||
shortenPubkey: any;
|
||||
showEditProfileDialog: any;
|
||||
showPasswordDialog: any;
|
||||
showQRDialog: any;
|
||||
showSeedDialog: any;
|
||||
storage: any;
|
||||
textsecure: LibTextsecure;
|
||||
|
|
Loading…
Reference in New Issue