[Pkg-mozext-commits] [firegestures] 04/07: Imported Upstream version 1.9~b5
David Prévot
taffit at moszumanska.debian.org
Wed Apr 15 16:19:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firegestures.
commit f065569d28214154e0d0e60b1a14d58cd1e6e0ae
Merge: 818aac7 539d670
Author: David Prévot <david at tilapin.org>
Date: Wed Apr 15 11:55:12 2015 -0400
Imported Upstream version 1.9~b5
chrome/content/firegestures/browser.js | 7 +++----
components/xdGestureHandler.js | 5 +----
install.rdf | 4 ++--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --cc chrome/content/firegestures/browser.js
index 1dcb9ee,f962bb3..46d5890
mode 100755,100644..100755
--- a/chrome/content/firegestures/browser.js
+++ b/chrome/content/firegestures/browser.js
@@@ -385,21 -426,24 +385,20 @@@ var FireGestures =
throw this._getLocaleString("ERROR_NOT_ON_IMAGE");
var doc = this.sourceNode.ownerDocument;
var skipPrompt = aCommand == "FireGestures:SaveImageNow";
+ var refURI = this.isRemote ? makeURI(doc.location.href) : doc.documentURIObject;
if (this.sourceNode instanceof HTMLVideoElement ||
this.sourceNode instanceof HTMLAudioElement) {
- // save video and audio
this.checkURL(mediaURL, doc);
var dialogTitle = this.sourceNode instanceof HTMLVideoElement
? "SaveVideoTitle" : "SaveAudioTitle";
nsContextMenu.prototype.saveHelper(mediaURL, null, dialogTitle, false, doc);
}
else if (this.sourceNode instanceof HTMLCanvasElement) {
- saveImageURL(mediaURL, "canvas.png", "SaveImageTitle",
- false, skipPrompt, doc.documentURIObject, doc);
- // save canvas
+ saveImageURL(mediaURL, "canvas.png", "SaveImageTitle", false, skipPrompt, refURI, doc);
}
else {
- // save image
this.checkURL(mediaURL, doc);
- saveImageURL(mediaURL, null, "SaveImageTitle",
- false, skipPrompt, doc.documentURIObject, doc);
+ saveImageURL(mediaURL, null, "SaveImageTitle", false, skipPrompt, refURI, doc);
}
break;
case "FireGestures:WebSearch":
diff --cc components/xdGestureHandler.js
index 97938d6,b26dd54..4963c79
mode 100755,100644..100755
--- a/components/xdGestureHandler.js
+++ b/components/xdGestureHandler.js
@@@ -543,13 -683,12 +543,10 @@@ xdGestureHandler.prototype =
this._trailDot.style.zIndex = 2147483647;
},
- // called from _progressGesture
drawTrail: function FGH_drawTrail(x1, y1, x2, y2) {
if (this._isRemote) {
- // [e10s]
this._gestureObserver.sendAsyncMessage("FireGestures:DrawTrail", {
- x1: x1 - this._drawArea.mCurrentBrowser.boxObject.screenX,
- y1: y1 - this._drawArea.mCurrentBrowser.boxObject.screenY,
- x2: x2 - this._drawArea.mCurrentBrowser.boxObject.screenX,
- y2: y2 - this._drawArea.mCurrentBrowser.boxObject.screenY,
+ x1: x1, y1: y1, x2: x2, y2: y2,
});
return;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firegestures.git
More information about the Pkg-mozext-commits
mailing list