Mercurial > snowl

changeset 308:553ceeb3507b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
factor out PART_TYPE_* constants
author Myk Melez <myk@mozilla.org>
date Thu, 09 Oct 2008 12:17:43 -0700
parents 7b21ebd95ad3
children cb559976359a
files modules/collection.js modules/datastore.js modules/feed.js modules/message.js modules/source.js modules/twitter.js
diffstat 6 files changed, 31 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/modules/collection.js	Wed Oct 08 17:03:47 2008 -0700
+++ b/modules/collection.js	Thu Oct 09 12:17:43 2008 -0700
@@ -34,16 +34,21 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const EXPORTED_SYMBOLS = ["SnowlCollection"];
+let EXPORTED_SYMBOLS = ["SnowlCollection"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-// FIXME: factor this out into a common file.
-const PART_TYPE_CONTENT = 1;
-const PART_TYPE_SUMMARY = 2;
+// modules that are generic
+Cu.import("resource://snowl/modules/URI.js");
+Cu.import("resource://snowl/modules/log4moz.js");
+
+// modules that are Snowl-specific
+Cu.import("resource://snowl/modules/datastore.js");
+Cu.import("resource://snowl/modules/message.js");
+Cu.import("resource://snowl/modules/utils.js");
 
 // Media type to nsIFeedTextConstruct::type mappings.
 // FIXME: get this from message.js (or from something that both message.js
@@ -54,13 +59,6 @@
   "text/plain": "text"
 };
 
-Cu.import("resource://snowl/modules/URI.js");
-Cu.import("resource://snowl/modules/log4moz.js");
-
-Cu.import("resource://snowl/modules/datastore.js");
-Cu.import("resource://snowl/modules/message.js");
-Cu.import("resource://snowl/modules/utils.js");
-
 // FIXME: make SnowlCollection take a hash so it can have named parameters,
 // since the number of parameters it currently accepts, and the fact that they
 // are all optional, makes it unwieldy to pass them in the right order.
--- a/modules/datastore.js	Wed Oct 08 17:03:47 2008 -0700
+++ b/modules/datastore.js	Thu Oct 09 12:17:43 2008 -0700
@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-EXPORTED_SYMBOLS = ["SnowlDatastore"];
+let EXPORTED_SYMBOLS = ["SnowlDatastore", "PART_TYPE_CONTENT", "PART_TYPE_SUMMARY"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -44,6 +44,11 @@
 const TABLE_TYPE_NORMAL = 0;
 const TABLE_TYPE_FULLTEXT = 1;
 
+// XXX Should these be in here, or should they be in some Snowl-wide module
+// that all other modules include, like snowl.js?
+const PART_TYPE_CONTENT = 1;
+const PART_TYPE_SUMMARY = 2;
+
 let SnowlDatastore = {
   // FIXME: use the memoization technique for properties that aren't defined
   // in the prototype here instead of the technique for properties that are
--- a/modules/feed.js	Wed Oct 08 17:03:47 2008 -0700
+++ b/modules/feed.js	Thu Oct 09 12:17:43 2008 -0700
@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-EXPORTED_SYMBOLS = ["SnowlFeed"];
+let EXPORTED_SYMBOLS = ["SnowlFeed"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -45,7 +45,7 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/ISO8601DateUtils.jsm");
 
-// modules that should come with Firefox
+// modules that are generic
 Cu.import("resource://snowl/modules/log4moz.js");
 Cu.import("resource://snowl/modules/Observers.js");
 Cu.import("resource://snowl/modules/URI.js");
@@ -57,10 +57,6 @@
 Cu.import("resource://snowl/modules/message.js");
 Cu.import("resource://snowl/modules/utils.js");
 
-// FIXME: factor this out into a common file.
-const PART_TYPE_CONTENT = 1;
-const PART_TYPE_SUMMARY = 2;
-
 // nsIFeedTextConstruct::type to media type mappings.
 const mediaTypes = { html: "text/html",
                      xhtml: "application/xhtml+xml",
--- a/modules/message.js	Wed Oct 08 17:03:47 2008 -0700
+++ b/modules/message.js	Thu Oct 09 12:17:43 2008 -0700
@@ -34,16 +34,20 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const EXPORTED_SYMBOLS = ["SnowlMessage"];
+let EXPORTED_SYMBOLS = ["SnowlMessage"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-// FIXME: factor this out into a common file.
-const PART_TYPE_CONTENT = 1;
-const PART_TYPE_SUMMARY = 2;
+// modules that are generic
+Cu.import("resource://snowl/modules/URI.js");
+
+// modules that are Snowl-specific
+Cu.import("resource://snowl/modules/datastore.js");
+Cu.import("resource://snowl/modules/source.js");
+Cu.import("resource://snowl/modules/utils.js");
 
 // Media type to nsIFeedTextConstruct::type mappings.
 // FIXME: get this from message.js (or from something that both message.js
@@ -54,12 +58,6 @@
   "text/plain": "text"
 };
 
-Cu.import("resource://snowl/modules/URI.js");
-
-Cu.import("resource://snowl/modules/datastore.js");
-Cu.import("resource://snowl/modules/source.js");
-Cu.import("resource://snowl/modules/utils.js");
-
 function SnowlMessage(aID, aSubject, aAuthor, aLink, aTimestamp, aRead, aAuthorIcon, aReceived) {
   this.id = aID;
   this.subject = aSubject;
--- a/modules/source.js	Wed Oct 08 17:03:47 2008 -0700
+++ b/modules/source.js	Thu Oct 09 12:17:43 2008 -0700
@@ -34,15 +34,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const EXPORTED_SYMBOLS = ["SnowlSource"];
+let EXPORTED_SYMBOLS = ["SnowlSource"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
+// modules that are generic
+Cu.import("resource://snowl/modules/URI.js");
+
+// modules that are Snowl-specific
 Cu.import("resource://snowl/modules/datastore.js");
-Cu.import("resource://snowl/modules/URI.js");
 Cu.import("resource://snowl/modules/utils.js");
 
 function SnowlSource(aID, aName, aMachineURI, aHumanURI, aLastRefreshed, aImportance) {
--- a/modules/twitter.js	Wed Oct 08 17:03:47 2008 -0700
+++ b/modules/twitter.js	Thu Oct 09 12:17:43 2008 -0700
@@ -45,7 +45,7 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/ISO8601DateUtils.jsm");
 
-// modules that should come with Firefox
+// modules that are generic
 Cu.import("resource://snowl/modules/log4moz.js");
 Cu.import("resource://snowl/modules/Observers.js");
 Cu.import("resource://snowl/modules/URI.js");
@@ -57,10 +57,6 @@
 Cu.import("resource://snowl/modules/message.js");
 Cu.import("resource://snowl/modules/utils.js");
 
-// FIXME: factor this out into a common file.
-const PART_TYPE_CONTENT = 1;
-const PART_TYPE_SUMMARY = 2;
-
 const NAME = "Twitter";
 const MACHINE_URI = URI.get("https://twitter.com");
 // XXX Should this be simply http://twitter.com ?