Merge pull request #194 from wp-media/fix/chart-color-conflicts

Fixes conflicts with chart.js
wp-media · Jan 11, 2018 · aece06d · aece06d
2 parents eb3fff1 + 4eb346b
commit aece06d
Show file tree

Hide file tree

Showing 10 changed files with 175 additions and 172 deletions.
diff --git a/assets/js/admin.js b/assets/js/admin.js
@@ -1,4 +1,6 @@
-window.imagify = {
+window.imagify = window.imagify || {};
+
+jQuery.extend( window.imagify, {
 	concat: ajaxurl.indexOf( '?' ) > 0 ? '&' : '?',
 	log:    function( content ) {
 		if ( undefined !== console ) {
@@ -20,7 +22,7 @@ window.imagify = {
 
 		jQuery( 'body' ).addClass( 'imagify-modal-is-open' );
 	}
-};
+} );
 
 
 // Imagify light modal =============================================================================

diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js
diff --git a/assets/js/bulk.js b/assets/js/bulk.js
@@ -43,7 +43,7 @@
 				return;
 			}
 
-			donuts[ this.id ] = new Chart( this, {
+			donuts[ this.id ] = new w.imagify.Chart( this, {
 				type: 'doughnut',
 				data: {
 					datasets: [{
@@ -91,7 +91,7 @@
 				return;
 			}
 
-			donut = new Chart( this, {
+			donut = new w.imagify.Chart( this, {
 				type: 'doughnut',
 				data: {
 					datasets: [{
@@ -121,7 +121,7 @@
 	}
 
 	if ( overviewCanvas ) {
-		overviewDoughnut = new Chart( overviewCanvas, {
+		overviewDoughnut = new w.imagify.Chart( overviewCanvas, {
 			type:    'doughnut',
 			data:    overviewData,
 			options: {

diff --git a/assets/js/bulk.min.js b/assets/js/bulk.min.js