Release v2.11.1
This commit is contained in:
1 parent
2c150b5b2e
commit
98f969ca0f
104 files changed
+3559
-447
No files matched your search
@@ -68,6 +68,9 @@ function substituteApiVariables(html, item, sourceId) {
|
||||
}
|
||||
|
||||
var resolved = placeholderUtils.resolvePlaceholderExpression(item, expression);
|
||||
if (typeof placeholderUtils.isProgressPlaceholderExpression === 'function' && placeholderUtils.isProgressPlaceholderExpression(expression)) {
|
||||
return placeholderUtils.renderProgressPlaceholder(item, expression);
|
||||
}
|
||||
if (typeof placeholderUtils.isImagePlaceholderExpression === 'function' && placeholderUtils.isImagePlaceholderExpression(expression)) {
|
||||
var imageSource = placeholderUtils.formatPlaceholderValue(resolved);
|
||||
var source = getApiSourceById(sourceId);
|
||||
|
||||
@@ -74,6 +74,9 @@ function substituteRssVariables(html, item, feedId) {
|
||||
return '';
|
||||
}
|
||||
var resolved = placeholderUtils.resolvePlaceholderExpression(item, expression);
|
||||
if (typeof placeholderUtils.isProgressPlaceholderExpression === 'function' && placeholderUtils.isProgressPlaceholderExpression(expression)) {
|
||||
return placeholderUtils.renderProgressPlaceholder(item, expression);
|
||||
}
|
||||
if (typeof placeholderUtils.isImagePlaceholderExpression === 'function' && placeholderUtils.isImagePlaceholderExpression(expression)) {
|
||||
var imageSource = placeholderUtils.formatPlaceholderValue(resolved);
|
||||
var feed = getRssFeedById(feedId);
|
||||
|
||||
@@ -13,6 +13,9 @@ function substituteTimetableVariables(html, entry) {
|
||||
return '';
|
||||
}
|
||||
|
||||
if (typeof window.placeholderUtils.isProgressPlaceholderExpression === 'function' && window.placeholderUtils.isProgressPlaceholderExpression(expression)) {
|
||||
return window.placeholderUtils.renderProgressPlaceholder(entry, expression);
|
||||
}
|
||||
return escapeHtml(window.placeholderUtils.formatPlaceholderValue(window.placeholderUtils.resolvePlaceholderExpression(entry, expression)));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -51,6 +51,9 @@ function substituteWeatherVariables(html, value) {
|
||||
if (!value || typeof value !== 'object' || typeof weatherPlaceholderUtils.resolvePlaceholderExpression !== 'function' || typeof weatherPlaceholderUtils.formatPlaceholderValue !== 'function') return '';
|
||||
var rawExpression = String(expression).trim();
|
||||
var normalizedExpression = normalizeWeatherExpression(rawExpression);
|
||||
if (typeof weatherPlaceholderUtils.isProgressPlaceholderExpression === 'function' && weatherPlaceholderUtils.isProgressPlaceholderExpression(rawExpression)) {
|
||||
return weatherPlaceholderUtils.renderProgressPlaceholder(value, rawExpression);
|
||||
}
|
||||
var iconMatch = normalizedExpression.match(/^(?:current\.weather_code|daily\.weather_code\.\d+|hourly\.weather_code\.\d+)\.icon(?:\((\d+)(?:\s*,\s*(\d+))?\))?$/);
|
||||
if (iconMatch) {
|
||||
var codeExpression = normalizedExpression.replace(/\.icon(?:\(.*\))?$/, '');
|
||||
|
||||
Reference in new issue
Block a user