[Pkg-mozext-commits] [tabmixplus] 08/34: [e10s] Stop using CPOWs from FillHistoryMenu function

[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 181fb1a60c2143fbecb67d4bb769a3860c86899f
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Feb 18 18:55:58 2015 +0200

    [e10s] Stop using CPOWs from FillHistoryMenu function
---
 chrome/content/minit/tablib.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 7d36930..4e8ba4a 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -639,10 +639,20 @@ var tablib = {
       'where'
     ).toCode();
 
-    Tabmix.changeCode(window, "FillHistoryMenu")._replace(
-      'entry.title',
-      'tablib.menuItemTitle(entry)', {flags: "g"}
-    ).toCode();
+    Tabmix.originalFunctions.FillHistoryMenu = window.FillHistoryMenu;
+    let fillHistoryMenu = function FillHistoryMenu(aParent) {
+      let rv = Tabmix.originalFunctions.FillHistoryMenu.apply(this, arguments);
+      let l = aParent.childNodes.length;
+      for (let i = 0; i < l; i++) {
+        let item = aParent.childNodes[i];
+        let uri = item.getAttribute("uri");
+        let label = item.getAttribute("label");
+        let title = TMP_Places.getTitleFromBookmark(uri, label);
+        Tabmix.setItem(item, "label", title);
+      }
+      return rv;
+    };
+    Tabmix.setNewFunction(window, "FillHistoryMenu", fillHistoryMenu);
 
     // Fix for Fast Dial
     if ("BrowserGoHome" in window || "BrowserGoHome" in FdTabLoader) {
@@ -1853,12 +1863,6 @@ var tablib = {
       gURLBar.focus();
   },
 
-  menuItemTitle: function TMP_menuItemTitle(entry) {
-    if (entry.URI)
-      return TMP_Places.getTitleFromBookmark(entry.URI.spec, entry.title);
-    return entry.title;
-  },
-
   reloadTabs: function(tabs, skipTab) {
     let l = tabs.length;
     for (let i = 0; i < l; i++) {

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