← All changes | public/class-wpdirectorykit-public.php +39 -12 1.3.0 → 1.5.9 View file →

		@@ -111,8 +111,10 @@
111	111	wp_register_style( 'wdk-listings-map', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-map.css', array(), $this->version, 'all' );
112	112	wp_register_style( 'wdk-listings-carousel', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-listings-carousel.css', array(), $this->version, 'all' );
113	113	wp_register_style( 'wdk-listing-related-listings-table', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-listing-related-listings-table.css', array(), $this->version, 'all' );
114	114	wp_register_style( 'wdk-search-popup', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-search-popup.css', array(), $this->version, 'all' );
	115	+ wp_register_style( 'wdk-tabs', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-tabs.css', array(), $this->version, 'all' );
	116	+ wp_register_style( 'wdk-language-switcher', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-language-switcher.css', array(), $this->version, 'all' );
115	117	wp_register_style( 'wdk-notify', plugin_dir_url( __FILE__ ) . 'css/wdk-notify.css', array(), $this->version, 'all' );
116	118	wp_register_style( 'wdk-modal', plugin_dir_url( __FILE__ ) . 'css/wdk-modal.css', array(), $this->version, 'all' );
117	119	wp_register_style( 'wdk-hover', plugin_dir_url( __FILE__ ) . 'css/wdk-hover.css', array(), $this->version, 'all' );
118	120	wp_register_style( 'leaflet', plugin_dir_url( __FILE__ ) . 'js/openstreetmap/leaflet.css', array(), '1.7.1', 'all' );
		@@ -120,9 +122,9 @@
120	122	wp_register_style( 'leaflet-cluster', plugin_dir_url( __FILE__ ) . 'js/openstreetmap/MarkerCluster.css', array(), '1.7.1', 'all' );
121	123	wp_register_style( 'leaflet-fullscreen', plugin_dir_url( __FILE__ ) . 'js/openstreetmap/leaflet.fullscreen.css', array(), '1.7.1', 'all' );
122	124	wp_register_style( 'ion.range-slider', plugin_dir_url( __FILE__ ) . 'js/ion.range-slider/css/ion.range-slider.min.css', array(), '2.3.1', 'all' );
123	125	wp_register_style( 'wdk-slider-range', plugin_dir_url( __FILE__ ) . 'css/wdk-slider-range.css', array(), '1.0', 'all' );
124		- wp_register_style( 'select2', plugin_dir_url( __FILE__ ) . 'js/select2/css/select2.min.css', array(), '4.0.13', 'all' );
	126	+ wp_register_style( 'select2-select2', plugin_dir_url( __FILE__ ) . 'js/select2/css/select2.min.css', array(), '4.0.13', 'all' );
125	127	wp_register_style( 'wdk-treefield-dropdown', plugin_dir_url( __FILE__ ) . 'js/wdk_treefield_dropdown/wdk_treefield_dropdown.css', array(), '1.0', 'all' );
126	128	wp_register_style( 'leaflet-draw', plugin_dir_url( __FILE__ ) . 'js/leaflet-draw/leaflet.draw.css', array(), '1.0', 'all' );
127	129
128	130	wp_register_style('blueimp-gallery', plugin_dir_url( __FILE__ ).'js/blueimp-gallery/css/blueimp-gallery.min.css', array(), '1.8', 'all');
		@@ -152,8 +154,11 @@
152	154	$custom_css .= "
153	155	.wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE)." .wdk_face.front i {
154	156	color: ".esc_attr(wmvc_show_data('category_color', $category),'',TRUE, TRUE).";
155	157	}
	158	+ .wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE).":hover .wdk_face.front i {
	159	+ color:#fff;
	160	+ }
156	161	.wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE)." .wdk_marker-container:hover .wdk_marker-card::after,
157	162	.wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE)." .wdk_marker-card::before {
158	163	background: ".esc_attr(wmvc_show_data('category_color', $category),'',TRUE, TRUE).";
159	164	}
		@@ -207,26 +212,24 @@
207	212	wp_register_script('wdk-blueimp-slider', plugin_dir_url( __FILE__ ).'js/wdk-blueimp-slider.js', array( 'jquery' ), '1.0', false );
208	213	wp_register_script('slick', plugin_dir_url( __FILE__ ).'js/slick/slick.min.js', array( 'jquery' ), '1.8', false );
209	214	wp_register_script('ion.range-slider', plugin_dir_url( __FILE__ ).'js/ion.range-slider/js/ion.range-slider.min.js', array( 'jquery' ), '2.3.1', false );
210	215	wp_register_script('wdk-slider-range', plugin_dir_url( __FILE__ ).'js/wdk-slider-range.js', array( 'jquery' ), '1.0', false );
211		- wp_register_script('select2', plugin_dir_url( __FILE__ ).'js/select2/js/select2.min.js', array( 'jquery' ), '4.0.13', false );
	216	+ wp_register_script('select2-select2', plugin_dir_url( __FILE__ ).'js/select2/js/select2.min.js', array( 'jquery' ), '4.0.13', false );
212	217	wp_register_script('wdk-select2', plugin_dir_url( __FILE__ ).'js/wdk-select2.js', array( 'jquery' ), '4.0.13', false );
213	218	wp_register_script('leaflet-googlemutant', plugin_dir_url( __FILE__ ).'js/leaflet-gridlayer-googlemutant/leaflet-googlemutant.js', array( 'jquery' ), '4.0.13', false );
214	219	wp_register_script('wdk-ajax-loading-listings', plugin_dir_url( __FILE__ ).'js/wdk-ajax-loading-listings.js', array( 'jquery' ), '1.0', false );
215	220	wp_register_script('leaflet-draw', plugin_dir_url( __FILE__ ).'js/leaflet-draw/leaflet.draw.js', array( 'jquery' ), '1.0', false );
216		- wp_register_script('wdk-map-rectangle', plugin_dir_url( __FILE__ ).'js/wdk-map-rectangle.js', array( 'jquery', 'leaflet-draw' ), '1.0', false );
	221	+ wp_register_script('wdk-map-rectangle', plugin_dir_url( __FILE__ ).'js/wdk-map-rectangle.js', array( 'jquery', 'leaflet-draw', 'wp-i18n' ), '1.0', false );
	222	+ wp_register_script('wdk-tabs', WPDIRECTORYKIT_URL. 'elementor-elements/assets/js/wdk-tabs.js', array( 'jquery', 'leaflet-draw' ), '1.0', false );
217	223
218	224
219	225	if( wdk_get_option('wdk_experimental_features') && wdk_get_option('wdk_experimental_listing_popup')) {
220		- wp_register_script('wdk-popup-listings', plugin_dir_url( __FILE__ ).'js/wdk-popup-listings.js', array( 'jquery' ), '1.0', false );
	226	+ wp_register_script('wdk-popup-listings', plugin_dir_url( __FILE__ ).'js/wdk-popup-listings.js', array( 'jquery', 'jquery-confirm' ), '1.6', false );
221	227	wp_enqueue_script('wdk-popup-listings');
	228	+ wp_enqueue_style('jquery-confirm');
222	229	}
223		-
224		- $params = array(
225		- 'ajax_url' => admin_url( 'admin-ajax.php' )
226		- );
	230	+
227	231	wp_register_script('wdk-treefield-dropdown', plugin_dir_url( __FILE__ ).'js/wdk_treefield_dropdown/wdk_treefield_dropdown.js', array( 'jquery' ), '1.0', false );
228		- wp_localize_script( 'wdk-treefield-dropdown', 'script_parameters', $params);
229	232
230	233	wp_register_script('jquery-confirm', plugin_dir_url( __FILE__ ).'js/jquery-confirm/js/jquery-confirm.js', array( 'jquery' ), '3.3.4', false );
231	234
232	235	$params = array(
		@@ -250,16 +253,40 @@
250	253	'format_datetime' => wdk_convert_date_format_js(get_option('date_format').' '.get_option('time_format')),
251	254	'format_date_js' => wdk_convert_date_format_jquery(get_option('date_format')),
252	255	'format_datetime_js' => wdk_convert_date_format_jquery(get_option('date_format').' '.get_option('time_format')),
253	256	'settings_wdk_field_search_suggestion_disable' => (wdk_get_option('wdk_field_search_suggestion_disable')) ? 1 : 0,
	257	+ 'text' => array(
	258	+ "read_more"=> esc_html__("Read More", 'wpdirectorykit'),
	259	+ "read_less"=> esc_html__("Read Less", 'wpdirectorykit'),
	260	+ ),
	261	+ 'wpApiSettings' => [
	262	+ 'root'=> esc_url_raw(rest_url()),
	263	+ 'nonce'=> wp_create_nonce('wp_rest'),
	264	+ 'wdk_secure_nonce'=> wp_create_nonce('wdk_secure_ajax'),
	265	+ ],
	266	+ 'fields_data' => wdk_cached_field_get(),
	267	+ 'wdk_ai_search_fields' => get_option( 'wdk_ai_search_fields', []),
254	268	);
255		-
256		- wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpdirectorykit-public.js', array( 'jquery' ), $this->version, false );
	269	+ wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpdirectorykit-public.js', array( 'jquery' ,'wp-i18n'), $this->version, false );
257	270	wp_localize_script( $this->plugin_name, 'script_parameters', $params);
	271	+ wp_localize_script( $this->plugin_name, 'wdk_script_parameters', $params);
258	272
259	273	wp_register_style('jquery-ui', WPDIRECTORYKIT_URL. 'public/css/jquery-ui.css', array(), '1.12.1' );
260	274
261	275	$custom_css = '.wdk-image:not(.media):not(.jsplaceholder){background-image: url('.esc_url(wdk_placeholder_image_src()).');background-size: cover;background-position: center; }';
	276	+
	277	+ $params = array(
	278	+ 'ajax_url' => admin_url( 'admin-ajax.php' ),
	279	+ 'text' =>array(
	280	+ 'errorLoading' => esc_html__('The results could not be loaded.', 'wpdirectorykit'),
	281	+ 'loadingMore' => esc_html__('Loading more results…', 'wpdirectorykit'),
	282	+ 'noResults' => esc_html__('No results found', 'wpdirectorykit'),
	283	+ 'searching' => esc_html__('Searching…', 'wpdirectorykit'),
	284	+ 'removeAllItems' => esc_html__('Remove all items', 'wpdirectorykit'),
	285	+ ),
	286	+ );
	287	+ wp_localize_script('wdk-select2', 'wdk_select2_script_parameters', $params);
	288	+
262	289	wp_add_inline_style( $this->plugin_name, $custom_css);
263	290	}
264	291
265	292
		@@ -272,9 +299,9 @@
272	299	if(isset($_POST['function']))$function = sanitize_text_field($_POST['function']);
273	300
274	301	/* protect access only to ajax controller */
275	302	if($page != 'wdk_frontendajax' && $page != 'wdk_backendajax') {
276		- exit(esc_html__('Access denied','wdk-bookings'));
	303	+ exit(esc_html__('Access denied','wpdirectorykit'));
277	304	}
278	305
279	306	$WMVC = &wdk_get_instance();
280	307	$WMVC->load_controller($page, $function, array());