[Pkg-mozext-commits] [sage-extension] 17/54: Livemarks integration, bug 7302
David Prévot
taffit at moszumanska.debian.org
Fri May 1 03:10:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag sage_1_3
in repository sage-extension.
commit 15fadd9e9a7ed406962286c8c5ca7c9424ee9276
Author: Peter Andrews <petea at jhu.edu>
Date: Tue Sep 28 12:40:42 2004 +0000
Livemarks integration, bug 7302
---
src/sage/content/bookmarksTree.xml | 68 +++++++++++++++++++++-----------------
src/sage/content/sage.js | 16 ++++++---
src/sage/content/sage.xul | 44 ++++++++++++------------
src/sage/content/updatechecker.js | 2 +-
src/sage/locale/en-US/sage.dtd | 2 +-
5 files changed, 73 insertions(+), 59 deletions(-)
diff --git a/src/sage/content/bookmarksTree.xml b/src/sage/content/bookmarksTree.xml
index 8378d28..4eab153 100755
--- a/src/sage/content/bookmarksTree.xml
+++ b/src/sage/content/bookmarksTree.xml
@@ -6,53 +6,61 @@
]>
<bindings id="bookmarksBindings"
- xmlns="http://www.mozilla.org/xbl"
- xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:xbl="http://www.mozilla.org/xbl">
+ xmlns="http://www.mozilla.org/xbl"
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:xbl="http://www.mozilla.org/xbl">
- <binding id="bookmarks-tree-name" extends="chrome://browser/content/bookmarks/bookmarksTree.xml#bookmarks-tree">
+ <binding id="bookmarks-tree-name" extends="chrome://browser/content/bookmarks/bookmarksTree.xml#bookmarks-tree">
<xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- xmlns:xbl="http://www.mozilla.org/xbl" contextmenu="_child">
- <!-- context menu -->
- <menupopup xbl:inherits="onpopupshowing"
- onpopupshowing="this.parentNode.createTreeContextMenu(event);createTreeContextMenu2(event)"
- onpopuphidden="if (content) content.focus()"
- onclick="event.preventBubble();"
- onkeypress="event.preventBubble();"/>
- <tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
+ xmlns:xbl="http://www.mozilla.org/xbl" contextmenu="_child">
+ <!-- context menu -->
+ <menupopup xbl:inherits="onpopupshowing"
+ onpopupshowing="this.parentNode.createTreeContextMenu(event);createTreeContextMenu2(event)"
+ onpopuphidden="if (content) content.focus()"
+ onclick="event.preventBubble();"
+ onkeypress="event.preventBubble();"/>
+ <tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
datasources="rdf:bookmarks rdf:internetsearch rdf:localsearch" ref="NC:BookmarksRoot" flags="dont-build-content"
onselect="this.parentNode.treeBoxObject.view.selectionChanged();" seltype="single">
<template xmlns:nc="http://home.netscape.com/NC-rdf#">
- <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+ <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
<treechildren>
- <treeitem uri="rdf:*">
+ <treeitem uri="rdf:*">
<treerow properties="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type separator">
- <treecell properties="separator" label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+ <treecell properties="separator" label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</treerow>
- </treeitem>
+ </treeitem>
</treechildren>
- </rule>
- <rule>
+ </rule>
+ <rule rdf:type="http://home.netscape.com/NC-rdf#Livemark">
<treechildren>
- <treeitem uri="rdf:*">
+ <treeitem uri="rdf:*">
<treerow properties="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type rdf:http://home.netscape.com/NC-rdf#loading rdf:http://home.netscape.com/WEB-rdf#status">
- <treecell label="rdf:http://home.netscape.com/NC-rdf#Name"
- properties="rdf:http://home.netscape.com/NC-rdf#Description rss"/>
+ <treecell label="rdf:http://home.netscape.com/NC-rdf#Name" properties="rdf:http://home.netscape.com/NC-rdf#Description rss"/>
</treerow>
- </treeitem>
+ </treeitem>
</treechildren>
- </rule>
+ </rule>
+ <rule>
+ <treechildren>
+ <treeitem uri="rdf:*">
+ <treerow properties="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type rdf:http://home.netscape.com/NC-rdf#loading rdf:http://home.netscape.com/WEB-rdf#status">
+ <treecell label="rdf:http://home.netscape.com/NC-rdf#Name" properties="rdf:http://home.netscape.com/NC-rdf#Description rss"/>
+ </treerow>
+ </treeitem>
+ </treechildren>
+ </rule>
</template>
<treecols anonid="treecols">
- <treecol id="Name" flex="1" primary="true" hideheader="true"
- sort="rdf:http://home.netscape.com/NC-rdf#Name"
- sortActive="true" sortDirection="none"/>
+ <treecol id="Name" flex="1" primary="true" hideheader="true"
+ sort="rdf:http://home.netscape.com/NC-rdf#Name"
+ sortActive="true" sortDirection="none"/>
</treecols>
- </tree>
+ </tree>
</xbl:content>
<implementation>
- <field name="clickCount">1</field>
+ <field name="clickCount">1</field>
</implementation>
- </binding>
+ </binding>
</bindings>
diff --git a/src/sage/content/sage.js b/src/sage/content/sage.js
index 8bb55bd..2942b6b 100755
--- a/src/sage/content/sage.js
+++ b/src/sage/content/sage.js
@@ -159,14 +159,20 @@ function updateCheck(aCheckFolderId) {
}
}
-function BookmarkResource(aRes, aDB){
+function BookmarkResource(aRes, aDB) {
this.res = aRes;
this.db = aDB;
this.name = BookmarksUtils.getProperty(this.res, NC_NS + "Name", this.db);
- this.url = BookmarksUtils.getProperty(this.res, NC_NS + "URL", this.db);
+ if(BookmarksUtils.getProperty(this.res, RDF_NS + "type", this.db) == NC_NS + "Bookmark") {
+ this.url = BookmarksUtils.getProperty(this.res, NC_NS + "URL", this.db);
+ }
+ if(BookmarksUtils.getProperty(this.res, RDF_NS + "type", this.db) == NC_NS + "Livemark") {
+ this.url = BookmarksUtils.getProperty(this.res, NC_NS + "FeedURL", this.db);
+ }
+
}
-function bookmarksOpen(){
+function bookmarksOpen() {
lastResource = new BookmarkResource(bookmarksTree.currentResource, bookmarksTree.db);
setStatusLoading();
httpGet(lastResource.url);
@@ -198,7 +204,7 @@ function createTreeContextMenu2(aEvent) {
}
}
-function bookmarksTreeClick(aEvent){
+function bookmarksTreeClick(aEvent) {
if(aEvent.type == "click") {
if(aEvent.button == 2 || aEvent.originalTarget.localName != "treechildren") {
return;
@@ -219,7 +225,7 @@ function bookmarksTreeClick(aEvent){
const BOOKMARK_TYPE = RDF_NS + "type";
const BOOKMARK_SEPARATOR = NC_NS + "BookmarkSeparator";
const BOOKMARK_FOLDER = NC_NS + "Folder"
- var bookmarkType = (BookmarksUtils.getProperty(bookmarksTree.currentResource, BOOKMARK_TYPE , bookmarksTree.db))
+ var bookmarkType = BookmarksUtils.getProperty(bookmarksTree.currentResource, BOOKMARK_TYPE , bookmarksTree.db)
if(bookmarkType == BOOKMARK_SEPARATOR || bookmarkType == BOOKMARK_FOLDER) {
return;
}
diff --git a/src/sage/content/sage.xul b/src/sage/content/sage.xul
index 7a83c48..fefb781 100755
--- a/src/sage/content/sage.xul
+++ b/src/sage/content/sage.xul
@@ -88,28 +88,28 @@
<vbox flex="1">
-<vbox id="bookmarksTreeBox" flex="1" persist="height">
- <bookmarks-tree id="bookmarksTree" type="single-column" flex="1"
- onkeypress="if(event.keyCode == 13) bookmarksTreeClick(event)"
- ondraggesture="if(event.originalTarget.localName == 'treechildren') nsDragAndDrop.startDrag(event, this.DNDObserver);"
- onclick="bookmarksTreeClick(event)"/>
-</vbox>
-
-<splitter id="sage-splitter"/>
-
-<vbox id="rssItemListBoxBox" flex="1" persist="height">
- <sidebarheader id="feedTitleBar" align="center">
- <hbox align="center" flex="1">
- <label id="rssTitleLabel" flex="1" crop="end" value="" onclick="rssTitleLabelClick(this, event)"/>
- </hbox>
- </sidebarheader>
-
- <listbox id="rssItemListBox" class="plain" flex="1"
- tooltip="rssItemToolTip"
- contextmenu="rssItemListBoxContextMenu"
- onkeypress="if(event.keyCode == 13) rssItemListBoxClick(event)"
- onclick="rssItemListBoxClick(event)"/>
-</vbox>
+ <vbox id="bookmarksTreeBox" flex="1" persist="height">
+ <bookmarks-tree id="bookmarksTree" type="single-column" flex="1"
+ onkeypress="if(event.keyCode == 13) bookmarksTreeClick(event)"
+ ondraggesture="if(event.originalTarget.localName == 'treechildren') nsDragAndDrop.startDrag(event, this.DNDObserver);"
+ onclick="bookmarksTreeClick(event)"/>
+ </vbox>
+
+ <splitter id="sage-splitter"/>
+
+ <vbox id="rssItemListBoxBox" flex="1" persist="height">
+ <sidebarheader id="feedTitleBar" align="center">
+ <hbox align="center" flex="1">
+ <label id="rssTitleLabel" flex="1" crop="end" value="" onclick="rssTitleLabelClick(this, event)"/>
+ </hbox>
+ </sidebarheader>
+
+ <listbox id="rssItemListBox" class="plain" flex="1"
+ tooltip="rssItemToolTip"
+ contextmenu="rssItemListBoxContextMenu"
+ onkeypress="if(event.keyCode == 13) rssItemListBoxClick(event)"
+ onclick="rssItemListBoxClick(event)"/>
+ </vbox>
</vbox>
diff --git a/src/sage/content/updatechecker.js b/src/sage/content/updatechecker.js
index c36f07a..f27d57e 100755
--- a/src/sage/content/updatechecker.js
+++ b/src/sage/content/updatechecker.js
@@ -10,7 +10,7 @@ var UpdateChecker = {
var resourceList = CommonFunc.getBMDSCChildren(aCheckFolderId);
this.checkList = new Array();
- // Delete separator and updeed resource
+ // select feeds to be checked, exclude separators and updated feeds
for(var i = 0; i < resourceList.length; i++) {
var url = CommonFunc.getBMDSProperty(resourceList[i], CommonFunc.BM_URL);
var desc = CommonFunc.getBMDSProperty(resourceList[i], CommonFunc.BM_DESCRIPTION);
diff --git a/src/sage/locale/en-US/sage.dtd b/src/sage/locale/en-US/sage.dtd
index b558b79..015cb36 100755
--- a/src/sage/locale/en-US/sage.dtd
+++ b/src/sage/locale/en-US/sage.dtd
@@ -43,7 +43,7 @@
<!ENTITY settingWindow.title "Sage Settings">
<!ENTITY selectFolder.label "Select Feed Folder">
<!ENTITY openInContentsArea.caption "Feed Rendering">
-<!ENTITY enableUserCss.label "Use custom CSS">
+<!ENTITY enableUserCss.label "Use custom style sheet">
<!ENTITY browseCss.label "Browse...">
<!ENTITY allowEContent.label "Allow HTML tags">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git
More information about the Pkg-mozext-commits
mailing list