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

use Ci.nsIDOMXPathResult instead of XPathResult

Browse Source
This commit is contained in:
SHIMODA Hiroshi 2011-04-06 14:02:00 +09:00
parent d1c7ff1aa8
commit 6addd2dffd
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/treestyletab/treestyletab.js
View File

@ -1315,9 +1315,7 @@ var TreeStyleTabService = {
'local-name() = "tooltip" or local-name() ="panel" or '+ 'local-name() = "tooltip" or local-name() ="panel" or '+
'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]', 'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
aPopup, aPopup,
XPathResult.BOOLEAN_TYPE Ci.nsIDOMXPathResult.BOOLEAN_TYPE
).booleanValue) ).booleanValue)
return; return;

14
content/treestyletab/treestyletabbrowser.js
View File

@ -86,7 +86,7 @@ TreeStyleTabBrowser.prototype = {
get tabTooltip() get tabTooltip()
{ {
return document.getElementById('tabbrowser-tab-tooltip') || // Firefox 4.0- return document.getElementById('tabbrowser-tab-tooltip') || // Firefox 4.0-
this.evaluateXPath('descendant::xul:tooltip', this.browser.mStrip, XPathResult.FIRST_ORDERED_NODE_TYPE).singleNodeValue; // -Firefox 3.6 this.evaluateXPath('descendant::xul:tooltip', this.browser.mStrip, Ci.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE).singleNodeValue; // -Firefox 3.6
}, },
/* properties */ /* properties */
@ -241,7 +241,7 @@ TreeStyleTabBrowser.prototype = {
return this.evaluateXPath( return this.evaluateXPath(
'ancestor-or-self::xul:toolbar[1]', 'ancestor-or-self::xul:toolbar[1]',
this.mTabBrowser.tabContainer, this.mTabBrowser.tabContainer,
XPathResult.FIRST_ORDERED_NODE_TYPE Ci.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE
).singleNodeValue; ).singleNodeValue;
}, },
@ -3388,7 +3388,7 @@ TreeStyleTabBrowser.prototype = {
(aDir < 0 ? 'last()' : '1' )+ (aDir < 0 ? 'last()' : '1' )+
']', ']',
aTabbar, aTabbar,
XPathResult.FIRST_ORDERED_NODE_TYPE Ci.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE
).singleNodeValue; ).singleNodeValue;
} }
if (nextTab && nextTab != aTabbar.selectedItem) if (nextTab && nextTab != aTabbar.selectedItem)
@ -3638,7 +3638,7 @@ TreeStyleTabBrowser.prototype = {
let item = this.evaluateXPath( let item = this.evaluateXPath(
'descendant::xul:*[starts-with(@id, "'+aID+'")]', 'descendant::xul:*[starts-with(@id, "'+aID+'")]',
aEvent.currentTarget, aEvent.currentTarget,
XPathResult.FIRST_ORDERED_NODE_TYPE Ci.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE
).singleNodeValue; ).singleNodeValue;
items[aID] = item; items[aID] = item;
if (this.getTreePref('show.'+aID)) if (this.getTreePref('show.'+aID))
@ -3667,7 +3667,7 @@ TreeStyleTabBrowser.prototype = {
'descendant::xul:menuseparator[starts-with(@id, "'+this.kMENUITEM_COLLAPSEEXPAND_SEPARATOR+'")]', 'descendant::xul:menuseparator[starts-with(@id, "'+this.kMENUITEM_COLLAPSEEXPAND_SEPARATOR+'")]',
aEvent.currentTarget, aEvent.currentTarget,
XPathResult.FIRST_ORDERED_NODE_TYPE Ci.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE
).singleNodeValue; ).singleNodeValue;
let collapseItem = items[this.kMENUITEM_COLLAPSE]; let collapseItem = items[this.kMENUITEM_COLLAPSE];
let expanndItem = items[this.kMENUITEM_EXPAND]; let expanndItem = items[this.kMENUITEM_EXPAND];
@ -3737,7 +3737,7 @@ TreeStyleTabBrowser.prototype = {
sep = this.evaluateXPath( sep = this.evaluateXPath(
'descendant::xul:menuseparator[starts-with(@id, "'+this.kMENUITEM_AUTOHIDE_SEPARATOR+'")]', 'descendant::xul:menuseparator[starts-with(@id, "'+this.kMENUITEM_AUTOHIDE_SEPARATOR+'")]',
aEvent.currentTarget, aEvent.currentTarget,
XPathResult.FIRST_ORDERED_NODE_TYPE Ci.nsIDOMXPathResult.FIRST_ORDERED_NODE_TYPE
).singleNodeValue; ).singleNodeValue;
if (autohide.getAttribute('hidden') != 'true' || if (autohide.getAttribute('hidden') != 'true' ||
fixed.getAttribute('hidden') != 'true') { fixed.getAttribute('hidden') != 'true') {
@ -4836,7 +4836,7 @@ TreeStyleTabBrowser.prototype = {
self.evaluateXPath( self.evaluateXPath(
'child::xul:tab[@'+self.kCOLLAPSING_PHASE+'="'+self.kCOLLAPSING_PHASE_TO_BE_EXPANDED+'"]', 'child::xul:tab[@'+self.kCOLLAPSING_PHASE+'="'+self.kCOLLAPSING_PHASE_TO_BE_EXPANDED+'"]',
self.mTabBrowser.mTabContainer, self.mTabBrowser.mTabContainer,
XPathResult.BOOLEAN_TYPE Ci.nsIDOMXPathResult.BOOLEAN_TYPE
).booleanValue ).booleanValue
) )
self.smoothScrollTo(aEndX, aEndY, parseInt(aDuration * 0.5)); self.smoothScrollTo(aEndX, aEndY, parseInt(aDuration * 0.5));