Changeset 490 for Dev/trunk/src/client/qed-client/app

Timestamp:

03/08/14 22:51:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Mark content as dirty to prevent moving away from unsaved data.
• Better change propagation from lists and our own widgets.
• Generate notifications for errors and show correct message.
• Moved all path/url generation to the class stores, not everywhere we use it.
• Give user always a choice between Save and Save & Close.
• Better refresh behaviour on form changes and saves.
• Don't generate duplicate code error when existing object is the one you're storing.

Location:

Dev/trunk/src/client/qed-client/app

Files:

• Content.js (modified) (3 diffs)
• Page.js (modified) (1 diff)
• Router.js (modified) (6 diffs)

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

@@ -8 +8 @@
         _container: null,
         _previousContent: null,
+        _dirty: false,
         startup: function() {
             if ( this._started ) { return; }
@@ -32 +33 @@
             }
             widget.region = 'center';
+            this._previousContent = widget;
             this._container.addChild(widget);
-            this._previousContent = widget;
         },
         notify: function(text,type) {
@@ -40 +41 @@
             }
             this._toaster.setContent(text,type || 'message');
+        },
+        markDirty: function() {
+            this._dirty = true;
+        },
+        markClean:function() {
+            this._dirty = false;
+        },
+        isDirty: function() {
+            return this._dirty;
         }
     });

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dijit/_TemplatedMixin',
-    'dijit/_WidgetsInTemplateMixin',
-    'dijit/layout/BorderContainer'
-],function(declare,_TemplatedMixin,_WidgetsInTemplateMixin,BorderContainer){
-    return declare([BorderContainer,_TemplatedMixin,_WidgetsInTemplateMixin],{
-        templateString: '<div>Empty page.</div>'
+    "./Content",
+    "./Path",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetsInTemplateMixin",
+    "dijit/layout/BorderContainer",
+    "dojo/_base/declare",
+    "dojo/_base/lang",
+    "dojo/hash"
+], function(Content, Path, _TemplatedMixin, _WidgetsInTemplateMixin, BorderContainer, declare, lang, hash) {
+    var Page = declare([BorderContainer,_TemplatedMixin,_WidgetsInTemplateMixin],{
+        templateString: '<div>Empty page.</div>',
+        die: function(msg) {
+            Content.set(new Page({templateString:'<div>Error: '+msg+'</div>'}));
+        },
+        notify: lang.hitch(Content,'notify'),
+        setURL: function(url,opts,addToHistory) {
+            hash(Path.format(url,opts),addToHistory !== true);
+        },
+        markDirty: lang.hitch(Content,'markDirty'),
+        markClean: lang.hitch(Content,'markClean')
     });
+    return Page;
 });

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dojo/hash',
-    'dojo/topic',
-    './Content',
-    './Page',
-    './Path'
-],function(declare,hash,topic,Content,Page,Path){
+    "./Content",
+    "./Page",
+    "./Path",
+    "dojo/_base/declare",
+    "dojo/_base/event",
+    "dojo/_base/lang",
+    "dojo/_base/window",
+    "dojo/hash",
+    "dojo/on",
+    "dojo/topic"
+], function(Content, Page, Path, declare, event, lang, window, hash, on, topic) {
 
     var Router = declare(null,{
@@ -12 +16 @@
         _routes: null,
         _previousHash: null,
+        _beforePreviousHash: null,
 
         constructor: function() {
@@ -18 +23 @@
         startup: function() {
             if ( this._started ) { return; }
-            if ( !Content._started ) {
-                Content.startup();
-            }
+            Content.startup();
             this._started = true;
-
-            var self = this;
-
             if ( hash() === "" ) {
                 hash(Path.getDefault());
             }
-            this._handlePathChange(hash());
-                        topic.subscribe("/dojo/hashchange", function(){
-                self._handlePathChange.apply(self,arguments);
-            });
+            this._handleHashChange(hash());
+            window.onbeforeunload = function() {
+                return Content.isDirty() && "Unsaved changes, leave anyway?";
+            };
+                        topic.subscribe("/dojo/hashchange",
+                            lang.hitch(this,'_handleHashChange'));
         },
         register: function(route) {
@@ -68 +70 @@
             return callback;
         },
-        _handlePathChange: function(newHash) {
-            if ( this._previousHash === newHash ) { return; }
+        _handleHashChange: function(newHash) {
+            if ( this._previousHash === newHash ) {
+                return false;
+            }
+            if ( Content.isDirty() ) {
+                if ( !confirm("Unsaved changes, leave anyway?") ) {
+                    var probablyBack = this._beforePreviousHash === newHash;
+                    // if we think we go backwards, we re-add the history
+                    // entry, otherwise we reset the current one,
+                    // resulting in minor annoyance of double back
+                    // behaviour.
+                    hash(this._previousHash,!probablyBack);
+                    return false;
+                } else {
+                    Content.markClean();
+                }
+            }
+            this._beforePreviousHash = this._previousHash;
             this._previousHash = newHash;
             for (var i = this._routes.length-1; i >= 0; i--) {
@@ -78 +96 @@
                         route.callback(params);
                     } catch(err) {
-                        console.error("Page change failed with",err,err.toString());
+                        console.error("Page change failed with",err,err.stack,err.toString());
                     }
-                    return;
+                    return true;
                 }
             }
@@ -88 +106 @@
                 console.error("Default page failed.",err);
             }
+            return true;
         },
         go: function(path,args) {
             if ( !this._started ) { return; }
             var newHash = Path.format(path,args);
-            this._handlePathChange(newHash);
             hash(newHash);
         },