Added simple plugin model. Handles loading of Providers for now.

Instead of having every model which might need a provider having to
specify every possible provider as input argument, we now have a plugin
model which can expose a list of providers, which the event manager then
will notify about when they are loaded.

Conflicts:
	public/res/publisher.js
	public/res/sharing.js

public/res/classes/Plugin.js

@@ -0,0 +1,11 @@
+define([
+], function() {
+ function Plugin(properties) {
+ for (var prop in properties) {
+ if (properties.hasOwnProperty(prop)) {
+ this[prop] = properties[prop];
+ }
+ }
+ }
+ return Plugin;
+});

public/res/eventMgr.js

@@ -219,6 +219,9 @@ define([
  // Refresh twitter buttons
  addEventHook("onTweet");
 
+ // Plugins
+ addEventHook("onProviderLoaded");
+ addEventHook("onPluginsLoaded");
 
  var onPreviewFinished = createEventHook("onPreviewFinished");
  var onAsyncPreviewListenerList = getExtensionListenerList("onAsyncPreview");

public/res/main.js

@@ -208,6 +208,7 @@ require([
  "publisher",
  "sharing",
  "mediaImporter",
+ "plugins",
  "css",
  "rangy-cssclassapplier",
  themeModule

public/res/mediaImporter.js

@@ -4,8 +4,7 @@ define([
  "constants",
  "classes/Provider",
  "core",
- "eventMgr",
- "providers/gplusProvider"
+ "eventMgr"
 ], function($, _, constants, Provider, core, eventMgr) {
 
  var mediaImporter = {};
@@ -82,4 +81,4 @@ define([
  });
 
  return mediaImporter;
-});
+});

public/res/plugins.js

@@ -0,0 +1,21 @@
+define([
+ "eventMgr",
+ "classes/Plugin",
+ "plugins/blogger/index",
+ "plugins/dropbox/index",
+ "plugins/github/index",
+ "plugins/google/index",
+ "plugins/ssh/index",
+ "plugins/tumblr/index",
+ "plugins/wordpress/index"
+], function(eventMgr, Plugin) {
+ Array.prototype.slice.call(arguments).forEach(function(argument) {
+ if (argument && argument instanceof Plugin) {
+ var providers = argument.providers || [];
+ providers.forEach(function(provider) {
+ eventMgr.onProviderLoaded(provider);
+ });
+ }
+ });
+ eventMgr.onPluginsLoaded();
+});

public/res/plugins/blogger/index.js

@@ -0,0 +1,9 @@
+define([
+ "classes/Plugin",
+ "providers/bloggerProvider",
+ "providers/bloggerPageProvider"
+], function(Plugin, bloggerProvider, bloggerPageProvider) {
+ return new Plugin({
+ providers: [bloggerProvider, bloggerPageProvider]
+ });
+});

public/res/plugins/couchdb/index.js

@@ -0,0 +1,8 @@
+define([
+ "classes/Plugin",
+ "providers/couchdbProvider"
+], function(Plugin, couchdbProvider) {
+ return new Plugin({
+ providers: [couchdbProvider]
+ };
+});

public/res/plugins/download/index.js

@@ -0,0 +1,8 @@
+define([
+ "classes/Plugin",
+ "providers/downloadProvider"
+], function(Plugin, downloadProvider) {
+ return new Plugin({
+ providers: [downloadProvider]
+ };
+});

public/res/plugins/dropbox/index.js

@@ -0,0 +1,8 @@
+define([
+ "classes/Plugin",
+ "providers/dropboxProvider"
+], function(Plugin, dropboxProvider) {
+ return new Plugin({
+ providers: [dropboxProvider]
+ };
+});

public/res/plugins/github/index.js

@@ -0,0 +1,9 @@
+define([
+ "classes/Plugin",
+ "providers/gistProvider",
+ "providers/githubProvider"
+], function(Plugin, gistProvider, githubProvider) {
+ return new Plugin({
+ providers: [gistProvider, githubProvider]
+ };
+});

public/res/plugins/google/index.js

@@ -0,0 +1,10 @@
+define([
+ "classes/Plugin",
+ "providers/gdriveProvider",
+ "providers/gdrivesecProvider",
+ "providers/gdriveterProvider"
+], function(Plugin, gdriveProvider, gdrivesecProvider, gdriveterProvider) {
+ return new Plugin({
+ providers: [gdriveProvider, gdrivesecProvider, gdriveterProvider]
+ };
+});

public/res/plugins/ssh/index.js

@@ -0,0 +1,8 @@
+define([
+ "classes/Plugin",
+ "providers/sshProvider"
+], function(Plugin, sshProvider) {
+ return new Plugin({
+ providers: [sshProvider]
+ };
+});

public/res/plugins/tumblr/index.js

@@ -0,0 +1,8 @@
+define([
+ "classes/Plugin",
+ "providers/tumblrProvider"
+], function(Plugin, tumblrProvider) {
+ return new Plugin({
+ providers: [tumblrProvider]
+ });
+});

public/res/plugins/wordpress/index.js

@@ -0,0 +1,8 @@
+define([
+ "classes/Plugin",
+ "providers/wordpressProvider"
+], function(Plugin, wordpressProvider) {
+ return new Plugin({
+ providers: [wordpressProvider]
+ });
+});

public/res/publisher.js

@@ -9,33 +9,22 @@ define([
  "fileSystem",
  "fileMgr",
  "monetizejs",
- "classes/Provider",
- "classes/AsyncTask",
- "providers/bloggerProvider",
- "providers/bloggerPageProvider",
- "providers/dropboxProvider",
- "providers/gistProvider",
- "providers/githubProvider",
- "providers/gdriveProvider",
- "providers/gdrivesecProvider",
- "providers/gdriveterProvider",
- "providers/sshProvider",
- "providers/tumblrProvider",
- "providers/wordpressProvider"
-], function($, _, constants, utils, storage, settings, eventMgr, fileSystem, fileMgr, MonetizeJS, Provider, AsyncTask) {
+ "classes/AsyncTask"
+], function($, _, constants, utils, storage, settings, eventMgr, fileSystem, fileMgr, MonetizeJS, AsyncTask) {
 
  var publisher = {};
 
  // Create a map with providerId: providerModule
- var providerMap = _.chain(arguments).map(function(argument) {
- return argument instanceof Provider && argument.isPublishEnabled === true && [
- argument.providerId,
- argument
- ];
- }).compact().object().value();
+ var providerMap = {};
+
+ eventMgr.addListener("onProviderLoaded", function(provider) {
+ if (provider.isPublishEnabled === true) {
+ providerMap[provider.providerId] = provider;
+ }
+ });
 
  // Retrieve publish locations from storage
- (function() {
+ eventMgr.addListener("onPluginsLoaded", function() {
  var publishIndexMap = {};
  _.each(fileSystem, function(fileDesc) {
  utils.retrieveIndexArray(fileDesc.fileIndex + ".publish").forEach(function(publishIndex) {
@@ -68,7 +57,7 @@ define([
  storage.removeItem(key);
  }
  });
- })();
+ });
 
  // Apply template to the current document
  publisher.applyTemplate = function(fileDesc, publishAttributes, html) {

public/res/sharing.js

@@ -7,6 +7,7 @@ define([
  "fileMgr",
  "classes/AsyncTask",
  "classes/Provider",
+ "providers/karnovProvider",
  "providers/couchdbProvider",
  "providers/downloadProvider",
  "providers/gistProvider"
@@ -15,12 +16,11 @@ define([
  var sharing = {};
 
  // Create a map with providerId: providerModule
- var providerMap = _.chain(arguments).map(function(argument) {
- return argument instanceof Provider && [
- argument.providerId,
- argument
- ];
- }).compact().object().value();
+ var providerMap = {};
+
+ eventMgr.addListener("onProviderLoaded", function(provider) {
+ providerMap[provider.providerId] = provider;
+ });
 
  // Listen to offline status changes
  var isOffline = false;

public/res/synchronizer.js

@@ -5,27 +5,22 @@ define([
  "storage",
  "eventMgr",
  "fileSystem",
- "fileMgr",
- "classes/Provider",
- "providers/dropboxProvider",
- "providers/couchdbProvider",
- "providers/gdriveProvider",
- "providers/gdrivesecProvider",
- "providers/gdriveterProvider"
-], function($, _, utils, storage, eventMgr, fileSystem, fileMgr, Provider) {
+ "fileMgr"
+], function($, _, utils, storage, eventMgr, fileSystem, fileMgr) {
 
  var synchronizer = {};
 
  // Create a map with providerId: providerModule
- var providerMap = _.chain(arguments).map(function(argument) {
- return argument instanceof Provider && [
- argument.providerId,
- argument
- ];
- }).compact().object().value();
+ var providerMap = {};
+
+ eventMgr.addListener("onProviderLoaded", function(provider) {
+ providerMap[provider.providerId] = provider;
+ // AutoSync configuration
+ provider.autosyncConfig = utils.retrieveIgnoreError(provider.providerId + ".autosyncConfig") || {};
+ });
 
  // Retrieve sync locations from storage
- (function() {
+ eventMgr.addListener("onPluginsLoaded", (function() {
  var syncIndexMap = {};
  _.each(fileSystem, function(fileDesc) {
  utils.retrieveIndexArray(fileDesc.fileIndex + ".sync").forEach(function(syncIndex) {
@@ -58,11 +53,6 @@ define([
  storage.removeItem(key);
  }
  });
- })();
-
- // AutoSync configuration
- _.each(providerMap, function(provider) {
- provider.autosyncConfig = utils.retrieveIgnoreError(provider.providerId + ".autosyncConfig") || {};
  });
 
  // Returns true if at least one file has synchronized location