Ulepszenie obsługi błędów (dodanie stanu error dla paneli).

diff --git a/project/static/js/models.js b/project/static/js/models.js
index 9938eb0..c333a97 100644 (file)
--- a/project/static/js/models.js
+++ b/project/static/js/models.js
@@ -35,6 +35,8 @@ Editor.ToolbarButtonsModel = Editor.Model.extend({
 
 // Stany modelu:
 //
+//                  -> error -> loading
+//                 /
 // empty -> loading -> synced -> unsynced -> loading
 //                           \
 //                            -> dirty -> updating -> updated -> synced
@@ -61,13 +63,30 @@ Editor.XMLModel = Editor.Model.extend({
         url: this.serverURL,
         dataType: 'text',
         data: {revision: this.get('revision')},
-        success: this.loadingSucceeded.bind(this)
+        success: this.loadingSucceeded.bind(this),
+        error: this.loadingFailed.bind(this)
       });
       return true;
     }
     return false;
   },
   
+  loadingSucceeded: function(data) {
+    if (this.get('state') != 'loading') {
+      alert('erroneous state:', this.get('state'));
+    }
+    this.set('data', data);
+    this.set('state', 'synced');
+  },
+  
+  loadingFailed: function() {
+    if (this.get('state') != 'loading') {
+      alert('erroneous state:', this.get('state'));
+    }
+    this.set('error', 'Nie udało się załadować panelu');
+    this.set('state', 'error');    
+  },
+  
   update: function(message) {
     if (this.get('state') == 'dirty') {
       this.set('state', 'updating');
@@ -93,10 +112,11 @@ Editor.XMLModel = Editor.Model.extend({
     return false;
   },
   
-  updatingSucceeded: function() {
+  updatingSucceeded: function(data) {
     if (this.get('state') != 'updating') {
       alert('erroneous state:', this.get('state'));
     }
+    this.set('revision', data.revision);
     this.set('state', 'updated');
   },
   
@@ -104,6 +124,7 @@ Editor.XMLModel = Editor.Model.extend({
     if (this.get('state') != 'updating') {
       alert('erroneous state:', this.get('state'));
     }
+    messageCenter.addMessage('error', 'Uaktualnienie nie powiodło się', 'Uaktualnienie nie powiodło się');
     this.set('state', 'dirty');
   },
   
@@ -121,14 +142,6 @@ Editor.XMLModel = Editor.Model.extend({
     }
   },
   
-  loadingSucceeded: function(data) {
-    if (this.get('state') != 'loading') {
-      alert('erroneous state:', this.get('state'));
-    }
-    this.set('data', data);
-    this.set('state', 'synced');
-  },
-  
   dispose: function() {
     this.removeObserver(this);
     this._super();
@@ -156,7 +169,8 @@ Editor.HTMLModel = Editor.Model.extend({
         url: this.serverURL,
         dataType: 'text',
         data: {revision: this.get('revision')},
-        success: this.loadingSucceeded.bind(this)
+        success: this.loadingSucceeded.bind(this),
+        error: this.loadingFailed.bind(this)
       });
     }
   },
@@ -168,6 +182,14 @@ Editor.HTMLModel = Editor.Model.extend({
     this.set('data', data);
     this.set('state', 'synced');
   },
+  
+  loadingFailed: function() {
+    if (this.get('state') != 'loading') {
+      alert('erroneous state:', this.get('state'));
+    }
+    this.set('error', 'Nie udało się załadować panelu');
+    this.set('state', 'error');    
+  },
 
   // For debbuging
   set: function(property, value) {
@@ -280,7 +302,14 @@ Editor.DocumentModel = Editor.Model.extend({
       for (key in this.contentModels) {
         if (this.contentModels[key].guid() == contentModel.guid()) {
           this.contentModels[key].set('state', 'synced');
-        } else if (this.contentModels[key].get('state') == 'unsynced') {
+          this.data.user_revision = this.contentModels[key].get('revision');
+          messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.data.user_revision,
+            'Uaktualnienie dokumentu do wersji ' + this.data.user_revision);
+        }
+      }
+      for (key in this.contentModels) {
+        if (this.contentModels[key].guid() != contentModel.guid()) {
+          this.contentModels[key].set('revision', this.data.user_revision);
           this.contentModels[key].set('state', 'empty');
         }
       }
@@ -315,6 +344,8 @@ Editor.DocumentModel = Editor.Model.extend({
     console.log(xhr.status, textStatus);
     if (xhr.status == 200) { // Sukces
       this.data.user_revision = this.get('updateData').revision;
+      messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision,
+        'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision);
       for (var key in this.contentModels) {
         this.contentModels[key].set('revision', this.data.user_revision);
         this.contentModels[key].set('state', 'empty');
@@ -351,6 +382,8 @@ Editor.DocumentModel = Editor.Model.extend({
         this.contentModels[key].set('revision', this.data.user_revision);
         this.contentModels[key].set('state', 'empty');
       }
+      messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.get('mergeData').revision,
+        'Uaktualnienie dokumentu do wersji ' + this.get('mergeData').revision);
     } else if (xhr.status == 202) { // Wygenerowano PullRequest
     } else if (xhr.status == 204) { // Nic nie zmieniono
     } else if (xhr.status == 409) { // Konflikt podczas operacji

diff --git a/project/static/js/views/editor.js b/project/static/js/views/editor.js
index 04e22c8..e9e62e9 100644 (file)
--- a/project/static/js/views/editor.js
+++ b/project/static/js/views/editor.js
@@ -37,7 +37,7 @@ var EditorView = View.extend({
   },
   
   quickSave: function(event) {
-    this.model.updateDirtyContentModel();
+    this.model.saveDirtyContentModel();
   },
   
   commit: function(event) {

diff --git a/project/static/js/views/html.js b/project/static/js/views/html.js
index 3d803fc..2e5f7cf 100644 (file)
--- a/project/static/js/views/html.js
+++ b/project/static/js/views/html.js
@@ -31,6 +31,8 @@ var HTMLView = View.extend({
       this.parent.freeze('Ładowanie...');
     } else if (value == 'saving') {
       this.parent.freeze('Zapisywanie...');
+    } else if (value == 'error') {
+      this.parent.freeze(this.model.get('error'));
     }
   },
   

diff --git a/project/static/js/views/view.js b/project/static/js/views/view.js
index 6e7eaaa..bc8266c 100644 (file)
--- a/project/static/js/views/view.js
+++ b/project/static/js/views/view.js
@@ -31,6 +31,9 @@ var View = Editor.Object.extend({
   },
   
   freeze: function(message) {
+    if (this.frozen()) {
+      this.unfreeze();
+    }
     this.overlay = this.overlay 
       || $('<div><div>' + message + '</div></div>')
             .addClass(this.overlayClass)

diff --git a/project/static/js/views/xml.js b/project/static/js/views/xml.js
index 8af3c4d..d272e27 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -72,6 +72,8 @@ var XMLView = View.extend({
       this.parent.freeze('Ładowanie...');
     } else if (value == 'saving') {
       this.parent.freeze('Zapisywanie...');
+    } else if (value == 'error') {
+      this.parent.freeze(this.model.get('error'));
     }
   },