8374: Addressing review comments

diff --git a/showmore_dyn/showmore_dyn.css b/showmore_dyn/showmore_dyn.css
index 0e082e10a3eb5aa9597ca12d7da44694b8819389..3e41fd3d4968b8240f4c1cf2cf28650ad8070bed 100644 (file)
--- a/showmore_dyn/showmore_dyn.css
+++ b/showmore_dyn/showmore_dyn.css
@@ -1,7 +1,7 @@
 .wall-item-body-toggle {
        width: 100%;
        text-align: center;
-       background-image: linear-gradient(rgba(0,0,0,0), #f6f6f6);
+       background-image: linear-gradient(rgba(0, 0, 0, 0), #f6f6f6);
        cursor: pointer;
        height: 50px;
        position: absolute;
@@ -11,6 +11,7 @@
        left: 0;
        display: none;
 }
+
 .wall-item-body-toggle-text {
        width: 100%;
        position: absolute;
@@ -20,22 +21,23 @@
        left: 0;
        text-shadow: 0 0 5px #f6f6f6;
        font-weight: bold;
-       background: none!important;
+       background: none !important;
        border: none;
-       padding: 0!important;
+       padding: 0 !important;
        cursor: pointer;
 }
+
 .wall-item-body-toggle-text:hover {
-       text-decoration:underline;
+       text-decoration: underline;
 }
+
 .wall-item-body {
        position: relative;
        width: 100%;
 }
+
 .wall-item-body-wrapper {
        position: relative;
        width: 100%;
        display: inline-block;
 }
-
-

diff --git a/showmore_dyn/showmore_dyn.js b/showmore_dyn/showmore_dyn.js
index 576d03f3d9026049741926959a3be6c24c450bc1..9864f24a1bb5a6443e3816187bae301586f2900c 100644 (file)
--- a/showmore_dyn/showmore_dyn.js
+++ b/showmore_dyn/showmore_dyn.js
@@ -1,6 +1,6 @@
 var nextBodyIdx = 0;
 
-$(document).ready(function(){
+$(document).ready(function() {
        $("head").append('<style type="text/css"></style>');
        var newStyleElement = $("head").children(':last');
        newStyleElement.html('.limit-height{max-height: ' + postLimitHeight + 'px; overflow: hidden; display:inline-block;}');
@@ -28,15 +28,22 @@ function handleNewWallItemBodies() {
                var limited = processHeightLimit($el);
 
                if (!limited) {
-                       var mutationObserver = new MutationObserver(function(mutations) {
+                       var mutationObserver = new MutationObserver(function() {
                                var limited = processHeightLimit($el);
                                if (limited) {
                                        mutationObserver.disconnect()
                                }
                        });
-                       mutationObserver.observe($el[0], { attributes: true, characterData: true, childList: true, subtree: true, attributeOldValue: true, characterDataOldValue: true });
+                       mutationObserver.observe($el[0], {
+                               attributes: true,
+                               characterData: true,
+                               childList: true,
+                               subtree: true,
+                               attributeOldValue: true,
+                               characterDataOldValue: true
+                       });
 
-                       $el.imagesLoaded().then(function(){
+                       $el.imagesLoaded().then(function() {
                                processHeightLimit($el);
                        });
                }
@@ -79,5 +86,3 @@ function processHeightLimit($item) {
                return true;
        }
 }
-
-

diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php
index 664049c66f5e35152f969d1cde2396f9bd634564..7e499beaa2a3024a7ad53ea3bf6de986df8d23a7 100644 (file)
--- a/showmore_dyn/showmore_dyn.php
+++ b/showmore_dyn/showmore_dyn.php
@@ -15,21 +15,13 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 
-function showmore_dyn_install() {
-       Hook::register('page_end', 'addon/showmore_dyn.php/showmore_dyn.php', 'showmore_dyn_script');
-       Hook::register('head'  , __FILE__, 'showmore_dyn_head');
-       Hook::register('footer', __FILE__, 'showmore_dyn_footer');
-       Hook::register('addon_settings', 'addon/showmore_dyn/showmore_dyn.php', 'showmore_dyn_settings');
-        Hook::register('addon_settings_post', 'addon/showmore_dyn/showmore_dyn.php', 'showmore_dyn_settings_post');
-}
-
-function showmore_dyn_uninstall()
+function showmore_dyn_install()
 {
-       Hook::unregister('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-       Hook::unregister('head'  , __FILE__, 'showmore_dyn_head');
-       Hook::unregister('footer', __FILE__, 'showmore_dyn_footer');
-        Hook::unregister('addon_settings', 'addon/showmore_dyn/showmore_dyn.php', 'showmore_dyn_settings');
-        Hook::unregister('addon_settings_post', 'addon/showmore_dyn/showmore_dyn.php', 'showmore_dyn_settings_post');
+       Hook::register('page_end',  __FILE__, 'showmore_dyn_script');
+       Hook::register('head', __FILE__, 'showmore_dyn_head');
+       Hook::register('footer', __FILE__, 'showmore_dyn_footer');
+       Hook::register('addon_settings',  __FILE__, 'showmore_dyn_settings');
+       Hook::register('addon_settings_post',  __FILE__, 'showmore_dyn_settings_post');
 }
 
 function showmore_dyn_head(App $a, &$b)
@@ -42,35 +34,47 @@ function showmore_dyn_footer(App $a, &$b)
        DI::page()->registerFooterScript(__DIR__ . '/showmore_dyn.js');
 }
 
-function showmore_dyn_settings_post(){
-        if(! local_user())
-                return;
-       if (isset($_POST['showmore_dyn-submit'])){
+function showmore_dyn_settings_post()
+{
+       if(!local_user()) {
+               return;
+       }
+
+       if (isset($_POST['showmore_dyn-submit'])) {
                $limitHeight = $_POST['showmore_dyn_height'];
-               DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $limitHeight);
-        }
+               if ($limitHeight && is_numeric($limitHeight)) {
+                       DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $limitHeight);
+               }
+       }
 }
 
-function showmore_dyn_settings(&$a,&$o) {
-    if(! local_user())
-                return;
-
+function showmore_dyn_settings(&$a, &$o)
+{
+       if(!local_user()) {
+               return;
+       }
 
-        $limitHeight = DI::pConfig()->get(local_user(), 'showmore_dyn', 'limitHeight' );
-        if ($limitHeight=='') { $limitHeight = 250; DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $limitHeight); }
+       $limitHeight = DI::pConfig()->get(local_user(), 'showmore_dyn', 'limitHeight', 250);
+       DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $limitHeight);
 
-        $t = Renderer::getMarkupTemplate("settings.tpl", "addon/showmore_dyn/");
-        $o .= Renderer::replaceMacros($t, [
-                '$submit' => DI::l10n()->t('Save Settings'),
-                '$title' => "Showmore Dynamic",
-                '$label' => DI::l10n()->t('Limit Height'),
-                '$limitHeight' => $limitHeight,
-        ]);
+       $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/showmore_dyn/');
+       $o .= Renderer::replaceMacros($t, [
+               '$submit' => DI::l10n()->t('Save Settings'),
+               '$title' => 'Showmore Dynamic',
+               '$label' => DI::l10n()->t('Limit Height'),
+               '$limitHeight' => $limitHeight,
+       ]);
 
 }
 
-function showmore_dyn_script() {
-       $limitHeight = DI::pConfig()->get(local_user(), 'showmore_dyn', 'limitHeight' );
+function showmore_dyn_script()
+{
+       $limitHeight = DI::pConfig()->get(local_user(), 'showmore_dyn', 'limitHeight', 250);
        $showmore_dyn_showmore_linktext = DI::l10n()->t('Show more ...');
-       DI::page()['htmlhead'] .= '<script>var postLimitHeight = ' . intval($limitHeight) . '; var showmore_dyn_showmore_linktext = "' . $showmore_dyn_showmore_linktext . '"</script>';
+       DI::page()['htmlhead'] .= <<<EOT
+<script>
+       var postLimitHeight = $limitHeight;
+       var showmore_dyn_showmore_linktext = "$showmore_dyn_showmore_linktext";
+</script>
+EOT;
 }

diff --git a/showmore_dyn/templates/settings.tpl b/showmore_dyn/templates/settings.tpl
index 2ef79c0aa01df766c37756b6d6b341445adb7c0a..782d1fdf7ab7134a7366776e993b0d229e49c362 100644 (file)
--- a/showmore_dyn/templates/settings.tpl
+++ b/showmore_dyn/templates/settings.tpl
@@ -1,12 +1,11 @@
 <div class="settings-block">
-        <h3 class="settings-heading">{{$title}}</h3>
-        <div class='field noedit'>
-                <label>{{$label}}</label>
+       <h3 class="settings-heading">{{$title}}</h3>
+       <div class='field noedit'>
+               <label>{{$label}}</label>
                <input id="showmore_dyn_height" name="showmore_dyn_height" value="{{$limitHeight}}" />
-        </div>
+       </div>
 
-        <div class="settings-submit-wrapper">
-                <input type="submit" value="{{$submit}}" class="settings-submit" name="showmore_dyn-submit" />
-        </div>
+       <div class="settings-submit-wrapper">
+               <input type="submit" value="{{$submit}}" class="settings-submit" name="showmore_dyn-submit" />
+       </div>
 </div>
-