Dziwny merge, zważywszy, że wcześniej dałem mv panels.js editor.js.

[redakcja.git] / project / static / js / jquery.hpanel.js

diff --git a/project/static/js/jquery.hpanel.js b/project/static/js/jquery.hpanel.js
index 0877400..a3e80ec 100644 (file)
--- a/project/static/js/jquery.hpanel.js
+++ b/project/static/js/jquery.hpanel.js
@@ -5,7 +5,6 @@
         settings: {},
                current_data: {},
         resize_start: function(event, mydata) {
-                       console.log('Overlay: ' + mydata.overlay);
                        $(document).bind('mousemove', mydata, $.hpanel.resize_changed).
                                bind('mouseup', mydata, $.hpanel.resize_stop); 
 
@@ -29,10 +28,12 @@
                        // $('.panel-content', event.data.root).css('display', 'block');
                        var overlays = $('.panel-content-overlay', event.data.root);
                        $('.panel-content-overlay', event.data.root).each(function(i) {
-                               $(this).data('panel').css({
-                                       'left': $(this).css('left'), 
-                                       'width': $(this).css('width') 
-                               });
+                               if( $(this).data('panel').hasClass('last-panel') )
+                                       $(this).data('panel').css({
+                                               'left': $(this).css('left'), 'right': $(this).css('right')}); 
+                               else
+                                       $(this).data('panel').css({
+                                               'left': $(this).css('left'), 'width': $(this).css('width')}); 
                        });
 
                        $('.panel-overlay', event.data.root).css('display', 'none');
@@ -41,10 +42,8 @@
     
     $.fn.makeHorizPanel = function(options) 
        {
-               console.log('Making an hpanel out of "#' +  $(this).attr('id') + '"'); 
                var root = $(this)
                var all_panels = $('.panel-wrap', root)
-               console.log('Panels: ' + all_panels);
 
                /* create an overlay */
                var overlay_root = $("<div class='panel-overlay'></div>");
@@ -53,22 +52,22 @@
                var prev = null;
 
                all_panels.each(function(i) {
-                       var panel = $(all_panels[i]);
+                       var panel = $(this);
                        var handle = $('.panel-slider', panel);
-
-                       var overlay     = $("<div class='panel-content-overlay panel-wrap'><p>Panel #"+i+"</p></div>");
+                       var overlay = $("<div class='panel-content-overlay panel-wrap'><p>Panel #"+i+"</p></div>");
                        overlay_root.append(overlay);
                        overlay.data('panel', panel);
                        overlay.data('next', null);
 
-                       if( panel.hasClass('last-panel') )
+                       if( panel.hasClass('last-panel') )                              
                                overlay.css({'left': panel.css('left'), 'right': panel.css('right')});
                        else
                                overlay.css({'left': panel.css('left'), 'width': panel.css('width')});
 
                        if (prev) prev.next = overlay;
 
-                       if(handle) {
+                       if(handle.length != 0) {
+                               $.log('Has handle: ' + panel.attr('id') );
                                overlay.append(handle.clone());
                                /* attach the trigger */
                                handle.mousedown(function(event) {
@@ -80,8 +79,10 @@
                                        $(this).trigger('hpanel:panel-resize-start', touch_data);
                                        return false;
                                });
-                               $('.panel-content', panel).css('right',handle.outerWidth() + 'px');
-                               $('.panel-content-overlay', panel).css('right',handle.outerWidth() + 'px');
+                               $('.panel-content', panel).css('right', 
+                                       (handle.outerWidth() || 10) + 'px');
+                               $('.panel-content-overlay', panel).css('right',
+                                       (handle.outerWidth() || 10) + 'px');
                        }
                                
                        prev = overlay;