aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGokulakrishna <gokulakrishna@rocketmail.com>2018-05-16 19:18:31 +0530
committerGitHub <noreply@github.com>2018-05-16 19:18:31 +0530
commite7aea47b298a5babd4adfd62493cb1f249404bb4 (patch)
tree54fda1df63ef2a2e16e10a7707b070b6b8c1a8ba
parent0e67ede5d1b4e9933e713046889a30b0d56f8ea8 (diff)
parent97631f0a8a17ad72ecd5cbdd4a5ece5dfaa3815a (diff)
Merge pull request #1 from gkrishnaks/issue104
Fixes #104
-rw-r--r--js/redirect.js4
-rw-r--r--redirector.html13
2 files changed, 16 insertions, 1 deletions
diff --git a/js/redirect.js b/js/redirect.js
index 83681fc..3b772b8 100644
--- a/js/redirect.js
+++ b/js/redirect.js
@@ -33,6 +33,7 @@ Redirect.prototype = {
error : null,
includePattern : '',
excludePattern : '',
+ patternDesc:'',
redirectUrl : '',
patternType : '',
processMatches : 'noProcessing',
@@ -56,6 +57,7 @@ Redirect.prototype = {
&& this.exampleUrl == redirect.exampleUrl
&& this.includePattern == redirect.includePattern
&& this.excludePattern == redirect.excludePattern
+ && this.patternDesc == redirect.patternDesc
&& this.redirectUrl == redirect.redirectUrl
&& this.patternType == redirect.patternType
&& this.processMatches == redirect.processMatches
@@ -70,6 +72,7 @@ Redirect.prototype = {
error : this.error,
includePattern : this.includePattern,
excludePattern : this.excludePattern,
+ patternDesc : this.patternDesc,
redirectUrl : this.redirectUrl,
patternType : this.patternType,
processMatches : this.processMatches,
@@ -208,6 +211,7 @@ Redirect.prototype = {
this.excludePattern = o.excludePattern || '';
this.redirectUrl = o.redirectUrl || '';
this.patternType = o.patternType || Redirect.WILDCARD;
+ this.patternDesc = o.patternDesc || '';
this.processMatches = o.processMatches || 'noProcessing';
if (!o.processMatches && o.unescapeMatches) {
this.processMatches = 'urlDecode';
diff --git a/redirector.html b/redirector.html
index 0285e00..7f04b68 100644
--- a/redirector.html
+++ b/redirector.html
@@ -46,7 +46,11 @@
<div>
<label>Pattern type:</label>
<span>{{redirect.patternType == 'W' ? 'Wildcard' : 'Regular Expression'}}</span>
- </div>
+ </div>
+ <div>
+ <label>Pattern Description:</label>
+ <span>{{redirect.patternDesc}}</span>
+ </div>
<div class="button-container">
<a class="btn red large" ng-click="deleteRedirect()">Yes, delete it</a>
<a class="btn grey large" ng-click="cancelDelete()">No, don't delete it</a>
@@ -84,6 +88,10 @@
</div>
</div>
<div>
+ <label>Pattern Description:</label>
+ <div class="input-cell"><input type="text" ng-model="redirect.patternDesc" placeholder="Describe your pattern" /></div>
+ </div>
+ <div>
<label>Example result:</label>
<div class="input-cell"><span class="error example-result-error" ng-show="redirect.error">{{redirect.error}}</span><span class="example-result" ng-show="redirect.exampleResult">{{redirect.exampleResult}}</span></div>
</div>
@@ -166,6 +174,9 @@
<div ng-show="r.excludePattern">
<label>excluding:</label><p>{{r.excludePattern}}</p>
</div>
+ <div ng-if="r.patternDesc">
+ <label>Hint:</label><p>{{r.patternDesc}}</p>
+ </div>
<div>
<label>Example:</label> <p><span class="error" ng-show="r.error">{{r.error}}</span><span ng-show="r.exampleResult">{{r.exampleUrl}} <span class="arrow">&rarr;</span> {{r.exampleResult}}</span></p>
</div>