Frio Bugfix: clear float at the end of comment-edit

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index aa6a48fcb64e9c79c558aefee48ac2e229005d5f..008d84b0bf1349a9b297226f8de98c818c2bef88 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -5,17 +5,14 @@
 
        function _resizeIframe(obj, desth) {
                var h = obj.style.height;
-               var ch = obj.contentWindow.document.body.scrollHeight + 'px';
-               if (h==ch) {
+               var ch = obj.contentWindow.document.body.scrollHeight;
+               if (h == (ch + 'px')) {
                        return;
                }
-               //console.log("_resizeIframe", obj, desth, ch);
-               if (desth!=ch) {
-                       setTimeout(_resizeIframe, 500, obj, ch);
-               } else {
-                       if (ch>0) obj.style.height  = ch;
-                       setTimeout(_resizeIframe, 1000, obj, ch);
+               if (desth == ch && ch>0) {
+                       obj.style.height  = ch + 'px';
                }
+               setTimeout(_resizeIframe, 100, obj, ch);
        }
 
        function openClose(theID) {
@@ -266,13 +263,13 @@
                                        var html = notifications_tpl.format(
                                                e.attr('href'),                     // {0}  // link to the source
                                                e.attr('photo'),                    // {1}  // photo of the contact
-                                               text,                               // {2}  // preformatet text (autor + text)
+                                               text,                               // {2}  // preformatted text (autor + text)
                                                e.attr('date'),                     // {3}  // date of notification (time ago)
-                                               seenclass,                          // {4}  // vistiting status of the notification
-                                               new Date(e.attr('timestamp')*1000), // {5}  //date of notification
+                                               seenclass,                          // {4}  // visited status of the notification
+                                               new Date(e.attr('timestamp')*1000), // {5}  // date of notification
                                                e.attr('url'),                      // {6}  // profile url of the contact
-                                               e.text().format(""),                // {7}  // clean status text
-                                               contact                             // {8}  //preformatat author (name + profile url)
+                                               e.text().format(contact),           // {7}  // preformatted html (text including author profile url)
+                                               ''                                  // {8}  // Deprecated
                                        );
                                        nnm.append(html);
                                });