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 78f8380..54abf16 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -1,53 +1,62 @@
-/*global Class CodeMirror render_template panels */
-var XMLView = Class.extend({
+/*global View CodeMirror render_template panels */
+var XMLView = View.extend({

   element: null,
   model: null,
   template: 'xml-view-template',
   editor: null,
   
   init: function(element, model, template) {
   element: null,
   model: null,
   template: 'xml-view-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._super(element, model, template);

     
     

-    var self = this;
+    this.freeze('Ładowanie edytora...');

        this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
       parserfile: 'parsexml.js',
       path: "/static/js/lib/codemirror/",
       stylesheet: "/static/css/xmlcolors.css",
       parserConfig: {useHTMLKludges: false},
        this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
       parserfile: 'parsexml.js',
       path: "/static/js/lib/codemirror/",
       stylesheet: "/static/css/xmlcolors.css",
       parserConfig: {useHTMLKludges: false},

-      // onChange: function() {
-      //        self.fireEvent('contentChanged');
-      // },
+      textWrapping: false,
+      tabMode: 'spaces',
+      indentUnit: 0,
+      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.model.getXML();
+    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));
+

     // 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);
+  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');
+    this.model.removeObserver(this);

     $(this.editor.frame).remove();
     $(this.editor.frame).remove();

+    this._super();

   }
 });
 
 // Register view
   }
 });
 
 // Register view

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