[Pkg-mozext-commits] [sage-extension] 53/54: versioning and preference defaults updates
David Prévot
taffit at moszumanska.debian.org
Fri May 1 03:10:41 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 e469d3c775a6f9211a533a55dcc4f46fc3cc314e
Author: Peter Andrews <petea at jhu.edu>
Date: Thu Nov 4 23:13:32 2004 +0000
versioning and preference defaults updates
---
src/install.rdf | 78 +++++++++++++++++-----------------
src/sage/content/commonfunc.js | 38 ++++++++++++++++-
src/sage/content/discover_feeds.js | 2 +-
src/sage/content/opml/opml.js | 4 +-
src/sage/content/sage.js | 28 +++++++++---
src/sage/content/settings/settings.js | 9 ++--
src/sage/content/settings/settings.xul | 2 +-
src/sage/locale/ca-CA/sage.dtd | 1 -
src/sage/locale/de-AT/sage.dtd | 1 -
src/sage/locale/de-CH/sage.dtd | 1 -
src/sage/locale/de-DE/sage.dtd | 1 -
src/sage/locale/en-US/sage.dtd | 1 -
src/sage/locale/es-ES/sage.dtd | 1 -
src/sage/locale/fr-FR/sage.dtd | 1 -
src/sage/locale/hu-HU/sage.dtd | 1 -
src/sage/locale/it-IT/sage.dtd | 1 -
src/sage/locale/ja-JP/sage.dtd | 1 -
src/sage/locale/ko-KR/sage.dtd | 1 -
src/sage/locale/nl-NL/sage.dtd | 1 -
src/sage/locale/ru-RU/sage.dtd | 1 -
src/sage/locale/sv-SE/sage.dtd | 1 -
src/sage/locale/zh-TW/sage.dtd | 1 -
22 files changed, 107 insertions(+), 69 deletions(-)
diff --git a/src/install.rdf b/src/install.rdf
index 48a20cf..ab17603 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -4,47 +4,47 @@
<Description about="urn:mozilla:install-manifest">
-<em:id>{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}</em:id>
-<em:name>Sage</em:name>
-<em:version>1.3</em:version>
-<em:description>A lightweight RSS and Atom feed aggregator.</em:description>
-<em:creator>The Sage Project</em:creator>
-<em:contributor>Peter Andrews</em:contributor>
-<em:contributor>Erik Arvidsson</em:contributor>
-<em:contributor>flyson</em:contributor>
-<em:homepageURL>http://sage.mozdev.org</em:homepageURL>
-<em:optionsURL>chrome://sage/content/settings/settings.xul</em:optionsURL>
-<em:iconURL>chrome://sage/skin/sage_icon.png</em:iconURL>
+ <em:id>{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}</em:id>
+ <em:name>Sage</em:name>
+ <em:version>1.3</em:version>
+ <em:description>A lightweight RSS and Atom feed aggregator.</em:description>
+ <em:creator>The Sage Project</em:creator>
+ <em:contributor>Peter Andrews</em:contributor>
+ <em:contributor>Erik Arvidsson</em:contributor>
+ <em:contributor>flyson</em:contributor>
+ <em:homepageURL>http://sage.mozdev.org</em:homepageURL>
+ <em:optionsURL>chrome://sage/content/settings/settings.xul</em:optionsURL>
+ <em:iconURL>chrome://sage/skin/sage_icon.png</em:iconURL>
-<em:file>
-<Description about="urn:mozilla:extension:file:sage.jar">
-<em:package>content/</em:package>
-<em:skin>skin/classic/</em:skin>
-<em:locale>locale/en-US/</em:locale>
-<em:locale>locale/ja-JP/</em:locale>
-<em:locale>locale/fr-FR/</em:locale>
-<em:locale>locale/hu-HU/</em:locale>
-<em:locale>locale/it-IT/</em:locale>
-<em:locale>locale/nl-NL/</em:locale>
-<em:locale>locale/ca-CA/</em:locale>
-<em:locale>locale/zh-TW/</em:locale>
-<em:locale>locale/de-DE/</em:locale>
-<em:locale>locale/es-ES/</em:locale>
-<em:locale>locale/ru-RU/</em:locale>
-<em:locale>locale/de-AT/</em:locale>
-<em:locale>locale/de-CH/</em:locale>
-<em:locale>locale/sv-SE/</em:locale>
-<em:locale>locale/ko-KR/</em:locale>
-</Description>
-</em:file>
+ <em:file>
+ <Description about="urn:mozilla:extension:file:sage.jar">
+ <em:package>content/</em:package>
+ <em:skin>skin/classic/</em:skin>
+ <em:locale>locale/en-US/</em:locale>
+ <em:locale>locale/ja-JP/</em:locale>
+ <em:locale>locale/fr-FR/</em:locale>
+ <em:locale>locale/hu-HU/</em:locale>
+ <em:locale>locale/it-IT/</em:locale>
+ <em:locale>locale/nl-NL/</em:locale>
+ <em:locale>locale/ca-CA/</em:locale>
+ <em:locale>locale/zh-TW/</em:locale>
+ <em:locale>locale/de-DE/</em:locale>
+ <em:locale>locale/es-ES/</em:locale>
+ <em:locale>locale/ru-RU/</em:locale>
+ <em:locale>locale/de-AT/</em:locale>
+ <em:locale>locale/de-CH/</em:locale>
+ <em:locale>locale/sv-SE/</em:locale>
+ <em:locale>locale/ko-KR/</em:locale>
+ </Description>
+ </em:file>
-<em:targetApplication>
-<Description>
-<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-<em:minVersion>0.7</em:minVersion>
-<em:maxVersion>1.0+</em:maxVersion>
-</Description>
-</em:targetApplication>
+ <em:targetApplication>
+ <Description>
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>0.7</em:minVersion>
+ <em:maxVersion>1.0+</em:maxVersion>
+ </Description>
+ </em:targetApplication>
</Description>
diff --git a/src/sage/content/commonfunc.js b/src/sage/content/commonfunc.js
index e9a4c43..757437b 100755
--- a/src/sage/content/commonfunc.js
+++ b/src/sage/content/commonfunc.js
@@ -69,9 +69,11 @@ function dateFormat(date, twelveHourClock, format) {
var CommonFunc = {
- RSS_READER_FOLDER_ID: "sage.folder_id",
+ VERSION: Array(1,3,0),
USER_AGENT: "Mozilla/5.0 (Sage)",
+ FEED_FOLDER_ID: "sage.folder_id",
+ LAST_VERSION: "sage.last_version",
USER_CSS_ENABLE: "sage.user_css.enable",
USER_CSS_PATH: "sage.user_css.path",
ALLOW_ENCODED_CONTENT: "sage.allow_encoded_content",
@@ -337,7 +339,39 @@ var CommonFunc = {
} catch(e) {
alert(e)
}
- }
+ },
+
+ // takes a version string, returns an integer triple containing (major version, minor version, patch level)
+ versionStrDecode: function(versionStr) {
+ var regexp = /([0-9]*)\.([0-9]*)\.([0-9]*)/;
+ var result = regexp.exec(versionStr);
+ return Array(parseInt(result[1]), parseInt(result[2]), parseInt(result[3]));
+ },
+
+ // takes a version triple, returns an integer
+ versionToInt: function(versionTriple) {
+ return versionTriple[0]*100 + versionTriple[1]*10 + versionTriple[2];
+ },
+ // takes two version triples, returns 1 if the first is more recent, 0 otherwise
+ versionCompare: function(versionA, versionB) {
+ if(this.versionToInt(versionA) > this.versionToInt(versionB)) {
+ return 1;
+ } else {
+ return 0;
+ }
+ },
+
+ // takes a version triple, returns a formatted version string
+ versionString: function(version, pretty) {
+ var formatted;
+ if(pretty) {
+ formatted = version[0].toString() + '.' + version[1].toString();
+ formatted += version[2] != 0 ? "." + version[2] : ""
+ } else {
+ formatted = version[0].toString() + '.' + version[1].toString() + '.' + version[2].toString();
+ }
+ return formatted;
+ }
}
diff --git a/src/sage/content/discover_feeds.js b/src/sage/content/discover_feeds.js
index 3a6730f..7bb4066 100644
--- a/src/sage/content/discover_feeds.js
+++ b/src/sage/content/discover_feeds.js
@@ -147,7 +147,7 @@ function doAddFeed() {
if(title == "") {
title = "No Title";
}
- var sage_folder = rdfService.GetResource(CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", "NC:BookmarksRoot"));
+ var sage_folder = rdfService.GetResource(CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID, "str", "NC:BookmarksRoot"));
if(BMSVC.createBookmarkInContainer.length == 7) { // firefox 0.8 and lower
BMSVC.createBookmarkInContainer(title, url, null, "updated", null, sage_folder, null);
} else {
diff --git a/src/sage/content/opml/opml.js b/src/sage/content/opml/opml.js
index ec20b66..90b5f0a 100755
--- a/src/sage/content/opml/opml.js
+++ b/src/sage/content/opml/opml.js
@@ -101,7 +101,7 @@ function importOPML() {
reportError(strRes.getString("opml_import_badfile"));
return false;
}
- var rssReaderFolderID = CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", "NC:BookmarksRoot");
+ var rssReaderFolderID = CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID, "str", "NC:BookmarksRoot");
var folderName = "OPML Import";
var opmlTitles = opmlDoc.getElementsByTagName("title");
@@ -193,7 +193,7 @@ function exportOPML() {
}
function createOpmlSource() {
- var rssReaderFolderID = CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID,"str", "NC:BookmarksRoot");
+ var rssReaderFolderID = CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID,"str", "NC:BookmarksRoot");
var rssReaderFolderRes = RDF.GetResource(rssReaderFolderID);
var srcTemplate = '<?xml version="1.0" encoding="UTF-8"?>';
diff --git a/src/sage/content/sage.js b/src/sage/content/sage.js
index ef9a4f9..269cbdc 100755
--- a/src/sage/content/sage.js
+++ b/src/sage/content/sage.js
@@ -48,11 +48,20 @@ function init() {
strRes.getString("RESULT_ERROR_FAILURE_STR")
);
+ // get the version string from the last release used
+ var lastVersion = CommonFunc.getPrefValue(CommonFunc.LAST_VERSION, "str", null);
+ if(lastVersion) {
+ lastVersion = CommonFunc.versionStrDecode(lastVersion);
+ } else {
+ lastVersion = Array(1,0,0);
+ }
+ var currentVersion = CommonFunc.VERSION;
+
// if feed folder has not been set, assume new user and install default feed folder and demo feeds
- if(!CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", null)) {
- logMessage("setting default preferences...");
+ if(!CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID, "str", null)) { // check for new user
+ logMessage("new user, creating feed folder and setting default preferences...");
var new_folder = BMSVC.createFolderInContainer("Sage Feeds", RDF.GetResource("NC:BookmarksRoot"), null);
- CommonFunc.setPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", new_folder.Value);
+ CommonFunc.setPrefValue(CommonFunc.FEED_FOLDER_ID, "str", new_folder.Value);
if(BMSVC.createBookmarkInContainer.length == 7) { // firefox 0.8 and lower
BMSVC.createBookmarkInContainer("BBC News | News Front Page | World Edition", "http://news.bbc.co.uk/rss/newsonline_world_edition/front_page/rss091.xml", null, "updated", null, new_folder, null);
BMSVC.createBookmarkInContainer("Yahoo! News - Sports", "http://rss.news.yahoo.com/rss/sports", null, "updated", null, new_folder, null);
@@ -66,12 +75,19 @@ function init() {
setCheckbox("chkShowTooltip", "true");
setCheckbox("chkShowFeedItemList", "true");
setCheckbox("chkShowFeedItemListToolbar", "true");
+ } else if(CommonFunc.versionCompare(currentVersion, lastVersion)) { // check for upgrade
+ logMessage("upgrade (last version: " + CommonFunc.versionString(lastVersion, 0) + ", current version: " + CommonFunc.versionString(currentVersion, 0) + "), setting new default preferences...");
+ if(CommonFunc.versionCompare(Array(1,3,0), lastVersion)) {
+ setCheckbox("chkShowFeedItemListToolbar", "true");
+ }
}
+ CommonFunc.setPrefValue(CommonFunc.LAST_VERSION, "str", CommonFunc.versionString(currentVersion, 0));
+
// get feed folder location
- sageFolderID = CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", "NC:BookmarksRoot");
+ sageFolderID = CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID, "str", "NC:BookmarksRoot");
// check for changes to the feed folder
- prefObserverSageFolder = CommonFunc.addPrefListener(CommonFunc.RSS_READER_FOLDER_ID, sageFolderChanged);
+ prefObserverSageFolder = CommonFunc.addPrefListener(CommonFunc.FEED_FOLDER_ID, sageFolderChanged);
// set feed folder location
bookmarksTree.tree.setAttribute("ref", sageFolderID);
// select first entry
@@ -107,7 +123,7 @@ function showOnlyUpdated() {
function sageFolderChanged(subject, topic, prefName) {
// observe Preference
- sageFolderID = CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", "NC:BookmarksRoot");
+ sageFolderID = CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID, "str", "NC:BookmarksRoot");
bookmarksTree.tree.setAttribute("ref", sageFolderID);
bookmarksTree.treeBoxObject.selection.select(0);
}
diff --git a/src/sage/content/settings/settings.js b/src/sage/content/settings/settings.js
index 04db7f1..4e825ae 100755
--- a/src/sage/content/settings/settings.js
+++ b/src/sage/content/settings/settings.js
@@ -12,7 +12,7 @@ var feedDiscoveryMode;
var gList;
var gNameArc;
-var strRes // stringbundle �I�u�W�F�N�g
+var strRes;
function init() {
initServices();
@@ -20,7 +20,10 @@ function init() {
strRes = document.getElementById("strRes");
- sageFolderID = CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", "NC:BookmarksRoot");
+ var header = document.getElementById("header");
+ header.setAttribute("description", header.getAttribute("description") + " " + CommonFunc.versionString(CommonFunc.VERSION, 1));
+
+ sageFolderID = CommonFunc.getPrefValue(CommonFunc.FEED_FOLDER_ID, "str", "NC:BookmarksRoot");
gNameArc = RDF.GetResource(NC_NS + "Name");
gList = document.getElementById("select-menu");
@@ -54,7 +57,7 @@ function init() {
}
function accept() {
- CommonFunc.setPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", sageFolderID);
+ CommonFunc.setPrefValue(CommonFunc.FEED_FOLDER_ID, "str", sageFolderID);
CommonFunc.setPrefValue(CommonFunc.USER_CSS_ENABLE, "bool", chkUserCssEnable.checked);
CommonFunc.setPrefValue(CommonFunc.USER_CSS_PATH, "wstr", txtUserCssPath.value);
CommonFunc.setPrefValue(CommonFunc.ALLOW_ENCODED_CONTENT, "bool", chkAllowEContent.checked);
diff --git a/src/sage/content/settings/settings.xul b/src/sage/content/settings/settings.xul
index e007d74..d220330 100755
--- a/src/sage/content/settings/settings.xul
+++ b/src/sage/content/settings/settings.xul
@@ -14,7 +14,7 @@
<script type="application/x-javascript" src="chrome://sage/content/settings/settings.js"/>
-<dialogheader title="&sage.label;" description="&sage.version.label; &sage.version;"/>
+<dialogheader id="header" title="&sage.label;" description="&sage.version.label;"/>
<stringbundleset>
<stringbundle id="strRes" src="chrome://sage/locale/sage.properties"/>
diff --git a/src/sage/locale/ca-CA/sage.dtd b/src/sage/locale/ca-CA/sage.dtd
index 258020d..29399c3 100644
--- a/src/sage/locale/ca-CA/sage.dtd
+++ b/src/sage/locale/ca-CA/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "Versió">
<!ENTITY sage.toolbarLabel "Sage">
<!ENTITY sage.sidebarTitle "Sage">
diff --git a/src/sage/locale/de-AT/sage.dtd b/src/sage/locale/de-AT/sage.dtd
index f84073c..746dc82 100644
--- a/src/sage/locale/de-AT/sage.dtd
+++ b/src/sage/locale/de-AT/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "version">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/de-CH/sage.dtd b/src/sage/locale/de-CH/sage.dtd
index 9041934..3521c4e 100644
--- a/src/sage/locale/de-CH/sage.dtd
+++ b/src/sage/locale/de-CH/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "version">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/de-DE/sage.dtd b/src/sage/locale/de-DE/sage.dtd
index 9041934..3521c4e 100644
--- a/src/sage/locale/de-DE/sage.dtd
+++ b/src/sage/locale/de-DE/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "version">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/en-US/sage.dtd b/src/sage/locale/en-US/sage.dtd
index 4ba35c2..1f1bc6c 100755
--- a/src/sage/locale/en-US/sage.dtd
+++ b/src/sage/locale/en-US/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "version">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/es-ES/sage.dtd b/src/sage/locale/es-ES/sage.dtd
index c808e52..a31aff2 100644
--- a/src/sage/locale/es-ES/sage.dtd
+++ b/src/sage/locale/es-ES/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "versión">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/fr-FR/sage.dtd b/src/sage/locale/fr-FR/sage.dtd
index 5595ec3..8358fb4 100644
--- a/src/sage/locale/fr-FR/sage.dtd
+++ b/src/sage/locale/fr-FR/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "version">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/hu-HU/sage.dtd b/src/sage/locale/hu-HU/sage.dtd
index 1c681b3..b38ef46 100755
--- a/src/sage/locale/hu-HU/sage.dtd
+++ b/src/sage/locale/hu-HU/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/it-IT/sage.dtd b/src/sage/locale/it-IT/sage.dtd
index a611c84..dd49da5 100644
--- a/src/sage/locale/it-IT/sage.dtd
+++ b/src/sage/locale/it-IT/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/ja-JP/sage.dtd b/src/sage/locale/ja-JP/sage.dtd
index b0dd89b..51fc70c 100755
--- a/src/sage/locale/ja-JP/sage.dtd
+++ b/src/sage/locale/ja-JP/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/ko-KR/sage.dtd b/src/sage/locale/ko-KR/sage.dtd
index 3778b6a..03170f2 100644
--- a/src/sage/locale/ko-KR/sage.dtd
+++ b/src/sage/locale/ko-KR/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "버전">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/nl-NL/sage.dtd b/src/sage/locale/nl-NL/sage.dtd
index a37ec46..889888e 100644
--- a/src/sage/locale/nl-NL/sage.dtd
+++ b/src/sage/locale/nl-NL/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "versie">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/ru-RU/sage.dtd b/src/sage/locale/ru-RU/sage.dtd
index 51090a6..b56d59c 100644
--- a/src/sage/locale/ru-RU/sage.dtd
+++ b/src/sage/locale/ru-RU/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "версия">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/sv-SE/sage.dtd b/src/sage/locale/sv-SE/sage.dtd
index c646e60..54a8093 100644
--- a/src/sage/locale/sv-SE/sage.dtd
+++ b/src/sage/locale/sv-SE/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "version">
<!ENTITY sage.toolbarLabel "Sage">
diff --git a/src/sage/locale/zh-TW/sage.dtd b/src/sage/locale/zh-TW/sage.dtd
index 7c37bfe..0a941ce 100644
--- a/src/sage/locale/zh-TW/sage.dtd
+++ b/src/sage/locale/zh-TW/sage.dtd
@@ -1,5 +1,4 @@
<!ENTITY sage.label "Sage">
-<!ENTITY sage.version "1.3">
<!ENTITY sage.version.label "版本">
<!ENTITY sage.toolbarLabel "Sage">
--
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