gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 00:17:58 +01:00
Code Issues Projects Releases Wiki Activity

Pause at first/last item when wrapping c_<C-f>/c_<C-b>.

Browse Source 
--HG--
extra : rebase_source : 2b981916a1e7be9399571b5b8a8a1c3108d28dab
This commit is contained in:
Kris Maglione
2011-10-03 18:18:11 -04:00
parent 52ae6d04fa
commit 705e481351
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/content/commandline.js
View File

@@ -1754,6 +1754,9 @@ var ItemList = Class("ItemList", {
|| c.hasItems && c.items.length)
.map(this.getGroup, this),
get selected() let (g = this.selectedGroup) g && g.selectedIdx != null &&
[g.context, g.selectedIdx],
getRelativeItem: function getRelativeItem(offset, tuple, noWrap) {
let groups = this.activeGroups;
if (!groups.length)
@@ -1777,7 +1780,7 @@ var ItemList = Class("ItemList", {
start = (group.offsets.start + start + offset);
if (!noWrap)
start %= this.itemCount || 1;
if (start < 0)
if (start < 0 && (!noWrap || arguments[1] === null))
start += this.itemCount;
if (noWrap && offset > 0) {
@@ -1802,7 +1805,26 @@ var ItemList = Class("ItemList", {
},
getRelativePage: function getRelativePage(offset, tuple, noWrap) {
return this.getRelativeItem(offset * this.maxItems, tuple, noWrap);
offset *= this.maxItems;
// Try once with wrapping disabled.
let res = this.getRelativeItem(offset, tuple, true);
if (!res) {
// Wrapped.
let sign = offset / Math.abs(offset);
let off = this.getOffset(tuple === null ? null : tuple || this.selected);
if (off == null)
// Unselected. Defer to getRelativeItem.
res = this.getRelativeItem(offset, null, noWrap);
else if (~[0, this.itemCount - 1].indexOf(off))
// At start or end. Jump to other end.
res = this.getRelativeItem(sign, null, noWrap);
else
// Wrapped. Go to beginning or end.
res = this.getRelativeItem(-sign, null);
}
return res;
},
open: function open(context) {