Fix scrolling of tabs on Firefox 36

This commit is contained in:
Matthew Noorenberghe 2014-10-21 18:23:17 -07:00
parent 89337cfcdf
commit 4ea8f31301
2 changed files with 10 additions and 4 deletions

View File

@ -165,8 +165,11 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
var node = this.scrollBox; var node = this.scrollBox;
if (node._scrollbox) if (node._scrollbox)
node = node._scrollbox; node = node._scrollbox;
return (node.scrollBoxObject || node.boxObject) var boxObject = (node.scrollBoxObject || node.boxObject);
.QueryInterface(Ci.nsIScrollBoxObject); // for Tab Mix Plus (ensure scrollbox-ed) try {
boxObject = boxObject.QueryInterface(Ci.nsIScrollBoxObject); // for Tab Mix Plus (ensure scrollbox-ed)
} catch (ex) { /* May not implement this interface e.g. after bug 979835 */ }
return boxObject;
}, },
get splitter() get splitter()

View File

@ -164,8 +164,11 @@ if (typeof window == 'undefined' ||
getScrollBoxObject : function(aTabBrowser) getScrollBoxObject : function(aTabBrowser)
{ {
var box = this.getScrollBox(aTabBrowser); var box = this.getScrollBox(aTabBrowser);
return (box.scrollBoxObject || box.boxObject) var boxObject = (box.scrollBoxObject || box.boxObject);
.QueryInterface(Ci.nsIScrollBoxObject); // Tab Mix Plus try {
boxObject = boxObject.QueryInterface(Ci.nsIScrollBoxObject); // for Tab Mix Plus (ensure scrollbox-ed)
} catch (ex) { /* May not implement this interface e.g. after bug 979835 */ }
return boxObject;
}, },
getUpButton : function(aTabBrowser) getUpButton : function(aTabBrowser)