Merge pull request #103 from telser/update-swagger-ui-4.14

Update to swagger-ui to 4.14.0

Author: dmjio

servant-swagger-ui/CHANGELOG.md

@@ -1,3 +1,6 @@
+- 0.3.5.4.14.0
+    - Update to `swagger-ui-4.14.0`
+
 - 0.3.5.3.47.1
     - Update to `swagger-ui-3.47.1`
     - Generalize `swaggerSchemaUIServer` to support arbitrary `Value` instead of hardcoded `Swagger`

servant-swagger-ui/servant-swagger-ui.cabal

@@ -1,6 +1,6 @@
 cabal-version:      1.12
 name:               servant-swagger-ui
-version:            0.3.5.4.5.0
+version:            0.3.5.4.14.0
 synopsis:           Servant swagger ui
 category:           Web, Servant, Swagger
 description:
@@ -27,17 +27,22 @@ tested-with:
 extra-source-files:
   CHANGELOG.md
   index.html.tmpl
-  swagger-ui-dist-4.5.0/favicon-16x16.png
-  swagger-ui-dist-4.5.0/favicon-32x32.png
-  swagger-ui-dist-4.5.0/oauth2-redirect.html
-  swagger-ui-dist-4.5.0/swagger-ui-bundle.js
-  swagger-ui-dist-4.5.0/swagger-ui-bundle.js.map
-  swagger-ui-dist-4.5.0/swagger-ui-standalone-preset.js
-  swagger-ui-dist-4.5.0/swagger-ui-standalone-preset.js.map
-  swagger-ui-dist-4.5.0/swagger-ui.css
-  swagger-ui-dist-4.5.0/swagger-ui.css.map
-  swagger-ui-dist-4.5.0/swagger-ui.js
-  swagger-ui-dist-4.5.0/swagger-ui.js.map
+  swagger-ui-dist-4.14.0/favicon-16x16.png
+  swagger-ui-dist-4.14.0/favicon-32x32.png
+  swagger-ui-dist-4.14.0/oauth2-redirect.html
+  swagger-ui-dist-4.14.0/swagger-ui-bundle.js
+  swagger-ui-dist-4.14.0/swagger-ui-bundle.js.map
+  swagger-ui-dist-4.14.0/swagger-ui-es-bundle-core.js
+  swagger-ui-dist-4.14.0/swagger-ui-es-bundle-core.js.map
+  swagger-ui-dist-4.14.0/swagger-ui-es-bundle.js
+  swagger-ui-dist-4.14.0/swagger-ui-es-bundle.js.map
+  swagger-ui-dist-4.14.0/swagger-ui-standalone-preset.js
+  swagger-ui-dist-4.14.0/swagger-ui-standalone-preset.js.map
+  swagger-ui-dist-4.14.0/swagger-ui.css
+  swagger-ui-dist-4.14.0/swagger-ui.css.map
+  swagger-ui-dist-4.14.0/swagger-ui.js
+  swagger-ui-dist-4.14.0/swagger-ui.js.map
+  swagger-ui-dist-4.14.0/favicon-16x16.png
 
 source-repository head
   type:     git

servant-swagger-ui/src/Servant/Swagger/UI.hs

@@ -123,4 +123,4 @@ swaggerUiIndexTemplate :: Text
 swaggerUiIndexTemplate = $(embedText "index.html.tmpl")
 
 swaggerUiFiles :: [(FilePath, ByteString)]
-swaggerUiFiles = $(embedRecursiveDir "swagger-ui-dist-4.5.0")
+swaggerUiFiles = $(embedRecursiveDir "swagger-ui-dist-4.14.0")

servant-swagger-ui/swagger-ui-dist-4.5.0/favicon-16x16.png renamed to servant-swagger-ui/swagger-ui-dist-4.14.0/favicon-16x16.png

@@ -13,7 +13,7 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
@@ -38,7 +38,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -58,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {
@@ -67,9 +67,13 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
 </body>
 </html>