r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

alt + shift + # switchs dialogs. Improved scrollToDialog. Fix #768.

Browse Source
This commit is contained in:
Abel 'Akronix' Serrano Juste 2015-04-21 22:19:08 +02:00
parent 9734a41304
commit 5c31574883
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/js/directives.js
View File

@ -588,7 +588,22 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
return cancelEvent(e); return cancelEvent(e);
} }
if ( e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey &&
e.keyCode >= 49 && e.keyCode <= 57 ) { // Alt + Shift + # , switch to conversation # where # is in [1..9]
var dialogNumber = e.keyCode - 49,
dialogWraps = $(scrollableWrap).find('.im_dialog_wrap'),
nextDialogWrap = dialogWraps[dialogNumber];
if (nextDialogWrap) {
$(nextDialogWrap).find('a').trigger('mousedown');
scrollToDialog(nextDialogWrap);
}
return cancelEvent(e);
}
var next, prev, skip, ctrlTabSupported = Config.Modes.packed; var next, prev, skip, ctrlTabSupported = Config.Modes.packed;
if (e.keyCode == 40 || e.keyCode == 38) { // UP, DOWN if (e.keyCode == 40 || e.keyCode == 38) { // UP, DOWN
next = e.keyCode == 40; next = e.keyCode == 40;
@ -600,6 +615,7 @@ angular.module('myApp.directives', ['myApp.filters'])
prev = !next; prev = !next;
skip = true; skip = true;
} }
if (next || prev) { if (next || prev) {
if (!skip && (!searchFocused || e.metaKey)) { if (!skip && (!searchFocused || e.metaKey)) {
return true; return true;
@ -650,16 +666,16 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
function scrollToDialog(dialogWrap) { function scrollToDialog(dialogWrap) {
var elTop = dialogWrap.offsetTop, var elTop = dialogWrap.offsetTop - 15,
elHeight = dialogWrap.offsetHeight, elHeight = dialogWrap.offsetHeight + 30,
scrollTop = scrollableWrap.scrollTop, scrollTop = scrollableWrap.scrollTop,
viewportHeight = scrollableWrap.clientHeight; viewportHeight = scrollableWrap.clientHeight;
if (scrollTop > elTop) { if (scrollTop > elTop) { // we are below the dialog to scroll
scrollableWrap.scrollTop = elTop; scrollableWrap.scrollTop = elTop;
$(dialogsWrap).nanoScroller({flash: true}); $(dialogsWrap).nanoScroller({flash: true});
} }
else if (scrollTop < elTop + elHeight - viewportHeight) { else if (scrollTop < elTop + elHeight - viewportHeight) { // we are over the dialog to scroll
scrollableWrap.scrollTop = elTop + elHeight - viewportHeight; scrollableWrap.scrollTop = elTop + elHeight - viewportHeight;
$(dialogsWrap).nanoScroller({flash: true}); $(dialogsWrap).nanoScroller({flash: true});
} }
@ -2932,4 +2948,4 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
}; };
}) })