From 36d4fe49ee7ff432fd0c270ddec5800d26c1ee5a Mon Sep 17 00:00:00 2001
From: Einar Egilsson <einar@einaregilsson.com>
Date: Sun, 27 Sep 2015 22:45:48 +0000
Subject: 3.0.4

---
 .jpmignore                    | 3 +++
 build.py                      | 4 ++++
 help.html                     | 1 -
 js/firefox/background-shim.js | 3 +++
 js/firefox/page-shim.js       | 9 ++++-----
 manifest.json                 | 2 +-
 package.json                  | 2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.jpmignore b/.jpmignore
index e1a9735..0e328ce 100644
--- a/.jpmignore
+++ b/.jpmignore
@@ -4,8 +4,11 @@
 manifest.json
 .git/*
 .gitignore
+.jpmignore
 *.py
+icon.html
 devprofile/*
+unittest/*
 debug.sh
 promo/*
 
diff --git a/build.py b/build.py
index db197d8..291004e 100755
--- a/build.py
+++ b/build.py
@@ -9,6 +9,10 @@ def get_files_to_zip():
 		r'\.(py|sh)$', 
 		r'\.DS_Store$', 
 		r'\.gitignore$',
+		r'\.jpmignore$',
+		r'package\.json$',
+		r'icon\.html',
+		r'.*unittest.*',
 		r'(\\|/)promo(\\|/)',
 		r'(\\|/)build(\\|/)', 
 		r'debug\.sh'
diff --git a/help.html b/help.html
index 95ff9da..f96375b 100644
--- a/help.html
+++ b/help.html
@@ -105,7 +105,6 @@
 
             
 		</ul>
-		</p>
 
 		<a name="wildcards"></a>
 		<h4>Wildcards</h4>
diff --git a/js/firefox/background-shim.js b/js/firefox/background-shim.js
index d43d662..3551e48 100644
--- a/js/firefox/background-shim.js
+++ b/js/firefox/background-shim.js
@@ -171,6 +171,9 @@ function attachedPage(worker) {
 			chrome.storage.local.set(message.payload, function(data) {
 				sendReply(message, data);
 			});
+		} else if (message.messageType == 'manifest.get') {
+			var p = require('package.json');
+			sendReply(message, p);
 		} else if (message.messageType == 'log.enabled') {
 			if (!message.payload.enabled) {
 				log('Logging has been disabled for Redirector');
diff --git a/js/firefox/page-shim.js b/js/firefox/page-shim.js
index 6496910..676c9d9 100644
--- a/js/firefox/page-shim.js
+++ b/js/firefox/page-shim.js
@@ -25,11 +25,10 @@
 		}
 	});
 
-	var req = new XMLHttpRequest();
-	req.overrideMimeType('application/json');
-	req.open("GET", 'package.json', false);
-	req.send();	
-	var manifest = JSON.parse(req.responseText);
+	var manifest = { version:'unknown' };
+	send('manifest.get', {}, function(data) {
+		manifest = data;
+	})
 
 	window.chrome = {
 		storage : {
diff --git a/manifest.json b/manifest.json
index 4c68b68..fe2a049 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "manifest_version": 2,
   "name": "Redirector",
   "description": "Automatically redirect pages based on user-defined rules. E.g. always redirect an article url to its printer-friendly version.",
-  "version": "3.0.3",
+  "version": "3.0.4",
   
   "icons": {   "16": "images/icon-active-16.png",
                "32": "images/icon-active-32.png",
diff --git a/package.json b/package.json
index 4b60882..d54264b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "title": "Redirector",
   "name": "redirector",
   "id" : "redirector@einaregilsson.com",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "homepage" : "http://einaregilsson.com/redirector",
   "icon" : "resource://redirector-at-einaregilsson-dot-com/images/icon-active-48.png",
   "icon64" : "resource://redirector-at-einaregilsson-dot-com/images/icon-active-64.png",
-- 
cgit v1.2.3