[Pkg-mozext-commits] [tabmixplus] 03/73: Redeclaration of variable stack in gBrowser.addTab before Firefox version 37, changeset d3f86efb794e

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 36be3466b38d8d014e47d1871eef7174453f77ba
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Mar 22 08:19:53 2016 +0200

    Redeclaration of variable stack in gBrowser.addTab before Firefox version 37, changeset d3f86efb794e
---
 chrome/content/minit/tablib.js | 10 +++++-----
 chrome/content/utils.js        |  2 +-
 modules/log.jsm                |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index c1c5e9c..ffc0993 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -155,8 +155,8 @@ var tablib = { // eslint-disable-line
 
     Tabmix.changeCode(obj, "gBrowser." + fnName)._replace(
       '{', '{\n' +
-      '            let dontMove, isPending, stack = Tabmix.stackTrace(),\n' +
-      '                isRestoringTab = stack.contain("ssi_restoreWindow");\n'
+      '            let dontMove, isPending, callerTrace = Tabmix.callerTrace(),\n' +
+      '                isRestoringTab = callerTrace.contain("ssi_restoreWindow");\n'
     )._replace(
       'let params = arguments[1];',
       '$&\n' +
@@ -198,7 +198,7 @@ var tablib = { // eslint-disable-line
       't.dispatchEvent(evt);' +
       'var openTabnext = Tabmix.prefs.getBoolPref("openTabNext");' +
       'if (openTabnext) {' +
-      '  if (dontMove || Tabmix.dontMoveNewTab(stack))' +
+      '  if (dontMove || Tabmix.dontMoveNewTab(callerTrace))' +
       '    openTabnext = false;' +
       '  else if (!Services.prefs.getBoolPref("browser.tabs.insertRelatedAfterCurrent"))' +
       '    aRelatedToCurrent = true;' +
@@ -207,8 +207,8 @@ var tablib = { // eslint-disable-line
       't.owner = this.selectedTab;', 't.owner = _selectedTab;'
     ).toCode();
 
-    Tabmix.dontMoveNewTab = function(stack) {
-      return stack.contain("ssi_restoreWindow", "ssi_duplicateTab");
+    Tabmix.dontMoveNewTab = function(callerTrace) {
+      return callerTrace.contain("ssi_restoreWindow", "ssi_duplicateTab");
     };
 
     // ContextMenu Extensions raplce the original removeTab function
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index d52f7ae..ddab77a 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -248,7 +248,7 @@ var Tabmix = {
 
     var methods = ["changeCode", "setNewFunction", "nonStrictMode",
                    "getObject", "log", "getCallerNameByIndex", "callerName",
-                   "clog", "isCallerInList", "stackTrace",
+                   "clog", "isCallerInList", "callerTrace",
                    "obj", "assert", "trace", "reportError"];
     methods.forEach(function(id) {
       this[id] = function TMP_console_wrapper() {
diff --git a/modules/log.jsm b/modules/log.jsm
index ae68f48..9bc9ed7 100644
--- a/modules/log.jsm
+++ b/modules/log.jsm
@@ -177,7 +177,7 @@ this.console = {
     return false;
   },
 
-  stackTrace: function TMP_console_stackTrace() {
+  callerTrace: function TMP_console_callerTrace() {
     let stack = this._getStackExcludingInternal().join("\n");
 
     return {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git