Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qooxdoo/qxl.versionlabel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: qooxdoo/qxl.versionlabel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 20 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 20, 2020

  1. change namespace

    hkollmann committed Nov 20, 2020
    Copy the full SHA
    f37ce03 View commit details

Commits on Jan 8, 2021

  1. add enviroment definitions

    update pqckages
    hkollmann committed Jan 8, 2021
    Copy the full SHA
    590719c View commit details
  2. Copy the full SHA
    b0cb649 View commit details

Commits on Feb 4, 2021

  1. move to 6.0.0

    lint
    hkollmann committed Feb 4, 2021
    Copy the full SHA
    f76edf5 View commit details
  2. Copy the full SHA
    cfcb059 View commit details
  3. fix syntax

    hkollmann committed Feb 4, 2021
    Copy the full SHA
    4da5b56 View commit details
  4. Copy the full SHA
    f58873d View commit details
  5. fix enviroment

    hkollmann committed Feb 4, 2021
    Copy the full SHA
    9b91460 View commit details
  6. "fix enviroment"

    hkollmann committed Feb 4, 2021
    Copy the full SHA
    8f0a26e View commit details
  7. updater apiviewer

    hkollmann committed Feb 4, 2021
    Copy the full SHA
    52ca5b8 View commit details

Commits on Feb 7, 2021

  1. allow 7.0.0-beta

    hkollmann committed Feb 7, 2021
    Copy the full SHA
    0dffe11 View commit details
  2. "allow 7.0.0-beta"

    hkollmann committed Feb 7, 2021
    Copy the full SHA
    ad9b10e View commit details

Commits on Feb 22, 2022

  1. move to v7

    hkollmann committed Feb 22, 2022
    Copy the full SHA
    d00de02 View commit details
  2. "move to v7"

    hkollmann committed Feb 22, 2022
    Copy the full SHA
    151a80b View commit details
  3. remove

    hkollmann committed Feb 22, 2022
    Copy the full SHA
    85b83b4 View commit details

Commits on Feb 23, 2022

  1. "move to v7"

    hkollmann committed Feb 23, 2022
    Copy the full SHA
    c8d8b93 View commit details

Commits on Apr 12, 2024

  1. add compiler version

    hkollmann committed Apr 12, 2024
    Copy the full SHA
    5820e1d View commit details
  2. "Release v2.0.1"

    hkollmann committed Apr 12, 2024
    Copy the full SHA
    98f3919 View commit details
  3. fix null

    hkollmann committed Apr 12, 2024
    Copy the full SHA
    734bc0d View commit details
  4. "Release v2.0.2"

    hkollmann committed Apr 12, 2024
    Copy the full SHA
    f5e3b61 View commit details
Showing with 25 additions and 75 deletions.
  1. +7 −5 Manifest.json
  2. +0 −36 compile.json
  3. +0 −13 qx-lock.json
  4. +18 −21 source/class/qxl/versionlabel/VersionLabel.js
12 changes: 7 additions & 5 deletions Manifest.json
Original file line number Diff line number Diff line change
@@ -4,19 +4,21 @@
"summary": "version label for qooxdoo demo apps",
"description": "",
"license": "MIT",
"version": "1.0.1",
"version": "2.0.2",
"authors": []
},
"provides": {
"namespace": "qxl.versionlabel",
"encoding": "utf-8",
"class": "source/class",
"resource": "source/resource",
"translation": "source/translation"
"translation": "source/translation",
"environmentChecks": {
"qxl.versionlabel.*": "qxl.versionlabel.VersionLabel"
}
},
"requires": {
"@qooxdoo/compiler": "^1.0.0-beta",
"@qooxdoo/framework": "^6.0.0-alpha"
"@qooxdoo/framework": "^7.0.0"
},
"$schema": "https://qooxdoo.org/schema/Manifest-1-0-0.json"
"$schema": "https://qooxdoo.org/schema/Manifest-2-0-0.json"
}
36 changes: 0 additions & 36 deletions compile.json

This file was deleted.

13 changes: 0 additions & 13 deletions qx-lock.json

This file was deleted.

39 changes: 18 additions & 21 deletions source/class/qxl/versionlabel/VersionLabel.js
Original file line number Diff line number Diff line change
@@ -20,48 +20,45 @@
* Slightly extended form of a @{qx.ui.basic.Label}, to include a version/
* revision string of qooxdoo.
*/
qx.Class.define("qxl.versionlabel.VersionLabel",
{
extend : qx.ui.basic.Label,
qx.Class.define("qxl.versionlabel.VersionLabel", {
extend: qx.ui.basic.Label,

construct : function(value, version)
{
if (value == undefined)
{
construct(value, version) {
if (!value) {
// if no parameter value given: use the environment variable
value = qx.core.Environment.get("versionLabel.name");
value = qx.core.Environment.get("qxl.versionlabel.name");
}

if (version == undefined)
{
if (!version) {
// if no parameter value given: use the environment variable
version = qx.core.Environment.get("versionLabel.version");
version = qx.core.Environment.get("qxl.versionlabel.version");

if (version == null)
{
if (!version) {
// revision or version number as fallback
version = qx.core.Environment.get("qx.revision");
if (version == "") {
if (!version) {
version = qx.core.Environment.get("qx.version");
}
if (!version) {
version = qx.core.Environment.get("qx.compiler.version");
}
}
}

this.base(arguments, value + " " + version);
super(value + " " + version);
},


defer : function() {
defer() {
/**
* The name of the version label which is shown in the upper right corner.
* Defaults to 'qooxdoo'.
*/
qx.core.Environment.add("versionLabel.name", "qooxdoo");
qx.core.Environment.add("qxl.versionlabel.name", "qooxdoo");

/**
* The version string of the version label which is shown in the upper right corner.
* Defaults to 'null' to be able to fallback to 'qx.revision' or 'qx.version' easily.
*/
qx.core.Environment.add("versionLabel.version", null);
}
});
qx.core.Environment.add("qxl.versionlabel.version", null);
},
});