[Pkg-mozext-commits] [SCM] firegesture s extension branch, master, updated. debian/1.6.10-1-5-g4027e5b
Fabrizio Regalli
fabreg at fabreg.it
Wed Mar 21 14:30:14 UTC 2012
The following commit has been merged in the master branch:
commit 591237aeec28d4a7fdcb4be5b6d881758239f006
Merge: 414f9396baea399a0dc4f4273f6697bf6ba23e99 94c0bdf69f6ae773237ec6dea0b97d70c2d3fbfc
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date: Wed Mar 21 15:26:09 2012 +0100
Merge tag 'upstream/1.6.12'
Upstream version 1.6.12
Conflicts:
chrome/content/firegestures/browser.js
components/xdGestureHandler.js
install.rdf
diff --combined chrome/content/firegestures/browser.js
index 76ecb55,f65dda9..b44fd7d
--- a/chrome/content/firegestures/browser.js
+++ b/chrome/content/firegestures/browser.js
@@@ -28,10 -28,6 +28,13 @@@ var FireGestures =
this._gestureMapping = gestureSvc.getMappingForBrowser();
this._getLocaleString = gestureSvc.getLocaleString;
this._statusTextField = document.getElementById("statusbar-display");
++<<<<<<< HEAD:chrome/firegestures.jar!/content/firegestures/browser.js
+ if (!this._statusTextField) {
+ this.setStatusText = this._setStatusText2;
+ this.clearStatusText = this._clearStatusText2;
+ }
++=======
++>>>>>>> upstream/1.6.12:chrome/content/firegestures/browser.js
},
uninit: function() {
@@@ -605,8 -601,6 +608,11 @@@
"gBrowser.warnAboutClosingTabs2 = " +
gBrowser.warnAboutClosingTabs.toString()
.replace("(aAll)", "(aAll, aTabsToClose)")
++<<<<<<< HEAD:chrome/firegestures.jar!/content/firegestures/browser.js
+ .replace(/var numTabs = [^;]+;/, "var numTabs = aTabsToClose;")
+ .replace("--tabsToClose;", "")
++=======
++>>>>>>> upstream/1.6.12:chrome/content/firegestures/browser.js
.replace(/var tabsToClose = [^;]+;/, "var tabsToClose = aTabsToClose;")
);
var tabs = Array.slice(gBrowser.mTabs);
@@@ -653,44 -647,6 +659,47 @@@
this._clearStatusTimer = window.setTimeout(callback, aMillisec, this);
},
++<<<<<<< HEAD:chrome/firegestures.jar!/content/firegestures/browser.js
+ _setStatusText2: function(aText) {
+ if (!this._statusTextField) {
+ this._statusTextField = document.createElement("hbox");
+ this._statusTextField.id = "firegestures-status";
+ this._statusTextField.setAttribute("style",
+ "position: fixed; border: 1px solid ThreeDShadow; " +
+ "background-color: -moz-dialog; color: -moz-dialogtext; " +
+ "margin: 4px; box-shadow: 2px 2px 2px rgba(0,0,0,0.5); " +
+ "-moz-transition-property: opacity; opacity: 0; "
+ );
+ this._statusTextField.setAttribute("onmouseover", "this.hidden = true;");
+ this._statusTextField.appendChild(document.createElement("label"));
+ document.documentElement.appendChild(this._statusTextField);
+ }
+ if (this._statusTextField.hidden)
+ this._statusTextField.hidden = false;
+ if (this._statusTextField.style.opacity == 0) {
+ var box = gBrowser.mPanelContainer.boxObject;
+ var rootBox = document.documentElement.boxObject;
+ var left = box.x - rootBox.x;
+ var bottom = rootBox.y + rootBox.height - box.y - box.height;
+ this._statusTextField.style.left = left.toString() + "px";
+ this._statusTextField.style.bottom = bottom.toString() + "px";
+ }
+ this._statusTextField.firstChild.value = aText;
+ this._statusTextField.style.MozTransitionDuration = "0s";
+ this._statusTextField.style.MozTransitionDelay = "0s";
+ this._statusTextField.style.opacity = 1;
+ },
+
+ _clearStatusText2: function(aMillisec) {
+ if (!this._statusTextField)
+ return;
+ this._statusTextField.style.MozTransitionDuration = "0.5s";
+ this._statusTextField.style.MozTransitionDelay = (aMillisec / 1000).toString() + "s";
+ this._statusTextField.style.opacity = 0;
+ },
+
++=======
++>>>>>>> upstream/1.6.12:chrome/content/firegestures/browser.js
_popupActiveItem: null,
@@@ -884,13 -840,10 +893,20 @@@
var submission = engine.getSubmission(selText, null);
if (!submission)
break;
++<<<<<<< HEAD:chrome/firegestures.jar!/content/firegestures/browser.js
+ if ("LightWeightThemeWebInstaller" in window)
+ gBrowser.loadOneTab(submission.uri.spec, {
+ postData: submission.postData,
+ relatedToCurrent: true
+ });
+ else
+ gBrowser.loadOneTab(submission.uri.spec, null, null, submission.postData, null, false);
++=======
+ gBrowser.loadOneTab(submission.uri.spec, {
+ postData: submission.postData,
+ relatedToCurrent: true
+ });
++>>>>>>> upstream/1.6.12:chrome/content/firegestures/browser.js
break;
default:
eval(activeItem.getAttribute("oncommand"));
diff --combined components/xdGestureHandler.js
index a5e5f94,579cbc6..76b50e0
--- a/components/xdGestureHandler.js
+++ b/components/xdGestureHandler.js
@@@ -44,23 -44,14 +44,34 @@@ xdGestureHandler.prototype =
_gestureObserver: null,
++<<<<<<< HEAD
+ _isFx4: false,
+
+ attach: function FGH_attach(aDrawArea, aObserver) {
+ var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
+ this._isFx4 = parseFloat(appInfo.version) >= 4.0;
+ this._drawArea = aDrawArea;
+ this._gestureObserver = aObserver;
+ this._drawArea.addEventListener("mousedown", this, true);
+ if (this._isFx4) {
+ var root = this._drawArea.ownerDocument.defaultView.document.documentElement;
+ root.addEventListener("mousemove", this, true);
+ root.addEventListener("mouseup", this, true);
+ }
+ else {
+ this._drawArea.addEventListener("mousemove", this, true);
+ this._drawArea.addEventListener("mouseup", this, true);
+ }
++=======
+ attach: function FGH_attach(aDrawArea, aObserver) {
+ var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
+ this._drawArea = aDrawArea;
+ this._gestureObserver = aObserver;
+ this._drawArea.addEventListener("mousedown", this, true);
+ var root = this._drawArea.ownerDocument.defaultView.document.documentElement;
+ root.addEventListener("mousemove", this, true);
+ root.addEventListener("mouseup", this, true);
++>>>>>>> upstream/1.6.12
this._drawArea.addEventListener("contextmenu", this, true);
this._drawArea.addEventListener("draggesture", this, true);
this._reloadPrefs();
@@@ -70,15 -61,9 +81,21 @@@
detach: function FGH_detach() {
this._drawArea.removeEventListener("mousedown", this, true);
++<<<<<<< HEAD
+ if (this._isFx4) {
+ var root = this._drawArea.ownerDocument.defaultView.document.documentElement;
+ root.removeEventListener("mousemove", this, true);
+ root.removeEventListener("mouseup", this, true);
+ }
+ else {
+ this._drawArea.removeEventListener("mousemove", this, true);
+ this._drawArea.removeEventListener("mouseup", this, true);
+ }
++=======
+ var root = this._drawArea.ownerDocument.defaultView.document.documentElement;
+ root.removeEventListener("mousemove", this, true);
+ root.removeEventListener("mouseup", this, true);
++>>>>>>> upstream/1.6.12
this._drawArea.removeEventListener("contextmenu", this, true);
this._drawArea.removeEventListener("draggesture", this, true);
var prefBranch2 = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
@@@ -283,14 -268,16 +300,27 @@@
},
_displayContextMenu: function FGH__displayContextMenu(event) {
++<<<<<<< HEAD
+ with (this._drawArea.ownerDocument.defaultView) {
+ if (!nsContextMenu.prototype._setTargetInternal) {
+ nsContextMenu.prototype._setTargetInternal = nsContextMenu.prototype.setTarget;
+ nsContextMenu.prototype.setTarget = function(aNode, aRangeParent, aRangeOffset) {
+ this._setTargetInternal(aNode, aRangeParent, this._rangeOffset);
+ };
+ }
+ nsContextMenu.prototype._rangeOffset = event.rangeOffset;
++=======
+ if ("nsContextMenu" in this._drawArea.ownerDocument.defaultView) {
+ with (this._drawArea.ownerDocument.defaultView) {
+ if (!nsContextMenu.prototype._setTargetInternal) {
+ nsContextMenu.prototype._setTargetInternal = nsContextMenu.prototype.setTarget;
+ nsContextMenu.prototype.setTarget = function(aNode, aRangeParent, aRangeOffset) {
+ this._setTargetInternal(aNode, aRangeParent, this._rangeOffset);
+ };
+ }
+ nsContextMenu.prototype._rangeOffset = event.rangeOffset;
+ }
++>>>>>>> upstream/1.6.12
}
this._enableContextMenu(true);
var evt = event.originalTarget.ownerDocument.createEvent("MouseEvents");
@@@ -555,9 -542,6 +585,13 @@@
++<<<<<<< HEAD
+if (XPCOMUtils.generateNSGetFactory)
+ var NSGetFactory = XPCOMUtils.generateNSGetFactory([xdGestureHandler]);
+else
+ var NSGetModule = XPCOMUtils.generateNSGetModule([xdGestureHandler]);
++=======
+ var NSGetFactory = XPCOMUtils.generateNSGetFactory([xdGestureHandler]);
++>>>>>>> upstream/1.6.12
diff --combined install.rdf
index 5bb6e14,6c9e314..1968e46
--- a/install.rdf
+++ b/install.rdf
@@@ -7,7 -7,7 +7,11 @@@
<em:id>firegestures at xuldev.org</em:id>
<em:type>2</em:type>
<em:name>FireGestures</em:name>
++<<<<<<< HEAD
+ <em:version>1.6.10</em:version>
++=======
+ <em:version>1.6.12</em:version>
++>>>>>>> upstream/1.6.12
<em:description>Executes various commands with mouse gestures.</em:description>
<em:creator>Gomita</em:creator>
<em:localized>
@@@ -141,7 -141,7 +145,7 @@@
</em:localized>
<em:localized>
<Description>
- <em:locale>it-IT</em:locale>
+ <em:locale>it</em:locale>
<em:name>FireGestures</em:name>
<em:description>Esegue vari comandi attraverso le gesture del mouse.</em:description>
<em:creator>Gomita</em:creator>
@@@ -261,7 -261,7 +265,7 @@@
</em:localized>
<em:localized>
<Description>
- <em:locale>tr-TR</em:locale>
+ <em:locale>tr</em:locale>
<em:name>FireGestures</em:name>
<em:description>Birçok komutu fare hareketi ile çalıştırır.</em:description>
<em:creator>Gomita</em:creator>
--
firegesture s extension
More information about the Pkg-mozext-commits
mailing list