Performance improvements in other events

Improved scroll performance
Remove media
2020-07-21 16:35:00 +02:00 · 2020-07-21 16:21:58 +02:00 · 2020-07-17 18:05:44 +02:00 · 2020-07-17 18:04:01 +02:00 · 2020-07-17 18:01:33 +02:00 · 2020-07-17 18:01:17 +02:00
12 changed files with 82 additions and 62 deletions
--- a/README.md
+++ b/README.md
@ -1,23 +1,28 @@
 # FFNM (Front-End for the next master)

-Simple utility to **avoid writing Javascript** when working with **classes**. It only takes up **2Kb**!
+``` html
+<button i-click="class:add('open', 'article')">open</button>

-Simplifies the click
+<article></article>
+```
+👇 🖱 **Click!** 👇
+``` html
+<button i-click="class:add('open', 'article')">open</button>

-Modify others
+<article class="open"></article>
+```

-Simplifies the scroll
+Simple utility to **avoid writing Javascript** when working with **classes**. It only takes up **2.5Kb**!

-Scroll up
+- Simplifies the **click**.

-Scroll down
-
-Simplifies Hover
+- Simplifies the **scroll**.

+- Simplifies **hover**.

 ## DEMOS

-[Click](https://codepen.io/androsfenollosa/pen/dyGdRVE)
+[Click](https://codepen.io/androsfenollosa/pen/dyGdRVE) | [Scroll](https://codepen.io/androsfenollosa/pen/xxZQxNV)

 ## Documentation

@ -33,7 +38,7 @@ Simplifies Hover
 Add to your `<head>` the following tag.

 ```html
-<script src="https://cdn.jsdelivr.net/gh/tanrax/FFNM@v1.2.0/dist/ffnm.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/tanrax/FFNM@v1.2.3/dist/ffnm.min.js"></script>
 ```

 ### Examples
@ -144,7 +149,7 @@ Add to your `<head>` the following tag.
 Añade a tu `<head>` la siguiente etiqueta.

 ```html
-<script src="https://cdn.jsdelivr.net/gh/tanrax/FFNM@v1.2.0/dist/ffnm.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/tanrax/FFNM@v1.2.3/dist/ffnm.min.js"></script>
 ```

 ### Ejemplos de uso
--- a/dist/ffnm.min.js
+++ b/dist/ffnm.min.js
@ -1,2 +1,2 @@
-document.addEventListener("DOMContentLoaded",()=>{const e={class:["add","remove","toggle"]};let t=[],c=void 0;function s(e,t){let c=e.getAttribute(t),s=RegExp("^(\\w+):").exec(c)[1],a=RegExp(":(\\w+)\\(").exec(c)[1],l=RegExp("\\('(\\w+)',?").exec(c)[1],o=RegExp(", *'([#,.,a-zA-Z]\\w*)'\\)");return{functionParent:s,functionChild:a,value:l,target:null!==o.exec(c)?o.exec(c)[1]:void 0}}t=[],["i-click","i-scroll-up","i-scroll-down","i-hover"].map(c=>[...document.querySelectorAll(`[${c}]`)].map(s=>{let a=Object.keys(e).map(t=>e[t].map(e=>RegExp(`^${t}:${e}\\('\\w+'(, *'[#,.,a-zA-Z]\\w*')?\\)$`).test(s.getAttribute(c))).some(e=>e)).every(e=>e);return a?t.push(s):(console.error("FFNM: Bad syntax"),console.error(s)),a}).every(e=>e)).every(e=>e),[...document.querySelectorAll("[i-click]")].forEach(e=>{let t=s(e,"i-click");switch(t.functionParent){case"class":[...document.querySelectorAll(t.target)].concat(e).forEach(c=>{e.addEventListener("click",()=>{switch(t.functionChild){case"add":c.classList.add(t.value);break;case"remove":c.classList.remove(t.value);break;case"toggle":c.classList.toggle(t.value)}})})}}),window.addEventListener("scroll",()=>{let e=window.pageYOffset||document.documentElement.scrollTop;[...document.querySelectorAll("[i-scroll-down]")].forEach(t=>{if(e>c){let e=s(t,"i-scroll-down");switch(e.functionParent){case"class":switch(e.functionChild){case"add":t.classList.add(e.value);break;case"remove":t.classList.remove(e.value)}}}}),[...document.querySelectorAll("[i-scroll-up]")].forEach(t=>{if(e<=c){let e=s(t,"i-scroll-up");switch(e.functionParent){case"class":switch(e.functionChild){case"add":t.classList.add(e.value);break;case"remove":t.classList.remove(e.value)}}}}),c=e<=0?0:e},!1),[...document.querySelectorAll("[i-hover]")].forEach(e=>{let t=s(e,"i-hover");switch(t.functionParent){case"class":[...document.querySelectorAll(t.target)].concat(e).forEach(c=>{switch(t.functionChild){case"add":e.addEventListener("mouseenter",()=>{c.classList.add(t.value)}),e.addEventListener("mouseout",()=>{c.classList.remove(t.value)});break;case"remove":e.addEventListener("mouseenter",()=>{c.classList.remove(t.value)}),e.addEventListener("mouseout",()=>{c.classList.add(t.value)});break;case"toggle":e.addEventListener("mouseenter",()=>{c.classList.toggle(t.value)}),e.addEventListener("mouseout",()=>{c.classList.toggle(t.value)})}})}})});
+document.addEventListener("DOMContentLoaded",()=>{const e={class:["add","remove","toggle"]};let t=[],s=void 0;function a(e,t){let s=e.getAttribute(t),a=RegExp("^(\\w+):").exec(s)[1],c=RegExp(":(\\w+)\\(").exec(s)[1],o=RegExp("\\('(\\w[_-\\w0-9]+)',?").exec(s)[1],l=RegExp(", ?'([.#i\\w][_-\\w0-9]+)'\\)");return{functionParent:a,functionChild:c,value:o,target:null!==l.exec(s)?l.exec(s)[1]:void 0}}function c(e){return[...t].filter(t=>t.hasAttribute(e))}t=[],["i-click","i-scroll-up","i-scroll-down","i-hover"].map(s=>[...document.querySelectorAll(`[${s}]`)].map(a=>{let c=Object.keys(e).map(t=>e[t].map(e=>RegExp(`^${t}:${e}\\('.+'(, ?'[.#i\\w][_-\\w0-9]+')?\\)$`).test(a.getAttribute(s))).some(e=>e)).every(e=>e);return c?t.push(a):(console.error("FFNM: Bad syntax"),console.error(a)),c}).every(e=>e)).every(e=>e),c("i-click").forEach(e=>{let t=a(e,"i-click");switch(t.functionParent){case"class":[...document.querySelectorAll(t.target)].concat(void 0===t.target?e:void 0).forEach(s=>{void 0!==s&&e.addEventListener("click",()=>{switch(t.functionChild){case"add":s.classList.add(t.value);break;case"remove":s.classList.remove(t.value);break;case"toggle":s.classList.toggle(t.value)}})})}}),function(){let e=c("i-scroll-down"),t=c("i-scroll-up");window.addEventListener("scroll",()=>{let c=window.pageYOffset||document.documentElement.scrollTop;e.forEach(e=>{if(c>s){let t=a(e,"i-scroll-down");switch(t.functionParent){case"class":switch(t.functionChild){case"add":e.classList.add(t.value);break;case"remove":e.classList.remove(t.value)}}}}),t.forEach(e=>{if(c<=s){let t=a(e,"i-scroll-up");switch(t.functionParent){case"class":switch(t.functionChild){case"add":e.classList.add(t.value);break;case"remove":e.classList.remove(t.value)}}}}),s=c<=0?0:c},!1)}(),c("i-hover").forEach(e=>{let t=a(e,"i-hover");switch(t.functionParent){case"class":[...document.querySelectorAll(t.target)].concat(void 0===t.target?e:void 0).forEach(s=>{if(void 0!==s)switch(t.functionChild){case"add":e.addEventListener("mouseenter",()=>{s.classList.add(t.value)}),e.addEventListener("mouseout",()=>{s.classList.remove(t.value)});break;case"remove":e.addEventListener("mouseenter",()=>{s.classList.remove(t.value)}),e.addEventListener("mouseout",()=>{s.classList.add(t.value)});break;case"toggle":e.addEventListener("mouseenter",()=>{s.classList.toggle(t.value)}),e.addEventListener("mouseout",()=>{s.classList.toggle(t.value)})}})}})});
 //# sourceMappingURL=ffnm.min.js.map
--- a/media/carbon-config.json
+++ b/media/carbon-config.json
@ -1 +0,0 @@
-{"paddingVertical":"56px","paddingHorizontal":"56px","backgroundImage":null,"backgroundImageSelection":null,"backgroundMode":"color","backgroundColor":"rgba(171,184,195,0)","dropShadow":true,"dropShadowOffsetY":"20px","dropShadowBlurRadius":"68px","theme":"monokai","windowTheme":"none","language":"htmlmixed","fontFamily":"Hack","fontSize":"14px","lineHeight":"133%","windowControls":true,"widthAdjustment":true,"lineNumbers":false,"firstLineNumber":1,"exportSize":"2x","watermark":false,"squaredImage":false,"hiddenCharacters":false,"name":"","width":680}
--- a/media/other-click.png
+++ b/media/other-click.png
--- a/media/other-clicked.png
+++ b/media/other-clicked.png
--- a/media/scroll-down.png
+++ b/media/scroll-down.png
--- a/media/scroll-up.png
+++ b/media/scroll-up.png
--- a/media/scroll.png
+++ b/media/scroll.png
--- a/media/self-click.png
+++ b/media/self-click.png
--- a/media/self-clicked.png
+++ b/media/self-clicked.png
--- a/src/core.js
+++ b/src/core.js
@ -28,7 +28,7 @@ document.addEventListener('DOMContentLoaded', () => {
                let checked = Object.keys(FUNCTION_TREE).map((key) => {
                    // Check METHODS FUNCTION_TREE
                    return FUNCTION_TREE[key].map((method) => {
-                        return RegExp(`^${key}:${method}\\('\\w+'(, *'[#,.,a-zA-Z]\\w*')?\\)$`).test(element.getAttribute(event));
+                        return RegExp(`^${key}:${method}\\('.+'(, ?'[.#i\\w][_-\\w0-9]+')?\\)$`).test(element.getAttribute(event));
                    }).some(method => method);
                }).every(key => key);
                if(checked) {
@ -52,25 +52,36 @@ document.addEventListener('DOMContentLoaded', () => {
     */
    function splitParams(element, attribute) {
        let params = element.getAttribute(attribute);
-        let functionParent = RegExp(`^(\\w+):`).exec(params)[1];
-        let functionChild = RegExp(`:(\\w+)\\(`).exec(params)[1];
-        let value = RegExp(`\\(\'(\\w+)\',?`).exec(params)[1];
-        let resultTarget = RegExp(`, *\'([#,.,a-zA-Z]\\w*)\'\\)`);
+        let functionParent = RegExp("^(\\w+):").exec(params)[1];
+        let functionChild = RegExp(":(\\w+)\\(").exec(params)[1];
+        let value = RegExp("\\(\'(\\w[_-\\w0-9]+)\',?").exec(params)[1];
+        let resultTarget = RegExp(", ?\'([.#i\\w][_-\\w0-9]+)\'\\)");
        let target = resultTarget.exec(params) !== null ? resultTarget.exec(params)[1] : undefined;
        return {'functionParent': functionParent, 'functionChild': functionChild, 'value': value, 'target': target};
    }

+    /**
+     * Method that returns all validated elements filtered by an event
+     * return Array
+     */
+    function getElementsValidatesByEvent(nameEvent) {
+        return [...elementsValidates].filter(element => {
+            return element.hasAttribute(nameEvent);
+        });
+    }
+
    /**
     * Method add events i-click
     * return void
     */
    function addEventClick() {
        let eventClick = 'i-click';
-        return [...document.querySelectorAll(`[${eventClick}]`)].forEach((element) => {
+        return getElementsValidatesByEvent(eventClick).forEach((element) => {
            let params = splitParams(element, eventClick);
            switch(params.functionParent) {
                case 'class':
-                [...document.querySelectorAll(params.target)].concat(element).forEach((item) => {
+                [...document.querySelectorAll(params.target)].concat(params.target === undefined ? element : undefined).forEach((item) => {
+                    if (item !== undefined) {
                        element.addEventListener('click', () => {
                            switch(params.functionChild) {
                                case 'add':
@ -84,6 +95,7 @@ document.addEventListener('DOMContentLoaded', () => {
                                    break;
                            }
                        });
+                    }
                    });
                break;
            }
@ -97,10 +109,12 @@ document.addEventListener('DOMContentLoaded', () => {
    function addEventScroll() {
        let eventScrollDown = 'i-scroll-down';
        let eventScrollUp = 'i-scroll-up';
+        let elementsDown = getElementsValidatesByEvent(eventScrollDown);
+        let elementsUp = getElementsValidatesByEvent(eventScrollUp);
        window.addEventListener("scroll", () => {
            let posScroll = window.pageYOffset || document.documentElement.scrollTop;
            // Scroll down
-            [...document.querySelectorAll(`[${eventScrollDown}]`)].forEach((element) => {
+            elementsDown.forEach((element) => {
                if (posScroll > lastScrollTop) {
                    let params = splitParams(element, eventScrollDown);
                    switch(params.functionParent) {
@ -118,7 +132,7 @@ document.addEventListener('DOMContentLoaded', () => {
                }
            });
            // Scroll up
-            [...document.querySelectorAll(`[${eventScrollUp}]`)].forEach((element) => {
+            elementsUp.forEach((element) => {
                if (posScroll <= lastScrollTop) {
                    let params = splitParams(element, eventScrollUp);
                    switch(params.functionParent) {
@ -146,11 +160,12 @@ document.addEventListener('DOMContentLoaded', () => {
     */
    function addEventHover() {
        let eventHover = 'i-hover';
-        return [...document.querySelectorAll(`[${eventHover}]`)].forEach((element) => {
+        return getElementsValidatesByEvent(eventHover).forEach((element) => {
            let params = splitParams(element, eventHover);
            switch(params.functionParent) {
                case 'class':
-                [...document.querySelectorAll(params.target)].concat(element).forEach((item) => {
+                [...document.querySelectorAll(params.target)].concat(params.target === undefined ? element : undefined).forEach((item) => {
+                    if (item !== undefined) {
                        // Enter
                        switch(params.functionChild) {
                            case 'add':
@ -184,6 +199,7 @@ document.addEventListener('DOMContentLoaded', () => {
                                });
                                break;
                        }
+                    }
                });
                break;
            }
--- a/test/i-hover.html
+++ b/test/i-hover.html
@ -11,20 +11,20 @@
        </style>
    </head>
    <body>
-        <p i-hover="class:add('uppercase', '.text')">Place the cursor over this text</p>
-        <p class="text">
+        <p i-hover="class:add('uppercase', '.text__1--hover')">Place the cursor over this text</p>
+        <p class="text__1--hover">
            Quisque id diam vel quam elementum pulvinar etiam non quam?
        </p>
-        <p class="text">
+        <p class="text__1--hover">
            Ac, feugiat sed lectus vestibulum mattis ullamcorper velit sed ullamcorper.
        </p>
-        <p class="text" i-hover="class:add('uppercase')">
+        <p class="text__1--hover" i-hover="class:add('uppercase')">
            Nunc aliquet bibendum enim, facilisis gravida neque convallis a cras.
        </p>
-        <p class="text">
+        <p class="text__1--hover">
            Orci phasellus egestas tellus rutrum tellus pellentesque eu tincidunt tortor.
        </p>
-        <p class="text">
+        <p class="text__1--hover">
            Volutpat consequat, mauris nunc congue nisi, vitae suscipit tellus mauris.
        </p>
    </body>
Author	SHA1	Message	Date
Andros Fenollosa	3fc6ff1c78	Performance improvements in other events	2020-07-21 16:35:00 +02:00
Andros Fenollosa	dac40e8d61	Improved scroll performance	2020-07-21 16:21:58 +02:00
Andros Fenollosa	6f965ce6c3	Remove media	2020-07-17 18:05:44 +02:00
Andros Fenollosa	988c7c15dd	Update README.md	2020-07-17 18:04:01 +02:00
Andros Fenollosa	b5fe682764	Update README.md	2020-07-17 18:01:33 +02:00
Andros Fenollosa	732dcfca57	Update README.md	2020-07-17 18:01:17 +02:00
Andros Fenollosa	4b01ca94bb	Fix dash	2020-07-17 17:50:20 +02:00
Andros Fenollosa	91338f9185	Update README.md	2020-07-17 16:29:34 +02:00
Andros Fenollosa	0284ebc9c4	Update README.md	2020-07-17 16:25:00 +02:00
Andros Fenollosa	3aa327bad6	Update README.md	2020-07-17 12:12:22 +02:00
Andros Fenollosa	a30f4023d2	Fix regex check	2020-07-17 12:12:02 +02:00
				`@ -1 +0,0 @@`
				{"paddingVertical":"56px","paddingHorizontal":"56px","backgroundImage":null,"backgroundImageSelection":null,"backgroundMode":"color","backgroundColor":"rgba(171,184,195,0)","dropShadow":true,"dropShadowOffsetY":"20px","dropShadowBlurRadius":"68px","theme":"monokai","windowTheme":"none","language":"htmlmixed","fontFamily":"Hack","fontSize":"14px","lineHeight":"133%","windowControls":true,"widthAdjustment":true,"lineNumbers":false,"firstLineNumber":1,"exportSize":"2x","watermark":false,"squaredImage":false,"hiddenCharacters":false,"name":"","width":680}