vanilla ckeditor-3.4

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

diff --git a/_source/plugins/dialog/plugin.js b/_source/plugins/dialog/plugin.js
index 5615b11..f2430cc 100644 (file)
--- a/_source/plugins/dialog/plugin.js
+++ b/_source/plugins/dialog/plugin.js
@@ -168,6 +168,9 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                {\r
                        this.on( 'ok', function( evt )\r
                                {\r
+                                       // Dialog confirm might probably introduce content changes (#5415).\r
+                                       editor.fire( 'saveSnapshot' );\r
+                                       setTimeout( function () { editor.fire( 'saveSnapshot' ); }, 0 );\r
                                        if ( definition.onOk.call( this, evt ) === false )\r
                                                evt.data.hide = false;\r
                                });\r
@@ -404,7 +407,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                                setupFocus();\r
 \r
                                if ( editor.config.dialog_startupFocusTab\r
-                                       && me._.tabIdList.length > 1 )\r
+                                       && me._.pageCount > 1 )\r
                                {\r
                                        me._.tabBarMode = true;\r
                                        me._.tabs[ me._.currentTabId ][ 0 ].focus();\r
@@ -469,7 +472,10 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 \r
                // Insert the tabs and contents.\r
                for ( var i = 0 ; i < definition.contents.length ; i++ )\r
-                       this.addPage( definition.contents[i] );\r
+               {\r
+                       var page = definition.contents[i];\r
+                       page && this.addPage( page );\r
+               }\r
 \r
                this.parts['tabs'].on( 'click', function( evt )\r
                                {\r
@@ -477,8 +483,10 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                                        // If we aren't inside a tab, bail out.\r
                                        if ( target.hasClass( 'cke_dialog_tab' ) )\r
                                        {\r
+                                               // Get the ID of the tab, without the 'cke_' prefix and the unique number suffix.\r
                                                var id = target.$.id;\r
-                                               this.selectPage( id.substr( 0, id.lastIndexOf( '_' ) ) );\r
+                                               this.selectPage( id.substring( 4, id.lastIndexOf( '_' ) ) );\r
+\r
                                                if ( this._.tabBarMode )\r
                                                {\r
                                                        this._.tabBarMode = false;\r
@@ -754,7 +762,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                        for ( var i in this._.contents )\r
                        {\r
                                for ( var j in this._.contents[i] )\r
-                                       fn( this._.contents[i][j]);\r
+                                       fn( this._.contents[i][j] );\r
                        }\r
                        return this;\r
                },\r
@@ -767,7 +775,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                 */\r
                reset : (function()\r
                {\r
-                       var fn = function( widget ){ if ( widget.reset ) widget.reset(); };\r
+                       var fn = function( widget ){ if ( widget.reset ) widget.reset( 1 ); };\r
                        return function(){ this.foreach( fn ); return this; };\r
                })(),\r
 \r
@@ -878,7 +886,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                        page.setAttribute( 'role', 'tabpanel' );\r
 \r
                        var env = CKEDITOR.env;\r
-                       var tabId = contents.id + '_' + CKEDITOR.tools.getNextNumber(),\r
+                       var tabId = 'cke_' + contents.id + '_' + CKEDITOR.tools.getNextNumber(),\r
                                 tab = CKEDITOR.dom.element.createFromHtml( [\r
                                        '<a class="cke_dialog_tab"',\r
                                                ( this._.pageCount > 0 ? ' cke_last' : 'cke_first' ),\r
@@ -938,6 +946,13 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                 */\r
                selectPage : function( id )\r
                {\r
+                       if ( this._.currentTabId == id )\r
+                               return;\r
+\r
+                       // Returning true means that the event has been canceled\r
+                       if ( this.fire( 'selectPage', { page : id, currentPage : this._.currentTabId } ) === true )\r
+                               return;\r
+\r
                        // Hide the non-selected tabs and pages.\r
                        for ( var i in this._.tabs )\r
                        {\r
@@ -1376,7 +1391,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                // Transform the contents entries in contentObjects.\r
                var contents = dialogDefinition.contents;\r
                for ( var i = 0, content ; ( content = contents[i] ) ; i++ )\r
-                       contents[ i ] = new contentObject( dialog, content );\r
+                       contents[ i ] = content && new contentObject( dialog, content );\r
 \r
                CKEDITOR.tools.extend( this, dialogDefinition );\r
        };\r
@@ -2041,7 +2056,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                                        styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {},\r
                                        attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {},\r
                                        innerHTML = ( contentsArg && contentsArg.call ? contentsArg.call( this, dialog, elementDefinition ) : contentsArg ) || '',\r
-                                       domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement',\r
+                                       domId = this.domId = attributes.id || CKEDITOR.tools.getNextId() + '_uiElement',\r
                                        id = this.id = elementDefinition.id,\r
                                        i;\r
 \r
@@ -2339,14 +2354,15 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
                /**\r
                 * Sets the value of this dialog UI object.\r
                 * @param {Object} value The new value.\r
+                * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.\r
                 * @returns {CKEDITOR.dialog.uiElement} The current UI element.\r
                 * @example\r
                 * uiElement.setValue( 'Dingo' );\r
                 */\r
-               setValue : function( value )\r
+               setValue : function( value, noChangeEvent )\r
                {\r
                        this.getInputElement().setValue( value );\r
-                       this.fire( 'change', { value : value } );\r
+                       !noChangeEvent && this.fire( 'change', { value : value } );\r
                        return this;\r
                },\r
 \r
@@ -2948,3 +2964,11 @@ CKEDITOR.plugins.add( 'dialog',
  * @param {CKEDITOR.editor} editor The editor instance that will use the\r
  *             dialog.\r
  */\r
+\r
+/**\r
+ * Fired when a tab is going to be selected in a dialog\r
+ * @name dialog#selectPage\r
+ * @event\r
+ * @param String page The id of the page that it's gonna be selected.\r
+ * @param String currentPage The id of the current page.\r
+ */\r