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 de3131c..54abf16 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -6,17 +6,7 @@ var XMLView = View.extend({
   editor: null,
   
   init: function(element, model, template) {
   editor: null,
   
   init: function(element, model, template) {

-    this.element = $(element);
-    this.model = $(model).get(0);
-    console.log('XMLView#init model:', model);
-    this.template = template || this.template;
-    this.element.html(render_template(this.template, {}));
-    
-    $(this.model)
-      .bind('modelxmlfreeze.xmlview',
-        function() { this.freeze('Ładowanie danych z serwera...'); }.bind(this))
-      .bind('modelxmlunfreeze.xmlview',
-        this.unfreeze.bind(this));
+    this._super(element, model, template);

     
     this.freeze('Ładowanie edytora...');
        this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
     
     this.freeze('Ładowanie edytora...');
        this.editor = new CodeMirror($('.xmlview', this.element).get(0), {


@@ -27,42 +17,46 @@ var XMLView = View.extend({
       textWrapping: false,
       tabMode: 'spaces',
       indentUnit: 0,
       textWrapping: false,
       tabMode: 'spaces',
       indentUnit: 0,

-      // onChange: function() {
-      //        self.fireEvent('contentChanged');
-      // },
+      onChange: this.changed.bind(this),

       initCallback: this.editorDidLoad.bind(this)
     });
   },
   
       initCallback: this.editorDidLoad.bind(this)
     });
   },
   

+  changed: function() {
+    this.model.setData(this.editor.getCode());
+  },
+  

   editorDidLoad: function(editor) {
   editorDidLoad: function(editor) {

-    console.log('init', this.model);
-    editor.setCode('Ładowanie...');
+    editor.setCode('Ładowanie edytora...');

     $(editor.frame).css({width: '100%', height: '100%'});
     $(editor.frame).css({width: '100%', height: '100%'});

-    this.editor.setCode(this.model.xml);
-    $(this.model).bind('modelxmlchanged.xmlview', this.codeChanged.bind(this));
+    this.editor.setCode(this.model.getData());

     this.unfreeze();
     this.unfreeze();

-    this.model.getXML();
+    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));
+

     // editor.grabKeys(
     //   $.fbind(self, self.hotkeyPressed),
     //   $.fbind(self, self.isHotkey)
     // );
   },
   
     // editor.grabKeys(
     //   $.fbind(self, self.hotkeyPressed),
     //   $.fbind(self, self.isHotkey)
     // );
   },
   

-  codeChanged: function() {
-    console.log('setCode:', this.editor, this.model);
-    this.editor.setCode(this.model.xml);
-    this.unfreeze();
+  textDidChange: function(event) {
+    console.log('textDidChange!');
+    if (this.editor.getCode() != this.model.getData()) {
+      this.editor.setCode(this.model.getData());
+    }

   },
   
   dispose: function() {
   },
   
   dispose: function() {

-    $(this.model)
-      .unbind('modelxmlchanged.xmlview')
-      .unbind('modelxmlfreeze.xmlview')
-      .unbind('modelxmlunfreeze.xmlview');
+    this.model.removeObserver(this);

     $(this.editor.frame).remove();
     this._super();
   }
 });
 
 // Register view
     $(this.editor.frame).remove();
     this._super();
   }
 });
 
 // Register view

-panels.push({name: 'xml', klass: XMLView});
+panels['xml'] = XMLView;