From: zuber <marek@stepniowski.com>
Date: Thu, 10 Sep 2009 14:21:31 +0000 (+0200)
Subject: Fix #102: Nie można zmienić domyślnych paneli.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/78b3d0dc3fc979d4c2ab507bf95d82b89e2792ad?hp=e73400dc663a8fb573146e173aff72247cdd3a23

Fix #102: Nie można zmienić domyślnych paneli.
---

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index ac34ac5a..11574373 100644
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -268,7 +268,7 @@ Editor.prototype.setupUI = function() {
     var self = this;
    
     self.rootDiv.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery
-    // self.rootDiv.css('top', ($('#header').outerHeight() ) + 'px');
+    // self.rootcDiv.css('top', ($('#header').outerHeight() ) + 'px');
     
     $('#panels > *.panel-wrap').each(function() {
         var panelWrap = $(this);
@@ -279,8 +279,8 @@ Editor.prototype.setupUI = function() {
         
         $('.panel-toolbar select', panelWrap).change(function() {
             var url = $(this).val();
-            panelWrap.data('ctrl').load(url);
             self.savePanelOptions();
+            panelWrap.data('ctrl').load(url);
         });
 
         $('.panel-toolbar button.refresh-button', panelWrap).click(
@@ -367,9 +367,11 @@ Editor.prototype.loadPanelOptions = function() {
             totalWidth += panelWidth;               
         }
         $.log('panel:', this, $(this).css('left'));
-        $('.panel-toolbar select', this).val(
-            $('.panel-toolbar option[name=' + self.options.panels[index].name + ']', this).attr('value')
-            )
+        $('.panel-toolbar option', this).each(function() {
+            if ($(this).attr('p:panel-name') == self.options.panels[index].name) {
+                $(this).parent('select').val($(this).attr('value'));
+            }
+        });
     });   
 }
 
@@ -378,7 +380,7 @@ Editor.prototype.savePanelOptions = function() {
     var panels = [];
     $('.panel-wrap', self.rootDiv).not('.panel-content-overlay').each(function() {
         panels.push({
-            name: $('.panel-toolbar option:selected', this).attr('name'),
+            name: $('.panel-toolbar option:selected', this).attr('p:panel-name'),
             ratio: $(this).width() / self.rootDiv.width()
         })
     });
diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 891366b7..2aaf26e9 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -61,7 +61,7 @@
                     <p><label>{{n|capfirst}} panel:
                     <select name="select-{{n}}-panel" id="panel-{{n}}-select">
                         {% for panel_type in availble_panels %}
-                        <option value="{% url panel_view path=fileid,name=panel_type.id  %}">{{panel_type.display_name}}</option>
+                        <option value="{% url panel_view path=fileid,name=panel_type.id  %}" p:panel-name="{{ panel_type.id }}">{{panel_type.display_name}}</option>
                         {% endfor %}
                     </select>
                     </label>