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

		@@ -587,14 +587,14 @@
587	587	__webpack_require__.r(__webpack_exports__);
588	588	/* harmony export */ __webpack_require__.d(__webpack_exports__, {
589	589	/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
590	590	/* harmony export */ });
591		-/* harmony import */ var _utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./utils.js */ "./assets/src/js/utils.js");
	591	+/* harmony import */ var lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lpAssetsJsPath/utils.js */ "./assets/src/js/utils.js");
592	592	/**
593	593	* Load all you need via AJAX
594	594	*
595	595	* @since 4.2.5.7
596		- * @version 1.1.0
	596	+ * @version 1.1.1
597	597	*/
598	598
599	599
600	600
		@@ -608,9 +608,9 @@
608	608	// End Handle general parameter in the Frontend and Backend
609	609
610	610	const lpAJAX = () => {
611	611	const classLPTarget = '.lp-target';
612		- const urlCurrent = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpGetCurrentURLNoParam)();
	612	+ const urlCurrent = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpGetCurrentURLNoParam();
613	613	return {
614	614	autoLoadAPIs: () => {
615	615	console.log('autoLoadAPIs');
616	616	},
		@@ -634,11 +634,11 @@
634	634	option.headers['Content-Type'] = 'application/json';
635	635	} else {
636	636	params.args = JSON.stringify(params.args);
637	637	params.callback = JSON.stringify(params.callback);
638		- url = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(url, params);
	638	+ url = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(url, params);
639	639	}
640		- ;(0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI)(url, option, callBack);
	640	+ lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI(url, option, callBack);
641	641	},
642	642	fetchAJAX: (params, callBack) => {
643	643	let urlAjax = lpSettings.lpAjaxUrl;
644	644
		@@ -643,36 +643,55 @@
643	643	let urlAjax = lpSettings.lpAjaxUrl;
644	644
645	645	// Set param id_url for identify.
646	646	if (params.hasOwnProperty('args') && params.args.hasOwnProperty('id_url')) {
647		- urlAjax = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlAjax, {
	647	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
648	648	id_url: params.args.id_url
649	649	});
650	650	} else if (params.hasOwnProperty('id_url')) {
651		- urlAjax = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlAjax, {
	651	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
652	652	id_url: params.id_url
653	653	});
654	654	}
655	655	// Set param lang here if exits, for detect translate
656	656	if (lpSettings.urlParams.hasOwnProperty('lang')) {
657		- urlAjax = (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlAjax, {
	657	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
658	658	lang: lpSettings.urlParams.lang
659	659	});
660	660	}
661		- const formData = new FormData();
662	661	const action = params.hasOwnProperty('action') ? params.action : 'load_content_via_ajax';
663		- formData.append('nonce', lpSettings.nonce);
664		- formData.append('lp-load-ajax', action);
665		- formData.append('data', JSON.stringify(params));
666		- const dataSend = {
667		- method: 'POST',
668		- headers: {},
669		- body: formData
670		- };
	662	+ const isGet = params.hasOwnProperty('method_request') && 'GET' === String(params.method_request).toUpperCase();
	663	+ let dataSend;
	664	+ if (isGet) {
	665	+ // Don't send method_request back to server; keep URL shorter.
	666	+ const paramsForSend = {
	667	+ ...params
	668	+ };
	669	+ delete paramsForSend.method_request;
	670	+ urlAjax = lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlAjax, {
	671	+ nonce: lpSettings.nonce,
	672	+ 'lp-load-ajax': action,
	673	+ data: JSON.stringify(paramsForSend)
	674	+ });
	675	+ dataSend = {
	676	+ method: 'GET',
	677	+ headers: {}
	678	+ };
	679	+ } else {
	680	+ const formData = new FormData();
	681	+ formData.append('nonce', lpSettings.nonce);
	682	+ formData.append('lp-load-ajax', action);
	683	+ formData.append('data', JSON.stringify(params));
	684	+ dataSend = {
	685	+ method: 'POST',
	686	+ headers: {},
	687	+ body: formData
	688	+ };
	689	+ }
671	690	if (0 !== parseInt(lpSettings.user_id)) {
672	691	dataSend.headers['X-WP-Nonce'] = lpSettings.nonce;
673	692	}
674		- ;(0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI)(urlAjax, dataSend, callBack);
	693	+ lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpFetchAPI(urlAjax, dataSend, callBack);
675	694	},
676	695	getElements: () => {
677	696	// Finds all elements with the class '.lp-load-ajax-element'
678	697	const elements = document.querySelectorAll('.lp-load-ajax-element:not(.loaded)');
		@@ -760,9 +779,9 @@
760	779
761	780	// Set url params to reload page.
762	781	if (!dataSend.args.hasOwnProperty('enableUpdateParamsUrl') || dataSend.args.enableUpdateParamsUrl) {
763	782	lpSettings.urlParams.paged = dataSend.args.paged;
764		- window.history.pushState({}, '', (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs)(urlCurrent, lpSettings.urlParams));
	783	+ window.history.pushState({}, '', lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpAddQueryArgs(urlCurrent, lpSettings.urlParams));
765	784	}
766	785	// End.
767	786
768	787	// Show loading
		@@ -804,9 +823,9 @@
804	823	},
805	824	showHideLoading: (elLPTarget, status) => {
806	825	const elLoading = elLPTarget.nextElementSibling?.querySelector('.lp-loading-change');
807	826	if (elLoading) {
808		- (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpShowHideEl)(elLoading, status);
	827	+ lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpShowHideEl(elLoading, status);
809	828	}
810	829	}
811	830	};
812	831	};
		@@ -819,9 +838,9 @@
819	838	window.lpAJAXG.clickNumberPage(e, target);
820	839	});
821	840
822	841	// Listen element created
823		-(0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.listenElementCreated)(node => {
	842	+lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.listenElementCreated(node => {
824	843	if (node.classList.contains('lp-load-ajax-element')) {
825	844	//console.log( 'Element created', node );
826	845	window.lpAJAXG.getElements();
827	846	}
		@@ -827,9 +846,9 @@
827	846	}
828	847	});
829	848
830	849	// Listen element ready
831		-(0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpOnElementReady)('.lp-load-ajax-element', element => {
	850	+lpAssetsJsPath_utils_js__WEBPACK_IMPORTED_MODULE_0__.lpOnElementReady('.lp-load-ajax-element', element => {
832	851	//console.log( 'Element ready', element );
833	852	window.lpAJAXG.getElements();
834	853	});
835	854