From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Fri, 16 Oct 2009 11:23:46 +0000 (+0200)
Subject: Naprawione galerie.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/da27dfe2be374e3f8626f00662645a52013576fd?ds=inline

Naprawione galerie.
---

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
index 607ac959..f533d0e6 100644
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -363,7 +363,7 @@ class DocumentGalleryHandler(BaseHandler):
 #            gallery['pages'].sort()
             galleries.append(gallery)
 
-        return galleries                      
+        return galleries
 
 #
 # Document Text View
diff --git a/platforma/static/js/models.js b/platforma/static/js/models.js
index fe42e895..c57f4f0f 100644
--- a/platforma/static/js/models.js
+++ b/platforma/static/js/models.js
@@ -347,7 +347,7 @@ Editor.ImageGalleryModel = Editor.Model.extend({
     data: [],
     state: 'empty',
 
-    init: function(serverURL) {
+    init: function(document, serverURL) {
         this._super();
         this.set('state', 'empty');
         this.serverURL = serverURL;
@@ -357,16 +357,22 @@ Editor.ImageGalleryModel = Editor.Model.extend({
 
     load: function(force) {
         if (force || this.get('state') == 'empty') {
+            console.log("setting state");
             this.set('state', 'loading');
+            console.log("going ajax");
             $.ajax({
                 url: this.serverURL,
                 dataType: 'json',
-                success: this.loadingSucceeded.bind(this)
+                success: this.loadingSucceeded.bind(this),
+                error: this.loadingFailed.bind(this)
             });
         }
     },
 
-    loadingSucceeded: function(data) {
+    loadingSucceeded: function(data) 
+    {
+        console.log("success");        
+        
         if (this.get('state') != 'loading') {
             alert('erroneous state:', this.get('state'));
         }
@@ -382,6 +388,16 @@ Editor.ImageGalleryModel = Editor.Model.extend({
         this.set('state', 'synced');
     },
 
+    loadingFailed: function(data) {
+        console.log("failed");
+
+        if (this.get('state') != 'loading') {
+            alert('erroneous state:', this.get('state'));
+        }       
+
+        this.set('state', 'error');
+    },
+
     set: function(property, value) {
         if (property == 'state') {
             console.log(this.description(), ':', property, '=', value);
diff --git a/platforma/static/js/views/gallery.js b/platforma/static/js/views/gallery.js
index 74493444..e0e3dc7e 100644
--- a/platforma/static/js/views/gallery.js
+++ b/platforma/static/js/views/gallery.js
@@ -13,7 +13,7 @@ var ImageGalleryView = View.extend({
     this._super(element, model, template);
     this.parent = parent;
 
-    console.log("galley model", this.model);
+    console.log("gallery model", this.model);
        
     this.model
       .addObserver(this, 'data', this.modelDataChanged.bind(this))
@@ -85,9 +85,9 @@ var ImageGalleryView = View.extend({
   
   modelStateChanged: function(property, value) {   
     if (value == 'loading') {
-      this.parent.freeze('Ładowanie...');
+      // this.freeze('Ładowanie...');
     } else {
-      this.parent.unfreeze();
+      this.unfreeze();
     }
   },
 
@@ -102,8 +102,7 @@ var ImageGalleryView = View.extend({
     $page.hide();
     $('img', $page).unbind();
     
-    $page.empty();
-    
+    $page.empty();    
     this.setPageViewOffset($page, {x:0, y:0});
   },