Usunięcie niepotrzebnych console.log (teraz śledzimy tylko stany modeli) i dodanie...

diff --git a/project/static/js/models.js b/project/static/js/models.js
index 9542eac..8ea488e 100644 (file)
--- a/project/static/js/models.js
+++ b/project/static/js/models.js
@@ -104,6 +104,7 @@ Editor.XMLModel = Editor.Model.extend({
     this.set('state', 'dirty');
   },
   
     this.set('state', 'dirty');
   },
   

+  // For debbuging

   set: function(property, value) {
     if (property == 'state') {
       console.log(this.description(), ':', property, '=', value);
   set: function(property, value) {
     if (property == 'state') {
       console.log(this.description(), ':', property, '=', value);


@@ -162,7 +163,8 @@ Editor.HTMLModel = Editor.Model.extend({
     this.set('data', data);
     this.set('state', 'synced');
   },
     this.set('data', data);
     this.set('state', 'synced');
   },

-  
+
+  // For debbuging

   set: function(property, value) {
     if (property == 'state') {
       console.log(this.description(), ':', property, '=', value);
   set: function(property, value) {
     if (property == 'state') {
       console.log(this.description(), ':', property, '=', value);


@@ -210,12 +212,21 @@ Editor.DocumentModel = Editor.Model.extend({
   
   contentModelStateChanged: function(property, value, contentModel) {
     if (value == 'dirty') {
   
   contentModelStateChanged: function(property, value, contentModel) {
     if (value == 'dirty') {

+      this.set('state', 'dirty');

       for (var key in this.contentModels) {
         if (this.contentModels[key].guid() != contentModel.guid()) {
       for (var key in this.contentModels) {
         if (this.contentModels[key].guid() != contentModel.guid()) {

-          // console.log(this.contentModels[key].description(), 'frozen');

           this.contentModels[key].set('state', 'unsynced');
         }
       }
           this.contentModels[key].set('state', 'unsynced');
         }
       }

+    } else if (value == 'updated') {
+      this.set('state', 'synced');
+      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.contentModels[key].set('state', 'empty');
+        }
+      }

     }
   },
   
     }
   },
   


@@ -226,6 +237,14 @@ Editor.DocumentModel = Editor.Model.extend({
         break;
       }
     }
         break;
       }
     }

+  },
+  
+  // For debbuging
+  set: function(property, value) {
+    if (property == 'state') {
+      console.log(this.description(), ':', property, '=', value);
+    }
+    return this._super(property, value);

   }
 });
 
   }
 });
 

diff --git a/project/static/js/views/editor.js b/project/static/js/views/editor.js
index 27b17cb..1e39ca5 100644 (file)
--- a/project/static/js/views/editor.js
+++ b/project/static/js/views/editor.js
@@ -9,29 +9,55 @@ var EditorView = View.extend({
     this._super(element, model, template);
     this.model.load();
     
     this._super(element, model, template);
     this.model.load();
     

-    $('#action-quick-save', this.element).bind('click.editorview', this.quickSave.bind(this));
-    $('#action-commit', this.element).bind('click.editorview', this.commit.bind(this));
-    $('#action-update', this.element).bind('click.editorview', this.update.bind(this));
-    this.freeze('Ładowanie');
+    this.quickSaveButton = $('#action-quick-save', this.element).bind('click.editorview', this.quickSave.bind(this));
+    this.commitButton = $('#action-commit', this.element).bind('click.editorview', this.commit.bind(this));
+    this.updateButton = $('#action-update', this.element).bind('click.editorview', this.update.bind(this));
+    this.mergeButton = $('#action-merge', this.element).bind('click.editorview', this.merge.bind(this));
+    
+    this.model.addObserver(this, 'state', this.modelStateChanged.bind(this));
+    this.modelStateChanged('state', this.model.get('state'));

   },
   
   quickSave: function(event) {
   },
   
   quickSave: function(event) {

-    console.log('quickSave');

     this.model.quickSave();
   },
   
   commit: function(event) {
     this.model.quickSave();
   },
   
   commit: function(event) {

-    console.log('commit');

   },
   
   update: function(event) {
   },
   
   update: function(event) {

-    console.log('update');
+  },
+  
+  merge: function(event) {
+  },
+  
+  modelStateChanged: function(property, value) {
+    // Uaktualnia stan przycisków
+    if (value == 'dirty') {
+      this.quickSaveButton.attr('disabled', null);
+      this.commitButton.attr('disabled', null);
+      this.updateButton.attr('disabled', 'disabled');
+      this.mergeButton.attr('disabled', 'disabled');
+    } else if (value == 'synced') {
+      this.quickSaveButton.attr('disabled', 'disabled');
+      this.commitButton.attr('disabled', 'disabled');
+      this.updateButton.attr('disabled', null);
+      this.mergeButton.attr('disabled', null);      
+    } else if (value == 'empty') {
+      this.quickSaveButton.attr('disabled', 'disabled');
+      this.commitButton.attr('disabled', 'disabled');
+      this.updateButton.attr('disabled', 'disabled');
+      this.mergeButton.attr('disabled', 'disabled');
+    }

   },
   
   dispose: function() {
     $('#action-quick-save', this.element).unbind('click.editorview');
     $('#action-commit', this.element).unbind('click.editorview');
     $('#action-update', this.element).unbind('click.editorview');
   },
   
   dispose: function() {
     $('#action-quick-save', this.element).unbind('click.editorview');
     $('#action-commit', this.element).unbind('click.editorview');
     $('#action-update', this.element).unbind('click.editorview');

+    $('#action-merge', this.element).unbind('click.editorview');
+
+    this.model.removeObserver(this);

     this._super();
   }
 });
     this._super();
   }
 });

diff --git a/project/static/js/views/xml.js b/project/static/js/views/xml.js
index 6b7571a..8af3c4d 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -58,7 +58,6 @@ var XMLView = View.extend({
   },
   
   modelDataChanged: function(property, value) {
   },
   
   modelDataChanged: function(property, value) {

-    console.log('modelDataChanged');

     if (this.editor.getCode() != value) {
       this.editor.setCode(value);
     }
     if (this.editor.getCode() != value) {
       this.editor.setCode(value);
     }