remove observer when destroying font_metrics

ajaxorg · Jul 22, 2018 · bac154e · bac154e
1 parent 85b4c97
commit bac154e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/lib/ace/ext/static_highlight.js b/lib/ace/ext/static_highlight.js
@@ -240,7 +240,6 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
     //console.log(JSON.stringify(outerEl, null, 2));
     //console.log(outerEl.toString());
     outerEl.appendChild(innerEl);
-    textLayer.destroy();
 
     return {
         css: baseStyles + theme.cssText,

diff --git a/lib/ace/layer/font_metrics.js b/lib/ace/layer/font_metrics.js
@@ -163,6 +163,8 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
 
     this.destroy = function() {
         clearInterval(this.$pollSizeChangesTimer);
+        if (this.$observer)
+            this.$observer.disconnect();
         if (this.el && this.el.parentNode)
             this.el.parentNode.removeChild(this.el);
     };

diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
@@ -635,13 +635,7 @@ var Text = function(parentEl) {
         return this.session.getUseWrapMode();
     };
 
-    this.destroy = function() {
-        clearInterval(this.$pollSizeChangesTimer);
-        if (this.$measureNode)
-            this.$measureNode.parentNode.removeChild(this.$measureNode);
-        delete this.$measureNode;
-    };
-
+    this.destroy = function() {};
 }).call(Text.prototype);
 
 exports.Text = Text;

diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
@@ -1659,7 +1659,7 @@ var VirtualRenderer = function(container, theme) {
      * Destroys the text and cursor layers for this renderer.
      **/
     this.destroy = function() {
-        this.$textLayer.destroy();
+        this.$fontMetrics.destroy();
         this.$cursorLayer.destroy();
     };