Ticket #4073: 4073_3.patch

_source/plugins/templates/dialogs/templates.js

@@ -81 +81 @@
 
                 if( isInsert )
                 {
+                        // Everything should happen after the document is loaded (#4073).
+                        editor.on( 'contentDom', function( evt )
+                        {
+                                evt.removeListener();
+                                dialog.hide();
+
+                                // Place the cursor at the first editable place.
+                                var range = new CKEDITOR.dom.range( editor.document );
+                                range.moveToElementEditStart( editor.document.getBody() );
+                                range.select( true );
+                        } );
                         editor.setData( html );
                 }
                 else
                 {
                         editor.insertHtml( html );
-                }
-
-                dialog.hide();
-        }
+                        dialog.hide();
+                }
+        }
 
         CKEDITOR.dialog.add( 'templates', function( editor )
                 {

_source/plugins/dialog/plugin.js

@@ -592 +592 @@
                  */
                 show : function()
                 {
-                        if ( this._.editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
-                                this._.editor.getSelection().lock();
+                        var editor = this._.editor;
+                        if ( editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
+                        {
+                                var selection = editor.getSelection();
+                                selection && selection.lock();
+                        }
 
                         // Insert the dialog's element to the root document.
                         var element = this._.element;
@@ -779 +783 @@
                                 editor.focus();
 
                                 if ( editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
-                                        editor.getSelection().unlock( true );
-                        }
+                                {
+                                        var selection = editor.getSelection();
+                                        selection && selection.unlock( true );
+                                }
+                        }
                         else
                                 CKEDITOR.dialog._.currentZIndex -= 10;