зеркало из https://github.com/mozilla/gecko-dev.git
Bug 302575 URL bar gets confused about which URI is loaded r=bz sr=darin
This commit is contained in:
Родитель
60fbbca06b
Коммит
c4b6a07345
|
@ -88,8 +88,15 @@
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
var webNavigation = this.webNavigation;
|
var webNavigation = this.webNavigation;
|
||||||
if (webNavigation.canGoBack)
|
if (webNavigation.canGoBack) {
|
||||||
webNavigation.goBack();
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
webNavigation.goBack();
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
@ -98,8 +105,15 @@
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
var webNavigation = this.webNavigation;
|
var webNavigation = this.webNavigation;
|
||||||
if (webNavigation.canGoForward)
|
if (webNavigation.canGoForward) {
|
||||||
webNavigation.goForward();
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
webNavigation.goForward();
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
@ -167,7 +181,13 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.mIconURL = null;
|
this.mIconURL = null;
|
||||||
this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, aPostData, null);
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, aPostData, null);
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
@ -209,7 +229,13 @@
|
||||||
<parameter name="aIndex"/>
|
<parameter name="aIndex"/>
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
this.webNavigation.gotoIndex(aIndex);
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
this.webNavigation.gotoIndex(aIndex);
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
|
|
@ -64,8 +64,15 @@
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
var webNavigation = this.webNavigation;
|
var webNavigation = this.webNavigation;
|
||||||
if (webNavigation.canGoBack)
|
if (webNavigation.canGoBack) {
|
||||||
webNavigation.goBack();
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
webNavigation.goBack();
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
@ -74,8 +81,15 @@
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
var webNavigation = this.webNavigation;
|
var webNavigation = this.webNavigation;
|
||||||
if (webNavigation.canGoForward)
|
if (webNavigation.canGoForward) {
|
||||||
webNavigation.goForward();
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
webNavigation.goForward();
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
@ -141,7 +155,13 @@
|
||||||
catch (e) {
|
catch (e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, null, null);
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, null, null);
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
@ -183,7 +203,13 @@
|
||||||
<parameter name="aIndex"/>
|
<parameter name="aIndex"/>
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
this.webNavigation.gotoIndex(aIndex);
|
try {
|
||||||
|
this.userTypedClear++;
|
||||||
|
this.webNavigation.gotoIndex(aIndex);
|
||||||
|
} finally {
|
||||||
|
if (this.userTypedClear)
|
||||||
|
this.userTypedClear--;
|
||||||
|
}
|
||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче