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

Fix '' for a subset of cases.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-13 12:22:46 -05:00
parent 0de4c844ef
commit 77e8bc5f65
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/buffer.js
View File

@@ -1140,6 +1140,9 @@ var Buffer = Module("buffer", {
}, },
scrollTo: function scrollTo(elem, left, top) { scrollTo: function scrollTo(elem, left, top) {
// Temporary hack. Should be done better.
if (elem.ownerDocument == buffer.focusedFrame.document)
marks.add("'");
if (left != null) if (left != null)
elem.scrollLeft = left; elem.scrollLeft = left;
if (top != null) if (top != null)

3
common/content/dactyl.js
View File

@@ -595,8 +595,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
let info = context.INFO; let info = context.INFO;
if (info.*.@lang.length()) { if (info.*.@lang.length()) {
let langs = set(String(a) for each (a in info.*.@lang)); let langs = set(String(a) for each (a in info.*.@lang));
let lang = [window.navigator.language, let lang = [config.language, config.language.replace(/-.*/, ""),
window.navigator.language.replace(/-.*/, ""),
"en", "en-US", info.*.@lang[0] "en", "en-US", info.*.@lang[0]
].filter(function (l) set.has(langs, l))[0]; ].filter(function (l) set.has(langs, l))[0];

2
common/content/marks.js
View File

@@ -201,7 +201,7 @@ var Marks = Module("marks", {
(tab ? ", tab: " + tabs.index(tab) : ""); (tab ? ", tab: " + tabs.index(tab) : "");
}, },
isLocalMark: function isLocalMark(mark) /^[a-z]$/.test(mark), isLocalMark: function isLocalMark(mark) /^[a-z`']$/.test(mark),
isURLMark: function isURLMark(mark) /^[A-Z]$/.test(mark) isURLMark: function isURLMark(mark) /^[A-Z]$/.test(mark)
}, { }, {

2
common/modules/config.jsm
View File

@@ -55,6 +55,8 @@ var ConfigBase = Class("ConfigBase", {
return addon; return addon;
}), }),
language: Class.memoize(function () services.chromeRegistry.getSelectedLocale("dactyl")),
/** @property {string} The Dactyl version string. */ /** @property {string} The Dactyl version string. */
version: Class.memoize(function () { version: Class.memoize(function () {
if (/pre$/.test(this.addon.version)) { if (/pre$/.test(this.addon.version)) {

1
common/modules/services.jsm
View File

@@ -29,6 +29,7 @@ var Services = Module("Services", {
this.add("browserSearch", "@mozilla.org/browser/search-service;1", Ci.nsIBrowserSearchService); this.add("browserSearch", "@mozilla.org/browser/search-service;1", Ci.nsIBrowserSearchService);
this.add("cache", "@mozilla.org/network/cache-service;1", Ci.nsICacheService); this.add("cache", "@mozilla.org/network/cache-service;1", Ci.nsICacheService);
this.add("charset", "@mozilla.org/charset-converter-manager;1", Ci.nsICharsetConverterManager); this.add("charset", "@mozilla.org/charset-converter-manager;1", Ci.nsICharsetConverterManager);
this.add("chromeRegistry", "@mozilla.org/chrome/chrome-registry;1", Ci.nsIXULChromeRegistry);
this.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=dactyl"); this.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=dactyl");
this.add("console", "@mozilla.org/consoleservice;1", Ci.nsIConsoleService); this.add("console", "@mozilla.org/consoleservice;1", Ci.nsIConsoleService);
this.add("dactyl:", "@mozilla.org/network/protocol;1?name=dactyl"); this.add("dactyl:", "@mozilla.org/network/protocol;1?name=dactyl");