Ticket #5307: 5307_2.patch

_source/plugins/dialog/plugin.js

@@ -335 +335 @@
 
                                 processed = 1;
                         }
-                        else if ( keystroke == CKEDITOR.ALT + 121 && !me._.tabBarMode )
+                        else if ( keystroke == CKEDITOR.ALT + 121 && !me._.tabBarMode && me.getPageCount() > 1 )
                         {
                                 // Alt-F10 puts focus into the current tab item in the tab bar.
                                 me._.tabBarMode = true;
@@ -893 +893 @@
 
                         page.setAttribute( 'aria-labelledby', tabId );
 
-                        // If only a single page exist, a different style is used in the central pane.
-                        if ( this._.pageCount === 0 )
-                                this.parts.dialog.addClass( 'cke_single_page' );
-                        else
-                                this.parts.dialog.removeClass( 'cke_single_page' );
-
                         // Take records for the tabs and elements created.
                         this._.tabs[ contents.id ] = [ tab, page ];
                         this._.tabIdList.push( contents.id );
-                        this._.pageCount++;
+                        !contents.hidden && this._.pageCount++;
                         this._.lastTab = tab;
+                        this.updateStyle();
 
                         var contentMap = this._.contents[ contents.id ] = {},
                                 cursor,
@@ -961 +956 @@
                         this._.currentTabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, id );
                 },
 
+                // Dialog state-specific style updates.
+                updateStyle : function()
+                {
+                        // If only a single page shown, a different style is used in the central pane.
+                        this.parts.dialog[ ( this._.pageCount === 1 ? 'add' : 'remove' ) + 'Class' ]( 'cke_single_page' );
+                },
+
                 /**
                  * Hides a page's tab away from the dialog.
                  * @param {String} id The page's Id.
@@ -970 +972 @@
                 hidePage : function( id )
                 {
                         var tab = this._.tabs[id] && this._.tabs[id][0];
-                        if ( !tab )
+                        if ( !tab || this._.pageCount == 1 )
                                 return;
+                        // Switch to other tab first when we're hiding the active tab.
+                        else if ( id == this._.currentTabId )
+                                this.selectPage( getPreviousVisibleTab.call( this ) );
+
                         tab.hide();
+                        this._.pageCount--;
+                        this.updateStyle();
                 },
 
                 /**
@@ -987 +995 @@
                         if ( !tab )
                                 return;
                         tab.show();
+                        this._.pageCount++;
+                        this.updateStyle();
                 },
 
                 /**