[showmore_dyn] Add support for 0 value to disable addon

diff --git a/showmore_dyn/showmore_dyn.js b/showmore_dyn/showmore_dyn.js
index 4b32b2d31d7da499a474bba34869ce2de7dbe886..74803d2d256eaa67016a5f5a3640779bba3c06c3 100644 (file)
--- a/showmore_dyn/showmore_dyn.js
+++ b/showmore_dyn/showmore_dyn.js
@@ -6,15 +6,14 @@ $(document).ready(function() {
                return;
        }
 
-       $("head").append('<style type="text/css"></style>');
-       var newStyleElement = $("head").children(':last');
-       newStyleElement.html('.limit-height{max-height: ' + postLimitHeight + 'px; overflow: hidden; }');
-
-       handleNewWallItemBodies();
-
-       document.addEventListener("postprocess_liveupdate", function() {
+       if (postLimitHeight) {
+               $('head').append('<style type="text/css">.limit-height{max-height: ' + postLimitHeight + 'px; overflow: hidden; }</style>');
                handleNewWallItemBodies();
-       });
+
+               document.addEventListener('postprocess_liveupdate', function() {
+                       handleNewWallItemBodies();
+               });
+       }
 });
 
 function handleNewWallItemBodies() {

diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php
index 32aedb08061635275dd015a48113cd6b2357cf5d..ccb96bc653bbcd92c90a39c5ae1a06211d8c1d4d 100644 (file)
--- a/showmore_dyn/showmore_dyn.php
+++ b/showmore_dyn/showmore_dyn.php
@@ -41,10 +41,7 @@ function showmore_dyn_settings_post()
        }
 
        if (isset($_POST['showmore_dyn-submit'])) {
-               $limitHeight = $_POST['limitHeight'];
-               if ($limitHeight && is_numeric($limitHeight)) {
-                       DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $limitHeight);
-               }
+               DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $_POST['limitHeight'] ?? 0);
        }
 }
 
@@ -61,14 +58,14 @@ function showmore_dyn_settings(App &$a, &$o)
        $o .= Renderer::replaceMacros($t, [
                '$submit' => DI::l10n()->t('Save Settings'),
                '$title' => 'Showmore Dynamic',
-               '$limitHeight' => ['limitHeight', DI::l10n()->t('Limit Height'), $limitHeight, 'The maximal height of posts when collapsed', '', '', 'number'],
+               '$limitHeight' => ['limitHeight', DI::l10n()->t('Limit Height'), $limitHeight, 'The maximal pixel height of posts, 0 to disable', '', '', 'number'],
        ]);
 
 }
 
 function showmore_dyn_script()
 {
-       $limitHeight = DI::pConfig()->get(local_user(), 'showmore_dyn', 'limitHeight', 250);
+       $limitHeight = intval(DI::pConfig()->get(local_user(), 'showmore_dyn', 'limitHeight', 250));
        $showmore_dyn_showmore_linktext = DI::l10n()->t('Show more ...');
        DI::page()['htmlhead'] .= <<<EOT
 <script>