Merge pull request #4 from jdub233/feature/fix_css_issue

Remove unnecessary html and body styles
jdub233 · Mar 19, 2018 · 65132c3 · 65132c3
2 parents cdf3527 + c0e2d27
commit 65132c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/Kaltura/AdminController.php b/lib/Kaltura/AdminController.php
@@ -15,6 +15,7 @@ public function execute() {
 		}
 
 		wp_enqueue_script( 'kaltura-admin' );
+		wp_enqueue_style( 'kaltura-admin' );
 		wp_enqueue_script( 'kaltura-jquery-validate' );
 		$kalturaPartnerId  = KalturaHelpers::getOption( 'kaltura_partner_id' );
 		$partnerLogin      = KalturaHelpers::getRequestParam( 'partner_login' );

diff --git a/lib/Kaltura/AllInOneVideoPackPlugin.php b/lib/Kaltura/AllInOneVideoPackPlugin.php
@@ -29,6 +29,7 @@ public function init() {
 		add_action( 'admin_menu', array($this, 'adminMenuAction' ) );
 		add_action( 'wp_enqueue_scripts', array($this, 'enqueueScripts' ) );
 		add_action( 'admin_enqueue_scripts', array($this, 'adminEnqueueScripts' ) );
+		add_action( 'edit_form_top', array( $this, 'editorEnqueueScripts' ) );
 
 		// media upload actions
 		add_action( 'media_upload_kaltura_upload', array($this, 'mediaUploadAction' ) );
@@ -70,6 +71,7 @@ public function enqueueScripts() {
 	}
 
 	public function adminEnqueueScripts() {
+		wp_register_script( 'kaltura', KalturaHelpers::jsUrl( 'js/kaltura.js' ), array('jquery'), KALTURA_PLUGIN_VERSION, false );
 		wp_register_script( 'kaltura-admin', KalturaHelpers::jsUrl( 'js/kaltura-admin.js' ), array(), KALTURA_PLUGIN_VERSION, false );
 		wp_register_script( 'kaltura-player-selector', KalturaHelpers::jsUrl( 'js/kaltura-player-selector.js' ), array(), KALTURA_PLUGIN_VERSION, true );
 		wp_register_script( 'kaltura-entry-status-checker', KalturaHelpers::jsUrl( 'js/kaltura-entry-status-checker.js' ), array(), KALTURA_PLUGIN_VERSION, true );
@@ -99,12 +101,13 @@ public function adminEnqueueScripts() {
 		), KALTURA_PLUGIN_VERSION, true );
 		wp_register_style( 'kaltura-jquery.fileupload-ui', KalturaHelpers::cssUrl( 'chunked-file-upload-jquery/css/jquery.fileupload-ui.css' ), array( ), KALTURA_PLUGIN_VERSION );
 		wp_register_style( 'kaltura-jquery.fileupload-ui-kaltura', KalturaHelpers::cssUrl( 'chunked-file-upload-jquery/css/jquery.fileupload-ui-kaltura.css' ), array( 'kaltura-jquery.fileupload-ui', 'kaltura-bootstrap' ), KALTURA_PLUGIN_VERSION );
+		wp_register_style( 'kaltura-admin', KalturaHelpers::cssUrl( 'css/admin.css' ), array(), KALTURA_PLUGIN_VERSION );
+	}
 
-		wp_enqueue_script( 'kaltura', KalturaHelpers::jsUrl( 'js/kaltura.js' ), array(), KALTURA_PLUGIN_VERSION, false );
-		wp_enqueue_script( 'kaltura-admin', KalturaHelpers::jsUrl( 'js/kaltura-admin.js' ), array(), KALTURA_PLUGIN_VERSION, false );
-
-		wp_enqueue_style( 'kaltura-admin', KalturaHelpers::cssUrl( 'css/admin.css' ), array(), KALTURA_PLUGIN_VERSION );
-		wp_enqueue_style( 'kaltura' );
+	function editorEnqueueScripts() {
+		// Enqueue the necessary scripts for kaltura_tinymce.js to work properly.
+		wp_enqueue_script( 'kaltura' );
+		wp_enqueue_script( 'kaltura-admin' );
 	}
 
 	function executeLibraryController() {

diff --git a/lib/Kaltura/NetworkAdminController.php b/lib/Kaltura/NetworkAdminController.php
@@ -14,6 +14,7 @@ public function execute() {
 		}
 
 		wp_enqueue_script( 'kaltura-admin' );
+		wp_enqueue_style( 'kaltura-admin' );
 		$kalturaPartnerId = get_site_option( 'kaltura_partner_id' );
 		$partnerLogin     = KalturaHelpers::getRequestParam( 'partner_login', false );
 		if ( ! $kalturaPartnerId || $partnerLogin ) {