TotalToolbar ( http://totaltoolbar.mozdev.org/ ) との競合を解消
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6597 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
parent
f68d64a4b2
commit
1985fe3220
@ -103,6 +103,11 @@ var TreeStyleTabService = {
|
|||||||
window.getComputedStyle(aElementOrStyle, null) ;
|
window.getComputedStyle(aElementOrStyle, null) ;
|
||||||
return Number(style.getPropertyValue(aProp).replace(/px$/, ''));
|
return Number(style.getPropertyValue(aProp).replace(/px$/, ''));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
get isToolbarCustomizing()
|
||||||
|
{
|
||||||
|
return window.gToolbox && gToolbox.customizing;
|
||||||
|
},
|
||||||
|
|
||||||
/* Initializing */
|
/* Initializing */
|
||||||
|
|
||||||
@ -607,6 +612,10 @@ catch(e) {
|
|||||||
{
|
{
|
||||||
try{
|
try{
|
||||||
var session = this.getCurrentDragSession();
|
var session = this.getCurrentDragSession();
|
||||||
|
// don't touch to drag & drop of customizable toolbar items
|
||||||
|
if (this.isToolbarCustomizing && !this.getTabFromChild(session.sourceNode))
|
||||||
|
return false;
|
||||||
|
|
||||||
window['piro.sakura.ne.jp'].autoScroll.processAutoScroll(aEvent);
|
window['piro.sakura.ne.jp'].autoScroll.processAutoScroll(aEvent);
|
||||||
|
|
||||||
var info = this.getDropAction(aEvent, session);
|
var info = this.getDropAction(aEvent, session);
|
||||||
|
@ -37,7 +37,7 @@ TreeStyleTabBrowserTabbarDNDObserver.prototype = {
|
|||||||
aEvent.originalTarget,
|
aEvent.originalTarget,
|
||||||
XPathResult.BOOLEAN_TYPE
|
XPathResult.BOOLEAN_TYPE
|
||||||
).booleanValue ||
|
).booleanValue ||
|
||||||
(window.gToolbox && gToolbox.customizing)
|
sv.isToolbarCustomizing
|
||||||
)
|
)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user