Merge pull request #26 from jwplayer/develop

Merged version 1.5.3 into master.
jwplayer · May 31, 2016 · 5ac59ae · 5ac59ae
2 parents 4f8e0fe + 22a18d1
commit 5ac59ae
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 104 deletions.
diff --git a/jw-player/include/admin.php b/jw-player/include/admin.php
@@ -22,10 +22,10 @@ function jwplayer_admin_head() {
 	?>
 
 	<script type="text/javascript">
-		jwplayer.plugin_url = '<?php echo esc_url( $plugin_url ); ?>';
-		jwplayer.content_mask = '<?php echo esc_url( $content_mask ); ?>';
-		jwplayer.nr_videos = <?php echo esc_js( $nr_videos ); ?>;
-		jwplayer.debug = <?php echo wp_json_encode( WP_DEBUG ); ?>;
+		jwplayerwp.plugin_url = '<?php echo esc_url( $plugin_url ); ?>';
+		jwplayerwp.content_mask = '<?php echo esc_url( $content_mask ); ?>';
+		jwplayerwp.nr_videos = <?php echo esc_js( $nr_videos ); ?>;
+		jwplayerwp.debug = <?php echo wp_json_encode( WP_DEBUG ); ?>;
 	</script>
 	<?php
 }

diff --git a/jw-player/jw-player.php b/jw-player/jw-player.php
@@ -4,7 +4,7 @@
 Plugin URI: http://www.jwplayer.com/
 Description: This plugin allows you to easily upload and embed videos using the JW Player. The embedded video links can be signed, making it harder for viewers to steal your content.
 Author: JW Player
-Version: 1.5.2
+Version: 1.5.3
 */
 
 define( 'JWPLAYER_PLUGIN_DIR', dirname( __FILE__ ) );

diff --git a/jw-player/readme.txt b/jw-player/readme.txt
@@ -3,7 +3,7 @@ Contributors: LongTail Video
 Tags: jwplayer, jw, player, jwplatform, video, media, html5
 Requires at least: 4.3
 Tested up to: 4.5.2
-Stable tag: 1.5.2
+Stable tag: 1.5.3
 License: GPLv3
 
 Upload and embed videos with your JW Player account to seamlessly integrate video into your WordPress website.
@@ -96,6 +96,11 @@ That's great. Tell us about it and open a pull request on [our GitHub mirror of
 
 == Changelog ==
 
+= 1.5.3 =
+
+* Fix: Https upload issues in admin.
+* Fix: Renamed main JS object to prevent conflicts with player in the admin.
+
 = 1.5.2 =
 
 * Issue: Small fix to make the plugin work with broken mime types.