Changeset 360 for Dev/branches/rest-dojo-ui/client/config

Timestamp:

07/13/12 15:13:46 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Removed controller dependency of Selector and SurveyList?.
Selector emits events now. No id's are used, pass objects around.
Fixed selector wipe in/out confusion for first click.
Read questions from db, no mockup data used anymore in survey page.
Added some sample question to db config, because they cannot be created yet.

Location:

Dev/branches/rest-dojo-ui/client

Files:

• . (modified) (1 prop)
• config (modified) (1 prop)
• config/db.js (modified) (3 diffs)
• config/docs/rft (modified) (1 prop)
• config/docs/rft/q1.json (added)
• config/docs/rft/q2.json (added)
• config/docs/rft/q3.json (added)
• config/docs/rft/q4.json (added)

Dev/branches/rest-dojo-ui/client/config

@@ -1 +1 @@
 .htaccess.swp
 .index.html.swp
+.db.js.swp

@@ -1 +1 @@
 .htaccess.swp
 .index.html.swp
+.db.js.swp

Dev/branches/rest-dojo-ui/client/config/db.js

@@ -10 +10 @@
          'dojo/text!./docs/_users/rft_admin.json',
          'dojo/text!./docs/rft/_design/default.json',
+         'dojo/text!./docs/rft/q1.json',
+         'dojo/text!./docs/rft/q2.json',
+         'dojo/text!./docs/rft/q3.json',
+         'dojo/text!./docs/rft/q4.json',
          'dojo/domReady!',
          'dijit/form/TextBox',
@@ -16 +20 @@
          ],
     function(json,lang,xhr,parser,query,registry,xhrPlugins,
-        securityDoc,rft_adminDoc,design_defaultDoc){
+        securityDoc,rft_adminDoc,design_defaultDoc,q1Doc,q2Doc,q3Doc,q4Doc){
     parser.parse();
 
@@ -112 +116 @@
         req('PUT','/rft/_design/default', newDoc);
 
+        log("Uploading sample question documents");
+        req('PUT','/rft/q1', json.fromJson(q1Doc));
+        req('PUT','/rft/q2', json.fromJson(q2Doc));
+        req('PUT','/rft/q3', json.fromJson(q3Doc));
+        req('PUT','/rft/q4', json.fromJson(q4Doc));
+
         log("Done!");
     });

@@ -1 +1 @@
 .htaccess.swp
 .index.html.swp
+.db.js.swp