Bumped version to 8.1.5

fabiospampinato · Apr 13, 2023 · 61e3b8f · 61e3b8f
1 parent ac0108c
commit 61e3b8f
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 23 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+### [v8.1.5](https://github.com/fabiospampinato/cash/releases/tag/8.1.5) (2023-04-13)
+
+- Fixed support for using a selector as context
+- $.hide: ensuring calling it multiple times sequentially works too
+
 ### [v8.1.4](https://github.com/fabiospampinato/cash/releases/tag/8.1.4) (2023-03-08)
 
 - Updatd contribution guide

diff --git a/dist/cash.d.ts b/dist/cash.d.ts
@@ -22,7 +22,7 @@ type Ele = Window | Document | HTMLElement | Element | Node;
 type EleLoose = HTMLElement & Element & Node;
 type Selector = falsy | string | Function | HTMLCollection | NodeList | Ele | Ele[] | ArrayLike<Ele> | Cash;
 type Comparator = string | Ele | Cash | ((this: EleLoose, index: number, ele: EleLoose) => boolean);
-type Context = Document | HTMLElement | Element;
+type Context = Document | HTMLElement | Element | string;
 type PlainObject<T> = Record<string, T>;
 type EventCallback = {
     (event: any, data?: any): any;

diff --git a/dist/cash.esm.js b/dist/cash.esm.js
@@ -33,12 +33,16 @@ class Cash {
             return selector;
         let eles = selector;
         if (isString(selector)) {
-            const ctx = (isCash(context) ? context[0] : context) || doc;
-            eles = idRe.test(selector) && 'getElementById' in ctx
+            const ctx = context || doc;
+            eles = idRe.test(selector) && isDocument(ctx)
                 ? ctx.getElementById(selector.slice(1).replace(/\\/g, ''))
                 : htmlRe.test(selector)
                     ? parseHTML(selector)
-                    : find(selector, ctx);
+                    : isCash(ctx)
+                        ? ctx.find(selector)
+                        : isString(ctx)
+                            ? cash(ctx).find(selector)
+                            : find(selector, ctx);
             if (!eles)
                 return;
         }
@@ -876,14 +880,15 @@ fn.toggle = function (force) {
     return this.each((i, ele) => {
         if (!isElement(ele))
             return;
-        const show = isUndefined(force) ? isHidden(ele) : force;
+        const hidden = isHidden(ele);
+        const show = isUndefined(force) ? hidden : force;
         if (show) {
             ele.style.display = ele[displayProperty] || '';
             if (isHidden(ele)) {
                 ele.style.display = getDefaultDisplay(ele.tagName);
             }
         }
-        else {
+        else if (!hidden) {
             ele[displayProperty] = computeStyle(ele, 'display');
             ele.style.display = 'none';
         }

diff --git a/dist/cash.js b/dist/cash.js
@@ -35,12 +35,16 @@ var Cash = /** @class */ (function () {
             return selector;
         var eles = selector;
         if (isString(selector)) {
-            var ctx = (isCash(context) ? context[0] : context) || doc;
-            eles = idRe.test(selector) && 'getElementById' in ctx
+            var ctx = context || doc;
+            eles = idRe.test(selector) && isDocument(ctx)
                 ? ctx.getElementById(selector.slice(1).replace(/\\/g, ''))
                 : htmlRe.test(selector)
                     ? parseHTML(selector)
-                    : find(selector, ctx);
+                    : isCash(ctx)
+                        ? ctx.find(selector)
+                        : isString(ctx)
+                            ? cash(ctx).find(selector)
+                            : find(selector, ctx);
             if (!eles)
                 return;
         }
@@ -885,14 +889,15 @@ fn.toggle = function (force) {
     return this.each(function (i, ele) {
         if (!isElement(ele))
             return;
-        var show = isUndefined(force) ? isHidden(ele) : force;
+        var hidden = isHidden(ele);
+        var show = isUndefined(force) ? hidden : force;
         if (show) {
             ele.style.display = ele[displayProperty] || '';
             if (isHidden(ele)) {
                 ele.style.display = getDefaultDisplay(ele.tagName);
             }
         }
-        else {
+        else if (!hidden) {
             ele[displayProperty] = computeStyle(ele, 'display');
             ele.style.display = 'none';
         }

diff --git a/dist/cash.min.js b/dist/cash.min.js
diff --git a/dist/cash.ts b/dist/cash.ts
@@ -27,7 +27,7 @@ type Ele = Window | Document | HTMLElement | Element | Node;
 type EleLoose = HTMLElement & Element & Node; //UGLY: Trick to remove some kind-of useless type errors //URL: https://github.com/fabiospampinato/cash/issues/278
 type Selector = falsy | string | Function | HTMLCollection | NodeList | Ele | Ele[] | ArrayLike<Ele> | Cash;
 type Comparator = string | Ele | Cash | (( this: EleLoose, index: number, ele: EleLoose ) => boolean);
-type Context = Document | HTMLElement | Element;
+type Context = Document | HTMLElement | Element | string;
 
 type PlainObject<T> = Record<string, T>; //FIXME: Arrays can be assigned to this type, for whatever reason
 
@@ -86,13 +86,17 @@ class Cash {
 
     if ( isString ( selector ) ) {
 
-      const ctx = ( isCash ( context ) ? context[0] : context ) || doc;
+      const ctx = context || doc;
 
-      eles = idRe.test ( selector ) && 'getElementById' in ctx
-                ? ( ctx as Document ).getElementById ( selector.slice ( 1 ).replace ( /\\/g, '' ) )
+      eles = idRe.test ( selector ) && isDocument ( ctx )
+                ? ctx.getElementById ( selector.slice ( 1 ).replace ( /\\/g, '' ) )
                 : htmlRe.test ( selector )
                   ? parseHTML ( selector )
-                  : find ( selector, ctx );
+                  : isCash ( ctx )
+                    ? ctx.find ( selector )
+                      : isString ( ctx )
+                        ? cash ( ctx ).find ( selector )
+                        : find ( selector, ctx );
 
       if ( !eles ) return;
 
@@ -2259,7 +2263,8 @@ fn.toggle = function ( this: Cash, force?: boolean ) {
 
     if ( !isElement ( ele ) ) return;
 
-    const show = isUndefined ( force ) ? isHidden ( ele ) : force;
+    const hidden = isHidden ( ele );
+    const show = isUndefined ( force ) ? hidden : force;
 
     if ( show ) {
 
@@ -2271,7 +2276,7 @@ fn.toggle = function ( this: Cash, force?: boolean ) {
 
       }
 
-    } else {
+    } else if ( !hidden ) {
 
       ele[displayProperty] = computeStyle ( ele, 'display' );
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cash-dom",
   "repository": "github:fabiospampinato/cash",
   "description": "An absurdly small jQuery alternative for modern browsers.",
-  "version": "8.1.4",
+  "version": "8.1.5",
   "license": "MIT",
   "browser": "./dist/cash.js",
   "main": "./dist/cash.js",

diff --git a/readme.md b/readme.md
@@ -31,10 +31,10 @@ If you're migrating from jQuery be sure to read our [migration guide](https://gi
 
 ## Usage
 
-Get Cash from [CloudFlare](https://cdnjs.cloudflare.com/ajax/libs/cash/8.1.4/cash.min.js) or [jsDelivr](https://cdn.jsdelivr.net/npm/cash-dom@8.1.4/dist/cash.min.js) and use it like this:
+Get Cash from [CloudFlare](https://cdnjs.cloudflare.com/ajax/libs/cash/8.1.5/cash.min.js) or [jsDelivr](https://cdn.jsdelivr.net/npm/cash-dom@8.1.5/dist/cash.min.js) and use it like this:
 
 ```html
-<script src="https://cdnjs.cloudflare.com/ajax/libs/cash/8.1.4/cash.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/cash/8.1.5/cash.min.js"></script>
 <script>
   $(function () {
     $('html').addClass ( 'dom-loaded' );