force recalcualte char size after custom font load #892

jcubic · Aug 2, 2023 · f962b55 · f962b55
1 parent b2e040c
commit f962b55
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 17 deletions.
diff --git a/css/jquery.terminal-2.37.0.css b/css/jquery.terminal-2.37.0.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2023 Jakub T. Jankiewicz <https://jcubic.pl/me>
  * Released under the MIT license
  *
- * Date: Tue, 01 Aug 2023 21:24:16 +0000
+ * Date: Wed, 02 Aug 2023 15:54:42 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd-prompt, .cmd-prompt div {

diff --git a/css/jquery.terminal-2.37.0.min.css b/css/jquery.terminal-2.37.0.min.css
diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2023 Jakub T. Jankiewicz <https://jcubic.pl/me>
  * Released under the MIT license
  *
- * Date: Tue, 01 Aug 2023 21:24:16 +0000
+ * Date: Wed, 02 Aug 2023 15:54:42 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd-prompt, .cmd-prompt div {

diff --git a/css/jquery.terminal.min.css b/css/jquery.terminal.min.css
diff --git a/css/jquery.terminal.min.css.map b/css/jquery.terminal.min.css.map
diff --git a/js/jquery.terminal-2.37.0.js b/js/jquery.terminal-2.37.0.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Tue, 01 Aug 2023 21:31:01 +0000
+ * Date: Wed, 02 Aug 2023 15:54:41 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -5278,7 +5278,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Tue, 01 Aug 2023 21:31:01 +0000',
+        date: 'Wed, 02 Aug 2023 15:54:41 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -7320,6 +7320,18 @@
         return Array.isArray(object);
     }
     // -----------------------------------------------------------------------
+    function have_custom_font(term) {
+        var font = $(term).css('--font');
+        if (!font) {
+            return false;
+        }
+        var fonts = Array.from(document.fonts.keys());
+        var font = fonts.find(function(face) {
+            return face.family === font;
+        });
+        return !!font;
+    }
+    // -----------------------------------------------------------------------
     function get_type(object) {
         if (typeof object === 'function') {
             return 'function';
@@ -12278,7 +12290,13 @@
             }
             // wait for custom font to load #892
             if (document.fonts && document.fonts.ready) {
-                document.fonts.ready.then(command_queue.resolve);
+                document.fonts.ready.then(function() {
+                    if (have_custom_font(self)) {
+                        calculate_char_size();
+                        self.resize();
+                    }
+                    command_queue.resolve();
+                });
             } else {
                 command_queue.resolve();
             }

diff --git a/js/jquery.terminal-2.37.0.min.js b/js/jquery.terminal-2.37.0.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -7320,6 +7320,18 @@
         return Array.isArray(object);
     }
     // -----------------------------------------------------------------------
+    function have_custom_font(term) {
+        var font = $(term).css('--font');
+        if (!font) {
+            return false;
+        }
+        var fonts = Array.from(document.fonts.keys());
+        var font = fonts.find(function(face) {
+            return face.family === font;
+        });
+        return !!font;
+    }
+    // -----------------------------------------------------------------------
     function get_type(object) {
         if (typeof object === 'function') {
             return 'function';
@@ -12278,7 +12290,13 @@
             }
             // wait for custom font to load #892
             if (document.fonts && document.fonts.ready) {
-                document.fonts.ready.then(command_queue.resolve);
+                document.fonts.ready.then(function() {
+                    if (have_custom_font(self)) {
+                        calculate_char_size();
+                        self.resize();
+                    }
+                    command_queue.resolve();
+                });
             } else {
                 command_queue.resolve();
             }

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Tue, 01 Aug 2023 21:31:01 +0000
+ * Date: Wed, 02 Aug 2023 15:54:41 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -5278,7 +5278,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Tue, 01 Aug 2023 21:31:01 +0000',
+        date: 'Wed, 02 Aug 2023 15:54:41 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -7320,6 +7320,18 @@
         return Array.isArray(object);
     }
     // -----------------------------------------------------------------------
+    function have_custom_font(term) {
+        var font = $(term).css('--font');
+        if (!font) {
+            return false;
+        }
+        var fonts = Array.from(document.fonts.keys());
+        var font = fonts.find(function(face) {
+            return face.family === font;
+        });
+        return !!font;
+    }
+    // -----------------------------------------------------------------------
     function get_type(object) {
         if (typeof object === 'function') {
             return 'function';
@@ -12278,7 +12290,13 @@
             }
             // wait for custom font to load #892
             if (document.fonts && document.fonts.ready) {
-                document.fonts.ready.then(command_queue.resolve);
+                document.fonts.ready.then(function() {
+                    if (have_custom_font(self)) {
+                        calculate_char_size();
+                        self.resize();
+                    }
+                    command_queue.resolve();
+                });
             } else {
                 command_queue.resolve();
             }

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map