gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-21 13:45:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix <C-d> and <C-u> permanently setting the 'scroll' option.

Browse Source 
The behaviour was undocumented and undesirable, as there was no way to reset
the option by supplying a 0 argument to the commands.
This commit is contained in:
Štěpán Němec
2011-11-14 12:52:08 +01:00
parent ac7c2b88e1
commit 5fcd2a4d32
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/modules/buffer.jsm
View File

@@ -679,29 +679,23 @@ var Buffer = Module("Buffer", {
scrollToPosition: function scrollToPosition(horizontal, vertical) scrollToPosition: function scrollToPosition(horizontal, vertical)
Buffer.scrollToPosition(this.findScrollable(0, vertical == null), horizontal, vertical), Buffer.scrollToPosition(this.findScrollable(0, vertical == null), horizontal, vertical),
_scrollByScrollSize: function _scrollByScrollSize(count, direction) {
let { options } = this.modules;
if (count > 0)
options["scroll"] = count;
this.scrollByScrollSize(direction);
},
/** /**
* Scrolls the buffer vertically 'scroll' lines. * Scrolls the buffer vertically 'scroll' or *count* lines.
* *
* @param {number} count The number of lines to scroll. When 0, use the
* 'scroll' option value.
* @param {boolean} direction The direction to scroll. If true then * @param {boolean} direction The direction to scroll. If true then
* scroll up and if false scroll down. * scroll up and if false scroll down.
* @param {number} count The multiple of 'scroll' lines to scroll.
* @optional * @optional
*/ */
scrollByScrollSize: function scrollByScrollSize(direction, count) { scrollByScrollSize: function scrollByScrollSize(count, direction) {
let { options } = this.modules; let { options } = this.modules;
direction = direction ? 1 : -1; direction = direction ? 1 : -1;
count = count || 1;
if (options["scroll"] > 0) if (count > 0)
this.scrollVertical("lines", count * direction);
else if (options["scroll"] > 0)
this.scrollVertical("lines", options["scroll"] * direction); this.scrollVertical("lines", options["scroll"] * direction);
else else
this.scrollVertical("pages", direction / 2); this.scrollVertical("pages", direction / 2);
@@ -1937,12 +1931,12 @@ var Buffer = Module("Buffer", {
mappings.add([modes.NORMAL], ["<C-d>", "<scroll-down>"], mappings.add([modes.NORMAL], ["<C-d>", "<scroll-down>"],
"Scroll window downwards in the buffer", "Scroll window downwards in the buffer",
function (args) { buffer._scrollByScrollSize(args.count, true); }, function (args) { buffer.scrollByScrollSize(args.count, true); },
{ count: true }); { count: true });
mappings.add([modes.NORMAL], ["<C-u>", "<scroll-up>"], mappings.add([modes.NORMAL], ["<C-u>", "<scroll-up>"],
"Scroll window upwards in the buffer", "Scroll window upwards in the buffer",
function (args) { buffer._scrollByScrollSize(args.count, false); }, function (args) { buffer.scrollByScrollSize(args.count, false); },
{ count: true }); { count: true });
mappings.add([modes.NORMAL], ["<C-b>", "<PageUp>", "<S-Space>", "<scroll-up-page>"], mappings.add([modes.NORMAL], ["<C-b>", "<PageUp>", "<S-Space>", "<scroll-up-page>"],