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

Bug 399310 - Add Firefox Sidebar API to SeaMonkey Sidebar. r+moa=Mnyromyr

This commit is contained in:
Manuel Reimer 2010-11-10 08:42:00 +01:00
Родитель b6de54dbe6
Коммит a7038f4252
8 изменённых файлов: 170 добавлений и 125 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
suite/common/jar.mn
Просмотреть файл

@ -238,7 +238,6 @@ comm.jar:
content/communicator/sidebar/customize-panel.xul (sidebar/customize-panel.xul)
content/communicator/sidebar/customize.js (sidebar/customize.js)
content/communicator/sidebar/customize.xul (sidebar/customize.xul)
content/communicator/sidebar/local-panels.rdf (sidebar/local-panels.rdf)
content/communicator/sidebar/PageNotFound.xul (sidebar/PageNotFound.xul)
content/communicator/sidebar/preview.js (sidebar/preview.js)
content/communicator/sidebar/preview.xul (sidebar/preview.xul)

11
suite/common/sidebar/customize.js
Просмотреть файл

@ -502,7 +502,16 @@ function Save()
current_panels = sidebarObj.container.GetElements();
while (current_panels.hasMoreElements()) {
panel = current_panels.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
if (panel.Value in panels) {
// "Check if the item is one of the broadcaster panels imported to RDF from
// mainBroadcasterSet. If so, then don't remove it from datasource.
var master_list = sidebarObj.datasource.GetTarget(RDF.GetResource(allPanelsObj.resource), RDF.GetResource(NC + "panel-list"), true);
var masterSeq = Components.classes["@mozilla.org/rdf/container;1"]
.createInstance(Components.interfaces.nsIRDFContainer);
masterSeq.Init(sidebarObj.datasource, master_list);
var inmaster = (masterSeq.IndexOf(panel) != -1);
if (panel.Value in panels || inmaster) {
// This panel will remain in the sidebar.
// Remove the resource, but keep all the other attributes.
// Removing it will allow it to be added in the correct order.

70
suite/common/sidebar/local-panels.rdf
Просмотреть файл

@ -1,70 +0,0 @@
<?xml version="1.0"?> <!-- -*- Mode: SGML -*- -->
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Stephen Lamm <slamm@netscape.com>
- Chris Waterson <waterson@netscape.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!DOCTYPE RDF SYSTEM "chrome://communicator/locale/sidebar/local-panels.dtd" >
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:nc="http://home.netscape.com/NC-rdf#">
<rdf:Description about="urn:sidebar:master-panel-list">
<nc:panel-list>
<rdf:Seq>
<rdf:li resource="urn:sidebar:panel:search"/>
<rdf:li resource="urn:sidebar:panel:bookmarks"/>
<rdf:li resource="urn:sidebar:panel:history"/>
<rdf:li resource="urn:sidebar:panel:addressbook"/>
</rdf:Seq>
</nc:panel-list>
</rdf:Description>
<rdf:Description about="urn:sidebar:panel:search">
<nc:title>&sidebar.search.label;</nc:title>
<nc:content>chrome://communicator/content/search/search-panel.xul</nc:content>
</rdf:Description>
<rdf:Description about="urn:sidebar:panel:bookmarks">
<nc:title>&sidebar.client-bookmarks.label;</nc:title>
<nc:content>chrome://communicator/content/bookmarks/bm-panel.xul</nc:content>
</rdf:Description>
<rdf:Description about="urn:sidebar:panel:history">
<nc:title>&sidebar.client-history.label;</nc:title>
<nc:content>chrome://communicator/content/history/history-panel.xul</nc:content>
</rdf:Description>
<rdf:Description about="urn:sidebar:panel:addressbook">
<nc:title>&sidebar.client-addressbook.label;</nc:title>
<nc:content>chrome://messenger/content/addressbook/addressbook-panel.xul</nc:content>
</rdf:Description>
</rdf:RDF>

133
suite/common/sidebar/sidebarOverlay.js
Просмотреть файл

@ -1,4 +1,4 @@
/* -*- Mode: Java; tab-width: 4; insert-tabs-mode: nil; c-basic-offset: 2 -*-
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -583,7 +583,7 @@ sbPanel.prototype.is_persistent =
function ()
{
var rv = false;
var datasource = RDF.GetDataSource(sidebarObj.datasource_uri);
var datasource = sidebarObj.datasource;
var persistNode = datasource.GetTarget(RDF.GetResource(this.id),
RDF.GetResource(NC + "persist"),
true);
@ -739,15 +739,19 @@ function sidebar_overlay_init() {
gMustInit = false;
sidebarObj.panels = new sbPanelList('sidebar-panels');
sidebarObj.datasource_uri = get_sidebar_datasource_uri();
sidebarObj.datasource = RDF.GetDataSourceBlocking(sidebarObj.datasource_uri);
sidebarObj.resource = 'urn:sidebar:current-panel-list';
sidebarObj.master_datasources = "";
sidebarObj.master_datasources = get_remote_datasource_url();
sidebarObj.master_datasources += " chrome://communicator/content/sidebar/local-panels.rdf";
sidebarObj.master_datasources += " " + sidebarObj.datasource_uri;
sidebarObj.master_resource = 'urn:sidebar:master-panel-list';
sidebarObj.component = document.documentElement.getAttribute('windowtype');
debug("sidebarObj.component is " + sidebarObj.component);
// Sync RDF with broadcasters.
SidebarBroadcastersToRDF();
// Initialize the display
var sidebar_element = document.getElementById('sidebar-box');
var sidebar_menuitem = document.getElementById('sidebar-menu');
@ -814,7 +818,7 @@ function sidebar_open_default_panel(wait, tries) {
return;
gBusyOpeningDefault = true;
var ds = RDF.GetDataSource(sidebarObj.datasource_uri);
var ds = sidebarObj.datasource;
var currentListRes = RDF.GetResource("urn:sidebar:current-panel-list");
var panelListRes = RDF.GetResource("http://home.netscape.com/NC-rdf#panel-list");
var container = ds.GetTarget(currentListRes, panelListRes, true);
@ -874,7 +878,6 @@ function check_for_missing_panels() {
channel.open();
}
catch(ex if (ex.result == NS_ERROR_FILE_NOT_FOUND)) {
sidebarObj.datasource = RDF.GetDataSource(sidebarObj.datasource_uri);
sidebarObj.datasource.Assert(RDF.GetResource(currHeader.getAttribute("id")),
RDF.GetResource(NC + "exclude"),
RDF.GetLiteral(sidebarObj.component),
@ -928,7 +931,7 @@ function sidebar_revert_to_default_panels() {
sidebar_file = sidebar_get_panels_file();
debug("sidebar defaults reloaded");
var datasource = RDF.GetDataSource(sidebarObj.datasource_uri);
var datasource = sidebarObj.datasource;
datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource).Refresh(true);
} catch (ex) {
debug("Error: Unable to reload panel defaults file.\n");
@ -977,7 +980,7 @@ function get_remote_datasource_url() {
}
function sidebar_fixup_datasource() {
var datasource = RDF.GetDataSource(sidebarObj.datasource_uri);
var datasource = sidebarObj.datasource;
var resource = RDF.GetResource(sidebarObj.resource);
var panel_list = datasource.GetTarget(resource,
@ -1243,7 +1246,7 @@ function SidebarShowHide() {
function SidebarBuildPickerPopup() {
var menu = document.getElementById('sidebar-panel-picker-popup');
menu.database.AddDataSource(RDF.GetDataSource(sidebarObj.datasource_uri));
menu.database.AddDataSource(sidebarObj.datasource);
menu.builder.rebuild();
for (var ii=3; ii < menu.childNodes.length; ii++) {
@ -1261,7 +1264,6 @@ function SidebarBuildPickerPopup() {
function SidebarTogglePanel(panel_menuitem) {
// Create a "container" wrapper around the current panels to
// manipulate the RDF:Seq more easily.
sidebarObj.datasource = RDF.GetDataSource(sidebarObj.datasource_uri);
var did_exclude = false;
var panel_id = panel_menuitem.getAttribute('id');
@ -1625,6 +1627,119 @@ if (!SB_DEBUG) {
}
}
function SidebarBroadcastersToRDF()
{
// Translation rules to translate between new broadcaster id and old RDF id.
const TRANSLATE = {viewBookmarksSidebar: "bookmarks",
viewHistorySidebar: "history",
viewSearchSidebar: "search",
viewAddressbookSidebar: "addressbook"};
const URN_PREFIX = "urn:sidebar:panel:";
const RDFCU = Components.classes['@mozilla.org/rdf/container-utils;1']
.getService(Components.interfaces.nsIRDFContainerUtils);
/*
* Initialize RDF stuff.
*/
let ds = sidebarObj.datasource;
let panelListRes = RDF.GetResource(NC + "panel-list");
let currentListRes = RDF.GetResource(sidebarObj.resource);
let masterListRes = RDF.GetResource(sidebarObj.master_resource);
let currentTarget = ds.GetTarget(currentListRes, panelListRes, true);
let masterTarget = ds.GetTarget(masterListRes, panelListRes, true);
if (!masterTarget) {
// No "master-panel-list" found, so create it.
masterTarget = RDF.GetAnonymousResource();
ds.Assert(masterListRes, panelListRes, masterTarget, true);
}
let currentSeq = RDFCU.MakeSeq(ds, currentTarget);
let masterSeq = RDFCU.MakeSeq(ds, masterTarget);
/*
* Run over broadcasters in browser window and add/update RDF entries
* based on them.
*/
let titleRes = RDF.GetResource(NC + "title");
let urlRes = RDF.GetResource(NC + "content");
let bset = document.getElementById("mainBroadcasterSet");
let broadcasters = bset.getElementsByTagName("broadcaster");
let bclist = {};
for (let bId = 0; bId < broadcasters.length; bId++) {
let curBC = broadcasters[bId];
let title = curBC.getAttribute("sidebartitle") || curBC.getAttribute("label");
let url = curBC.getAttribute("sidebarurl");
let bcid = (curBC.id in TRANSLATE) ? TRANSLATE[curBC.id] : curBC.id;
if (!url || !title || !bcid)
continue;
// This one is needed later to check for obsolete sidebars.
bclist[bcid] = 1;
let panelRes = RDF.GetResource(URN_PREFIX + bcid);
// Literals of values that should be in RDF.
let titleLit = RDF.GetLiteral(title);
let urlLit = RDF.GetLiteral(url);
// Literals of values that are in RDF.
let curtitleLit = ds.GetTarget(panelRes, titleRes, true);
let cururlLit = ds.GetTarget(panelRes, urlRes, true);
// If the item doesn't already exist, create it.
if (!curtitleLit && !cururlLit) {
ds.Assert(panelRes, titleRes, titleLit, true);
ds.Assert(panelRes, urlRes, titleLit, true);
masterSeq.AppendElement(panelRes);
if (currentSeq.IndexOf(panelRes) == -1)
currentSeq.AppendElement(panelRes);
}
// Item already exists, but perhaps we need to update...
else {
let curtitle = curtitleLit.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
let cururl = cururlLit.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
if (curtitle != title)
ds.Change(panelRes, titleRes, curtitleLit, titleLit);
if (cururl != url)
ds.Change(panelRes, urlRes, cururlLit, urlLit);
}
}
/*
* Do the same the other way around to delete obsolete sidebars.
*/
let masterElements = masterSeq.GetElements();
while (masterElements.hasMoreElements()) {
let curElementRes = masterElements.getNext();
let curId = curElementRes.QueryInterface(Components.interfaces.nsIRDFResource).Value;
if (curId.substr(0, URN_PREFIX.length) != URN_PREFIX)
continue;
curId = curId.substr(URN_PREFIX.length);
if (!(curId in bclist)) {
let properties = ds.ArcLabelsOut(curElementRes);
while(properties.hasMoreElements()) {
let propertyRes = properties.getNext();
let valueLit = ds.GetTarget(curElementRes, propertyRes, true);
ds.Unassert(curElementRes, propertyRes, valueLit);
}
masterSeq.RemoveElement(curElementRes, true);
if (currentSeq.IndexOf(curElementRes) != -1)
currentSeq.RemoveElement(curElementRes, true);
}
}
// Write modified data.
sidebarObj.datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource).Flush();
}
//////////////////////////////////////////////////////////////
// Install the load/unload handlers
//////////////////////////////////////////////////////////////

32
suite/common/sidebar/sidebarOverlay.xul
Просмотреть файл

@ -49,6 +49,38 @@
<overlay id="sidebarOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- Overlay of broadcasterset to get our panels in -->
<broadcasterset id="mainBroadcasterSet">
<broadcaster id="viewBookmarksSidebar"
autoCheck="false"
type="checkbox"
group="sidebar"
sidebartitle="&sidebar.client-bookmarks.label;"
sidebarurl="chrome://communicator/content/bookmarks/bm-panel.xul"
oncommand="toggleSidebar('viewBookmarksSidebar');"/>
<broadcaster id="viewHistorySidebar"
autoCheck="false"
type="checkbox"
group="sidebar"
sidebartitle="&sidebar.client-history.label;"
sidebarurl="chrome://communicator/content/history/history-panel.xul"
oncommand="toggleSidebar('viewHistorySidebar');"/>
<broadcaster id="viewSearchSidebar"
autoCheck="false"
type="checkbox"
group="sidebar"
sidebartitle="&sidebar.search.label;"
sidebarurl="chrome://communicator/content/search/search-panel.xul"
oncommand="toggleSidebar('viewSearchSidebar');"/>
<broadcaster id="viewAddressbookSidebar"
autoCheck="false"
type="checkbox"
group="sidebar"
sidebartitle="&sidebar.client-addressbook.label;"
sidebarurl="chrome://messenger/content/addressbook/addressbook-panel.xul"
oncommand="toggleSidebar('viewAddressbookSidebar');"/>
</broadcasterset>
<command id="toggleSidebar" oncommand="SidebarShowHide();"/>
<key id="showHideSidebar" keycode="VK_F9" command="toggleSidebar"/>
<menupopup id="sidebarPopup"

43
suite/locales/en-US/chrome/common/sidebar/local-panels.dtd
Просмотреть файл

@ -1,43 +0,0 @@
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Stephen Lamm <slamm@netscape.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!-- extracted from ./local-panels.rdf -->
<!ENTITY sidebar.search.label "Search">
<!ENTITY sidebar.client-bookmarks.label "Bookmarks">
<!ENTITY sidebar.client-history.label "History">
<!ENTITY sidebar.client-addressbook.label "Address Book">

4
suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
Просмотреть файл

@ -63,3 +63,7 @@
<!ENTITY sidebar.close.tooltip "Close Sidebar">
<!ENTITY sidebar.open.tooltip "Open Sidebar">
<!ENTITY sidebar.search.label "Search">
<!ENTITY sidebar.client-bookmarks.label "Bookmarks">
<!ENTITY sidebar.client-history.label "History">
<!ENTITY sidebar.client-addressbook.label "Address Book">

1
suite/locales/jar.mn
Просмотреть файл

@ -185,7 +185,6 @@
locale/@AB_CD@/communicator/profile/profileSelection.properties (%chrome/common/profile/profileSelection.properties)
locale/@AB_CD@/communicator/search/search-panel.dtd (%chrome/common/search/search-panel.dtd)
locale/@AB_CD@/communicator/sidebar/customize.dtd (%chrome/common/sidebar/customize.dtd)
locale/@AB_CD@/communicator/sidebar/local-panels.dtd (%chrome/common/sidebar/local-panels.dtd)
locale/@AB_CD@/communicator/sidebar/preview.dtd (%chrome/common/sidebar/preview.dtd)
locale/@AB_CD@/communicator/sidebar/sidebar.properties (%chrome/common/sidebar/sidebar.properties)
locale/@AB_CD@/communicator/sidebar/sidebarOverlay.dtd (%chrome/common/sidebar/sidebarOverlay.dtd)