gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-30 15:03:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix some issues with magically toolbarless popups.

Browse Source 
Update issue 148
This fixes some particular issues with these types of popups, but I
no longer see the original problem (though window.content is
certainly still null).
This commit is contained in:
Kris Maglione
2011-01-13 23:55:51 -05:00
parent 3e4fa31139
commit 7a023373bf
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/commandline.js
View File

@@ -143,7 +143,7 @@ var CommandWidgets = Class("CommandWidgets", {
return this.statusbar; return this.statusbar;
let statusElem = this.statusbar.message; let statusElem = this.statusbar.message;
if (value && statusElem.editor.rootElement.scrollWidth > statusElem.scrollWidth) if (value && statusElem.editor && statusElem.editor.rootElement.scrollWidth > statusElem.scrollWidth)
return this.commandbar; return this.commandbar;
return this.activeGroup.mode; return this.activeGroup.mode;
} }

18
common/content/tabs.js
View File

@@ -55,15 +55,17 @@ var Tabs = Module("tabs", {
if (dactyl.has("Gecko2")) { if (dactyl.has("Gecko2")) {
let node = function node(clas) document.getAnonymousElementByAttribute(tab, "class", clas); let node = function node(clas) document.getAnonymousElementByAttribute(tab, "class", clas);
if (!node("dactyl-tab-number")) { if (!node("dactyl-tab-number")) {
let nodes = {};
let dom = util.xmlToDom(<xul xmlns:xul={XUL} xmlns:html={XHTML}
><xul:hbox highlight="tab-number"><xul:label key="icon" align="center" highlight="TabIconNumber" class="dactyl-tab-icon-number"/></xul:hbox
><xul:hbox highlight="tab-number"><html:div key="label" highlight="TabNumber" class="dactyl-tab-number"/></xul:hbox
></xul>.*, document, nodes);
let img = node("tab-icon-image"); let img = node("tab-icon-image");
img.parentNode.appendChild(dom); if (img) {
tab.__defineGetter__("dactylOrdinal", function () Number(nodes.icon.value)); let nodes = {};
tab.__defineSetter__("dactylOrdinal", function (i) nodes.icon.value = nodes.label.textContent = i); let dom = util.xmlToDom(<xul xmlns:xul={XUL} xmlns:html={XHTML}
><xul:hbox highlight="tab-number"><xul:label key="icon" align="center" highlight="TabIconNumber" class="dactyl-tab-icon-number"/></xul:hbox
><xul:hbox highlight="tab-number"><html:div key="label" highlight="TabNumber" class="dactyl-tab-number"/></xul:hbox
></xul>.*, document, nodes);
img.parentNode.appendChild(dom);
tab.__defineGetter__("dactylOrdinal", function () Number(nodes.icon.value));
tab.__defineSetter__("dactylOrdinal", function (i) nodes.icon.value = nodes.label.textContent = i);
}
} }
} }
tab.setAttribute("dactylOrdinal", i + 1); tab.setAttribute("dactylOrdinal", i + 1);