| @@ -53,8 +53,9 @@ | ||
| 53 | 53 | public function __construct( Visualizer_Plugin $plugin ) { |
| 54 | 54 | parent::__construct( $plugin ); |
| 55 | 55 | |
| 56 | 56 | $this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' ); |
| 57 | + $this->_addAction( 'visualizer_enqueue_scripts', 'enqueueScripts' ); | |
| 57 | 58 | $this->_addFilter( 'visualizer_get_language', 'getLanguage' ); |
| 58 | 59 | $this->_addShortcode( 'visualizer', 'renderChart' ); |
| 59 | 60 | |
| 60 | 61 | // add do_shortocde hook for widget_text filter |
| @@ -98,9 +99,10 @@ | ||
| 98 | 99 | * @access private |
| 99 | 100 | */ |
| 100 | 101 | private function get_actions() { |
| 101 | 102 | return apply_filters( |
| 102 | - 'visualizer_action_buttons', array( | |
| 103 | + 'visualizer_action_buttons', | |
| 104 | + array( | |
| 103 | 105 | 'print' => __( 'Print', 'visualizer' ), |
| 104 | 106 | 'csv' => __( 'CSV', 'visualizer' ), |
| 105 | 107 | 'xls' => __( 'Excel', 'visualizer' ), |
| 106 | 108 | 'copy' => __( 'Copy', 'visualizer' ), |
| @@ -156,9 +158,10 @@ | ||
| 156 | 158 | */ |
| 157 | 159 | public function enqueueScripts() { |
| 158 | 160 | wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); |
| 159 | 161 | wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true ); |
| 160 | - wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true ); | |
| 162 | + wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true ); | |
| 163 | + wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery', 'visualizer-customization' ), Visualizer_Plugin::VERSION, true ); | |
| 161 | 164 | wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true ); |
| 162 | 165 | wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION ); |
| 163 | 166 | do_action( 'visualizer_pro_frontend_load_resources' ); |
| 164 | 167 | } |
| @@ -184,9 +187,10 @@ | ||
| 184 | 187 | 'class' => false, // chart class |
| 185 | 188 | 'series' => false, // series filter hook |
| 186 | 189 | 'data' => false, // data filter hook |
| 187 | 190 | 'settings' => false, // data filter hook |
| 188 | - ), $atts | |
| 191 | + ), | |
| 192 | + $atts | |
| 189 | 193 | ); |
| 190 | 194 | |
| 191 | 195 | // if empty id or chart does not exists, then return empty string |
| 192 | 196 | if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { |
| @@ -227,9 +231,9 @@ | ||
| 227 | 231 | $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type ); |
| 228 | 232 | } |
| 229 | 233 | |
| 230 | 234 | // handle data filter hooks |
| 231 | - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type ); | |
| 235 | + $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type ); | |
| 232 | 236 | if ( ! empty( $atts['data'] ) ) { |
| 233 | 237 | $data = apply_filters( $atts['data'], $data, $chart->ID, $type ); |
| 234 | 238 | } |
| 235 | 239 | |
| @@ -252,9 +256,11 @@ | ||
| 252 | 256 | |
| 253 | 257 | // enqueue visualizer render and update render localizations |
| 254 | 258 | wp_enqueue_script( 'visualizer-render' ); |
| 255 | 259 | wp_localize_script( |
| 256 | - 'visualizer-render', 'visualizer', array( | |
| 260 | + 'visualizer-render', | |
| 261 | + 'visualizer', | |
| 262 | + array( | |
| 257 | 263 | 'charts' => $this->_charts, |
| 258 | 264 | 'language' => $this->get_language(), |
| 259 | 265 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 260 | 266 | 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '', |
