| @@ -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->_addFilter( 'visualizer_get_language', 'getLanguage' ); | |
| 57 | 58 | $this->_addShortcode( 'visualizer', 'renderChart' ); |
| 58 | 59 | |
| 59 | 60 | // add do_shortocde hook for widget_text filter |
| 60 | 61 | if ( ! has_filter( 'widget_text', 'do_shortcode' ) ) { |
| @@ -69,8 +70,16 @@ | ||
| 69 | 70 | add_action( 'rest_api_init', array( $this, 'endpoint_register' ) ); |
| 70 | 71 | } |
| 71 | 72 | |
| 72 | 73 | /** |
| 74 | + * Returns the language/locale. | |
| 75 | + */ | |
| 76 | + function getLanguage( $dummy, $only_language ) { | |
| 77 | + return $this->get_language(); | |
| 78 | + } | |
| 79 | + | |
| 80 | + | |
| 81 | + /** | |
| 73 | 82 | * Registers the endpoints |
| 74 | 83 | */ |
| 75 | 84 | function endpoint_register() { |
| 76 | 85 | register_rest_route( |
| @@ -149,9 +158,8 @@ | ||
| 149 | 158 | wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); |
| 150 | 159 | wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true ); |
| 151 | 160 | wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true ); |
| 152 | 161 | wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true ); |
| 153 | - wp_enqueue_script( 'visualizer-clipboardjs' ); | |
| 154 | 162 | wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION ); |
| 155 | 163 | do_action( 'visualizer_pro_frontend_load_resources' ); |
| 156 | 164 | } |
| 157 | 165 | |
| @@ -188,8 +196,13 @@ | ||
| 188 | 196 | if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) { |
| 189 | 197 | return ''; |
| 190 | 198 | } |
| 191 | 199 | |
| 200 | + // in case revisions exist. | |
| 201 | + if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) { | |
| 202 | + $chart = get_post( $chart->ID ); | |
| 203 | + } | |
| 204 | + | |
| 192 | 205 | $id = 'visualizer-' . $atts['id']; |
| 193 | 206 | $defaultClass = 'visualizer-front'; |
| 194 | 207 | $class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] ); |
| 195 | 208 | $class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id']; |
| @@ -221,11 +234,14 @@ | ||
| 221 | 234 | } |
| 222 | 235 | |
| 223 | 236 | $id = $id . '-' . rand(); |
| 224 | 237 | $arguments = array( '', $id, $settings ); |
| 238 | + $css = ''; | |
| 225 | 239 | apply_filters_ref_array( 'visualizer_pro_inline_css', array( &$arguments ) ); |
| 226 | - $css = $arguments[0]; | |
| 227 | - $settings = $arguments[2]; | |
| 240 | + if ( ! empty( $arguments ) ) { | |
| 241 | + $css = $arguments[0]; | |
| 242 | + $settings = $arguments[2]; | |
| 243 | + } | |
| 228 | 244 | |
| 229 | 245 | // add chart to the array |
| 230 | 246 | $this->_charts[ $id ] = array( |
| 231 | 247 | 'type' => $type, |
| @@ -238,8 +254,9 @@ | ||
| 238 | 254 | wp_enqueue_script( 'visualizer-render' ); |
| 239 | 255 | wp_localize_script( |
| 240 | 256 | 'visualizer-render', 'visualizer', array( |
| 241 | 257 | 'charts' => $this->_charts, |
| 258 | + 'language' => $this->get_language(), | |
| 242 | 259 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 243 | 260 | 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '', |
| 244 | 261 | 'i10n' => array( |
| 245 | 262 | 'copied' => __( 'Copied!', 'visualizer' ), |
| @@ -266,8 +283,9 @@ | ||
| 266 | 283 | |
| 267 | 284 | if ( 'copy' === $key ) { |
| 268 | 285 | $copy = $this->_getDataAs( $atts['id'], 'csv' ); |
| 269 | 286 | $actions_div .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"'; |
| 287 | + wp_enqueue_script( 'visualizer-clipboardjs' ); | |
| 270 | 288 | } |
| 271 | 289 | |
| 272 | 290 | $actions_div .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] ); |
| 273 | 291 | $actions_div .= '>' . $label . '</a> '; |
