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

Disable tab numbers on Gecko<2 again.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-15 16:32:19 -05:00
parent 14ec281811
commit ac3845feb2
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/content/dactyl.js
View File

@@ -242,31 +242,25 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
* @returns {string}
*/
clipboardRead: function clipboardRead(getClipboard) {
let str = null;
try {
const clipboard = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
const transferable = Cc["@mozilla.org/widget/transferable;1"].createInstance(Ci.nsITransferable);
transferable.addDataFlavor("text/unicode");
if (!getClipboard && clipboard.supportsSelectionClipboard())
clipboard.getData(transferable, clipboard.kSelectionClipboard);
else
clipboard.getData(transferable, clipboard.kGlobalClipboard);
let source = clipboard[getClipboard || !clipboard.supportsSelectionClipboard() ?
"kSelectionClipboard" : "kGlobalClipboard"];
clipboard.getData(transferable, source);
let data = {};
let dataLen = {};
let str = {}, len = {};
transferable.getTransferData("text/unicode", str, len);
transferable.getTransferData("text/unicode", data, dataLen);
if (data) {
data = data.value.QueryInterface(Ci.nsISupportsString);
str = data.data.substring(0, dataLen.value / 2);
}
if (str)
return str.value.QueryInterface(Ci.nsISupportsString)
.data.substr(0, len.value / 2);
}
catch (e) {}
return str;
return null;
},
/**
@@ -1369,7 +1363,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}
if (config.tabbrowser.tabContainer._positionPinnedTabs)
config.tabbrowser.tabContainer._positionPinnedTabs();
}
},
validator: function (opts) dactyl.has("Gecko2") ||
Option.validIf(!/[nN]/.test(opts), "Tab numbering not available in this " + config.host + " version")
}
].filter(function (group) !group.feature || dactyl.has(group.feature));