aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-10 22:47:19 -0700
committerzotlabs <mike@macgirvin.com>2016-10-10 22:47:19 -0700
commite75b0cb743595dc9e8e726b71a129a52d2b6c6d3 (patch)
treefc8f552e2b7ff4d18396ea2351626aee951ff670
parent47e91e06606918028be362ecf8e99b9f860eb8e8 (diff)
parent18ef8ea271ef69a7940be311d2c2a62d22c341e1 (diff)
downloadvolse-hubzilla-e75b0cb743595dc9e8e726b71a129a52d2b6c6d3.tar.gz
volse-hubzilla-e75b0cb743595dc9e8e726b71a129a52d2b6c6d3.tar.bz2
volse-hubzilla-e75b0cb743595dc9e8e726b71a129a52d2b6c6d3.zip
Merge branch '1.14RC' of https://github.com/redmatrix/hubzilla into 1.14RC_merge
-rw-r--r--CHANGELOG3
-rwxr-xr-xboot.php2
-rw-r--r--library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch20
-rw-r--r--library/readmore.js/readmore.js6
4 files changed, 25 insertions, 6 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 );
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 51222ced0..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');
@@ -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 = 100 + '%';
+ newHeight = $element.data('expandedHeight');
newLink = 'lessLink';
expanded = true;
}