stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #444 from saneyuki/constant2

Browse Source 
Remove the setting TreeStyleTabUtils.__proto__.
This commit is contained in:
YUKI "Piro" Hiroshi 2013-01-05 20:04:32 -08:00
commit 8320caadea
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/utils.js
View File

@ -65,7 +65,6 @@ const TST_PREF_VERSION = 9;
let TreeStyleTabUtils = { let TreeStyleTabUtils = {
__proto__ : TreeStyleTabConstants,
get prefs () { get prefs () {
return prefs; return prefs;
@ -115,10 +114,10 @@ let TreeStyleTabUtils = {
if (this.getTreePref('loadDroppedLinkToNewChildTab') !== null) { if (this.getTreePref('loadDroppedLinkToNewChildTab') !== null) {
this.setTreePref('dropLinksOnTab.behavior', this.setTreePref('dropLinksOnTab.behavior',
this.getTreePref('loadDroppedLinkToNewChildTab.confirm') ? this.getTreePref('loadDroppedLinkToNewChildTab.confirm') ?
this.kDROPLINK_ASK : TreeStyleTabConstants.kDROPLINK_ASK :
this.getTreePref('loadDroppedLinkToNewChildTab') ? this.getTreePref('loadDroppedLinkToNewChildTab') ?
this.kDROPLINK_NEWTAB : TreeStyleTabConstants.kDROPLINK_NEWTAB :
this.kDROPLINK_LOAD TreeStyleTabConstants.kDROPLINK_LOAD
); );
this.clearTreePref('loadDroppedLinkToNewChildTab.confirm'); this.clearTreePref('loadDroppedLinkToNewChildTab.confirm');
this.clearTreePref('loadDroppedLinkToNewChildTab'); this.clearTreePref('loadDroppedLinkToNewChildTab');
@ -126,21 +125,21 @@ let TreeStyleTabUtils = {
if (this.getTreePref('openGroupBookmarkAsTabSubTree') !== null) { if (this.getTreePref('openGroupBookmarkAsTabSubTree') !== null) {
let behavior = 0; let behavior = 0;
if (this.getTreePref('openGroupBookmarkAsTabSubTree.underParent')) if (this.getTreePref('openGroupBookmarkAsTabSubTree.underParent'))
behavior += this.kGROUP_BOOKMARK_USE_DUMMY; behavior += TreeStyleTabConstants.kGROUP_BOOKMARK_USE_DUMMY;
if (!this.getTreePref('openGroupBookmarkBehavior.confirm')) { if (!this.getTreePref('openGroupBookmarkBehavior.confirm')) {
behavior += ( behavior += (
this.getTreePref('openGroupBookmarkAsTabSubTree') ? this.getTreePref('openGroupBookmarkAsTabSubTree') ?
this.kGROUP_BOOKMARK_SUBTREE : TreeStyleTabConstants.kGROUP_BOOKMARK_SUBTREE :
this.getTreePref('browser.tabs.loadFolderAndReplace') ? this.getTreePref('browser.tabs.loadFolderAndReplace') ?
this.kGROUP_BOOKMARK_REPLACE : TreeStyleTabConstants.kGROUP_BOOKMARK_REPLACE :
this.kGROUP_BOOKMARK_SEPARATE TreeStyleTabConstants.kGROUP_BOOKMARK_SEPARATE
); );
} }
this.setTreePref('openGroupBookmark.behavior', behavior); this.setTreePref('openGroupBookmark.behavior', behavior);
this.clearTreePref('openGroupBookmarkBehavior.confirm'); this.clearTreePref('openGroupBookmarkBehavior.confirm');
this.clearTreePref('openGroupBookmarkAsTabSubTree'); this.clearTreePref('openGroupBookmarkAsTabSubTree');
this.clearTreePref('openGroupBookmarkAsTabSubTree.underParent'); this.clearTreePref('openGroupBookmarkAsTabSubTree.underParent');
prefs.setPref('browser.tabs.loadFolderAndReplace', !!(behavior & this.kGROUP_BOOKMARK_REPLACE)); prefs.setPref('browser.tabs.loadFolderAndReplace', !!(behavior & TreeStyleTabConstants.kGROUP_BOOKMARK_REPLACE));
} }
case 4: case 4:
let (prefs = [ let (prefs = [