aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-10 22:46:43 -0700
committerzotlabs <mike@macgirvin.com>2016-10-10 22:46:43 -0700
commit29617737ca2c03c800ebbe4701dc21cf9f25ce22 (patch)
tree36283850e2a3bfc639889abe15e4a3406f4a10e2
parent26cc73118a648940a20a4f462a07a73681309af0 (diff)
parentad26eec9f27cb518867a266cf6b2c99aac686f94 (diff)
downloadvolse-hubzilla-29617737ca2c03c800ebbe4701dc21cf9f25ce22.tar.gz
volse-hubzilla-29617737ca2c03c800ebbe4701dc21cf9f25ce22.tar.bz2
volse-hubzilla-29617737ca2c03c800ebbe4701dc21cf9f25ce22.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
-rwxr-xr-xboot.php2
-rw-r--r--library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch20
-rw-r--r--library/readmore.js/readmore.js6
3 files changed, 23 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index b493bbea0..9f359d071 100755
--- a/boot.php
+++ b/boot.php
@@ -44,7 +44,7 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'STD_VERSION', '1.12' );
+define ( 'STD_VERSION', '1.12.1' );
define ( 'ZOT_REVISION', '1.1' );
define ( 'DB_UPDATE_VERSION', 1181 );
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;
}