Merge branch 'release/v3.0.0-rc.25'

uikit · Nov 30, 2018 · b4e0946 · b4e0946
2 parents 239656c + 67568f7
commit b4e0946
Show file tree

Hide file tree

Showing 17 changed files with 2,824 additions and 2,811 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -15,7 +15,7 @@ Also try to search for your issue. It may have already been answered or even fix
 <!-- BUG REPORT TEMPLATE -->
 ### UIkit version
 <!-- Check if the issue is reproducible with the latest stable version. -->
-3.0.0-rc.24
+3.0.0-rc.25
 
 ### Browser
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.0.0 rc 25 (November 30, 2018)
+
+### Fixed
+
+- Fix `hasClass` in IE11 again
+- Fix workaround to mitigate the duplicating icons issue
+
 ## 3.0.0 rc 24 (November 23, 2018)
 
 ### Changed

diff --git a/dist/css/uikit-rtl.css b/dist/css/uikit-rtl.css
@@ -1,4 +1,4 @@
-/*! UIkit 3.0.0-rc.24 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.25 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */

diff --git a/dist/css/uikit-rtl.min.css b/dist/css/uikit-rtl.min.css
diff --git a/dist/css/uikit.css b/dist/css/uikit.css
@@ -1,4 +1,4 @@
-/*! UIkit 3.0.0-rc.24 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.25 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */

diff --git a/dist/css/uikit.min.css b/dist/css/uikit.min.css
diff --git a/dist/js/uikit-icons.js b/dist/js/uikit-icons.js
diff --git a/dist/js/uikit-icons.min.js b/dist/js/uikit-icons.min.js
diff --git a/dist/js/uikit.js b/dist/js/uikit.js
@@ -1,4 +1,4 @@
-/*! UIkit 3.0.0-rc.24 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.25 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -1182,7 +1182,7 @@
     }
 
     function hasClass(element, cls) {
-        return cls && toNodes(element).some(function (element) { return element.classList.contains(cls); });
+        return cls && toNodes(element).some(function (element) { return element.classList.contains(cls.split(' ')[0]); });
     }
 
     function toggleClass(element) {
@@ -5445,13 +5445,16 @@
                     removeAttr(el, 'width');
                 }
 
+                var src = this$1.icon || this$1.src;
+                attr(el, 'data-svg', src);
+
                 var root = this$1.$el;
                 if (isVoidElement(root) || root.tagName === 'CANVAS') {
 
                     attr(root, {hidden: true, id: null});
 
                     var next = root.nextElementSibling;
-                    if (next && el.isEqualNode(next)) {
+                    if (src === attr(next, 'data-svg')) {
                         el = next;
                     } else {
                         after(root, el);
@@ -5460,7 +5463,7 @@
                 } else {
 
                     var last = root.lastElementChild;
-                    if (last && el.isEqualNode(last)) {
+                    if (src === attr(last, 'data-svg')) {
                         el = last;
                     } else {
                         append(root, el);
@@ -8199,7 +8202,7 @@
 
     }
 
-    UIkit.version = '3.0.0-rc.24';
+    UIkit.version = '3.0.0-rc.25';
 
     core(UIkit);
 

diff --git a/dist/js/uikit.min.js b/dist/js/uikit.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "uikit",
   "title": "UIkit",
   "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-  "version": "3.0.0-rc.24",
+  "version": "3.0.0-rc.25",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "scripts": {

diff --git a/src/js/core/svg.js b/src/js/core/svg.js
@@ -86,13 +86,16 @@ export default {
                 removeAttr(el, 'width');
             }
 
+            const src = this.icon || this.src;
+            attr(el, 'data-svg', src);
+
             const root = this.$el;
             if (isVoidElement(root) || root.tagName === 'CANVAS') {
 
                 attr(root, {hidden: true, id: null});
 
                 const next = root.nextElementSibling;
-                if (next && el.isEqualNode(next)) {
+                if (src === attr(next, 'data-svg')) {
                     el = next;
                 } else {
                     after(root, el);
@@ -101,7 +104,7 @@ export default {
             } else {
 
                 const last = root.lastElementChild;
-                if (last && el.isEqualNode(last)) {
+                if (src === attr(last, 'data-svg')) {
                     el = last;
                 } else {
                     append(root, el);

diff --git a/src/js/util/class.js b/src/js/util/class.js
@@ -19,7 +19,7 @@ export function replaceClass(element, ...args) {
 }
 
 export function hasClass(element, cls) {
-    return cls && toNodes(element).some(element => element.classList.contains(cls));
+    return cls && toNodes(element).some(element => element.classList.contains(cls.split(' ')[0]));
 }
 
 export function toggleClass(element, ...args) {