Merge branch 'fix_rating_form_addition_fields_bug' into 'master'

Fix rating form addition fields bug Fix rating form bug: When the add new institution button appeared, and the block was closed(with the arrow) the addition fields script was killing the entire page. See merge request !110

Merge branch 'fix_rating_form_addition_fields_bug' into 'master'
Fix rating form addition fields bug Fix rating form bug: When the add new institution button appeared, and the block was closed(with the arrow) the addition fields script was killing the entire page. See merge request !110
Melissa Wen
2 parents cb360ed8 8600e789
Showing 3 changed files with 31 additions and 26 deletions Show diff stats
src/noosfero-spb/gov_user/public/views/create-institution.js
src/noosfero-spb/noosfero-spb-theme/css/use-report.css
src/noosfero-spb/noosfero-spb-theme/theme.js
@@ -200,11 +200,9 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function toggle_extra_fields_style_status(status) {
       if(status) {
-        $('.extra-fields-container').css({ marginTop: "55px" });
-        $('.button-bar').css({ marginTop: "55px" });
+        $('.comments-software-extra-fields').css({height: "180px" });
       } else {
-        $('.extra-fields-container').css({ marginTop: "0px" });
-        $('.button-bar').css({ marginTop: "20px" });
+        $('.comments-software-extra-fields').css({height: "140px" });
       }
   }
@@ -237,6 +237,11 @@
   margin-left: 10px;
 }
+#content .star-rate-form .star-comment-container .extra-fields-container{
+  height: 56px;
+  overflow: hidden;
+}
+
 #content .star-rate-form .star-comment-container .comments-software-extra-fields {
   height: 0;
   overflow: initial;
@@ -245,7 +250,7 @@
 #content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments {
   margin-bottom: 19px;
   margin-top: 16px;
-  height: 50px;
+  height: auto;
 }
 #content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments > label {
@@ -51,7 +51,7 @@ function alignBlocks(containerIndex){
 // Foco no botao de busca
 $('#link-buscar').click(function(e) {
-    e.preventDefault();
+    e.defaultPrevented();
     window.location.hash = '#portal-searchbox';
     $('.searchField').focus()
 })
@@ -195,35 +195,37 @@ $(&#39;#link-buscar&#39;).click(function(e) {
     $('.star-tooltip').html("?");
   }
-  // TODO: fix calls for this function below
-  // TODO: comments-additional-information --> comments-display-fields
+
   function set_arrow_direction() {
     var additional_data_bar = $('.comments-display-fields');
-    var arrow = $('.comments-arrow-down');
-    var state = 0;
+
     additional_data_bar.on('click', function() {
-      animateExtraFields();
+      var arrow = additional_data_bar.find('span[class*="comments-arrow"]');
+      var additional_fields = $('.comments-software-extra-fields');
+
+      if (additional_fields) {
+        animateExtraFields(additional_fields, arrow);
+      }
     });
   }
-  function animateExtraFields() {
-    var additional_data_bar = $('.comments-display-fields');
-    var arrow = ($('.comments-arrow-down')[0])? $('.comments-arrow-down') : $('.comments-arrow-up');
-    console.log(arrow);
-    var fields = $('.comments-software-extra-fields');
-    if(fields) {
-      var innerHeight = fields[0].offsetHeight;
-      if(fields.height()!==0) {
-        arrow.attr('class', "comments-arrow-down");
-        fields.animate({height: 0});
-      }
-      else {
-        arrow.attr('class', "comments-arrow-up");
-        fields.animate({height: 140});
-      }
+
+  function animateExtraFields(additional_fields, arrow) {
+    var innerHeight = additional_fields[0].offsetHeight;
+
+    if(additional_fields.height() !== 0) {
+      arrow.attr('class', "comments-arrow-down");
+      additional_fields.animate({height: 0});
+    } else {
+      arrow.attr('class', "comments-arrow-up");
+      additional_fields.animate({height: additional_fields.get(0).scrollHeight}, 1000 );
     }
+
+    // Fix for the arrow change on modal display to block, killing the entire page
+    $("#institution_modal").css({'display':'none'});
   }
+
   function set_use_report_content() {
     $('.profile-homepage .organization-average-rating-container .rate-this-organization a').html('Avalie este software');
     $('.make-report-block .make-report-container .button-bar a span').html('Avalie este software');