From 0da05c347cfe4c5eb3dceb84714b93096ac5f3a9 Mon Sep 17 00:00:00 2001 From: codecalm Date: Mon, 27 Jan 2020 00:20:02 +0100 Subject: [PATCH] tabler javascript rebuild --- build/banner.js | 7 ------- js/tabler.js | 38 ++++++++++++++++++++++++-------------- package.json | 5 +++-- pages/_data/libs.json | 3 +-- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/build/banner.js b/build/banner.js index 611e2b019..553828755 100644 --- a/build/banner.js +++ b/build/banner.js @@ -1,10 +1,3 @@ -/* - * Tabler (v0.9.0): banner.js - * Copyright 2018-2019 The Tabler Authors - * Copyright 2018-2019 codecalm - * Licensed under MIT (https://github.com/tabler/tabler/blob/master/LICENSE) - */ - 'use strict'; const pkg = require('../package.json'), diff --git a/js/tabler.js b/js/tabler.js index dbba33da6..ce9c2c4fb 100644 --- a/js/tabler.js +++ b/js/tabler.js @@ -1,12 +1,26 @@ -import {CountUp} from "countup.js"; +'use strict'; -document.addEventListener("DOMContentLoaded", function () { +import {CountUp} from "countup.js"; +import {Dropdown, Tooltip, Popover} from 'bootstrap'; +import 'popper.js'; + + +(function() { + /** + * Dropdown + */ + var dropdownElementList = [].slice.call(document.querySelectorAll('[data-toggle="dropdown"]')) + dropdownElementList.map(function (dropdownToggleEl) { + console.log('dropdownToggleEl', dropdownToggleEl); + return new Dropdown(dropdownToggleEl, {}) + }); + /** * Tooltip */ var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="tooltip"]')); tooltipTriggerList.map(function (tooltipTriggerEl) { - return new bootstrap.Tooltip(tooltipTriggerEl, {}) + return new Tooltip(tooltipTriggerEl, {}) }); /* @@ -14,7 +28,7 @@ document.addEventListener("DOMContentLoaded", function () { */ var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="popover"]')); popoverTriggerList.map(function (popoverTriggerEl) { - return new bootstrap.Popover(popoverTriggerEl, { + return new Popover(popoverTriggerEl, { autoHide: true }) }); @@ -22,13 +36,9 @@ document.addEventListener("DOMContentLoaded", function () { /* CountUp */ - let countups = document.querySelectorAll("[data-countup]"); - for (let i = 0; i < countups.length; i++) { - let dataCountUp; - if (countups[i].getAttribute("data-countup")) { - dataCountUp = JSON.parse(countups[i].getAttribute("data-countup")); - } - let countup = new CountUp(countups[i], parseFloat(countups[i].innerText), dataCountUp); - countup.start(); - } -}); \ No newline at end of file + let countupTriggerList = [].slice.call(document.querySelectorAll("[data-countup]")); + countupTriggerList.map(function (countupTriggerEl) { + let dataCountUp = JSON.parse(countupTriggerEl.getAttribute("data-countup")); + return (new CountUp(countupTriggerEl, parseFloat(countupTriggerEl.innerText), dataCountUp)).start(); + }); +})(); \ No newline at end of file diff --git a/package.json b/package.json index 027133519..96cf0e552 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tabler", - "version": "v1.0.0-alpha", - "version_short": "v1.0.0-alpha", + "version": "1.0.0-alpha", + "version_short": "1.0.0-alpha", "description": "Premium and Open Source dashboard template with responsive and high quality UI.", "scripts": { "start": "npm-run-all clean css-main js-compile-standalone --parallel browsersync watch", @@ -120,6 +120,7 @@ "jquery": "3.4.1", "jqvmap": "1.5.1", "peity": "3.3.0", + "popper.js": "1.16.1", "selectize": "0.12.6" }, "resolutions": { diff --git a/pages/_data/libs.json b/pages/_data/libs.json index a9537bc95..cc741f907 100644 --- a/pages/_data/libs.json +++ b/pages/_data/libs.json @@ -1,10 +1,9 @@ { "global-libs": [ - "jquery", "bootstrap" + "jquery" ], "js": { "jquery": "jquery/dist/jquery.slim.min.js", - "bootstrap": "bootstrap/dist/js/bootstrap.bundle.min.js", "autosize": "autosize/dist/autosize.min.js", "imask": "imask/dist/imask.min.js", "selectize": "selectize/dist/js/standalone/selectize.min.js",