Cleanup

Author: AB-xdev

vaadin-chartjs-wrapper/src/main/java/software/xdev/vaadin/chartjs/resources/js/src/ChartClientToServerUpdater.java

@@ -24,5 +24,5 @@ private ChartClientToServerUpdater()
 	public static final String LOCATION = ChartJSSources.BASE_LOCATION + "chartClientToServerUpdater.js";
 
 	public static final String CHECK_IF_EXISTS_ON_CLIENT_AND_UPDATE_SERVER =
-		"xVaadinChartjsWrapper.checkIfExistsOnClientAndUpdateServer('%s')";
+		ChartJSSources.FUNCTION_PREFIX + "checkIfExistsOnClientAndUpdateServer('%s')";
 }

vaadin-chartjs-wrapper/src/main/java/software/xdev/vaadin/chartjs/resources/js/src/ChartControlFunc.java

@@ -23,7 +23,7 @@ private ChartControlFunc()
 
 	public static final String LOCATION = ChartJSSources.BASE_LOCATION + "chartControlFunc.js";
 
-	public static final String BUILD_CHART = "xVaadinChartjsWrapper.buildChart('%s','%s',%s)";
+	public static final String BUILD_CHART = ChartJSSources.FUNCTION_PREFIX + "buildChart('%s','%s',%s)";
 
-	public static final String DESTROY_CHART = "xVaadinChartjsWrapper.tryDestroyChart('%s')";
+	public static final String DESTROY_CHART = ChartJSSources.FUNCTION_PREFIX + "tryDestroyChart('%s')";
 }

vaadin-chartjs-wrapper/src/main/java/software/xdev/vaadin/chartjs/resources/js/src/ChartJSSources.java

@@ -22,4 +22,6 @@ private ChartJSSources()
 	}
 
 	public static final String BASE_LOCATION = "./src/";
+	
+	public static final String FUNCTION_PREFIX = "window.xVaadinChartjsWrapper.";
 }

vaadin-chartjs-wrapper/src/main/java/software/xdev/vaadin/chartjs/resources/js/src/ChartThemeManager.java

@@ -23,5 +23,6 @@ private ChartThemeManager()
 
 	public static final String LOCATION = ChartJSSources.BASE_LOCATION + "chartThemeManager.js";
 
-	public static final String TRY_UPDATE_CHART_JS_THEMING = "xVaadinChartjsWrapper.tryUpdateChartJsTheming(%s)";
+	public static final String TRY_UPDATE_CHART_JS_THEMING =
+		ChartJSSources.FUNCTION_PREFIX + "tryUpdateChartJsTheming(%s)";
 }

vaadin-chartjs-wrapper/src/main/resources/META-INF/resources/frontend/src/chartThemeManager.js

@@ -1,7 +1,7 @@
 if(window.xVaadinChartjsWrapper == undefined) window.xVaadinChartjsWrapper = {};
 
 window.xVaadinChartjsWrapper.tryUpdateChartJsTheming = function tryUpdateChartJsTheming(force) {
-  if(!updatingChartJsThemingRequired && !force) {
+  if(!window.xVaadinChartjsWrapper.updatingChartJsThemingRequired && !force) {
     return;
   }