Merge pull request #6900 from annando/fix-error

[friendica.git] / view / theme / frio / js / theme.js

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index edbe713c6713ad7abf51f11bce2db37c7e61b9af..83623bf34214a93fbd9ce3ee3a8a3b8a69fbf0da 100644 (file)
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -373,28 +373,21 @@ function openClose(theID) {
 
 function showHide(theID) {
        var elem = document.getElementById(theID);
+       var edit = document.getElementById("comment-edit-submit-wrapper-" + theID.match('[0-9$]+'));
 
-       if( $(elem).is(':visible') ) {
-               elem.style.display = "none";
+       if ($(elem).is(':visible')) {
+               if (!$(edit).is(':visible')) {
+                       edit.style.display = "block";
+               }
+               else {
+                       elem.style.display = "none";
+               }
        }
        else {
                elem.style.display = "block";
        }
 }
 
-function showHideComments(id) {
-       if( $('#collapsed-comments-' + id).is(':visible')) {
-               $('#collapsed-comments-' + id).slideUp();
-               $('#hide-comments-' + id).html(window.showMore);
-               $('#hide-comments-total-' + id).show();
-       }
-       else {
-               $('#collapsed-comments-' + id).slideDown();
-               $('#hide-comments-' + id).html(window.showFewer);
-               $('#hide-comments-total-' + id).hide();
-       }
-}
-
 // Show & hide event map in the network stream by button click.
 function showHideEventMap(elm) {
        // Get the id of the map element - it should be provided through
@@ -433,10 +426,10 @@ function justifyPhotos() {
                margins: 3,
                border: 0,
                sizeRangeSuffixes: {
-                       'lt100': '-2',
-                       'lt240': '-2',
+                       'lt48': '-6',
+                       'lt80': '-5',
+                       'lt300': '-4',
                        'lt320': '-2',
-                       'lt500': '',
                        'lt640': '-1',
                        'lt1024': '-0'
                }