]> git.mxchange.org Git - friendica.git/commitdiff
Infinite scroll: At the end of the network page new content is loaded automatically
authorMichael Vogel <icarus@dabo.de>
Mon, 14 Oct 2013 22:43:11 +0000 (00:43 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 14 Oct 2013 22:43:11 +0000 (00:43 +0200)
index.php
mod/settings.php
view/templates/settings_display.tpl

index 8784b5d0eb1d5f7bb82af52dbd7d6cbdd60ae6a9..39b4337f3cc337a308feeca33f6580be714d3a2f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -108,6 +108,7 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
  *
  * What we really need to do is output the raw headers ourselves so we can keep them separate.
  *
+
  */
 
 // header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
@@ -118,7 +119,6 @@ if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module ==
 if(! x($_SESSION,'authenticated'))
        header('X-Account-Management-Status: none');
 
-
 /* set up page['htmlhead'] and page['end'] for the modules to use */
 $a->page['htmlhead'] = '';
 $a->page['end'] = '';
@@ -428,6 +428,83 @@ else
 $a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
 //$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
 
+if ($_GET["mode"] == "raw") {
+       $doc = new DOMDocument();
+
+       $target = new DOMDocument();
+       $target->loadXML("<root></root>");
+
+       $content = mb_convert_encoding($a->page["content"], 'HTML-ENTITIES', "UTF-8");
+
+       @$doc->loadHTML($content);
+
+       $xpath = new DomXPath($doc);
+
+       $list = $xpath->query("//*[contains(@id,'tread-wrapper-')]");  /* */
+
+       foreach ($list as $item) {
+
+               $item = $target->importNode($item, true);
+
+               // And then append it to the target
+               $target->documentElement->appendChild($item);
+       }
+
+       header("Content-type: text/html; charset=utf-8");
+
+       echo substr($target->saveHTML(), 6, -8);
+
+       session_write_close();
+       exit;
+
+} elseif (get_pconfig(local_user(),'system','infinite_scroll') AND ($_GET["q"] == "network")) {
+       if (is_string($_GET["page"]))
+               $pageno = $_GET["page"];
+       else
+               $pageno = 1;
+
+       $reload_uri = "";
+
+       foreach ($_GET AS $param => $value)
+               if (($param != "page") AND ($param != "q"))
+                       $reload_uri .= "&".$param."=".$value;
+
+$a->page['htmlhead'] .= <<< EOT
+<script type="text/javascript">
+
+$(document).ready(function() {
+    num = $pageno;
+});
+
+function loadcontent() {
+       //$("div.loader").show();
+
+       num+=1;
+
+       console.log('Loading page ' + num);
+
+       $.get('/network?mode=raw$reload_uri&page=' + num, function(data) {
+               $(data).insertBefore('#conversation-end');
+       });
+
+       //$("div.loader").fadeOut('normal');
+}
+
+var num = $pageno;
+
+$(window).scroll(function(e){
+
+       //if ($(window).scrollTop() == $(document).height() - $(window).height()){
+       if ($(window).scrollTop() > $("section").height() - $(window).height()){
+               loadcontent();
+       }
+});
+</script>
+
+EOT;
+
+}
+
 $page    = $a->page;
 $profile = $a->profile;
 
index 12f7910ccee6b6c35e599f0ef4a877b8912fc78a..a75230f339fb26d6d7657e7512ab8718891d3fcf 100644 (file)
@@ -259,7 +259,8 @@ function settings_post(&$a) {
 
                $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme']))  : $a->user['theme']);
                $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme']))  : '');
-               $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);  
+               $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);
+               $infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll'])  : 0);
                $browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
                $browser_update   = $browser_update * 1000;
                if($browser_update < 10000)
@@ -281,6 +282,7 @@ function settings_post(&$a) {
                set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
                set_pconfig(local_user(),'system','itemspage_mobile_network', $itemspage_mobile_network);
                set_pconfig(local_user(),'system','no_smilies',$nosmile);
+               set_pconfig(local_user(),'system','infinite_scroll',$infinite_scroll);
 
 
                if ($theme == $a->user['theme']){
@@ -816,7 +818,7 @@ function settings_content(&$a) {
                }
                $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
                $mobile_theme_selected = (!x($_SESSION,'mobile-theme')? $default_mobile_theme : $_SESSION['mobile-theme']);
-               
+
                $browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
                $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
 
@@ -824,17 +826,19 @@ function settings_content(&$a) {
                $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
                $itemspage_mobile_network = intval(get_pconfig(local_user(), 'system','itemspage_mobile_network'));
                $itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : 20); // default if not set: 20 items
-               
+
                $nosmile = get_pconfig(local_user(),'system','no_smilies');
                $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
 
+               $infinite_scroll = get_pconfig(local_user(),'system','infinite_scroll');
+               $infinite_scroll = (($infinite_scroll===false)? '0': $infinite_scroll); // default if not set: 0
 
                $theme_config = "";
                if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){
                        require_once($themeconfigfile);
                        $theme_config = theme_content($a);
                }
-               
+
                $tpl = get_markup_template("settings_display.tpl");
                $o = replace_macros($tpl, array(
                        '$ptitle'       => t('Display Settings'),
@@ -842,17 +846,18 @@ function settings_content(&$a) {
                        '$submit'       => t('Submit'),
                        '$baseurl' => $a->get_baseurl(true),
                        '$uid' => local_user(),
-               
+
                        '$theme'        => array('theme', t('Display Theme:'), $theme_selected, '', $themes, true),
                        '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false),
                        '$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
                        '$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
                        '$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
                        '$nosmile'      => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
-                       
+                       '$infinite_scroll'      => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
+
                        '$theme_config' => $theme_config,
                ));
-               
+
                $tpl = get_markup_template("settings_display_end.tpl");
                $a->page['end'] .= replace_macros($tpl, array(
                        '$theme'        => array('theme', t('Display Theme:'), $theme_selected, '', $themes)
@@ -860,8 +865,8 @@ function settings_content(&$a) {
 
                return $o;
        }
-       
-       
+
+
        /*
         * ACCOUNT SETTINGS
         */
index 91075129659a09f6ac01e1b5cec48f8a98935ce7..5da575049fa5aaceaa43989bf12a16f88082dd79 100644 (file)
@@ -14,6 +14,7 @@
 {{include file="field_input.tpl" field=$itemspage_mobile_network}}
 {{include file="field_input.tpl" field=$ajaxint}}
 {{include file="field_checkbox.tpl" field=$nosmile}}
+{{include file="field_checkbox.tpl" field=$infinite_scroll}}
 
 
 <div class="settings-submit-wrapper" >