Merge pull request #17 from shutterstock/version-1.3.5

Release 1.3.5

shutterstock/README.txt

@@ -2,8 +2,8 @@
 Contributors: shutterstockplugins
 Tags: shutterstock, stock photography, images, editorial images, licensing, media library, stock
 Requires at least: 5.5
-Tested up to: 5.6
-Stable tag: 1.3.4
+Tested up to: 5.7
+Stable tag: 1.3.5
 Requires PHP: 7.1
 License: MIT
 License URI: http://opensource.org/licenses/mit-license.html
@@ -111,6 +111,9 @@ You can click **View recommendations** to see suggested images based on the text
 1. Publish the page as usual. The image appears on the page just like any other image that you add to a page.
 
 == Changelog ==
+= 1.3.5 =
+* Bug fixes related to Screen options
+
 = 1.3.4 =
 * Documentation updates
 

shutterstock/admin/css/shutterstock-admin.css

@@ -3,26 +3,26 @@
  * included in this file.
  */
 
-.user-settings-table {
+.shutterstock-user-settings-table {
  border-spacing: 0;
 }
 
-.user-settings-table th {
+.shutterstock-user-settings-table th {
   border-top: 1px solid #7e8993;
   padding-left: 10px;
 }
-.user-settings-table td:last-child,
-.user-settings-table th:last-child {
+.shutterstock-user-settings-table td:last-child,
+.shutterstock-user-settings-table th:last-child {
   border-right: 1px solid #7e8993;
 }
 
-.user-settings-table td,
-.user-settings-table th {
+.shutterstock-user-settings-table td,
+.shutterstock-user-settings-table th {
   border-bottom: 1px solid #7e8993;
   border-left: 1px solid #7e8993;
 }
 
-.connected,
+.shutterstock-connected,
 p.shutterstock-token {
     word-wrap: break-word;
     white-space: pre-wrap;
@@ -47,15 +47,15 @@ p.shutterstock-token {
     color: orange;
 }
 
-button.logout, input.login {
+button.shutterstock-logout, input.shutterstock-login {
     cursor: pointer;
 }
 
-.connected {
+.shutterstock-connected {
   padding-top: 5px;
 }
 
-.hidden {
+.shutterstock-hidden {
   display: none !important;
 }
 

shutterstock/admin/partials/shutterstock-admin-field-shutterstock-login-button.php

@@ -17,7 +17,7 @@
                 function logout() {
                   var pre = \'<p class="' . esc_attr($atts['context']['connected_class']) . '">' . esc_html__('wordpress:logging_out', 'shutterstock') . '</p>\';
                   jQuery(".shutterstock-token").replaceWith(pre);
-                  jQuery(".connected").addClass("hidden");
+                  jQuery(".shutterstock-connected").addClass("shutterstock-hidden");
                 }
             </script>
             ';
@@ -26,12 +26,12 @@ function logout() {
                 id="' . esc_attr($atts['id']) . '"
                 name="' . esc_attr($atts['name']) . '"
                 value="' . esc_textarea($atts['value']) . '"
-                class="' . esc_attr($atts['context']['connected_class']) . ' hidden">' .
+                class="' . esc_attr($atts['context']['connected_class']) . ' shutterstock-hidden">' .
                     esc_textarea($atts['value']) .
                 '</textarea>';
 
-            echo '<div class="connected">'. esc_html__('wordpress:connected', 'shutterstock') .'</div>';
-            echo '<button class="logout" onclick="logout()">' . esc_attr($atts['context']['has_value_button_text']) . '</button>';
+            echo '<div class="shutterstock-connected">'. esc_html__('wordpress:connected', 'shutterstock') .'</div>';
+            echo '<button class="shutterstock-logout" onclick="logout()">' . esc_attr($atts['context']['has_value_button_text']) . '</button>';
         } else {
             echo '
             <script type="text/javascript">
@@ -48,7 +48,7 @@ function() {
                 }
             </script>
             <input
-                class="login"
+                class="shutterstock-login"
                 type="button"
                 value="' . esc_attr($atts['context']['no_value_button_text']) . '"
                 onclick="loginWithShutterstock()"

shutterstock/admin/partials/shutterstock-admin-field-user-settings.php

@@ -17,7 +17,7 @@
 ];
 
 ?>
-<table class="user-settings-table">
+<table class="shutterstock-user-settings-table">
     <thead>
       <th><?php echo esc_html_e('wordpress:text_user_type', 'shutterstock') ?></th>
       <?php

shutterstock/admin/shutterstock-media-page/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-dom', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'a12dd5a3fd2c760ed1eba6a1d1411b29');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-dom', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ad1fbcbe1ae62bfc0fe883dd43a5fba6');

shutterstock/includes/class-shutterstock.php

@@ -70,7 +70,7 @@ public function __construct() {
 		if ( defined( 'SHUTTERSTOCK_VERSION' ) ) {
 			$this->version = SHUTTERSTOCK_VERSION;
 		} else {
-			$this->version = '1.3.4';
+			$this->version = '1.3.5';
 		}
 		$this->shutterstock = 'shutterstock';
 		$this->shutterstock_ui = [

shutterstock/public/shutterstock-block/build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-data', 'wp-dom', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'bfe06f10ff22ac5a49cc33160d929da0');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-data', 'wp-dom', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'f82a7a3f573966b77006471e908ebd58');