[Pkg-mozext-commits] [sage-extension] 12/20: cleanup
David Prévot
taffit at moszumanska.debian.org
Fri May 1 03:10:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag sage_1_2
in repository sage-extension.
commit 740ee4ffeb7c2269dc31b983c9a2f132f6c15216
Author: Peter Andrews <petea at jhu.edu>
Date: Thu Jul 22 01:35:47 2004 +0000
cleanup
---
src/sage/content/createhtml.js | 16 +++++++-------
src/sage/content/discover_feeds.js | 10 +++------
src/sage/content/feedlib.js | 38 ++++++++++++++++++++++++++++++++++
src/sage/content/sage.js | 19 +++++++++++++----
src/sage/locale/fr-FR/sage.properties | 6 ++++--
src/sage/skin/classic/toolbar.png | Bin 4126 -> 4497 bytes
6 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/sage/content/createhtml.js b/src/sage/content/createhtml.js
index e5c109b..bf25306 100755
--- a/src/sage/content/createhtml.js
+++ b/src/sage/content/createhtml.js
@@ -69,6 +69,7 @@ var CreateHTML = {
createHTMLSource: function(feed) {
var allowEContent = CommonFunc.getPrefValue(CommonFunc.ALLOW_ENCODED_CONTENT, "bool", true);
var twelveHourClock = CommonFunc.getPrefValue(CommonFunc.TWELVE_HOUR_CLOCK, "bool", false);
+ var feedItemOrder = CommonFunc.getPrefValue(CommonFunc.FEED_ITEM_ORDER, "str", "chrono");
var htmlSource = this.HTML_SOURCE;
var cssUrl = this.getUserCssURL();
@@ -83,19 +84,20 @@ var CreateHTML = {
htmlSource = htmlSource.replace("**DESCRIPTION**", feed.getDescription());
var itemsSource = "";
- for(var i = 0; i < feed.getItemCount(); i++) {
- var link = feed.getItem(i).getLink();
- var title = feed.getItem(i).getTitle();
+ var items = feed.getItems(feedItemOrder);
+ for(var i = 0; i < items.length; i++) {
+ var link = items[i].getLink();
+ var title = items[i].getTitle();
var description = "";
var pubDate = "";
- if(feed.getItem(i).hasContent()) {
- description = allowEContent ? feed.getItem(i).getContent() : htmlToText(feed.getItem(i).getContent());
+ if(items[i].hasContent()) {
+ description = allowEContent ? items[i].getContent() : htmlToText(items[i].getContent());
description = "<div class=\"item-desc\">" + description + "</div>";
}
- if(feed.getItem(i).hasPubDate()) {
- pubDate = "<div class=\"item-pubDate\">" + dateFormat(feed.getItem(i).getPubDate(), twelveHourClock) + "</div>";
+ if(items[i].hasPubDate()) {
+ pubDate = "<div class=\"item-pubDate\">" + dateFormat(items[i].getPubDate(), twelveHourClock) + "</div>";
}
var itemSource = this.ITEM_SOURCE;
diff --git a/src/sage/content/discover_feeds.js b/src/sage/content/discover_feeds.js
index af60644..8a21148 100644
--- a/src/sage/content/discover_feeds.js
+++ b/src/sage/content/discover_feeds.js
@@ -52,9 +52,8 @@ function init() {
document_host = current_document.location.host;
if(document_host.match(/^www\./i)) {
- document_host = document_host.substring(4, document_host.length - 1);
+ document_host = document_host.substring(4, document_host.length);
}
- logMessage("host: " + document_host);
possibleFeeds = new Array();
@@ -63,17 +62,15 @@ function init() {
if(discoveryMode == "exhaustive") {
links = current_document.getElementsByTagName("a");
for(c = 0; c < links.length; c++) {
- if(links[c].href.match(/xml$|rss|rdf|atom/i)) {
+ if(links[c].href.match(/xml$|rss|rdf|atom|feed/i)) {
possibleFeeds[links[c].href] = Array(links[c].href, "implicit");
- logMessage("Found: " + links[c].href);
}
}
} else {
links = current_document.getElementsByTagName("a");
for(c = 0; c < links.length; c++) {
- if(links[c].href.match(/xml$|rss|rdf|atom/i) && links[c].href.match(new RegExp(document_host, "i"))) {
+ if(links[c].href.match(/xml$|rss|rdf|atom|feed/i) && links[c].href.match(new RegExp(document_host, "i"))) {
possibleFeeds[links[c].href] = Array(links[c].href, "implicit");
- logMessage("Found: " + links[c].href);
}
}
}
@@ -82,7 +79,6 @@ function init() {
for(c = 0; c < links.length; c++) {
if(links[c].rel == "alternate" && (links[c].type == "text/xml" || links[c].type == "application/atom+xml" || links[c].type == "application/rss+xml")) {
possibleFeeds[links[c].href] = Array(links[c].href, "explicit");
- logMessage("Found: " + links[c].href);
}
}
diff --git a/src/sage/content/feedlib.js b/src/sage/content/feedlib.js
index 0effde9..7278258 100644
--- a/src/sage/content/feedlib.js
+++ b/src/sage/content/feedlib.js
@@ -276,6 +276,44 @@ Feed.prototype.getItem = function(itemIndex) {
return this.items[itemIndex];
}
+Feed.prototype.getItems = function(sort) {
+ if(sort == "chrono" && !this.hasLastPubDate()) { // if the feed doesn't have pub dates, we're going to do a source sort
+ sort = "source";
+ }
+ var items_array;
+ switch(sort) {
+ case "chrono":
+ var items = new Array();
+ for(var c = 0; c < this.items.length; c++) {
+ items.push(this.items[c]);
+ }
+ function chronoSort(a, b) {
+ var a_ts, b_ts;
+ if(a.hasPubDate()) {
+ a_ts = a.getPubDate().getTime();
+ } else {
+ a_ts = 0;
+ }
+ if(b.hasPubDate()) {
+ b_ts = b.getPubDate().getTime();
+ } else {
+ b_ts = 0;
+ }
+ return (a_ts < b_ts ? 1 : (b_ts < a_ts ? -1 : 0));
+ }
+ items.sort(chronoSort);
+ items_array = items;
+ break;
+ case "source":
+ items_array = this.items;
+ break;
+ default:
+ items_array = this.items;
+ break;
+ }
+ return items_array;
+}
+
Feed.prototype.getFormat = function() {
return this.feedFormat;
}
diff --git a/src/sage/content/sage.js b/src/sage/content/sage.js
index ec3128c..ace603d 100755
--- a/src/sage/content/sage.js
+++ b/src/sage/content/sage.js
@@ -230,8 +230,11 @@ function rssItemListBoxClick(aEvent) {
}
}
+ var feedItemOrder = CommonFunc.getPrefValue(CommonFunc.FEED_ITEM_ORDER, "str", "chrono");
+
var selectedItem = rssItemListBox.selectedItem;
- var link = currentFeed.getItem(selectedItem.value).getLink();
+ var items = currentFeed.getItems(feedItemOrder);
+ var link = items[selectedItem.value].getLink();
var tabbed = false;
if(aEvent.button == 1) { tabbed = true; } // click middle button
@@ -327,8 +330,12 @@ function setRssItemListBox() {
rssItemListBox.removeItemAt(0);
}
- for(var i = 0; currentFeed.getItemCount() > i; i++) {
- var item = currentFeed.getItem(i);
+ var feedItemOrder = CommonFunc.getPrefValue(CommonFunc.FEED_ITEM_ORDER, "str", "chrono");
+
+ var items = currentFeed.getItems(feedItemOrder);
+
+ for(var i = 0; items.length > i; i++) {
+ var item = items[i];
var itemLabel = item.getTitle();
itemLabel = (i+1) + ". " + itemLabel;
var listItem = rssItemListBox.appendItem(itemLabel, i);
@@ -363,8 +370,12 @@ function showRssItemListPopup(aEvent) {
rssItemListPopup.hidePopup();
return;
}
+
+ var feedItemOrder = CommonFunc.getPrefValue(CommonFunc.FEED_ITEM_ORDER, "str", "chrono");
- var description = htmlToText(currentFeed.getItem(aEvent.originalTarget.value).getContent());
+ var items = currentFeed.getItems(feedItemOrder);
+
+ var description = htmlToText(items[aEvent.originalTarget.value].getContent());
if(description.indexOf("/") != -1) {
description = description.replace(/\//gm, "/\u200B");
}
diff --git a/src/sage/locale/fr-FR/sage.properties b/src/sage/locale/fr-FR/sage.properties
index 55a4380..603b53b 100644
--- a/src/sage/locale/fr-FR/sage.properties
+++ b/src/sage/locale/fr-FR/sage.properties
@@ -4,6 +4,7 @@ RESULT_NOT_RSS_STR = Ce fichier XML n'est pas un fil
RESULT_NOT_FOUND_STR = Fichier introuvable
RESULT_NOT_AVAILABLE_STR = URL non disponible
RESULT_ERROR_FAILURE_STR = Erreur de chargement
+RESULT_LOADING = Cherche
CHECK_UPDATE = V\u00e9rification des fils
GET_RSS_TITLE= Trouver le nom du fil
@@ -36,8 +37,8 @@ opml_path_invalid = Chemin incorrect.
opml_import_fail = \u00c9chec de chargement.
opml_import_badfile = Ce fichier n'est pas une liste OPML.
opml_export_nocreate = Erreur de cr\u00e9ation de fichier
-
-
+opml_select_file = S\u00e9lectionner un fichier OPML
+opml_opml_file = Liste OPML
# Date rendering values
@@ -81,3 +82,4 @@ date_november_short = Nov
date_december = D\u00e9cembre
date_december_short = D\u00e9c
+
diff --git a/src/sage/skin/classic/toolbar.png b/src/sage/skin/classic/toolbar.png
index db7abd3..701fc01 100644
Binary files a/src/sage/skin/classic/toolbar.png and b/src/sage/skin/classic/toolbar.png differ
--
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