diff options
| author | Einar Egilsson <einar@einaregilsson.com> | 2015-09-24 10:46:03 +0000 |
|---|---|---|
| committer | Einar Egilsson <einar@einaregilsson.com> | 2015-09-24 10:46:03 +0000 |
| commit | f432a10a164e9a32f7bb915e5ca8cef5489f3ccd (patch) | |
| tree | e7723cfce514c94b1984422f3483e699e30c7a41 | |
| parent | f35ca65eac41d9acad9b5888242d2bc1c27d7904 (diff) | |
Few fixes from Jack Black by email, thanks :)
| -rw-r--r-- | css/redirector.css | 3 | ||||
| -rw-r--r-- | help.html | 18 | ||||
| -rw-r--r-- | js/controllers/deleteredirect.js | 6 | ||||
| -rw-r--r-- | redirector.html | 2 |
4 files changed, 14 insertions, 15 deletions
diff --git a/css/redirector.css b/css/redirector.css index 31fb8cf..97b877c 100644 --- a/css/redirector.css +++ b/css/redirector.css @@ -256,8 +256,7 @@ a.disabled:hover { #delete-redirect-form { position: fixed; padding:10px; - min-width:500px; - width:intrinsic; + width:500px; background:white; border:solid 1px #bbb; border-radius:3px; @@ -4,7 +4,7 @@ <title>REDIRECTOR HELP</title> <meta charset="UTF-8"> <link rel="stylesheet" href="css/help.css" /> - <link rel="shortcut icon" href="images/icon32active.png"> + <link rel="shortcut icon" href="images/icon-active-32.png"> </head> <body> @@ -77,8 +77,8 @@ <li><a name="redirectto"></a><strong>Redirect to:</strong> This is the url that you will be redirected to when you open any page where the url matches the include pattern. You can use the special signs $1, $2, $3 etc. in the url, they will be replaced by the results of captures with regular expressions or stars with wildcards. For instance, if you have the include pattern <span class="pattern">http://google.com/*</span>, redirect to <span class="pattern">http://froogle.com/$1</span> - and you open the page <span class="url">http://google.com/foobar</span>, then you will be redireced to <span class="url">http://froogle.com/foobar</span>, since 'foobar' was what the star replaced. $1 is for the - first star in the pattern, $2 for the second and so on. For regular expression $1 is for the first parantheses, $2 for the second etc.</li> + and you open the page <span class="url">http://google.com/foobar</span>, then you will be redirected to <span class="url">http://froogle.com/foobar</span>, since 'foobar' was what the star replaced. $1 is for the + first star in the pattern, $2 for the second and so on. For regular expression $1 is for the first parentheses, $2 for the second etc.</li> <li><a name="patterntype"></a><strong>Pattern type:</strong> This specifies how Redirector should interpret the patterns, either as <a href="#wildcards">wildcards</a> or <a href="#regularexpressions#">regular expressions</a>.</li> @@ -91,7 +91,7 @@ matches will be unescaped (turned from e.g. <span class="url">http%3A%2F%2Fbar%2Ecom</span> to <span class="url">http://bar.com</span>) before being inserted into the target url. </li> - <li><a name="escapematches"></a><strong>Escape matches:</strong> The opposite of <a href="unescapematches">Unescape matches</a>. Let's say you want to redirect all requests to + <li><a name="escapematches"></a><strong>Escape matches:</strong> The opposite of <a href="#unescapematches">Unescape matches</a>. Let's say you want to redirect all requests to a domain like <span class="url">http://example.com</span> to some proxy site that took the url to proxy as an url parameter. Then you might do something like the regular expression pattern <span class="pattern">^(http://example\.com/.*)</span> and redirect it to <span class="pattern">http://proxysite.com?url=$1</span>. If you used the Escape matches option then the final url would become <span class="url">http://proxysite.com?url=http%3A%2F%2Fexample.com%2Ffoo%2Fbar</span>. @@ -132,7 +132,7 @@ <p>Regular expressions allow for more complicated patterns but they are a lot harder to learn than wildcards. I'm not gonna create a regex tutorial here but normal javascript regex syntax works, look at <a href="http://regular-expressions.info" target="_blank">http://regular-expressions.info</a> for an introduction to regular expressions. $1,$2 etc. can be used in the redirect url and will be replaced with contents of captures in - the regular expressions. Captures are specified with parantheses. Example: <span class="pattern">http://example.com/index.asp\?id=(\d+)</span> will match the url + the regular expressions. Captures are specified with parentheses. Example: <span class="pattern">http://example.com/index.asp\?id=(\d+)</span> will match the url <span class="url">http://example.com/index.asp?id=12345</span> and $1 will be replaced by 12345. (A common mistake in regex patterns is to forget to escape the ? sign in the querystring of the url. ? is a special character in regular expressions so if you want to match an url with a querystring you should escape it as \?).</p> @@ -180,7 +180,7 @@ </tr> <tr> <th>Redirect to:</th> - <td class="pattern">http://example.com/printerfriendly.com?id=$1&a=b</td> + <td class="pattern">http://example.com/printerfriendly.php?id=$1&a=b</td> </tr> <tr> <th>Pattern type:</th> @@ -206,7 +206,7 @@ </tr> <tr> <th>Redirect to:</th> - <td class="pattern">http://example.com/printerfriendly.com?id=$1&a=b</td> + <td class="pattern">http://example.com/printerfriendly.php?id=$1&a=b</td> </tr> <tr> <th>Pattern type:</th> @@ -238,7 +238,7 @@ </tr> <tr> <th>Redirect to:</th> - <td class="pattern">http://example.com/category/cats/index.php</td> + <td class="pattern">http://example.com/category/cat/index.php</td> </tr> <tr> <th>Pattern type:</th> @@ -246,7 +246,7 @@ </tr> <tr> <th>Example result:</th> - <td class="url">http://example.com/category/cats/index.php</td> + <td class="url">http://example.com/category/cat/index.php</td> </tr> </table> </li> diff --git a/js/controllers/deleteredirect.js b/js/controllers/deleteredirect.js index f480339..c126df9 100644 --- a/js/controllers/deleteredirect.js +++ b/js/controllers/deleteredirect.js @@ -11,14 +11,14 @@ redirectorApp.controller('DeleteRedirectCtrl', ['$scope', function($s) { $s.cancelDelete = function(index) { delete $s.redirect; - delete $s.deletingIndex; + delete $s.deleteIndex; $s.$parent.showDeleteForm = false; } $s.deleteRedirect = function() { - $s.redirects.splice($s.deletingIndex, 1); + $s.redirects.splice($s.deleteIndex, 1); delete $s.redirect; - delete $s.deletingIndex; + delete $s.deleteIndex; $s.$parent.showDeleteForm = false; $s.saveChanges(); }; diff --git a/redirector.html b/redirector.html index 1627d03..7b381e2 100644 --- a/redirector.html +++ b/redirector.html @@ -5,7 +5,7 @@ <meta charset="UTF-8"> <link rel="stylesheet" href="css/redirector.css" /> <!-- ☈ --> - <link rel="shortcut icon" href="images/icon32active.png" /> + <link rel="shortcut icon" href="images/icon-active-32.png"> <script src="js/firefox/page-shim.js"></script> <script src="js/angular.min.js"></script> <script src="js/redirect.js"></script> |