fix identify

bem · Oct 24, 2016 · b3c90a5 · b3c90a5
1 parent 4cbb74c
commit b3c90a5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/common.blocks/identify/identify.vanilla.js b/common.blocks/identify/identify.vanilla.js
@@ -6,15 +6,19 @@ modules.define('identify', function(provide) {
 
 var counter = 0,
     expando = '__' + (+new Date),
+    global = this.global,
     get = function() {
         return 'uniq' + (++counter);
     },
     identify = function(obj) {
         if((typeof obj === 'object' && obj !== null) || typeof obj === 'function') {
-            var key = 'uniqueID' in obj && obj !== document ?
-                'uniqueID' :
-                expando; // Use when possible native uniqueID for elements in IE
-
+            var key;
+            if('uniqueID' in obj) {
+                obj === global.document && (obj = obj.documentElement);
+                key = 'uniqueID';
+            } else {
+                key = expando;
+            }
             return key in obj?
                 obj[key] :
                 obj[key] = get();

diff --git a/test/dist/fixtures/desktop.html b/test/dist/fixtures/desktop.html
@@ -27,30 +27,30 @@
         </script>
         <script src="../../../common.blocks/cookie/cookie.spec.js"></script>
         <script src="../../../common.blocks/dom/dom.spec.js"></script>
-        <script src="../../../common.blocks/events/events.spec.js"></script>
         <script src="../../../common.blocks/functions/functions.spec.js"></script>
-        <script src="../../../common.blocks/i-bem/i-bem.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/i-bem-dom.spec.js"></script>
+        <script src="../../../common.blocks/i-bem/i-bem.spec.js"></script>
+        <script src="../../../common.blocks/events/events.spec.js"></script>
         <script src="../../../common.blocks/i18n/i18n.spec.js"></script>
         <script src="../../../common.blocks/identify/identify.spec.js"></script>
         <script src="../../../common.blocks/inherit/inherit.spec.js"></script>
         <script src="../../../common.blocks/next-tick/next-tick.spec.js"></script>
         <script src="../../../common.blocks/objects/objects.spec.js"></script>
         <script src="../../../common.blocks/tick/tick.spec.js"></script>
         <script src="../../../common.blocks/uri/uri.spec.js"></script>
-        <script src="../../../common.blocks/events/__observable/events__observable.spec.js"></script>
         <script src="../../../common.blocks/functions/__debounce/functions__debounce.spec.js"></script>
         <script src="../../../common.blocks/functions/__throttle/functions__throttle.spec.js"></script>
-        <script src="../../../common.blocks/i-bem/__collection/i-bem__collection.spec.js"></script>
-        <script src="../../../common.blocks/i-bem/__internal/i-bem__internal.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/__collection/i-bem-dom__collection.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/__init/i-bem-dom__init.spec.js"></script>
+        <script src="../../../common.blocks/i-bem/__collection/i-bem__collection.spec.js"></script>
+        <script src="../../../common.blocks/i-bem/__internal/i-bem__internal.spec.js"></script>
+        <script src="../../../common.blocks/events/__observable/events__observable.spec.js"></script>
         <script src="../../../common.blocks/loader/_type/loader_type_js.spec.js"></script>
         <script src="../../../common.blocks/strings/__escape/strings__escape.spec.js"></script>
         <script src="../../../common.blocks/uri/__querystring/uri__querystring.spec.js"></script>
-        <script src="../../../common.blocks/events/__observable/_type/events__observable_type_bem-dom.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/__events/_type/i-bem-dom__events_type_bem.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/__events/_type/i-bem-dom__events_type_dom.spec.js"></script>
+        <script src="../../../common.blocks/events/__observable/_type/events__observable_type_bem-dom.spec.js"></script>
         <script src="../../../common.blocks/jquery/__event/_type/jquery__event_type_pointerclick.spec.js"></script>
         <script src="../../../common.blocks/jquery/__event/_type/jquery__event_type_pointernative.spec.js"></script>
         <script src="../../../common.blocks/jquery/__event/_type/jquery__event_type_pointerpressrelease.spec.js"></script>

diff --git a/test/dist/fixtures/touch.html b/test/dist/fixtures/touch.html
@@ -25,24 +25,24 @@
                     });
             }());
         </script>
-        <script src="../../../common.blocks/dom/dom.spec.js"></script>
         <script src="../../../common.blocks/cookie/cookie.spec.js"></script>
+        <script src="../../../common.blocks/dom/dom.spec.js"></script>
         <script src="../../../common.blocks/events/events.spec.js"></script>
         <script src="../../../common.blocks/functions/functions.spec.js"></script>
         <script src="../../../common.blocks/i-bem/i-bem.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/i-bem-dom.spec.js"></script>
-        <script src="../../../common.blocks/identify/identify.spec.js"></script>
         <script src="../../../common.blocks/i18n/i18n.spec.js"></script>
+        <script src="../../../common.blocks/identify/identify.spec.js"></script>
         <script src="../../../common.blocks/inherit/inherit.spec.js"></script>
-        <script src="../../../common.blocks/next-tick/next-tick.spec.js"></script>
         <script src="../../../common.blocks/objects/objects.spec.js"></script>
+        <script src="../../../common.blocks/next-tick/next-tick.spec.js"></script>
         <script src="../../../common.blocks/tick/tick.spec.js"></script>
         <script src="../../../common.blocks/uri/uri.spec.js"></script>
         <script src="../../../common.blocks/events/__observable/events__observable.spec.js"></script>
-        <script src="../../../common.blocks/functions/__throttle/functions__throttle.spec.js"></script>
         <script src="../../../common.blocks/functions/__debounce/functions__debounce.spec.js"></script>
-        <script src="../../../common.blocks/i-bem/__internal/i-bem__internal.spec.js"></script>
+        <script src="../../../common.blocks/functions/__throttle/functions__throttle.spec.js"></script>
         <script src="../../../common.blocks/i-bem/__collection/i-bem__collection.spec.js"></script>
+        <script src="../../../common.blocks/i-bem/__internal/i-bem__internal.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/__collection/i-bem-dom__collection.spec.js"></script>
         <script src="../../../common.blocks/i-bem-dom/__init/i-bem-dom__init.spec.js"></script>
         <script src="../../../common.blocks/loader/_type/loader_type_js.spec.js"></script>