[Pkg-mozext-commits] [tabmixplus] 17/27: Follow uo bug 1111275 - Replace gBrowser.mCurrentBrowser with gBrowser.selectedBrowser

[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 05c0a1773b5cbe4d0924efdd1033c680a2c57093
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Dec 16 15:03:17 2014 +0200

    Follow uo bug 1111275 - Replace gBrowser.mCurrentBrowser with gBrowser.selectedBrowser
---
 chrome/content/minit/tablib.js  | 4 ++--
 chrome/content/places/places.js | 4 ++--
 modules/Places.jsm              | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 4f783a1..caa9be8 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -465,7 +465,7 @@ var tablib = {
       'tablib.contentAreaOnDrop(event, data.url, data.postData);', {check: Tabmix.isVersion(250)}
     ).toCode();
     // update current browser
-    gBrowser.mCurrentBrowser.droppedLinkHandler = handleDroppedLink;
+    gBrowser.selectedBrowser.droppedLinkHandler = handleDroppedLink;
 
     // we prevent sessionStore.duplicateTab from moving the tab
     Tabmix.changeCode(window, "duplicateTabIn")._replace(
@@ -1797,7 +1797,7 @@ var tablib = {
 
   contentAreaOnDrop: function TMP_contentAreaOnDrop(aEvent, aUri, aPostData) {
     var where;
-    var browser = gBrowser.mCurrentBrowser;
+    var browser = gBrowser.selectedBrowser;
     if (aUri != browser.currentURI.spec) {
       let tab = gBrowser.mCurrentTab;
       let isCopy = "dataTransfer" in aEvent ? (aEvent.dataTransfer.dropEffect == "copy") : (aEvent.ctrlKey || aEvent.metaKey);
diff --git a/chrome/content/places/places.js b/chrome/content/places/places.js
index bfb3fcc..a5aca03 100644
--- a/chrome/content/places/places.js
+++ b/chrome/content/places/places.js
@@ -160,7 +160,7 @@ var TMP_Places = {
    openLivemarkSite: function TMP_PC_openLivemarkSite(aUrl, aEvent) {
      var where = this.fixWhereToOpen(aEvent, whereToOpenLink(aEvent), this.prefBookmark);
      if (where == "current")
-       Tabmix.getTopWin().gBrowser.mCurrentBrowser.tabmix_allowLoad = true;
+       Tabmix.getTopWin().gBrowser.selectedBrowser.tabmix_allowLoad = true;
      openUILinkIn(aUrl, where, {
         inBackground: Services.prefs.getBoolPref("browser.tabs.loadBookmarksInBackground"),
         initiatingDoc: aEvent ? aEvent.target.ownerDocument : null
@@ -182,7 +182,7 @@ var TMP_Places = {
       var where = this.isBookmarklet(aUri) ? "current" :
                    this.fixWhereToOpen(aEvent, whereToOpenLink(aEvent, false, true), this.prefHistory);
       if (where == "current")
-        Tabmix.getTopWin().gBrowser.mCurrentBrowser.tabmix_allowLoad = true;
+        Tabmix.getTopWin().gBrowser.selectedBrowser.tabmix_allowLoad = true;
       openUILinkIn(aUri, where, {
         inBackground: Services.prefs.getBoolPref("browser.tabs.loadBookmarksInBackground"),
         initiatingDoc: aEvent ? aEvent.target.ownerDocument : null
diff --git a/modules/Places.jsm b/modules/Places.jsm
index 317c111..6b15387 100644
--- a/modules/Places.jsm
+++ b/modules/Places.jsm
@@ -166,7 +166,8 @@ let PlacesUtilsInternal = {
       '            aWhere = browserWindow.TMP_Places.fixWhereToOpen(null, aWhere);\n' +
       '        }\n' +
       '      }\n' +
-      '      if (browserWindow && aWhere == "current") browserWindow.gBrowser.mCurrentBrowser.tabmix_allowLoad = true;\n' +
+      '      if (browserWindow && aWhere == "current")\n' +
+      '        browserWindow.gBrowser.selectedBrowser.tabmix_allowLoad = true;\n' +
       '      $&'
     )._replace(
       'inBackground:',

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