Merge pull request #777 from mnoorenberghe/nsIScrollBoxObject

Fix scrolling of tabs on Firefox 36
This commit is contained in:
YUKI "Piro" Hiroshi 2014-10-22 13:26:40 +09:00
commit 8c6e28ea0d
2 changed files with 10 additions and 4 deletions

View File

@ -165,8 +165,11 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
var node = this.scrollBox;
if (node._scrollbox)
node = node._scrollbox;
return (node.scrollBoxObject || node.boxObject)
.QueryInterface(Ci.nsIScrollBoxObject); // for Tab Mix Plus (ensure scrollbox-ed)
var boxObject = (node.scrollBoxObject || node.boxObject);
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()

View File

@ -164,8 +164,11 @@ if (typeof window == 'undefined' ||
getScrollBoxObject : function(aTabBrowser)
{
var box = this.getScrollBox(aTabBrowser);
return (box.scrollBoxObject || box.boxObject)
.QueryInterface(Ci.nsIScrollBoxObject); // Tab Mix Plus
var boxObject = (box.scrollBoxObject || box.boxObject);
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)