1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 14:27:59 +01:00

Fix wheel scrolling in the MOW.

--HG--
extra : transplant_source : %BD%8C6%3DN%BB%CF%BB%9C.%1Cc%D7vpV%A2v%C3%06
This commit is contained in:
Kris Maglione
2011-01-24 09:21:31 -05:00
parent 08104aee80
commit 2df1de7ad1
5 changed files with 12 additions and 8 deletions

View File

@@ -12,6 +12,7 @@ var CommandWidgets = Class("CommandWidgets", {
init: function () { init: function () {
let _status = "dactyl-statusline-field-"; let _status = "dactyl-statusline-field-";
XML.ignoreWhitespace = true;
util.overlayWindow(window, { util.overlayWindow(window, {
append: <e4x xmlns={XUL} xmlns:dactyl={NS}> append: <e4x xmlns={XUL} xmlns:dactyl={NS}>
<window id={document.documentElement.id}> <window id={document.documentElement.id}>
@@ -166,10 +167,9 @@ var CommandWidgets = Class("CommandWidgets", {
let fontSize = util.computedStyle(document.documentElement).fontSize; let fontSize = util.computedStyle(document.documentElement).fontSize;
styles.registerSheet("resource://dactyl-skin/dactyl.css"); styles.registerSheet("resource://dactyl-skin/dactyl.css");
styles.system.add("font-size", "dactyl://content/buffer.xhtml", styles.system.add("font-size", "dactyl://content/buffer.xhtml",
"body { font-size: " + fontSize + "; }"); "body { font-size: " + fontSize + "; } \
}, html|html > xul|scrollbar { visibility: collapse !important; }",
cleanup: function cleanup() { true);
styles.unregisterSheet("resource://dactyl-skin/dactyl.css");
}, },
addElement: function (obj) { addElement: function (obj) {
const self = this; const self = this;
@@ -474,6 +474,9 @@ var CommandLine = Module("commandline", {
dactyl.trapErrors(callback, self, value != null ? value : commandline.command); dactyl.trapErrors(callback, self, value != null ? value : commandline.command);
} }
}, },
cleanup: function cleanup() {
styles.unregisterSheet("resource://dactyl-skin/dactyl.css");
},
/** /**
* Determines whether the command line should be visible. * Determines whether the command line should be visible.

View File

@@ -212,6 +212,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
bell: document.getElementById("dactyl-bell"), bell: document.getElementById("dactyl-bell"),
strut: document.getElementById("dactyl-bell-strut") strut: document.getElementById("dactyl-bell-strut")
} }
XML.ignoreWhitespace = true;
if (!elems.bell) if (!elems.bell)
util.overlayWindow(window, { util.overlayWindow(window, {
objects: elems, objects: elems,

View File

@@ -39,6 +39,7 @@ var StatusLine = Module("statusline", {
]]>)({ padding: util.OS.isMacOSX ? "padding-right: 10px !important;" : "" })); ]]>)({ padding: util.OS.isMacOSX ? "padding-right: 10px !important;" : "" }));
} }
XML.ignoreWhitespace = true;
let _commandline = "if (window.dactyl) return dactyl.modules.commandline"; let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}> let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
<statusbar id="status-bar" highlight="StatusLine"> <statusbar id="status-bar" highlight="StatusLine">

View File

@@ -83,14 +83,14 @@ var actions = {
enable: { enable: {
name: "exte[nable]", name: "exte[nable]",
description: "Enable an extension", description: "Enable an extension",
action: function (addon) addon.userDisabled = false, action: function (addon) { addon.userDisabled = false; },
filter: function ({ item }) item.userDisabled, filter: function ({ item }) item.userDisabled,
perm: "enable" perm: "enable"
}, },
disable: { disable: {
name: "extd[isable]", name: "extd[isable]",
description: "Disable an extension", description: "Disable an extension",
action: function (addon) addon.userDisabled = true, action: function (addon) { addon.userDisabled = true; },
filter: function ({ item }) !item.userDisabled, filter: function ({ item }) !item.userDisabled,
perm: "disable" perm: "disable"
}, },
@@ -125,7 +125,7 @@ var actions = {
toggle: { toggle: {
name: "extt[oggle]", name: "extt[oggle]",
description: "Toggle an extension's enabled status", description: "Toggle an extension's enabled status",
action: function (addon) addon.userDisabled = !addon.userDisabled action: function (addon) { addon.userDisabled = !addon.userDisabled; }
}, },
update: { update: {
name: "extu[pdate]", name: "extu[pdate]",

View File

@@ -187,7 +187,6 @@ statusbarpanel {
.dactyl-completions, .dactyl-completions,
#dactyl-multiline-output, #dactyl-multiline-output,
#dactyl-multiline-input { #dactyl-multiline-input {
overflow: hidden;
background-color: white; background-color: white;
color: black; color: black;
} }