From df174a1695b2d1a872c01c19758ab6e1f366ff12 Mon Sep 17 00:00:00 2001
From: Michael Jett <mjett@mitre.org>
Date: Fri, 4 May 2012 15:56:12 -0400
Subject: [PATCH] Test Client JS now valid. App.JS updates
---
.../src/main/webapp/resources/js/app.js | 54 +++++++--
.../webapp/resources/test/json/clients.js | 104 ++++++++++--------
2 files changed, 99 insertions(+), 59 deletions(-)
diff --git a/openid-connect-server/src/main/webapp/resources/js/app.js b/openid-connect-server/src/main/webapp/resources/js/app.js
index a9abff065..df9416643 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -13,13 +13,13 @@
refreshTokens:false
},
- urlRoot:"../api/clients"
+ urlRoot:"/resources/test/json/clients.js"
});
var ClientCollection = Backbone.Collection.extend({
model:ClientModel,
- url:"../api/clients"
+ url:"/resources/test/json/clients.js"
});
@@ -65,26 +65,56 @@
el: $("#client-table"),
- addOne: function(todo) {
+ initialize:function () {
+ this.model.bind("reset", this.render, this);
+ },
- var view = new ClientView({
- model:new ClientModel()
- });
-
- var chilly = view.render().el;
- this.$('tbody').append(view.render().el);
-
- view.model.set({name:'hello world'});
+ render:function (eventName) {
+ _.each(this.model.models, function (client) {
+ $(this.el).append(new ClientView({model:client}).render().el);
+ }, this);
+ return this;
}
});
+ // Router
+ var AppRouter = Backbone.Router.extend({
+ routes:{
+ "":"list"
+ },
+
+ initialize:function () {
+ //$('#header').html(new HeaderView().render().el);
+ },
+
+ list:function () {
+ this.clientList = new ClientCollection();
+ this.clientListView = new ClientListView({model:this.clientList});
+ this.clientList.fetch({
+ dataType:"json",
+ success:function (collection, response) {
+ //console.dir(response);
+ },
+ error:function (collection, response) {
+ //console.dir(response);
+ }
+ });
+
+ //debugger;
+ }
+
+ });
+
+ // main
$(function () {
// load templates and append them to the body
$.get('resources/template/client.html', function (templates) {
$('body').append(templates);
-
+
+ var app = new AppRouter();
+ Backbone.history.start();
});
diff --git a/openid-connect-server/src/main/webapp/resources/test/json/clients.js b/openid-connect-server/src/main/webapp/resources/test/json/clients.js
index 52b2566d2..ada5e2698 100644
--- a/openid-connect-server/src/main/webapp/resources/test/json/clients.js
+++ b/openid-connect-server/src/main/webapp/resources/test/json/clients.js
@@ -1,47 +1,57 @@
-var clients = [
- {
- name:"A name",
- redirectURL:"http://myURL.domain",
- grantType:["my grant type 1", "my grant type 2"],
- scope:["scope 1", "scope 2"],
- authority:"my authority",
- description:"my description",
- refreshTokens:false
- },
- {
- name:"A name",
- redirectURL:"http://myURL.domain",
- grantType:["my grant type 1", "my grant type 2"],
- scope:["scope 1", "scope 2"],
- authority:"my authority",
- description:"my description",
- refreshTokens:false
- },
- {
- name:"A name",
- redirectURL:"http://myURL.domain",
- grantType:["my grant type 1", "my grant type 2"],
- scope:["scope 1", "scope 2"],
- authority:"my authority",
- description:"my description",
- refreshTokens:false
- },
- {
- name:"A name",
- redirectURL:"http://myURL.domain",
- grantType:["my grant type 1", "my grant type 2"],
- scope:["scope 1", "scope 2"],
- authority:"my authority",
- description:"my description",
- refreshTokens:false
- },
- {
- name:"A name",
- redirectURL:"http://myURL.domain",
- grantType:["my grant type 1", "my grant type 2"],
- scope:["scope 1", "scope 2"],
- authority:"my authority",
- description:"my description",
- refreshTokens:false
- }
-];
\ No newline at end of file
+[{
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+}, {
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+},{
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+},{
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+},{
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+},{
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+},{
+ "name": "A name",
+ "redirectURL": "http://myURL.domain",
+ "grantType": ["my grant type 1", "my grant type 2"],
+ "scope": ["scope 1", "scope 2"],
+ "authority": "my authority",
+ "description": "my description",
+ "refreshTokens": false
+}]
\ No newline at end of file