From 249f2b75053689fb5ca17c43d0e5f9fd5b938d61 Mon Sep 17 00:00:00 2001 From: Grzegorz Tomicki Date: Mon, 18 Jan 2021 00:39:52 +0100 Subject: [PATCH 1/2] chore: 1.0.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 772ef39..1ac1fe2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "show-more-read", - "version": "1.0.8", + "version": "1.0.9", "main": "docs/showMore.min.js", "description": "JavaScript library that truncates text, list or table by chars, elements or rows", "author": "Grzegorz Tomicki", From 63659ebb460c6ae06a35c91c1d0b52c659a97a99 Mon Sep 17 00:00:00 2001 From: Grzegorz Tomicki Date: Mon, 18 Jan 2021 00:40:23 +0100 Subject: [PATCH 2/2] fix: no less element #10 --- docs/index.html | 3 +-- docs/showMore.min.js | 2 +- sources/index.js | 15 +++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/index.html b/docs/index.html index d8d56a8..eb83cfe 100644 --- a/docs/index.html +++ b/docs/index.html @@ -141,8 +141,7 @@
Show html

Element inline

+ data-config='{ "type": "list", "limit": 5, "element": "div", "more": "↓ show more", "less": "↑ less" }'> Administracja biur, Badanie i uzdatnianie wody, Motele i zajazdy, diff --git a/docs/showMore.min.js b/docs/showMore.min.js index a32ca44..0aa5d8a 100644 --- a/docs/showMore.min.js +++ b/docs/showMore.min.js @@ -1 +1 @@ -var ShowMore=function(){"use strict";function e(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function t(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function n(n){for(var r=1;rc){s=d.substr(0,a+p);var b=Math.min(s.length,s.lastIndexOf(" "));t.innerHTML=s.substr(0,b),i.addBtn(i.object),i.clickEvent(t,n(n({},i.object),{},{originalText:o,truncatedText:s}))}}if("list"===l||"table"===l){var m="list"===l?[].slice.call(t.children):t.rows;if(m.length>c){for(var u=a;u=l&&f=l;"false"===m?i.addRemClass(h[f],!1):g&&i.addRemClass(h[f],!0)}("table"===a||("list"===a||"text"===a)&&b)&&i.setExpand(n(n({},e),{},{target:p}))})),e(this,"addBtn",(function(e){var t=e.type,n=e.element,r=e.more,a=e.ellipsis,l=e.typeElement;if("table"!==t&&!r&&a){var c=document.createElement("span");return c.insertAdjacentHTML("afterbegin",a),void n.appendChild(c)}if(r)if("table"===t)n.insertAdjacentElement("afterend",i.createBtn(e));else{var s=document.createElement(l);s.appendChild(i.createBtn(e)),n.appendChild(s)}})),e(this,"getNumber",(function(e,t){var n=e.rows,r=e.children,i="table"===t?n:r,a=[].slice.call(i).filter((function(e){return"hidden"===e.className})).length;return 0!==a?" ".concat(a):""})),e(this,"setExpand",(function(e){var t=e.element,n=e.type,r=e.less,a=e.more,l=e.number,c=e.target,s=i.checkExp?r:a,o=i.checkExp?"collapse":"expand",d="table"===n?n:"the ".concat(n),p=t.lastElementChild;t.setAttribute("aria-expanded",i.checkExp),c.setAttribute("aria-label","".concat(o," ").concat(d)),s?c.innerHTML=l?s+i.getNumber(t,n):s:"table"===i.object.type?c.parentNode.removeChild(c):"list"===i.object.type&&p.parentNode.removeChild(p)})),this.elements=document.querySelectorAll(r),this.regex={newLine:/[^\x20-\x7E]/gm,space:/\s{2,}/gm,br:/<\s*\/?br\s*[/]?>/gm};for(var a=0;as){c=d.substr(0,a+p);var m=Math.min(c.length,c.lastIndexOf(" "));t.innerHTML=c.substr(0,m),i.addBtn(i.object),i.clickEvent(t,n(n({},i.object),{},{originalText:o,truncatedText:c}))}}if("list"===l||"table"===l){var b="list"===l?[].slice.call(t.children):t.rows;if(b.length>s){for(var u=a;u=l&&g=l;"false"===u?i.addRemClass(f[g],!1):v&&i.addRemClass(f[g],!0)}("table"===a||("list"===a||"text"===a)&&b)&&i.setExpand(n(n({},e),{},{target:m}))})),e(this,"addBtn",(function(e){var t=e.type,n=e.element,r=e.more,a=e.ellipsis,l=e.typeElement;if("table"!==t&&!r&&a){var s=document.createElement("span");return s.insertAdjacentHTML("afterbegin",a),void n.appendChild(s)}if(r)if("table"===t)n.insertAdjacentElement("afterend",i.createBtn(e));else{var c=document.createElement(l);c.appendChild(i.createBtn(e)),n.appendChild(c)}})),e(this,"getNumber",(function(e,t){var n=e.rows,r=e.children,i="table"===t?n:r,a=[].slice.call(i).filter((function(e){return"hidden"===e.className})).length;return 0!==a?" ".concat(a):""})),e(this,"setExpand",(function(e){var t=e.element,n=e.type,r=e.less,a=e.more,l=e.number,s=e.target,c=i.checkExp?r:a,o=i.checkExp?"collapse":"expand",d="table"===n?n:"the ".concat(n),p=t.lastElementChild;t.setAttribute("aria-expanded",i.checkExp),s.setAttribute("aria-label","".concat(o," ").concat(d)),c?s.innerHTML=l?c+i.getNumber(t,n):c:"table"===n?s.parentNode.removeChild(s):"list"===n&&p.parentNode.removeChild(p)})),this.elements=document.querySelectorAll(r),this.regex={newLine:/[^\x20-\x7E]/gm,space:/\s{2,}/gm,br:/<\s*\/?br\s*[/]?>/gm};for(var a=0;a { - const typeAria = this.checkExp ? less : more || ''; + const typeAria = this.checkExp ? less || '' : more || ''; const aria = this.checkExp ? 'collapse' : 'expand'; const btn = document.createElement('span'); @@ -119,6 +119,7 @@ class ShowMore { element, type, limit, + less, typeElement, originalText, truncatedText, @@ -134,9 +135,11 @@ class ShowMore { element.innerHTML = ''; element.innerHTML = this.checkExp ? originalText : truncatedText; - const el = document.createElement(typeElement); - el.insertAdjacentElement('beforeend', this.createBtn(object)); - element.appendChild(el); + if (less) { + const el = document.createElement(typeElement); + el.insertAdjacentElement('beforeend', this.createBtn(object)); + element.appendChild(el); + } } // list and table @@ -210,9 +213,9 @@ class ShowMore { target.innerHTML = number ? typeAria + this.getNumber(element, type) : typeAria; - } else if (this.object.type === 'table') { + } else if (type === 'table') { target.parentNode.removeChild(target); - } else if (this.object.type === 'list') { + } else if (type === 'list') { lastChild.parentNode.removeChild(lastChild); } };