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

Don't Be Evil.

Browse Source 
--HG--
rename : pentadactyl/skin/icon.png => pentadactyl/icon16.png
This commit is contained in:
Kris Maglione
2011-09-11 15:06:46 -04:00
parent 68d8bf74df
commit 345cce5a42
8 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/content/buffer.js
View File

@@ -270,9 +270,10 @@ var Buffer = Module("buffer", {
*/
get localStore() {
let doc = content.document;
if (!doc.dactylStore || !buffer.localStorePrototype.isPrototypeOf(doc.dactylStore))
doc.dactylStore = Object.create(buffer.localStorePrototype);
return doc.dactylStore.instance = doc.dactylStore;
let store = overlay.getData(doc, "buffer");
if (!store || !buffer.localStorePrototype.isPrototypeOf(store))
store = overlay.setData(doc, "buffer", Object.create(buffer.localStorePrototype));
return store.instance = store;
},
localStorePrototype: memoize({
@@ -463,7 +464,8 @@ var Buffer = Module("buffer", {
else
flags = services.focus.FLAG_SHOWRING;
if (!elem.dactylHadFocus && elem.value &&
if (!overlay.getData(elem, "had-focus", false) &&
elem.value &&
elem instanceof HTMLInputElement &&
Editor.getEditor(elem) &&
elem.selectionStart != null &&

11
common/content/events.js
View File

@@ -163,10 +163,10 @@ var Events = Module("events", {
if (modes.main != modes.AUTOCOMPLETE)
modes.push(modes.AUTOCOMPLETE);
}
else if (elem.localName !== "tooltip") {
if (Events.isHidden(elem))
if (elem.hidePopup && Events.isHidden(elem.parentNode))
elem.hidePopup();
else if (elem.hidePopup && elem.localName !== "tooltip"
&& Events.isHidden(elem)
&& Events.isHidden(elem.parentNode)) {
elem.hidePopup();
}
},
@@ -420,6 +420,7 @@ var Events = Module("events", {
toString: function toString() {
if (!arguments.length)
return toString.supercall(this);
deprecated.warn(toString, "toString", "DOM.Event.stringify");
return DOM.Event.stringify.apply(DOM.Event, arguments);
},
@@ -584,7 +585,7 @@ var Events = Module("events", {
if (elem == window)
overlay.activeWindow = window;
elem.dactylHadFocus = true;
overlay.setData(elem, "had-focus", true);
if (event.target instanceof Ci.nsIDOMXULTextBoxElement)
if (Events.isHidden(elem, true))
elem.blur();