Skip to content

Commit

Permalink
fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
MohammadYounes committed Dec 2, 2019
1 parent abafed6 commit a35ad98
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
28 changes: 15 additions & 13 deletions src/js/dialog/focus.js
Expand Up @@ -89,14 +89,14 @@
if( /*first show */
(target === firstReset && !within) ||
/*focus cycle */
(target === lastReset && lastFocusedElement == firstReset))
return
else if(target === lastReset || target === document.body)
resetTarget = firstReset
else if(target === firstReset && lastFocusedElement == lastReset){
resetTarget = findTabbable(instance)
}else if(target == firstReset && within){
resetTarget = findTabbable(instance, true)
(target === lastReset && lastFocusedElement === firstReset)){
return;
}else if(target === lastReset || target === document.body){
resetTarget = firstReset;
}else if(target === firstReset && lastFocusedElement === lastReset){
resetTarget = findTabbable(instance);
}else if(target === firstReset && within){
resetTarget = findTabbable(instance, true);
}
// focus
setFocus(instance, resetTarget);
Expand All @@ -105,18 +105,20 @@
}
function findTabbable(instance, last){
var tabbables = [].slice.call(instance.elements.dialog.querySelectorAll(defaults.tabbable));
last && tabbables.reverse()
for(var x=0;x<tabbables.length;x++){
var tabbable = tabbables[x]
if(last){
tabbables.reverse();
}
for(var x=0;x<tabbables.length;x+=1){
var tabbable = tabbables[x];
//check if visible
if(!!(tabbable.offsetParent || tabbable.offsetWidth || tabbable.offsetHeight || tabbable.getClientRects().length)){
return tabbable
return tabbable;
}
}
}
function recycleTab(event) {
var instance = openDialogs[openDialogs.length - 1];
if (instance && event.shiftKey && event.keyCode === keys.TAB) {
instance.elements.reset[1].focus()
instance.elements.reset[1].focus();
}
}
18 changes: 9 additions & 9 deletions src/js/event.js
@@ -1,15 +1,15 @@
/**
* Test to check if passive event listeners are supported.
*/
var IsPassiveSupported = false
var IsPassiveSupported = false;
try {
var options = Object.defineProperty({}, 'passive', {
get: function () {
IsPassiveSupported = true
IsPassiveSupported = true;
}
})
window.addEventListener('test', options, options)
window.removeEventListener('test', options, options)
});
window.addEventListener('test', options, options);
window.removeEventListener('test', options, options);
} catch (e) {}

/**
Expand All @@ -22,8 +22,8 @@
* @param {boolean} passive A Boolean which, if true, indicates that the function specified by listener will never call preventDefault().
*/
var on = function (el, event, fn, useCapture, passive) {
el.addEventListener(event, fn, IsPassiveSupported ? { capture: useCapture, passive: passive } : useCapture === true)
}
el.addEventListener(event, fn, IsPassiveSupported ? { capture: useCapture, passive: passive } : useCapture === true);
};

/**
* Removes an event listener
Expand All @@ -35,8 +35,8 @@
* @param {boolean} passive A Boolean which, if true, indicates that the function specified by listener will never call preventDefault().
*/
var off = function (el, event, fn, useCapture, passive) {
el.removeEventListener(event, fn, IsPassiveSupported ? { capture: useCapture, passive: passive } : useCapture === true)
}
el.removeEventListener(event, fn, IsPassiveSupported ? { capture: useCapture, passive: passive } : useCapture === true);
};

/**
* Prevent default event from firing
Expand Down

0 comments on commit a35ad98

Please sign in to comment.