Client side: Fixed ajaxified action links [Closed #114]

o5 · Apr 3, 2014 · 153497d · 153497d
1 parent c2f3ba1
commit 153497d
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/client-side/grido.js b/client-side/grido.js
@@ -91,14 +91,21 @@
                 .off('click.nette')
                 .off('click.grido')
                 .on('click.grido', function(event) {
-                    var hasConfirm = $(this).data('grido-confirm');
-                    if (hasConfirm && !confirm(hasConfirm)) {
-                        event.preventDefault();
-                        event.stopImmediatePropagation();
-                    } else if (hasConfirm && $(this).hasClass('ajax') && that.ajax) {
-                        that.ajax.doRequest(this.href);
-                        event.preventDefault();
-                        event.stopImmediatePropagation();
+                    var isAjax = $(this).hasClass('ajax') && that.ajax,
+                        hasConfirm = $(this).data('grido-confirm'),
+                        stop = function(event) {
+                            event.preventDefault();
+                            event.stopImmediatePropagation();
+                        };
+
+                    if (hasConfirm && confirm(hasConfirm)) {
+                        isAjax && (that.ajax.doRequest(this.href) || stop(event));
+
+                    } else if (hasConfirm) {
+                        stop(event);
+
+                    } else if (isAjax) {
+                        that.ajax.doRequest(this.href) || stop(event);
                     }
                 });
         },