shorten_expanded: shorten based on window height not preset value

This commit is contained in:
Andrew Dolgov 2015-07-07 16:43:22 +03:00
parent 9090b874ab
commit 0cf910991e
2 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,7 @@
div.contentSizeWrapper { div.contentSizeWrapper {
overflow : hidden; overflow : hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
height : 700px; /*height : 700px;*/
} }
button.expandPrompt { button.expandPrompt {

View File

@ -1,4 +1,4 @@
var _shorten_expanded_threshold = 900; //px, longer than css height so that we would only clip articles significantly longer than limit var _shorten_expanded_threshold = 1.5; //window heights
function expandSizeWrapper(id) { function expandSizeWrapper(id) {
try { try {
@ -28,11 +28,13 @@ dojo.addOnLoad(function() {
window.setTimeout(function() { window.setTimeout(function() {
if (row) { if (row) {
if (row.offsetHeight >= _shorten_expanded_threshold) { if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
var content = row.select(".cdmContentInner")[0]; var content = row.select(".cdmContentInner")[0];
if (content) { if (content) {
content.innerHTML = "<div class='contentSizeWrapper'>" + var wrapperHeight = Math.round(window.innerHeight * 0.8) + 'px';
content.innerHTML = "<div class='contentSizeWrapper' style='height : "+wrapperHeight+"'>" +
content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+ content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
"href='#'>" + __("Click to expand article") + "</button>"; "href='#'>" + __("Click to expand article") + "</button>";