Parcourir la source

Ticket #923 - In Convos and Sites modules.

AntonLV il y a 9 ans
Parent
commit
c8f64f3069
2 fichiers modifiés avec 21 ajouts et 12 suppressions
  1. 16 11
      modules/boonex/convos/js/main.js
  2. 5 1
      modules/boonex/sites/js/main.js

+ 16 - 11
modules/boonex/convos/js/main.js

@@ -8,17 +8,22 @@ function bx_cnv_mark_unread(e, iConvoId) {
 }
 
 function bx_cnv_action(sAction, e, iConvoId, isConfirm) {
-    if (isConfirm && !confirm(_t('_Are_you_sure')))
-        return false;
-
-    bx_loading_btn(e, 1);
-    $.post(sUrlRoot + 'modules/?r=convos/' + sAction + '/' + parseInt(iConvoId), function (s) {
-        bx_loading_btn(e, 0);
-        if (sUrlRoot == s.substring(0,sUrlRoot.length))
-            location.href = s;
-        else
-            bx_alert(s);
-    });
+	var oPerform = function() {
+		bx_loading_btn(e, 1);
+
+	    $.post(sUrlRoot + 'modules/?r=convos/' + sAction + '/' + parseInt(iConvoId), function (s) {
+	        bx_loading_btn(e, 0);
+	        if (sUrlRoot == s.substring(0,sUrlRoot.length))
+	            location.href = s;
+	        else
+	            bx_alert(s);
+	    });
+	};
+
+    if (isConfirm)
+    	bx_confirm(_t('_Are_you_sure'), oPerform);
+    else
+    	oPerform();    
 }
 
 $(document).ready(function () {

+ 5 - 1
modules/boonex/sites/js/main.js

@@ -7,7 +7,11 @@ function BxSitesMain(oOptions) {
 }
 
 BxSitesMain.prototype.onCancelSubscription = function(oForm) {
-	return confirm(aDolLang['_bx_sites_form_site_input_do_cancel_confirm']) ? true : false;
+	bx_confirm(aDolLang['_bx_sites_form_site_input_do_cancel_confirm'], function() {
+		$(oForm).removeAttr('onsubmit').submit();
+	});
+
+	return false;
 };
 
 /*