Skip to content

fix(share): render conflict modal in public shares #49924

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

Merged
max-nextcloud merged 2 commits into from
Dec 19, 2024
Merged

fix(share): render conflict modal in public shares #49924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13189d7
fix(share): render conflict modal in public shares
max-nextcloud Dec 19, 2024
38c9c73
chore(assets): Recompile assets
nextcloud-command Dec 19, 2024
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
11 changes: 10 additions & 1 deletion core/src/jquery/octemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const Template = {
},
// From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
_build(o) {
const data = this.elem.attr('type') === 'text/template' ? this.elem.html() : this.elem.get(0).outerHTML
const data = this._getData()
try {
return data.replace(/{([^{}]*)}/g,
function(a, b) {
Expand All @@ -95,6 +95,15 @@ const Template = {
console.error(e, 'data:', data)
}
},
_getData() {
if (this.elem.attr('type') === 'text/template') {
return this.elem.html()
}
// Leave out comments, etc and take the first html element
const htmlElem = $.makeArray(this.elem)
.find(e => e instanceof HTMLElement)
return htmlElem.outerHTML
},
options: {
escapeFunction: escapeHTML,
},
Expand Down
4 changes: 2 additions & 2 deletions dist/core-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading