Merge pull request #7 from tomten/2.14

2 14

README.md

@@ -3,6 +3,10 @@ filmtipset-chrome-extension
 
 Chrome Extension for Filmtipset movie site. Released version available in Chrome Web Store: https://chrome.google.com/webstore/detail/filmtipset/faajjfnpkdjpceeodjnmhdphbgehjeji
 
+Version 2.14:
+
+- Rarat
+
 Version 2.11:
 
 - Movie info pop-over slightly easier to mouse-over.

content-scripts/other.js

@@ -1,4 +1,7 @@
 $(function(){
     var links = new FilmtipsetExtension.Links($);
-    links.processLinks();
+    window.setInterval(function(){ 
+		links.processLinks(); 
+		}, 
+		2000);	
     });

js/Filmtipset/Filmtipset.ExtensionHost.js

@@ -11,7 +11,7 @@ FilmtipsetExtension.ExtensionHost = function(window, debug){
     this.cache = new Cache(
         -1, // Maximum size of cache = maximum size of storage medium 
         this.debug, // Debug?
-        new Cache.LocalStorageCacheStorage("filmtipset2.11")); // Use this extension's Local Storage for persisting the cache
+        new Cache.LocalStorageCacheStorage("filmtipset2.14")); // Use this extension's Local Storage for persisting the cache
     // TODO: When to clear out obsolete caches?
     this.gradeForTab = {}; // Session-scoped storage for the current page action grades for different browser tabs
     this.wantedList = undefined; // Session-scoped storage for items in the user's Filmtipset Wanted List

js/Filmtipset/Filmtipset.FilmtipsetApi.js

@@ -406,7 +406,7 @@ FilmtipsetExtension.FilmtipsetApi.prototype.getGradeInfoMovie = function(movie)
 /**
  * GETs an URL.
  * @param {string} url Request URL. 
- * @param {function(*)} callback Function to call upon completion. 
+ * @param {function((null|Object))} callback Function to call upon completion. 
  *     Input parameter will be response for request to URL, or null upon any error. 
  */
 FilmtipsetExtension.FilmtipsetApi.prototype.xmlHttpRequest = function(

js/Filmtipset/Filmtipset.Links.js

@@ -7,7 +7,8 @@ FilmtipsetExtension.Links = function (jQuery){
     this.jQuery = jQuery;
     this.$links = [];
     this.linkProcessingPort = null;
-    };
+    this.running = false;
+	};
 
 /** @const */
 FilmtipsetExtension.Links.image_html_template = '<img hidden style="position:absolute;" width="20" height="20" src="%grade%" />';    
@@ -54,7 +55,8 @@ FilmtipsetExtension.Links.prototype.handleResponse = function(contentScriptReque
     var gradeUrl = contentScriptRequestCallback.gradeIconUrl;
     var movieInfo = contentScriptRequestCallback.movieInfo;
     var $link = this.jQuery(this.$links[reference]); 
-    if (
+    $link.attr("filmtipsified", "true");
+	if (
         movieInfo &&
         movieInfo.name
         )
@@ -77,6 +79,7 @@ FilmtipsetExtension.Links.prototype.handleResponse = function(contentScriptReque
     $link.append($gradeImage);
     $gradeImage.fadeIn(200); 
     if (reference >= this.$links.length - 1) { // HACK: Should be == something
+		this.running = false;
         this.jQuery("#filmtipsetImdbLinks").stop().slideUp(500, "linear", function(){});
         this.linkProcessingPort.disconnect();
         }
@@ -101,8 +104,11 @@ FilmtipsetExtension.Links.prototype.handleResponse = function(contentScriptReque
  @private 
  */
 FilmtipsetExtension.Links.prototype.processLinksInternal = function(link_selector){
-    var self = this;
-    this.$links = this.jQuery(link_selector); // collect all links to follow
+	var self = this;
+	if (this.running) 
+		return;
+    this.running = true;
+	this.$links = this.jQuery(link_selector).not('[filmtipsified]'); // collect all unprocessed links to follow
     if (this.$links.length > 0) { // are there any links to follow?
         this.linkProcessingPort = chrome.runtime.connect(); // setup the port used to communicate with the event page
         this.linkProcessingPort.onMessage.addListener(
@@ -112,17 +118,26 @@ FilmtipsetExtension.Links.prototype.processLinksInternal = function(link_selecto
             function(contentScriptRequestCallback){
                 self.handleResponse.call(self, contentScriptRequestCallback); // TODO: is .call() necessary?
             }); // setup the response handler for the port
-        this.jQuery("body").append(
-            FilmtipsetExtension.Links.progress_html
-                .replace("%remsaUrl%", chrome.extension.getURL("images/progress.png"))
-                .replace("%linkCount%", this.$links.length)
-            );
-        this.jQuery("#filmtipsetImdbLinks")
+
+		if (this.jQuery("#filmtipsetImdbLinks").length === 0)
+			this.jQuery("body").append(
+				FilmtipsetExtension.Links.progress_html
+					.replace(
+						"%remsaUrl%", 
+						chrome.extension.getURL("images/progress.png")
+						)
+				);
+
+		$("#filmLinkCount").html(this.$links.length);
+
+		this.jQuery("#filmtipsetImdbLinks")
             //.hide() // Hide the progress bar and...
             .delay(3000) // ...wait 3 seconds before...
             .slideDown(500, "linear", function(){}); // ...showing it (to avoid it showing it at all if possible)
         this.processOneLink(0);
         }
+	else 
+		this.running = false;
     };
 
 /**

js/Filmtipset/warnings

@@ -0,0 +1,5 @@
+Filmtipset.ExtensionHost.js:112: ERROR - Bad type annotation. Unknown type chrome.runtime.Port
+         * @param {chrome.runtime.Port} port
+                   ^
+
+1 error(s), 0 warning(s)

manifest.json

@@ -4,7 +4,7 @@
     "content_security_policy": "script-src 'self' https://ssl.google-analytics.com; object-src 'self'",
     "name": "__MSG_extensionName__",
     "short_name": "__MSG_extensionShortName__",
-    "version": "2.11",
+    "version": "2.14",
     "web_accessible_resources": [  
         "extension-pages/filmtipset.html.js",
         "extension-pages/grade.html.js",