Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

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

diff --git a/project/static/js/views/gallery.js b/project/static/js/views/gallery.js
index ad17c4b..7449344 100644 (file)
--- a/project/static/js/views/gallery.js
+++ b/project/static/js/views/gallery.js
@@ -12,6 +12,8 @@ var ImageGalleryView = View.extend({
     console.log("init for gallery");
     this._super(element, model, template);
     this.parent = parent;
     console.log("init for gallery");
     this._super(element, model, template);
     this.parent = parent;

+
+    console.log("galley model", this.model);

        
     this.model
       .addObserver(this, 'data', this.modelDataChanged.bind(this))
        
     this.model
       .addObserver(this, 'data', this.modelDataChanged.bind(this))


@@ -79,6 +81,8 @@ var ImageGalleryView = View.extend({
       this.$pageInput.val( (this.currentPage+1) );
   },
   
       this.$pageInput.val( (this.currentPage+1) );
   },
   

+  reload: function() {},
+  

   modelStateChanged: function(property, value) {   
     if (value == 'loading') {
       this.parent.freeze('Ładowanie...');
   modelStateChanged: function(property, value) {   
     if (value == 'loading') {
       this.parent.freeze('Ładowanie...');


@@ -205,7 +209,7 @@ var ImageGalleryView = View.extend({
 
   render: function() 
   {
 
   render: function() 
   {

-      console.log('rendering:', this._className);
+      if(!this.model) return;            

       
       /* first unbind all */    
       if(this.$nextButton) this.$nextButton.unbind();
       
       /* first unbind all */    
       if(this.$nextButton) this.$nextButton.unbind();


@@ -218,7 +222,7 @@ var ImageGalleryView = View.extend({
       if(this.$zoomResetButton) this.$zoomResetButton.unbind();
 
       /* render */
       if(this.$zoomResetButton) this.$zoomResetButton.unbind();
 
       /* render */

-      this.element.html(render_template(this.template, this));
+      this._super();

 
       /* fetch important parts */
       this.$pageListRoot = $('.image-gallery-page-list', this.element);
 
       /* fetch important parts */
       this.$pageListRoot = $('.image-gallery-page-list', this.element);