vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Support for bundled asset in frappe.require

Browse source
This commit is contained in:
Faris Ansari 2021-04-29 13:57:16 +05:30
parent dd69f1ab43
commit 4c64f04b88
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/assets.js
View file

@ -9,6 +9,12 @@ frappe.require = function(items, callback) {
if(typeof items === "string") {
items = [items];
}
items = items.map(item => {
if (!item.startsWith('/assets') && item.includes('.bundle.')) {
return frappe.boot.assets_json[item] || item;
}
return item;
});
return new Promise(resolve => {
frappe.assets.execute(items, () => {

3
frappe/sessions.py
View file

@ -11,7 +11,7 @@ permission, homepage, default variables, system defaults etc
import frappe, json
from frappe import _
import frappe.utils
from frappe.utils import cint, cstr
from frappe.utils import cint, cstr, get_assets_json
import frappe.model.meta
import frappe.defaults
import frappe.translate
@ -149,6 +149,7 @@ def get():
bootinfo["metadata_version"] = frappe.reset_metadata_version()
bootinfo.notes = get_unseen_notes()
bootinfo.assets_json = get_assets_json()
for hook in frappe.get_hooks("extend_bootinfo"):
frappe.get_attr(hook)(bootinfo=bootinfo)