Merge pull request #1809 from nextcloud/drop-compatibility.js

Remove unneeded compatibility polyfills
nextcloud · Oct 20, 2016 · 19b69cb · 19b69cb
2 parents f7f2711 + f7ca3ec
commit 19b69cb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 158 deletions.
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
diff --git a/core/js/core.json b/core/js/core.json
@@ -20,7 +20,6 @@
 		"placeholder.js"
 	],
 	"modules": [
-		"compatibility.js",
 		"jquery.ocdialog.js",
 		"oc-dialogs.js",
 		"js.js",

diff --git a/core/js/octemplate.js b/core/js/octemplate.js
@@ -76,7 +76,7 @@
 		},
 		// From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
 		_build: function(o){
-			var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : outerHTML(this.elem.get(0));
+			var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : this.elem.get(0).outerHTML;
 			try {
 				return data.replace(/{([^{}]*)}/g,
 					function (a, b) {

diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
@@ -143,7 +143,6 @@ public static function initTemplateEngine($renderAs) {
 			OC_Util::addScript("oc-dialogs", null, true);
 			OC_Util::addScript("jquery.ocdialog", null, true);
 			OC_Util::addStyle("jquery.ocdialog");
-			OC_Util::addScript("compatibility", null, true);
 			OC_Util::addScript('files/fileinfo');
 			OC_Util::addScript('files/client');