From 580f6d990ec859e7e371c4527606f0fbbaf7f0c3 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 3 Jun 2014 22:43:09 -0400 Subject: [PATCH] cleaned up "cancel" button behavior, also closes #608 --- .../src/main/webapp/resources/js/client.js | 7 ++++++- .../src/main/webapp/resources/js/dynreg.js | 7 ++++++- .../src/main/webapp/resources/js/rsreg.js | 7 ++++++- .../src/main/webapp/resources/js/whitelist.js | 9 ++++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js index 448cbe51d..e7809f738 100644 --- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js +++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js @@ -489,13 +489,18 @@ var ClientFormView = Backbone.View.extend({ $("#refresh-token-timeout-unit", this.$el).prop('disabled',!$("#refresh-token-timeout-unit", this.$el).prop('disabled')); document.getElementById("refresh-token-timeout-time").value = ''; }, - "click .btn-cancel": function() { window.history.back(); return false; }, + "click .btn-cancel":"cancel", "change #requireClientSecret":"toggleRequireClientSecret", "change #displayClientSecret":"toggleDisplayClientSecret", "change #generateClientSecret":"toggleGenerateClientSecret", "change #logoUri input":"previewLogo" }, + cancel:function(e) { + e.preventDefault(); + app.navigate('admin/clients', {trigger: true}); + }, + load:function(callback) { if (this.options.systemScopeList.isFetched) { $('#loadingbox').sheet('hide'); diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js index f11da9c39..e36e3dd40 100644 --- a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js +++ b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js @@ -185,11 +185,16 @@ var DynRegEditView = Backbone.View.extend({ events:{ "click .btn-save":"saveClient", - "click .btn-cancel": function() { window.history.back(); return false; }, + "click .btn-cancel":"cancel", "click .btn-delete":"deleteClient", "change #logoUri input":"previewLogo" }, + cancel:function(e) { + e.preventDefault(); + app.navigate('dev/dynreg', {trigger: true}); + }, + deleteClient:function (e) { e.preventDefault(); diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js index 74e0e7afb..f87200685 100644 --- a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js +++ b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js @@ -185,11 +185,16 @@ var ResRegEditView = Backbone.View.extend({ events:{ "click .btn-save":"saveClient", - "click .btn-cancel": function() { window.history.back(); return false; }, + "click .btn-cancel":"cancel", "click .btn-delete":"deleteClient", "change #logoUri input":"previewLogo" }, + cancel:function(e) { + e.preventDefault(); + app.navigate('dev/resource', {trigger: true}); + }, + deleteClient:function (e) { e.preventDefault(); diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js b/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js index 8916771aa..a7da26a5c 100644 --- a/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js +++ b/openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js @@ -297,7 +297,14 @@ var WhiteListFormView = Backbone.View.extend({ cancelWhiteList:function(e) { e.preventDefault(); - app.navigate('admin/whitelists', {trigger:true}); + // TODO: figure out where we came from and go back there instead + if (this.model.get('id') == null) { + // if it's a new whitelist entry, go back to the client listing page + app.navigate('admin/clients', {trigger:true}); + } else { + // if we're editing a whitelist, go back to the whitelists page + app.navigate('admin/whitelists', {trigger:true}); + } }, render:function (eventName) {