Convert the hand tool to ES6 syntax

This commit is contained in:
Tim van der Meij 2017-05-07 21:30:07 +02:00
parent 7015c88ce9
commit bc49524ac7
No known key found for this signature in database
GPG Key ID: 8C3FD2925A5F2762

View File

@ -20,20 +20,17 @@ import { localized } from './ui_utils';
* @typedef {Object} HandToolOptions * @typedef {Object} HandToolOptions
* @property {HTMLDivElement} container - The document container. * @property {HTMLDivElement} container - The document container.
* @property {EventBus} eventBus - The application event bus. * @property {EventBus} eventBus - The application event bus.
* @property {BasePreferences} preferences - Object for reading/writing
* persistent settings.
*/ */
/** class HandTool {
* @class
*/
var HandTool = (function HandToolClosure() {
/** /**
* @constructs HandTool
* @param {HandToolOptions} options * @param {HandToolOptions} options
*/ */
function HandTool(options) { constructor({ container, eventBus, preferences, }) {
this.container = options.container; this.container = container;
this.eventBus = options.eventBus; this.eventBus = eventBus;
var preferences = options.preferences;
this.wasActive = false; this.wasActive = false;
@ -46,12 +43,12 @@ var HandTool = (function HandToolClosure() {
this.eventBus.on('togglehandtool', this.toggle.bind(this)); this.eventBus.on('togglehandtool', this.toggle.bind(this));
Promise.all([localized, let enableOnLoad = preferences.get('enableHandToolOnLoad');
preferences.get('enableHandToolOnLoad')]).then((values) => { Promise.all([localized, enableOnLoad]).then((values) => {
if (values[1] === true) { if (values[1] === true) {
this.handTool.activate(); this.handTool.activate();
} }
}).catch(function rejected(reason) { }); }).catch(function(reason) {});
this.eventBus.on('presentationmodechanged', (evt) => { this.eventBus.on('presentationmodechanged', (evt) => {
if (evt.switchInProgress) { if (evt.switchInProgress) {
@ -65,35 +62,31 @@ var HandTool = (function HandToolClosure() {
}); });
} }
HandTool.prototype = { /**
/** * @return {boolean}
* @return {boolean} */
*/ get isActive() {
get isActive() { return !!this.handTool.active;
return !!this.handTool.active; }
},
toggle: function HandTool_toggle() { toggle() {
this.handTool.toggle(); this.handTool.toggle();
}, }
enterPresentationMode: function HandTool_enterPresentationMode() { enterPresentationMode() {
if (this.isActive) { if (this.isActive) {
this.wasActive = true; this.wasActive = true;
this.handTool.deactivate(); this.handTool.deactivate();
}
},
exitPresentationMode: function HandTool_exitPresentationMode() {
if (this.wasActive) {
this.wasActive = false;
this.handTool.activate();
}
} }
}; }
return HandTool; exitPresentationMode() {
})(); if (this.wasActive) {
this.wasActive = false;
this.handTool.activate();
}
}
}
export { export {
HandTool, HandTool,