Removed FontLoader submodule

GreyRook · Jul 12, 2017 · 2923138 · 2923138
1 parent ad5a94a
commit 2923138
Show file tree

Hide file tree

Showing 4 changed files with 1,009 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "external/pixi-shapes"]
 	path = external/pixi-shapes
 	url = [email protected]:GreyRook/pixi-shapes.git
-[submodule "examples/example 13 - login dialog/lib/FontLoader"]
-	path = docs/examples/example 13 - login dialog/lib/FontLoader
-	url = [email protected]:smnh/FontLoader.git
diff --git a/docs/examples/example 13 - login dialog/index.html b/docs/examples/example 13 - login dialog/index.html
@@ -21,7 +21,7 @@
     <script src="js/IconTextInput.js"></script>
 </head>
 <body>
-<script src="lib/FontLoader/FontLoader.js"></script>
+<script src="lib/FontLoader.js"></script>
 <script>
 
     // load fontawesome first, see https://github.com/smnh/FontLoader/issues/2
@@ -35,6 +35,8 @@
         // fontawesome loaded correctly
         var theme = new GOWN.ThemeParser("../../themes/assets/aeon_desktop/aeon_desktop.json");
         theme.once(GOWN.Theme.COMPLETE, onCompleteAeon, this);
+
+        GOWN.loader.load();
     }
 
     var app;
@@ -53,9 +55,6 @@
             height: app._height
         }});
     }
-    GOWN.loader.load();
-
-
 </script>
 
 </body>

diff --git a/docs/examples/example 13 - login dialog/lib/FontLoader b/docs/examples/example 13 - login dialog/lib/FontLoader
diff --git a/docs/examples/example 13 - login dialog/lib/FontLoader.js b/docs/examples/example 13 - login dialog/lib/FontLoader.js