Merge pull request #364 from saneyuki/rm_35

Remove needless old codes before ESR 10
This commit is contained in:
YUKI "Piro" Hiroshi 2012-09-17 17:33:00 -07:00
commit a95701932a
2 changed files with 18 additions and 34 deletions

View File

@ -76,12 +76,7 @@ function initAppearancePane()
onChangeTabbarPosition(); onChangeTabbarPosition();
var sidebar = document.getElementById('extensions.treestyletab.tabbar.style-sidebar'); var sidebar = document.getElementById('extensions.treestyletab.tabbar.style-sidebar');
if (comparator.compare(XULAppInfo.version, '3.6') >= 0) {
sidebar.removeAttribute('disabled'); sidebar.removeAttribute('disabled');
}
else {
sidebar.setAttribute('disabled', true);
}
var boxes = [ var boxes = [
document.getElementById('extensions.treestyletab.tabbar.style-arrowscrollbox'), document.getElementById('extensions.treestyletab.tabbar.style-arrowscrollbox'),
@ -152,21 +147,14 @@ function initTabPane()
); );
var newTabPref = document.getElementById('extensions.treestyletab.autoAttach.newTabButton-box'); var newTabPref = document.getElementById('extensions.treestyletab.autoAttach.newTabButton-box');
if (comparator.compare(XULAppInfo.version, '4.0') >= 0)
newTabPref.removeAttribute('hidden'); newTabPref.removeAttribute('hidden');
else
newTabPref.setAttribute('hidden', true);
var bookmarkGroupReplacePref = document.getElementById('openGroupBookmark.replace'); var bookmarkGroupReplacePref = document.getElementById('openGroupBookmark.replace');
if (comparator.compare(XULAppInfo.version, '7.0') > 0) { if (bookmarkGroupReplacePref.selected) {
if (bookmarkGroupReplacePref.selected)
document.getElementById('openGroupBookmark.subtree').selected = true; document.getElementById('openGroupBookmark.subtree').selected = true;
}
bookmarkGroupReplacePref.setAttribute('hidden', true); bookmarkGroupReplacePref.setAttribute('hidden', true);
} }
else {
bookmarkGroupReplacePref.removeAttribute('hidden');
}
}
function onSyncGroupBookmarkUIToPref() function onSyncGroupBookmarkUIToPref()
{ {

View File

@ -151,14 +151,12 @@ TreeStyleTabThemeManager.prototype = {
BASE+'metal/shadow-active-l.png', BASE+'metal/shadow-active-l.png',
BASE+'metal/shadow-inactive-l.png' BASE+'metal/shadow-inactive-l.png'
].concat( ].concat(
TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ?
[ [
BASE+'metal/tab-active-middle.png', BASE+'metal/tab-active-middle.png',
BASE+'metal/tab-active-middle-selected.png', BASE+'metal/tab-active-middle-selected.png',
BASE+'metal/tab-inactive-middle.png', BASE+'metal/tab-inactive-middle.png',
BASE+'metal/tab-inactive-middle-selected.png' BASE+'metal/tab-inactive-middle-selected.png'
] : ]
[]
), ),
'metal-right' : [ 'metal-right' : [
BASE+'metal/tab-active-r.png', BASE+'metal/tab-active-r.png',
@ -168,14 +166,12 @@ TreeStyleTabThemeManager.prototype = {
BASE+'metal/shadow-active-r.png', BASE+'metal/shadow-active-r.png',
BASE+'metal/shadow-inactive-r.png' BASE+'metal/shadow-inactive-r.png'
].concat( ].concat(
TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ?
[ [
BASE+'metal/tab-active-middle.png', BASE+'metal/tab-active-middle.png',
BASE+'metal/tab-active-middle-selected.png', BASE+'metal/tab-active-middle-selected.png',
BASE+'metal/tab-inactive-middle.png', BASE+'metal/tab-inactive-middle.png',
BASE+'metal/tab-inactive-middle-selected.png' BASE+'metal/tab-inactive-middle-selected.png'
] : ]
[]
) )
} }
}; };