Merge pull request #37 from viivue/2.1.6

2.1.6
viivue · Feb 16, 2023 · 91fa9f4 · 91fa9f4
2 parents 022f382 + 5df2505
commit 91fa9f4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/dist/easy-tab-accordion.min.js b/dist/easy-tab-accordion.min.js
diff --git a/dist/easy-tab-accordion.module.js b/dist/easy-tab-accordion.module.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@viivue/easy-tab-accordion",
   "filename": "easy-tab-accordion",
   "prettyName": "Easy Tabs & Accordion",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Javascript library to create tabs or accordion.",
   "homepage": "https://github.com/viivue/easy-tab-accordion",
   "repository": {

diff --git a/src/animation.js b/src/animation.js
@@ -79,9 +79,6 @@ export function setTransition(target, duration){
  */
 export function removeTransition(target){
     setCSS(target, {
-        overflow: '',
-        transitionProperty: '',
-        transitionDuration: '',
         boxSizing: '',
         paddingTop: '',
         paddingBottom: '',

diff --git a/src/fade.js b/src/fade.js
@@ -10,9 +10,6 @@ import {getElementMarginHeight, removeTransition, setCSS, setTransition} from ".
  * @since 1.0.0
  */
 export function fadeOut(target, duration = 500, fn){
-    // before
-    setTransition(target, duration);
-
     // animate
     setCSS(target, {
         opacity: '0',
@@ -38,7 +35,6 @@ export function fadeOut(target, duration = 500, fn){
  */
 export function fadeIn(target, duration = 500, fn){
     // before
-    setTransition(target, duration);
     setTransition(target.parentElement, duration);
 
     // animate

diff --git a/src/methods.js b/src/methods.js
@@ -1,5 +1,5 @@
 import {responsive} from "./responsive";
-import {setCSS} from "./animation";
+import {setCSS, setTransition} from "./animation";
 import {getHash} from "./hash";
 
 export function initSetup(context){
@@ -44,6 +44,8 @@ export function initSetup(context){
                 setCSS(el, styleObj);
             }, 1);
         }
+
+        setTransition(el, context.options.duration);
     });
 
     assignTriggerElements(context);

diff --git a/src/slide.js b/src/slide.js
@@ -1,4 +1,4 @@
-import {setCSS, setTransition, removeTransition, getElementHeight} from "./animation";
+import {setCSS, removeTransition, getElementHeight} from "./animation";
 import {removeActiveClass} from "./helpers";
 
 
@@ -23,7 +23,6 @@ export function slideUp(target, duration = 500, fn){
         boxSizing: 'border-box',
         height
     });
-    setTransition(target, duration);
 
     // animate (set 10ms delay for CSS transition take effect)
     setTimeout(() => {
@@ -67,7 +66,6 @@ export function slideDown(target, duration = 500, fn){
             height: '0px',
             display: 'block'
         });
-        setTransition(target, duration);
     }
 
     // animate (set 10ms delay for CSS transition take effect)