Changeset 693 for ether_statistics

Timestamp:

01/07/13 18:43:16 (12 years ago)

Author:

vmipsl

Message:

rollable slide with min-height

File:

• ether_statistics/web/resources/js/classesForJQuery/DragSlide.js (modified) (5 diffs)

ether_statistics/web/resources/js/classesForJQuery/DragSlide.js

@@ -17 +17 @@
         this.titleId = objectParameter.titleId;
         this.contentId = objectParameter.contentId;
-        this.width = objectParameter.minWidth ? objectParameter.minWidth : objectParameter.width;
-        this.height = objectParameter.minHeight ? objectParameter.minHeight : objectParameter.height;
-        this.minWidth = objectParameter.minWidth ? objectParameter.minWidth : objectParameter.width;
-        this.minHeight = objectParameter.minHeight ? objectParameter.minHeight : objectParameter.height;
+        this.width = objectParameter.width ? objectParameter.width : false;
+        this.height = objectParameter.height ? objectParameter.height : false;
+        this.minWidth = objectParameter.minWidth ? objectParameter.minWidth : false;
+        this.minHeight = objectParameter.minHeight ? objectParameter.minHeight : false;
         this.top = objectParameter.top;
         this.left = objectParameter.left;
@@ -37 +37 @@
         if( this.specificClass )
             this.divContainer.addClass( this.specificClass );
-        this.divContainer.attr( {id:this.id, style:"width:" + this.width + "px; height:" + this.height + "px; min-width:" + this.minWidth + "px; min-height:" + this.minHeight + "px; top:" + this.top + "; left:" + this.left} );
 
         // Title
@@ -52 +51 @@
         this.divContent.html( this.contentSlide );
         this.divContainer.append( this.divContent );
+
+        // Height and width or min-height and min-width
+        if( this.height && this.width )
+            this.divContainer.attr( {id:this.id, style:"width:" + this.width + "px; height:" + this.height + "px; top:" + this.top + "; left:" + this.left} );
+        else
+            this.divContainer.attr( {id:this.id, style:"min-width:" + this.minWidth + "px; min-height:" + this.minHeight + "px; height:" + this.divTitle.height() + "px; top:" + this.top + "; left:" + this.left} );
+
 
         this.parent.append( this.divContainer );
@@ -102 +108 @@
     onDbClickTitle: function()
     {
-        if( this.height == this.divContainer.height() )
+        if( (this.height == this.divContainer.height()) || (this.minHeight == this.divContainer.height()) )
             this.hideContainerContent();
         else
@@ -110 +116 @@
     hideContainerContent: function()
     {
-        this.divContainer.css( 'min-height', '0px' ).animate( {
-            height:this.divTitle.height() + 'px'
-        }, 1000, jQuery.proxy( function()
+        if( this.minHeight )
         {
-            this.divContent.hide();
-        }, this ) );
+            this.divContainer.css( 'min-height', '0px' );
+            this.divContainer.css( 'height', this.minHeight + 'px' ).animate( {
+                height:this.divTitle.height() + 'px'
+            }, 1000, jQuery.proxy( function()
+            {
+                this.divContent.hide();
+            }, this ) );
+        }
+        else
+        {
+            this.divContainer.animate( {
+                height:this.divTitle.height() + 'px'
+            }, 1000, jQuery.proxy( function()
+            {
+                this.divContent.hide();
+            }, this ) );
+        }
     },
 
     showContainerContent: function()
     {
-        this.divContainer.css( 'min-height', this.minHeight + 'px' ).animate( {
-            height:this.height + 'px'
-        }, 1000, jQuery.proxy( function()
+        if( this.minHeight )
         {
-            this.divContent.show();
-        }, this ) );
+            this.divContainer.animate( {
+                height:this.minHeight + 'px'
+            }, 1000, jQuery.proxy( function()
+            {
+                this.divContainer.css( 'min-height', this.minHeight + 'px' );
+                this.divContainer.css( 'height', this.divTitle.height() + 'px' );
+                this.divContent.show();
+            }, this ) );
+        }
+        else
+        {
+            this.divContainer.animate( {
+                height:this.height + 'px'
+            }, 1000, jQuery.proxy( function()
+            {
+                this.divContent.show();
+            }, this ) );
+        }
     },