From 4a8d511afb7a609fddded251f9d5ecc79001941c Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Mon, 4 Sep 2017 16:44:03 +0200
Subject: [PATCH] hotline #64325 remove auto scroll + fix reading settings
---
library/ZendAfi/View/Helper/Accueil/Base.php | 1 +
library/ZendAfi/View/Helper/ModuleAbstract.php | 3 +++
public/opac/js/renderFilters/ajaxifyFilters.js | 5 -----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Accueil/Base.php b/library/ZendAfi/View/Helper/Accueil/Base.php
index 7d2cd429df4..f4ad99549b4 100644
--- a/library/ZendAfi/View/Helper/Accueil/Base.php
+++ b/library/ZendAfi/View/Helper/Accueil/Base.php
@@ -49,6 +49,7 @@ class ZendAfi_View_Helper_Accueil_Base extends ZendAfi_View_Helper_ModuleAbstrac
if (!$this->preferences)
$this->preferences = $modules_accueil->getValeursParDefaut($this->type_module);
+
$this->preferences = array_merge($modules_accueil->getValeursParDefaut($this->type_module),
$this->preferences);
}
diff --git a/library/ZendAfi/View/Helper/ModuleAbstract.php b/library/ZendAfi/View/Helper/ModuleAbstract.php
index bbbd105adab..04bb5734820 100644
--- a/library/ZendAfi/View/Helper/ModuleAbstract.php
+++ b/library/ZendAfi/View/Helper/ModuleAbstract.php
@@ -33,6 +33,9 @@ abstract class ZendAfi_View_Helper_ModuleAbstract extends ZendAfi_View_Helper_Ba
$this->id_module = $id_module;
$this->preferences = array_merge($params['preferences'],
$params);
+
+ $this->preferences = array_merge($this->preferences,
+ $this->preferences['preferences']);
}
diff --git a/public/opac/js/renderFilters/ajaxifyFilters.js b/public/opac/js/renderFilters/ajaxifyFilters.js
index d7699ac1912..dad65667fb3 100644
--- a/public/opac/js/renderFilters/ajaxifyFilters.js
+++ b/public/opac/js/renderFilters/ajaxifyFilters.js
@@ -37,11 +37,6 @@
var onLoadComplete = function() {
widget.ajaxifyFilters();
-
- var offset = widget.offset();
- $('html, body').animate({scrollTop:offset.top},
- 500,
- 'easeInSine');
};
--
GitLab