3df22026ab
- [x] Removed ‘Restart Signal’ global menu item - [x] Change _Click to create contact…_ to _Start conversation…_ - [x] Move global menu (top-left kebab) into OS menu bar, i.e. **Settings** > **Preferences…** - [x] Add tests for OS menu bar templates - [x] Fix bug with **Window** menu on macOS when showing setup options - [x] Use _Title Case_ for all OS menu bar menu items for consistency commit dedf7c9af0de90980388559659df0d92a77b864c Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 16:53:42 2018 -0500 Use ‘Title Case’ to be consistent with OS menus References: - Apple: - https://developer.apple.com/macos/human-interface-guidelines/menus/menu-anatomy/#menu-and-menu-item-titles - https://developer.apple.com/library/content/documentation/FinalCutProX/Conceptual/FxPlugHIG/TextStyleGuidelines/TextStyleGuidelines.html#//apple_ref/doc/uid/TP40013782-CH6-SW1 - https://titlecaseconverter.com/ commit 3286da29b334bd4526c587b17707c2f230cec8f5 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 16:36:50 2018 -0500 Fix bug for macOS ‘Window’ menu with setup options commit 236a23d1eafe2a16073394a27b9013298b682a25 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 16:27:46 2018 -0500 Test menus with included setup options commit c5d5f5abb8d7f52d6a4aa182a86c92f7ddceade0 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 16:10:27 2018 -0500 Move settings (‘Preferences’) into OS-level menu This reduces our reliance on custom UI until we have more design resources. commit 027803f8f4983cffa443f0beff1854dcf541689b Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 16:02:56 2018 -0500 Prepare tests for menu with/without included setup commit 9e2f006924b85eb249a8a1261c1c4dd1a706afa6 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 15:55:46 2018 -0500 Destructure `includeSetup` commit 6b2a1eccdf724fd722e58415d2700da73942d9e8 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 15:55:14 2018 -0500 🔤 `createTemplate` `options` commit c2fecba34b153fed106f414ed3347d46299f6fe5 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 12:49:55 2018 -0500 Test menu for Windows and Linux commit 60281b1af9ad1f022cdbc40711ebd0b688a7355d Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 12:40:39 2018 -0500 Add `yarn run test-app` command commit 1a0489919c0a97b03fe88196260fef894fb3d9e4 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 12:40:29 2018 -0500 Add test for `SignalMenu.createTemplate` on macOS commit 9638b86c0f00f231e44562a5aa01626f0e5fdd8b Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 12:34:46 2018 -0500 Make `createTemplate` pure Extracting `options.platform` makes it easier to test without having to stub `process.platform`. commit 9c26404892d7c9a7bd0199a9e8367a165a3b365c Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 11:47:39 2018 -0500 Extract `locale.load` `appLocale` & `logger` for testability This allows us to run this code in a non-Electron environment, e.g. Node.js Mocha test suite. commit 710b22438df25c8d5e8431845a035c55ec8fc0b7 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 11:46:13 2018 -0500 🔤 npm scripts commit 9ae22937fbce078f91443023b560b3c0468c1380 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 11:45:30 2018 -0500 Use 2-space indendation for `app` module tests commit 22c26baf6159bd2e1f5a787c10e2260f09395329 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 11:22:55 2018 -0500 Prefer named exports commit 9c9526195266ac77ac2ca04135a1e675f617dfd2 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 11:22:46 2018 -0500 🔤 Organize `require`s commit 2f144d24d9e9a9ef72fe418996e3c911b304b00a Author: Daniel Gasienica <daniel@gasienica.ch> Date: Tue Feb 27 11:13:50 2018 -0500 Remove existing global hamburger menu This will be replaced by a OS-level ‘Preferences’ menu. commit f5adb374cb742e5f319ececda8ab6d8adee88d7e Author: Daniel Gasienica <daniel@gasienica.ch> Date: Mon Feb 26 18:40:54 2018 -0500 Remove ‘Restart Signal’ menu from settings Apparently, this is a remnant from the Chrome web application. commit d7a206bc8e67ef44022085e804ca040ed1b219f7 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Mon Feb 26 17:16:49 2018 -0500 Clarify label for starting a new conversation When user a enters a number that is not a contact, we prompt them to start a new conversation. commit 715a4064367fb61d85c1a4f9d48261b2ce002435 Author: Daniel Gasienica <daniel@gasienica.ch> Date: Mon Feb 26 16:46:26 2018 -0500 Use ‘Enter name or number’ as prompt’ This follows implementation of Android and recommendation from Alissa.
283 lines
8.1 KiB
JavaScript
283 lines
8.1 KiB
JavaScript
/* global ConversationController: false */
|
|
/* global extension: false */
|
|
/* global getInboxCollection: false */
|
|
/* global i18n: false */
|
|
/* global Whisper: false */
|
|
|
|
// eslint-disable-next-line func-names
|
|
(function () {
|
|
'use strict';
|
|
|
|
window.Whisper = window.Whisper || {};
|
|
|
|
Whisper.ConversationStack = Whisper.View.extend({
|
|
className: 'conversation-stack',
|
|
open(conversation) {
|
|
const id = `conversation-${conversation.cid}`;
|
|
if (id !== this.el.firstChild.id) {
|
|
this.$el.first().find('video, audio').each(function pauseMedia() {
|
|
this.pause();
|
|
});
|
|
let $el = this.$(`#${id}`);
|
|
if ($el === null || $el.length === 0) {
|
|
const view = new Whisper.ConversationView({
|
|
model: conversation,
|
|
window: this.model.window,
|
|
});
|
|
// eslint-disable-next-line prefer-destructuring
|
|
$el = view.$el;
|
|
}
|
|
$el.prependTo(this.el);
|
|
conversation.trigger('opened');
|
|
}
|
|
},
|
|
});
|
|
|
|
Whisper.FontSizeView = Whisper.View.extend({
|
|
defaultSize: 14,
|
|
maxSize: 30,
|
|
minSize: 14,
|
|
initialize() {
|
|
this.currentSize = this.defaultSize;
|
|
this.render();
|
|
},
|
|
events: { keydown: 'zoomText' },
|
|
zoomText(e) {
|
|
if (!e.ctrlKey) {
|
|
return;
|
|
}
|
|
const keyCode = e.which || e.keyCode;
|
|
const maxSize = 22; // if bigger text goes outside send-message textarea
|
|
const minSize = 14;
|
|
if (keyCode === 189 || keyCode === 109) {
|
|
if (this.currentSize > minSize) {
|
|
this.currentSize -= 1;
|
|
}
|
|
} else if (keyCode === 187 || keyCode === 107) {
|
|
if (this.currentSize < maxSize) {
|
|
this.currentSize += 1;
|
|
}
|
|
}
|
|
this.render();
|
|
},
|
|
render() {
|
|
this.$el.css('font-size', `${this.currentSize}px`);
|
|
},
|
|
});
|
|
|
|
|
|
Whisper.AppLoadingScreen = Whisper.View.extend({
|
|
templateName: 'app-loading-screen',
|
|
className: 'app-loading-screen',
|
|
updateProgress(count) {
|
|
if (count > 0) {
|
|
const message = i18n('loadingMessages', count.toString());
|
|
this.$('.message').text(message);
|
|
}
|
|
},
|
|
render_attributes: {
|
|
message: i18n('loading'),
|
|
},
|
|
});
|
|
|
|
Whisper.InboxView = Whisper.View.extend({
|
|
templateName: 'two-column',
|
|
className: 'inbox index',
|
|
initialize(options = {}) {
|
|
this.ready = false;
|
|
this.render();
|
|
this.$el.attr('tabindex', '1');
|
|
|
|
// eslint-disable-next-line no-new
|
|
new Whisper.FontSizeView({ el: this.$el });
|
|
|
|
this.conversation_stack = new Whisper.ConversationStack({
|
|
el: this.$('.conversation-stack'),
|
|
model: { window: options.window },
|
|
});
|
|
|
|
if (!options.initialLoadComplete) {
|
|
this.appLoadingScreen = new Whisper.AppLoadingScreen();
|
|
this.appLoadingScreen.render();
|
|
this.appLoadingScreen.$el.prependTo(this.el);
|
|
this.startConnectionListener();
|
|
}
|
|
|
|
const inboxCollection = getInboxCollection();
|
|
|
|
inboxCollection.on('messageError', () => {
|
|
this.networkStatusView.render();
|
|
});
|
|
|
|
this.inboxListView = new Whisper.ConversationListView({
|
|
el: this.$('.inbox'),
|
|
collection: inboxCollection,
|
|
}).render();
|
|
|
|
this.inboxListView.listenTo(
|
|
inboxCollection,
|
|
'add change:timestamp change:name change:number',
|
|
this.inboxListView.updateLocation
|
|
);
|
|
this.inboxListView.listenTo(
|
|
inboxCollection,
|
|
'remove',
|
|
this.inboxListView.removeItem
|
|
);
|
|
|
|
this.searchView = new Whisper.ConversationSearchView({
|
|
el: this.$('.search-results'),
|
|
input: this.$('input.search'),
|
|
});
|
|
|
|
this.searchView.$el.hide();
|
|
|
|
this.listenTo(this.searchView, 'hide', function toggleVisibility() {
|
|
this.searchView.$el.hide();
|
|
this.inboxListView.$el.show();
|
|
});
|
|
this.listenTo(this.searchView, 'show', function toggleVisibility() {
|
|
this.searchView.$el.show();
|
|
this.inboxListView.$el.hide();
|
|
});
|
|
this.listenTo(
|
|
this.searchView,
|
|
'open',
|
|
this.openConversation.bind(this, null)
|
|
);
|
|
|
|
this.networkStatusView = new Whisper.NetworkStatusView();
|
|
this.$el.find('.network-status-container')
|
|
.append(this.networkStatusView.render().el);
|
|
|
|
extension.windows.onClosed(() => {
|
|
this.inboxListView.stopListening();
|
|
});
|
|
|
|
if (extension.expired()) {
|
|
const banner = new Whisper.ExpiredAlertBanner().render();
|
|
banner.$el.prependTo(this.$el);
|
|
this.$el.addClass('expired');
|
|
}
|
|
},
|
|
render_attributes: {
|
|
welcomeToSignal: i18n('welcomeToSignal'),
|
|
selectAContact: i18n('selectAContact'),
|
|
searchForPeopleOrGroups: i18n('searchForPeopleOrGroups'),
|
|
settings: i18n('settings'),
|
|
},
|
|
events: {
|
|
click: 'onClick',
|
|
'click #header': 'focusHeader',
|
|
'click .conversation': 'focusConversation',
|
|
'select .gutter .conversation-list-item': 'openConversation',
|
|
'input input.search': 'filterContacts',
|
|
'show .lightbox': 'showLightbox',
|
|
},
|
|
startConnectionListener() {
|
|
this.interval = setInterval(() => {
|
|
const status = window.getSocketStatus();
|
|
switch (status) {
|
|
case WebSocket.CONNECTING:
|
|
break;
|
|
case WebSocket.OPEN:
|
|
clearInterval(this.interval);
|
|
// if we've connected, we can wait for real empty event
|
|
this.interval = null;
|
|
break;
|
|
case WebSocket.CLOSING:
|
|
case WebSocket.CLOSED:
|
|
clearInterval(this.interval);
|
|
this.interval = null;
|
|
// if we failed to connect, we pretend we got an empty event
|
|
this.onEmpty();
|
|
break;
|
|
default:
|
|
console.log(
|
|
'Whisper.InboxView::startConnectionListener:',
|
|
'Unknown web socket status:', status
|
|
);
|
|
break;
|
|
}
|
|
}, 1000);
|
|
},
|
|
onEmpty() {
|
|
const view = this.appLoadingScreen;
|
|
if (view) {
|
|
this.appLoadingScreen = null;
|
|
view.remove();
|
|
}
|
|
},
|
|
onProgress(count) {
|
|
const view = this.appLoadingScreen;
|
|
if (view) {
|
|
view.updateProgress(count);
|
|
}
|
|
},
|
|
focusConversation(e) {
|
|
if (e && this.$(e.target).closest('.placeholder').length) {
|
|
return;
|
|
}
|
|
|
|
this.$('#header, .gutter').addClass('inactive');
|
|
this.$('.conversation-stack').removeClass('inactive');
|
|
},
|
|
focusHeader() {
|
|
this.$('.conversation-stack').addClass('inactive');
|
|
this.$('#header, .gutter').removeClass('inactive');
|
|
this.$('.conversation:first .menu').trigger('close');
|
|
},
|
|
reloadBackgroundPage() {
|
|
window.location.reload();
|
|
},
|
|
showSettings() {
|
|
const view = new Whisper.SettingsView();
|
|
view.$el.appendTo(this.el);
|
|
},
|
|
filterContacts(e) {
|
|
this.searchView.filterContacts(e);
|
|
const input = this.$('input.search');
|
|
if (input.val().length > 0) {
|
|
input.addClass('active');
|
|
const textDir = window.getComputedStyle(input[0]).direction;
|
|
if (textDir === 'ltr') {
|
|
input.removeClass('rtl').addClass('ltr');
|
|
} else if (textDir === 'rtl') {
|
|
input.removeClass('ltr').addClass('rtl');
|
|
}
|
|
} else {
|
|
input.removeClass('active');
|
|
}
|
|
},
|
|
openConversation(e, conversation) {
|
|
this.searchView.hideHints();
|
|
if (conversation) {
|
|
this.conversation_stack.open(ConversationController.get(conversation.id));
|
|
this.focusConversation();
|
|
}
|
|
},
|
|
showLightbox(e) {
|
|
this.$el.append(e.target);
|
|
},
|
|
closeRecording(e) {
|
|
if (e && this.$(e.target).closest('.capture-audio').length > 0) {
|
|
return;
|
|
}
|
|
this.$('.conversation:first .recorder').trigger('close');
|
|
},
|
|
onClick(e) {
|
|
this.closeRecording(e);
|
|
},
|
|
});
|
|
|
|
Whisper.ExpiredAlertBanner = Whisper.View.extend({
|
|
templateName: 'expired_alert',
|
|
className: 'expiredAlert clearfix',
|
|
render_attributes() {
|
|
return {
|
|
expiredWarning: i18n('expiredWarning'),
|
|
upgrade: i18n('upgrade'),
|
|
};
|
|
},
|
|
});
|
|
}());
|