uikit 3.9.5-dev.1c5ab040d → 3.9.5-dev.600ee2ba9

package/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.9.5-dev.1c5ab040d",
+  "version": "3.9.5-dev.600ee2ba9",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/drop.js

@@ -1,7 +1,7 @@
 import Container from '../mixin/container';
 import Position from '../mixin/position';
 import Togglable from '../mixin/togglable';
-import {addClass, append, apply, css, hasClass, includes, isTouch, matches, MouseTracker, offset, on, once, parent, pointerCancel, pointerDown, pointerEnter, pointerLeave, pointerUp, query, removeClass, toggleClass, within} from 'uikit-util';
+import {addClass, append, apply, attr, css, hasClass, includes, isTouch, matches, MouseTracker, offset, on, once, parent, pointerCancel, pointerDown, pointerEnter, pointerLeave, pointerUp, query, removeClass, toggleClass, within} from 'uikit-util';
 
 export let active;
 
@@ -62,7 +62,8 @@ export default {
             this.target = this.$create('toggle', query(this.toggle, this.$el), {
                 target: this.$el,
                 mode: this.mode
-            });
+            }).$el;
+            attr(this.target, 'aria-haspopup', true);
         }
 
     },

package/src/js/core/img.js

@@ -2,7 +2,10 @@ import {attr, children, createEvent, css, data, Dimensions, escape, getImage, in
 
 export default {
 
+    args: 'dataSrc',
+
     props: {
+        dataSrc: String,
         width: Number,
         height: Number,
         offsetTop: String,
@@ -11,6 +14,7 @@ export default {
     },
 
     data: {
+        dataSrc: '',
         width: false,
         height: false,
         offsetTop: '50vh',
@@ -20,16 +24,8 @@ export default {
 
     computed: {
 
-        cacheKey() {
-            return `${this.$name}.${data(this.$el, 'data-src')}`;
-        },
-
-        width({width, dataWidth}) {
-            return width || dataWidth;
-        },
-
-        height({height, dataHeight}) {
-            return height || dataHeight;
+        cacheKey({dataSrc}) {
+            return `${this.$name}.${dataSrc}`;
         },
 
         target: {
@@ -64,7 +60,7 @@ export default {
         if (storage[this.cacheKey]) {
             setSrcAttrs(this.$el, storage[this.cacheKey]);
         } else if (isImg(this.$el) && this.width && this.height) {
-            attr(this.$el, 'src', getPlaceholderImage(this.$el) || null);
+            attr(this.$el, 'src', getPlaceholderImage(this.$el));
         }
 
         this.observer = new IntersectionObserver(this.load, {
@@ -127,7 +123,7 @@ export default {
                 return;
             }
 
-            this._data.image = getImageFromElement(this.$el).then(img => {
+            this._data.image = getImageFromElement(this.$el, this.dataSrc).then(img => {
 
                 setSrcAttrs(this.$el, currentSrc(img));
                 storage[this.cacheKey] = currentSrc(img);
@@ -161,6 +157,7 @@ function setSrcAttrs(el, src) {
                 }
             })
         );
+        attr(el, 'src', src);
     } else if (src) {
 
         const change = !includes(el.style.backgroundImage, src);
@@ -201,10 +198,15 @@ function sizesToPixel(sizes) {
     return matches || '100vw';
 }
 
-function getImageFromElement(el) {
+function getImageFromElement(el, src) {
     const parentNode = parent(el);
+
+    if (!src) {
+        return Promise.reject(createEvent('error', false));
+    }
+
     if (!isPicture(parentNode)) {
-        return getImage(...srcProps.map(prop => data(el, prop)));
+        return getImage(src, ...srcProps.slice(1).map(prop => data(el, prop)));
     }
 
     return new Promise((resolve, reject) => {