зеркало из https://github.com/mozilla/gecko-dev.git
4912 an't open bookmarks when no other window open
This commit is contained in:
Родитель
f002a3fe71
Коммит
115319f3ac
|
@ -655,9 +655,16 @@ function UpdateBookmarksLastVisitedDate(event)
|
|||
if (url.substring(0, 3) == "NC:") {
|
||||
return false;
|
||||
}
|
||||
|
||||
window.content.location.href = url;
|
||||
RefreshUrlbar();
|
||||
// Check if we have a browser window
|
||||
if ( window.content == null )
|
||||
{
|
||||
window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url );
|
||||
}
|
||||
else
|
||||
{
|
||||
window.content.location.href = url;
|
||||
RefreshUrlbar();
|
||||
}
|
||||
}
|
||||
|
||||
function OpenSearch(tabName, searchStr)
|
||||
|
|
|
@ -259,21 +259,21 @@ Contributor(s): ______________________________________. -->
|
|||
ondraggesture="return BeginDragPersonalToolbar(event);"
|
||||
ondragdrop="return DropPersonalToolbar(event);"
|
||||
ondragover="return DragOverPersonalToolbar(event);"
|
||||
onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')">
|
||||
>
|
||||
|
||||
<!-- This template builds content from the bookmarks datasource -->
|
||||
<template>
|
||||
<!-- Rules for content hanging _directly_ off the toolbar -->
|
||||
<rule parent="toolbar" iscontainer="true">
|
||||
<menu uri="...">
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"
|
||||
align="left" />
|
||||
<menupopup />
|
||||
</menu>
|
||||
</rule>
|
||||
<rule parent="toolbar">
|
||||
<titledbutton uri="..." align="left"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
|
||||
</rule>
|
||||
|
||||
<!-- Recursive rules for nested folders -->
|
||||
|
@ -288,7 +288,7 @@ Contributor(s): ______________________________________. -->
|
|||
<rule>
|
||||
<menupopup>
|
||||
<menuitem align="left" uri="..."
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
|
|
@ -655,9 +655,16 @@ function UpdateBookmarksLastVisitedDate(event)
|
|||
if (url.substring(0, 3) == "NC:") {
|
||||
return false;
|
||||
}
|
||||
|
||||
window.content.location.href = url;
|
||||
RefreshUrlbar();
|
||||
// Check if we have a browser window
|
||||
if ( window.content == null )
|
||||
{
|
||||
window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url );
|
||||
}
|
||||
else
|
||||
{
|
||||
window.content.location.href = url;
|
||||
RefreshUrlbar();
|
||||
}
|
||||
}
|
||||
|
||||
function OpenSearch(tabName, searchStr)
|
||||
|
|
|
@ -259,21 +259,21 @@ Contributor(s): ______________________________________. -->
|
|||
ondraggesture="return BeginDragPersonalToolbar(event);"
|
||||
ondragdrop="return DropPersonalToolbar(event);"
|
||||
ondragover="return DragOverPersonalToolbar(event);"
|
||||
onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')">
|
||||
>
|
||||
|
||||
<!-- This template builds content from the bookmarks datasource -->
|
||||
<template>
|
||||
<!-- Rules for content hanging _directly_ off the toolbar -->
|
||||
<rule parent="toolbar" iscontainer="true">
|
||||
<menu uri="...">
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"
|
||||
align="left" />
|
||||
<menupopup />
|
||||
</menu>
|
||||
</rule>
|
||||
<rule parent="toolbar">
|
||||
<titledbutton uri="..." align="left"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
|
||||
</rule>
|
||||
|
||||
<!-- Recursive rules for nested folders -->
|
||||
|
@ -288,7 +288,7 @@ Contributor(s): ______________________________________. -->
|
|||
<rule>
|
||||
<menupopup>
|
||||
<menuitem align="left" uri="..."
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
|
Загрузка…
Ссылка в новой задаче