| @@ -53,8 +53,10 @@ | ||
| 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' ); | |
| 58 | + $this->_addFilter( 'visualizer_get_language', 'getLanguage' ); | |
| 57 | 59 | $this->_addShortcode( 'visualizer', 'renderChart' ); |
| 58 | 60 | |
| 59 | 61 | // add do_shortocde hook for widget_text filter |
| 60 | 62 | if ( ! has_filter( 'widget_text', 'do_shortcode' ) ) { |
| @@ -69,8 +71,16 @@ | ||
| 69 | 71 | add_action( 'rest_api_init', array( $this, 'endpoint_register' ) ); |
| 70 | 72 | } |
| 71 | 73 | |
| 72 | 74 | /** |
| 75 | + * Returns the language/locale. | |
| 76 | + */ | |
| 77 | + function getLanguage( $dummy, $only_language ) { | |
| 78 | + return $this->get_language(); | |
| 79 | + } | |
| 80 | + | |
| 81 | + | |
| 82 | + /** | |
| 73 | 83 | * Registers the endpoints |
| 74 | 84 | */ |
| 75 | 85 | function endpoint_register() { |
| 76 | 86 | register_rest_route( |
| @@ -89,9 +99,10 @@ | ||
| 89 | 99 | * @access private |
| 90 | 100 | */ |
| 91 | 101 | private function get_actions() { |
| 92 | 102 | return apply_filters( |
| 93 | - 'visualizer_action_buttons', array( | |
| 103 | + 'visualizer_action_buttons', | |
| 104 | + array( | |
| 94 | 105 | 'print' => __( 'Print', 'visualizer' ), |
| 95 | 106 | 'csv' => __( 'CSV', 'visualizer' ), |
| 96 | 107 | 'xls' => __( 'Excel', 'visualizer' ), |
| 97 | 108 | 'copy' => __( 'Copy', 'visualizer' ), |
| @@ -145,13 +156,10 @@ | ||
| 145 | 156 | * |
| 146 | 157 | * @access public |
| 147 | 158 | */ |
| 148 | 159 | public function enqueueScripts() { |
| 149 | - wp_register_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); | |
| 150 | - wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true ); | |
| 151 | - wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true ); | |
| 160 | + wp_register_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, 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 | |
| @@ -176,9 +184,10 @@ | ||
| 176 | 184 | 'class' => false, // chart class |
| 177 | 185 | 'series' => false, // series filter hook |
| 178 | 186 | 'data' => false, // data filter hook |
| 179 | 187 | 'settings' => false, // data filter hook |
| 180 | - ), $atts | |
| 188 | + ), | |
| 189 | + $atts | |
| 181 | 190 | ); |
| 182 | 191 | |
| 183 | 192 | // if empty id or chart does not exists, then return empty string |
| 184 | 193 | if ( ! $atts['id'] || ! ( $chart = get_post( $atts['id'] ) ) || $chart->post_type != Visualizer_Plugin::CPT_VISUALIZER ) { |
| @@ -188,8 +197,13 @@ | ||
| 188 | 197 | if ( ! apply_filters( 'visualizer_pro_show_chart', true, $atts['id'] ) ) { |
| 189 | 198 | return ''; |
| 190 | 199 | } |
| 191 | 200 | |
| 201 | + // in case revisions exist. | |
| 202 | + if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) { | |
| 203 | + $chart = get_post( $chart->ID ); | |
| 204 | + } | |
| 205 | + | |
| 192 | 206 | $id = 'visualizer-' . $atts['id']; |
| 193 | 207 | $defaultClass = 'visualizer-front'; |
| 194 | 208 | $class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] ); |
| 195 | 209 | $class = $defaultClass . ' ' . $class . ' ' . 'visualizer-front-' . $atts['id']; |
| @@ -196,9 +210,11 @@ | ||
| 196 | 210 | $class = ! empty( $class ) ? ' class="' . trim( $class ) . '"' : ''; |
| 197 | 211 | |
| 198 | 212 | $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 199 | 213 | |
| 200 | - // faetch and update settings | |
| 214 | + $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false ); | |
| 215 | + | |
| 216 | + // fetch and update settings | |
| 201 | 217 | $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true ); |
| 202 | 218 | if ( empty( $settings['height'] ) ) { |
| 203 | 219 | $settings['height'] = '400'; |
| 204 | 220 | } |
| @@ -214,19 +230,22 @@ | ||
| 214 | 230 | $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type ); |
| 215 | 231 | } |
| 216 | 232 | |
| 217 | 233 | // handle data filter hooks |
| 218 | - $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( $chart->post_content ), $chart->ID, $type ); | |
| 234 | + $data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type ); | |
| 219 | 235 | if ( ! empty( $atts['data'] ) ) { |
| 220 | 236 | $data = apply_filters( $atts['data'], $data, $chart->ID, $type ); |
| 221 | 237 | } |
| 222 | 238 | |
| 223 | - $id = $id . '-' . rand(); | |
| 224 | - $arguments = array( '', $id, $settings ); | |
| 225 | - apply_filters_ref_array( 'visualizer_pro_inline_css', array( &$arguments ) ); | |
| 226 | - $css = $arguments[0]; | |
| 227 | - $settings = $arguments[2]; | |
| 239 | + $css = ''; | |
| 240 | + $arguments = $this->get_inline_custom_css( $id, $settings ); | |
| 241 | + if ( ! empty( $arguments ) ) { | |
| 242 | + $css = $arguments[0]; | |
| 243 | + $settings = $arguments[1]; | |
| 244 | + } | |
| 228 | 245 | |
| 246 | + $library = $this->load_chart_type( $chart->ID ); | |
| 247 | + | |
| 229 | 248 | // add chart to the array |
| 230 | 249 | $this->_charts[ $id ] = array( |
| 231 | 250 | 'type' => $type, |
| 232 | 251 | 'series' => $series, |
| @@ -231,20 +250,32 @@ | ||
| 231 | 250 | 'type' => $type, |
| 232 | 251 | 'series' => $series, |
| 233 | 252 | 'settings' => $settings, |
| 234 | 253 | 'data' => $data, |
| 254 | + 'library' => $library, | |
| 235 | 255 | ); |
| 236 | 256 | |
| 237 | - // enqueue visualizer render and update render localizations | |
| 238 | - wp_enqueue_script( 'visualizer-render' ); | |
| 257 | + wp_register_script( | |
| 258 | + "visualizer-render-$library", | |
| 259 | + VISUALIZER_ABSURL . 'js/render-facade.js', | |
| 260 | + apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ), | |
| 261 | + Visualizer_Plugin::VERSION, | |
| 262 | + true | |
| 263 | + ); | |
| 264 | + | |
| 265 | + wp_enqueue_script( "visualizer-render-$library" ); | |
| 239 | 266 | wp_localize_script( |
| 240 | - 'visualizer-render', 'visualizer', array( | |
| 267 | + "visualizer-render-$library", | |
| 268 | + 'visualizer', | |
| 269 | + array( | |
| 241 | 270 | 'charts' => $this->_charts, |
| 271 | + 'language' => $this->get_language(), | |
| 242 | 272 | 'map_api_key' => get_option( 'visualizer-map-api-key' ), |
| 243 | 273 | 'rest_url' => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '', |
| 244 | 274 | 'i10n' => array( |
| 245 | 275 | 'copied' => __( 'Copied!', 'visualizer' ), |
| 246 | 276 | ), |
| 277 | + 'page_type' => 'frontend', | |
| 247 | 278 | ) |
| 248 | 279 | ); |
| 249 | 280 | wp_enqueue_style( 'visualizer-front' ); |
| 250 | 281 | |
| @@ -266,8 +297,9 @@ | ||
| 266 | 297 | |
| 267 | 298 | if ( 'copy' === $key ) { |
| 268 | 299 | $copy = $this->_getDataAs( $atts['id'], 'csv' ); |
| 269 | 300 | $actions_div .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"'; |
| 301 | + wp_enqueue_script( 'visualizer-clipboardjs' ); | |
| 270 | 302 | } |
| 271 | 303 | |
| 272 | 304 | $actions_div .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] ); |
| 273 | 305 | $actions_div .= '>' . $label . '</a> '; |
