X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/38747104cc8581d642f3c5a0d78c17565cc9988c..ab093330473e6cee879256b9902ce90bd1832c35:/project/static/js/views/xml.js?ds=inline

diff --git a/project/static/js/views/xml.js b/project/static/js/views/xml.js
index ecd27342..8af3c4d4 100644
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -12,8 +12,10 @@ var XMLView = View.extend({
     this.parent = parent;
     this.buttonToolbar = new ButtonToolbarView(
       $('.xmlview-toolbar', this.element), 
-      this.model.toolbarButtonsModel);
+      this.model.toolbarButtonsModel, parent);
 
+    $('.xmlview-toolbar', this.element).bind('resize.xmlview', this.resized.bind(this));
+    
     this.parent.freeze('Ładowanie edytora...');
   	this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
       parserfile: 'parsexml.js',
@@ -28,20 +30,23 @@ var XMLView = View.extend({
     });
   },
   
+  resized: function(event) {
+    var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight();
+    $('.xmlview', this.element).height(height);
+  },
+  
   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));
+      .addObserver(this, 'state', this.modelStateChanged.bind(this))
+      .load();
     
     this.parent.unfreeze();
       
     this.editor.setCode(this.model.get('data'));
-    if (!this.model.get('synced')) {
-      this.parent.freeze('Niezsynchronizowany...');
-      this.model.load();
-    }
-    
+    this.modelStateChanged('state', this.model.get('state'));
+        
     // editor.grabKeys(
     //   $.fbind(self, self.hotkeyPressed),
     //   $.fbind(self, self.isHotkey)
@@ -58,11 +63,15 @@ var XMLView = View.extend({
     }
   },
   
-  modelSyncChanged: function(property, value) {
-    if (value) {
+  modelStateChanged: function(property, value) {
+    if (value == 'synced' || value == 'dirty') {
       this.parent.unfreeze();
-    } else {
+    } else if (value == 'unsynced') {
       this.parent.freeze('Niezsynchronizowany...');
+    } else if (value == 'loading') {
+      this.parent.freeze('Ładowanie...');
+    } else if (value == 'saving') {
+      this.parent.freeze('Zapisywanie...');
     }
   },