Merge branch 'develop' into staging

nastachku · Mar 25, 2014 · eee10c9 · eee10c9
2 parents 0387932 + a06dc53
commit eee10c9
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/app/views/web/schedules/show.html.haml b/app/views/web/schedules/show.html.haml
@@ -11,16 +11,21 @@
       = render "day", day: configus.schedule.second_day.date, start_time: configus.schedule.second_day.start_time, finish_time: configus.schedule.second_day.finish_time
 :javascript
     jQuery(document).ready(function ($) {
-            $("td[data-hall]").children(".programm__schedule__lectures__lecture").each(function(){
-                var $local_this = $(this);
-                var parent_height = $local_this.parent().css('height');
-                if ($local_this.css('height') < parent_height) {
-                    $local_this.css('min-height', parent_height);
-                }
-            });
-
+            function setHeightOfDivInTd() {
+              $("td[data-hall]").children(".programm__schedule__lectures__lecture").each(function(){
+                  var $local_this = $(this);
+                  var parent_height = $local_this.parent().css('height');
+                  if ($local_this.css('min-height') != 0 && $local_this.css('height') < parent_height) {
+                      $local_this.css('min-height', parent_height);
+                  }
+              });
+            }
+
+
+            setHeightOfDivInTd();
             $('.tab_button').on('click', function() {
                 $(this).siblings().removeClass('selected').end().next('dd').andSelf().addClass('selected');
+                setHeightOfDivInTd();
             });
 
             var next=$('.programm__next'), prev=$('.programm__prev');