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

move getMapLeader() to liberator.Mappings

Browse Source
This commit is contained in:
Doug Kearns
2008-09-11 16:39:29 +00:00
parent eda172d8c2
commit fefa6e4609
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/events.js
View File

@@ -948,12 +948,6 @@ liberator.Events = function () //{{{
return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>"); return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
}, },
getMapLeader: function ()
{
var leaderRef = liberator.variableReference("mapleader");
return leaderRef[0] ? leaderRef[0][leaderRef[1]] : "\\";
},
// argument "event" is delibarately not used, as i don't seem to have // argument "event" is delibarately not used, as i don't seem to have
// access to the real focus target // access to the real focus target
// //

4
content/hints.js
View File

@@ -71,7 +71,7 @@ liberator.Hints = function () //{{{
function updateStatusline() function updateStatusline()
{ {
liberator.statusline.updateInputBuffer((escapeNumbers ? liberator.events.getMapLeader() + " ": "") + // sign for escapeNumbers liberator.statusline.updateInputBuffer((escapeNumbers ? liberator.mappings.getMapLeader() + " " : "") + // sign for escapeNumbers
(hintString ? "\"" + hintString + "\"" : "") + (hintString ? "\"" + hintString + "\"" : "") +
(hintNumber > 0 ? " <" + hintNumber + ">" : "")); (hintNumber > 0 ? " <" + hintNumber + ">" : ""));
} }
@@ -752,7 +752,7 @@ liberator.Hints = function () //{{{
hintNumber = 0; hintNumber = 0;
break; break;
case liberator.events.getMapLeader(): case liberator.mappings.getMapLeader():
escapeNumbers = !escapeNumbers; escapeNumbers = !escapeNumbers;
if (escapeNumbers && usedTabKey) // hintNumber not used normally, but someone may wants to toggle if (escapeNumbers && usedTabKey) // hintNumber not used normally, but someone may wants to toggle
hintNumber = 0; // <tab>s ? reset. Prevent to show numbers not entered. hintNumber = 0; // <tab>s ? reset. Prevent to show numbers not entered.

4
content/io.js
View File

@@ -242,8 +242,8 @@ liberator.IO = function () //{{{
for (var abbrCmd in liberator.editor.abbreviations) for (var abbrCmd in liberator.editor.abbreviations)
line += abbrCmd; line += abbrCmd;
// if (liberator.events.getMapLeader() != "\\") // if (liberator.mappings.getMapLeader() != "\\")
// line += "\nlet mapleader = \"" + liberator.events.getMapLeader() + "\"\n"; // line += "\nlet mapleader = \"" + liberator.mappings.getMapLeader() + "\"\n";
// source a user .vimperatorrc file // source a user .vimperatorrc file
line += "\nsource! " + filename + ".local\n"; line += "\nsource! " + filename + ".local\n";

8
content/mappings.js
View File

@@ -130,7 +130,7 @@ liberator.Mappings = function () //{{{
function expandLeader(keyString) function expandLeader(keyString)
{ {
var leaderRegexp = /<Leader>/i; var leaderRegexp = /<Leader>/i;
var currentLeader = liberator.events.getMapLeader(); var currentLeader = liberator.mappings.getMapLeader();
return keyString.replace(leaderRegexp, currentLeader); return keyString.replace(leaderRegexp, currentLeader);
} }
@@ -345,6 +345,12 @@ liberator.Mappings = function () //{{{
return matches; return matches;
}, },
getMapLeader: function ()
{
var leaderRef = liberator.variableReference("mapleader");
return leaderRef[0] ? leaderRef[0][leaderRef[1]] : "\\";
},
// returns whether the user added a custom user map // returns whether the user added a custom user map
hasMap: function (mode, cmd) hasMap: function (mode, cmd)
{ {