Merge branch 'master' into plugin-2fa

dev/Common/Audio.js

@@ -1,5 +1,5 @@
 import * as Links from 'Common/Links';
-import { doc } from 'Common/Globals';
+import { doc, SettingsGet } from 'Common/Globals';
 
 let notificator = null,
 	player = null,
@@ -106,11 +106,11 @@ export const SMAudio = new class {
 
 	playNotification(silent) {
 		if ('running' == audioCtx.state && (this.supportedMp3 || this.supportedOgg)) {
-			if (!notificator) {
-				notificator = createNewObject();
-				notificator.src = Links.staticLink('sounds/new-mail.'+ (this.supportedMp3 ? 'mp3' : 'ogg'));
-			}
+			notificator = notificator || createNewObject();
 			if (notificator) {
+				notificator.src = Links.staticLink('sounds/'
+					+ SettingsGet('NotificationSound')
+					+ (this.supportedMp3 ? '.mp3' : '.ogg'));
 				notificator.volume = silent ? 0.01 : 1;
 				notificator.play();
 			}

dev/Common/Links.js

@@ -70,14 +70,6 @@ export function change(email) {
 	return serverRequest('Change') + encodeURIComponent(email) + '/';
 }
 
-/**
- * @param {string} hash
- * @returns {string}
- */
-export function userBackground(hash) {
-	return serverRequestRaw('UserBackground', hash);
-}
-
 /**
  * @param {string} lang
  * @param {boolean} isAdmin

dev/Common/Momentor.js

@@ -1,4 +1,3 @@
-import { doc } from 'Common/Globals';
 import { i18n } from 'Common/Translator';
 
 export function timestampToString(timeStampInUTC, formatStr) {
@@ -53,8 +52,3 @@ export function timeToNode(element, time) {
 		console.error(e);
 	}
 }
-
-addEventListener('reload-time', () => setTimeout(() =>
-	doc.querySelectorAll('[data-bind*="moment:"]').forEach(element => timeToNode(element))
-	, 1)
-);

dev/Common/Selector.js

@@ -1,6 +1,15 @@
 import ko from 'ko';
 import { isArray } from 'Common/Utils';
 
+/*
+	oCallbacks:
+		ItemSelect
+		MiddleClick
+		AutoSelect
+		ItemGetUid
+		UpOrDown
+*/
+
 export class Selector {
 	/**
 	 * @param {koProperty} koList
@@ -209,11 +218,9 @@ export class Selector {
 
 	itemSelected(item) {
 		if (this.isListChecked()) {
-			if (!item) {
-				(this.oCallbacks.onItemSelect || (()=>{}))(item || null);
-			}
+			item || (this.oCallbacks.ItemSelect || (()=>{}))(null);
 		} else if (item) {
-			(this.oCallbacks.onItemSelect || (()=>{}))(item);
+			(this.oCallbacks.ItemSelect || (()=>{}))(item);
 		}
 	}
 
@@ -226,20 +233,32 @@ export class Selector {
 		this.oContentScrollable = contentScrollable;
 
 		if (contentScrollable) {
+			let getItem = selector => {
+				let el = event.target.closestWithin(selector, contentScrollable);
+				return el ? ko.dataFor(el) : null;
+			};
+
 			contentScrollable.addEventListener('click', event => {
 				let el = event.target.closestWithin(this.sItemSelector, contentScrollable);
 				el && this.actionClick(ko.dataFor(el), event);
 
-				el = event.target.closestWithin(this.sItemCheckedSelector, contentScrollable);
-				if (el) {
-					const item = ko.dataFor(el);
+				const item = getItem(this.sItemCheckedSelector);
+				if (item) {
+					if (event.shiftKey) {
+						this.actionClick(item, event);
+					} else {
+						this.focusedItem(item);
+						item.checked(!item.checked());
+					}
+				}
+			});
+
+			contentScrollable.addEventListener('auxclick', event => {
+				if (1 == event.button) {
+					const item = getItem(this.sItemSelector);
 					if (item) {
-						if (event.shiftKey) {
-							this.actionClick(item, event);
-						} else {
-							this.focusedItem(item);
-							item.checked(!item.checked());
-						}
+						this.focusedItem(item);
+						(this.oCallbacks.MiddleClick || (()=>{}))(item);
 					}
 				}
 			});
@@ -271,7 +290,7 @@ export class Selector {
 	 * @returns {boolean}
 	 */
 	autoSelect() {
-		return !!(this.oCallbacks.onAutoSelect || (()=>true))();
+		return !!(this.oCallbacks.AutoSelect || (()=>true))();
 	}
 
 	/**
@@ -281,7 +300,7 @@ export class Selector {
 	getItemUid(item) {
 		let uid = '';
 
-		const getItemUidCallback = this.oCallbacks.onItemGetUid || null;
+		const getItemUidCallback = this.oCallbacks.ItemGetUid || null;
 		if (getItemUidCallback && item) {
 			uid = getItemUidCallback(item);
 		}
@@ -312,7 +331,7 @@ export class Selector {
 					} else if (++i < listLen) {
 						result = list[i];
 					}
-					result || (this.oCallbacks.onUpUpOrDownDown || (()=>true))('ArrowUp' === sEventKey);
+					result || (this.oCallbacks.UpOrDown || (()=>true))('ArrowUp' === sEventKey);
 				} else if ('Home' === sEventKey) {
 					result = list[0];
 				} else if ('End' === sEventKey) {

dev/Common/Translator.js

@@ -140,7 +140,7 @@ export function reload(admin, language) {
 			// reload the data
 			if (init()) {
 				i18nToNodes(doc);
-				dispatchEvent(new CustomEvent('reload-time'));
+				admin || rl.app.reloadTime();
 				trigger(!trigger());
 			}
 			script.remove();