Ensure pending timeouts are cleared before performing a gridfield rel…

…oad. Fixed button spacing via CSS.
bummzack · May 25, 2016 · c3074db · c3074db
1 parent 26c5fd2
commit c3074db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/css/omnipay-ui-cms.css b/css/omnipay-ui-cms.css
@@ -39,8 +39,8 @@
 }
 
 .cms .gridfield-button-capture .ui-button-text,
-.cms .gridfield-button-capture .ui-button-text,
-.cms .gridfield-button-capture .ui-button-text
+.cms .gridfield-button-refund .ui-button-text,
+.cms .gridfield-button-void .ui-button-text
 {
     padding-left: 1em;
     padding-right: 1em;

diff --git a/javascript/omnipay-ui-cms.js b/javascript/omnipay-ui-cms.js
@@ -86,6 +86,12 @@
                 this._super();
             },
 
+            reload: function(ajaxOpts, successCallback) {
+                // clear any running timeout before reloading
+                this._clearTimeout();
+                this._super(ajaxOpts, successCallback);
+            },
+
             onreload: function () {
                 this._super();
                 this.refreshPendingPayments(2000);
@@ -122,6 +128,7 @@
             _clearTimeout: function () {
                 if (this.data("payment-timeout")) {
                     window.clearTimeout(this.data("payment-timeout"));
+                    this.data("payment-timeout", null);
                 }
             }
         });