Merge pull request #181 from Codeinwp/new_deploy

Fixed priority issue with wp_enqueue_media
Added latest version of sdk

Author: selul

.distignore

@@ -17,3 +17,4 @@ dist
 artifact
 composer.json
 composer.lock
+key.enc

.travis.yml

@@ -1,38 +1,41 @@
 language: php
 php:
-    - "7.1"
-    - "7.0"
-    - "5.6"
-    - "5.5"
-    - "5.4"
-    - "5.3"
+- '7.1'
+- '7.0'
+- '5.6'
+- '5.5'
+- '5.4'
+- '5.3'
 sudo: false
 matrix:
   include:
-  - php: "5.6"
+  - php: '5.6'
     install: true
     before_script: chmod +x bin/wraith.sh
     env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
-    script:  ./bin/wraith.sh
+    script: "./bin/wraith.sh"
 branches:
   except:
   - "/^*-v[0-9]/"
 env:
   matrix:
   - WP_VERSION=latest WP_MULTISITE=0
   global:
-  - MASTER_BRANCH=master UPSTREAM_REPO=Codeinwp/visualizer STORE_URL=https://themeisle.com DEPLOY_BUILD=7.0
+  - MASTER_BRANCH=master UPSTREAM_REPO=Codeinwp/visualizer-pro STORE_URL=https://themeisle.com
+   DEPLOY_BUILD=7.0
 before_install:
-  - mkdir -p bin && cd bin
-  - wget "$PIRATE_FLEET"load.sh
-  - cd .. && chmod +x bin/load.sh
-  - ". ./bin/load.sh"
+- mkdir -p bin && cd bin
+- wget "$PIRATE_FLEET"load.sh
+- cd .. && chmod +x bin/load.sh
+- ". ./bin/load.sh"
 install:
 - chmod +x bin/install-dependencies.sh
 - ". ./bin/install-dependencies.sh"
 script:
 - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then  grunt travis; fi;
 before_deploy:
+- openssl aes-256-cbc -K $encrypted_794a7a2c76e1_key -iv $encrypted_794a7a2c76e1_iv
+  -in key.enc -out /tmp/key -d
 - chmod +x bin/prepare-deploy.sh
 - ". ./bin/prepare-deploy.sh"
 deploy:
@@ -48,7 +51,7 @@ deploy:
   on:
     branch: "$MASTER_BRANCH"
     repo: "$UPSTREAM_REPO"
-    condition: $TRAVIS_PHP_VERSION = $DEPLOY_BUILD
+    condition: "$TRAVIS_PHP_VERSION = $DEPLOY_BUILD"
 - provider: s3
   access_key_id: "$AWS_ACCESS_KEY"
   secret_access_key: "$AWS_SECRET_KEY"
@@ -61,7 +64,7 @@ deploy:
   on:
     repo: "$UPSTREAM_REPO"
     branch: "$MASTER_BRANCH"
-    condition: $TRAVIS_PHP_VERSION = $DEPLOY_BUILD
+    condition: "$TRAVIS_PHP_VERSION = $DEPLOY_BUILD"
 after_deploy:
 - chmod +x bin/deploy.sh
 - ". ./bin/deploy.sh"

classes/Visualizer/Module/Admin.php

@@ -54,7 +54,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
 		$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
 		$this->_addAction( 'admin_footer', 'renderTempaltes' );
-		$this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 9 );
+		$this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
 		$this->_addAction( 'admin_menu', 'registerAdminMenu' );
 		$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
 		$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );

classes/Visualizer/Plugin.php

@@ -28,7 +28,7 @@
 class Visualizer_Plugin {
 
 	const NAME = 'visualizer';
-	const VERSION = '2.1.1';
+	const VERSION = '2.1.2';
 
 	// custom post types
 	const CPT_VISUALIZER = 'visualizer';

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 2.1.1
+	Version: 2.1.2
 */
 #visualizer-library-view {
 	padding: 30px 10px 10px 30px;

index.php

@@ -4,7 +4,7 @@
 	Plugin Name: Visualizer: Charts and Graphs Lite
 	Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/
 	Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases.
-	Version: 2.1.1
+	Version: 2.1.2
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later

key.enc

@@ -2,9 +2,9 @@
 # This file is distributed under the GPL v2.0 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Visualizer: Charts and Graphs Lite 2.1.0\n"
+"Project-Id-Version: Visualizer: Charts and Graphs Lite 2.1.1\n"
 "Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
-"POT-Creation-Date: 2017-05-16 06:15:21+00:00\n"
+"POT-Creation-Date: 2017-05-26 11:03:14+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1500,6 +1500,20 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
+#: vendor/codeinwp/themeisle-sdk/class-themeisle-sdk-licenser.php:453
+msgid ""
+"Updating this theme will lose any customizations you have made. Cancel to "
+"stop, OK to update."
+msgstr ""
+
+#: vendor/codeinwp/themeisle-sdk/class-themeisle-sdk-widget-dashboard-blog.php:200
+msgid "Popular Plugin"
+msgstr ""
+
+#: vendor/codeinwp/themeisle-sdk/class-themeisle-sdk-widget-dashboard-blog.php:201
+msgid "Install"
+msgstr ""
+
 #. Plugin Name of the plugin/theme
 msgid "Visualizer: Charts and Graphs Lite"
 msgstr ""

languages/visualizer.pot

@@ -1,6 +1,6 @@
 {
   "name": "visualizer",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Visualizer Lite",
   "repository": {
     "type": "git",

package.json

@@ -119,6 +119,10 @@ http://docs.themeisle.com/article/610-how-can-i-edit-the-data-manually
 
 == Changelog ==
 
+= 2.1.2 =
+* Fixed priority issue with wp_enqueue_media
+* Added latest version of sdk
+
 = 2.1.1 =
 * Fixed charts bliking on some themes.