From 717a532c09436fd8386fa2a652a1792d0f445cd7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 10 Oct 2016 13:30:05 +0200 Subject: [PATCH 1/3] fix readmorejs collapsing on scrolldirection change in mobile browsers --- library/readmore.js/readmore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 51222ced0..8b215dcb4 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -102,7 +102,7 @@ var resizeBoxes = debounce(function() { $('[data-readmore]').each(function() { var current = $(this), - isExpanded = (current.attr('aria-expanded') === 'true'); + isExpanded = (current.height() > current.data('collapsedHeight')); setBoxHeights(current); From 79a068e92b0f6a4108cb148741fc5f6187928b64 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 10 Oct 2016 14:27:49 +0200 Subject: [PATCH 2/3] another fix to readmore.js and update patch file --- .../hubzilla-custom-fix-webkit-browsers.patch | 20 ++++++++++++++++++- library/readmore.js/readmore.js | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch b/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch index fd3146152..e947d8854 100644 --- a/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch +++ b/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch @@ -2,12 +2,30 @@ diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 34a624e..51222ce 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js +@@ -79,7 +79,7 @@ + maxHeight: 'none', + overflow: 'hidden' + }).insertAfter(element), +- expandedHeight = el.outerHeight(), ++ expandedHeight = 100 + '%', + cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), + defaultHeight = element.data('defaultHeight'); + +@@ -102,7 +102,7 @@ + var resizeBoxes = debounce(function() { + $('[data-readmore]').each(function() { + var current = $(this), +- isExpanded = (current.attr('aria-expanded') === 'true'); ++ isExpanded = (current.height() > current.data('collapsedHeight')); + + setBoxHeights(current); + @@ -246,7 +246,7 @@ collapsedHeight = $element.data('collapsedHeight'); if ($element.height() <= collapsedHeight) { - newHeight = $element.data('expandedHeight') + 'px'; -+ newHeight = 100 + '%'; ++ newHeight = $element.data('expandedHeight'); newLink = 'lessLink'; expanded = true; } diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 8b215dcb4..4c4252e54 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -79,7 +79,7 @@ maxHeight: 'none', overflow: 'hidden' }).insertAfter(element), - expandedHeight = el.outerHeight(), + expandedHeight = 100 + '%', cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), defaultHeight = element.data('defaultHeight'); @@ -246,7 +246,7 @@ collapsedHeight = $element.data('collapsedHeight'); if ($element.height() <= collapsedHeight) { - newHeight = 100 + '%'; + newHeight = $element.data('expandedHeight'); newLink = 'lessLink'; expanded = true; } From 18ef8ea271ef69a7940be311d2c2a62d22c341e1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 10 Oct 2016 20:16:15 +0200 Subject: [PATCH 3/3] changelog and version 1.14RC1 --- CHANGELOG | 3 ++- boot.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9e06fb7a1..1e150ee71 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Hubzilla 1.14RC (2016-10-02) +Hubzilla 1.14 (????-??-??) - Unify the various mail sending instance to enotify::send() and z_mail() - Provide ability for admin to change account password - Replace deprecated Sabre functions @@ -38,6 +38,7 @@ Hubzilla 1.14RC (2016-10-02) - Server roles (basic, standard and pro) Bugfixes + - Fix readmore.js collapsing on scrolldirection change in some mobile browsers - Personalize Server Emails - Audio player doesn't automatically show for m4a files - Fix ajax page update with /channel?f=&mid=hash diff --git a/boot.php b/boot.php index 1acc8b562..8160f8804 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.14RC' ); +define ( 'STD_VERSION', '1.14RC1' ); define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1183 );