← All changes | assets/js/dist/loadAJAX.js +41 -22 4.4.6 → 4.4.9 View file →

		@@ -572,14 +572,14 @@
572	572	__webpack_require__.r(__webpack_exports__);
573	573	/* harmony export */ __webpack_require__.d(__webpack_exports__, {
574	574	/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
575	575	/* harmony export */ });
576		-/* harmony import */ var _utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./utils.js */ "./assets/src/js/utils.js");
	576	+/* harmony import */ var lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lpAssetsJsPath/utils.js */ "./assets/src/js/utils.js");
577	577	/**
578	578	* Load all you need via AJAX
579	579	*
580	580	* @since 4.2.5.7
581		- * @version 1.1.0
	581	+ * @version 1.1.1
582	582	*/
583	583
584	584
585	585
		@@ -593,9 +593,9 @@
593	593	// End Handle general parameter in the Frontend and Backend
594	594
595	595	const lpAJAX = () => {
596	596	const classLPTarget = '.lp-target';
597		- const urlCurrent = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpGetCurrentURLNoParam)();
	597	+ const urlCurrent = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpGetCurrentURLNoParam();
598	598	return {
599	599	autoLoadAPIs: () => {
600	600	console.log('autoLoadAPIs');
601	601	},
		@@ -619,11 +619,11 @@
619	619	option.headers['Content-Type'] = 'application/json';
620	620	} else {
621	621	params.args = JSON.stringify(params.args);
622	622	params.callback = JSON.stringify(params.callback);
623		- url = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(url, params);
	623	+ url = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(url, params);
624	624	}
625		- (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI)(url, option, callBack);
	625	+ lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI(url, option, callBack);
626	626	},
627	627	fetchAJAX: (params, callBack) => {
628	628	let urlAjax = lpSettings.lpAjaxUrl;
629	629
		@@ -628,36 +628,55 @@
628	628	let urlAjax = lpSettings.lpAjaxUrl;
629	629
630	630	// Set param id_url for identify.
631	631	if (params.hasOwnProperty('args') && params.args.hasOwnProperty('id_url')) {
632		- urlAjax = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlAjax, {
	632	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
633	633	id_url: params.args.id_url
634	634	});
635	635	} else if (params.hasOwnProperty('id_url')) {
636		- urlAjax = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlAjax, {
	636	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
637	637	id_url: params.id_url
638	638	});
639	639	}
640	640	// Set param lang here if exits, for detect translate
641	641	if (lpSettings.urlParams.hasOwnProperty('lang')) {
642		- urlAjax = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlAjax, {
	642	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
643	643	lang: lpSettings.urlParams.lang
644	644	});
645	645	}
646		- const formData = new FormData();
647	646	const action = params.hasOwnProperty('action') ? params.action : 'load_content_via_ajax';
648		- formData.append('nonce', lpSettings.nonce);
649		- formData.append('lp-load-ajax', action);
650		- formData.append('data', JSON.stringify(params));
651		- const dataSend = {
652		- method: 'POST',
653		- headers: {},
654		- body: formData
655		- };
	647	+ const isGet = params.hasOwnProperty('method_request') && 'GET' === String(params.method_request).toUpperCase();
	648	+ let dataSend;
	649	+ if (isGet) {
	650	+ // Don't send method_request back to server; keep URL shorter.
	651	+ const paramsForSend = {
	652	+ ...params
	653	+ };
	654	+ delete paramsForSend.method_request;
	655	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
	656	+ nonce: lpSettings.nonce,
	657	+ 'lp-load-ajax': action,
	658	+ data: JSON.stringify(paramsForSend)
	659	+ });
	660	+ dataSend = {
	661	+ method: 'GET',
	662	+ headers: {}
	663	+ };
	664	+ } else {
	665	+ const formData = new FormData();
	666	+ formData.append('nonce', lpSettings.nonce);
	667	+ formData.append('lp-load-ajax', action);
	668	+ formData.append('data', JSON.stringify(params));
	669	+ dataSend = {
	670	+ method: 'POST',
	671	+ headers: {},
	672	+ body: formData
	673	+ };
	674	+ }
656	675	if (0 !== parseInt(lpSettings.user_id)) {
657	676	dataSend.headers['X-WP-Nonce'] = lpSettings.nonce;
658	677	}
659		- (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI)(urlAjax, dataSend, callBack);
	678	+ lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI(urlAjax, dataSend, callBack);
660	679	},
661	680	getElements: () => {
662	681	// Finds all elements with the class '.lp-load-ajax-element'
663	682	const elements = document.querySelectorAll('.lp-load-ajax-element:not(.loaded)');
		@@ -745,9 +764,9 @@
745	764
746	765	// Set url params to reload page.
747	766	if (!dataSend.args.hasOwnProperty('enableUpdateParamsUrl') || dataSend.args.enableUpdateParamsUrl) {
748	767	lpSettings.urlParams.paged = dataSend.args.paged;
749		- window.history.pushState({}, '', (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlCurrent, lpSettings.urlParams));
	768	+ window.history.pushState({}, '', lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlCurrent, lpSettings.urlParams));
750	769	}
751	770	// End.
752	771
753	772	// Show loading
		@@ -789,9 +808,9 @@
789	808	},
790	809	showHideLoading: (elLPTarget, status) => {
791	810	const elLoading = elLPTarget.nextElementSibling?.querySelector('.lp-loading-change');
792	811	if (elLoading) {
793		- (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpShowHideEl)(elLoading, status);
	812	+ lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpShowHideEl(elLoading, status);
794	813	}
795	814	}
796	815	};
797	816	};
		@@ -804,9 +823,9 @@
804	823	window.lpAJAXG.clickNumberPage(e, target);
805	824	});
806	825
807	826	// Listen element created
808		-(0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.listenElementCreated)(node => {
	827	+lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.listenElementCreated(node => {
809	828	if (node.classList.contains('lp-load-ajax-element')) {
810	829	//console.log( 'Element created', node );
811	830	window.lpAJAXG.getElements();
812	831	}
		@@ -812,9 +831,9 @@
812	831	}
813	832	});
814	833
815	834	// Listen element ready
816		-(0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpOnElementReady)('.lp-load-ajax-element', element => {
	835	+lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpOnElementReady('.lp-load-ajax-element', element => {
817	836	//console.log( 'Element ready', element );
818	837	window.lpAJAXG.getElements();
819	838	});
820	839