version 2.10 released

inc/mep_enque.php

@@ -5,16 +5,10 @@ function mep_event_admin_scripts() {
   $user_api = mep_get_option( 'google-map-api', 'general_setting_sec', '');
     wp_enqueue_script('jquery-ui-datepicker');
     wp_enqueue_script('jquery-ui-core');   
-    wp_enqueue_script('jquery-ui-timepicker-addon',plugin_dir_url( __DIR__ ).'js/jquery-ui-timepicker-addon.js',array('jquery','jquery-ui-core'),1,true);
+
-    wp_enqueue_script('jquery-ui-timepicker-addon',plugin_dir_url( __DIR__ ).'js/jquery-ui-sliderAccess.js',array('jquery','jquery-ui-core','jquery-ui-timepicker-addon'),1,true);
-    wp_enqueue_style('jquery-ui-timepicker-addon',plugin_dir_url( __DIR__ ).'css/jquery-ui-timepicker-addon.css',array());
 
     wp_enqueue_style('mep-admin-style',plugin_dir_url( __DIR__ ).'css/admin_style.css',array());
     
-    wp_enqueue_style('mep-jquery-ui-style',plugin_dir_url( __DIR__ ).'css/jquery-ui.css',array());    
-
-  
-    wp_enqueue_script('gmap-scripts',plugin_dir_url( __DIR__ ).'js/mkb-admin.js',array('jquery','jquery-ui-core'),1,true);
        
 
     
@@ -26,6 +20,25 @@ if($user_api){
 }
 
 
+function add_admin_scripts( $hook ) {
+
+    global $post;
+
+    if ( $hook == 'post-new.php' || $hook == 'post.php' ) {
+        if ( 'mep_events' === $post->post_type ) { 
+    wp_enqueue_script('jquery-ui-timepicker-addon',plugin_dir_url( __DIR__ ).'js/jquery-ui-timepicker-addon.js',array('jquery','jquery-ui-core'),1,true);
+    wp_enqueue_script('jquery-ui-timepicker-addon',plugin_dir_url( __DIR__ ).'js/jquery-ui-sliderAccess.js',array('jquery','jquery-ui-core','jquery-ui-timepicker-addon'),1,true);
+    wp_enqueue_style('jquery-ui-timepicker-addon',plugin_dir_url( __DIR__ ).'css/jquery-ui-timepicker-addon.css',array());
+             wp_enqueue_style('mep-jquery-ui-style',plugin_dir_url( __DIR__ ).'css/jquery-ui.css',array());
+             wp_enqueue_script('gmap-scripts',plugin_dir_url( __DIR__ ).'js/mkb-admin.js',array('jquery','jquery-ui-core'),1,true);
+        }
+    }
+}
+add_action( 'admin_enqueue_scripts', 'add_admin_scripts', 10, 1 );
+
+
+
+
 
 
 // Enqueue Scripts for frontend
@@ -56,8 +69,8 @@ function mep_event_custom_enqueue_scripts() {
 // Datepicker code for admin dashboard load in footer section
 add_action('admin_footer','mep_admin_footer_script',10,99);
 function mep_admin_footer_script(){
-  global $pagenow, $typenow;
+    global $post;
-  if ($typenow=='mep_events') {
+        if ( 'mep_events' === $post->post_type ) { 
   ?>
 <script type="text/javascript">
 jQuery(document).ready(function($){

inc/mep_shortcode.php

@@ -251,6 +251,12 @@ if($pagination=='yes'){
 
 </div>
 </div>
+<script>
+	jQuery(document).ready( function() {
+            var containerEl = document.querySelector('.mep_event_list_sec');
+            var mixer = mixitup(containerEl);
+});
+</script>
 <?php
 $content = ob_get_clean();
 return $content;

js/mkb-scripts.js

@@ -1,7 +0,0 @@
-jQuery(document).ready( function() {
-
-            var containerEl = document.querySelector('.mep_event_list_sec');
-            var mixer = mixitup(containerEl);
-
-
-});

readme.txt

@@ -164,3 +164,6 @@ You can display the event list on any page by using the ShortCode. Just use this
 
 = 2.0.9 =
 *Update Release,Quantity Box issue Fixed & Datepcker missing Next and Previuos button fixed 6 Aug 2018*
+
+= 2.1.0 =
+*Update Release, jQuery Conflict fixed with DiVi theme. 8 Aug 2018*

woocommerce-event-press.php

@@ -3,7 +3,7 @@
 * Plugin Name: Woocommerce Events Manager
 * Plugin URI: http://mage-people.com
 * Description: A Complete Event Solution for WordPress by MagePeople..
-* Version: 2.0.9
+* Version: 2.1.0
 * Author: MagePeople Team
 * Author URI: http://www.mage-people.com/
 */