vanilla ckeditor-3.6.1

[ckeditor.git] / _source / plugins / dialogui / plugin.js

diff --git a/_source/plugins/dialogui/plugin.js b/_source/plugins/dialogui/plugin.js
index 3fbaa22..c68c35b 100644 (file)
--- a/_source/plugins/dialogui/plugin.js
+++ b/_source/plugins/dialogui/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -124,7 +124,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @extends CKEDITOR.ui.dialog.uiElement\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>label</strong> (Required) The label string.</li>\r
@@ -158,10 +158,10 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                html.push( '<label class="cke_dialog_ui_labeled_label' + requiredClass + '" ',\r
                                                                ' id="'+  _.labelId + '"',\r
                                                                ' for="' + _.inputId + '"',\r
-                                                               ' style="' + elementDefinition.labelStyle + '">',\r
+                                                               ( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) +'>',\r
                                                                elementDefinition.label,\r
                                                                '</label>',\r
-                                                               '<div class="cke_dialog_ui_labeled_content" role="presentation">',\r
+                                                               '<div class="cke_dialog_ui_labeled_content"' + ( elementDefinition.controlStyle ? ' style="' + elementDefinition.controlStyle + '"' : '' ) + ' role="presentation">',\r
                                                                contentHtml.call( this, dialog, elementDefinition ),\r
                                                                '</div>' );\r
                                        else\r
@@ -177,13 +177,13 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                                        html : '<label class="cke_dialog_ui_labeled_label' + requiredClass + '"' +\r
                                                                                ' id="' + _.labelId + '"' +\r
                                                                                ' for="' + _.inputId + '"' +\r
-                                                                               ' style="' + elementDefinition.labelStyle + '">' +\r
+                                                                               ( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) +'>' +\r
                                                                                   CKEDITOR.tools.htmlEncode( elementDefinition.label ) +\r
                                                                                '</span>'\r
                                                                },\r
                                                                {\r
                                                                        type : 'html',\r
-                                                                       html : '<span class="cke_dialog_ui_labeled_content">' +\r
+                                                                       html : '<span class="cke_dialog_ui_labeled_content"' + ( elementDefinition.controlStyle ? ' style="' + elementDefinition.controlStyle + '"' : '' ) + '>' +\r
                                                                                contentHtml.call( this, dialog, elementDefinition ) +\r
                                                                                '</span>'\r
                                                                }\r
@@ -204,7 +204,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @extends CKEDITOR.ui.dialog.labeledElement\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>default</strong> (Optional) The default value.</li>\r
@@ -237,8 +237,8 @@ CKEDITOR.plugins.add( 'dialogui' );
                                if ( elementDefinition.size )\r
                                        attributes.size = elementDefinition.size;\r
 \r
-                               if ( elementDefinition.controlStyle )\r
-                                       attributes.style = elementDefinition.controlStyle;\r
+                               if ( elementDefinition.inputStyle )\r
+                                       attributes.style = elementDefinition.inputStyle;\r
 \r
                                // If user presses Enter in a text box, it implies clicking OK for the dialog.\r
                                var me = this, keyPressedOnMe = false;\r
@@ -293,7 +293,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @example\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>rows</strong> (Optional) The number of rows displayed.\r
@@ -323,6 +323,10 @@ CKEDITOR.plugins.add( 'dialogui' );
                                attributes.rows = elementDefinition.rows || 5;\r
                                attributes.cols = elementDefinition.cols || 20;\r
 \r
+                               if ( typeof elementDefinition.inputStyle != 'undefined' )\r
+                                       attributes.style = elementDefinition.inputStyle;\r
+\r
+\r
                                /** @ignore */\r
                                var innerHTML = function()\r
                                {\r
@@ -344,7 +348,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @example\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>checked</strong> (Optional) Whether the checkbox is checked\r
@@ -380,11 +384,11 @@ CKEDITOR.plugins.add( 'dialogui' );
                                        if ( elementDefinition[ 'default' ] )\r
                                                attributes.checked = 'checked';\r
 \r
-                                       if ( typeof myDefinition.controlStyle != 'undefined' )\r
-                                               myDefinition.style = myDefinition.controlStyle;\r
+                                       if ( typeof myDefinition.inputStyle != 'undefined' )\r
+                                               myDefinition.style = myDefinition.inputStyle;\r
 \r
                                        _.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes );\r
-                                       html.push( ' <label id="', labelId, '" for="', attributes.id, '">',\r
+                                       html.push( ' <label id="', labelId, '" for="', attributes.id, '"' + ( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) + '>',\r
                                                        CKEDITOR.tools.htmlEncode( elementDefinition.label ),\r
                                                        '</label>' );\r
                                        return html.join( '' );\r
@@ -400,7 +404,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @extends CKEDITOR.ui.dialog.labeledElement\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>default</strong> (Required) The default value.</li>\r
@@ -462,8 +466,8 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                cleanInnerDefinition( inputDefinition );\r
                                                cleanInnerDefinition( labelDefinition );\r
 \r
-                                               if ( typeof inputDefinition.controlStyle != 'undefined' )\r
-                                                       inputDefinition.style = inputDefinition.controlStyle;\r
+                                               if ( typeof inputDefinition.inputStyle != 'undefined' )\r
+                                                       inputDefinition.style = inputDefinition.inputStyle;\r
 \r
                                                children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );\r
                                                inputHtml.push( ' ' );\r
@@ -486,7 +490,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @extends CKEDITOR.ui.dialog.uiElement\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>label</strong> (Required) The button label.</li>\r
@@ -569,7 +573,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @constructor\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>default</strong> (Required) The default value.</li>\r
@@ -618,12 +622,12 @@ CKEDITOR.plugins.add( 'dialogui' );
                                        for ( var i = 0, item ; i < elementDefinition.items.length && ( item = elementDefinition.items[i] ) ; i++ )\r
                                        {\r
                                                innerHTML.push( '<option value="',\r
-                                                       CKEDITOR.tools.htmlEncode( item[1] !== undefined ? item[1] : item[0] ), '" /> ',\r
+                                                       CKEDITOR.tools.htmlEncode( item[1] !== undefined ? item[1] : item[0] ).replace( /"/g, '&quot;' ), '" /> ',\r
                                                        CKEDITOR.tools.htmlEncode( item[0] ) );\r
                                        }\r
 \r
-                                       if ( typeof myDefinition.controlStyle != 'undefined' )\r
-                                               myDefinition.style = myDefinition.controlStyle;\r
+                                       if ( typeof myDefinition.inputStyle != 'undefined' )\r
+                                               myDefinition.style = myDefinition.inputStyle;\r
 \r
                                        _.select = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'select', null, attributes, innerHTML.join( '' ) );\r
                                        return html.join( '' );\r
@@ -639,7 +643,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @constructor\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>validate</strong> (Optional) The validation function.</li>\r
@@ -712,7 +716,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * @constructor\r
                         * @param {CKEDITOR.dialog} dialog\r
                         * Parent dialog object.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>for</strong> (Required) The file input's page and element Id\r
@@ -765,7 +769,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                                 * @extends CKEDITOR.ui.dialog.uiElement\r
                                 * @name CKEDITOR.ui.dialog.html\r
                                 * @param {CKEDITOR.dialog} dialog Parent dialog object.\r
-                                * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition Element definition.\r
+                                * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition Element definition.\r
                                 * Accepted fields:\r
                                 * <ul>\r
                                 *      <li><strong>html</strong> (Required) HTML code of this element.</li>\r
@@ -837,7 +841,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                         * objects in childObjList.\r
                         * @param {Array} htmlList\r
                         * Array of HTML code that this element will output to.\r
-                        * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition\r
+                        * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition\r
                         * The element definition. Accepted fields:\r
                         * <ul>\r
                         *      <li><strong>label</strong> (Optional) The legend of the this fieldset.</li>\r
@@ -1460,7 +1464,7 @@ CKEDITOR.plugins.add( 'dialogui' );
 \r
                                getValue : function()\r
                                {\r
-                                       return this.getInputElement().$.value;\r
+                                       return this.getInputElement().$.value || '';\r
                                },\r
 \r
                                /***\r
@@ -1521,3 +1525,17 @@ CKEDITOR.plugins.add( 'dialogui' );
        CKEDITOR.dialog.addUIElement( 'html', commonBuilder );\r
        CKEDITOR.dialog.addUIElement( 'fieldset', containerBuilder );\r
 })();\r
+\r
+/**\r
+ * Fired when the value of the uiElement is changed\r
+ * @name CKEDITOR.ui.dialog.uiElement#change\r
+ * @event\r
+ */\r
+\r
+/**\r
+ * Fired when the inner frame created by the element is ready.\r
+ * Each time the button is used or the dialog is loaded a new\r
+ * form might be created.\r
+ * @name CKEDITOR.ui.dialog.fileButton#formLoaded\r
+ * @event\r
+ */\r