Mercurial > wikked
changeset 275:bde155a0335b
Don't redirect when going to search results or canceling page editing.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Thu, 25 Sep 2014 11:35:54 -0700 |
| parents | b300e1d1371e |
| children | 24d5464274bb |
| files | wikked/assets/js/wikked/models.js wikked/assets/tpl/edit-page.html |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/wikked/assets/js/wikked/models.js Thu Sep 25 11:35:25 2014 -0700 +++ b/wikked/assets/js/wikked/models.js Thu Sep 25 11:35:54 2014 -0700 @@ -57,7 +57,7 @@ this.navigate('/search/' + $(form.q).val(), { trigger: true }); }, doGoToSearchResult: function(url) { - this.navigate(url, { trigger: true }); + this.navigate(url + "?no_redirect", { trigger: true }); }, doNewPage: function(form) { this.navigate('/create/', { trigger: true }); @@ -275,7 +275,7 @@ } if (this.getMeta('redirect')) { // Handle redirects. - var newPath = this.getMeta('redirect').replace(/^\//, ""); + var newPath = this.getMeta('redirect')[0].replace(/^\//, ""); if (this.get('no_redirect')) { this.set({ 'redirects_to': newPath }, { 'silent': true }); } else {
--- a/wikked/assets/tpl/edit-page.html Thu Sep 25 11:35:25 2014 -0700 +++ b/wikked/assets/tpl/edit-page.html Thu Sep 25 11:35:54 2014 -0700 @@ -49,7 +49,7 @@ <section id="wmd-commit-wrapper"> <div class="pure-control-group" id="wmd-commit"> <button type="submit" class="pure-button pure-button-primary"><i class="icon-ok icon-white"></i> Save</button> - <a href="{{url_read}}" class="pure-button">Cancel</a> + <a href="{{url_read}}?no_redirect" class="pure-button">Cancel</a> </div> </section> </div>