uikit 3.11.2-dev.28b7953b9 → 3.11.2-dev.29f2881ed

package/src/js/core/margin.js

@@ -1,42 +1,37 @@
-import {isRtl, isVisible, offsetPosition, toggleClass} from 'uikit-util';
+import { isRtl, isVisible, offsetPosition, toggleClass } from 'uikit-util';
 
 export default {
-
     props: {
         margin: String,
-        firstColumn: Boolean
+        firstColumn: Boolean,
     },
 
     data: {
         margin: 'uk-margin-small-top',
-        firstColumn: 'uk-first-column'
+        firstColumn: 'uk-first-column',
     },
 
     update: {
-
         read() {
-
             const rows = getRows(this.$el.children);
 
             return {
                 rows,
-                columns: getColumns(rows)
+                columns: getColumns(rows),
             };
         },
 
-        write({columns, rows}) {
-            for (let i = 0; i < rows.length; i++) {
-                for (let j = 0; j < rows[i].length; j++) {
-                    toggleClass(rows[i][j], this.margin, i !== 0);
-                    toggleClass(rows[i][j], this.firstColumn, !!~columns[0].indexOf(rows[i][j]));
+        write({ columns, rows }) {
+            for (const row of rows) {
+                for (const column of row) {
+                    toggleClass(column, this.margin, rows[0] !== row);
+                    toggleClass(column, this.firstColumn, !!~columns[0].indexOf(column));
                 }
             }
         },
 
-        events: ['resize']
-
-    }
-
+        events: ['resize'],
+    },
 };
 
 export function getRows(items) {
@@ -44,38 +39,30 @@ export function getRows(items) {
 }
 
 function getColumns(rows) {
-
     const columns = [];
 
-    for (let i = 0; i < rows.length; i++) {
-        const sorted = sortBy(rows[i], 'left', 'right');
+    for (const row of rows) {
+        const sorted = sortBy(row, 'left', 'right');
         for (let j = 0; j < sorted.length; j++) {
-            columns[j] = !columns[j] ? sorted[j] : columns[j].concat(sorted[j]);
+            columns[j] = columns[j] ? columns[j].concat(sorted[j]) : sorted[j];
         }
     }
 
-    return isRtl
-        ? columns.reverse()
-        : columns;
+    return isRtl ? columns.reverse() : columns;
 }
 
 function sortBy(items, startProp, endProp) {
-
     const sorted = [[]];
 
-    for (let i = 0; i < items.length; i++) {
-
-        const el = items[i];
-
+    for (const el of items) {
         if (!isVisible(el)) {
             continue;
         }
 
         let dim = getOffset(el);
 
-        for (let j = sorted.length - 1; j >= 0; j--) {
-
-            const current = sorted[j];
+        for (let i = sorted.length - 1; i >= 0; i--) {
+            const current = sorted[i];
 
             if (!current[0]) {
                 current.push(el);
@@ -100,21 +87,18 @@ function sortBy(items, startProp, endProp) {
                 break;
             }
 
-            if (j === 0) {
+            if (i === 0) {
                 sorted.unshift([el]);
                 break;
             }
-
         }
-
     }
 
     return sorted;
 }
 
 function getOffset(element, offset = false) {
-
-    let {offsetTop, offsetLeft, offsetHeight, offsetWidth} = element;
+    let { offsetTop, offsetLeft, offsetHeight, offsetWidth } = element;
 
     if (offset) {
         [offsetTop, offsetLeft] = offsetPosition(element);
@@ -124,6 +108,6 @@ function getOffset(element, offset = false) {
         top: offsetTop,
         left: offsetLeft,
         bottom: offsetTop + offsetHeight,
-        right: offsetLeft + offsetWidth
+        right: offsetLeft + offsetWidth,
     };
 }

package/src/js/core/modal.js

@@ -1,8 +1,18 @@
 import Modal from '../mixin/modal';
-import {$, addClass, assign, css, Deferred, hasClass, height, html, isString, on, Promise, removeClass} from 'uikit-util';
+import {
+    $,
+    addClass,
+    css,
+    Deferred,
+    hasClass,
+    height,
+    html,
+    isString,
+    on,
+    removeClass,
+} from 'uikit-util';
 
 export default {
-
     install,
 
     mixins: [Modal],
@@ -10,18 +20,17 @@ export default {
     data: {
         clsPage: 'uk-modal-page',
         selPanel: '.uk-modal-dialog',
-        selClose: '.uk-modal-close, .uk-modal-close-default, .uk-modal-close-outside, .uk-modal-close-full'
+        selClose:
+            '.uk-modal-close, .uk-modal-close-default, .uk-modal-close-outside, .uk-modal-close-full',
     },
 
     events: [
-
         {
             name: 'show',
 
             self: true,
 
             handler() {
-
                 if (hasClass(this.panel, 'uk-margin-auto-vertical')) {
                     addClass(this.$el, 'uk-flex');
                 } else {
@@ -29,7 +38,7 @@ export default {
                 }
 
                 height(this.$el); // force reflow
-            }
+            },
         },
 
         {
@@ -38,21 +47,15 @@ export default {
             self: true,
 
             handler() {
-
                 css(this.$el, 'display', '');
                 removeClass(this.$el, 'uk-flex');
-
-            }
-        }
-
-    ]
-
+            },
+        },
+    ],
 };
 
-function install({modal}) {
-
+function install({ modal }) {
     modal.dialog = function (content, options) {
-
         const dialog = modal(
             `<div class="uk-modal">
                 <div class="uk-modal-dialog">${content}</div>
@@ -62,10 +65,14 @@ function install({modal}) {
 
         dialog.show();
 
-        on(dialog.$el, 'hidden', () =>
-            Promise.resolve().then(() =>
-                dialog.$destroy(true)
-            ), {self: true}
+        on(
+            dialog.$el,
+            'hidden',
+            async () => {
+                await Promise.resolve();
+                dialog.$destroy(true);
+            },
+            { self: true }
         );
 
         return dialog;
@@ -73,64 +80,71 @@ function install({modal}) {
 
     modal.alert = function (message, options) {
         return openDialog(
-            ({labels}) => `<div class="uk-modal-body">${isString(message) ? message : html(message)}</div>
+            ({ labels }) => `<div class="uk-modal-body">${
+                isString(message) ? message : html(message)
+            }</div>
             <div class="uk-modal-footer uk-text-right">
-                <button class="uk-button uk-button-primary uk-modal-close" autofocus>${labels.ok}</button>
+                <button class="uk-button uk-button-primary uk-modal-close" autofocus>${
+                    labels.ok
+                }</button>
             </div>`,
             options,
-            deferred => deferred.resolve()
+            (deferred) => deferred.resolve()
         );
     };
 
     modal.confirm = function (message, options) {
         return openDialog(
-            ({labels}) => `<form>
+            ({ labels }) => `<form>
                 <div class="uk-modal-body">${isString(message) ? message : html(message)}</div>
                 <div class="uk-modal-footer uk-text-right">
-                    <button class="uk-button uk-button-default uk-modal-close" type="button">${labels.cancel}</button>
+                    <button class="uk-button uk-button-default uk-modal-close" type="button">${
+                        labels.cancel
+                    }</button>
                     <button class="uk-button uk-button-primary" autofocus>${labels.ok}</button>
                 </div>
             </form>`,
             options,
-            deferred => deferred.reject()
+            (deferred) => deferred.reject()
         );
     };
 
     modal.prompt = function (message, value, options) {
         return openDialog(
-            ({labels}) => `<form class="uk-form-stacked">
+            ({ labels }) => `<form class="uk-form-stacked">
                 <div class="uk-modal-body">
                     <label>${isString(message) ? message : html(message)}</label>
                     <input class="uk-input" value="${value || ''}" autofocus>
                 </div>
                 <div class="uk-modal-footer uk-text-right">
-                    <button class="uk-button uk-button-default uk-modal-close" type="button">${labels.cancel}</button>
+                    <button class="uk-button uk-button-default uk-modal-close" type="button">${
+                        labels.cancel
+                    }</button>
                     <button class="uk-button uk-button-primary">${labels.ok}</button>
                 </div>
             </form>`,
             options,
-            deferred => deferred.resolve(null),
-            dialog => $('input', dialog.$el).value
+            (deferred) => deferred.resolve(null),
+            (dialog) => $('input', dialog.$el).value
         );
     };
 
     modal.labels = {
         ok: 'Ok',
-        cancel: 'Cancel'
+        cancel: 'Cancel',
     };
 
     function openDialog(tmpl, options, hideFn, submitFn) {
-
-        options = assign({bgClose: false, escClose: true, labels: modal.labels}, options);
+        options = { bgClose: false, escClose: true, labels: modal.labels, ...options };
 
         const dialog = modal.dialog(tmpl(options), options);
         const deferred = new Deferred();
 
         let resolved = false;
 
-        on(dialog.$el, 'submit', 'form', e => {
+        on(dialog.$el, 'submit', 'form', (e) => {
             e.preventDefault();
-            deferred.resolve(submitFn && submitFn(dialog));
+            deferred.resolve(submitFn?.(dialog));
             resolved = true;
             dialog.hide();
         });
@@ -141,5 +155,4 @@ function install({modal}) {
 
         return deferred.promise;
     }
-
 }

package/src/js/core/nav.js

@@ -1,13 +1,11 @@
 import Accordion from './accordion';
 
 export default {
-
     extends: Accordion,
 
     data: {
         targets: '> .uk-parent',
         toggle: '> a',
-        content: '> ul'
-    }
-
+        content: '> ul',
+    },
 };