Fixed merge weirdness
parent
b58ed8b616
commit
ea16f4e2b6
|
@ -463,18 +463,6 @@
|
||||||
$(this.el).html(this.template(this.model.toJSON()));
|
$(this.el).html(this.template(this.model.toJSON()));
|
||||||
|
|
||||||
|
|
||||||
return this;
|
|
||||||
},
|
|
||||||
|
|
||||||
postRender:function() {
|
|
||||||
this.toggleRequireClientSecret();
|
|
||||||
this.previewLogo();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var URLListView = Backbone.View.extend({
|
|
||||||
|
|
||||||
|
|
||||||
var _self = this;
|
var _self = this;
|
||||||
|
|
||||||
// build and bind registered redirect URI collection and view
|
// build and bind registered redirect URI collection and view
|
||||||
|
@ -500,6 +488,7 @@
|
||||||
|
|
||||||
postRender:function() {
|
postRender:function() {
|
||||||
this.toggleRequireClientSecret();
|
this.toggleRequireClientSecret();
|
||||||
|
this.previewLogo();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue