Fixes #3108. Moves debounce functionality from polymer-micro to pol…

…ymer-mini. The functionality belongs at the mini tier and was never actually functional in micro.
Polymer · Nov 30, 2015 · 3df4ef2 · 3df4ef2
1 parent 06898da
commit 3df4ef2
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 44 deletions.
diff --git a/polymer-micro.html b/polymer-micro.html
@@ -14,7 +14,6 @@
 <link rel="import" href="src/micro/constructor.html">
 <link rel="import" href="src/micro/properties.html">
 <link rel="import" href="src/micro/attributes.html">
-<link rel="import" href="src/micro/debouncer.html">
 
 <script>
   Polymer.version = 'master';
@@ -45,8 +44,6 @@
     _initFeatures: function() {
       // install host attributes
       this._marshalHostAttributes();
-      // setup debouncers
-      this._setupDebouncers();
       // acquire behaviors
       this._marshalBehaviors();
     }

diff --git a/polymer-mini.html b/polymer-mini.html
@@ -14,6 +14,7 @@
 <link rel="import" href="src/mini/ready.html">
 <link rel="import" href="src/mini/shady.html">
 <link rel="import" href="src/mini/shadow.html">
+<link rel="import" href="src/mini/debouncer.html">
 
 <script>
 

diff --git a/src/micro/debouncer.html → src/mini/debouncer.html b/src/micro/debouncer.html → src/mini/debouncer.html
@@ -7,6 +7,9 @@
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
+<link rel="import" href="../lib/async.html">
+<link rel="import" href="../lib/debounce.html">
+
 <script>
 
   Polymer.Base._addFeature({

diff --git a/test/runner.html b/test/runner.html
@@ -37,6 +37,7 @@
       'unit/polymer-dom-content.html?dom=shadow',
       'unit/polymer-dom-observeNodes.html',
       'unit/polymer-dom-observeNodes.html?dom=shadow',
+      'unit/debounce.html',
       'unit/bind.html',
       'unit/bind.html?dom=shadow',
       'unit/notify-path.html',

diff --git a/test/unit/debounce.html b/test/unit/debounce.html
@@ -0,0 +1,83 @@
+<!doctype html>
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../polymer-mini.html">
+</head>
+<body>
+
+<script>
+
+  HTMLImports.whenReady(function() {
+    Polymer({is: 'my-element'});
+  });
+
+  setup(function() {
+    window.el1 = document.createElement('my-element');
+    document.body.appendChild(window.el1);
+    window.el2 = document.createElement('my-element');
+    window.el1.appendChild(window.el2);
+  });
+
+  teardown(function() {
+    document.body.removeChild(window.el1);
+    delete window.el1;
+    delete window.el2;
+  });
+
+  suite('debounce', function() {
+
+    test('debounce (no-wait)', function(done) {
+
+      var called = 0;
+      var cb = function() {
+        called++;
+      };
+
+      window.el1.debounce('foo', cb);
+      window.el1.debounce('foo', cb);
+      window.el1.debounce('foo', cb);
+
+      setTimeout(function() {
+        assert.equal(called, 1, 'debounce should be called exactly once');
+        done();
+      }, 50);
+
+    });
+
+    test('debounce (wait)', function(done) {
+
+      var called = 0;
+      var now = Date.now();
+      var cb = function() {
+        called++;
+      };
+
+      window.el1.debounce('foo', cb);
+      window.el1.debounce('foo', cb, 100);
+      window.el1.debounce('foo', cb, 100);
+
+      setTimeout(function() {
+        assert.equal(called, 1, 'debounce should be called exactly once');
+        assert(Date.now() - now > 100, 'debounce should be called after at least 100ms');
+        done();
+      }, 200);
+
+    });
+
+  });
+
+</script>
+</body>
+</html>
diff --git a/test/unit/utils.html b/test/unit/utils.html
@@ -57,47 +57,6 @@
 
   });
 
-  suite('debounce', function() {
-
-    test('debounce (no-wait)', function(done) {
-
-      var called = 0;
-      var cb = function() {
-        called++;
-      };
-
-      window.el1.debounce('foo', cb);
-      window.el1.debounce('foo', cb);
-      window.el1.debounce('foo', cb);
-
-      setTimeout(function() {
-        assert.equal(called, 1, 'debounce should be called exactly once');
-        done();
-      }, 50);
-
-    });
-
-    test('debounce (wait)', function(done) {
-
-      var called = 0;
-      var now = Date.now();
-      var cb = function() {
-        called++;
-      };
-
-      window.el1.debounce('foo', cb);
-      window.el1.debounce('foo', cb, 100);
-      window.el1.debounce('foo', cb, 100);
-
-      setTimeout(function() {
-        assert.equal(called, 1, 'debounce should be called exactly once');
-        assert(Date.now() - now > 100, 'debounce should be called after at least 100ms');
-        done();
-      }, 200);
-
-    });
-
-  });
 
 </script>
 </body>