Skip to content

Commit 8f16cac

Browse files
committed
Merge branch 'dev'
2 parents 214b5a6 + a032c2d commit 8f16cac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+9500
-25167
lines changed

.storybook/addons.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

.storybook/main.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

.storybook/preview-head.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

.storybook/preview.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

build/rollup.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const path = require('path')
44
const { babel } = require('@rollup/plugin-babel')
5-
const resolve = require('@rollup/plugin-node-resolve')
5+
const { nodeResolve } = require('@rollup/plugin-node-resolve')
66
const banner = require('./banner.js')
77
const replace = require('@rollup/plugin-replace')
88

@@ -29,12 +29,12 @@ const globals = {
2929

3030
if (BUNDLE) {
3131
fileDest += '.bundle'
32-
// Remove last entry in external array to bundle Popper and Perfect Scrollbar
32+
// Remove entries to bundle Popper and Perfect Scrollbar
3333
external.pop()
3434
external.pop()
3535
delete globals['@popperjs/core']
3636
delete globals['perfect-scrollbar']
37-
plugins.push(resolve())
37+
plugins.push(nodeResolve())
3838
}
3939

4040
const rollupConfig = {

js/index.esm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* CoreUI (v3.2.2): index.esm.js
3+
* CoreUI (v3.3.0): index.esm.js
44
* Licensed under MIT (https://coreui.io/license)
55
* --------------------------------------------------------------------------
66
*/

js/index.umd.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* CoreUI (v3.2.2): index.umd.js
3+
* CoreUI (v3.3.0): index.umd.js
44
* Licensed under MIT (https://coreui.io/license)
55
* --------------------------------------------------------------------------
66
*/

js/src/alert.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* CoreUI (v3.2.2): alert.js
3+
* CoreUI (v3.3.0): alert.js
44
* Licensed under MIT (https://coreui.io/license)
55
*
66
* This component is a modified version of the Bootstrap's alert.js
@@ -65,10 +65,7 @@ class Alert {
6565
// Public
6666

6767
close(element) {
68-
let rootElement = this._element
69-
if (element) {
70-
rootElement = this._getRootElement(element)
71-
}
68+
const rootElement = element ? this._getRootElement(element) : this._element
7269

7370
const customEvent = this._triggerCloseEvent(rootElement)
7471

@@ -104,8 +101,7 @@ class Alert {
104101

105102
const transitionDuration = getTransitionDurationFromElement(element)
106103

107-
EventHandler
108-
.one(element, TRANSITION_END, () => this._destroyElement(element))
104+
EventHandler.one(element, TRANSITION_END, () => this._destroyElement(element))
109105
emulateTransitionEnd(element, transitionDuration)
110106
}
111107

@@ -153,8 +149,7 @@ class Alert {
153149
* Data Api implementation
154150
* ------------------------------------------------------------------------
155151
*/
156-
EventHandler
157-
.on(document, EVENT_CLICK_DATA_API, SELECTOR_DISMISS, Alert.handleDismiss(new Alert()))
152+
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DISMISS, Alert.handleDismiss(new Alert()))
158153

159154
const $ = getjQuery()
160155

js/src/async-load.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* CoreUI (v3.2.2): asyn-load.js
3+
* CoreUI (v3.3.0): asyn-load.js
44
* Licensed under MIT (https://coreui.io/license)
55
* --------------------------------------------------------------------------
66
*/

js/src/button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* CoreUI (v3.2.2): button.js
3+
* CoreUI (v3.3.0): button.js
44
* Licensed under MIT (https://coreui.io/license)
55
*
66
* This component is a modified version of the Bootstrap's buttons.js

0 commit comments

Comments
 (0)