Merge pull request #5095 from ajaxorg/resize-observer

Resize observer

doc/site/js/main.js

@@ -153,12 +153,6 @@ $(function() {
             $.bbq.pushState(state);
      });
 
-    $('#tabnav a[data-toggle="tab"]').on('shown', function (e) {
-        $(".tab-content .tab-pane.active .ace_editor").each(function(i, el){
-            el.env.onResize();
-        });
-    });
-
     $(window).on("hashchange", function(e) {
         _gaq.push(['_trackPageview',location.pathname + location.search  + location.hash]);
         tabs.each(function() {

doc/site/style.css

@@ -496,4 +496,6 @@ img {
 
 .nav>li>a.external-nav:hover {
     text-decoration: underline;
-}
+}
+
+pre { background-color: white!important }

src/ace.js

@@ -8,7 +8,6 @@
 "include loader_build";
 
 var dom = require("./lib/dom");
-var event = require("./lib/event");
 
 var Range = require("./range").Range;
 var Editor = require("./editor").Editor;
@@ -66,9 +65,7 @@ exports.edit = function(el, options) {
         onResize: editor.resize.bind(editor, null)
     };
     if (oldNode) env.textarea = oldNode;
-    event.addListener(window, "resize", env.onResize);
     editor.on("destroy", function() {
-        event.removeListener(window, "resize", env.onResize);
         env.editor.container.env = null; // prevent memory leak on old ie
     });
     editor.container.env = editor.env = env;

src/ace_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -102,6 +101,61 @@ module.exports = {
         ace.config.set("useStrictCSP", false);
         assert.ok(getStyleNode());
     },
+    "test: resizeObserver": function(done) {
+        var mockObserver = {
+            disconnect: function() { mockObserver.target = null; },
+            observe: function(el) {
+                mockObserver.target = el;
+            },
+            $create: function(fn) {
+                mockObserver.callback = fn;
+                return mockObserver;
+            },
+            call: function() {
+                setTimeout(function() {
+                    if (mockObserver.target)
+                        mockObserver.callback([{contentRect: mockObserver.target.getBoundingClientRect()}]);
+                });
+            }
+        };
+        if (!window.ResizeObserver) {
+            window.ResizeObserver = mockObserver.$create;
+        }
+        var editor = ace.edit(null);
+        document.body.appendChild(editor.container);
+        editor.container.style.width = "100px";
+        editor.container.style.height = "100px";
+        mockObserver.call();
+        editor.resize(true);
+        assert.ok(!editor.renderer.$resizeTimer.isPending());
+        assert.equal(editor.renderer.$size.width, 100);
+        editor.container.style.width = "200px";
+        mockObserver.call();
+        setTimeout(function() {
+            if (editor.renderer.$resizeTimer.isPending())
+                editor.renderer.$resizeTimer.call();
+            assert.equal(editor.renderer.$size.width, 200);
+            editor.container.style.height = "200px";
+            mockObserver.call();
+            setTimeout(function() {
+                assert.ok(editor.renderer.$resizeTimer.isPending());
+                editor.container.style.height = "100px";
+                mockObserver.call();
+                setTimeout(function() {
+                    assert.ok(!editor.renderer.$resizeTimer.isPending());
+                    editor.setOption("useResizeObserver", false);
+                    editor.container.style.height = "300px";
+                    mockObserver.call();
+                    assert.ok(!editor.renderer.$resizeObserver);
+                    editor.setOption("useResizeObserver", true);
+                    assert.ok(editor.renderer.$resizeObserver);
+                    if (window.ResizeObserver === mockObserver.$create)
+                        window.ResizeObserver = undefined;
+                    done();
+                }, 15);
+            }, 15);
+        }, 15);
+    },
     "test: edit template" : function() {
         var template = document.createElement("template");
         var div = document.createElement("div");

src/editor.js

@@ -2897,6 +2897,7 @@ config.defineOptions(Editor.prototype, "editor", {
     hasCssTransforms: "renderer",
     maxPixelHeight: "renderer",
     useTextareaForIME: "renderer",
+    useResizeObserver: "renderer",
 
     scrollSpeed: "$mouseHandler",
     dragDelay: "$mouseHandler",

src/virtual_renderer.js

@@ -2,6 +2,7 @@
 
 var oop = require("./lib/oop");
 var dom = require("./lib/dom");
+var lang = require("./lib/lang");
 var config = require("./config");
 var GutterLayer = require("./layer/gutter").Gutter;
 var MarkerLayer = require("./layer/marker").Marker;
@@ -156,6 +157,7 @@ var VirtualRenderer = function(container, theme) {
 
     this.updateCharacterSize();
     this.setPadding(4);
+    this.$addResizeObserver();
     config.resetOptions(this);
     config._signal("renderer", this);
 };
@@ -343,6 +345,7 @@ var VirtualRenderer = function(container, theme) {
             width = el.clientWidth || el.scrollWidth;
         var changes = this.$updateCachedSize(force, gutterWidth, width, height);
 
+        if (this.$resizeTimer) this.$resizeTimer.cancel();
 
         if (!this.$size.scrollerHeight || (!width && !height))
             return this.resizing = 0;
@@ -1798,6 +1801,7 @@ var VirtualRenderer = function(container, theme) {
         this.$cursorLayer.destroy();
         this.removeAllListeners();
         this.container.textContent = "";
+        this.setOption("useResizeObserver", false);
     };
 
     this.$updateCustomScrollbar = function (val) {
@@ -1835,10 +1839,42 @@ var VirtualRenderer = function(container, theme) {
         }
     };
 
+    this.$addResizeObserver = function() {
+        if (!window.ResizeObserver || this.$resizeObserver) return;
+        var self = this;
+        this.$resizeTimer = lang.delayedCall(function() {
+            if (!self.destroyed)  self.onResize();
+        }, 50);
+        this.$resizeObserver = new window.ResizeObserver(function(e) {
+            var w = e[0].contentRect.width;
+            var h = e[0].contentRect.height;
+            if (
+                Math.abs(self.$size.width - w) > 1
+                || Math.abs(self.$size.height - h) > 1
+            ) {
+                self.$resizeTimer.delay();
+            } else {
+                self.$resizeTimer.cancel();
+            }
+        });
+        this.$resizeObserver.observe(this.container);
+    };
+
 }).call(VirtualRenderer.prototype);
 
 
 config.defineOptions(VirtualRenderer.prototype, "renderer", {
+    useResizeObserver: {
+        set: function(value) {
+            if (!value && this.$resizeObserver) {
+                this.$resizeObserver.disconnect();
+                this.$resizeTimer.cancel();
+                this.$resizeTimer = this.$resizeObserver = null;
+            } else if (value && !this.$resizeObserver) {
+                this.$addResizeObserver();
+            }
+        }
+    },
     animatedScroll: {initialValue: false},
     showInvisibles: {
         set: function(value) {