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 9df8954..460317b 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -1,15 +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,
   buttonToolbar: 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/",


@@ -23,21 +30,26 @@ var XMLView = View.extend({
     });
   },
   
     });
   },
   

+  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) {
     $(editor.frame).css({width: '100%', height: '100%'});
   editorDidLoad: function(editor) {
     $(editor.frame).css({width: '100%', height: '100%'});

-    

     this.model
       .addObserver(this, 'data', this.modelDataChanged.bind(this))
       .addObserver(this, 'synced', this.modelSyncChanged.bind(this));
     
     this.model
       .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')) {
     if (!this.model.get('synced')) {

-      this.freeze('Niezsynchronizowany...');
+      this.parent.freeze('Niezsynchronizowany...');

       this.model.load();
       this.model.load();

-    } else {
-      this.editor.setCode(this.model.get('data'));

     }
     }

-    this.unfreeze();
-  
+    

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


@@ -56,9 +68,9 @@ var XMLView = View.extend({
   
   modelSyncChanged: function(property, value) {
     if (value) {
   
   modelSyncChanged: function(property, value) {
     if (value) {

-      this.unfreeze();
+      this.parent.unfreeze();

     } else {
     } else {

-      this.freeze('Niezsynchronizowany...');
+      this.parent.freeze('Niezsynchronizowany...');

     }
   },
     
     }
   },