added more tests and reverted scrolling

Author: acburst

js/modal.js

@@ -277,44 +277,6 @@
       }
     }
 
-    _preventDefault(e) {
-      e.preventDefault();
-    }
-
-    _preventWheelDefault(e) {
-      let modalEl = this;
-      let scrolledToBottom = modalEl.offsetHeight + modalEl.scrollTop >= modalEl.scrollHeight;
-      let scrolledToTop = modalEl.scrollTop === 0;
-      if ((scrolledToTop && e.deltaY < 0) || (scrolledToBottom && e.deltaY > 0)) {
-        e.preventDefault();
-      }
-    }
-
-    preventBodyScrolling() {
-      let modalEl = this.$el[0];
-      // modalEl.setAttribute('tabindex', 0);
-      // this.$el[0].focus();
-
-      this.$overlay[0].addEventListener('wheel', this._preventDefault);
-      this.$overlay[0].addEventListener('touchmove', this._preventDefault);
-      modalEl.addEventListener('wheel', this._preventWheelDefault);
-
-      // modalEl.addEventListener("keydown", function(e) {
-      //   let scrolledToBottom = modalEl.offsetHeight + modalEl.scrollTop >= modalEl.scrollHeight;
-      //   let scrolledToTop = modalEl.scrollTop === 0;
-      //   if (e.target === modalEl && [37, 39].indexOf(e.keyCode) > -1 ||
-      //       (e.keyCode === 38 && scrolledToTop) ||
-      //       ([32, 40].indexOf(e.keyCode) > -1 && scrolledToBottom)) {
-      //     e.preventDefault();
-      //   }
-      // });
-    }
-
-    enableBodyScrolling() {
-      this.$overlay[0].removeEventListener('wheel', this._preventDefault);
-      this.$overlay[0].removeEventListener('touchmove', this._preventDefault);
-      this.$el[0].removeEventListener('wheel', this._preventWheelDefault);
-    }
 
     /**
      * Open Modal
@@ -327,6 +289,7 @@
 
       this.isOpen = true;
       let body = document.body;
+      body.style.overflow = 'hidden';
       this.$el[0].classList.add('open');
       body.appendChild(this.$overlay[0]);
 
@@ -340,7 +303,6 @@
       }
 
       this.animateIn();
-      this.preventBodyScrolling();
 
       return this;
     }
@@ -362,7 +324,6 @@
       }
 
       this.animateOut();
-      this.enableBodyScrolling();
 
       return this;
     }

tests/spec/modal/modalSpec.js

@@ -15,24 +15,84 @@ describe( 'Modal:', function() {
   describe('Modals', function() {
     it('Should open and close correctly', function(done) {
       modal1.modal();
+      expect(modal1).toBeHidden('Modal should be hidden');
 
       click(trigger1[0]);
 
       setTimeout(function() {
+        expect(modal1).toBeVisible('Modal should be shown');
+        expect(modal1.hasClass('open')).toEqual(true, 'Modal should have class open');
+
         // Check overlay is attached
         var overlay = modal1.modal('getInstance').$overlay;
         var overlayInDOM = $.contains(document, overlay[0]);
         expect(overlayInDOM).toEqual(true, 'Overlay should be attached on open');
 
         click(overlay[0]);
         setTimeout(function() {
+          expect(modal1.hasClass('open')).toEqual(false, 'Modal should have class open removed');
+
           var overlayInDOM = $.contains(document, overlay[0]);
           expect(overlayInDOM).toEqual(false, 'Overlay should be removed on close');
 
           done();
         }, 500);
       }, 500);
     });
+
+    it('Should have a dismissible option', function(done) {
+      modal1.modal({
+        dismissible: false
+      });
+
+      click(trigger1[0]);
+      setTimeout(function() {
+        expect(modal1).toBeVisible('Modal should be shown');
+        var overlay = modal1.modal('getInstance').$overlay;
+        var overlayInDOM = $.contains(document, overlay[0]);
+        expect(overlayInDOM).toEqual(true, 'Overlay should be attached on open');
+
+        click(overlay[0]);
+        setTimeout(function() {
+          expect(modal1).toBeVisible('Modal should be shown');
+          var overlayInDOM = $.contains(document, overlay[0]);
+          expect(overlayInDOM).toEqual(true, 'modal should not be dismissable');
+
+          done();
+        }, 500);
+      }, 500);
+    });
+
+    it('Should have callbacks', function(done) {
+      var readyTest = false;
+      var completeTest = false;
+      modal1.modal({
+        ready: function() {
+          readyTest = true;
+        },
+        complete: function() {
+          completeTest = true;
+        }
+      });
+
+      expect(readyTest).toEqual(false, 'callback not yet fired');
+      expect(completeTest).toEqual(false, 'callback not yet fired');
+
+      click(trigger1[0]);
+      setTimeout(function() {
+        expect(readyTest).toEqual(true, 'callback fired');
+        expect(completeTest).toEqual(false, 'callback not yet fired');
+
+        var overlay = modal1.modal('getInstance').$overlay;
+        click(overlay[0]);
+        setTimeout(function() {
+          expect(readyTest).toEqual(true, 'callback fired');
+          expect(completeTest).toEqual(true, 'callback fired');
+
+          done();
+        }, 500);
+      }, 500);
+    });
   });
 
 });