Merge branch 'master' into view-refactor

[redakcja.git] / project / static / js / views / xml.js

diff --git a/project/static/js/views/xml.js b/project/static/js/views/xml.js
index 54abf16..fd67040 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -1,14 +1,17 @@
 /*global View CodeMirror render_template panels */
 var XMLView = View.extend({
+  _className: 'XMLView',
   element: null,
   model: null,
   template: 'xml-view-template',
   editor: null,
+  buttonToolbar: null,
   
-  init: function(element, model, template) {
+  init: function(element, model, parent, template) {
     this._super(element, model, template);
+    this.parent = parent;
     
-    this.freeze('Ładowanie edytora...');
+    this.parent.freeze('Ładowanie edytora...');
        this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
       parserfile: 'parsexml.js',
       path: "/static/js/lib/codemirror/",
@@ -17,40 +20,50 @@ var XMLView = View.extend({
       textWrapping: false,
       tabMode: 'spaces',
       indentUnit: 0,
-      onChange: this.changed.bind(this),
+      onChange: this.editorDataChanged.bind(this),
       initCallback: this.editorDidLoad.bind(this)
     });
   },
   
-  changed: function() {
-    this.model.setData(this.editor.getCode());
-  },
-  
   editorDidLoad: function(editor) {
-    editor.setCode('Ładowanie edytora...');
     $(editor.frame).css({width: '100%', height: '100%'});
-    this.editor.setCode(this.model.getData());
-    this.unfreeze();
+    
     this.model
-      .addObserver(this, 'reloaded', function() {
-        this.editor.setCode(this.model.getData()); this.unfreeze(); }.bind(this))
-      .addObserver(this, 'needsReload', function() { 
-        this.freeze('Niezsynchronizowany'); }.bind(this))
-      .addObserver(this, 'dataChanged', this.textDidChange.bind(this));
-
+      .addObserver(this, 'data', this.modelDataChanged.bind(this))
+      .addObserver(this, 'synced', this.modelSyncChanged.bind(this));
+    
+    this.parent.unfreeze();
+      
+    this.editor.setCode(this.model.get('data'));
+    if (!this.model.get('synced')) {
+      this.parent.freeze('Niezsynchronizowany...');
+      this.model.load();
+    }
+    
     // editor.grabKeys(
     //   $.fbind(self, self.hotkeyPressed),
     //   $.fbind(self, self.isHotkey)
     // );
   },
   
-  textDidChange: function(event) {
-    console.log('textDidChange!');
-    if (this.editor.getCode() != this.model.getData()) {
-      this.editor.setCode(this.model.getData());
+  editorDataChanged: function() {
+    this.model.set('data', this.editor.getCode());
+  },
+  
+  modelDataChanged: function(property, value) {
+    if (this.editor.getCode() != value) {
+      this.editor.setCode(value);
     }
   },
   
+  modelSyncChanged: function(property, value) {
+    if (value) {
+      this.parent.unfreeze();
+    } else {
+      this.parent.freeze('Niezsynchronizowany...');
+    }
+  },
+    
   dispose: function() {
     this.model.removeObserver(this);
     $(this.editor.frame).remove();