Merge pull request #297 from Availity/fix/upload

change includes method to indexOf
Availity · Jan 30, 2018 · 91e530b · 91e530b
2 parents 0bed02f + cac7c39
commit 91e530b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/ui/dropdown/directive.js b/src/ui/dropdown/directive.js
@@ -10,7 +10,7 @@ if (!jQuery.avPatchedTouchEvents) {
 
   jQuery.event.special.touchstart = {
     setup(_, ns, handle) {
-      if (ns.includes('noPreventDefault') ) {
+      if (ns.indexOf('noPreventDefault') >= 0 ) {
         this.addEventListener('touchstart', handle, { passive: false });
       } else {
         this.addEventListener('touchstart', handle, { passive: true });
@@ -20,7 +20,7 @@ if (!jQuery.avPatchedTouchEvents) {
 
   jQuery.event.special.touchend = {
     setup(_, ns, handle) {
-      if (ns.includes('noPreventDefault') ) {
+      if (ns.indexOf('noPreventDefault') >= 0 ) {
         this.addEventListener('touchend', handle, { passive: false });
       } else {
         this.addEventListener('touchend', handle, { passive: true });
@@ -30,7 +30,7 @@ if (!jQuery.avPatchedTouchEvents) {
 
   jQuery.event.special.touchmove = {
     setup(_, ns, handle) {
-      if (ns.includes('noPreventDefault') ) {
+      if (ns.indexOf('noPreventDefault') >= 0 ) {
         this.addEventListener('touchmove', handle, { passive: false });
       } else {
         this.addEventListener('touchmove', handle, { passive: true });

diff --git a/src/ui/uploads/tests/upload-progress-bar-spec.js b/src/ui/uploads/tests/upload-progress-bar-spec.js
@@ -17,17 +17,21 @@ describe('uploadProgessBar', () => {
   it('should render with defaults', () => {
     tester.$scope.upload = {
       percentage: 0,
-      onProgress: []
+      onProgress: [],
+      onSuccess: [],
+      onError: []
     };
     const el = tester.compileDirective(template, null, null);
     const progressBar = el.find('.progress');
     expect(progressBar.hasClass('progress')).toBeTruthy();
   });
 
-  it('should render with 50% progess', () => {
+  it('should render with 50% progress', () => {
     tester.$scope.upload = {
       percentage: 50,
       onProgress: [],
+      onSuccess: [],
+      onError: [],
       completed: false
     };
     const el = tester.compileDirective(template, null, null);
@@ -37,14 +41,17 @@ describe('uploadProgessBar', () => {
     expect(progressBar.attr('style')).toBe('width: 50%;');
   });
 
-  it('should render with with 100% progress', () => {
+  it('should render with 100% progress', () => {
     tester.$scope.upload = {
       percentage: 100,
       onProgress: [],
+      onSuccess: [],
+      onError: [],
       completed: false
     };
     const el = tester.compileDirective(template, null, null);
     tester.$scope.upload.onProgress.forEach(cb => cb(50, 100));
+    tester.$scope.upload.onSuccess.forEach(cb => cb(50, 100));
     tester.$scope.$apply();
     const progress = el.find('.progress');
     const progressBar = el.find('.progress-bar');