Merge pull request #122 from contactashish13/development

remove footer banner #120

Author: selul

classes/Visualizer/Module/Admin.php

@@ -72,7 +72,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 	 * @access private
 	 * @return array The associated array of chart types with localized names.
 	 */
-	public static function _getChartTypesLocalized() {
+	public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
 		$types  = array(
 			'pie'         => array( 'name' => esc_html__( 'Pie', 'visualizer' ), 'enabled' => true ),
 			'line'        => array( 'name' => esc_html__( 'Line', 'visualizer' ), 'enabled' => true ),
@@ -91,6 +91,24 @@ public static function _getChartTypesLocalized() {
 
 		$types  = apply_filters( 'visualizer_pro_chart_types', $types );
 
+		if ( $enabledOnly ) {
+			$filtered   = array();
+			foreach ( $types as $type => $array ) {
+				if ( ! $array['enabled'] ) { continue;
+				}
+				$filtered[ $type ] = $array;
+			}
+			$types      = $filtered;
+		}
+
+		if ( $get2Darray ) {
+			$doubleD    = array();
+			foreach ( $types as $type => $array ) {
+				$doubleD[ $type ] = $array['name'];
+			}
+			$types      = $doubleD;
+		}
+
 		return $types;
 	}
 
@@ -143,7 +161,8 @@ public function setupMediaViewStrings( $strings ) {
 				'create'  => esc_html__( 'Create New', 'visualizer' ),
 			),
 			'library' => array(
-				'filters' => self::_getChartTypesLocalized(),
+				'filters'   => self::_getChartTypesLocalized( true, true ),
+				'types'     => array_keys( self::_getChartTypesLocalized( true, true ) ),
 			),
 			'nonce'    => wp_create_nonce(),
 			'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),

classes/Visualizer/Plugin.php

@@ -165,7 +165,6 @@ public function setModule( $class ) {
 	 */
 	public static function getChartTypes() {
 		$array  = array_keys( Visualizer_Module_Admin::_getChartTypesLocalized() );
-		unset( $array[0] ); // all
 		return $array;
 	}
 

js/media/view.js

@@ -358,7 +358,7 @@
 			var self = this;
 
 			self.filters = {};
-			_.each(['all', 'pie', 'line', 'area', 'bar', 'column', 'geo', 'scatter', 'gauge', 'candlestick'], function(type, i) {
+			_.each(l10n.library.types, function(type, i) {
 				self.filters[type] = {
 					text: l10n.library.filters[type],
 					key: type,

languages/visualizer.pot

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Visualizer: Charts and Graphs Lite 1.7.2\n"
 "Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
-"POT-Creation-Date: 2016-12-09 18:27:39+00:00\n"
+"POT-Creation-Date: 2016-12-09 18:57:52+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,32 +72,32 @@ msgstr ""
 msgid "Combo"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:139
+#: classes/Visualizer/Module/Admin.php:157
 msgid "Visualizations"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:142
+#: classes/Visualizer/Module/Admin.php:160
 msgid "From Library"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:143
+#: classes/Visualizer/Module/Admin.php:161
 msgid "Create New"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:221
+#: classes/Visualizer/Module/Admin.php:240
 #: classes/Visualizer/Render/Library.php:168
 msgid "Visualizer Library"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:345
+#: classes/Visualizer/Module/Admin.php:364
 msgid "Library"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:368
+#: classes/Visualizer/Module/Admin.php:387
 msgid "Knowledge Base"
 msgstr ""
 
-#: classes/Visualizer/Module/Admin.php:373
+#: classes/Visualizer/Module/Admin.php:392
 msgid "Pro Addon"
 msgstr ""