Skip to content
Snippets Groups Projects
Commit c64792c7 authored by Martin Schoeler's avatar Martin Schoeler
Browse files

Fix Reviews

parent 09d9b193
No related branches found
Tags 6.0.0-rc.7
No related merge requests found
Template.oembedAudioWidget.helpers({
collapsed() {
const user = Meteor.user();
if (this.collapsed) {
return this.collapsed;
} else {
return (user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault);
const user = Meteor.user();
return user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault === true;
}
}
});
Template.oembedFrameWidget.helpers({
collapsed() {
const user = Meteor.user();
if (this.collapsed) {
return this.collapsed;
} else {
return (user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault) === true;
const user = Meteor.user();
return user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault === true;
}
}
});
......@@ -2,21 +2,20 @@ Template.oembedImageWidget.helpers({
loadImage() {
const user = Meteor.user();
if (user && user.settings && user.settings.preferences && user.settings.preferences.autoImageLoad === false && this.downloadImages) {
if (user && user.settings && user.settings.preferences && user.settings.preferences.autoImageLoad === false && this.downloadImages == null) {
return false;
}
if (Meteor.Device.isPhone() && user() && user.settings && user.settings.preferences && user.settings.preferences.saveMobileBandwidth && this.downloadImages) {
if (Meteor.Device.isPhone() && user && user.settings && user.settings.preferences && user.settings.preferences.saveMobileBandwidth && this.downloadImages == null) {
return false;
}
return true;
},
collapsed() {
const user = Meteor.user();
if (this.collapsed != null) {
return this.collapsed;
} else {
return (user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault) === true;
const user = Meteor.user();
return user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault === true;
}
}
});
......@@ -57,11 +57,11 @@ Template.oembedUrlWidget.helpers({
return (getDescription(this) != null) || (getTitle(this) != null);
},
collapsed() {
const user = Meteor.user();
if (this.collapsed != null) {
return this.collapsed;
} else {
return (user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault) === true;
const user = Meteor.user();
return user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault === true;
}
}
});
......@@ -24,11 +24,11 @@ Template.oembedVideoWidget.helpers({
return getTitle(this);
},
collapsed() {
const user = Meteor.user();
if (this.collapsed) {
return this.collapsed;
} else {
return (user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault) === true;
const user = Meteor.user();
return user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault === true;
}
}
......
Template.oembedYoutubeWidget.helpers({
collapsed() {
const user = Meteor.user();
if (this.collapsed) {
return this.collapsed;
} else {
return (user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault) === true;
const user = Meteor.user();
return user && user.settings && user.settings.preferences && user.settings.preferences.collapseMediaByDefault === true;
}
}
});
......@@ -57,10 +57,8 @@ const toUtf8 = function(contentType, body) {
return iconv.decode(body, getCharset(contentType, body));
};
const getUrlContent = function(urlObj, redirectCount, callback) {
if (redirectCount == null) {
redirectCount = 5;
}
const getUrlContent = function(urlObj, redirectCount = 5, callback) {
if (_.isString(urlObj)) {
urlObj = URL.parse(urlObj);
}
......@@ -180,6 +178,7 @@ OEmbed.getUrlMeta = function(url, withFragment) {
}
}
let headers = undefined;
let data = undefined;
if (content && content.headers) {
......@@ -190,9 +189,9 @@ OEmbed.getUrlMeta = function(url, withFragment) {
});
}
if (content && content.statusCode !== 200) {
return;
return data;
}
const data = RocketChat.callbacks.run('oembed:afterParseContent', {
data = RocketChat.callbacks.run('oembed:afterParseContent', {
meta: metas,
headers,
parsedUrl: content.parsedUrl,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment