Merge pull request #1959 from Polymer/1911-kschaaf

Move mixin to Base. Fixes #1911
Polymer · Jun 24, 2015 · 259efb8 · 259efb8
2 parents 489bd29 + 2234eff
commit 259efb8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/src/lib/base.html b/src/lib/base.html
@@ -48,7 +48,15 @@
       this._doBehavior('attributeChanged', arguments); // abstract
     },
 
-    // copy own properties from `api` to `prototype`
+    /**
+     * Copies own properties (including accessor descriptors) from a source
+     * object to a target object.
+     *
+     * @method extend
+     * @param {Object} prototype Target object to copy properties to.
+     * @param {Object} api Source object to copy properties from.
+     * @return {Object} prototype object that was passed as first argument.
+     */
     extend: function(prototype, api) {
       if (prototype && api) {
         Object.getOwnPropertyNames(api).forEach(function(n) {
@@ -58,6 +66,25 @@
       return prototype || api;
     },
 
+    /**
+     * Copies props from a source object to a target object.
+     *
+     * Note, this method ueses a simple `for...in` strategy for enumerating
+     * properties.  To ensure only `ownProperties` are copied from source
+     * to target and that accessor implementations are copied, use `extend`.
+     *
+     * @method mixin
+     * @param {Object} target Target object to copy properties to.
+     * @param {Object} source Source object to copy properties from.
+     * @return {Object} Target object that was passed as first argument.
+     */
+    mixin: function(target, source) {
+      for (var i in source) {
+        target[i] = source[i];
+      }
+      return target;
+    },
+
     copyOwnProperty: function(name, source, target) {
       var pd = Object.getOwnPropertyDescriptor(source, name);
       if (pd) {

diff --git a/src/standard/utils.html b/src/standard/utils.html
@@ -298,25 +298,6 @@
         }
       }
       return elt;
-    },
-
-    /**
-     * Copies props from a source object to target a target object.
-     *
-     * Note, this method ueses a simple `for...in` strategy for enumerating
-     * properties.  To ensure only `ownProperties` are copied from source
-     * to target and that accessor implementations are copied, use `extend`.
-     *
-     * @method mixin
-     * @param {Object} target Target object to copy properties to.
-     * @param {Object} source Source object to copy properties from.
-     * @return {Object} Target object that was passed as first argument.
-     */
-    mixin: function(target, source) {
-      for (var i in source) {
-        target[i] = source[i];
-      }
-      return target;
     }
 
   });