mirror/webslides
1
0
Fork 0
mirror of https://github.com/webslides/WebSlides.git synced 2025-08-22 21:03:23 +02:00
Code Issues Releases Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Antonio Laguna
2017-03-12 23:01:41 +01:00
parent 94f21e7232
commit f8340bd821
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/plugins/keyboard.js
View File

@@ -1,4 +1,5 @@
import Keys from '../utils/keys';
import DOM from '../utils/dom';
/**
* Keyboard plugin.
@@ -28,16 +29,8 @@ export default class Keyboard {
let method;
let argument;
// Check if there's a focused element that might use the keyboard.
if (document.activeElement) {
const isContentEditable = document.activeElement
.contentEditable !== 'inherit';
const isInput = ['INPUT', 'SELECT', 'OPTION', 'TEXTAREA']
.indexOf(document.activeElement.tagName) > -1;
if (isInput || isContentEditable) {
return;
}
if (DOM.isFocusableElement()) {
return;
}
switch (event.which) {

21
src/js/utils/dom.js
View File

@@ -144,4 +144,25 @@ export default class DOM {
static toArray(iterable) {
return [].slice.call(iterable);
}
/**
* Checks whether the document has focus on an input or contenteditable
* element.
* @return {boolean} Whether the focused element is an input or content
* editable.
*/
static isFocusableElement() {
let result = false;
if (document.activeElement) {
const isContentEditable = document.activeElement
.contentEditable !== 'inherit';
const isInput = ['INPUT', 'SELECT', 'OPTION', 'TEXTAREA']
.indexOf(document.activeElement.tagName) > -1;
result = isInput || isContentEditable;
}
return result;
}
}