Move data fetching to an event page (Rel #5)

iplanwebsites · Feb 23, 2013 · a2406e7 · a2406e7
1 parent 68ec220
commit a2406e7
Show file tree

Hide file tree

Showing 12 changed files with 3,010 additions and 2,857 deletions.
diff --git a/extension/app/background.js b/extension/app/background.js
@@ -0,0 +1,24 @@
+function fetch() {
+	window.ENV = "Events";
+	require(['config'], function( conf ) {
+
+		// Fetch Chrome bookmarks
+		require([ "modules/bookmarks.chrome" ], function( chromeBookmarks ) {
+			chromeBookmarks.fetch();
+		});
+
+		// Fetch Delicious bookmarks
+		require([ "modules/bookmarks.delicious" ], function( deliciousBookmarks ) {
+			deliciousBookmarks.fetch();
+		});
+
+	});
+}
+
+if( chrome.alarms ) {
+	chrome.alarms.create('fetch', { periodInMinutes : 30 });
+	chrome.alarms.onAlarm.addListener(fetch);
+} else {
+	setInterval( fetch, 1800000 );
+}
+chrome.runtime.onInstalled.addListener(fetch);
diff --git a/extension/app/config.js b/extension/app/config.js
@@ -1,15 +1,10 @@
-/*global require:true, define:true, window:true, document:true */
-
 /**
  * AMD loader Configuration
  */
 
 require.config({
-
-	// Initialize the application with the main application file
-	deps: [
-		"main"
-	],
+
+	deps: window.ENV === 'events' ? [] : ["main"],
 
 	paths: {
 		// Libraries.

diff --git a/extension/app/main.js b/extension/app/main.js
@@ -23,31 +23,9 @@ function( app, $, _, Backbone, settings, bookmarksCollection, AllBookmarksView,
 
 
 	// ---
-	// Get Bookmarks
+	// Get Bookmarks (LocalStorage is Synchronous)
 
-	bookmarksCollection.fetch({
-		success: fetchSources
-	});
-
-
-	// ---
-	// Check bookmarks sources updates
-	// @info: triggered after bookmarksCollection fetch is done
-	// TODO: Transfer to an event/background page
-
-	function fetchSources() {
-
-		// Fetch Chrome bookmarks
-		require([ "modules/bookmarks.chrome" ], function( chromeBookmarks ) {
-			chromeBookmarks.fetch();
-		});
-
-		// Fetch Delicious bookmarks
-		require([ "modules/bookmarks.delicious" ], function( deliciousBookmarks ) {
-			deliciousBookmarks.fetch();
-		});
-
-	}
+	bookmarksCollection.fetch();
 
 
 	// ---
@@ -62,6 +40,7 @@ function( app, $, _, Backbone, settings, bookmarksCollection, AllBookmarksView,
 		"#stage"  : new AllBookmarksView()
 	}).render();
 
+
 
 	// ---
 	// Listen click on a tags and open link in current Tab

diff --git a/extension/app/models/single-bookmark.js b/extension/app/models/single-bookmark.js
@@ -16,9 +16,6 @@ function( app, $, _, Backbone, utils, BookmarkView ) {
 
 	var Bookmark = Backbone.Model.extend({
 
-		// Identify model via their URL as this is their canonical/unique reference
-		idAttribute: "url",
-
 		defaults: {
 			url           : "",
 			title         : "",
@@ -35,13 +32,17 @@ function( app, $, _, Backbone, utils, BookmarkView ) {
 		localStorage: new Backbone.LocalStorage('whatever2'),
 
 		initialize: function() {
+			if( this.isNew() ) {
+				this.parseNew();
+			}
+		},
+
+		parseNew: function() {
 
+			// Set domain
 			var url = this.get('url');
 			if ( utils.isURL(url) ) {
 				this.set( 'domain', utils.getDomain(url) );
-			} else {
-				//this can be a bookmarklet, a FTP, or special page bookmark...
-				this.set( 'domain', false );
 			}
 
 			//set the main set_content_type
@@ -54,7 +55,6 @@ function( app, $, _, Backbone, utils, BookmarkView ) {
 
 			this.set( 'thumbnail_url', this.get_thumb_url() );
 			this.save();
-
 		},
 
 		save: function(attrs, options) {

diff --git a/extension/app/modules/bookmarks.chrome.js b/extension/app/modules/bookmarks.chrome.js
@@ -23,7 +23,6 @@ function( $, _, allBookmarks ) {
 		importChromeBookmarks: function() {
 			var def  = new $.Deferred(),
 				self = this;
-
 			chrome.bookmarks.getTree(function( tree, folder ) {
 				self.parseChromeBookmarkTree( tree, folder, def );
 			});

diff --git a/extension/app/views/all-bookmarks.js b/extension/app/views/all-bookmarks.js
@@ -34,17 +34,22 @@ function( app, $, _, Backbone, allBookmarks, BookmarkView, searchCriterias ) {
 
 			$(document).on('keydown', _.bind(this.keyAction, this));
 			this.on('change:focus', this.setScroll);
+			this.listenTo(this.collection, 'add', _.throttle(this.render, 500));
 		},
 
 		beforeRender: function() {
 			this.collection.each(function( model ) {
-				this.insertView( ".app-bookmarks", new BookmarkView({ model: model }) );
+				this.add( model );
 			}, this);
 		},
 
 		afterRender: function() {
 			this.$el.nanoScroller({ scroll: 'top' });
 		},
+
+		add: function( model ) {
+			return this.insertView( ".app-bookmarks", new BookmarkView({ model: model }) );
+		},
 
 
 		// ---

diff --git a/extension/app/views/single-bookmark.js b/extension/app/views/single-bookmark.js
@@ -19,6 +19,10 @@ function( app, $, _, Backbone ) {
 
 		template: "single-bookmark",
 		el: false,
+
+		initialize: function() {
+			this.listenTo( this.model, 'change', this.render );
+		},
 
 		serialize: function() {
 			return this.model.toJSON();