Restore submits to Picreel

acumenbrands · May 11, 2015 · cceec94 · cceec94
1 parent 6b91a72
commit cceec94
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 25 deletions.
diff --git a/build/picreel.js b/build/picreel.js
@@ -22,7 +22,6 @@
       this.action         = this.action          || "/";
       this.carrier        = null;
 
-      this.unbindDefaultClickEvents();
       this.bindNewClickEvents();
     }
 
@@ -57,10 +56,9 @@
     };
 
     APLSubscriber.prototype.handleButtonClick = function(e) {
-      e.preventDefault();
-      $(self).trigger('onBeforeSubmit');
       this.removeErrorStatus();
       this.applyLoadingStatus();
+
       var email = this.$(this.emailSelector).val();
 
       if(this.emailIsValid(email)) {
@@ -121,14 +119,10 @@
       this.carrier = this.$.ajax(carrierOptions);
     };
 
-    APLSubscriber.prototype.unbindDefaultClickEvents = function() {
-      this.$(this.submitSelector).off('click');
-    };
-
     APLSubscriber.prototype.bindNewClickEvents = function() {
       var _APL = this;
 
-      this.$(_APL.submitSelector).on('click', function(e){
+      this.$(this.submitSelector).on('onBeforeSubmit', function(e){
         _APL.handleButtonClick(e);
       });
     };

diff --git a/build/picreel.min.js b/build/picreel.min.js
diff --git a/build/picreel.min.js.map b/build/picreel.min.js.map
diff --git a/lib/factories/subscriber.js b/lib/factories/subscriber.js
@@ -21,7 +21,6 @@
       this.action         = this.action          || "/";
       this.carrier        = null;
 
-      this.unbindDefaultClickEvents();
       this.bindNewClickEvents();
     }
 
@@ -56,10 +55,9 @@
     };
 
     APLSubscriber.prototype.handleButtonClick = function(e) {
-      e.preventDefault();
-      $(self).trigger('onBeforeSubmit');
       this.removeErrorStatus();
       this.applyLoadingStatus();
+
       var email = this.$(this.emailSelector).val();
 
       if(this.emailIsValid(email)) {
@@ -120,14 +118,10 @@
       this.carrier = this.$.ajax(carrierOptions);
     };
 
-    APLSubscriber.prototype.unbindDefaultClickEvents = function() {
-      this.$(this.submitSelector).off('click');
-    };
-
     APLSubscriber.prototype.bindNewClickEvents = function() {
       var _APL = this;
 
-      this.$(_APL.submitSelector).on('click', function(e){
+      this.$(this.submitSelector).on('onBeforeSubmit', function(e){
         _APL.handleButtonClick(e);
       });
     };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "picreel",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "author": {
     "name": "Brian Sage",

diff --git a/test/lib/picreel_tests.js b/test/lib/picreel_tests.js
@@ -35,29 +35,27 @@ QUnit.test("APL Subscriber", function(assert) {
   handleButtonClickSpy.reset();
   applyLoadingStatusSpy.reset();
   $(subject.emailSelector).val(validEmail);
-  $(subject.submitSelector).trigger("click");
+  $(subject.submitSelector).trigger("onBeforeSubmit");
   assert.ok(handleButtonClickSpy.called, "When button is clicked, subscriber should submit to custom handler");
   assert.ok(applyLoadingStatusSpy.called, "Indicates when loading");
 
   submitSpy.reset();
   applyErrorStatusSpy.reset();
   $(subject.emailSelector).val(invalidEmail);
-  $(subject.submitSelector).trigger("click");
+  $(subject.submitSelector).trigger("onBeforeSubmit");
   assert.notOk(submitSpy.called, "Won't submit an invalid Email");
   assert.ok(applyErrorStatusSpy.called, "Indicates an error has occured");
 
   submitSpy.reset();
   removeErrorStatusSpy.reset();
   $(subject.emailSelector).val(validEmail);
-  $(subject.submitSelector).trigger("click");
+  $(subject.submitSelector).trigger("onBeforeSubmit");
   assert.ok(submitSpy.called, "Will submit a valid Email");
   assert.ok(removeErrorStatusSpy.called, "Removes error indicators");
 
   carrierSpy.reset();
   $(subject.emailSelector).val(validEmail);
-  $(subject.submitSelector).trigger("click");
+  $(subject.submitSelector).trigger("onBeforeSubmit");
   assert.deepEqual(subject.formToCarrierParams(), validFormData, "Reads data from the form");
   assert.ok(carrierSpy.called, "Sends AJAX carrier");
-
-  //"Pass picreel extended form data"
 });