Skip to content

fix(OpenUI5Support): css variables detection #13465

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

Open
nnaydenow wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −8
Open

fix(OpenUI5Support): css variables detection #13465

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
20 changes: 12 additions & 8 deletions packages/base/src/features/OpenUI5Support.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const OPENUI5_POLLING_INTERVAL = 100;
class OpenUI5Support {
static enablePolling = false; // set to true for old OpenUI5 versions

static isAtLeastVersion116() {
static isAtLeastVersion(minor: number) {
if (!window.sap.ui!.version) {
return true; // sap.ui.version will be removed in newer OpenUI5 versions
}
Expand All @@ -86,7 +86,7 @@ class OpenUI5Support {
if (!parts || parts.length < 2) {
return false;
}
return parseInt(parts[0]) > 1 || parseInt(parts[1]) >= 116;
return parseInt(parts[0]) > 1 || parseInt(parts[1]) >= minor;
}

static isOpenUI5Detected() {
Expand Down Expand Up @@ -128,7 +128,7 @@ class OpenUI5Support {
window.sap.ui.require(["sap/ui/core/Core"], async (Core: OpenUI5Core) => {
const callback = () => {
let deps: Array<string> = ["sap/ui/core/Popup", "sap/m/Dialog", "sap/ui/core/Patcher", "sap/ui/core/LocaleData"];
if (OpenUI5Support.isAtLeastVersion116()) { // for versions since 1.116.0 and onward, use the modular core
if (OpenUI5Support.isAtLeastVersion(116)) { // for versions since 1.116.0 and onward, use the modular core
deps = [
...deps,
"sap/base/i18n/Formatting",
Expand All @@ -144,7 +144,7 @@ class OpenUI5Support {
resolve();
});
};
if (OpenUI5Support.isAtLeastVersion116()) {
if (OpenUI5Support.isAtLeastVersion(116)) {
await Core.ready();
callback();
} else {
Expand All @@ -162,7 +162,7 @@ class OpenUI5Support {
return {};
}

if (OpenUI5Support.isAtLeastVersion116()) {
if (OpenUI5Support.isAtLeastVersion(116)) {
const ControlBehavior = window.sap.ui.require("sap/ui/core/ControlBehavior") as ControlBehavior;
const Localization = window.sap.ui.require("sap/base/i18n/Localization") as Localization;
const Theming = window.sap.ui.require("sap/ui/core/Theming") as Theming;
Expand Down Expand Up @@ -211,7 +211,7 @@ class OpenUI5Support {

const LocaleData = window.sap.ui.require("sap/ui/core/LocaleData") as LocaleData;

if (OpenUI5Support.isAtLeastVersion116()) {
if (OpenUI5Support.isAtLeastVersion(116)) {
const Localization = window.sap.ui.require("sap/base/i18n/Localization") as Localization;
return LocaleData.getInstance(Localization.getLanguageTag())._get();
}
Expand All @@ -222,7 +222,7 @@ class OpenUI5Support {
}

static _listenForThemeChange() {
if (OpenUI5Support.isAtLeastVersion116()) {
if (OpenUI5Support.isAtLeastVersion(116)) {
const Theming: Theming = window.sap.ui.require("sap/ui/core/Theming");
Theming.attachApplied(() => {
setTheme(Theming.getTheme());
Expand Down Expand Up @@ -256,7 +256,11 @@ class OpenUI5Support {
}

// The file name is "css_variables.css" until 1.127 and "library.css" from 1.127 onwards
return !!link.href.match(/\/css(-|_)variables\.css/) || !!link.href.match(/\/library\.css/);
if (OpenUI5Support.isAtLeastVersion(127)) {
return !!link.href.match(/\/css(-|_)variables\.css/) || !!link.href.match(/\/library\.css/);
}

return !!link.href.match(/\/css(-|_)variables\.css/);
}

static addOpenedPopup(popupInfo: PopupInfo) {
Expand Down
Loading