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

floating sidebar items miss a "reattach" button; b=356817, r=brade

This commit is contained in:
daniel%glazman.org 2006-10-20 13:20:06 +00:00
Родитель 40de06c0ff
Коммит 58e16cbe8c
4 изменённых файлов: 37 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
composer/base/content/composer/bindings/sidebar.xml
Просмотреть файл

@ -307,12 +307,12 @@
<parameter name="aURL"/>
<body>
<![CDATA[
this.mOtherSidebar._addContent(aName, aTitle, aURL);
this.mOtherSidebar.addContent(aName, aTitle, aURL);
]]>
</body>
</method>
<method name="_addContent">
<method name="addContent">
<parameter name="aName"/>
<parameter name="aTitle"/>
<parameter name="aURL"/>
@ -356,7 +356,7 @@
<parameter name="aMenuitem"/>
<body>
<![CDATA[
this._addContent( aMenuitem.getAttribute("name"),
this.addContent( aMenuitem.getAttribute("name"),
aMenuitem.getAttribute("label"),
aMenuitem.getAttribute("src") );
]]>

20
composer/base/content/composer/dialogs/standaloneSidebar.js
Просмотреть файл

@ -84,3 +84,23 @@ function Shutdown()
doc.persist(id, "width");
doc.persist(id, "height");
}
function Reattach(aSide)
{
var sidebar;
switch (aSide)
{
case "first": sidebar = window.opener.gDialog.sidebar1; break;
case "second": sidebar = window.opener.gDialog.sidebar2; break;
default:
dump("bad sidebar descriptor\n");
return;
}
var sidebaritem = gDialog.sidebaritem;
sidebaritem.removeAttribute("standalone");
sidebar.addContent( sidebaritem.getAttribute("name"),
sidebaritem.getAttribute("title"),
sidebaritem.getAttribute("src") );
window.close();
}

12
composer/base/content/composer/dialogs/standaloneSidebar.xul
Просмотреть файл

@ -38,6 +38,9 @@
- ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://composer/skin/standaloneSidebar.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://composer/locale/standaloneSidebar.dtd">
<window
id = "standaloneSidebar"
@ -53,6 +56,15 @@
<script type="application/x-javascript" src="chrome://composer/content/utils/dgid.js"/>
<script type="application/x-javascript" src="chrome://composer/content/dialogs/standaloneSidebar.js"/>
<hbox align="center" id="mainMenu">
<spacer flex="1"/>
<toolbarbutton label="&reattachMenu.label;" type="menu">
<menupopup>
<menuitem label="&intoFirstSidebar.label;" oncommand="Reattach('first')"/>
<menuitem label="&intoSecondSidebar.label;" oncommand="Reattach('second')"/>
</menupopup>
</toolbarbutton>
</hbox>
<iframe flex="1" id="iframe"/>
</window>

2
composer/base/jar.mn
Просмотреть файл

@ -55,6 +55,7 @@ composer.jar:
skin/classic/composer/structurebar.css (skin/classic/composer/structurebar.css)
skin/classic/composer/sidebarcontent.css (skin/classic/composer/sidebarcontent.css)
skin/classic/composer/sidebar.css (skin/classic/composer/sidebar.css)
skin/classic/composer/standaloneSidebar.css (skin/classic/composer/standaloneSidebar.css)
skin/classic/composer/tabeditor.css (skin/classic/composer/tabeditor.css)
skin/classic/composer/formatToolbar.css (skin/classic/composer/formatToolbar.css)
@ -72,3 +73,4 @@ composer-locale.jar:
locale/en-US/branding/brand.properties (locale/en-US/branding/brand.properties)
locale/en-US/composer/sidebar.dtd (locale/en-US/composer/sidebar.dtd)
locale/en-US/composer/structurebar.dtd (locale/en-US/composer/structurebar.dtd)
locale/en-US/composer/standaloneSidebar.dtd (locale/en-US/composer/standaloneSidebar.dtd)