Merge pull request #2222 from rtCamp/fix/dashboard-build-files

Fix JS Build Files Breaking Admin Interface

Author: NoumaanAhamed

Gruntfile.js

@@ -12,7 +12,7 @@ module.exports = function (grunt) {
 				tasks: ['shell:postcss']
 			},
 			js: {
-				files: ['app/assets/js/rtMedia.js', 'app/assets/admin/js/scripts.js'],
+				files: ['app/assets/js/rtMedia.js', 'app/assets/admin/js/scripts.js', 'app/assets/admin/js/settings.js'],
 				tasks: ['terser']
 			}
 		},
@@ -60,7 +60,10 @@ module.exports = function (grunt) {
             },
             backend: {
                 files: {
-                    'app/assets/admin/js/admin.min.js': ['app/assets/admin/js/scripts.js']
+                    'app/assets/admin/js/admin.min.js': [
+                        'app/assets/admin/js/scripts.js',
+                        'app/assets/admin/js/settings.js'
+                    ]
                 }
             },
             godam: {

app/admin/RTMediaAdmin.php

@@ -777,13 +777,15 @@ public function ui( $hook ) {
 
 				$admin_ajax = admin_url( 'admin-ajax.php' );
 
+				// Always enqueue tabs.js as it's a dependency for admin scripts (provides rtTab jQuery plugin).
+				wp_enqueue_script( 'rtmedia-admin-tabs', RTMEDIA_URL . 'app/assets/admin/js/vendors/tabs.js', array( 'backbone' ), RTMEDIA_VERSION, true );
+
 				/* Only one JS file should enqueue */
 				if ( '' === $suffix ) {
-					wp_enqueue_script( 'rtmedia-admin-tabs', RTMEDIA_URL . 'app/assets/admin/js/vendors/tabs.js', array( 'backbone' ), RTMEDIA_VERSION, true );
-					wp_enqueue_script( 'rtmedia-admin-scripts', RTMEDIA_URL . 'app/assets/admin/js/scripts.js', array( 'backbone' ), RTMEDIA_VERSION, true );
+					wp_enqueue_script( 'rtmedia-admin-scripts', RTMEDIA_URL . 'app/assets/admin/js/scripts.js', array( 'rtmedia-admin-tabs', 'backbone' ), RTMEDIA_VERSION, true );
 					wp_enqueue_script( 'rtmedia-admin', RTMEDIA_URL . 'app/assets/admin/js/settings.js', array( 'backbone', 'wp-util' ), RTMEDIA_VERSION, true );
 				} else {
-					wp_enqueue_script( 'rtmedia-admin', RTMEDIA_URL . 'app/assets/admin/js/admin.min.js', array( 'backbone', 'wp-util' ), RTMEDIA_VERSION, true );
+					wp_enqueue_script( 'rtmedia-admin', RTMEDIA_URL . 'app/assets/admin/js/admin.min.js', array( 'rtmedia-admin-tabs', 'backbone', 'wp-util' ), RTMEDIA_VERSION, true );
 				}
 
 				// Enqueue JS file for GoDAM notice show/hide.

app/assets/admin/js/admin.min.js

@@ -1066,11 +1066,15 @@ jQuery( document ).ready( function ( $ ) {
 						jQuery('.rtm-button-container.top').append( setting_message );
 						setting_message.delay( 3000 ).fadeOut( 100 );
 					}
+					// Return early for import/export settings responses to avoid JSON.parse on already-parsed object.
+					return;
 				}
 
 				if ( typeof data.error === 'undefined' ) {
-
-					data = JSON.parse( data );
+					// Only parse if data is a string (not already parsed by jQuery).
+					if ( typeof data === 'string' ) {
+						data = JSON.parse( data );
+					}
 					if ( data.exceed_size_msg ) {
 						jQuery( '#debuglog' ).val( '' );
 						alert( data.exceed_size_msg );