Merge pull request #13407 from nextcloud/js-async-loading

Plain javascript api to asynchronously load javascript or css files

core/js/dist/main.js

@@ -413,5 +413,27 @@ function O(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=_
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-window._=s.a,window.$=o.a,window.autosize=l.a,window.Backbone=c.a,window.Clipboard=h.a,window.ClipboardJS=h.a,window.cssVars=I,window.dav=N.a,window.DOMPurify=W.a,window.Handlebars=B.a,window.jstimezonedetect=q.a,window.jstz=q.a,window.jQuery=o.a,window.marked=G.a,window.md5=V.a,window.moment=X.a}]);
+window._=s.a,window.$=o.a,window.autosize=l.a,window.Backbone=c.a,window.Clipboard=h.a,window.ClipboardJS=h.a,window.cssVars=I,window.dav=N.a,window.DOMPurify=W.a,window.Handlebars=B.a,window.jstimezonedetect=q.a,window.jstz=q.a,window.jQuery=o.a,window.marked=G.a,window.md5=V.a,window.moment=X.a;
+/*
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+var Z={},$={},ee={Loader:{loadScript:function(e,t){var n=e+t;return Z.hasOwnProperty(n)?Promise.resolve():(Z[n]=!0,new Promise(function(n,i){var s=OC.filePath(e,"js",t),r=document.createElement("script");r.src=s,r.setAttribute("nonce",btoa(OC.requestToken)),r.onload=function(){return n()},r.onerror=function(){return i("Failed to load script from ".concat(s))},document.head.appendChild(r)}))},loadStylesheet:function(e,t){var n=e+t;return $.hasOwnProperty(n)?Promise.resolve():($[n]=!0,new Promise(function(n,i){var s=OC.filePath(e,"css",t),r=document.createElement("link");r.href=s,r.type="text/css",r.rel="stylesheet",r.onload=function(){return n()},r.onerror=function(){return i("Failed to load stylesheet from ".concat(s))},document.head.appendChild(r)}))}}};window.OCP=Object.assign({},window.OCP,ee)}]);
 //# sourceMappingURL=main.js.map

core/js/js.js

@@ -39,7 +39,7 @@ function escapeHTML(s) {
 }
 
 /** @namespace OCP */
-var OCP = {},
+var OCP = Object.assign({}, window.OCP),
 	/**
 	 * @namespace OC
 	 */
@@ -367,6 +367,7 @@ var OCP = {},
 	 * @param {string} app the app id to which the script belongs
 	 * @param {string} script the filename of the script
 	 * @param ready event handler to be called when the script is loaded
+	 * @deprecated 16.0.0 Use OCP.Loader.loadScript
 	 */
 	addScript:function(app,script,ready){
 		var deferred, path=OC.filePath(app,'js',script+'.js');
@@ -387,6 +388,7 @@ var OCP = {},
 	 * Loads a CSS file
 	 * @param {string} app the app id to which the css style belongs
 	 * @param {string} style the filename of the css file
+	 * @deprecated 16.0.0 Use OCP.Loader.loadStylesheet
 	 */
 	addStyle:function(app,style){
 		var path=OC.filePath(app,'css',style+'.css');
@@ -1352,7 +1354,9 @@ function initCore() {
 
 	// css variables fallback for IE
 	if (msie > 0 || trident > 0) {
-		cssVars();
+		cssVars({
+			watch: true
+		});
 	}
 
 	$(window).on('unload.main', function() {

core/src/OCP/index.js

@@ -0,0 +1,11 @@
+/**
+ *
+ */
+import loader from './loader'
+
+/** @namespace OCP */
+const OCP = {
+	Loader: loader,
+};
+
+window['OCP'] = Object.assign({}, window.OCP, OCP)

core/src/OCP/loader.js

@@ -0,0 +1,80 @@
+/*
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+let loadedScripts = {};
+let loadedStylesheets = {};
+/**
+ * @namespace OCP
+ * @class Loader
+ */
+export default {
+
+
+	/**
+	 * Load a script asynchronously
+	 *
+	 * @param {string} app
+	 * @param {string} file
+	 * @returns {Promise}
+	 */
+	loadScript: function(app, file) {
+		const key = app + file;
+		if (loadedScripts.hasOwnProperty(key)) {
+			return Promise.resolve();
+		}
+		loadedScripts[key] = true;
+		return new Promise(function (resolve, reject) {
+			var scriptPath = OC.filePath(app, 'js', file);
+			var script = document.createElement('script');
+			script.src = scriptPath;
+			script.setAttribute('nonce', btoa(OC.requestToken));
+			script.onload = () => resolve();
+			script.onerror = () => reject(`Failed to load script from ${scriptPath}`);
+			document.head.appendChild(script);
+		});
+	},
+
+	/**
+	 * Load a stylesheet file asynchronously
+	 *
+	 * @param {string} app
+	 * @param {string} file
+	 * @returns {Promise}
+	 */
+	loadStylesheet: function(app, file) {
+		const key = app + file;
+		if (loadedStylesheets.hasOwnProperty(key)) {
+			return Promise.resolve();
+		}
+		loadedStylesheets[key] = true;
+		return new Promise(function (resolve, reject) {
+			var stylePath = OC.filePath(app, 'css', file);
+			var link = document.createElement('link');
+			link.href = stylePath;
+			link.type = 'text/css';
+			link.rel = 'stylesheet';
+			link.onload = () => resolve();
+			link.onerror = () => reject(`Failed to load stylesheet from ${stylePath}`);
+			document.head.appendChild(link);
+		});
+	},
+}

core/src/main.js

@@ -22,3 +22,5 @@
 import '@babel/polyfill'
 
 import './globals'
+
+import './OCP/index'