Changeset 519 for Dev/trunk/src/client/qed-client

Timestamp:

03/15/14 01:00:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Support different environments with QED_ENV. If dev, run against qed-dev database, if production, run against qed database. The UI indicates if we are running in anything but production mode.
• Return undefined if we allow page leaves, because null is treated as a value.
• Changed format of design docs, so it can work for different databases.
• Use correct design documents in configCouch, so server now actually updates them when it starts.

Location:

Dev/trunk/src/client/qed-client

Files:

• app/Router.js (modified) (1 diff)
• css/ui/topbar.less (modified) (1 diff)
• index.js (modified) (1 diff)
• pages/surveyRun.js (modified) (1 diff)

Dev/trunk/src/client/qed-client/app/Router.js

@@ -29 +29 @@
             this._handleHashChange(hash());
             window.onbeforeunload = function(evt) {
-                var msg = Content.isDirty() ? 
-                        "Unsaved changes, leave anyway?" :
-                        null;
-                evt.returnValue = msg;
+                var msg;
+                if ( Content.isDirty() ) { 
+                    msg = "Unsaved changes, leave anyway?";
+                    evt.returnValue = msg;
+                }
                 return msg;
             };

Dev/trunk/src/client/qed-client/css/ui/topbar.less

@@ -6 +6 @@
         float: left;
         clear: left;
+    }
+    
+    #qedModeNode {
+        float: left;
+        margin-top: 28px;
     }
     

Dev/trunk/src/client/qed-client/index.js

@@ -5 +5 @@
     "./ui/MainMenu",
     "dojo/_base/array",
+    "dojo/_base/xhr",
+    "dojo/dom",
     "dojo/parser",
     "./stddeps",
     "dojo/domReady!"
-], function(Router, routes, session, MainMenu, array, parser) {
+], function(Router, routes, session, MainMenu, array, xhr, dom, parser) {
 
     parser.parse();
 
     new MainMenu({},"menu").startup();
+
+    xhr("GET", {
+        url: 'api/mode',
+        handleAs: 'json'
+    }).then(function(result){
+        var node = dom.byId('qedModeNode');
+        if ( result.mode !== 'production' ) {
+            node.innerHTML = "Running in "+result.mode+" mode";
+        }
+    });
 
     array.forEach(routes,function(route){

Dev/trunk/src/client/qed-client/pages/surveyRun.js

@@ -47 +47 @@
             .then(lang.hitch(this,function(allResponses){
                 array.forEach(allResponses, function(response){
-                    var actions = {
-                        view: {
-                            callback: function(){},
+                    var actions = {};
+                    if ( !response.publicationDate ) {
+                        actions.Delete = {
+                            callback: function(){
+                                responses.remove(response)
+                                .then(function(){
+                                    w.destroy();
+                                });
+                            },
                             properties: {
-                                title: "View response"
-                            }
-                        }
-                    };
-                    if ( !response.publicationDate ) {
-                        actions.remove = {
-                            callback: function(){},
-                            properties: {
-                                title: "Remove response"
+                                icon: 'Delete',
+                                title: "Delete response"
                             }
                         };