studio/blender-studio
3
4
Fork 4
Code Issues 37 Pull Requests 2 Projects 1 Releases 5 Wiki Activity

WIP: Switch between FS storage and S3 per static asset #104417

Draft
Anna Sirota wants to merge 4 commits from alternative-storage into main
pull from: alternative-storage
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 4 Files Changed 7 +12 -2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec2d89a8db - Show all commits

14
common/static/common/scripts/vendor/bootstrap.bundle.js vendored
View File

@ -1864,15 +1864,25 @@
return; return;
} }
// TODO: decouple js collapse from Bootstrap bundle
triggerArray.forEach(elem => { triggerArray.forEach(elem => {
if (isOpen) { if (isOpen) {
const characterCount = elem.textContent.length;
elem.classList.remove(CLASS_NAME_COLLAPSED); elem.classList.remove(CLASS_NAME_COLLAPSED);
elem.textContent = 'Hide'; // Check if btn text is 'Show' or 'Hide'
if (characterCount == 4) {
elem.textContent = 'Hide';
}
} else { } else {
const characterCount = elem.textContent.length;
elem.classList.add(CLASS_NAME_COLLAPSED); elem.classList.add(CLASS_NAME_COLLAPSED);
elem.textContent = 'Show'; if (characterCount == 4) {
elem.textContent = 'Show';
}
} }
elem.setAttribute('aria-expanded', isOpen); elem.setAttribute('aria-expanded', isOpen);