Uproszczenie implementacji wzorca observer.

[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..333b1c2 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -8,15 +8,12 @@ var XMLView = View.extend({
   init: function(element, model, template) {
     this.element = $(element);
     this.model = $(model).get(0);
   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.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.model
+      .addObserver(this, 'xml-freeze')
+      .addObserver(this, 'xml-unfreeze');

     
     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,38 +24,42 @@ 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.set('text', 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.get('text'));
+    this.model.addObserver(this, 'text-changed');

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

-    this.model.getXML();

     // 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();
+  handle: function(event, data) {
+    console.log('handle', this, event, data);
+    if (event == 'text-changed') {
+      this.freeze('Niezsynchronizowany');
+      // this.unfreeze();      
+    } else if (event == 'xml-freeze') {
+      this.freeze('Ładowanie XMLa...');
+    } else if (event == 'xml-unfreeze') {
+      this.editor.setCode(this.model.get('text'));
+      this.unfreeze();
+    }

   },
   
   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();
   }
     $(this.editor.frame).remove();
     this._super();
   }