@qooxdoo/framework 7.5.1 → 7.6.0

package/source/class/qx/theme/manager/Font.js

@@ -102,16 +102,12 @@ qx.Class.define("qx.theme.manager.Font", {
       // the theme and are not updating the cache
       var theme = this.getTheme();
       if (theme !== null && theme.fonts[value]) {
-        var font = this.__getFontClass(theme.fonts[value]);
-        var fo = new font();
-
-        // Inject information about custom charcter set tests before we apply the
-        // complete blob in one.
-        if (theme.fonts[value].comparisonString) {
-          fo.setComparisonString(theme.fonts[value].comparisonString);
+        let createdFonts = this.__initialiseFonts(theme.fonts);
+        let font = createdFonts[value] || null;
+        if (font) {
+          cache[value] = font;
         }
-
-        return (cache[value] = fo.set(theme.fonts[value]));
+        return font;
       }
       if (qx.core.Environment.get("qx.debug")) {
         if (theme) {
@@ -154,16 +150,16 @@ qx.Class.define("qx.theme.manager.Font", {
       // the theme and are not updating the cache
       var theme = this.getTheme();
       if (theme !== null && value && theme.fonts[value]) {
-        var font = this.__getFontClass(theme.fonts[value]);
-        var fo = new font();
+        var fontClass = this.__getFontClass(theme.fonts[value]);
+        var font = new fontClass();
 
         // Inject information about custom charcter set tests before we apply the
         // complete blob in one.
         if (theme.fonts[value].comparisonString) {
-          fo.setComparisonString(theme.fonts[value].comparisonString);
+          font.setComparisonString(theme.fonts[value].comparisonString);
         }
 
-        cache[value] = fo.set(theme.fonts[value]);
+        cache[value] = font.set(theme.fonts[value]);
         return true;
       }
 
@@ -195,41 +191,149 @@ qx.Class.define("qx.theme.manager.Font", {
       }
     },
 
-    // apply method
-    _applyTheme(value) {
-      var dest = (this._dynamic = {});
+    /**
+     * Initialises fonts from a set of font definitions (eg from a theme Font configuration)
+     *
+     * @param {Map<String,Object>} fontDefs indexed by font ID
+     * @return {Map<String,qx.bom.Font>} created fonts
+     */
+    __initialiseFonts(fontDefs) {
+      let webFontDefs = [];
+      let createdFonts = {};
+
+      for (var fontId in fontDefs) {
+        let fontDef = fontDefs[fontId];
+        if (fontDef.include && fontDefs[fontDef.include]) {
+          this.__resolveInclude(fontDefs, fontId);
+        }
 
-      for (var key in dest) {
-        if (dest[key].themed) {
-          dest[key].dispose();
-          delete dest[key];
+        if (fontDef.fontName) {
+          let preset = this._manifestFonts[fontDef.fontName];
+          Object.keys(preset).forEach(presetKey => {
+            if (fontDef[presetKey] === undefined) {
+              fontDef[presetKey] = preset[presetKey];
+            }
+          });
         }
-      }
 
-      if (value) {
-        var source = this._manifestFonts
-          ? Object.assign(value.fonts, this._manifestFonts)
-          : value.fonts;
+        // If the theme font is defining sources, then we want to intercept that and either
+        //  fabricate a Manifest font, or if the qx.bom.webfonts.WebFont has already been
+        //  created we need to add the font face definition to the existing one
+        if (fontDef.sources) {
+          // Make sure the font family is specified in the font definition (it was previously allowable to
+          //  only specify the font family in the sources object)
+          if (
+            fontDef.sources.family &&
+            fontDef.family.indexOf(fontDef.sources.family) < 0
+          ) {
+            fontDef.family.unshift(fontDef.sources.family);
+          }
+          let family = fontDef.family[0];
+
+          // Make sure that there is a font definition
+          if (!fontDefs[family]) {
+            fontDefs[family] = {
+              fontFaces: []
+            };
+          }
+
+          // Create a lookup of the fontFaces within the font definition
+          let fontFacesLookup = {};
+          fontDefs[family].fontFaces.forEach(fontFace => {
+            let fontKey = qx.bom.webfonts.WebFontLoader.createFontLookupKey(
+              fontFace.family,
+              fontFace.fontWeight,
+              fontFace.fontStyle
+            );
+
+            fontFacesLookup[fontKey] = fontFace;
+          });
+          let fontKey = qx.bom.webfonts.WebFontLoader.createFontLookupKey(
+            fontDef.sources.family,
+            fontDef.sources.fontWeight,
+            fontDef.sources.fontStyle
+          );
+
+          if (!fontFacesLookup[fontKey]) {
+            let fontFace = {
+              fontFamily: fontDef.sources.family,
+              fontWeight: fontDef.sources.fontWeight,
+              fontStyle: fontDef.sources.fontStyle
+            };
+
+            fontDefs[family].fontFaces.push(fontFace);
+          }
+        }
+        if (fontDef.css || fontDef.fontFaces) {
+          webFontDefs.push(fontDef);
+        }
+        var fontClass = this.__getFontClass(fontDef);
+        var font = new fontClass();
+
+        // Inject information about custom charcter set tests before we apply the
+        // complete blob in one.
+        if (fontDef.comparisonString) {
+          font.setComparisonString(fontDef.comparisonString);
+        }
 
-        for (var key in source) {
-          if (source[key].include && source[source[key].include]) {
-            this.__resolveInclude(source, key);
+        createdFonts[fontId] = font;
+        qx.Class.getProperties(qx.bom.Font).forEach(propertyName => {
+          let value = fontDef[propertyName];
+          if (value !== undefined) {
+            font["set" + qx.lang.String.firstUp(propertyName)](value);
           }
+        });
+        createdFonts[fontId].themed = true;
+      }
 
-          var font = this.__getFontClass(source[key]);
-          var fo = new font();
+      // Load all of the web fonts
+      for (let webFontDef of webFontDefs) {
+        let loader = qx.bom.webfonts.WebFontLoader.getLoader(
+          webFontDef.family[0],
+          true
+        );
 
-          // Inject information about custom charcter set tests before we apply the
-          // complete blob in one.
-          if (source[key].comparisonString) {
-            fo.setComparisonString(source[key].comparisonString);
+        ["css", "fontFaces", "comparisonString", "version"].forEach(
+          propertyName => {
+            if (webFontDef[propertyName]) {
+              loader["set" + qx.lang.String.firstUp(propertyName)](
+                webFontDef[propertyName]
+              );
+            }
           }
+        );
 
-          dest[key] = fo.set(source[key]);
-          dest[key].themed = true;
+        loader.load();
+      }
+
+      // Initialise the fonts, including those that refer to the loaded web fonts
+      for (let fontId in createdFonts) {
+        let font = createdFonts[fontId];
+        font.loadComplete();
+      }
+
+      return createdFonts;
+    },
+
+    // apply method
+    _applyTheme(value) {
+      let createdFonts = (this._dynamic = {});
+
+      for (let key in createdFonts) {
+        if (createdFonts[key].themed) {
+          createdFonts[key].dispose();
+          delete createdFonts[key];
         }
       }
-      this._setDynamic(dest);
+
+      if (value) {
+        var fonts = this._manifestFonts
+          ? Object.assign(value.fonts, this._manifestFonts)
+          : value.fonts;
+        createdFonts = this.__initialiseFonts(fonts);
+      }
+
+      this._setDynamic(createdFonts);
     },
 
     /**
@@ -239,10 +343,19 @@ qx.Class.define("qx.theme.manager.Font", {
      * @return {Class}
      */
     __getFontClass(config) {
-      if (config.sources) {
+      if (config.fontFaces || config.css) {
         return qx.bom.webfonts.WebFont;
       }
       return qx.bom.Font;
+    },
+
+    /**
+     * Returns the font information output by the compiler
+     * @internal subject to change
+     * @return {Object}
+     */
+    getManifestFonts() {
+      return this._manifestFonts;
     }
   },
 

package/source/class/qx/theme/modern/Font.js

@@ -19,6 +19,7 @@
 
 /**
  * The modern font theme.
+ *
  */
 qx.Theme.define("qx.theme.modern.Font", {
   fonts: {

package/source/class/qx/theme/simple/Font.js

@@ -18,6 +18,8 @@
 
 /**
  * The simple qooxdoo font theme.
+ *
+ * @usefont(qx.theme.monospace)
  */
 qx.Theme.define("qx.theme.simple.Font", {
   fonts: {
@@ -44,7 +46,7 @@ qx.Theme.define("qx.theme.simple.Font", {
 
     monospace: {
       size: 11,
-      family: ["DejaVu Sans Mono", "Courier New", "monospace"]
+      fontName: "qx.theme.monospace"
     }
   }
 });

package/source/class/qx/theme/tangible/Appearance.js

@@ -34,6 +34,7 @@
  * @asset(qx/icon/Tango/16/actions/window-close.png)
  * @asset(qx/icon/Tango/16/actions/dialog-cancel.png)
  * @asset(qx/icon/Tango/16/actions/dialog-ok.png)
+ * @usefont(MaterialIcons)
  */
 qx.Theme.define("qx.theme.tangible.Appearance", {
   appearances: {

package/source/class/qx/theme/tangible/Font.js

@@ -17,15 +17,12 @@
     This theme is based in large parts on the osparc.theme
 
 ************************************************************************ */
-/**
- * @asset(qx/font/Roboto/*.woff)
- * @asset(qx/font/Roboto/*.woff2)
- * @asset(qx/font/Roboto/*.eot)
- * @asset(qx/font/Roboto/*.ttf)
- * @asset(qx/iconfont/MaterialIcons/*)
- */
+
 /**
  * The simple qooxdoo font theme.
+ *
+ * @usefont(Roboto)
+ * @usefont(Roboto Mono)
  */
 qx.Theme.define("qx.theme.tangible.Font", {
   fonts: {
@@ -33,17 +30,7 @@ qx.Theme.define("qx.theme.tangible.Font", {
       size: 14,
       family: ["sans-serif"],
       color: "text-primary-on-surface",
-      sources: [
-        {
-          family: "Roboto",
-          source: [
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.eot",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.woff2",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.woff",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.ttf"
-          ]
-        }
-      ]
+      fontName: "Roboto"
     },
 
     bold: {
@@ -51,68 +38,28 @@ qx.Theme.define("qx.theme.tangible.Font", {
       family: ["sans-serif"],
       bold: true,
       color: "text-primary-on-surface",
-      sources: [
-        {
-          family: "Roboto",
-          source: [
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-700.eot",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-700.woff2",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-700.woff",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-700.ttf"
-          ]
-        }
-      ]
+      fontName: "Roboto"
     },
 
     headline: {
       size: 24,
       family: ["sans-serif"],
       color: "text-primary-on-surface",
-      sources: [
-        {
-          family: "Roboto",
-          source: [
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.eot",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.woff2",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.woff",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.ttf"
-          ]
-        }
-      ]
+      fontName: "Roboto"
     },
 
     small: {
       size: 12,
       family: ["sans-serif"],
       color: "text-primary-on-surface",
-      sources: [
-        {
-          family: "Roboto",
-          source: [
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.eot",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.woff2",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.woff",
-            "qx/font/Roboto/roboto-v18-latin_latin-ext-regular.ttf"
-          ]
-        }
-      ]
+      fontName: "Roboto"
     },
 
     monospace: {
       size: 14,
       family: ["monospace"],
       color: "text-primary-on-surface",
-      sources: [
-        {
-          family: "Roboto Mono",
-          source: [
-            "qx/font/Roboto/roboto-mono-v6-latin_latin-ext-regular.eot",
-            "qx/font/Roboto/roboto-mono-v6-latin_latin-ext-regular.woff2",
-            "qx/font/Roboto/roboto-mono-v6-latin_latin-ext-regular.woff",
-            "qx/font/Roboto/roboto-mono-v6-latin_latin-ext-regular.ttf"
-          ]
-        }
-      ]
+      fontName: "Roboto Mono"
     }
   }
 });

package/source/class/qx/theme/tangible/Image.js

@@ -24,11 +24,8 @@
 /**
  * Mapping class for all images used in the tangible theme.
  *
- * @asset(qx/iconfont/MaterialIcons/materialicons-v50.ttf)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v50.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v50.woff)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v50.eot)
  * @asset(qx/static/blank.png)
+ * @usefont(MaterialIcons)
  */
 
 qx.Class.define("qx.theme.tangible.Image", {

package/source/class/qx/tool/cli/Cli.js

@@ -36,6 +36,7 @@ qx.Class.define("qx.tool.cli.Cli", {
     if (qx.tool.cli.Cli.__instance) {
       throw new Error("qx.tool.cli.Cli has already been initialized!");
     }
+    this.__compileJsExists = false;
     qx.tool.cli.Cli.__instance = this;
     // include & register log appender
     qx.log.appender.NodeConsole;
@@ -189,6 +190,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           "Config",
           "Deploy",
           "Es6ify",
+          "ExportGlyphs",
           "Package",
           "Pkg", // alias for Package
           "Create",
@@ -326,6 +328,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
 
       let CompilerApi = qx.tool.cli.api.CompilerApi;
       if (await fs.existsAsync(compileJsFilename)) {
+        this.__compileJsExists = true;
         let compileJs = await this.__loadJs(compileJsFilename);
         this._compileJsFilename = compileJsFilename;
         if (compileJs.CompilerApi) {
@@ -608,6 +611,15 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       }
     },
 
+    /**
+     * Returns if the file compile.js exists
+     * 
+     * @returns {Boolean}
+     */
+    compileJsExists(){
+      return this.__compileJsExists;
+    },
+
     /**
      * Returns the CompilerApi instance
      *

package/source/class/qx/tool/cli/Watch.js

@@ -21,6 +21,9 @@ const fs = require("fs");
 const path = require("upath");
 const chokidar = require("chokidar");
 
+/**
+ * @ignore(setImmediate)
+ */
 qx.Class.define("qx.tool.cli.Watch", {
   extend: qx.core.Object,
 

package/source/class/qx/tool/cli/api/CompilerApi.js

@@ -33,6 +33,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
   construct() {
     super();
     this.__libraryApis = {};
+    this.__compileJsonExists = true;
     this.addListener("changeCommand", () => {
       this.afterCommandLoaded(this.getCommand());
     });
@@ -101,11 +102,18 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
       let config = {};
       if (await fs.existsAsync(compileJsonPath)) {
         config = await qx.tool.utils.Json.loadJsonAsync(compileJsonPath);
+      } else {
+        this.__compileJsonExists = false;
+        
       }
       this.setConfiguration(config);
       return super.load();
     },
 
+    compileJsonExists(){
+      return this.__compileJsonExists;
+    },
+
     /**
      * runs after the whole process is finished
      * @param cmd {qx.tool.cli.commands.Command} current command

package/source/class/qx/tool/cli/commands/Add.js

@@ -35,7 +35,7 @@ qx.Class.define("qx.tool.cli.commands.Add", {
 
           return yargs.demandCommand().showHelpOnFail().help();
         },
-        handler(argv) {}
+        handler() {}
       };
     }
   },

package/source/class/qx/tool/cli/commands/Compile.js

@@ -27,6 +27,7 @@ require("app-module-path").addPath(process.cwd() + "/node_modules");
 
 /**
  * Handles compilation of the project
+ * @ignore(setImmediate)
  */
 qx.Class.define("qx.tool.cli.commands.Compile", {
   extend: qx.tool.cli.commands.Command,
@@ -111,6 +112,11 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
         type: "string"
       },
 
+      "local-fonts": {
+        describe: "whether to prefer local font files over CDN",
+        type: "boolean"
+      },
+
       watch: {
         describe: "enables watching for changes and continuous compilation",
         type: "boolean",
@@ -531,6 +537,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
      * @return {Boolean} true if all makers succeeded
      */
     async _loadConfigAndStartMaking() {
+      if (!this.getCompilerApi().compileJsonExists() && !qx.tool.cli.Cli.getInstance().compileJsExists()) {
+        qx.tool.compiler.Console.error("Cannot find either compile.json nor compile.js");
+        process.exit(1);
+      }
       var config = this.getCompilerApi().getConfiguration();
       var makers = (this.__makers = await this.createMakersFromConfig(config));
       if (!makers || !makers.length) {
@@ -998,6 +1008,18 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         target.setUpdatePoFiles(this.argv.updatePoFiles);
         target.setLibraryPoPolicy(this.argv.libraryPo);
 
+        let fontsConfig = targetConfig.fonts || {};
+        let preferLocalFonts = true;
+
+        if (this.argv.localFonts !== undefined) {
+          preferLocalFonts = this.argv.localFonts;
+        } else if (fontsConfig.local !== undefined) {
+          preferLocalFonts = fontsConfig.local;
+        }
+        target.setPreferLocalFonts(preferLocalFonts);
+        if (fontsConfig.fontTypes !== undefined) {
+          target.setFontTypes(fontsConfig.fontTypes);
+        }
         // Take the command line for `minify` as most precedent only if provided
         var minify;
         if (process.argv.indexOf("--minify") > -1) {