From f6d8c6d044bada1891c2e081599f7a3882a8dc3e Mon Sep 17 00:00:00 2001 From: Christian Boulanger Date: Mon, 14 Apr 2014 16:06:38 -0400 Subject: [PATCH] Updated manifest files after testing compatibility with qx v 3.6 --- .gitignore | 5 +++- Manifest.json | 4 ++-- demo/default/Manifest.json | 4 ++-- qooxdoo | 2 +- source/class/dialog/Dialog.js | 43 +++++++++++++---------------------- 5 files changed, 25 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 2d314b3..594fa79 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ inspector api source/inspector.html qooxdoo -.DS_Store \ No newline at end of file +.DS_Store +.c9revisions +demo/default/build +demo/default/source/script \ No newline at end of file diff --git a/Manifest.json b/Manifest.json index a0cc352..30d389c 100644 --- a/Manifest.json +++ b/Manifest.json @@ -17,8 +17,8 @@ } ], - "version" : "0.6", - "qooxdoo-versions": ["2.0","2.1pre"] + "version" : "1.0", + "qooxdoo-versions": ["2.0","2.1","3.0","3.5","3.6"] }, "provides" : diff --git a/demo/default/Manifest.json b/demo/default/Manifest.json index 6bbc1d3..d27ebb8 100644 --- a/demo/default/Manifest.json +++ b/demo/default/Manifest.json @@ -17,8 +17,8 @@ } ], - "version" : "0.6", - "qooxdoo-versions": ["2.0","2.1pre"] + "version" : "1.0", + "qooxdoo-versions": ["2.0","2.1","3.0","3.5","3.6"] }, "provides" : diff --git a/qooxdoo b/qooxdoo index 4530219..8869efa 160000 --- a/qooxdoo +++ b/qooxdoo @@ -1 +1 @@ -Subproject commit 4530219cada8075d831cd00db101ca5ad30d6adb +Subproject commit 8869efada39b7284cadda121c884b2beb245a726 diff --git a/source/class/dialog/Dialog.js b/source/class/dialog/Dialog.js index 62baac3..fb34c11 100644 --- a/source/class/dialog/Dialog.js +++ b/source/class/dialog/Dialog.js @@ -17,35 +17,24 @@ ************************************************************************ */ -/* ************************************************************************ -#asset(qx/icon/${qx.icontheme}/22/actions/dialog-cancel.png) -#asset(qx/icon/${qx.icontheme}/22/actions/dialog-ok.png) -#asset(qx/icon/${qx.icontheme}/48/status/dialog-information.png) -#asset(qx/icon/${qx.icontheme}/48/status/dialog-error.png) -#asset(qx/icon/${qx.icontheme}/48/status/dialog-warning.png) - -#ignore(dialog.alert) -#ignore(dialog.error) -#ignore(dialog.warning) -#ignore(dialog.confirm) -#ignore(dialog.prompt) -#ignore(dialog.select) -************************************************************************ */ - -// for qooxdoo > 2.x /** - * @lint ignoreUndefined(dialog.alert) - * @lint ignoreUndefined(dialog.error) - * @lint ignoreUndefined(dialog.warning) - * @lint ignoreUndefined(dialog.confirm) - * @lint ignoreUndefined(dialog.prompt) - * @lint ignoreUndefined(dialog.form) - * @lint ignoreUndefined(dialog.select) + * @ignore(dialog.alert) + * @ignore(dialog.error) + * @ignore(dialog.warning) + * @ignore(dialog.confirm) + * @ignore(dialog.prompt) + * @ignore(dialog.form) + * @ignore(dialog.select) + * @asset(qx/icon/${qx.icontheme}/22/actions/dialog-cancel.png) + * @asset(qx/icon/${qx.icontheme}/22/actions/dialog-ok.png) + * @asset(qx/icon/${qx.icontheme}/48/status/dialog-information.png) + * @asset(qx/icon/${qx.icontheme}/48/status/dialog-error.png) + * @asset(qx/icon/${qx.icontheme}/48/status/dialog-warning.png) */ /** * Base class for dialog widgets - * @todo use childControl system + * */ qx.Class.define("dialog.Dialog", { @@ -62,7 +51,7 @@ qx.Class.define("dialog.Dialog", /** * Returns a dialog instance by type * @param type {String} The dialog type to get - * @return dialog.Dialog + * @return {dialog.Dialog} */ getInstanceByType : function(type) { @@ -380,13 +369,13 @@ qx.Class.define("dialog.Dialog", /** * Dispatched when user clicks on the "OK" Button - * @type String + * @type {String} */ "ok" : "qx.event.type.Event", /** * Dispatched when user clicks on the "Cancel" Button - * @type String + * @type {String} */ "cancel" : "qx.event.type.Event"