Merge pull request #49924 from nextcloud/fix/link-share-conflict-modal

fix(share): render conflict modal in public shares
nextcloud · Dec 19, 2024 · e703507 · e703507
2 parents 7e57d0d + 38c9c73
commit e703507
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/core/src/jquery/octemplate.js b/core/src/jquery/octemplate.js
@@ -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) {
@@ -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,
 	},

diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map