Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 10:15:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out patch for bug 248612, since it may have caused 10% argo Ts regression

Browse Source
This commit is contained in:
martijn.martijn%gmail.com 2006-10-14 22:26:57 +00:00
parent f417e3b2fe
commit 47ae4bc241
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/base/content/browser.js
View File

@ -3837,9 +3837,17 @@ nsBrowserStatusHandler.prototype =
location = locationURI.spec;
} catch (exception) {}
if (getBrowser().forceSyncURLBarUpdate) {
gURLBar.value = ""; // hack for bug 249322
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
// become set because of oninput, so reset it to its old value.

26
toolkit/content/widgets/tabbrowser.xml
View File

@ -180,6 +180,9 @@
<field name="mContextTab">
null
</field>
<field name="mModalDialogShowing">
false
</field>
<field name="arrowKeysShouldWrap" readonly="true">
#ifdef XP_MACOSX
true
@ -1698,8 +1701,6 @@
</body>
</method>
<field name="mDragTime">0</field>
<field name="mDragOverDelay">350</field>
<method name="onDragOver">
<parameter name="aEvent"/>
<parameter name="aFlavour"/>
@ -1727,13 +1728,8 @@
}
var isTabDrag = (aDragSession.sourceNode.parentNode == this.mTabContainer);
if (!isTabDrag && aEvent.target.localName == "tab") {
if (!this.mDragTime)
this.mDragTime = Date.now();
if (Date.now() >= this.mDragTime + this.mDragOverDelay)
this.mTabContainer.selectedItem = aEvent.target;
if (!isTabDrag)
return;
}
var newIndex = this.getNewIndex(aEvent);
@ -1892,8 +1888,6 @@
<parameter name="aDragSession"/>
<body>
<![CDATA[
this.mDragTime = 0;
if (aDragSession.sourceNode &&
aDragSession.sourceNode.parentNode == this.mTabContainer &&
aDragSession.canDrop) {
@ -2390,6 +2384,9 @@
onget="return this.mCurrentBrowser.userTypedValue;"
onset="return this.mCurrentBrowser.userTypedValue = val;"/>
<property name="forceSyncURLBarUpdate"
onget="return this.mModalDialogShowing;"/>
<method name="createTooltip">
<parameter name="event"/>
<body>
@ -2483,6 +2480,7 @@
for (var i = 0; i < browsers.length; ++i) {
if (this.getBrowserAtIndex(i).contentWindow == targetTop) {
this.mModalDialogShowing = true;
this.selectedTab = this.mTabContainer.childNodes[i];
break;
@ -2490,6 +2488,14 @@
}
]]>
</handler>
<handler event="DOMModalDialogClosed" phase="capturing">
<![CDATA[
if (!event.isTrusted)
return;
this.mModalDialogShowing = false;
]]>
</handler>
</handlers>
</binding>