Merge remote-tracking branch 'upstream/develop' into 1602-diaspora

[friendica.git] / view / theme / frost-mobile / js / main.js

diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 926de5d253f81f3db40a5e38c4c5352b57051671..7e2880594d81c9310317525515b177cd47f8fe70 100644 (file)
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -13,7 +13,6 @@
                if($(listID).is(":visible")) {
                        $(listID).hide();
                        $(listID+"-wrapper").show();
-                       alert($(listID+"-wrapper").attr("id"));
                }
                else {
                        $(listID).show();
@@ -34,7 +33,6 @@
        var src = null;
        var prev = null;
        var livetime = null;
-       var msie = false;
        var stopped = false;
        var totStopped = false;
        var timer = null;
@@ -49,9 +47,7 @@
        $(function() {
                $.ajaxSetup({cache: false});
 
-               msie = $.browser.msie ;
-               
-               collapseHeight();
+               //collapseHeight();
 
                /* setup tooltips *//*
                $("a,.tt").each(function(){
@@ -296,7 +292,7 @@
                        if(livetime) {
                                clearTimeout(livetime);
                        }
-                       livetime = setTimeout(liveUpdate, 10000);
+                       livetime = setTimeout(liveUpdate, 5000);
                        return;
                }
                if(livetime != null)
@@ -306,7 +302,7 @@
 
                in_progress = true;
                var udargs = ((netargs.length) ? '/' + netargs : '');
-               var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+               var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page;
 
                $.get(update_url,function(data) {
                        in_progress = false;
@@ -405,12 +401,10 @@
                        elemName = elems + ' ' + elemName;
                }
                $(elemName).each(function() {
-                       if($(this).height() > 350) {
-                               $('html').height($('html').height());
-                               $(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 });
-                               $(this).addClass('divmore');
-                               $('html').height('auto');
-                       }
+                       $('html').height($('html').height());
+                       $(this).readmore({maxheight:350 , moreLink:'<a href="#" class="showmore">+ Show more</a>', lessLink:'<a href="#" class="showmore">+ Show less</a>'});
+                       $(this).addClass('divmore');
+                       $('html').height('auto');
                });
        }