Skip to content

Commit 9f42d0b

Browse files
Google charts: Do not load old and new JS
1 parent 2958b29 commit 9f42d0b

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

classes/Visualizer/Module/Frontend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function script_loader_tag( $tag, $handle, $src ) {
8181
return $tag;
8282
}
8383

84-
$scripts = array( 'google-jsapi-new', 'google-jsapi-old', 'visualizer-render-google-lib', 'visualizer-render-google' );
84+
$scripts = array( 'google-jsapi', 'visualizer-render-google-lib', 'visualizer-render-google' );
8585

8686
foreach ( $scripts as $async ) {
8787
if ( $async === $handle ) {

classes/Visualizer/Render/Sidebar/Google.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,12 @@ protected function hooks() {
9595
* Loads the assets.
9696
*/
9797
function load_google_assets( $deps, $is_frontend ) {
98-
wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
99-
wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
98+
wp_register_script( 'google-jsapi', '//www.gstatic.com/charts/loader.js', array(), null, true );
10099
wp_register_script(
101100
'visualizer-render-google-lib',
102101
VISUALIZER_ABSURL . 'js/render-google.js',
103102
array(
104-
'google-jsapi-old',
103+
'google-jsapi',
105104
),
106105
Visualizer_Plugin::VERSION,
107106
true
@@ -118,9 +117,8 @@ function load_google_assets( $deps, $is_frontend ) {
118117
* Enqueue assets.
119118
*/
120119
public static function enqueue_assets( $deps = array() ) {
121-
wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
122-
wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
123-
wp_enqueue_script( 'visualizer-render-google-lib', VISUALIZER_ABSURL . 'js/render-google.js', array_merge( $deps, array( 'visualizer-google-jsapi-old' ) ), Visualizer_Plugin::VERSION, true );
120+
wp_enqueue_script( 'visualizer-google-jsapi', '//www.gstatic.com/charts/loader.js', array(), null, true );
121+
wp_enqueue_script( 'visualizer-render-google-lib', VISUALIZER_ABSURL . 'js/render-google.js', array_merge( $deps, array( 'visualizer-google-jsapi' ) ), Visualizer_Plugin::VERSION, true );
124122
return 'visualizer-render-google-lib';
125123
}
126124

0 commit comments

Comments
 (0)