Skip to content

Commit

Permalink
Updated manifest files after testing compatibility with qx v 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Boulanger committed Apr 14, 2014
1 parent 9bc95ff commit f6d8c6d
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 33 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ inspector
api
source/inspector.html
qooxdoo
.DS_Store
.DS_Store
.c9revisions
demo/default/build
demo/default/source/script
4 changes: 2 additions & 2 deletions Manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" :
Expand Down
4 changes: 2 additions & 2 deletions demo/default/Manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" :
Expand Down
2 changes: 1 addition & 1 deletion qooxdoo
Submodule qooxdoo updated 4305 files
43 changes: 16 additions & 27 deletions source/class/dialog/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
{
Expand All @@ -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)
{
Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit f6d8c6d

Please sign in to comment.