MantisGraph: new method to load chart.js resources

Since MantisBT 2.8.0, MantisGraph only loads chart.js for its own pages. This prevents other plugins from accessing these resources to publish their own charts, unless they bundle chart.js themselves. This commit exposes a dedicated public method include_chartjs() to include the library, separately from the plugin's standard resources() function. Fixes #27122
mantisbt · Aug 9, 2020 · a145378 · a145378
1 parent bf4efef
commit a145378
Showing 1 changed file with 36 additions and 21 deletions.
diff --git a/plugins/MantisGraph/MantisGraph.php b/plugins/MantisGraph/MantisGraph.php
@@ -158,34 +158,49 @@ function graph_filter_menu() {
 	}
 
 	/**
-	 * Include javascript files for chart.js
+	 * Include Chart.js and plugins.
+	 *
+	 * This function can be called by other plugins that may need to use
+	 * Chart.js.
+	 *
 	 * @return void
 	 */
-	function resources() {
-		if( current( explode( '/', gpc_get_string( 'page', '' ) ) ) === $this->basename ) {
-			if( config_get_global( 'cdn_enabled' ) == ON ) {
-				$t_cdn_url = self::CHARTJS_CDN . '/npm/%s@%s/dist/';
+	function include_chartjs() {
+		if( config_get_global( 'cdn_enabled' ) == ON ) {
+			$t_cdn_url = self::CHARTJS_CDN . '/npm/%s@%s/dist/';
 
-				# Chart.js library
-				$t_link = sprintf( $t_cdn_url, 'chart.js', self::CHARTJS_VERSION );
-				html_javascript_cdn_link( $t_link . 'Chart.min.js', self::CHARTJS_HASH );
-				html_javascript_cdn_link( $t_link . 'Chart.bundle.min.js', self::CHARTJSBUNDLE_HASH );
+			# Chart.js library
+			$t_link = sprintf( $t_cdn_url, 'chart.js', self::CHARTJS_VERSION );
+			html_javascript_cdn_link( $t_link . 'Chart.min.js', self::CHARTJS_HASH );
+			html_javascript_cdn_link( $t_link . 'Chart.bundle.min.js', self::CHARTJSBUNDLE_HASH );
 
-				# Chart.js color schemes plugin
-				$t_link = sprintf( $t_cdn_url, 'chartjs-plugin-colorschemes', self::CHARTJS_COLORSCHEMES_VERSION );
-				html_javascript_cdn_link( $t_link . 'chartjs-plugin-colorschemes.min.js', self::CHARTJS_COLORSCHEMES_HASH );
-			} else {
-				$t_scripts = array(
-					plugin_file( 'Chart-' . self::CHARTJS_VERSION . '.min.js' ),
-					plugin_file( 'Chart.bundle-' . self::CHARTJS_VERSION . '.min.js' ),
-					plugin_file( 'chartjs-plugin-colorschemes-' . self::CHARTJS_COLORSCHEMES_VERSION . '.min.js' ),
+			# Chart.js color schemes plugin
+			$t_link = sprintf( $t_cdn_url, 'chartjs-plugin-colorschemes', self::CHARTJS_COLORSCHEMES_VERSION );
+			html_javascript_cdn_link( $t_link . 'chartjs-plugin-colorschemes.min.js', self::CHARTJS_COLORSCHEMES_HASH );
+		} else {
+			$t_scripts = array(
+				'Chart-' . self::CHARTJS_VERSION . '.min.js',
+				'Chart.bundle-' . self::CHARTJS_VERSION . '.min.js',
+				'chartjs-plugin-colorschemes-' . self::CHARTJS_COLORSCHEMES_VERSION . '.min.js',
+			);
+			foreach( $t_scripts as $t_script ) {
+				printf( "\t<script src=\"%s\"></script>\n",
+					plugin_file( $t_script, false, $this->basename )
 				);
 			}
+		}
+	}
 
-			$t_scripts[] = plugin_file( "MantisGraph.js" );
-			foreach( $t_scripts as $t_script ) {
-				echo "\t", '<script src="' . $t_script . '"></script>', "\n";
-			}
+	/**
+	 * Include javascript files for chart.js
+	 * @return void
+	 */
+	function resources() {
+		if( current( explode( '/', gpc_get_string( 'page', '' ) ) ) === $this->basename ) {
+			$this->include_chartjs();
+			printf( "\t<script src=\"%s\"></script>\n",
+				plugin_file( 'MantisGraph.js' )
+			);
 		}
 	}