Merge pull request DevExpress#120 from MikhailTymchukDX/htmleditorext…

…ender-focus Resolve DevExpress#109
CharlieBP · May 27, 2016 · e4ae8a7 · e4ae8a7
2 parents 101e8a8 + d53bf29
commit e4ae8a7
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 23 deletions.
diff --git a/AjaxControlToolkit.Jasmine/Suites/HtmlEditorExtenderTests/HtmlEditorExtenderTests.aspx b/AjaxControlToolkit.Jasmine/Suites/HtmlEditorExtenderTests/HtmlEditorExtenderTests.aspx
@@ -7,6 +7,15 @@
 <asp:Content ContentPlaceHolderID="TestSuite" runat="server">
     <asp:UpdatePanel runat="server" UpdateMode="Conditional">
         <ContentTemplate>
+
+            <asp:UpdatePanel ID="LocalUpdatePanel" runat="server">
+                <ContentTemplate>
+                    <asp:Button ID="UpdatePanelButton" runat="server" Text="Update panel" ClientIDMode="Static" />
+                </ContentTemplate>
+            </asp:UpdatePanel>
+
+            <asp:TextBox runat="server" ID="SimpleTextBox" ClientIDMode="Static" />
+
             <asp:TextBox runat="server"
                 ID="Target"
                 Width="500"
@@ -107,7 +116,9 @@
         describe("HtmlEditorExtender", function() {
 
             var HTML_EDITOR_EXTENDER_CLIENT_ID = "<%= TargetExtender.ClientID %>",
-                HTML_EDITOR_EXTENDER_SANITIZED_CLIENT_ID = "<%= TargetExtenderSanitized.ClientID %>";
+                HTML_EDITOR_EXTENDER_SANITIZED_CLIENT_ID = "<%= TargetExtenderSanitized.ClientID %>",
+                SIMPLE_TEXTBOX_CLIENT_ID = "<%= SimpleTextBox.ClientID %>",
+                UPDATE_PANEL_BUTTON_CLIENT_ID = "<%= UpdatePanelButton.ClientID %>";
 
             var HTML_EDITOR_COLOR_PICKER_CONTAINER_CLASS_NAME = "ajax__colorPicker";
 
@@ -733,6 +744,25 @@
                 expect($container.find(".ajax__html_editor_extender_Copy").length).toBeTruthy();
                 expect($container.find(".ajax__html_editor_extender_Paste").length).toBeTruthy();
             });
+
+            it("correctly loses editable div focus", function(done) {
+                var wrapper = new HtmlEditorWrapper(this.extender);
+                wrapper.setContent("abc");
+
+                var textbox = $("#" + SIMPLE_TEXTBOX_CLIENT_ID);
+                textbox.focus();
+
+                var endRequestHandler = function() {
+                    expect(document.activeElement).toEqual(textbox.get(0));
+
+                    done();
+                }
+
+                Sys.WebForms.PageRequestManager.getInstance().add_endRequest(endRequestHandler);
+
+                var button = $("#" + UPDATE_PANEL_BUTTON_CLIENT_ID);
+                button.click();
+            });
         });
     </script>
 

diff --git a/...olToolkit.Jasmine/Suites/HtmlEditorExtenderTests/HtmlEditorExtenderTests.aspx.designer.cs b/...olToolkit.Jasmine/Suites/HtmlEditorExtenderTests/HtmlEditorExtenderTests.aspx.designer.cs
diff --git a/AjaxControlToolkit/Scripts/HtmlEditorExtender.js b/AjaxControlToolkit/Scripts/HtmlEditorExtender.js
@@ -753,27 +753,6 @@ Sys.Extended.UI.HtmlEditorExtenderBehavior.prototype = {
     },
 
     _editableDiv_submit: function() {
-        var char = 0,
-            selection = null;
-
-        setTimeout(function() {
-            if(this._editableDiv != null)
-                this._editableDiv.focus();
-        }, 0);
-
-        if(Sys.Browser.agent != Sys.Browser.Firefox) {
-            if(document.selection) {
-                selection = document.selection.createRange();
-                selection.moveStart('character', char);
-                selection.select();
-            } else {
-                selection = window.getSelection();
-
-                if(this._editableDiv.firstChild !== null)
-                    selection.collapse(this._editableDiv.firstChild, char);
-            }
-        }
-
         this._textbox._element.value = this._encodeHtml();
     },