aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Crosby2012-05-05 16:49:53 -0700
committerPhil Crosby2012-05-05 18:32:14 -0700
commit6451f8a8a35cbe81796032f0777f8c632a00a510 (patch)
tree01c0eb1e3ee442d3c2adcebc02f7588f8e2d46a2
parenteeff98bceaa20c2592feca7f84d5c683543e87bd (diff)
downloadvimium-6451f8a8a35cbe81796032f0777f8c632a00a510.tar.bz2
Rename func => functionName
-rw-r--r--fuzzyMode.js2
-rw-r--r--lib/completion.js10
2 files changed, 6 insertions, 6 deletions
diff --git a/fuzzyMode.js b/fuzzyMode.js
index 91fca8de..fe5b542a 100644
--- a/fuzzyMode.js
+++ b/fuzzyMode.js
@@ -183,7 +183,7 @@ var fuzzyMode = (function() {
this.filterPort.onMessage.addListener(function(msg) {
if (msg.id != id) return;
callback(msg.results.map(function(result) {
- var functionToCall = eval(result.action.func);
+ var functionToCall = eval(result.action.functionName);
result.performAction = functionToCall.curry(result.action.args);
return result;
}));
diff --git a/lib/completion.js b/lib/completion.js
index 00ae526f..de69dc90 100644
--- a/lib/completion.js
+++ b/lib/completion.js
@@ -21,7 +21,7 @@ var completion = (function() {
var url = item.url;
var parts = [type, url, item.title];
var str = parts.join(" ");
- action = action || { func: "navigateToUrl", args: [url] };
+ action = action || { functionName: "navigateToUrl", args: [url] };
function createLazyCompletion(query) {
return new LazyCompletion(url.length / fuzzyMatcher.calculateRelevancy(query, str), function() {
@@ -87,7 +87,7 @@ var completion = (function() {
return new LazyCompletion(-2, function() {
return {
html: createCompletionHtml(desc, term),
- action: { func: "navigateToUrl", args: [utils.createFullUrl(url)] },
+ action: { functionName: "navigateToUrl", args: [utils.createFullUrl(url)] },
}})
}.proxy(this));
},
@@ -101,7 +101,7 @@ var completion = (function() {
return new LazyCompletion(-1, function() {
return {
html: createCompletionHtml(isUrl ? "goto" : "search", query),
- action: { func: "navigateToUrl",
+ action: { functionName: "navigateToUrl",
args: isUrl ? [utils.createFullUrl(query)] : [utils.createSearchUrl(query)] }
}});
},
@@ -175,7 +175,7 @@ var completion = (function() {
chrome.tabs.getAllInWindow(null, function(tabs) {
this.asyncCompleter.resultsReady(tabs.map(function(tab) {
return this.asyncCompleter.createInternalMatch("tab", tab,
- { func: "switchToTab", args: [tab.id] });
+ { functionName: "switchToTab", args: [tab.id] });
}.proxy(this)));
}.proxy(this));
}
@@ -245,7 +245,7 @@ var completion = (function() {
best = new LazyCompletion(-1.5, function() {
return {
html: createCompletionHtml("site", domain),
- action: { func: "navigateToUrl", args: [protocol + "://" + domain] },
+ action: { functionName: "navigateToUrl", args: [protocol + "://" + domain] },
}});
});
});