diff options
| -rw-r--r-- | build.py | 4 | ||||
| -rw-r--r-- | chrome/js/browserOverlay.js | 2 | ||||
| -rw-r--r-- | chrome/js/redirect.js | 13 | ||||
| -rw-r--r-- | chrome/js/redirector.js | 5 | ||||
| -rw-r--r-- | chrome/redirector.html | 1 | ||||
| -rw-r--r-- | defaults/preferences/redirector.preferences.js | 1 | ||||
| -rw-r--r-- | install.rdf | 4 |
7 files changed, 15 insertions, 15 deletions
@@ -1,6 +1,6 @@ -import os, os.path, zipfile
+import os, os.path, zipfile, sys
-xpi = zipfile.ZipFile('redirector-2.7.1.xpi','w')
+xpi = zipfile.ZipFile('redirector-' + raw_input('Version: ') + '.xpi','w')
for (root, folders, files) in os.walk('.'):
if 'unittest' in root:
continue
diff --git a/chrome/js/browserOverlay.js b/chrome/js/browserOverlay.js index ed1ab73..019505f 100644 --- a/chrome/js/browserOverlay.js +++ b/chrome/js/browserOverlay.js @@ -18,7 +18,7 @@ var RedirectorOverlay = { this.changedPrefs(this.prefs); this.prefs.addListener(this); document.addEventListener('keypress', function(event) { - if ((event.charCode == 114) && event.altKey) { //alt+r + if ((RedirectorOverlay.prefs.enableShortcutKey) && (event.charCode == 114) && event.altKey) { //alt+r RedirectorOverlay.toggleEnabled(); } }, true); diff --git a/chrome/js/redirect.js b/chrome/js/redirect.js index 4a05ef8..eab14f8 100644 --- a/chrome/js/redirect.js +++ b/chrome/js/redirect.js @@ -202,11 +202,14 @@ Redirect.prototype = { } var resultUrl = this.redirectUrl; for (var i = 1; i < matches.length; i++) { - resultUrl = resultUrl.replace(new RegExp('\\$' + i, 'gi'), - this.unescapeMatches ? unescape(matches[i]) : - this.escapeMatches ? encodeURIComponent(matches[i]) : - matches[i] - ); + var repl = matches[i] || ''; + if (this.unescapeMatches) { + repl = unescape(repl); + } + if (this.escapeMatches) { + repl = encodeURIComponent(repl); + } + resultUrl = resultUrl.replace(new RegExp('\\$' + i, 'gi'), repl); } this._rxInclude.lastIndex = 0; return resultUrl; diff --git a/chrome/js/redirector.js b/chrome/js/redirector.js index 78974bd..86e07a2 100644 --- a/chrome/js/redirector.js +++ b/chrome/js/redirector.js @@ -303,11 +303,6 @@ Redirector = { if (redirectsFile.exists()) { this.importRedirects(redirectsFile); } - - //RedirectorProxy.start(this._prefs.proxyServerPort); - //Redirector.debug('Registering as Proxy Filter'); - //var pps = Cc["@mozilla.org/network/protocol-proxy-service;1"].getService(Ci.nsIProtocolProxyService); - //pps.registerFilter(this, 0); }, _loadStrings : function() { diff --git a/chrome/redirector.html b/chrome/redirector.html index 68300c1..eb0baa7 100644 --- a/chrome/redirector.html +++ b/chrome/redirector.html @@ -31,6 +31,7 @@ <input type="checkbox" id="enable-redirector" data-pref="enabled" /><label>Enabled</label><br /> <input type="checkbox" id="show-status-bar-icon" data-pref="showStatusBarIcon"/><label>Statusbar icon</label><br /> <input type="checkbox" id="show-context-menu" data-pref="showContextMenu"/><label>Context menu</label><br /> + <input type="checkbox" id="enable-shortcut-key" data-pref="enableShortcutKey"/><label>Enable/Disable via Alt-r</label><br /> <input type="checkbox" id="enable-debug-output" data-pref="debugEnabled"/><label>Debug output</label><br /> <div class="button-row"> <button id="close">Close</button> diff --git a/defaults/preferences/redirector.preferences.js b/defaults/preferences/redirector.preferences.js index 4464a8a..c6b864f 100644 --- a/defaults/preferences/redirector.preferences.js +++ b/defaults/preferences/redirector.preferences.js @@ -3,6 +3,7 @@ pref("extensions.redirector.debugEnabled", false); pref("extensions.redirector.enabled", true); pref("extensions.redirector.showContextMenu", true); pref("extensions.redirector.showStatusBarIcon", true); +pref("extensions.redirector.enableShortcutKey", true); pref("extensions.redirector.version", 'undefined'); pref("extensions.redirector.defaultDir", ''); pref("extensions.redirector.proxyServerPort", 4815); diff --git a/install.rdf b/install.rdf index 063de77..df68e9f 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>redirector@einaregilsson.com</em:id> <em:name>Redirector</em:name> - <em:version>2.8</em:version> + <em:version>2.8.1</em:version> <em:creator>Einar Egilsson</em:creator> <em:contributor>Noah Luck Easterly</em:contributor> <em:description>Automatically redirects to user-defined urls on certain pages</em:description> @@ -18,7 +18,7 @@ <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox --> <em:minVersion>5.0</em:minVersion> - <em:maxVersion>10.*</em:maxVersion> + <em:maxVersion>12.*</em:maxVersion> </Description> </em:targetApplication> </Description> |