diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index e056a34be2..89270bad3f 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -107,6 +107,5 @@ import "./frappe/utils/dashboard_utils.js"; import "./frappe/ui/chart.js"; import "./frappe/ui/datatable.js"; import "./frappe/ui/driver.js"; -import "./frappe/ui/plyr.js"; import "./frappe/barcode_scanner/index.js"; import "./frappe/scanner"; diff --git a/frappe/public/js/frappe/utils/help.js b/frappe/public/js/frappe/utils/help.js index 9b8149e20e..56109c7701 100644 --- a/frappe/public/js/frappe/utils/help.js +++ b/frappe/public/js/frappe/utils/help.js @@ -33,13 +33,16 @@ frappe.help.show_video = function (youtube_id, title) { dialog.show(); dialog.$wrapper.addClass("video-modal"); - let plyr = new frappe.Plyr(video[0], { - hideControls: true, - resetOnEnd: true, - }); + let plyr; + frappe.utils.load_video_player().then(() => { + plyr = new frappe.Plyr(video[0], { + hideControls: true, + resetOnEnd: true, + }); + }) dialog.onhide = () => { - plyr.destroy(); + plyr?.destroy(); }; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index aa305a9ce7..74c89aa01a 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1528,5 +1528,9 @@ Object.assign(frappe.utils, { return [doctype, filter, val[0], val[1], false]; }); } + }, + + load_video_player() { + return frappe.require("video_player.bundle.js"); } }); diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index e560551f79..5c3b996bb1 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -5,6 +5,7 @@ frappe.provide("frappe.utils"); export default class OnboardingWidget extends Widget { async refresh() { + frappe.utils.load_video_player(); this.new && await this.get_onboarding_data(); this.set_title(); this.set_actions(); @@ -156,7 +157,6 @@ export default class OnboardingWidget extends Widget { }; toggle_content(); - // toggle_video(); } go_to_page(step) { diff --git a/frappe/public/js/frappe/ui/plyr.js b/frappe/public/js/video_player.bundle.js similarity index 70% rename from frappe/public/js/frappe/ui/plyr.js rename to frappe/public/js/video_player.bundle.js index 97b36837f9..14e2d754bd 100644 --- a/frappe/public/js/frappe/ui/plyr.js +++ b/frappe/public/js/video_player.bundle.js @@ -1,3 +1,3 @@ import Plyr from "plyr/dist/plyr.polyfilled"; -frappe.Plyr = Plyr; \ No newline at end of file +frappe.Plyr = Plyr; diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 16fea9155d..aa00a884e1 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -699,7 +699,7 @@ class TestBenchBuild(BaseTestCommands): self.assertEqual(result.exit_code, 0) self.assertEqual(result.exception, None) - CURRENT_SIZE = 3.7 # MB + CURRENT_SIZE = 3.5 # MB JS_ASSET_THRESHOLD = 0.1 hooks = frappe.get_hooks()