[Pkg-mozext-commits] [automatic-save-folder] 112/133: Fix: Fixed version detection to prevent install.xhtml to display every time. (Thanks to TheOne)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch wip
in repository automatic-save-folder.

commit 4a3b7c99e3d82c50efe0598214349672b1895daf
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date:   Thu Nov 29 14:16:02 2012 +0000

    Fix: Fixed version detection to prevent install.xhtml to display every time. (Thanks to TheOne)
    
    git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@121 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
 content/asf_download.js     |  4 +---
 content/asf_right_click.js  | 19 ++-----------------
 content/common.dtd          |  4 +++-
 defaults/preferences/asf.js |  3 ++-
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/content/asf_download.js b/content/asf_download.js
index 0cc9ba3..f707006 100644
--- a/content/asf_download.js
+++ b/content/asf_download.js
@@ -59,9 +59,6 @@ Copyright (C) 2007-2012 Éric Cassar (Cyan).
 			}
 		}
 
-		// Check if there is any filter in list
-		var nbrfilters = 	prefManager.getIntPref("extensions.asf.filtersNumber");
-		
 		// Load Window and tab elements from the current active browser.
 		var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 						   .getService(Components.interfaces.nsIWindowMediator);
@@ -164,6 +161,7 @@ Copyright (C) 2007-2012 Éric Cassar (Cyan).
 		
 		// load filters data from prefmanager into filters[]
 		// filters[filternumber][label]
+		var nbrfilters = 	prefManager.getIntPref("extensions.asf.filtersNumber");
 		var filters = new Array();
 		for ( var i = 0 ; i < nbrfilters ; i++)
 		{
diff --git a/content/asf_right_click.js b/content/asf_right_click.js
index 8b4f18a..1974f1d 100644
--- a/content/asf_right_click.js
+++ b/content/asf_right_click.js
@@ -111,10 +111,6 @@ var automatic_save_folder = {
 				Components.utils.import("resource://gre/modules/DownloadLastDir.jsm");
 			}
 			
-			// Check if there is any filter in list
-			var nbrfilters = 	prefManager.getIntPref("extensions.asf.filtersNumber");
-				
-				
 			// load the domain and the filename of the saved file
 			var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 							   .getService(Components.interfaces.nsIWindowMediator);
@@ -204,6 +200,7 @@ var automatic_save_folder = {
 			
 			// load filters data from prefmanager into filters[]
 			// filters[filternumber][label]
+			var nbrfilters = 	prefManager.getIntPref("extensions.asf.filtersNumber");
 			var filters = new Array();
 			for ( var i = 0 ; i < nbrfilters ; i++)
 			{
@@ -961,19 +958,7 @@ var automatic_save_folder = {
 		}
 		
 		this.previousASFVersion = this.prefManager.getCharPref("extensions.asf.version");
-		
-		// Read currently installed ASF version, including beta revisions
-		// workaround for Firefox4 new asynchronous addonManager (can't depend on addon.version anymore,
-		// so for all versions of Firefox, read the data directly from the dtd source file.
-		var XhrObj = new XMLHttpRequest();
-		XhrObj.open("GET", "chrome://asf/content/common.dtd", false); //synchronous mode
-		XhrObj.overrideMimeType('text/plain; charset=UTF-8');
-		XhrObj.send(null);
-		if (XhrObj.status == 0)
-		{
-			var dtd = XhrObj.responseText.split("\n") ;
-			this.currentASFVersion = dtd[1].match(/"(.*)"/)[1];
-		}
+		this.currentASFVersion = this.prefmanager.getCharPref("extensions.asf.currentVersion");
 	},
 	
 	
diff --git a/content/common.dtd b/content/common.dtd
index 1fe4ea9..aaee926 100644
--- a/content/common.dtd
+++ b/content/common.dtd
@@ -1,5 +1,7 @@
+<!-- Strings which don't need a translation -->
+
 <!-- Current version -->
-<!ENTITY asf.version "1.0.5bRev120">
+<!ENTITY asf.version "1.0.5bRev121">
 
 <!ENTITY about.translators "
 - cs : Stanislav Horáček<br />
diff --git a/defaults/preferences/asf.js b/defaults/preferences/asf.js
index b839348..35c5724 100644
--- a/defaults/preferences/asf.js
+++ b/defaults/preferences/asf.js
@@ -1,4 +1,5 @@
- pref("extensions.asf.lastdir", true);
+ pref("extensions.asf.currentVersion", "1.0.5bRev121");
+ pref("extensions.asf.lastdir", true);
  pref("extensions.asf.keeptemp", true);
  pref("extensions.asf.viewdloption", false);
  pref("extensions.asf.viewdloptionType", 0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/automatic-save-folder.git