Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes Bug #5562

git-svn-id: https://qooxdoo-contrib.svn.sourceforge.net/svnroot/qooxdoo-contrib@21520 09f7d036-9b2a-0410-8fbe-9cff4eb17569
  • Loading branch information...
commit 135d6985e57fb6dcb37b01a6fa57a7974fd5db40 1 parent 98f5ecb
cboulanger authored
View
2  config.json
@@ -34,7 +34,7 @@
"QOOXDOO_PATH" : "../../qooxdoo/1.5",
//"QXTHEME" : "dialog.theme.modern.Theme",
"QXTHEME" : "qx.theme.Modern",
- "API_EXCLUDE" : ["qx.test.*", "dialog.demo.*"],
+ "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.demo.*", "${APPLICATION}.theme.*"],
"LOCALES" : [ "en","de","fr" ],
"CACHE" : "${TMPDIR}/cache",
"ROOT" : "."
View
19 source/class/dialog/Confirm.js
@@ -47,6 +47,9 @@ qx.Class.define("dialog.Confirm",
*/
properties :
{
+ /**
+ * Label used for the "yes button"
+ */
yesButtonLabel :
{
check : "String",
@@ -55,6 +58,9 @@ qx.Class.define("dialog.Confirm",
event : "changeYesButtonLabel"
},
+ /**
+ * Icon used for the "yes button"
+ */
yesButtonIcon :
{
check : "String",
@@ -63,6 +69,9 @@ qx.Class.define("dialog.Confirm",
event : "changeYesButtonIcon"
},
+ /**
+ * Label used for the "no button"
+ */
noButtonLabel :
{
check : "String",
@@ -71,6 +80,9 @@ qx.Class.define("dialog.Confirm",
event : "changeNoButtonLabel"
},
+ /**
+ * Icon used for the "no button"
+ */
noButtonIcon :
{
check : "String",
@@ -79,6 +91,9 @@ qx.Class.define("dialog.Confirm",
event : "changeNoButtonIcon"
},
+ /**
+ * This property controls the display of a cancel button
+ */
allowCancel :
{
refine : true,
@@ -98,7 +113,7 @@ qx.Class.define("dialog.Confirm",
---------------------------------------------------------------------------
PRIVATE MEMBERS
---------------------------------------------------------------------------
- */
+ */
_yesButton : null,
_noButton : null,
@@ -143,8 +158,6 @@ qx.Class.define("dialog.Confirm",
this._message.setAllowStretchX(true);
hbox.add( this._message, {flex:1} );
- var _this = this;
-
/*
* Yes button
*/
View
51 source/class/dialog/Dialog.js
@@ -51,7 +51,7 @@ qx.Class.define("dialog.Dialog",
/**
* Returns a dialog instance by type
- * @param type {String}
+ * @param type {String} The dialog type to get
* @return dialog.Dialog
*/
getInstanceByType : function(type)
@@ -92,9 +92,9 @@ qx.Class.define("dialog.Dialog",
/**
* Shortcut for alert dialog
- * @param message {String}
- * @param callback {Function}
- * @param context {Object}
+ * @param message {String} The message to display
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
*/
alert : function( message, callback, context )
{
@@ -106,6 +106,12 @@ qx.Class.define("dialog.Dialog",
})).show();
},
+ /**
+ * Shortcut for error dialog
+ * @param message {String} The message to display
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
+ */
error : function( message, callback, context )
{
(new dialog.Alert({
@@ -116,6 +122,12 @@ qx.Class.define("dialog.Dialog",
})).show();
},
+ /**
+ * Shortcut for warning dialog
+ * @param message {String} The message to display
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
+ */
warning : function( message, callback, context )
{
(new dialog.Alert({
@@ -128,9 +140,9 @@ qx.Class.define("dialog.Dialog",
/**
* Shortcut for confirm dialog
- * @param message {String}
- * @param callback {Function}
- * @param context {Object}
+ * @param message {String} The message to display
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
*/
confirm : function( message, callback, context )
{
@@ -146,10 +158,10 @@ qx.Class.define("dialog.Dialog",
* The value argument was forgotten in the initial implementation and
* comes last for backwards compatibility. This might change in a future
* release.
- * @param message {String}
- * @param callback {Function}
- * @param context {Object}
- * @param value {String}
+ * @param message {String} The message to display
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
+ * @param value {String} The default value of the prompt textfield
*/
prompt : function( message, callback, context, value )
{
@@ -163,10 +175,10 @@ qx.Class.define("dialog.Dialog",
/**
* Shortcut for select dialog
- * @param message {String}
- * @param options {Array}
- * @param callback {Function}
- * @param context {Object}
+ * @param message {String} The message to display
+ * @param options {Array} Options to select from
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
* @param allowCancel {Boolean} Default: true
*/
select : function( message, options, callback, context, allowCancel )
@@ -182,10 +194,10 @@ qx.Class.define("dialog.Dialog",
/**
* Shortcut for form dialog
- * @param message {String}
- * @param formData {Map}
- * @param callback {Function}
- * @param context {Object}
+ * @param message {String} The message to display
+ * @param formData {Map} Map of form data. See {@link dialog.Form.formData}
+ * @param callback {Function} The callback function
+ * @param context {Object} The context to use with the callback function
*/
form : function( message, formData, callback, context )
{
@@ -426,6 +438,7 @@ qx.Class.define("dialog.Dialog",
*/
__container : null,
+ __previousFocus : null,
/*
---------------------------------------------------------------------------
View
16 source/class/dialog/Form.js
@@ -208,9 +208,10 @@ qx.Class.define("dialog.Form",
/**
* Constructs the form on-the-fly
- * @param formData
- * @param old
- * @return
+ * @param formData The form data map
+ * @param old The old value
+ *
+ * @lint ignoreDeprecated(alert,eval)
*/
_applyFormData : function ( formData, old )
{
@@ -331,7 +332,7 @@ qx.Class.define("dialog.Form",
{
formElement.setUserData("orientation", fieldData.orientation );
}
- var selected = null;
+ //var selected = null;
fieldData.options.forEach( function( item )
{
var radioButton = new qx.ui.form.RadioButton( item.label );
@@ -393,7 +394,7 @@ qx.Class.define("dialog.Form",
var selectables = this.getSelectables();
selectables.forEach( function( selectable )
{
- var key = this.getUserData("key");
+ //var key = this.getUserData("key");
//console.warn( key +": '" + value + "' looking at '" + selectable.getLabel() + "' => " + selectable.getModel().getValue() );
if ( selectable.getModel().getValue() === value )
{
@@ -413,7 +414,7 @@ qx.Class.define("dialog.Form",
"converter" : qx.lang.Function.bind( function( selection )
{
var value = selection[0].getModel().getValue();
- var key = this.getUserData("key");
+ //var key = this.getUserData("key");
//console.warn("Selection is " + ( selection.length ? selection[0].getLabel() : "none" ) + " -> Setting value for " + key +": " + value );
return value;
}, formElement)
@@ -619,8 +620,7 @@ qx.Class.define("dialog.Form",
* Default behavior: bind the enabled state of the "OK" button to the
* validity of the current form.
*
- * @param form {qx.ui.form.Form}
- * @return {void}
+ * @param form {qx.ui.form.Form} The form to bind
*/
_onFormReady : function( form )
{
View
12 source/class/dialog/Login.js
@@ -99,12 +99,21 @@ qx.Class.define("dialog.Login",
---------------------------------------------------------------------------
*/
+ /**
+ * Apply function used by proterty {@link #text}
+ * @param value {String} New value
+ * @param old {String} Old value
+ */
_applyText : function( value, old )
{
this._text.setValue( value );
this._text.setVisibility( value ? "visible" : "excluded" );
},
+ /**
+ * Apply function used by proterty {@link #textFont}
+ * @param value {String} New value
+ */
_applyTextFont : function( value )
{
this._text.setFont( value );
@@ -257,10 +266,9 @@ qx.Class.define("dialog.Login",
/**
* Handler function called with the result of the authentication
* process.
- * @param result {Boolean}
+ * @param result {Boolean} The state of login success
* @param message {String|Null} Optional HTML message that might contain
* error information, such as "Wrong password".
- * @return
*/
_handleCheckLogin : function( result, message )
{
View
1  source/class/dialog/Select.js
@@ -135,6 +135,7 @@ qx.Class.define("dialog.Select",
/**
* Handle click on a button. Calls callback with
* the value set in the options map.
+ * @param value {var} The passed value
*/
_handleSelection : function( value )
{
View
12 source/class/dialog/Wizard.js
@@ -214,8 +214,7 @@ qx.Class.define("dialog.Wizard",
/**
* Add bindings to the validation manager to control the state of
* the wizard buttons.
- * @param form {qx.ui.form.Form}
- * @return {void}
+ * @param form {qx.ui.form.Form} The form to bind
*/
_onFormReady : function( form )
{
@@ -251,8 +250,8 @@ qx.Class.define("dialog.Wizard",
/**
* Apply the page data. This initializes the response
* data model
- * @param pageData
- * @param old
+ * @param pageData {Array} The new page data
+ * @param old {Array} The old page data
* @return
*/
_applyPageData : function ( pageData, old )
@@ -290,9 +289,8 @@ qx.Class.define("dialog.Wizard",
/**
* Go to a given wizard page. This recreates the
* form.
- * @param page {Integer}
- * @param old {Integer}
- * @return
+ * @param page {Integer} The new page
+ * @param old {Integer} The old page
*/
_applyPage : function ( page, old )
{
Please sign in to comment.
Something went wrong with that request. Please try again.