Conflict issue oceanwp#5

omelsoft · May 15, 2020 · d916bc9 · d916bc9
1 parent 3f059be
commit d916bc9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/includes/widgets/about-me.php b/includes/widgets/about-me.php
@@ -119,8 +119,10 @@ public function print_scripts() {
 				( function( $ ){
 					$(document).ajaxSuccess(function(e, xhr, settings) {
 						var widget_id_base = 'ocean_about_me';
-						if ( settings.data.search( 'action=save-widget' ) != -1 && settings.data.search( 'id_base=' + widget_id_base) != -1 ) {
-							oceanwpSortServices();
+						if (typeof(settings.data) !== 'undefined' && typeof(settings.data.search) !== 'undefined') {
+							if ( settings.data.search( 'action=save-widget' ) !== 'undefined' && typeof(settings.data.search( 'id_base=' + widget_id_base)) !== 'undefined' ) {
+								oceanwpSortServices();
+							}
 						}
 					} );
 
@@ -372,4 +374,4 @@ public function form( $instance ) {
 
 	}
 }
-register_widget( 'Ocean_Extra_About_Me_Widget' );
+register_widget( 'Ocean_Extra_About_Me_Widget' );
diff --git a/includes/widgets/social.php b/includes/widgets/social.php
@@ -170,8 +170,10 @@ public function print_scripts() { ?>
 				( function( $ ){
 					$(document).ajaxSuccess(function(e, xhr, settings) {
 						var widget_id_base = 'ocean_social';
-						if ( settings.data.search( 'action=save-widget' ) != -1 && settings.data.search( 'id_base=' + widget_id_base) != -1 ) {
-							oceanwpSortServices();
+						if (typeof(settings.data) !== 'undefined' && typeof(settings.data.search) !== 'undefined') {
+							if ( settings.data.search( 'action=save-widget' ) !== 'undefined' && typeof(settings.data.search( 'id_base=' + widget_id_base)) !== 'undefined' ) {
+								oceanwpSortServices();
+							}
 						}
 					} );
 
@@ -529,4 +531,4 @@ public function colors( $args, $instance ) {
 
 	}
 }
-register_widget( 'Ocean_Extra_Social_Widget' );
+register_widget( 'Ocean_Extra_Social_Widget' );