Skip to content

MOBILE-2313 formattext: Calculate always width and height #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2018
Merged

MOBILE-2313 formattext: Calculate always width and height #1246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions www/core/directives/formattext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ angular.module('mm.core')
* -shorten: If shorten is present, max-height="100" will be applied.
* -expand-on-click: This attribute will be discarded. The text will be expanded if shortened and fullview-on-click not true.
*/
.directive('mmFormatText', function($interpolate, $mmText, $compile, $translate, $mmUtil, $mmSitesManager, $mmFS) {
.directive('mmFormatText', function($interpolate, $mmText, $compile, $translate, $mmUtil, $mmSitesManager, $mmFS, $window) {

var extractVariableRegex = new RegExp('{{([^|]+)(|.*)?}}', 'i'),
tagsToIgnore = ['AUDIO', 'VIDEO', 'BUTTON', 'INPUT', 'SELECT', 'TEXTAREA', 'A'];
Expand Down Expand Up @@ -416,14 +416,33 @@ angular.module('mm.core')
if (matches && matches[1]) {
var newUrl = $mmFS.concatenatePaths(site.getURL(), '/media/player/vimeo/wsplayer.php?video=') +
matches[1] + '&token=' + site.getToken();

// Width and height are mandatory, we need to calcualte one.
if (el.width) {
newUrl = newUrl + '&width=' + el.width;
width = el.width;
} else {
width = getElementWidth(el);
if (!width) {
width = $window.innerWidth;
}
}

if (el.height) {
newUrl = newUrl + '&height=' + el.height;
height = el.height;
} else {
height = getElementHeight(angular.element(el));
if (!height) {
height = width;
}
}

el.src = newUrl;
el.src = newUrl + '&width=' + width + '&height=' + height;
if (!el.width) {
el.width = width;
}
if (!el.height) {
el.height = height;
}
}
}
}
Expand Down