mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-23 10:15:41 +00:00
Backing out patch for bug 248612, since it may have caused 10% argo Ts regression
This commit is contained in:
parent
f417e3b2fe
commit
47ae4bc241
@ -3837,9 +3837,17 @@ nsBrowserStatusHandler.prototype =
|
|||||||
location = locationURI.spec;
|
location = locationURI.spec;
|
||||||
} catch (exception) {}
|
} catch (exception) {}
|
||||||
|
|
||||||
gURLBar.value = ""; // hack for bug 249322
|
if (getBrowser().forceSyncURLBarUpdate) {
|
||||||
gURLBar.value = location;
|
gURLBar.value = ""; // hack for bug 249322
|
||||||
SetPageProxyState("valid");
|
gURLBar.value = location;
|
||||||
|
SetPageProxyState("valid");
|
||||||
|
} else {
|
||||||
|
setTimeout(function(loc) {
|
||||||
|
gURLBar.value = ""; // hack for bug 249322
|
||||||
|
gURLBar.value = loc;
|
||||||
|
SetPageProxyState("valid");
|
||||||
|
}, 0, location);
|
||||||
|
}
|
||||||
|
|
||||||
// Setting the urlBar value in some cases causes userTypedValue to
|
// Setting the urlBar value in some cases causes userTypedValue to
|
||||||
// become set because of oninput, so reset it to its old value.
|
// become set because of oninput, so reset it to its old value.
|
||||||
|
@ -180,6 +180,9 @@
|
|||||||
<field name="mContextTab">
|
<field name="mContextTab">
|
||||||
null
|
null
|
||||||
</field>
|
</field>
|
||||||
|
<field name="mModalDialogShowing">
|
||||||
|
false
|
||||||
|
</field>
|
||||||
<field name="arrowKeysShouldWrap" readonly="true">
|
<field name="arrowKeysShouldWrap" readonly="true">
|
||||||
#ifdef XP_MACOSX
|
#ifdef XP_MACOSX
|
||||||
true
|
true
|
||||||
@ -1698,8 +1701,6 @@
|
|||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
|
||||||
<field name="mDragTime">0</field>
|
|
||||||
<field name="mDragOverDelay">350</field>
|
|
||||||
<method name="onDragOver">
|
<method name="onDragOver">
|
||||||
<parameter name="aEvent"/>
|
<parameter name="aEvent"/>
|
||||||
<parameter name="aFlavour"/>
|
<parameter name="aFlavour"/>
|
||||||
@ -1727,13 +1728,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
var isTabDrag = (aDragSession.sourceNode.parentNode == this.mTabContainer);
|
var isTabDrag = (aDragSession.sourceNode.parentNode == this.mTabContainer);
|
||||||
if (!isTabDrag && aEvent.target.localName == "tab") {
|
if (!isTabDrag)
|
||||||
if (!this.mDragTime)
|
|
||||||
this.mDragTime = Date.now();
|
|
||||||
if (Date.now() >= this.mDragTime + this.mDragOverDelay)
|
|
||||||
this.mTabContainer.selectedItem = aEvent.target;
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
var newIndex = this.getNewIndex(aEvent);
|
var newIndex = this.getNewIndex(aEvent);
|
||||||
|
|
||||||
@ -1892,8 +1888,6 @@
|
|||||||
<parameter name="aDragSession"/>
|
<parameter name="aDragSession"/>
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
this.mDragTime = 0;
|
|
||||||
|
|
||||||
if (aDragSession.sourceNode &&
|
if (aDragSession.sourceNode &&
|
||||||
aDragSession.sourceNode.parentNode == this.mTabContainer &&
|
aDragSession.sourceNode.parentNode == this.mTabContainer &&
|
||||||
aDragSession.canDrop) {
|
aDragSession.canDrop) {
|
||||||
@ -2390,6 +2384,9 @@
|
|||||||
onget="return this.mCurrentBrowser.userTypedValue;"
|
onget="return this.mCurrentBrowser.userTypedValue;"
|
||||||
onset="return this.mCurrentBrowser.userTypedValue = val;"/>
|
onset="return this.mCurrentBrowser.userTypedValue = val;"/>
|
||||||
|
|
||||||
|
<property name="forceSyncURLBarUpdate"
|
||||||
|
onget="return this.mModalDialogShowing;"/>
|
||||||
|
|
||||||
<method name="createTooltip">
|
<method name="createTooltip">
|
||||||
<parameter name="event"/>
|
<parameter name="event"/>
|
||||||
<body>
|
<body>
|
||||||
@ -2483,6 +2480,7 @@
|
|||||||
|
|
||||||
for (var i = 0; i < browsers.length; ++i) {
|
for (var i = 0; i < browsers.length; ++i) {
|
||||||
if (this.getBrowserAtIndex(i).contentWindow == targetTop) {
|
if (this.getBrowserAtIndex(i).contentWindow == targetTop) {
|
||||||
|
this.mModalDialogShowing = true;
|
||||||
this.selectedTab = this.mTabContainer.childNodes[i];
|
this.selectedTab = this.mTabContainer.childNodes[i];
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@ -2490,6 +2488,14 @@
|
|||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
|
<handler event="DOMModalDialogClosed" phase="capturing">
|
||||||
|
<![CDATA[
|
||||||
|
if (!event.isTrusted)
|
||||||
|
return;
|
||||||
|
|
||||||
|
this.mModalDialogShowing = false;
|
||||||
|
]]>
|
||||||
|
</handler>
|
||||||
</handlers>
|
</handlers>
|
||||||
</binding>
|
</binding>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user