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

Make Melodactyl minimally functional. Closes issue #340.

Browse Source 
--HG--
rename : pentadactyl/chrome.manifest => common/chrome.manifest
This commit is contained in:
Kris Maglione
2011-02-22 10:01:56 -05:00
parent d92f3f2c9c
commit 8299257422
13 changed files with 259 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
common/content/bookmarks.js
View File

@@ -263,63 +263,56 @@ var Bookmarks = Module("bookmarks", {
* @returns {[string, string | null] | null}
*/
getSearchURL: function getSearchURL(text, useDefsearch) {
let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
let query = (useDefsearch ? options["defsearch"] + " " : "") + text;
// ripped from Firefox
function getShortcutOrURI(url) {
var keyword = url;
var param = "";
var offset = url.indexOf(" ");
if (offset > 0) {
keyword = url.substr(0, offset);
param = url.substr(offset + 1);
}
var engine = bookmarks.searchEngines[keyword];
if (engine) {
if (engine.searchForm && !param)
return [engine.searchForm, null];
let submission = engine.getSubmission(param, null);
return [submission.uri.spec, submission.postData];
}
let [shortcutURL, postData] = PlacesUtils.getURLAndPostDataForKeyword(keyword);
if (!shortcutURL)
return [url, null];
let bmark = bookmarkcache.keywords[keyword];
let data = window.unescape(postData || "");
if (/%s/i.test(shortcutURL) || /%s/i.test(data)) {
var charset = "";
var matches = shortcutURL.match(/^(.*)\&mozcharset=([a-zA-Z][_\-a-zA-Z0-9]+)\s*$/);
if (matches)
[, shortcutURL, charset] = matches;
else
try {
charset = services.history.getCharsetForURI(util.newURI(shortcutURL));
}
catch (e) {}
if (charset)
var encodedParam = escape(window.convertFromUnicode(charset, param));
else
encodedParam = bmark.encodeURIComponent(param);
shortcutURL = shortcutURL.replace(/%s/g, encodedParam).replace(/%S/g, param);
if (/%s/i.test(data))
postData = window.getPostDataStream(data, param, encodedParam, "application/x-www-form-urlencoded");
}
else if (param)
return [shortcutURL, null];
return [shortcutURL, postData];
var keyword = query;
var param = "";
var offset = query.indexOf(" ");
if (offset > 0) {
keyword = query.substr(0, offset);
param = query.substr(offset + 1);
}
let [url, postData] = getShortcutOrURI(searchString);
var engine = bookmarks.searchEngines[keyword];
if (engine) {
if (engine.searchForm && !param)
return engine.searchForm;
let submission = engine.getSubmission(param, null);
return [submission.uri.spec, submission.postData];
}
if (url == searchString)
let [url, postData] = PlacesUtils.getURLAndPostDataForKeyword(keyword);
if (!url)
return null;
let data = window.unescape(postData || "");
if (/%s/i.test(url) || /%s/i.test(data)) {
var charset = "";
var matches = url.match(/^(.*)\&mozcharset=([a-zA-Z][_\-a-zA-Z0-9]+)\s*$/);
if (matches)
[, url, charset] = matches;
else
try {
charset = services.history.getCharsetForURI(util.newURI(url));
}
catch (e) {}
if (charset)
var encodedParam = escape(window.convertFromUnicode(charset, param));
else
encodedParam = bookmarkcache.keywords[keyword].encodeURIComponent(param);
url = url.replace(/%s/g, encodedParam).replace(/%S/g, param);
if (/%s/i.test(data))
postData = window.getPostDataStream(data, param, encodedParam, "application/x-www-form-urlencoded");
}
else if (param)
postData = null;
if (postData)
return [url, postData];
return url; // can be null
return url;
},
/**