Merge branch 'master' into obersalzberg

# Conflicts: # dist/iwmlib.js # dist/iwmlib.pixi.js
2021-03-15 17:02:08 +01:00
parent 1316a727f3 a5f94e0a5f
commit 266a770c8e
69 changed files with 18107 additions and 43055 deletions
@@ -269,7 +269,7 @@ export default class Card {
        */
        return html.replace(
            /<\s*(a|video|img|image|circle)\s(.*?)(xlink:href|href|src)\s*=\s*["'](\..*?)["']\s*(.*?)>/g,
-            function () {
+            function() {
                let path = that._getRelativePath(arguments[4])
                const tag = `<${arguments[1]} ${arguments[2]} ${arguments[3]}="${path}" ${arguments[5]}>`
                /* if (that.debug) */ console.log('Adjusted: ', tag)
@@ -298,7 +298,7 @@ export default class Card {
        return new Promise((resolve, reject) => {
            let request = new XMLHttpRequest()

-            request.onreadystatechange = function () {
+            request.onreadystatechange = function() {
                if (this.readyState == 4) {
                    if (this.status == 200 || Card._isLocal()) {
                        try {
@@ -1593,7 +1593,7 @@ export default class Card {
                })
            },
            onUpdateParams: ['{self}'],
-            onUpdate: function (self) {
+            onUpdate: function(self) {
                let transform = self.target._gsTransform

                TweenLite.set(title, {
@@ -9,8 +9,8 @@
    <link rel="stylesheet" href="../../css/highlight.css">
    <link rel="stylesheet" href="../../css/popup.css">
    <script src="../3rdparty/highlight/highlight.pack.js"></script>
-    <script src="../../dist/iwmlib.js"></script>
    <script src="../../dist/iwmlib.3rdparty.js"></script>
+    <script src="../../dist/iwmlib.js"></script>
 </head>

 <body onload="Doctest.run();">