Replace DOM manipulation code with equvilent jQuery api calls.

adobe · Jul 9, 2012 · 0159dc2 · 0159dc2
1 parent 8978529
commit 0159dc2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -68,11 +68,10 @@ define(function (require, exports, module) {
     * Creates a dialog div floating on top of the current code mirror editor
     */
     FindInFilesDialog.prototype._createDialogDiv = function (template) {
-        // FUTURE: consider using jQuery for all the DOM manipulation here
-        var wrap = $("#editor-holder")[0];
-        this.dialog = wrap.insertBefore(window.document.createElement("div"), wrap.firstChild);
-        this.dialog.className = "CodeMirror-dialog";
-        this.dialog.innerHTML = "<div>" + template + "</div>";
+        $("<div />").insertBefore($("#editor-holder > :first"));
+        this.dialog = $("#editor-holder > div:first")
+                          .attr("class", "CodeMirror-dialog")
+                          .html("<div>" + template + "</div>");
     };
 
     /**
@@ -84,7 +83,7 @@ define(function (require, exports, module) {
         }
 
         this.closed = true;
-        this.dialog.parentNode.removeChild(this.dialog);
+        this.dialog.remove();
         EditorManager.focusEditor();
         this.result.resolve(value);
     };

diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js
@@ -147,10 +147,10 @@ define(function (require, exports, module) {
      * Creates a dialog div floating on top of the current code mirror editor
      */
     QuickNavigateDialog.prototype._createDialogDiv = function (template) {
-        var $wrap = $("#editor-holder")[0];
-        this.dialog = $wrap.insertBefore(window.document.createElement("div"), $wrap.firstChild);
-        this.dialog.className = "CodeMirror-dialog";
-        this.dialog.innerHTML = '<div align="right">' + template + '</div>';
+        $("<div />").insertBefore($("#editor-holder > :first"));
+        this.dialog = $("#editor-holder > div:first")
+                          .attr("class", "CodeMirror-dialog")
+                          .html("<div align='right'>" + template + "</div>");
     };
 
     function _filenameFromPath(path, includeExtension) {
@@ -354,9 +354,7 @@ define(function (require, exports, module) {
 
         EditorManager.focusEditor();
 
-        // for some odd reason I need to remove the dialog like this through the parent
-        // If I do it more directly listeners are not removed by the smart auto complete plug-in
-        this.dialog.parentNode.removeChild(this.dialog);
+        this.dialog.remove();
         $(".smart_autocomplete_container").remove();
 
         $(window.document).off("mousedown", this.handleDocumentClick);