Initialize "edit" UI of a bookmark correctly for Firefox 40 and later #887

This commit is contained in:
Piro / YUKI Hiroshi 2015-08-19 00:59:16 +09:00
parent c3adaabacf
commit 4abc4413e9

View File

@ -127,12 +127,24 @@ var TreeStyleTabBookmarksServiceEditable = inherit(TreeStyleTabBookmarksService,
)); ));
}, 'TreeStyleTab'); }, 'TreeStyleTab');
// for Firefox 40 and later, after Bug 951651
if (Services.vc.compare(Services.appinfo.platformVersion, '40') >= 0) {
TreeStyleTabUtils.doPatching(gEditItemOverlay.initPanel, 'gEditItemOverlay.initPanel', function(aName, aSource) {
return eval(aName+' = '+aSource.replace(
'let showOrCollapse =',
'TreeStyleTabBookmarksServiceEditable.initParentMenuList(); $&'
));
}, 'TreeStyleTab');
}
else {
// for Firefox 39 and olders
TreeStyleTabUtils.doPatching(gEditItemOverlay.initPanel, 'gEditItemOverlay.initPanel', function(aName, aSource) { TreeStyleTabUtils.doPatching(gEditItemOverlay.initPanel, 'gEditItemOverlay.initPanel', function(aName, aSource) {
return eval(aName+' = '+aSource.replace( return eval(aName+' = '+aSource.replace(
'if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {', 'if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {',
'$& TreeStyleTabBookmarksServiceEditable.initParentMenuList();' '$& TreeStyleTabBookmarksServiceEditable.initParentMenuList();'
)); ));
}, 'TreeStyleTab'); }, 'TreeStyleTab');
}
TreeStyleTabUtils.doPatching(gEditItemOverlay.onItemMoved, 'gEditItemOverlay.onItemMoved', function(aName, aSource) { TreeStyleTabUtils.doPatching(gEditItemOverlay.onItemMoved, 'gEditItemOverlay.onItemMoved', function(aName, aSource) {
return eval(aName+' = '+aSource.replace( return eval(aName+' = '+aSource.replace(