Skip to content

Commit 2e196eb

Browse files
committed
LP: Restoring injection of css/js libs in lp content - refs BT#21508
1 parent 2ffbdfb commit 2e196eb

File tree

5 files changed

+60
-3
lines changed

5 files changed

+60
-3
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
@tailwind base;
2+
3+
@layer base {
4+
:root {
5+
--color-primary-base: 46 117 163;
6+
--color-primary-gradient: 36 77 103;
7+
--color-primary-button-text: 46 117 163;
8+
--color-primary-button-alternative-text: 255 255 255;
9+
10+
--color-secondary-base: 243 126 47;
11+
--color-secondary-gradient: 224 100 16;
12+
--color-secondary-button-text: 255 255 255;
13+
14+
--color-tertiary-base: 51 51 51;
15+
--color-tertiary-gradient: 0 0 0;
16+
--color-tertiary-button-text: 255 255 255;
17+
18+
--color-success-base: 119 170 12;
19+
--color-success-gradient: 83 127 0;
20+
--color-success-button-text: 255 255 255;
21+
22+
--color-info-base: 13 123 253;
23+
--color-info-gradient: 0 84 211;
24+
--color-info-button-text: 255 255 255;
25+
26+
--color-warning-base: 245 206 1;
27+
--color-warning-gradient: 186 152 0;
28+
--color-warning-button-text: 0 0 0;
29+
30+
--color-danger-base: 223 59 59;
31+
--color-danger-gradient: 180 0 21;
32+
--color-danger-button-text: 255 255 255;
33+
34+
--color-form-base: 46 117 163;
35+
}
36+
}
37+
38+
@import "../scss/libs/mediaelementjs/styles";

assets/js/legacy/frameReadyLoader.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { useMediaElementLoader } from "../../vue/composables/mediaElementLoader"
2+
import "../../css/legacy/frameReadyLoader.scss"
3+
4+
const { domLoader: mejsLoader } = useMediaElementLoader()
5+
6+
mejsLoader()

assets/vue/composables/mediaElementLoader.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ function loader() {
5656
}
5757

5858
function domLoader() {
59-
document.addEventListener("DOMContentLoaded", function () {
60-
loader()
61-
})
59+
addedNodesCallback(document)
6260
}
6361

6462
export function useMediaElementLoader() {

public/main/inc/lib/display.lib.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2667,9 +2667,23 @@ public static function getFrameReadyBlock(
26672667
string $itemType = '',
26682668
string $jsConditionalFunction = 'function () { return false; }'
26692669
): string {
2670+
$colorThemeRepo = Container::$container->get(ColorThemeRepository::class);
2671+
$router = Container::getRouter();
2672+
2673+
$colorTheme = $colorThemeRepo->getActiveOne();
2674+
$colorThemeItem = '';
2675+
2676+
if ($colorTheme) {
2677+
$colorThemeItem = '{ type: "stylesheet", src: "'.$router->generate('chamilo_color_theme').'" },';
2678+
}
2679+
26702680
return '$.frameReady(function() {},
26712681
"'.$frameName.'",
26722682
[
2683+
{ type: "script", src: "/build/runtime.js" },
2684+
{ type: "script", src: "/build/legacy_framereadyloader.js" },
2685+
{ type: "stylesheet", src: "/build/legacy_framereadyloader.css" },
2686+
'.$colorThemeItem.'
26732687
],
26742688
'.$jsConditionalFunction
26752689
.');';

webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Encore.setOutputPath("public/build/")
1919
.addEntry("legacy_free-jqgrid", "./assets/js/legacy/free-jqgrid.js")
2020
.addEntry("legacy_lp", "./assets/js/legacy/lp.js")
2121
.addEntry("legacy_document", "./assets/js/legacy/document.js")
22+
.addEntry("legacy_framereadyloader", "./assets/js/legacy/frameReadyLoader.js")
2223

2324
.addEntry("vue", "./assets/vue/main.js")
2425
.addEntry("vue_installer", "./assets/vue/main_installer.js")

0 commit comments

Comments
 (0)