Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 935561 - [Messaging] Attach icon is kept like pressed when tapping on it and cancel selecting a content to attach. r=fabrice

Browse Source
This commit is contained in:
Vivien Nicolas 2013-11-22 13:45:05 +01:00
parent e9d9f618bc
commit b1b8831091
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/activities/src/ActivityProxy.js
View File

@ -77,10 +77,12 @@ ActivityProxy.prototype = {
debug("FireSuccess"); debug("FireSuccess");
Services.DOMRequest.fireSuccess(this.activity, Services.DOMRequest.fireSuccess(this.activity,
ObjectWrapper.wrap(msg.result, this.window)); ObjectWrapper.wrap(msg.result, this.window));
Services.obs.notifyObservers(null, "Activity:Success", null);
break; break;
case "Activity:FireError": case "Activity:FireError":
debug("FireError"); debug("FireError");
Services.DOMRequest.fireError(this.activity, msg.error); Services.DOMRequest.fireError(this.activity, msg.error);
Services.obs.notifyObservers(null, "Activity:Error", null);
break; break;
} }
// We can only get one FireSuccess / FireError message, so cleanup as soon as possible. // We can only get one FireSuccess / FireError message, so cleanup as soon as possible.

12
dom/browser-element/BrowserElementPanning.js
View File

@ -63,8 +63,10 @@ const ContentPanning = {
addMessageListener("Viewport:Change", this._recvViewportChange.bind(this)); addMessageListener("Viewport:Change", this._recvViewportChange.bind(this));
addMessageListener("Gesture:DoubleTap", this._recvDoubleTap.bind(this)); addMessageListener("Gesture:DoubleTap", this._recvDoubleTap.bind(this));
addEventListener("visibilitychange", this._recvVisibilityChange.bind(this)); addEventListener("visibilitychange", this._handleVisibilityChange.bind(this));
Services.obs.addObserver(this, "BEC:ShownModalPrompt", false); Services.obs.addObserver(this, "BEC:ShownModalPrompt", false);
Services.obs.addObserver(this, "Activity:Success", false);
Services.obs.addObserver(this, "Activity:Error", false);
}, },
handleEvent: function cp_handleEvent(evt) { handleEvent: function cp_handleEvent(evt) {
@ -461,8 +463,10 @@ const ContentPanning = {
_resetHover: function cp_resetHover() { _resetHover: function cp_resetHover() {
const kStateHover = 0x00000004; const kStateHover = 0x00000004;
let element = content.document.createElement('foo'); try {
this._domUtils.setContentState(element, kStateHover); let element = content.document.createElement('foo');
this._domUtils.setContentState(element, kStateHover);
} catch(e) {}
}, },
_setActive: function cp_setActive(elt) { _setActive: function cp_setActive(elt) {
@ -546,7 +550,7 @@ const ContentPanning = {
} }
}, },
_recvVisibilityChange: function(evt) { _handleVisibilityChange: function(evt) {
if (!evt.target.hidden) if (!evt.target.hidden)
return; return;