mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 302575 URL bar gets confused about which URI is loaded r=bz sr=darin

This commit is contained in:
neil%parkwaycc.co.uk 2005-08-31 21:00:40 +00:00
Родитель 60fbbca06b
Коммит c4b6a07345
2 изменённых файлов: 64 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

30
toolkit/content/widgets/browser.xml
Просмотреть файл

@ -88,8 +88,15 @@
<body> <body>
<![CDATA[ <![CDATA[
var webNavigation = this.webNavigation; var webNavigation = this.webNavigation;
if (webNavigation.canGoBack) if (webNavigation.canGoBack) {
try {
this.userTypedClear++;
webNavigation.goBack(); 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) {
try {
this.userTypedClear++;
webNavigation.goForward(); webNavigation.goForward();
} finally {
if (this.userTypedClear)
this.userTypedClear--;
}
}
]]> ]]>
</body> </body>
</method> </method>
@ -167,7 +181,13 @@
} }
} }
this.mIconURL = null; this.mIconURL = null;
try {
this.userTypedClear++;
this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, aPostData, null); 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[
try {
this.userTypedClear++;
this.webNavigation.gotoIndex(aIndex); this.webNavigation.gotoIndex(aIndex);
} finally {
if (this.userTypedClear)
this.userTypedClear--;
}
]]> ]]>
</body> </body>
</method> </method>

30
xpfe/global/resources/content/bindings/browser.xml
Просмотреть файл

@ -64,8 +64,15 @@
<body> <body>
<![CDATA[ <![CDATA[
var webNavigation = this.webNavigation; var webNavigation = this.webNavigation;
if (webNavigation.canGoBack) if (webNavigation.canGoBack) {
try {
this.userTypedClear++;
webNavigation.goBack(); 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) {
try {
this.userTypedClear++;
webNavigation.goForward(); webNavigation.goForward();
} finally {
if (this.userTypedClear)
this.userTypedClear--;
}
}
]]> ]]>
</body> </body>
</method> </method>
@ -141,7 +155,13 @@
catch (e) { catch (e) {
} }
} }
try {
this.userTypedClear++;
this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, null, null); 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[
try {
this.userTypedClear++;
this.webNavigation.gotoIndex(aIndex); this.webNavigation.gotoIndex(aIndex);
} finally {
if (this.userTypedClear)
this.userTypedClear--;
}
]]> ]]>
</body> </body>
</method> </method>