diff options
Diffstat (limited to 'chrome/content')
| -rw-r--r-- | chrome/content/overlay.js | 181 | ||||
| -rw-r--r-- | chrome/content/overlay.xul | 5 | ||||
| -rw-r--r-- | chrome/content/redirect.js | 24 | ||||
| -rw-r--r-- | chrome/content/redirect.xul | 6 | ||||
| -rw-r--r-- | chrome/content/redirectList.js | 50 | ||||
| -rw-r--r-- | chrome/content/redirectList.xul | 62 | ||||
| -rw-r--r-- | chrome/content/redirector.js | 312 | ||||
| -rw-r--r-- | chrome/content/redirector.tws | bin | 783 -> 0 bytes | |||
| -rw-r--r-- | chrome/content/redirlib.js | 229 |
9 files changed, 121 insertions, 748 deletions
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js index f1d2241..46f69cc 100644 --- a/chrome/content/overlay.js +++ b/chrome/content/overlay.js @@ -1,5 +1,10 @@ //// $Id$ +var Redirector = Components.classes["@einaregilsson.com/redirector;1"].getService(Components.interfaces.nsISupports).wrappedJSObject; + +function $(id) { + return document.getElementById(id); +} var RedirectorOverlay = { @@ -12,172 +17,35 @@ var RedirectorOverlay = { try { // initialization code - RedirLib.initialize(this); - RedirLib.debug("Initializing..."); + Redirector.debug("Initializing..."); $('contentAreaContextMenu') .addEventListener("popupshowing", function(e) { RedirectorOverlay.showContextMenu(e); }, false); - this.ffversion = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).version; - - if (!RedirLib.getBoolPref('showContextMenu')) { + if (!Redirector.getBoolPref('showContextMenu')) { $('redirector-context').hidden = true; } - if (!RedirLib.getBoolPref('showStatusBarIcon')) { + if (!Redirector.getBoolPref('showStatusBarIcon')) { $('redirector-status').hidden = true; } - Redirector.init(); - this.overrideOnStateChange(); - this.overrideOpenNewWindowWith(); - this.overrideOpenNewTabWith(); this.strings = document.getElementById("redirector-strings"); - Redirector.strings = this.strings; this.prefObserver.register(); this.setStatusBarImg(); - RedirLib.debug("Finished initialization"); + Redirector.debug("Finished initialization"); this.initialized = true; } catch(e) { - //Don't use RedirLib because it's initialization might have failed. if (this.strings) { - alert(this.strings.getString("initError")._(this.name) + "\n\n" + e); + alert(this.strings.getFormattedString("initError", [this.name]) + "\n\n" + e); } else { alert(e); } } }, - isVersion3 : function() { - return this.ffversion.toString().charAt(0) == '3'; - }, - - overrideOnStateChange : function() { - var origOnStateChange = nsBrowserStatusHandler.prototype.onStateChange; - - nsBrowserStatusHandler.prototype.onStateChange = function(aWebProgress, aRequest, aStateFlags, aStatus) { - if(aStateFlags & Ci.nsIWebProgressListener.STATE_START - && aStateFlags| Ci.nsIWebProgressListener.STATE_IS_NETWORK - && aStateFlags| Ci.nsIWebProgressListener.STATE_IS_REQUEST - && aRequest && aWebProgress.DOMWindow) { - - //If it's not a GET request we'll always do a slow redirect so the web will continue - //to work in the way you'd expect - try { - var oHttp = aRequest.QueryInterface(Ci.nsIHttpChannel); - var method = oHttp.requestMethod; - - if (method != "GET") { - origOnStateChange.apply(this, arguments); - return; - } - - } catch(ex) { - origOnStateChange.apply(this, arguments); - return; - } - - var uri = aRequest.QueryInterface(Ci.nsIChannel).URI.spec; - - RedirLib.debug('Checking url %1 for instant redirect'._(uri)); - var redirectUrl = Redirector.getRedirectUrlForInstantRedirect(uri); - if (redirectUrl.url && oHttp.notificationCallbacks) { - const NS_BINDING_ABORTED = 0x804b0002; - aRequest.cancel(NS_BINDING_ABORTED); - var newStateFlags = Ci.nsIWebProgressListener.STATE_STOP | Ci.nsIWebProgressListener.STATE_IS_NETWORK | Ci.nsIWebProgressListener.STATE_IS_REQUEST; - origOnStateChange.call(this, aWebProgress, aRequest, newStateFlags, ""); - var interfaceRequestor = oHttp.notificationCallbacks.QueryInterface(Ci.nsIInterfaceRequestor); - var targetDoc = interfaceRequestor.getInterface(Ci.nsIDOMWindow).document; - var gotoUrl = Redirector.makeAbsoluteUrl(uri, redirectUrl.url); - Redirector.goto(gotoUrl, redirectUrl.pattern, uri, targetDoc); - } else { - origOnStateChange.apply(this, arguments); - } - - } else { - origOnStateChange.apply(this, arguments); - } - - }; - }, - - overrideOpenNewWindowWith: function() { - - window.__openNewWindowWith = window.openNewWindowWith; - - - if (this.isVersion3()) { - - window.openNewWindowWith = function (aUrl, aDocument, aPostData, aAllowThirdPartyFixup, aReferrer) { - var redirectUrl = Redirector.getRedirectUrlForInstantRedirect(aUrl); - if (redirectUrl.url) { - __openNewWindowWith(redirectUrl.url, aDocument, aPostData, aAllowThirdPartyFixup, aUrl); - } else { - __openNewWindowWith(aUrl, aDocument, aPostData, aAllowThirdPartyFixup, aReferrer); - } - }; - - } else { //version 2.* - - window.openNewWindowWith = function (href, sourceURL, postData, allowThirdPartyFixup) { - var redirectUrl = Redirector.getRedirectUrlForInstantRedirect(href); - if (redirectUrl.url) { - __openNewWindowWith(redirectUrl.url, href, postData, allowThirdPartyFixup); - } else { - __openNewWindowWith(href, sourceURL, postData, allowThirdPartyFixup); - } - }; - } - }, - - - overrideOpenNewTabWith: function() { - - window.__openNewTabWith = window.openNewTabWith; - if (this.isVersion3()) { - window.openNewTabWith = function (aUrl, aDocument, aPostData, aEvent, aAllowThirdPartyFixup, aReferrer) { - var redirectUrl = Redirector.getRedirectUrlForInstantRedirect(aUrl); - if (redirectUrl.url) { - __openNewTabWith(redirectUrl.url, aDocument, aPostData, aEvent, aAllowThirdPartyFixup, aUrl); - } else { - __openNewTabWith(aUrl, aDocument, aPostData, aEvent, aAllowThirdPartyFixup, aReferrer); - } - - }; - - } else { //version 2.* - window.openNewTabWith = function (href, sourceURL, postData, event, allowThirdPartyFixup) { - var redirectUrl = Redirector.getRedirectUrlForInstantRedirect(href); - if (redirectUrl.url) { - __openNewTabWith(redirectUrl.url, href, postData, event, allowThirdPartyFixup); - } else { - __openNewTabWith(href, sourceURL, postData, event, allowThirdPartyFixup); - } - - }; - - } - }, - - - onDOMContentLoaded : function(event) { - var redirect, link, links, url; - - if (event.target.toString().indexOf('HTMLDocument') == -1) { - return; - } - - url = event.target.location.href; - - RedirLib.debug('Processing url %1'._(url)); - Redirector.processUrl(url, event.target); - }, - - onUnload : function(event) { RedirectorOverlay.prefObserver.unregister(); - Redirector.prefObserver.unregister(); - //Clean up here - RedirLib.debug("Finished cleanup"); + Redirector.debug("Finished cleanup"); }, showContextMenu : function(event) { @@ -202,24 +70,37 @@ var RedirectorOverlay = { if (item.saved) { Redirector.addRedirect(item); } - }, onMenuItemCommand: function(event) { - Redirector.openSettings(); + this.openSettings(); }, toggleEnabled : function(event) { - RedirLib.setBoolPref('enabled', !RedirLib.getBoolPref('enabled')); + Redirector.setEnabled(!Redirector.enabled); }, + openSettings : function() { + var windowName = "redirectorSettings"; + var windowsMediator = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator); + var win = windowsMediator.getMostRecentWindow(windowName); + if (win) { + win.focus(); + } else { + window.openDialog("chrome://redirector/content/redirectList.xul", + windowName, + "chrome,dialog,resizable=no,centerscreen", this); + } + + }, + statusBarClick : function(event) { var LEFT = 0, RIGHT = 2; if (event.button == LEFT) { RedirectorOverlay.toggleEnabled(); } else if (event.button == RIGHT) { - Redirector.openSettings(); + this.openSettings(); //$('redirector-status-popup').showPopup(); } }, @@ -227,16 +108,16 @@ var RedirectorOverlay = { setStatusBarImg : function() { var statusImg = $('redirector-statusbar-img'); - if (RedirLib.getBoolPref('enabled')) { + if (Redirector.enabled) { statusImg.src = 'chrome://redirector/content/statusactive.PNG' statusImg.setAttribute('tooltiptext', this.strings.getString('enabledTooltip')); - Redirector.enabled = true; } else { statusImg.src = 'chrome://redirector/content/statusinactive.PNG' statusImg.setAttribute('tooltiptext', this.strings.getString('disabledTooltip')); - Redirector.enabled = false; } }, + + prefObserver : { diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul index 5bd827f..f46bfcf 100644 --- a/chrome/content/overlay.xul +++ b/chrome/content/overlay.xul @@ -4,9 +4,6 @@ <!DOCTYPE overlay SYSTEM "chrome://redirector/locale/redirector.dtd"> <overlay id="redirector-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - <script src="redirlib.js"/> - <script src="redirector.js"/> <script src="overlay.js"/> <stringbundleset id="stringbundleset"> @@ -28,7 +25,7 @@ <statusbarpanel id="redirector-status"> <!-- Put back in later <menupopup id="redirector-status-popup" position="at_pointer"> - <menuitem label="&RedirectorManageRedirects.label;" accesskey="&RedirectorManageRedirects.accesskey;" oncommand="Redirector.openSettings();" /> + <menuitem label="&RedirectorManageRedirects.label;" accesskey="&RedirectorManageRedirects.accesskey;" oncommand="RedirectorOverlay.openSettings();" /> <menuitem label="&RedirectorHelp.label;" accesskey="&RedirectorHelp.accesskey;" oncommand="Redirector.openHelp();" /> </menupopup> --> diff --git a/chrome/content/redirect.js b/chrome/content/redirect.js index be6cb96..fe468f0 100644 --- a/chrome/content/redirect.js +++ b/chrome/content/redirect.js @@ -1,5 +1,13 @@ //// $Id$ +const kRedirectorWildcard = 'W'; +const kRedirectorRegex= 'R'; +var Redirector = Components.classes["@einaregilsson.com/redirector;1"].getService(Components.interfaces.nsISupports).wrappedJSObject; + +function $(id) { + return document.getElementById(id); +} + var Redirect = { onLoad : function() { @@ -9,7 +17,6 @@ var Redirect = { $('txtPattern').value = item.pattern; $('txtRedirectUrl').value = item.redirectUrl || ''; $('txtExcludePattern').value = item.excludePattern || ''; - $('chkOnlyIfLinkExists').checked = item.onlyIfLinkExists || false; $('txtPattern').focus(); this.strings = document.getElementById("redirector-strings"); @@ -32,15 +39,19 @@ var Redirect = { item.exampleUrl =$('txtExampleUrl').value; item.redirectUrl = $('txtRedirectUrl').value; item.excludePattern = $('txtExcludePattern').value; - item.onlyIfLinkExists = $('chkOnlyIfLinkExists').checked; item.saved = true; return true; }, + msgBox : function(title, text) {
+ Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+ .getService(Components.interfaces.nsIPromptService)
+ .alert(window, title, text);
+ },
+
testPattern : function() { var redirectUrl, pattern, excludePattern, example, extName, isExcluded; - redirectUrl = $('txtRedirectUrl').value; pattern = $('txtPattern').value; excludePattern = $('txtExcludePattern').value; @@ -62,12 +73,11 @@ var Redirect = { var isRedirectMatch = redirectUrl || (redirectUrl === '' && $('txtRedirectUrl').value === ''); if (isRedirectMatch && !isExcluded) { - RedirLib.msgBox(extName, this.strings.getFormattedString('testPatternSuccess', [pattern, example, redirectUrl])); + this.msgBox(extName, this.strings.getFormattedString('testPatternSuccess', [pattern, example, redirectUrl])); } else if (isExcluded) { - RedirLib.msgBox(extName, this.strings.getFormattedString('testPatternExclude', [example, excludePattern])); + this.msgBox(extName, this.strings.getFormattedString('testPatternExclude', [example, excludePattern])); } else { - RedirLib.msgBox(extName, this.strings.getFormattedString('testPatternFailure', [pattern, example])); + this.msgBox(extName, this.strings.getFormattedString('testPatternFailure', [pattern, example])); } } - };
\ No newline at end of file diff --git a/chrome/content/redirect.xul b/chrome/content/redirect.xul index 83ed8df..e808fc4 100644 --- a/chrome/content/redirect.xul +++ b/chrome/content/redirect.xul @@ -10,8 +10,6 @@ xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript" src="redirlib.js"/>
- <script type="application/x-javascript" src="redirector.js"/>
<script type="application/x-javascript" src="redirect.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="redirector-strings" src="chrome://redirector/locale/redirector.properties"/>
@@ -43,10 +41,6 @@ <radio id="rdoRegex" label="&rdoRegex.label;" accesskey="&rdoRegex.accessKey;" taborder="6"/>
</radiogroup>
</row>
- <row>
- <text value="&chkOnlyIfLinkExists.label;" />
- <checkbox id="chkOnlyIfLinkExists" label="" taborder="7"/>
- </row>
</rows>
</grid>
diff --git a/chrome/content/redirectList.js b/chrome/content/redirectList.js index 1e61067..c50583b 100644 --- a/chrome/content/redirectList.js +++ b/chrome/content/redirectList.js @@ -1,3 +1,10 @@ + +var Redirector = Components.classes["@einaregilsson.com/redirector;1"].getService(Components.interfaces.nsISupports).wrappedJSObject; + +function $(id) { + return document.getElementById(id); +} + var RedirectList = { id : "redirector@einaregilsson.com", @@ -26,11 +33,8 @@ var RedirectList = { onLoad : function() { try { - RedirLib.initialize(this); - Redirector.init(); - this.lstRedirects = $('lstRedirects'); - this.lstRedirects.selType = 'single'; //For fx3 + this.lstRedirects.selType = 'single'; this.template = document.getElementsByTagName('richlistitem')[0]; this.lstRedirects.removeChild(this.template); this.btnDelete = $('btnDelete'); @@ -44,10 +48,41 @@ var RedirectList = { close : function() { window.close(); }, + + moveUp : function(){ + if (this.lstRedirects.selectedIndex <= 0) { + return; + } + this.switchItems(this.lstRedirects.selectedIndex-1); + }, + moveDown : function() { + if (this.lstRedirects.selectedIndex == Redirector.list.length-1) { + return; + } + this.switchItems(this.lstRedirects.selectedIndex); + }, + + switchItems : function(firstIndex) { + var first = Redirector.list[firstIndex]; + var second = Redirector.list[firstIndex+1]; + Redirector.list[firstIndex] = second; + Redirector.list[firstIndex+1] = first; + this.setListItemValues(this.lstRedirects.children[firstIndex+1], first); + this.setListItemValues(this.lstRedirects.children[firstIndex], second); + this.lstRedirects.selectedIndex -= 1; + Redirector.save(); + }, + + setListItemValues : function(listItem, item){ + listItem.getElementsByAttribute('name', 'dscrIncludePattern')[0].setAttribute('value', item.pattern); + listItem.getElementsByAttribute('name', 'dscrExcludePattern')[0].setAttribute('value', item.excludePattern); + listItem.getElementsByAttribute('name', 'dscrRedirectTo')[0].setAttribute('value', item.redirectUrl); + }, + addRedirect : function() { - var item = { pattern : '', exampleUrl : '', redirectUrl : '', onlyIfLinkExists : false, patternType : 'W'}; + var item = { pattern : '', exampleUrl : '', redirectUrl : '', patternType : 'W'}; window.openDialog("chrome://redirector/content/redirect.xul", "redirect", @@ -75,12 +110,9 @@ var RedirectList = { "chrome,dialog,modal,centerscreen", item); if (item.saved) { - listItem.getElementsByAttribute('name', 'dscrIncludePattern')[0].setAttribute('value', item.pattern); - listItem.getElementsByAttribute('name', 'dscrExcludePattern')[0].setAttribute('value', item.excludePattern); - listItem.getElementsByAttribute('name', 'dscrRedirectTo')[0].setAttribute('value', item.redirectUrl); + this.setListItemValues(listItem, item); Redirector.save(); } - }, deleteRedirect : function() { diff --git a/chrome/content/redirectList.xul b/chrome/content/redirectList.xul index e3638b0..630c364 100644 --- a/chrome/content/redirectList.xul +++ b/chrome/content/redirectList.xul @@ -11,39 +11,39 @@ xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript" src="redirlib.js"/>
- <script type="application/x-javascript" src="redirector.js"/>
<script type="application/x-javascript" src="redirectList.js"/>
<vbox>
- <richlistbox seltype="single" id="lstRedirects" style="margin-bottom:5px; border:solid 1px grey;" height="330px" ondblclick="RedirectList.editRedirect();" onselect="RedirectList.selectionChange();">
- <richlistitem style="border-bottom:dotted 1px grey;" selected="false">
- <grid>
- <cols>
- </cols>
- <rows>
- <row>
- <label style="font-weight:bold;" value="&colIncludePattern.label;:" />
- <description name="dscrIncludePattern" />
- </row>
- <row>
- <label style="font-weight:bold;" value="&colExcludePattern.label;:" />
- <description name="dscrExcludePattern" />
- </row>
- <row>
- <label style="font-weight:bold;" value="&colRedirectTo.label;:" />
- <description name="dscrRedirectTo" />
- </row>
- </rows>
- </grid>
- </richlistitem>
- </richlistbox>
- <hbox style="align:right;">
- <button id="btnAdd" onclick="RedirectList.addRedirect();" label="&btnAdd.label;" disabled="false" />
- <button id="btnEdit" onclick="RedirectList.editRedirect();" label="&btnEdit.label;" disabled="true" />
- <button id="btnDelete" onclick="RedirectList.deleteRedirect();" label="&btnDelete.label;" disabled="true" />
- <button id="btnClose" onclick="RedirectList.close();" label="&btnClose.label;"/>
- <button id="btnHelp" onclick="Redirector.openHelp();" label="&btnHelp.label;"/>
- </hbox>
+ <richlistbox seltype="single" id="lstRedirects" style="margin-bottom:5px; border:solid 1px grey;" height="330px" ondblclick="RedirectList.editRedirect();" onselect="RedirectList.selectionChange();">
+ <richlistitem style="border-bottom:dotted 1px grey;" selected="false">
+ <grid>
+ <cols>
+ </cols>
+ <rows>
+ <row>
+ <label style="font-weight:bold;" value="&colIncludePattern.label;:" />
+ <description name="dscrIncludePattern" />
+ </row>
+ <row>
+ <label style="font-weight:bold;" value="&colExcludePattern.label;:" />
+ <description name="dscrExcludePattern" />
+ </row>
+ <row>
+ <label style="font-weight:bold;" value="&colRedirectTo.label;:" />
+ <description name="dscrRedirectTo" />
+ </row>
+ </rows>
+ </grid>
+ </richlistitem>
+ </richlistbox>
+ <hbox style="align:right;">
+ <button id="btnAdd" onclick="RedirectList.addRedirect();" label="&btnAdd.label;" disabled="false" />
+ <button id="btnEdit" onclick="RedirectList.editRedirect();" label="&btnEdit.label;" disabled="true" />
+ <button id="btnDelete" onclick="RedirectList.deleteRedirect();" label="&btnDelete.label;" disabled="true" />
+ <button id="btnClose" onclick="RedirectList.close();" label="&btnClose.label;"/>
+ <button id="btnHelp" onclick="Redirector.openHelp();" label="&btnHelp.label;"/>
+ <button id="btnUp" onclick="RedirectList.moveUp();" label="UP" disabled="false" />
+ <button id="btnDown" onclick="RedirectList.moveDown();" label="Down" />
+ </hbox>
</vbox>
</window>
diff --git a/chrome/content/redirector.js b/chrome/content/redirector.js deleted file mode 100644 index fb902f6..0000000 --- a/chrome/content/redirector.js +++ /dev/null @@ -1,312 +0,0 @@ -const kRedirectorWildcard = 'W'; -const kRedirectorRegex= 'R'; - -var Redirector = { - - list : [], - - enabled : true, - - init : function() { - this.load(); - this.prefObserver.register(); - }, - - unload : function() { - this.prefObserver.unregister(); - }, - - save : function() { - var r - , tempList = []; - - for each (r in this.list) { - tempList.push([r.exampleUrl, r.pattern, r.redirectUrl, r.onlyIfLinkExists, r.patternType, r.excludePattern]); - } - RedirLib.setCharPref('redirects', tempList.toSource()); - }, - - load : function() { - var tempList = eval(RedirLib.getCharPref('redirects')); - var arr; - - this.list = []; - - for each (arr in tempList) { - this.list.push({ - exampleUrl : arr[0], - pattern : arr[1], - redirectUrl : arr[2], - onlyIfLinkExists : arr[3], - patternType : arr[4], - excludePattern : arr[5] || '' - }); - } - - }, - - addRedirect : function(redirect) { - this.list.push(redirect); - this.save(); - }, - - deleteAt : function(index) { - this.list.splice(index, 1); - this.save(); - }, - - getRedirectUrlForInstantRedirect : function(url) { - var redirect, link, links, redirectUrl; - - if (this.enabled) { - - for each (redirect in this.list) { - - redirectUrl = this.getRedirectUrl(url, redirect); - //Can't do fast redirect if it requires that link exists - //we need the original page to verify that it exists. - //Slow redirect will be done automatically. - if (redirectUrl) { - if (redirect.redirectUrl.startsWith('xpath:')) { - RedirLib.msgBox(this.strings.getString('extensionName'), this.strings.getString('xpathDeprecated')); - } else if (!redirect.onlyIfLinkExists) { - RedirLib.debug('%1 matches %2, and it\'s not only if link exists. Can do instant redirect.'._(redirect.pattern, url)); - return { 'url' : redirectUrl, 'pattern' : redirect.pattern}; - } else { - RedirLib.debug('%1 matches %2, but it\'s "only if link exists" and so has to be a slow redirect'._(redirect.pattern, url)); - } - } - } - } - return { 'url' : null, 'pattern' : null}; - }, - - getRedirectUrl: function(url, redirect) { - - if (redirect.patternType == kRedirectorWildcard) { - if (this.wildcardMatch(redirect.excludePattern, url, 'whatever')) { - RedirLib.debug('%1 matches exclude pattern %2'._(url, redirect.excludePattern)); - return null; - } - return this.wildcardMatch(redirect.pattern, url, redirect.redirectUrl); - } else if (redirect.patternType == kRedirectorRegex) { - if (this.regexMatch(redirect.excludePattern, url, 'whatever')) { - RedirLib.debug('%1 matches exclude pattern %2'._(url, redirect.excludePattern)); - return null; - } - return this.regexMatch(redirect.pattern, url, redirect.redirectUrl); - } - return null; - }, - - processUrl : function(url, doc) { - var redirect, link, links, redirectUrl; - - if (!this.enabled) { - return; - } - - for each (redirect in this.list) { - - redirectUrl = this.getRedirectUrl(url, redirect); - - if (redirectUrl) { - RedirLib.debug('%1 matches %2'._(redirect.pattern, url)); - if (redirect.onlyIfLinkExists) { - links = window.content.document.getElementsByTagName('a'); - - for each(link in links) { - - if (link.href && link.href.toString() == redirectUrl) { - RedirLib.debug('Found a link for %1'._(redirectUrl)); - this.goto(redirectUrl, redirect.pattern, url, doc); - return; - } - } - - RedirLib.debug('Did not find a link for %1'._(redirectUrl)); - - } else { - this.goto(redirectUrl, redirect.pattern, url, doc); - } - } - } - }, - - makeAbsoluteUrl : function(currentUrl, relativeUrl) { - - if (relativeUrl.startsWith('http://') || relativeUrl.startsWith('https://')) { - return relativeUrl; - } - - var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); - RedirLib.debug(currentUrl); - var uri = ioService.newURI(currentUrl, null, null); - - return uri.resolve(relativeUrl); - }, - - goto : function(redirectUrl, pattern, url, doc) { - - redirectUrl = this.makeAbsoluteUrl(url, redirectUrl); - - if (redirectUrl.startsWith('xpath:')) { - //Do nothing, the instant redirect will have popped up a message - } else if (redirectUrl == url) { - RedirLib.msgBox(this.strings.getString('extensionName'), this.strings.getFormattedString('recursiveError', [pattern, redirectUrl])); - } else { - doc.location.href = redirectUrl; - } - }, - - regexMatch : function(pattern, text, redirectUrl) { - - if (!pattern) { - return null; - } - var strings, rx, match; - try { - rx = new RegExp(pattern, 'gi'); - match = rx.exec(text); - } catch(e) { - //HACK, need to make this better - if (window.RedirectorOverlay) { - strings = window.RedirectorOverlay.strings; - } else if(window.Redirect) { - strings = window.Redirect.strings; - } - RedirLib.msgBox(strings.getString('extensionName'), strings.getFormattedString('regexPatternError', [pattern, e.toString()])); - return null; - } - - var rxrepl; - - if (match) { - for (var i = 1; i < match.length; i++) { - rxrepl = new RegExp('\\$' + i, 'gi'); - redirectUrl = redirectUrl.replace(rxrepl, match[i]); - } - return redirectUrl; - } - - return null; - - }, - - wildcardMatch : function(pattern, text, redirectUrl) { - var parts - , part - , i - , pos - , originalText - , stars; - - if (!pattern) { - return null; - } - parts = pattern.split('*'); - - stars = []; - originalText = text; - var starStart = -1; - - for (i in parts) { - - part = parts[i]; - - pos = text.lastIndexOf(part); - - if (pos == -1) { - return null; - } - - if (i == 0 && pos != 0) { - return null; - } - - if (i == parts.length -1 && i != "" && text.substr(text.length - part.length) != part) { - return null; - - } - - if (i == 0) { - //Do nothing, part will be added on next run - } else if (i == parts.length-1 && parts[i] == '') { - stars.push(text); - } else { - stars.push(text.substr(0, pos)); - } - - text = text.substr(pos + part.length); - } - - for (var i = 1; i <= stars.length; i++) { - redirectUrl = redirectUrl.replace(new RegExp('\\$' + i, 'gi'), stars[i-1]); - } - - return redirectUrl; - }, - - openHelp : function() { - var windowName = "redirectorHelp"; - var windowsMediator = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator); - var win; - var iter = windowsMediator.getEnumerator(null); - while (iter.hasMoreElements()) { - win = iter.getNext(); - if (win.name == windowName) { - win.focus(); - return; - } - } - window.openDialog("chrome://redirector/content/help.html", windowName, "chrome,dialog,resizable=yes,location=0,toolbar=0,status=0,width=800px,height=600px,centerscreen", this); - }, - - - openSettings : function() { - var windowName = "redirectorSettings"; - var windowsMediator = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator); - var win = windowsMediator.getMostRecentWindow(windowName); - if (win) { - win.focus(); - } else { - window.openDialog("chrome://redirector/content/redirectList.xul", - windowName, - "chrome,dialog,resizable=no,centerscreen", this); - } - - }, - - prefObserver : { - - getService : function() { - return Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranchInternal); - }, - - register: function() { - this.getService().addObserver('extensions.redirector', this, false); - }, - - unregister: function() { - this.getService().removeObserver('extensions.redirector', this); - }, - - observe : function(subject, topic, data) { - if (topic != 'nsPref:changed') { - return; - } - - if (!window.Redirector) { - return; - } - - if (data == 'extensions.redirector.redirects') { - Redirector.load(); - } else if (data == 'extensions.redirector.enabled') { - Redirector.enabled = RedirLib.getBoolPref('enabled'); - } - } - - } -}; - diff --git a/chrome/content/redirector.tws b/chrome/content/redirector.tws Binary files differdeleted file mode 100644 index b69455f..0000000 --- a/chrome/content/redirector.tws +++ /dev/null diff --git a/chrome/content/redirlib.js b/chrome/content/redirlib.js deleted file mode 100644 index c25f0fb..0000000 --- a/chrome/content/redirlib.js +++ /dev/null @@ -1,229 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * RedirLib - Utility functions for Firefox extensions
- *
- * Einar Egilsson
- *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-var RedirLib = {
-
- _debug : false,
- _ext : null,
- _cout : null,
- _prefBranch : null,
- version : 0.2,
-
- initialize : function(extension) {
- this._ext = extension;
- this._cout = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
- this._debug = true;
- this._initPrefs();
- },
-
- debug : function(str) {
- if (!this._ext) {
- return; //not initalized yet, _ext will be null
- }
-
- if (this._ext.prefs.debug) {
- this._cout.logStringMessage("%1: %2"._(this._ext.name, str));
- }
- },
-
-
- debugObject : function(name, obj) {
- s = name + ': ';
- for (x in obj)
- s += "\n\t%1 : %2"._(x, obj[x]);
- this.debug(s);
- },
-
- //Adds all prefs to a prefs object on the extension object, and registers a pref observer
- //for the branch.
- _initPrefs : function() {
-
- this._prefBranch = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService)
- .getBranch("extensions.%1."._(this._ext.id.split("@")[0]));
- this._ext.prefs = {};
-
- var list = this._prefBranch.getChildList("", {}).toString().split(",");
-
- for (i in list) {
-
- var name = list[i];
-
- var type = this._prefBranch.getPrefType(name);
-
- if (type == this._prefBranch.PREF_STRING) {
- this._ext.prefs[name] = this._prefBranch.getCharPref(name);
- } else if (type == this._prefBranch.PREF_INT) {
- this._ext.prefs[name] = this._prefBranch.getIntPref(name);
- } else if (type == this._prefBranch.PREF_BOOL) {
- this._ext.prefs[name] = this._prefBranch.getBoolPref(name);
- }
- }
- },
-
-
- getCharPref : function(branch) {
- return this._prefBranch.getCharPref(branch);
- },
-
- setCharPref : function(branch, value) {
- return this._prefBranch.setCharPref(branch, value);
- },
-
- setBoolPref : function(branch, value) {
- return this._prefBranch.setBoolPref(branch, value);
- },
-
- getBoolPref : function(branch) {
- return this._prefBranch.getBoolPref(branch);
- },
-
- getIntPref : function(branch) {
- return this._prefBranch.getIntPref(branch);
- },
-
- getExtensionFolder : function() {
- return Cc["@mozilla.org/extensions/manager;1"]
- .getService(Ci.nsIExtensionManager)
- .getInstallLocation(this._ext.id)
- .getItemLocation(this._ext.id);
-
- },
-
- getEnvVar : function(name) {
- return Cc["@mozilla.org/process/environment;1"]
- .getService(Ci.nsIEnvironment)
- .get(name);
-
- },
-
- setEnvVar : function(name, value) {
- return Cc["@mozilla.org/process/environment;1"]
- .getService(Ci.nsIEnvironment)
- .set(name, value);
-
- },
-
- msgBox : function(title, text) {
- Cc["@mozilla.org/embedcomp/prompt-service;1"]
- .getService(Ci.nsIPromptService)
- .alert(window, title, text);
- },
-
- //Converts a chrome path to a local file path. Note that the
- //file specified at the end of the chrome path does not have
- //to exist.
- chromeToPath : function(path) {
- var rv;
- var ios = Cc["@mozilla.org/network/io-service;1"].createInstance(Ci.nsIIOService);
- var uri = ios.newURI(path, 'UTF-8', null);
- var cr = Cc["@mozilla.org/chrome/chrome-registry;1"].createInstance(Ci.nsIChromeRegistry);
- return cr.convertChromeURL(uri);
- return decodeURI(rv.spec.substr("file:///".length).replace(/\//g, "\\"));
- },
-
- //Saves 'content' to file 'filepath'. Note that filepath needs to
- //be a real file path, not a chrome path.
- saveToFile : function(filepath, content) {
- var file = this.getFile(filepath);
-
- if (!file.exists()) {
- file.create(Ci.nsIFile.NORMAL_FILE_TYPE, 420);
- }
- var outputStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
-
- outputStream.init( file, 0x04 | 0x08 | 0x20, 420, 0 );
- var result = outputStream.write( content, content.length );
- outputStream.close();
- },
-
- startProcess: function(filename, args) {
-
- var file = this.getFile(filename);
-
- args = args ? args : [];
-
- if (file.exists()) {
- var nsIProcess = Cc["@mozilla.org/process/util;1"].getService(Ci.nsIProcess);
- nsIProcess.init(file);
- nsIProcess.run(false, args, args.length);
- } else {
- throw Error("File '%1' does not exist!"._(filename));
- }
-
- },
-
- //Simulates a double click on the file in question
- launchFile : function(filepath) {
- var f = this.getFile(filepath);
- f.launch();
- },
-
-
- //Gets a local file reference, return the interface nsILocalFile.
- getFile : function(filepath) {
- var f = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
- f.initWithPath(filepath);
- return f;
- },
-
- //Returns all elements that match the query sent in. The root used
- //in the query is the window.content.document, so this will only
- //work for html content.
- xpath : function(doc, query) {
- return doc.evaluate(query, doc, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
- }
-
-
-
-};
-
-//************** Some prototype enhancements ************** //
-
-if (!window.Cc) window.Cc = Components.classes;
-if (!window.Ci) window.Ci = Components.interfaces;
-
-//Returns true if the string contains the substring str.
-String.prototype.contains = function (str) {
- return this.indexOf(str) != -1;
-};
-
-String.prototype.trim = function() {
- return this.replace(/^\s*|\s*$/gi, '');
-};
-
-String.prototype.startsWith = function(s) {
- return (this.length >= s.length && this.substr(0, s.length) == s);
-};
-
-String.prototype.endsWith = function(s) {
- return (this.length >= s.length && this.substr(this.length - s.length) == s);
-};
-
-//Inserts the arguments into the string. E.g. if
-//the string is "Hello %1" then "Hello %1"._('johnny')
-//would return "Hello johnny"
-String.prototype._ = function() {
- s = this;
- for (var i = 0; i < arguments.length; i++) {
- var nr = "%" + (i+1);
- var repl;
- if (arguments[i] == null) {
- repl = "null";
- } else if (arguments[i] == undefined) {
- repl = "undefined";
- } else {
- repl = arguments[i];
- }
- s = s.replace(new RegExp(nr, "g"), repl);
- }
- return s;
-};
-
-function $(id) {
- return document.getElementById(id);
-}
\ No newline at end of file |