Ensuring events work with Document and Window objects

r-aamir · Jan 5, 2020 · d77372a · d77372a
1 parent 78a3afc
commit d77372a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/events/off.ts b/src/events/off.ts
@@ -21,7 +21,7 @@ fn.off = function ( this: Cash, eventFullName?: string | Record<string, EventCal
 
     this.each ( ( i, ele ) => {
 
-      if ( !isElement ( ele ) ) return;
+      if ( !isElement ( ele ) && !isDocument ( ele ) && !isWindow ( ele ) ) return;
 
       removeEvent ( ele );
 
@@ -50,7 +50,7 @@ fn.off = function ( this: Cash, eventFullName?: string | Record<string, EventCal
 
       this.each ( ( i, ele ) => {
 
-        if ( !isElement ( ele ) ) return;
+        if ( !isElement ( ele ) && !isDocument ( ele ) && !isWindow ( ele ) ) return;
 
         removeEvent ( ele, name, namespaces, selector, callback );
 

diff --git a/src/events/on.ts b/src/events/on.ts
@@ -83,7 +83,7 @@ function on ( this: Cash, eventFullName: Record<string, EventCallback> | string,
 
     this.each ( ( i, ele ) => {
 
-      if ( !isElement ( ele ) ) return;
+      if ( !isElement ( ele ) && !isDocument ( ele ) && !isWindow ( ele ) ) return;
 
       const finalCallback = function ( event: Event ) {
 

diff --git a/test/modules/events.js b/test/modules/events.js
@@ -209,6 +209,22 @@ describe ( 'Events', { beforeEach: getFixtureInit ( fixture ) }, function () {
 
     });
 
+    it ( 'supports Window and Document objects', function ( t ) {
+
+      var eles = $([window, document]);
+      var count = 0;
+
+      function handler () {
+        count++;
+      }
+
+      eles.on ( 'foo', handler );
+      eles.trigger ( 'foo' );
+
+      t.is ( count, 3 );
+
+    });
+
     it ( 'ignores the order of namespaces', function ( t ) {
 
       var ele = $('.event');