Add event params helpers

jstiburek · Nov 17, 2020 · f96f64b · f96f64b
1 parent 4b136a9
commit f96f64b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/assets/datagrid-spinners.js b/assets/datagrid-spinners.js
@@ -2,6 +2,8 @@ var dataGridRegisterExtension;
 
 if (typeof naja !== "undefined") {
 	var isNaja2 = function () { return naja && naja.VERSION && naja.VERSION >= 2 };
+	var najaEventParams = function (params) { return isNaja2() ? params.detail : params };
+	var najaRequest = function (params) { return isNaja2() ? params.detail.request : params.xhr };
 	dataGridRegisterExtension = function (name, extension) {
 		var init = extension.init;
 		var success = extension.success;
@@ -15,26 +17,26 @@ if (typeof naja !== "undefined") {
 			this.initialize = function (naja) {
 				if(init) {
 					naja.addEventListener('init', function (params)  {
-						init(params.defaultOptions);
+						init(najaEventParams(params).defaultOptions);
 					});
 				}
 
 				if(success) {
 					naja.addEventListener('success', function (params)  {
-						var payload = isNaja2() ? params.payload : params.response;
-						success(payload, params.options);
+						var payload = isNaja2() ? params.detail.payload : params.response;
+						success(payload, najaEventParams(params).options);
 					});
 				}
 
 				if(before) {
 					naja.addEventListener('before', function (params) {
-						before(params.xhr || params.request, params.options);
+						before(najaRequest(params), najaEventParams(params).options);
 					});
 				}
 
 				if(complete) {
 					naja.addEventListener('complete', function (params) {
-						complete(params.xhr || params.request, params.options);
+						complete(najaRequest(params), najaEventParams(params).options);
 					});
 				}
 			}

diff --git a/assets/datagrid.js b/assets/datagrid.js
@@ -2,6 +2,8 @@ var dataGridRegisterExtension, dataGridRegisterAjaxCall, dataGridLoad, dataGridS
 
 if (typeof naja !== "undefined") {
 	var isNaja2 = function () { return naja && naja.VERSION && naja.VERSION >= 2 };
+	var najaEventParams = function (params) { return isNaja2() ? params.detail : params };
+	var najaRequest = function (params) { return isNaja2() ? params.detail.request : params.xhr };
 	dataGridRegisterExtension = function (name, extension) {
 		var init = extension.init;
 		var success = extension.success;
@@ -16,14 +18,14 @@ if (typeof naja !== "undefined") {
 			this.initialize = function (naja) {
 				if(init) {
 					naja.addEventListener('init', function (params)  {
-						init(params.defaultOptions);
+						init(najaEventParams(params).defaultOptions);
 					});
 				}
 
 				if(success) {
 					naja.addEventListener('success', function (params)  {
-						var payload = isNaja2() ? params.payload : params.response;
-						success(payload, params.options);
+						var payload = isNaja2() ? params.detail.payload : najaEventParams(params).response;
+						success(payload, najaEventParams(params).options);
 					});
 				}
 
@@ -33,26 +35,32 @@ if (typeof naja !== "undefined") {
 				}
 
 				interactionTarget.addEventListener('interaction', function (params) {
-					params.options.nette = {
-						el: $(params.element)
+					if (isNaja2()) {
+						params.detail.options.nette = {
+							el: $(params.detail.element)
+						}
+					} else {
+						params.options.nette = {
+							el: $(params.element)
+						}
 					}
 					if (interaction) {
-						if (!interaction(params.options)){
+						if (!interaction(najaEventParams(params).options)){
 							params.preventDefault();
 						}
 					}
 				});
 
 				if(before) {
 					naja.addEventListener('before', function (params) {
-						if (!before(params.xhr || params.request, params.options))
+						if (!before(najaRequest(params), najaEventParams(params).options))
 							params.preventDefault();
 					});
 				}
 
 				if(complete) {
 					naja.addEventListener('complete', function (params) {
-						complete(params.xhr || params.request, params.options);
+						complete(najaRequest(params), najaEventParams(params).options);
 					});
 				}
 			}