Merge branch '1.14RC' of https://github.com/redmatrix/hubzilla into 1.14RC_merge

This commit is contained in:
zotlabs 2016-10-10 22:47:19 -07:00
commit e75b0cb743
4 changed files with 25 additions and 6 deletions

View File

@ -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() - Unify the various mail sending instance to enotify::send() and z_mail()
- Provide ability for admin to change account password - Provide ability for admin to change account password
- Replace deprecated Sabre functions - Replace deprecated Sabre functions
@ -38,6 +38,7 @@ Hubzilla 1.14RC (2016-10-02)
- Server roles (basic, standard and pro) - Server roles (basic, standard and pro)
Bugfixes Bugfixes
- Fix readmore.js collapsing on scrolldirection change in some mobile browsers
- Personalize Server Emails - Personalize Server Emails
- Audio player doesn't automatically show for m4a files - Audio player doesn't automatically show for m4a files
- Fix ajax page update with /channel?f=&mid=hash - Fix ajax page update with /channel?f=&mid=hash

View File

@ -44,7 +44,7 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.14RC' ); define ( 'STD_VERSION', '1.14RC1' );
define ( 'ZOT_REVISION', '1.1' ); define ( 'ZOT_REVISION', '1.1' );
define ( 'DB_UPDATE_VERSION', 1183 ); define ( 'DB_UPDATE_VERSION', 1183 );

View File

@ -2,12 +2,30 @@ diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js
index 34a624e..51222ce 100644 index 34a624e..51222ce 100644
--- a/library/readmore.js/readmore.js --- a/library/readmore.js/readmore.js
+++ b/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 @@ @@ -246,7 +246,7 @@
collapsedHeight = $element.data('collapsedHeight'); collapsedHeight = $element.data('collapsedHeight');
if ($element.height() <= collapsedHeight) { if ($element.height() <= collapsedHeight) {
- newHeight = $element.data('expandedHeight') + 'px'; - newHeight = $element.data('expandedHeight') + 'px';
+ newHeight = 100 + '%'; + newHeight = $element.data('expandedHeight');
newLink = 'lessLink'; newLink = 'lessLink';
expanded = true; expanded = true;
} }

View File

@ -79,7 +79,7 @@
maxHeight: 'none', maxHeight: 'none',
overflow: 'hidden' overflow: 'hidden'
}).insertAfter(element), }).insertAfter(element),
expandedHeight = el.outerHeight(), expandedHeight = 100 + '%',
cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10),
defaultHeight = element.data('defaultHeight'); defaultHeight = element.data('defaultHeight');
@ -102,7 +102,7 @@
var resizeBoxes = debounce(function() { var resizeBoxes = debounce(function() {
$('[data-readmore]').each(function() { $('[data-readmore]').each(function() {
var current = $(this), var current = $(this),
isExpanded = (current.attr('aria-expanded') === 'true'); isExpanded = (current.height() > current.data('collapsedHeight'));
setBoxHeights(current); setBoxHeights(current);
@ -246,7 +246,7 @@
collapsedHeight = $element.data('collapsedHeight'); collapsedHeight = $element.data('collapsedHeight');
if ($element.height() <= collapsedHeight) { if ($element.height() <= collapsedHeight) {
newHeight = 100 + '%'; newHeight = $element.data('expandedHeight');
newLink = 'lessLink'; newLink = 'lessLink';
expanded = true; expanded = true;
} }