Widgets - Google Translate: rename global JS function prefixing it to…

… avoid conflicts
Automattic · Nov 1, 2016 · a64d6bd · a64d6bd
1 parent b58b193
commit a64d6bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/widgets/customizer-utils.js b/modules/widgets/customizer-utils.js
@@ -42,7 +42,7 @@ wp.isJetpackWidgetPlaced = function( placement, widgetName ) {
 
 					// Refresh Google Translate
 					else if ( wp.isJetpackWidgetPlaced( placement, 'google_translate_widget' ) && 'object' === typeof google && google.translate && 'function' === typeof google.translate.TranslateElement ) {
-						$( 'script[src*="cb=googleTranslateElementInit"]' ).remove().appendTo( $( 'head' ) );
+						$( 'script[src*="cb=jetpackGoogleTranslateInit"]' ).remove().appendTo( $( 'head' ) );
 					}
 
 					// Refresh Facebook XFBML

diff --git a/modules/widgets/google-translate.php b/modules/widgets/google-translate.php
@@ -38,7 +38,7 @@ function __construct() {
 	 */
 	public function enqueue_scripts() {
 		wp_register_script( 'google-translate-init', plugins_url( 'google-translate/google-translate.js', __FILE__ ) );
-		wp_enqueue_script( 'google-translate', '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit', array( 'google-translate-init' ) );
+		wp_enqueue_script( 'google-translate', '//translate.google.com/translate_a/element.js?cb=jetpackGoogleTranslateInit', array( 'google-translate-init' ) );
 		wp_localize_script( 'google-translate-init', '_wp_google_translate_widget', array( 'lang' => get_locale() ) );
 
 		// Admin bar is also displayed on top of the site which causes google translate bar to hide beneath.

diff --git a/modules/widgets/google-translate/google-translate.js b/modules/widgets/google-translate/google-translate.js
@@ -1,7 +1,7 @@
 /*global google:true*/
 /*global _wp_google_translate_widget:true*/
-/*exported googleTranslateElementInit*/
-function googleTranslateElementInit() {
+/*exported jetpackGoogleTranslateInit*/
+function jetpackGoogleTranslateInit() {
 	var langRegex = /[?&#]lang=([a-z]+)/,
 	    langParam = window.location.href.match( langRegex ),
 	    lang      = 'object' === typeof _wp_google_translate_widget && 'string' === typeof _wp_google_translate_widget.lang ? _wp_google_translate_widget.lang: 'en';