Skip to content

Commit 3da5076

Browse files
hkollmannhkollmann
committed
move to 6.0.0
lint
1 parent 2b5b5b9 commit 3da5076

File tree

6 files changed

+55
-39
lines changed

6 files changed

+55
-39
lines changed

‎Manifest.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@
2828
"translation": "source/translation"
2929
},
3030
"requires": {
31-
"@qooxdoo/framework": "^6.0.0-beta",
32-
"@qooxdoo/compiler": "^1.0.0-beta",
33-
"qooxdoo/qxl.logpane": "^1.0.0-beta.0",
34-
"qooxdoo/qxl.versionlabel": "^1.0.0-beta.0",
35-
"maettu/qx-showdown": "^1.8.7"
31+
"@qooxdoo/framework": "^6.0.0",
32+
"@qooxdoo/compiler": "^1.0.0"
3633
}
3734
}

‎compile.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
22
"$schema": "https://qooxdoo.org/schema/compile-1-0-0.json",
3-
"targets": [
4-
{
3+
"targets": [{
54
"type": "source",
65
"outputPath": "compiled/source",
76
"bundle": {
87
"include": "qx.*"
98
}
10-
},
11-
{
9+
}, {
1210
"type": "build",
1311
"outputPath": "compiled/build"
1412
}
@@ -17,14 +15,19 @@
1715
"locales": ["en"],
1816

1917
"environment": {
20-
"qxl.packagebrowser.cache-url" : "https://raw.githubusercontent.com/qooxdoo/qx-contrib/master/cache.json"
18+
"qxl.packagebrowser.cache-url": "https://raw.githubusercontent.com/qooxdoo/qx-contrib/master/cache.json"
2119
},
22-
"applications": [
23-
{
20+
"applications": [{
2421
"title": "Qooxdoo Package Browser",
2522
"class": "qxl.packagebrowser.Application",
2623
"theme": "qxl.packagebrowser.Theme",
2724
"name": "qxl.packagebrowser"
2825
}
29-
]
26+
],
27+
"eslintConfig": {
28+
"parserOptions": {
29+
"ecmaVersion": 2018
30+
}
31+
}
32+
3033
}

‎qx-lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"libraries": [
33
{
44
"library_name": "logpane",
5-
"library_version": "1.0.0",
6-
"path": "qx_packages/qooxdoo_qxl_logpane_v1_0_0",
5+
"library_version": "1.0.2",
6+
"path": "qx_packages/qooxdoo_qxl_logpane_v1_0_2",
77
"uri": "qooxdoo/qxl.logpane",
88
"repo_name": "qooxdoo/qxl.logpane",
9-
"repo_tag": "v1.0.0"
9+
"repo_tag": "v1.0.2"
1010
},
1111
{
1212
"library_name": "versionlabel",
13-
"library_version": "1.0.0",
14-
"path": "qx_packages/qooxdoo_qxl_versionlabel_v1_0_0",
13+
"library_version": "1.0.4",
14+
"path": "qx_packages/qooxdoo_qxl_versionlabel_v1_0_4",
1515
"uri": "qooxdoo/qxl.versionlabel",
1616
"repo_name": "qooxdoo/qxl.versionlabel",
17-
"repo_tag": "v1.0.0"
17+
"repo_tag": "v1.0.4"
1818
},
1919
{
2020
"library_name": "qxShowdown",

‎source/class/qxl/packagebrowser/PackageBrowser.js‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@
5656
* @asset(qxl/packagebrowser/icon/github-16x16.png)
5757
*
5858
* @ignore(location.*)
59+
* @ignore(showdown)
5960
* @ignore(qx.$$appRoot)
6061
*/
62+
/* global showdown */
6163
qx.Class.define("qxl.packagebrowser.PackageBrowser", {
6264
extend: qx.ui.container.Composite,
6365

@@ -77,7 +79,6 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
7779
},
7880

7981
construct: function () {
80-
8182
qxShowdown.Load;
8283
this.base(arguments);
8384

@@ -254,8 +255,8 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
254255

255256
// -- documentaton
256257
var docButton = new qx.ui.toolbar.Button(this.tr("Documentation"), "icon/22/apps/internet-web-browser.png");
257-
docButton.addListener("execute",() => {
258-
window.open('https://www.qooxdoo.org/docs/#/cli/packages');
258+
docButton.addListener("execute", () => {
259+
window.open("https://www.qooxdoo.org/docs/#/cli/packages");
259260
}, this);
260261
docButton.setToolTipText("Open package system documentation");
261262
bar.add(docButton);
@@ -501,7 +502,6 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
501502
leftReloadTree: function (e) {
502503
this._sampleToTreeNodeMap = {};
503504
var _sampleToTreeNodeMap = this._sampleToTreeNodeMap;
504-
var _initialSection = null;
505505
var _initialNode = null;
506506

507507
// set a section to open initially
@@ -584,15 +584,14 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
584584

585585
// -- Main --------------------------------
586586
var ttree = this.tests.handler.ttree;
587-
var that = this;
588587

589588
// Handle current Tree Selection and Content
590589
this.tree.setUserData("modelLink", ttree); // link top level widgets and model
591590

592591
this.tree.getRoot().setOpen(true);
593592
buildSubTree(this.tree.getRoot(), ttree);
594593

595-
if (_initialNode != null) {
594+
if (_initialNode !== null) {
596595
this.updateIframe(_initialNode);
597596
} else {
598597
this.tree.setSelection([this.tree.getRoot()]);
@@ -673,13 +672,15 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
673672
case "problems":
674673
html = this.__getProblemsHtml(modelNode);
675674
break;
676-
default:
675+
default: {
677676
let children = modelNode.getChildren();
678677
if (Array.isArray(children) && children.length && children[0].type === "library") {
678+
/* eslint-disable-next-line consistent-return */
679679
return this.updateIframe(children[0]);
680680
}
681681
state = modelNode.pwd().slice(1).concat([modelNode.label]).join("/");
682682
url = this.welcomeUrl;
683+
}
683684
}
684685
} else if (!url) {
685686
url = this.welcomeUrl;
@@ -749,10 +750,18 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
749750
const repo_url = "https://github.com/" + modelNode.uri.split(/\//).slice(0, 2).join("/");
750751
const display = v => v ? "" : "display:none";
751752

753+
/**
754+
* @param {...any} args
755+
*/
752756
function createTableRow(...args) {
753757
return "<tr>" + args.map(arg => `<td>${arg}</td>`).join("") + "</tr>";
754758
}
755759

760+
/**
761+
* @param href
762+
* @param linktext
763+
* @param target
764+
*/
756765
function createAnchor(href, linktext, target="_blank") {
757766
return `<a href="${href}" ${target ? "target=\"" + target + "\"" : ""}>${linktext || href}</a>`;
758767
}
@@ -761,6 +770,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
761770
if (!pkg_uri.startsWith("@") && !pkg_uri.startsWith("qooxdoo-")) {
762771
return createTableRow(createAnchor(`javascript:void(top.location.hash='${pkg_uri.replace("/", "~")}~library')`, pkg_uri), range);
763772
}
773+
return null;
764774
}).filter(v => Boolean(v));
765775
let html = `
766776
<h1>${lib.info.name}</h1>
@@ -771,7 +781,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
771781
${createTableRow("Authors:", this.__getAuthorsHtml(lib.info.authors))}
772782
${createTableRow("Homepage:", createAnchor(lib.info.homepage))}
773783
${createTableRow("Repository:", createAnchor(repo_url))}
774-
${createTableRow("Issues:", createAnchor(this.__getNewIssueUrl(modelNode.uri), "List of issues") + " | " + createAnchor(this.__getNewIssueUrl(modelNode.uri,true), "Create new issue"))}
784+
${createTableRow("Issues:", createAnchor(this.__getNewIssueUrl(modelNode.uri), "List of issues") + " | " + createAnchor(this.__getNewIssueUrl(modelNode.uri, true), "Create new issue"))}
775785
${createTableRow("Keywords:", this.__getKeywordssHtml(lib.info.keywords || []))}
776786
</table>
777787
<h2 style="${display(lib.info.description)}">Description</h2>
@@ -808,7 +818,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
808818
},
809819

810820
__getNewIssueUrl(uri, newIssue=false) {
811-
uri = uri.split("/").slice(0,2).join("/");
821+
uri = uri.split("/").slice(0, 2).join("/");
812822
return `https://github.com/${uri}/issues${newIssue ? "/new" : ""}`;
813823
},
814824

@@ -839,7 +849,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
839849
The package author should run <span class="code">qx package migrate</span>
840850
in the root folder of this package, follow the instructions, and
841851
release a new version of the package.</p>`;
842-
log = log.replace(migrateSignal,"");
852+
log = log.replace(migrateSignal, "");
843853
}
844854
const newIssueBody = [
845855
`Compiling package '${info.name}' with the following environment:`, "",
@@ -899,7 +909,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
899909
result.push(line.replace(explanation.regex, explanation.description));
900910
}
901911
return result;
902-
},[]);
912+
}, []);
903913
if (explainMessages.length) {
904914
html += `<h2>Explanation</h2>
905915
<ul><li>${explainMessages.join("</li><li>")}</li></ul>`;
@@ -918,7 +928,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
918928
const appsHtml = children.map(childNode => {
919929
const hash = childNode.pwd().slice(1).concat([childNode.label]).join("~");
920930
return `<a href="javascript:void(top.location.hash='${hash}')"><h2>${childNode.label}</h2></a>` +
921-
(childNode.description ? `<p>${childNode.description}</p>` : "")
931+
(childNode.description ? `<p>${childNode.description}</p>` : "");
922932
}
923933
).join("\n");
924934
return `<h1>Demo Applications</h1>
@@ -958,8 +968,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
958968
},
959969

960970
async __getReleasesHtml(modelNode, treeNode) {
961-
962-
let uri = modelNode.uri.split("/").slice(0,2).join("/");
971+
let uri = modelNode.uri.split("/").slice(0, 2).join("/");
963972
let apiUrl = `https://api.github.com/repos/${uri}/releases`;
964973
qxl.packagebrowser.Popup.getInstance().useIcon("waiting").display(`Loading, please wait... `);
965974
try {
@@ -969,7 +978,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
969978
let result = await (await fetch(apiUrl)).json();
970979
if (result.length) {
971980
html = `<h1>Releases</h1>`;
972-
html += result.map( release => {
981+
html += result.map(release => {
973982
if (release.draft) {
974983
return null;
975984
}
@@ -990,7 +999,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
990999
if (release.tag_name === modelNode.latestVersion) {
9911000
titleSuffixes.push("current version");
9921001
}
993-
let div = document.createElement('div');
1002+
let div = document.createElement("div");
9941003
div.innerText = release.body;
9951004
let description = div.innerHTML;
9961005
return `
@@ -1036,7 +1045,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
10361045
// check for the tags
10371046
var tags = folder.getUserData("tags");
10381047
var inTags = false;
1039-
if (tags != null) {
1048+
if (tags !== null) {
10401049
for (let j = 0; j < tags.length; j++) {
10411050
inTags = Boolean(tags[j].match(searchRegExp));
10421051
if (inTags) {
@@ -1097,10 +1106,11 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
10971106
req.addListener("success", function (evt) {
10981107
var content = evt.getTarget().getResponse();
10991108
if (!content) {
1100-
alert("Failed to load package data");
1109+
/* eslint-disable-next-line no-alert */
1110+
alert("Failed to load package data");
11011111
return;
11021112
}
1103-
1113+
/* eslint-disable-next-line no-eval */
11041114
let treeData = eval(content);
11051115

11061116
// give the browser a chance to update its UI before doing more
@@ -1114,7 +1124,7 @@ qx.Class.define("qxl.packagebrowser.PackageBrowser", {
11141124
if (state.startsWith("filter/")) {
11151125
qx.event.Timer.once(() => {
11161126
this._searchTextField.setValue(state.slice(7));
1117-
},null,1000);
1127+
}, null, 1000);
11181128
} else {
11191129
this.updateIframe(state);
11201130
}

‎source/class/qxl/packagebrowser/Tree.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ qx.Class.define("qxl.packagebrowser.Tree", {
109109
var agenda = [this];
110110
var depthfirst = style === "depth" ? 1 : 0;
111111

112+
/**
113+
*
114+
*/
112115
function f() {
113116
var curr;
114117

‎source/class/qxl/packagebrowser/TreeDataHandler.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ qx.Class.define("qxl.packagebrowser.TreeDataHandler", {
4242

4343
/**
4444
* create a new tree path from path, under parent node
45+
* @param parent
46+
* @param path
47+
* @param types
4548
*/
4649
__createPath(parent, path, types) {
4750
var head = path[0];

0 commit comments

Comments
 (0)