Merge branch 'master' into view-refactor

[redakcja.git] / project / static / js / views / html.js

diff --git a/project/static/js/views/html.js b/project/static/js/views/html.js
index 59579af..41c3497 100644 (file)
--- a/project/static/js/views/html.js
+++ b/project/static/js/views/html.js
@@ -1,21 +1,22 @@
 /*global View render_template panels */
 var HTMLView = View.extend({
 /*global View render_template panels */
 var HTMLView = View.extend({

+  _className: 'HTMLView',

   element: null,
   model: null,
   template: 'html-view-template',
   
   element: null,
   model: null,
   template: 'html-view-template',
   

-  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.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));
       

+    $('.htmlview', this.element).html(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 {
-      $('.htmlview', this.element).html(this.model.get('data'));

     }
   },
   
     }
   },
   


@@ -25,9 +26,9 @@ var HTMLView = 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...');

     }
   },
   
     }
   },