don't re-use view objects, closes #608
parent
e57adc048a
commit
f33726a778
|
@ -463,15 +463,6 @@ var AppRouter = Backbone.Router.extend({
|
||||||
this.accessTokensList = new AccessTokenCollection();
|
this.accessTokensList = new AccessTokenCollection();
|
||||||
this.refreshTokensList = new RefreshTokenCollection();
|
this.refreshTokensList = new RefreshTokenCollection();
|
||||||
|
|
||||||
this.clientListView = new ClientListView({model:this.clientList, stats: this.clientStats, systemScopeList: this.systemScopeList, whiteListList: this.whiteListList});
|
|
||||||
this.whiteListListView = new WhiteListListView({model:this.whiteListList, clientList: this.clientList, systemScopeList: this.systemScopeList});
|
|
||||||
this.approvedSiteListView = new ApprovedSiteListView({model:this.approvedSiteList, clientList: this.clientList, systemScopeList: this.systemScopeList});
|
|
||||||
this.blackListListView = new BlackListListView({model:this.blackListList});
|
|
||||||
this.systemScopeListView = new SystemScopeListView({model:this.systemScopeList});
|
|
||||||
this.tokensListView = new TokenListView({model: {access: this.accessTokensList, refresh: this.refreshTokensList}, clientList: this.clientList, systemScopeList: this.systemScopeList});
|
|
||||||
this.dynRegRootView = new DynRegRootView({systemScopeList: this.systemScopeList});
|
|
||||||
this.resRegRootView = new ResRegRootView({systemScopeList: this.systemScopeList});
|
|
||||||
|
|
||||||
this.breadCrumbView = new BreadCrumbView({
|
this.breadCrumbView = new BreadCrumbView({
|
||||||
collection:new Backbone.Collection()
|
collection:new Backbone.Collection()
|
||||||
});
|
});
|
||||||
|
@ -504,8 +495,10 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Manage Clients", href:"manage/#admin/clients"}
|
{text:"Manage Clients", href:"manage/#admin/clients"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
this.clientListView.load(function() {
|
var view = new ClientListView({model:this.clientList, stats: this.clientStats, systemScopeList: this.systemScopeList, whiteListList: this.whiteListList});
|
||||||
$('#content').html(app.clientListView.render().el);
|
|
||||||
|
view.load(function() {
|
||||||
|
$('#content').html(view.render().el);
|
||||||
app.clientListView.delegateEvents();
|
app.clientListView.delegateEvents();
|
||||||
setPageTitle("Manage Clients");
|
setPageTitle("Manage Clients");
|
||||||
});
|
});
|
||||||
|
@ -643,7 +636,7 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Manage Whitelisted Sites", href:"manage/#admin/whitelists"}
|
{text:"Manage Whitelisted Sites", href:"manage/#admin/whitelists"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var view = this.whiteListListView;
|
var view = new WhiteListListView({model:this.whiteListList, clientList: this.clientList, systemScopeList: this.systemScopeList});
|
||||||
|
|
||||||
view.load(
|
view.load(
|
||||||
function() {
|
function() {
|
||||||
|
@ -730,9 +723,9 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Manage Approved Sites", href:"manage/#user/approve"}
|
{text:"Manage Approved Sites", href:"manage/#user/approve"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var view = this.approvedSiteListView;
|
var view = new ApprovedSiteListView({model:this.approvedSiteList, clientList: this.clientList, systemScopeList: this.systemScopeList});
|
||||||
|
|
||||||
this.approvedSiteListView.load(
|
view.load(
|
||||||
function(collection, response, options) {
|
function(collection, response, options) {
|
||||||
$('#content').html(view.render().el);
|
$('#content').html(view.render().el);
|
||||||
setPageTitle("Manage Approved Sites");
|
setPageTitle("Manage Approved Sites");
|
||||||
|
@ -748,7 +741,7 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Manage Active Tokens", href:"manage/#user/tokens"}
|
{text:"Manage Active Tokens", href:"manage/#user/tokens"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var view = this.tokensListView;
|
var view = new TokenListView({model: {access: this.accessTokensList, refresh: this.refreshTokensList}, clientList: this.clientList, systemScopeList: this.systemScopeList});
|
||||||
|
|
||||||
view.load(
|
view.load(
|
||||||
function(collection, response, options) {
|
function(collection, response, options) {
|
||||||
|
@ -780,7 +773,7 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Manage Blacklisted Sites", href:"manage/#admin/blacklist"}
|
{text:"Manage Blacklisted Sites", href:"manage/#admin/blacklist"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var view = this.blackListListView;
|
var view = new BlackListListView({model:this.blackListList});
|
||||||
|
|
||||||
view.load(
|
view.load(
|
||||||
function(collection, response, options) {
|
function(collection, response, options) {
|
||||||
|
@ -803,7 +796,7 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Manage System Scopes", href:"manage/#admin/scope"}
|
{text:"Manage System Scopes", href:"manage/#admin/scope"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var view = this.systemScopeListView;
|
var view = new SystemScopeListView({model:this.systemScopeList});
|
||||||
|
|
||||||
view.load(function() {
|
view.load(function() {
|
||||||
$('#content').html(view.render().el);
|
$('#content').html(view.render().el);
|
||||||
|
@ -864,8 +857,10 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Client Registration", href:"manage/#dev/dynreg"}
|
{text:"Client Registration", href:"manage/#dev/dynreg"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
this.dynRegRootView.load(function() {
|
var view = new DynRegRootView({systemScopeList: this.systemScopeList});
|
||||||
$('#content').html(app.dynRegRootView.render().el);
|
|
||||||
|
view.load(function() {
|
||||||
|
$('#content').html(view.render().el);
|
||||||
|
|
||||||
setPageTitle("Self-service Client Registration");
|
setPageTitle("Self-service Client Registration");
|
||||||
});
|
});
|
||||||
|
@ -922,8 +917,9 @@ var AppRouter = Backbone.Router.extend({
|
||||||
{text:"Protected Resource Registration", href:"manage/#dev/resource"}
|
{text:"Protected Resource Registration", href:"manage/#dev/resource"}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
this.resRegRootView.load(function() {
|
var view = new ResRegRootView({systemScopeList: this.systemScopeList});
|
||||||
$('#content').html(app.resRegRootView.render().el);
|
view.load(function() {
|
||||||
|
$('#content').html(view.render().el);
|
||||||
|
|
||||||
setPageTitle("Self-service Protected Resource Registration");
|
setPageTitle("Self-service Protected Resource Registration");
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue