| Index: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php |
| — | — | @@ -38,22 +38,22 @@ |
| 39 | 39 | |
| 40 | 40 | $resourceTemplate = array( |
| 41 | 41 | 'localBasePath' => $srfgIP . '/jqPlot', |
| 42 | | - 'remoteExtPath' => 'SemanticResultFormats' |
| | 42 | + 'remoteExtPath' => 'SemanticResultFormats/jqPlot' |
| 43 | 43 | ); |
| 44 | 44 | $wgResourceModules['ext.srf.jqplot'] = $resourceTemplate + array( |
| 45 | 45 | 'scripts' => array( |
| 46 | | - 'jquery.jqplot.min.js', |
| | 46 | + 'jquery.jqplot.js', |
| 47 | 47 | ), |
| 48 | 48 | 'styles' => array( |
| 49 | 49 | 'jquery.jqplot.css', |
| 50 | 50 | ), |
| 51 | 51 | 'dependencies' => array( |
| 52 | | - 'jquery', |
| 53 | 52 | ), |
| 54 | 53 | ); |
| 55 | 54 | $wgResourceModules['ext.srf.jqplotpie'] = $resourceTemplate + array( |
| 56 | 55 | 'scripts' => array( |
| 57 | | - 'jqplot.pieRenderer.min.js', |
| | 56 | + 'jqplot.pieRenderer.js', |
| | 57 | + 'excanvas.js', |
| 58 | 58 | ), |
| 59 | 59 | 'styles' => array( |
| 60 | 60 | ), |
| — | — | @@ -65,6 +65,7 @@ |
| 66 | 66 | |
| 67 | 67 | protected function loadJavascriptAndCSS() { |
| 68 | 68 | global $wgOut; |
| | 69 | + $wgOut->addModules( 'ext.srf.jqplot' ); |
| 69 | 70 | $wgOut->addModules( 'ext.srf.jqplotpie' ); |
| 70 | 71 | } |
| 71 | 72 | |
| — | — | @@ -92,11 +93,11 @@ |
| 93 | 94 | |
| 94 | 95 | if ( !$srfgJQPlotIncluded ) { |
| 95 | 96 | $srfgJQPlotIncluded = true; |
| 96 | | - $wgOut->addScript( '<!--[if IE]><script language="javascript" type="text/javascript" src="' . $srfgScriptPath . '/jqPlot/excanvas.min.js"></script><![endif]-->' ); |
| 97 | | - $wgOut->addScriptFile( "$srfgScriptPath/jqPlot/jquery.jqplot.min.js" ); |
| | 97 | + $wgOut->addScript( '<!--[if IE]><script language="javascript" type="text/javascript" src="' . $srfgScriptPath . '/jqPlot/excanvas.js"></script><![endif]-->' ); |
| | 98 | + $wgOut->addScriptFile( "$srfgScriptPath/jqPlot/jquery.jqplot.js" ); |
| 98 | 99 | } |
| 99 | 100 | |
| 100 | | - $wgOut->addScriptFile( "$srfgScriptPath/jqPlot/jqplot.pieRenderer.min.js" ); |
| | 101 | + $wgOut->addScriptFile( "$srfgScriptPath/jqPlot/jqplot.pieRenderer.js" ); |
| 101 | 102 | |
| 102 | 103 | // CSS file |
| 103 | 104 | $wgOut->addExtensionStyle( "$srfgScriptPath/jqPlot/jquery.jqplot.css" ); |
| Index: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php |
| — | — | @@ -57,25 +57,25 @@ |
| 58 | 58 | |
| 59 | 59 | $resourceTemplate = array( |
| 60 | 60 | 'localBasePath' => $srfgIP . '/jqPlot', |
| 61 | | - 'remoteExtPath' => 'SemanticResultFormats' |
| | 61 | + 'remoteExtPath' => 'SemanticResultFormats/jqPlot' |
| 62 | 62 | ); |
| 63 | 63 | $wgResourceModules['ext.srf.jqplot'] = $resourceTemplate + array( |
| 64 | 64 | 'scripts' => array( |
| 65 | | - 'jquery.jqplot.min.js', |
| | 65 | + 'jquery.jqplot.js', |
| 66 | 66 | ), |
| 67 | 67 | 'styles' => array( |
| 68 | 68 | 'jquery.jqplot.css', |
| 69 | 69 | ), |
| 70 | 70 | 'dependencies' => array( |
| 71 | | - 'jquery', |
| 72 | 71 | ), |
| 73 | 72 | ); |
| 74 | 73 | $wgResourceModules['ext.srf.jqplotbar'] = $resourceTemplate + array( |
| 75 | 74 | 'scripts' => array( |
| 76 | | - 'jqplot.categoryAxisRenderer.min.js', |
| 77 | | - 'jqplot.barRenderer.min.js', |
| 78 | | - 'jqplot.canvasAxisTickRenderer.min.js', |
| 79 | | - 'jqplot.canvasTextRenderer.min.js', |
| | 75 | + 'jqplot.categoryAxisRenderer.js', |
| | 76 | + 'jqplot.barRenderer.js', |
| | 77 | + 'jqplot.canvasAxisTickRenderer.js', |
| | 78 | + 'jqplot.canvasTextRenderer.js', |
| | 79 | + 'excanvas.js', |
| 80 | 80 | ), |
| 81 | 81 | 'styles' => array( |
| 82 | 82 | ), |
| — | — | @@ -116,15 +116,15 @@ |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | if ( !$srfgJQPlotIncluded ) { |
| 120 | | - $wgOut->addScript( '<!--[if IE]><script language="javascript" type="text/javascript" src="' . $srfgScriptPath . '/jqPlot/excanvas.min.js"></script><![endif]-->' ); |
| 121 | | - $scripts[] = "$srfgScriptPath/jqPlot/jquery.jqplot.min.js"; |
| | 120 | + $wgOut->addScript( '<!--[if IE]><script language="javascript" type="text/javascript" src="' . $srfgScriptPath . '/jqPlot/excanvas.js"></script><![endif]-->' ); |
| | 121 | + $scripts[] = "$srfgScriptPath/jqPlot/jquery.jqplot.js"; |
| 122 | 122 | $srfgJQPlotIncluded = true; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | | - $scripts[] = "$srfgScriptPath/jqPlot/jqplot.categoryAxisRenderer.min.js"; |
| 126 | | - $scripts[] = "$srfgScriptPath/jqPlot/jqplot.barRenderer.min.js"; |
| 127 | | - $scripts[] = "$srfgScriptPath/jqPlot/jqplot.canvasAxisTickRenderer.min.js"; |
| 128 | | - $scripts[] = "$srfgScriptPath/jqPlot/jqplot.canvasTextRenderer.min.js"; |
| | 125 | + $scripts[] = "$srfgScriptPath/jqPlot/jqplot.categoryAxisRenderer.js"; |
| | 126 | + $scripts[] = "$srfgScriptPath/jqPlot/jqplot.barRenderer.js"; |
| | 127 | + $scripts[] = "$srfgScriptPath/jqPlot/jqplot.canvasAxisTickRenderer.js"; |
| | 128 | + $scripts[] = "$srfgScriptPath/jqPlot/jqplot.canvasTextRenderer.js"; |
| 129 | 129 | |
| 130 | 130 | foreach ( $scripts as $script ) { |
| 131 | 131 | $wgOut->addScriptFile( $script ); |