@qooxdoo/framework 7.5.1 → 7.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Manifest.json +169 -44
- package/lib/compiler/compile-info.json +76 -68
- package/lib/compiler/index.js +3683 -2588
- package/lib/resource/qx/tool/schema/Manifest-1-0-0.json +79 -26
- package/lib/resource/qx/tool/schema/Manifest-2-0-0.json +17 -26
- package/lib/resource/qx/tool/schema/compile-1-0-0.json +40 -53
- package/package.json +2 -2
- package/source/class/qx/bom/Font.js +36 -0
- package/source/class/qx/bom/webfonts/Validator.js +31 -6
- package/source/class/qx/bom/webfonts/WebFont.js +60 -64
- package/source/class/qx/bom/webfonts/WebFontLoader.js +461 -0
- package/source/class/qx/core/Object.js +1 -1
- package/source/class/qx/data/Array.js +27 -0
- package/source/class/qx/dev/FakeServer.js +1 -1
- package/source/class/qx/event/handler/Focus.js +2 -1
- package/source/class/qx/event/handler/GestureCore.js +1 -1
- package/source/class/qx/test/bom/webfonts/Validator.js +0 -6
- package/source/class/qx/test/core/Environment.js +8 -8
- package/source/class/qx/test/core/Validation.js +2 -2
- package/source/class/qx/test/dev/unit/Requirements.js +6 -6
- package/source/class/qx/test/ui/basic/Image.js +3 -3
- package/source/class/qx/test/ui/basic/Label.js +0 -65
- package/source/class/qx/test/ui/form/Field.js +56 -52
- package/source/class/qx/theme/classic/Font.js +7 -23
- package/source/class/qx/theme/iconfont/LoadMaterialIcons.js +2 -4
- package/source/class/qx/theme/iconfont/LoadMaterialIconsOutlined.js +2 -4
- package/source/class/qx/theme/iconfont/LoadMaterialIconsRound.js +2 -4
- package/source/class/qx/theme/iconfont/LoadMaterialIconsSharp.js +2 -4
- package/source/class/qx/theme/iconfont/LoadMaterialIconsTwoTone.js +2 -4
- package/source/class/qx/theme/indigo/Font.js +8 -15
- package/source/class/qx/theme/manager/Font.js +151 -38
- package/source/class/qx/theme/modern/Font.js +1 -0
- package/source/class/qx/theme/simple/Font.js +3 -1
- package/source/class/qx/theme/tangible/Appearance.js +1 -0
- package/source/class/qx/theme/tangible/Font.js +9 -62
- package/source/class/qx/theme/tangible/Image.js +1 -4
- package/source/class/qx/tool/cli/Cli.js +12 -0
- package/source/class/qx/tool/cli/Watch.js +3 -0
- package/source/class/qx/tool/cli/api/CompilerApi.js +8 -0
- package/source/class/qx/tool/cli/commands/Add.js +1 -1
- package/source/class/qx/tool/cli/commands/Compile.js +22 -0
- package/source/class/qx/tool/cli/commands/Config.js +16 -141
- package/source/class/qx/tool/cli/commands/ExportGlyphs.js +134 -0
- package/source/class/qx/tool/cli/commands/Package.js +3 -0
- package/source/class/qx/tool/cli/commands/Pkg.js +1 -1
- package/source/class/qx/tool/cli/commands/config/Delete.js +47 -0
- package/source/class/qx/tool/cli/commands/config/Get.js +52 -0
- package/source/class/qx/tool/cli/commands/config/List.js +81 -0
- package/source/class/qx/tool/cli/commands/config/Set.js +61 -0
- package/source/class/qx/tool/cli/commands/package/Update.js +3 -3
- package/source/class/qx/tool/compiler/Analyser.js +45 -0
- package/source/class/qx/tool/compiler/ClassFile.js +41 -0
- package/source/class/qx/tool/compiler/Console.js +6 -1
- package/source/class/qx/tool/compiler/app/Application.js +19 -0
- package/source/class/qx/tool/compiler/app/Library.js +51 -2
- package/source/class/qx/tool/compiler/app/ManifestFont.js +181 -0
- package/source/class/qx/tool/compiler/app/WebFont.js +144 -234
- package/source/class/qx/tool/compiler/makers/AppMaker.js +13 -0
- package/source/class/qx/tool/compiler/resources/ImageLoader.js +22 -12
- package/source/class/qx/tool/compiler/resources/Manager.js +2 -2
- package/source/class/qx/tool/compiler/resources/MetaLoader.js +7 -2
- package/source/class/qx/tool/compiler/resources/ResourceLoader.js +21 -0
- package/source/class/qx/tool/compiler/targets/Target.js +186 -67
- package/source/class/qx/tool/migration/M7_5_6.js +75 -0
- package/source/class/qx/tool/utils/Http.js +69 -0
- package/source/class/qx/ui/basic/Label.js +20 -38
- package/source/class/qx/ui/form/AbstractField.js +8 -2
- package/source/class/qx/ui/form/FileSelectorButton.js +5 -0
- package/source/class/qx/ui/table/pane/FocusIndicator.js +5 -4
- package/source/class/qx/ui/table/pane/Pane.js +14 -0
- package/source/class/qx/ui/table/pane/Scroller.js +3 -3
- package/source/class/qx/ui/virtual/core/Scroller.js +8 -2
- package/source/class/qx/ui/window/Window.js +9 -8
- package/source/resource/qx/iconfont/MaterialIcons/materialicons.json +10912 -0
- package/source/resource/qx/iconfont/MaterialIcons/materialiconsoutlined.json +10967 -0
- package/source/resource/qx/iconfont/MaterialIcons/materialiconsround.json +10992 -0
- package/source/resource/qx/iconfont/MaterialIcons/materialiconssharp.json +10992 -0
- package/source/resource/qx/iconfont/MaterialIcons/materialiconstwotone.json +9947 -0
- package/source/resource/qx/iconfont/MaterialIcons/x.json +10967 -0
- package/source/resource/qx/iconfont/export-glyphs.sh +22 -0
- package/source/resource/qx/tool/schema/Manifest-1-0-0.json +79 -26
- package/source/resource/qx/tool/schema/Manifest-2-0-0.json +17 -26
- package/source/resource/qx/tool/schema/compile-1-0-0.json +40 -53
- package/source/class/qx/bom/webfonts/Manager.js +0 -652
- package/source/class/qx/test/bom/webfonts/Manager.js +0 -238
|
@@ -132,6 +132,27 @@ qx.Class.define("qx.data.Array", {
|
|
|
132
132
|
// private members
|
|
133
133
|
__array: null,
|
|
134
134
|
|
|
135
|
+
/**
|
|
136
|
+
* Returns an iterator, ie an object which follows the "Iterator Protocol" so that
|
|
137
|
+
* arrays can be used natively in `for...of`. See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols
|
|
138
|
+
*
|
|
139
|
+
* @returns {Iterator}
|
|
140
|
+
*/
|
|
141
|
+
iterator() {
|
|
142
|
+
let index = 0;
|
|
143
|
+
let array = this;
|
|
144
|
+
return {
|
|
145
|
+
next: () => {
|
|
146
|
+
if (index >= this.getLength()) {
|
|
147
|
+
return { done: true };
|
|
148
|
+
}
|
|
149
|
+
return {
|
|
150
|
+
value: this.getItem(index++)
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
};
|
|
154
|
+
},
|
|
155
|
+
|
|
135
156
|
/**
|
|
136
157
|
* Concatenates the current and the given array into a new one.
|
|
137
158
|
*
|
|
@@ -1133,5 +1154,11 @@ qx.Class.define("qx.data.Array", {
|
|
|
1133
1154
|
}
|
|
1134
1155
|
|
|
1135
1156
|
this.__array = null;
|
|
1157
|
+
},
|
|
1158
|
+
|
|
1159
|
+
defer(statics) {
|
|
1160
|
+
statics.prototype[Symbol.iterator] = function () {
|
|
1161
|
+
return this.iterator();
|
|
1162
|
+
};
|
|
1136
1163
|
}
|
|
1137
1164
|
});
|
|
@@ -227,7 +227,7 @@ qx.Bootstrap.define("qx.dev.FakeServer", {
|
|
|
227
227
|
if (!this.__fakeServer) {
|
|
228
228
|
var sinon = (this.__sinon = qx.dev.unit.Sinon.getSinon());
|
|
229
229
|
sinon.FakeXMLHttpRequest.useFilters = true;
|
|
230
|
-
this.__fakeServer = sinon.
|
|
230
|
+
this.__fakeServer = sinon.useFakeServer();
|
|
231
231
|
this.__fakeServer.autoRespond = true;
|
|
232
232
|
}
|
|
233
233
|
return this.__fakeServer;
|
|
@@ -65,6 +65,7 @@ qx.Class.define("qx.event.handler.Focus", {
|
|
|
65
65
|
if (
|
|
66
66
|
qx.core.Environment.get("os.name") == "ios" &&
|
|
67
67
|
parseFloat(qx.core.Environment.get("os.version")) > 6 &&
|
|
68
|
+
parseFloat(qx.core.Environment.get("os.version")) < 15 &&
|
|
68
69
|
(!qx.application.Inline ||
|
|
69
70
|
!qx.core.Init.getApplication() instanceof qx.application.Inline)
|
|
70
71
|
) {
|
|
@@ -1512,7 +1513,7 @@ qx.Class.define("qx.event.handler.Focus", {
|
|
|
1512
1513
|
if (value) {
|
|
1513
1514
|
this.__fireEvent(value, old, "activate", true);
|
|
1514
1515
|
}
|
|
1515
|
-
// correct scroll position for iOS 7
|
|
1516
|
+
// correct scroll position for iOS 7 to 14 [ISSUE #9393 and #10565]
|
|
1516
1517
|
if (this.__needsScrollFix) {
|
|
1517
1518
|
window.scrollTo(0, 0);
|
|
1518
1519
|
}
|
|
@@ -472,7 +472,7 @@ qx.Bootstrap.define("qx.event.handler.GestureCore", {
|
|
|
472
472
|
if (
|
|
473
473
|
(Math.abs(deltaY) < 1 && Math.abs(deltaX) < 1) ||
|
|
474
474
|
this.__stopMomentum[oldTimeoutId] ||
|
|
475
|
-
!this.getWindow()
|
|
475
|
+
(this.getWindow && !this.getWindow())
|
|
476
476
|
) {
|
|
477
477
|
delete this.__stopMomentum[oldTimeoutId];
|
|
478
478
|
delete this.__momentum[domEvent.pointerId];
|
|
@@ -20,7 +20,6 @@ qx.Class.define("qx.test.bom.webfonts.Validator", {
|
|
|
20
20
|
|
|
21
21
|
members: {
|
|
22
22
|
setUp() {
|
|
23
|
-
this.__nodesBefore = document.body.childNodes.length;
|
|
24
23
|
this.require(["webFontSupport"]);
|
|
25
24
|
this.__val = new qx.bom.webfonts.Validator();
|
|
26
25
|
},
|
|
@@ -31,11 +30,6 @@ qx.Class.define("qx.test.bom.webfonts.Validator", {
|
|
|
31
30
|
delete this.__val;
|
|
32
31
|
}
|
|
33
32
|
qx.bom.webfonts.Validator.removeDefaultHelperElements();
|
|
34
|
-
this.assertEquals(
|
|
35
|
-
this.__nodesBefore,
|
|
36
|
-
document.body.childNodes.length,
|
|
37
|
-
"Validator did not clean up correctly!"
|
|
38
|
-
);
|
|
39
33
|
},
|
|
40
34
|
|
|
41
35
|
testValidFont() {
|
|
@@ -156,25 +156,25 @@ qx.Class.define("qx.test.core.Environment", {
|
|
|
156
156
|
},
|
|
157
157
|
|
|
158
158
|
testAddFunction() {
|
|
159
|
-
qx.core.Environment.add("affe", function () {
|
|
159
|
+
qx.core.Environment.add("qx.test.core.Environment.affe", function () {
|
|
160
160
|
return "AFFE";
|
|
161
161
|
});
|
|
162
162
|
|
|
163
|
-
this.assertEquals("AFFE", qx.core.Environment.get("affe"));
|
|
163
|
+
this.assertEquals("AFFE", qx.core.Environment.get("qx.test.core.Environment.affe"));
|
|
164
164
|
|
|
165
165
|
// clear the check
|
|
166
|
-
delete qx.core.Environment.getChecks()["affe"];
|
|
167
|
-
qx.core.Environment.invalidateCacheKey("affe");
|
|
166
|
+
delete qx.core.Environment.getChecks()["qx.test.core.Environment.affe"];
|
|
167
|
+
qx.core.Environment.invalidateCacheKey("qx.test.core.Environment.affe");
|
|
168
168
|
},
|
|
169
169
|
|
|
170
170
|
testAddValue() {
|
|
171
|
-
qx.core.Environment.add("affe", "AFFE");
|
|
171
|
+
qx.core.Environment.add("qx.test.core.Environment.affe", "AFFE");
|
|
172
172
|
|
|
173
|
-
this.assertEquals("AFFE", qx.core.Environment.get("affe"));
|
|
173
|
+
this.assertEquals("AFFE", qx.core.Environment.get("qx.test.core.Environment.affe"));
|
|
174
174
|
|
|
175
175
|
// clear the check
|
|
176
|
-
delete qx.core.Environment.getChecks()["affe"];
|
|
177
|
-
qx.core.Environment.invalidateCacheKey("affe");
|
|
176
|
+
delete qx.core.Environment.getChecks()["qx.test.core.Environment.affe"];
|
|
177
|
+
qx.core.Environment.invalidateCacheKey("qx.test.core.Environment.affe");
|
|
178
178
|
},
|
|
179
179
|
|
|
180
180
|
testAddAsyncFunction() {
|
|
@@ -33,7 +33,7 @@ qx.Class.define("qx.test.core.Validation", {
|
|
|
33
33
|
custom: {
|
|
34
34
|
init: "Some String",
|
|
35
35
|
check: "String",
|
|
36
|
-
validate: "
|
|
36
|
+
validate: "_validateCustom"
|
|
37
37
|
},
|
|
38
38
|
|
|
39
39
|
number: {
|
|
@@ -78,7 +78,7 @@ qx.Class.define("qx.test.core.Validation", {
|
|
|
78
78
|
},
|
|
79
79
|
|
|
80
80
|
members: {
|
|
81
|
-
|
|
81
|
+
_validateCustom(value) {
|
|
82
82
|
// if the length is lower than 4
|
|
83
83
|
if (value.length < 4) {
|
|
84
84
|
throw new qx.core.ValidationError(
|
|
@@ -57,30 +57,30 @@ qx.Class.define("qx.test.dev.unit.Requirements", {
|
|
|
57
57
|
},
|
|
58
58
|
|
|
59
59
|
testEnvironmentPass() {
|
|
60
|
-
qx.core.Environment.add("qx.test.
|
|
60
|
+
qx.core.Environment.add("qx.test.dev.unit.Requirements.syncTrue", function () {
|
|
61
61
|
return true;
|
|
62
62
|
});
|
|
63
63
|
|
|
64
64
|
try {
|
|
65
|
-
this.require(["fulfilledReq", "qx.test.
|
|
65
|
+
this.require(["fulfilledReq", "qx.test.dev.unit.Requirements.syncTrue"]);
|
|
66
66
|
} catch (ex) {
|
|
67
67
|
this.fail("Check for environment key failed!");
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
delete qx.core.Environment.getChecks()["qx.test.
|
|
70
|
+
delete qx.core.Environment.getChecks()["qx.test.dev.unit.Requirements.syncTrue"];
|
|
71
71
|
},
|
|
72
72
|
|
|
73
73
|
testEnvironmentFail() {
|
|
74
|
-
qx.core.Environment.add("qx.test.
|
|
74
|
+
qx.core.Environment.add("qx.test.dev.unit.Requirements.syncFalse", function () {
|
|
75
75
|
return false;
|
|
76
76
|
});
|
|
77
77
|
|
|
78
78
|
var self = this;
|
|
79
79
|
this.assertException(function () {
|
|
80
|
-
self.require(["fulfilledReq", "qx.test.
|
|
80
|
+
self.require(["fulfilledReq", "qx.test.dev.unit.Requirements.syncFalse"]);
|
|
81
81
|
}, qx.dev.unit.RequirementError);
|
|
82
82
|
|
|
83
|
-
delete qx.core.Environment.getChecks()["qx.test.
|
|
83
|
+
delete qx.core.Environment.getChecks()["qx.test.dev.unit.Requirements.syncFalse"];
|
|
84
84
|
},
|
|
85
85
|
|
|
86
86
|
testEnvironmentAsync() {
|
|
@@ -556,10 +556,10 @@ qx.Class.define("qx.test.ui.basic.Image", {
|
|
|
556
556
|
lineHeight: 1,
|
|
557
557
|
comparisonString: "\uf1e3\uf1f7\uf11b\uf19d",
|
|
558
558
|
family: ["FontAwesome"],
|
|
559
|
-
|
|
559
|
+
fontFaces: [
|
|
560
560
|
{
|
|
561
|
-
|
|
562
|
-
|
|
561
|
+
fontFamily: "FontAwesome",
|
|
562
|
+
paths: [
|
|
563
563
|
"qx/test/webfonts/fontawesome-webfont.ttf",
|
|
564
564
|
"qx/test/webfonts/fontawesome-webfont.woff"
|
|
565
565
|
]
|
|
@@ -41,8 +41,6 @@ qx.Class.define("qx.test.ui.basic.Label", {
|
|
|
41
41
|
tearDown() {
|
|
42
42
|
super.tearDown();
|
|
43
43
|
this.getSandbox().restore();
|
|
44
|
-
qx.bom.webfonts.Manager.getInstance().dispose();
|
|
45
|
-
delete qx.bom.webfonts.Manager.$$instance;
|
|
46
44
|
},
|
|
47
45
|
|
|
48
46
|
testHeightForWidth() {
|
|
@@ -164,69 +162,6 @@ qx.Class.define("qx.test.ui.basic.Label", {
|
|
|
164
162
|
l.dispose();
|
|
165
163
|
},
|
|
166
164
|
|
|
167
|
-
testApplyWebFont() {
|
|
168
|
-
this.require(["webFontSupport"]);
|
|
169
|
-
var l = new qx.ui.basic.Label("Laugh while you can, monkey boy!");
|
|
170
|
-
|
|
171
|
-
var f = new qx.bom.webfonts.WebFont();
|
|
172
|
-
f.set({
|
|
173
|
-
size: 18,
|
|
174
|
-
family: ["monospace"],
|
|
175
|
-
sources: [
|
|
176
|
-
{
|
|
177
|
-
family: "FinelinerScriptRegular",
|
|
178
|
-
source: [
|
|
179
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
180
|
-
"qx/test/webfonts/fineliner_script-webfont.woff"
|
|
181
|
-
),
|
|
182
|
-
|
|
183
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
184
|
-
"qx/test/webfonts/fineliner_script-webfont.ttf"
|
|
185
|
-
),
|
|
186
|
-
|
|
187
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
188
|
-
"qx/test/webfonts/fineliner_script-webfont.eot"
|
|
189
|
-
)
|
|
190
|
-
]
|
|
191
|
-
},
|
|
192
|
-
|
|
193
|
-
{
|
|
194
|
-
family: "YanoneKaffeesatzRegular",
|
|
195
|
-
source: [
|
|
196
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
197
|
-
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.woff"
|
|
198
|
-
),
|
|
199
|
-
|
|
200
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
201
|
-
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.ttf"
|
|
202
|
-
),
|
|
203
|
-
|
|
204
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
205
|
-
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.eot"
|
|
206
|
-
)
|
|
207
|
-
]
|
|
208
|
-
}
|
|
209
|
-
]
|
|
210
|
-
});
|
|
211
|
-
|
|
212
|
-
var statusChangeSpy = this.spy(l, "_onWebFontStatusChange");
|
|
213
|
-
l.setFont(f);
|
|
214
|
-
|
|
215
|
-
qx.event.Timer.once(
|
|
216
|
-
function () {
|
|
217
|
-
this.resume(function () {
|
|
218
|
-
l.dispose();
|
|
219
|
-
f.dispose();
|
|
220
|
-
this.assertCalledTwice(statusChangeSpy);
|
|
221
|
-
}, this);
|
|
222
|
-
},
|
|
223
|
-
this,
|
|
224
|
-
4000
|
|
225
|
-
);
|
|
226
|
-
|
|
227
|
-
this.wait(8000);
|
|
228
|
-
},
|
|
229
|
-
|
|
230
165
|
testApplyFontColorAndTextColor() {
|
|
231
166
|
var font1 = new qx.bom.Font();
|
|
232
167
|
font1.setColor("#FF0000");
|
|
@@ -43,8 +43,6 @@ qx.Class.define("qx.test.ui.form.Field", {
|
|
|
43
43
|
|
|
44
44
|
tearDown() {
|
|
45
45
|
this.getSandbox().restore();
|
|
46
|
-
qx.bom.webfonts.Manager.getInstance().dispose();
|
|
47
|
-
delete qx.bom.webfonts.Manager.$$instance;
|
|
48
46
|
},
|
|
49
47
|
|
|
50
48
|
testSelectTextAllBeforeFlush() {
|
|
@@ -155,63 +153,69 @@ qx.Class.define("qx.test.ui.form.Field", {
|
|
|
155
153
|
this.require(["webFontSupport"]);
|
|
156
154
|
var tf = new qx.ui.form.TextField("Laugh while you can, monkey boy!");
|
|
157
155
|
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
sources: [
|
|
163
|
-
{
|
|
164
|
-
family: "FinelinerScriptRegular",
|
|
165
|
-
source: [
|
|
166
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
167
|
-
"qx/test/webfonts/fineliner_script-webfont.woff"
|
|
168
|
-
),
|
|
169
|
-
|
|
170
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
171
|
-
"qx/test/webfonts/fineliner_script-webfont.ttf"
|
|
172
|
-
),
|
|
173
|
-
|
|
174
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
175
|
-
"qx/test/webfonts/fineliner_script-webfont.eot"
|
|
176
|
-
)
|
|
177
|
-
]
|
|
178
|
-
},
|
|
179
|
-
|
|
180
|
-
{
|
|
181
|
-
family: "YanoneKaffeesatzRegular",
|
|
182
|
-
source: [
|
|
183
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
184
|
-
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.woff"
|
|
185
|
-
),
|
|
186
|
-
|
|
187
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
188
|
-
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.ttf"
|
|
189
|
-
),
|
|
190
|
-
|
|
191
|
-
qx.util.ResourceManager.getInstance().toUri(
|
|
192
|
-
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.eot"
|
|
193
|
-
)
|
|
194
|
-
]
|
|
195
|
-
}
|
|
196
|
-
]
|
|
197
|
-
});
|
|
156
|
+
let loader = qx.bom.webfonts.WebFontLoader.getLoader(
|
|
157
|
+
"FinelinerScriptRegular",
|
|
158
|
+
true
|
|
159
|
+
);
|
|
198
160
|
|
|
199
|
-
|
|
200
|
-
|
|
161
|
+
loader.setFontFaces([
|
|
162
|
+
{
|
|
163
|
+
fontFamily: "FinelinerScriptRegular",
|
|
164
|
+
paths: [
|
|
165
|
+
qx.util.ResourceManager.getInstance().toUri(
|
|
166
|
+
"qx/test/webfonts/fineliner_script-webfont.woff"
|
|
167
|
+
),
|
|
168
|
+
|
|
169
|
+
qx.util.ResourceManager.getInstance().toUri(
|
|
170
|
+
"qx/test/webfonts/fineliner_script-webfont.ttf"
|
|
171
|
+
),
|
|
172
|
+
|
|
173
|
+
qx.util.ResourceManager.getInstance().toUri(
|
|
174
|
+
"qx/test/webfonts/fineliner_script-webfont.eot"
|
|
175
|
+
)
|
|
176
|
+
]
|
|
177
|
+
},
|
|
201
178
|
|
|
202
|
-
|
|
203
|
-
|
|
179
|
+
{
|
|
180
|
+
fontFamily: "YanoneKaffeesatzRegular",
|
|
181
|
+
paths: [
|
|
182
|
+
qx.util.ResourceManager.getInstance().toUri(
|
|
183
|
+
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.woff"
|
|
184
|
+
),
|
|
185
|
+
|
|
186
|
+
qx.util.ResourceManager.getInstance().toUri(
|
|
187
|
+
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.ttf"
|
|
188
|
+
),
|
|
189
|
+
|
|
190
|
+
qx.util.ResourceManager.getInstance().toUri(
|
|
191
|
+
"qx/test/webfonts/yanonekaffeesatz-regular-webfont.eot"
|
|
192
|
+
)
|
|
193
|
+
]
|
|
194
|
+
}
|
|
195
|
+
]);
|
|
196
|
+
|
|
197
|
+
loader.load().then(() => {
|
|
198
|
+
var f = new qx.bom.webfonts.WebFont();
|
|
199
|
+
f.set({
|
|
200
|
+
size: 18,
|
|
201
|
+
family: ["FinelinerScriptRegular", "monospace"]
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
f.addListener("changeValid", () => {
|
|
204
205
|
this.resume(function () {
|
|
205
206
|
tf.dispose();
|
|
206
207
|
f.dispose();
|
|
207
|
-
this.
|
|
208
|
+
this.assertCalledOnce(statusChangeSpy);
|
|
208
209
|
}, this);
|
|
209
|
-
}
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
210
|
+
});
|
|
211
|
+
|
|
212
|
+
f.loadComplete();
|
|
213
|
+
|
|
214
|
+
var statusChangeSpy = this.spy(tf, "_onWebFontStatusChange");
|
|
215
|
+
tf.setFont(f);
|
|
216
|
+
});
|
|
213
217
|
|
|
214
|
-
this.wait(
|
|
218
|
+
this.wait(30000);
|
|
215
219
|
}
|
|
216
220
|
}
|
|
217
221
|
});
|
|
@@ -19,51 +19,35 @@
|
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
21
|
* The classic qooxdoo font theme.
|
|
22
|
+
*
|
|
23
|
+
* @usefont(qx.theme.classic.defaultFont)
|
|
24
|
+
* @usefont(qx.theme.monospace)
|
|
22
25
|
*/
|
|
23
26
|
qx.Theme.define("qx.theme.classic.Font", {
|
|
24
27
|
fonts: {
|
|
25
28
|
default: {
|
|
26
29
|
size: 11,
|
|
27
30
|
lineHeight: 1.4,
|
|
28
|
-
|
|
29
|
-
"Lucida Grande",
|
|
30
|
-
"Tahoma",
|
|
31
|
-
"Verdana",
|
|
32
|
-
"Bitstream Vera Sans",
|
|
33
|
-
"Liberation Sans"
|
|
34
|
-
]
|
|
31
|
+
fontName: "qx.theme.classic.defaultFont"
|
|
35
32
|
},
|
|
36
33
|
|
|
37
34
|
bold: {
|
|
38
35
|
size: 11,
|
|
39
36
|
lineHeight: 1.4,
|
|
40
|
-
|
|
41
|
-
"Lucida Grande",
|
|
42
|
-
"Tahoma",
|
|
43
|
-
"Verdana",
|
|
44
|
-
"Bitstream Vera Sans",
|
|
45
|
-
"Liberation Sans"
|
|
46
|
-
],
|
|
47
|
-
|
|
37
|
+
fontName: "qx.theme.classic.defaultFont",
|
|
48
38
|
bold: true
|
|
49
39
|
},
|
|
50
40
|
|
|
51
41
|
small: {
|
|
52
42
|
size: 10,
|
|
53
43
|
lineHeight: 1.4,
|
|
54
|
-
|
|
55
|
-
"Lucida Grande",
|
|
56
|
-
"Tahoma",
|
|
57
|
-
"Verdana",
|
|
58
|
-
"Bitstream Vera Sans",
|
|
59
|
-
"Liberation Sans"
|
|
60
|
-
]
|
|
44
|
+
fontName: "qx.theme.classic.defaultFont"
|
|
61
45
|
},
|
|
62
46
|
|
|
63
47
|
monospace: {
|
|
64
48
|
size: 11,
|
|
65
49
|
lineHeight: 1.4,
|
|
66
|
-
|
|
50
|
+
fontName: "qx.theme.monospace"
|
|
67
51
|
}
|
|
68
52
|
}
|
|
69
53
|
});
|
|
@@ -20,9 +20,7 @@
|
|
|
20
20
|
* A dummy class to trigger the compiler to copy the MaterialIcons font files
|
|
21
21
|
*/
|
|
22
22
|
/**
|
|
23
|
-
* @
|
|
24
|
-
* @
|
|
25
|
-
* @asset(qx/iconfont/MaterialIcons/materialicons-v126.woff)
|
|
26
|
-
* @asset(qx/iconfont/MaterialIcons/materialicons-v126.eot)
|
|
23
|
+
* @usefont(MaterialIcons)
|
|
24
|
+
* @deprecated use the `@usefont` directive directly in your code
|
|
27
25
|
*/
|
|
28
26
|
qx.Class.define("qx.theme.iconfont.LoadMaterialIcons", {});
|
|
@@ -20,9 +20,7 @@
|
|
|
20
20
|
* A dummy class to trigger the compiler to copy the MaterialIconsOutlined font files
|
|
21
21
|
*/
|
|
22
22
|
/**
|
|
23
|
-
* @
|
|
24
|
-
* @
|
|
25
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.woff)
|
|
26
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.eot)
|
|
23
|
+
* @usefont(MaterialIconsOutlined)
|
|
24
|
+
* @deprecated use the `@usefont` directive directly in your code
|
|
27
25
|
*/
|
|
28
26
|
qx.Class.define("qx.theme.iconfont.LoadMaterialIconsOutlined", {});
|
|
@@ -20,9 +20,7 @@
|
|
|
20
20
|
* A dummy class to trigger the compiler to copy the MaterialIconsRound font files
|
|
21
21
|
*/
|
|
22
22
|
/**
|
|
23
|
-
* @
|
|
24
|
-
* @
|
|
25
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.woff)
|
|
26
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.eot)
|
|
23
|
+
* @usefont(MaterialIconsRound)
|
|
24
|
+
* @deprecated use the `@usefont` directive directly in your code
|
|
27
25
|
*/
|
|
28
26
|
qx.Class.define("qx.theme.iconfont.LoadMaterialIconsRound", {});
|
|
@@ -20,9 +20,7 @@
|
|
|
20
20
|
* A dummy class to trigger the compiler to copy the MaterialIconsSharpe font files
|
|
21
21
|
*/
|
|
22
22
|
/**
|
|
23
|
-
* @
|
|
24
|
-
* @
|
|
25
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.woff)
|
|
26
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.eot)
|
|
23
|
+
* @usefont(MaterialIconsSharp)
|
|
24
|
+
* @deprecated use the `@usefont` directive directly in your code
|
|
27
25
|
*/
|
|
28
26
|
qx.Class.define("qx.theme.iconfont.LoadMaterialIconsSharp", {});
|
|
@@ -20,9 +20,7 @@
|
|
|
20
20
|
* A dummy class to trigger the compiler to copy the MaterialIconsTwoTone font files
|
|
21
21
|
*/
|
|
22
22
|
/**
|
|
23
|
-
* @
|
|
24
|
-
* @
|
|
25
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.woff)
|
|
26
|
-
* @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.eot)
|
|
23
|
+
* @usefont(MaterialIconsTwoTone)
|
|
24
|
+
* @deprecated use the `@usefont` directive directly in your code
|
|
27
25
|
*/
|
|
28
26
|
qx.Class.define("qx.theme.iconfont.LoadMaterialIconsTwoTone", {});
|
|
@@ -24,21 +24,22 @@
|
|
|
24
24
|
/**
|
|
25
25
|
* The simple qooxdoo font theme.
|
|
26
26
|
*
|
|
27
|
-
* @
|
|
28
|
-
* @
|
|
27
|
+
* @usefont(JosefinSlab)
|
|
28
|
+
* @usefont(qx.theme.indigo.defaultFont)
|
|
29
|
+
* @usefont(qx.theme.monospace)
|
|
29
30
|
*/
|
|
30
31
|
qx.Theme.define("qx.theme.indigo.Font", {
|
|
31
32
|
fonts: {
|
|
32
33
|
default: {
|
|
33
34
|
size: 12,
|
|
34
|
-
|
|
35
|
+
fontName: "qx.theme.indigo.defaultFont",
|
|
35
36
|
color: "font",
|
|
36
37
|
lineHeight: 1.8
|
|
37
38
|
},
|
|
38
39
|
|
|
39
40
|
bold: {
|
|
40
41
|
size: 12,
|
|
41
|
-
|
|
42
|
+
fontName: "qx.theme.indigo.defaultFont",
|
|
42
43
|
bold: true,
|
|
43
44
|
color: "font",
|
|
44
45
|
lineHeight: 1.8
|
|
@@ -47,27 +48,19 @@ qx.Theme.define("qx.theme.indigo.Font", {
|
|
|
47
48
|
headline: {
|
|
48
49
|
size: 22,
|
|
49
50
|
family: ["serif"],
|
|
50
|
-
|
|
51
|
-
{
|
|
52
|
-
family: "JosefinSlab",
|
|
53
|
-
source: [
|
|
54
|
-
"qx/decoration/Indigo/font/JosefinSlab-SemiBold.woff",
|
|
55
|
-
"qx/decoration/Indigo/font/JosefinSlab-SemiBold.ttf"
|
|
56
|
-
]
|
|
57
|
-
}
|
|
58
|
-
]
|
|
51
|
+
fontName: "JosefinSlab"
|
|
59
52
|
},
|
|
60
53
|
|
|
61
54
|
small: {
|
|
62
55
|
size: 11,
|
|
63
|
-
|
|
56
|
+
fontName: "qx.theme.indigo.defaultFont",
|
|
64
57
|
color: "font",
|
|
65
58
|
lineHeight: 1.8
|
|
66
59
|
},
|
|
67
60
|
|
|
68
61
|
monospace: {
|
|
69
62
|
size: 11,
|
|
70
|
-
|
|
63
|
+
fontName: "qx.theme.monospace",
|
|
71
64
|
color: "font",
|
|
72
65
|
lineHeight: 1.8
|
|
73
66
|
}
|