Merge pull request #53 from contactashish13/issue-52

Adding new Visualizer chart triggers theme deactivation feedback window
Codeinwp · May 21, 2019 · 274277f · 274277f
2 parents 36f9b77 + e476004
commit 274277f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.0.5](https://github.com/Codeinwp/themeisle-sdk/compare/v3.0.4...v3.0.5) (2019-03-07)
+
+
+### Bug Fixes
+
+* dashboard widget issues and recommended module inconsistency fix [#50](https://github.com/Codeinwp/themeisle-sdk/issues/50), [#49](https://github.com/Codeinwp/themeisle-sdk/issues/49), [#47](https://github.com/Codeinwp/themeisle-sdk/issues/47) ([757eb02](https://github.com/Codeinwp/themeisle-sdk/commit/757eb02))
+
 ## [3.0.4](https://github.com/Codeinwp/themeisle-sdk/compare/v3.0.3...v3.0.4) (2019-01-28)
 
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
       "homepage": "https://themeisle.com"
     }
   ],
-  "version": "3.0.4",
+  "version": "3.0.5",
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
     "squizlabs/php_codesniffer": "^3.1",

diff --git a/load.php b/load.php
@@ -14,7 +14,7 @@
 	return;
 }
 // Current SDK version and path.
-$themeisle_sdk_version = '3.0.4';
+$themeisle_sdk_version = '3.0.5';
 $themeisle_sdk_path    = dirname( __FILE__ );
 
 global $themeisle_sdk_max_version;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "themeisle-sdk",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "scripts": {
     "semantic-release": "semantic-release --debug"
   },

diff --git a/src/Modules/Uninstall_feedback.php b/src/Modules/Uninstall_feedback.php
@@ -127,6 +127,12 @@ class Uninstall_Feedback extends Abstract_Module {
 	 * Loads the additional resources
 	 */
 	function load_resources() {
+		$screen = get_current_screen();
+
+		if ( ! $screen || ! in_array( $screen->id, array( 'theme-install', 'plugins' ) ) ) {
+			return;
+		}
+
 		add_thickbox();
 
 		$id = $this->product->get_key() . '_deactivate';