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

minor refactoring of incrementURL() and <C-x>/<C-a> mappings

Browse Source
This commit is contained in:
Doug Kearns
2007-11-29 12:44:46 +00:00
parent c3f142b07d
commit d9acf8c24b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
content/mappings.js
View File

@@ -847,25 +847,25 @@ vimperator.Mappings = function () //{{{
var url = vimperator.buffer.URL; var url = vimperator.buffer.URL;
var regex = /(.*?)(-?\d+)(\D*)$/; var regex = /(.*?)(-?\d+)(\D*)$/;
var res = url.match(regex); var matches = url.match(regex);
if (!res || !res[2]) // no number to increment if (!matches || !matches[2]) // no number to increment
{ {
vimperator.beep(); vimperator.beep();
return; return;
} }
var newNum = parseInt(res[2], 10) + count + ""; // "" to make sure its a string var newNum = parseInt(matches[2], 10) + count + ""; // "" to make sure its a string
var nums = newNum.match(/^(-?)(\d+)$/); var nums = newNum.match(/^(-?)(\d+)$/);
var oldLength = res[2].replace(/-/, "").length, newLength = nums[2].length; var oldLength = matches[2].replace(/-/, "").length, newLength = nums[2].length;
newNum = nums[1] || ""; newNum = nums[1] || "";
for (let i = 0; i < oldLength - newLength; i++) for (let i = 0; i < oldLength - newLength; i++)
newNum += "0"; // keep leading zeros newNum += "0"; // keep leading zeros
newNum += nums[2]; newNum += nums[2];
vimperator.open(res[1] + newNum + res[3]); vimperator.open(matches[1] + newNum + matches[3]);
} }
addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-x>"], addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-x>"],
function (count) { if (count < 1) count = 1; incrementURL(-count); }, function (count) { incrementURL(-(count > 1 ? count : 1)); },
{ {
shortHelp: "Decrement last number in URL", shortHelp: "Decrement last number in URL",
help: "Decrements the last number in URL by 1, or by <code class=\"argument\">count</code> if given.", help: "Decrements the last number in URL by 1, or by <code class=\"argument\">count</code> if given.",
@@ -873,7 +873,7 @@ vimperator.Mappings = function () //{{{
} }
)); ));
addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-a>"], addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-a>"],
function (count) { if (count < 1) count = 1; incrementURL(count); }, function (count) { incrementURL(count > 1 ? count : 1); },
{ {
shortHelp: "Increment last number in URL", shortHelp: "Increment last number in URL",
help: "Increments the last number in URL by 1, or by <code class=\"argument\">count</code> if given.", help: "Increments the last number in URL by 1, or by <code class=\"argument\">count</code> if given.",