diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js index a8d6e511..7046debe 100644 --- a/content/treestyletab/config.js +++ b/content/treestyletab/config.js @@ -76,13 +76,8 @@ function initAppearancePane() onChangeTabbarPosition(); var sidebar = document.getElementById('extensions.treestyletab.tabbar.style-sidebar'); - if (comparator.compare(XULAppInfo.version, '3.6') >= 0) { - sidebar.removeAttribute('disabled'); - } - else { - sidebar.setAttribute('disabled', true); - } - + sidebar.removeAttribute('disabled'); + var boxes = [ document.getElementById('extensions.treestyletab.tabbar.style-arrowscrollbox'), document.getElementById('extensions.treestyletab.twisty.style-arrowscrollbox') @@ -152,20 +147,13 @@ function initTabPane() ); var newTabPref = document.getElementById('extensions.treestyletab.autoAttach.newTabButton-box'); - if (comparator.compare(XULAppInfo.version, '4.0') >= 0) - newTabPref.removeAttribute('hidden'); - else - newTabPref.setAttribute('hidden', true); + newTabPref.removeAttribute('hidden'); var bookmarkGroupReplacePref = document.getElementById('openGroupBookmark.replace'); - if (comparator.compare(XULAppInfo.version, '7.0') > 0) { - if (bookmarkGroupReplacePref.selected) - document.getElementById('openGroupBookmark.subtree').selected = true; - bookmarkGroupReplacePref.setAttribute('hidden', true); - } - else { - bookmarkGroupReplacePref.removeAttribute('hidden'); + if (bookmarkGroupReplacePref.selected) { + document.getElementById('openGroupBookmark.subtree').selected = true; } + bookmarkGroupReplacePref.setAttribute('hidden', true); } function onSyncGroupBookmarkUIToPref() diff --git a/modules/themeManager.js b/modules/themeManager.js index fb0a596d..62c6bb16 100644 --- a/modules/themeManager.js +++ b/modules/themeManager.js @@ -151,14 +151,12 @@ TreeStyleTabThemeManager.prototype = { BASE+'metal/shadow-active-l.png', BASE+'metal/shadow-inactive-l.png' ].concat( - TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ? - [ - BASE+'metal/tab-active-middle.png', - BASE+'metal/tab-active-middle-selected.png', - BASE+'metal/tab-inactive-middle.png', - BASE+'metal/tab-inactive-middle-selected.png' - ] : - [] + [ + BASE+'metal/tab-active-middle.png', + BASE+'metal/tab-active-middle-selected.png', + BASE+'metal/tab-inactive-middle.png', + BASE+'metal/tab-inactive-middle-selected.png' + ] ), 'metal-right' : [ BASE+'metal/tab-active-r.png', @@ -168,14 +166,12 @@ TreeStyleTabThemeManager.prototype = { BASE+'metal/shadow-active-r.png', BASE+'metal/shadow-inactive-r.png' ].concat( - TreeStyleTabUtils.Comparator.compare(TreeStyleTabUtils.XULAppInfo.version, '3.5') >= 0 ? - [ - BASE+'metal/tab-active-middle.png', - BASE+'metal/tab-active-middle-selected.png', - BASE+'metal/tab-inactive-middle.png', - BASE+'metal/tab-inactive-middle-selected.png' - ] : - [] + [ + BASE+'metal/tab-active-middle.png', + BASE+'metal/tab-active-middle-selected.png', + BASE+'metal/tab-inactive-middle.png', + BASE+'metal/tab-inactive-middle-selected.png' + ] ) } };