Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checking in patch for bug 248612 again, this causes 10% argo Ts regression, but other tinderboxes are not affected, see discussion in bug 248612

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@213950 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
martijn.martijn%gmail.com 2006-10-21 09:09:09 +00:00
parent b9e142b17e
commit 302913b105
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/browser/base/content/browser.js
View File

@ -3850,17 +3850,9 @@ nsBrowserStatusHandler.prototype =
} catch (ex) {}
}
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);
}
gURLBar.value = ""; // hack for bug 249322
gURLBar.value = location;
SetPageProxyState("valid");
// Setting the urlBar value in some cases causes userTypedValue to
// become set because of oninput, so reset it to its old value.

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

@ -180,9 +180,6 @@
<field name="mContextTab">
null
</field>
<field name="mModalDialogShowing">
false
</field>
<field name="arrowKeysShouldWrap" readonly="true">
#ifdef XP_MACOSX
true
@ -1699,6 +1696,8 @@
</body>
</method>
<field name="mDragTime">0</field>
<field name="mDragOverDelay">350</field>
<method name="onDragOver">
<parameter name="aEvent"/>
<parameter name="aFlavour"/>
@ -1726,8 +1725,13 @@
}
var isTabDrag = (aDragSession.sourceNode.parentNode == this.mTabContainer);
if (!isTabDrag)
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;
return;
}
var newIndex = this.getNewIndex(aEvent);
@ -1886,6 +1890,8 @@
<parameter name="aDragSession"/>
<body>
<![CDATA[
this.mDragTime = 0;
if (aDragSession.sourceNode &&
aDragSession.sourceNode.parentNode == this.mTabContainer &&
aDragSession.canDrop) {
@ -2382,9 +2388,6 @@
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>
@ -2478,7 +2481,6 @@
for (var i = 0; i < browsers.length; ++i) {
if (this.getBrowserAtIndex(i).contentWindow == targetTop) {
this.mModalDialogShowing = true;
this.selectedTab = this.mTabContainer.childNodes[i];
break;
@ -2486,14 +2488,6 @@
}
]]>
</handler>
<handler event="DOMModalDialogClosed" phase="capturing">
<![CDATA[
if (!event.isTrusted)
return;
this.mModalDialogShowing = false;
]]>
</handler>
</handlers>
</binding>