vanilla ckeditor-3.4

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

diff --git a/_source/plugins/dialogui/plugin.js b/_source/plugins/dialogui/plugin.js
index 6d7aaa3..7875b5b 100644 (file)
--- a/_source/plugins/dialogui/plugin.js
+++ b/_source/plugins/dialogui/plugin.js
@@ -59,9 +59,9 @@ CKEDITOR.plugins.add( 'dialogui' );
                        return this.getValue() != this.getInitValue();\r
                },\r
 \r
-               reset : function()\r
+               reset : function( noChangeEvent )\r
                {\r
-                       this.setValue( this.getInitValue() );\r
+                       this.setValue( this.getInitValue(), noChangeEvent );\r
                },\r
 \r
                setInitValue : function()\r
@@ -147,7 +147,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                                        return;\r
 \r
                                var _ = initPrivateObject.call( this, elementDefinition );\r
-                               _.labelId = CKEDITOR.tools.getNextNumber() + '_label';\r
+                               _.labelId = CKEDITOR.tools.getNextId() + '_label';\r
                                var children = this._.children = [];\r
                                /** @ignore */\r
                                var innerHTML = function()\r
@@ -223,7 +223,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                                        return;\r
 \r
                                initPrivateObject.call( this, elementDefinition );\r
-                               var domId = this._.inputId = CKEDITOR.tools.getNextNumber() + '_textInput',\r
+                               var domId = this._.inputId = CKEDITOR.tools.getNextId() + '_textInput',\r
                                        attributes = { 'class' : 'cke_dialog_ui_input_' + elementDefinition.type, id : domId, type : 'text' },\r
                                        i;\r
 \r
@@ -313,7 +313,7 @@ CKEDITOR.plugins.add( 'dialogui' );
 \r
                                initPrivateObject.call( this, elementDefinition );\r
                                var me = this,\r
-                                       domId = this._.inputId = CKEDITOR.tools.getNextNumber() + '_textarea',\r
+                                       domId = this._.inputId = CKEDITOR.tools.getNextId() + '_textarea',\r
                                        attributes = {};\r
 \r
                                if ( elementDefinition.validate )\r
@@ -370,11 +370,11 @@ CKEDITOR.plugins.add( 'dialogui' );
                                {\r
                                        var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition,\r
                                                        {\r
-                                                               id : elementDefinition.id ? elementDefinition.id + '_checkbox' : CKEDITOR.tools.getNextNumber() + '_checkbox'\r
+                                                               id : elementDefinition.id ? elementDefinition.id + '_checkbox' : CKEDITOR.tools.getNextId() + '_checkbox'\r
                                                        }, true ),\r
                                                html = [];\r
 \r
-                                       var labelId = CKEDITOR.tools.getNextNumber() + '_label';\r
+                                       var labelId = CKEDITOR.tools.getNextId() + '_label';\r
                                        var attributes = { 'class' : 'cke_dialog_ui_checkbox_input', type : 'checkbox', 'aria-labelledby' : labelId };\r
                                        cleanInnerDefinition( myDefinition );\r
                                        if ( elementDefinition[ 'default' ] )\r
@@ -430,13 +430,13 @@ CKEDITOR.plugins.add( 'dialogui' );
                                {\r
                                        var inputHtmlList = [], html = [],\r
                                                commonAttributes = { 'class' : 'cke_dialog_ui_radio_item', 'aria-labelledby' : this._.labelId },\r
-                                               commonName = elementDefinition.id ? elementDefinition.id + '_radio' : CKEDITOR.tools.getNextNumber() + '_radio';\r
+                                               commonName = elementDefinition.id ? elementDefinition.id + '_radio' : CKEDITOR.tools.getNextId() + '_radio';\r
                                        for ( var i = 0 ; i < elementDefinition.items.length ; i++ )\r
                                        {\r
                                                var item = elementDefinition.items[i],\r
                                                        title = item[2] !== undefined ? item[2] : item[0],\r
                                                        value = item[1] !== undefined ? item[1] : item[0],\r
-                                                       inputId = CKEDITOR.tools.getNextNumber() + '_radio_input',\r
+                                                       inputId = CKEDITOR.tools.getNextId() + '_radio_input',\r
                                                        labelId = inputId + '_label',\r
                                                        inputDefinition = CKEDITOR.tools.extend( {}, elementDefinition,\r
                                                                        {\r
@@ -540,7 +540,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                                var outerDefinition = CKEDITOR.tools.extend( {}, elementDefinition );\r
                                delete outerDefinition.style;\r
 \r
-                               var labelId = CKEDITOR.tools.getNextNumber() + '_label';\r
+                               var labelId = CKEDITOR.tools.getNextId() + '_label';\r
                                CKEDITOR.ui.dialog.uiElement.call(\r
                                        this,\r
                                        dialog,\r
@@ -596,13 +596,13 @@ CKEDITOR.plugins.add( 'dialogui' );
                                if ( elementDefinition.validate )\r
                                        this.validate = elementDefinition.validate;\r
 \r
-                               _.inputId = CKEDITOR.tools.getNextNumber() + '_select';\r
+                               _.inputId = CKEDITOR.tools.getNextId() + '_select';\r
                                /** @ignore */\r
                                var innerHTML = function()\r
                                {\r
                                        var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition,\r
                                                        {\r
-                                                               id : elementDefinition.id ? elementDefinition.id + '_select' : CKEDITOR.tools.getNextNumber() + '_select'\r
+                                                               id : elementDefinition.id ? elementDefinition.id + '_select' : CKEDITOR.tools.getNextId() + '_select'\r
                                                        }, true ),\r
                                                html = [],\r
                                                innerHTML = [],\r
@@ -663,7 +663,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                                /** @ignore */\r
                                var innerHTML = function()\r
                                {\r
-                                       _.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';\r
+                                       _.frameId = CKEDITOR.tools.getNextId() + '_fileInput';\r
 \r
                                        // Support for custom document.domain in IE.\r
                                        var isCustomDomain = CKEDITOR.env.isCustomDomain();\r
@@ -1061,7 +1061,7 @@ CKEDITOR.plugins.add( 'dialogui' );
                                setValue : function( value )\r
                                {\r
                                        !value && ( value = '' );\r
-                                       return CKEDITOR.ui.dialog.uiElement.prototype.setValue.call( this, value );\r
+                                       return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply( this, arguments );\r
                                },\r
 \r
                                keyboardFocusable : true\r
@@ -1156,11 +1156,12 @@ CKEDITOR.plugins.add( 'dialogui' );
                                 * Sets the state of the checkbox.\r
                                 * @example\r
                                 * @param {Boolean} true to tick the checkbox, false to untick it.\r
+                                * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.\r
                                 */\r
-                               setValue : function( checked )\r
+                               setValue : function( checked, noChangeEvent )\r
                                {\r
                                        this.getInputElement().$.checked = checked;\r
-                                       this.fire( 'change', { value : checked } );\r
+                                       !noChangeEvent && this.fire( 'change', { value : checked } );\r
                                },\r
 \r
                                /**\r
@@ -1222,14 +1223,15 @@ CKEDITOR.plugins.add( 'dialogui' );
                                 * Checks one of the radio buttons in this button group.\r
                                 * @example\r
                                 * @param {String} value The value of the button to be chcked.\r
+                                * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.\r
                                 */\r
-                               setValue : function( value )\r
+                               setValue : function( value, noChangeEvent )\r
                                {\r
                                        var children = this._.children,\r
                                                item;\r
                                        for ( var i = 0 ; ( i < children.length ) && ( item = children[i] ) ; i++ )\r
                                                item.getElement().$.checked = ( item.getValue() == value );\r
-                                       this.fire( 'change', { value : value } );\r
+                                       !noChangeEvent && this.fire( 'change', { value : value } );\r
                                },\r
 \r
                                /**\r