Test fix.

[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..460317b 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -1,14 +1,22 @@
-/*global View CodeMirror render_template panels */
+/*global View CodeMirror ButtonToolbarView render_template panels */

 var XMLView = View.extend({
 var XMLView = View.extend({

+  _className: 'XMLView',

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

+    this.parent = parent;
+    this.buttonToolbar = new ButtonToolbarView(
+      $('.xmlview-toolbar', this.element), 
+      this.model.toolbarButtonsModel, parent);
+
+    $('.xmlview-toolbar', this.element).bind('resize.xmlview', this.resized.bind(this));

     
     

-    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/",
        this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
       parserfile: 'parsexml.js',
       path: "/static/js/lib/codemirror/",


@@ -17,40 +25,55 @@ var XMLView = View.extend({
       textWrapping: false,
       tabMode: 'spaces',
       indentUnit: 0,
       textWrapping: false,
       tabMode: 'spaces',
       indentUnit: 0,

-      onChange: this.changed.bind(this),
+      onChange: this.editorDataChanged.bind(this),

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

-  changed: function() {
-    this.model.setData(this.editor.getCode());
+  resized: function(event) {
+    var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight();
+    console.log('.xmlview height =', height);
+    $('.xmlview', this.element).height(height);

   },
   
   editorDidLoad: function(editor) {
   },
   
   editorDidLoad: function(editor) {

-    editor.setCode('Ładowanie edytora...');

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

-    this.editor.setCode(this.model.getData());
-    this.unfreeze();

     this.model
     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)
     // );
   },
   
     // 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();
   dispose: function() {
     this.model.removeObserver(this);
     $(this.editor.frame).remove();