Skip to content

Commit

Permalink
Install jqplot from npm instead of git
Browse files Browse the repository at this point in the history 
npm/pacote#76 caused issues for some developers when installing this
package from git
  • Loading branch information
@ThiefMaster
ThiefMaster committed Apr 16, 2021
1 parent 51b2de1 commit 058d9b2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 53 deletions.
52 changes: 12 additions & 40 deletions indico/web/client/js/jquery/compat/jqplot.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,17 @@
// imports all necesssay jqplot files,
// $ is automatically extended with jqplot functionality.

import 'jqplot/src/jqplot.core';
import 'jqplot/src/jqplot.axisLabelRenderer';
import 'jqplot/src/jqplot.axisTickRenderer';
import 'jqplot/src/jqplot.canvasGridRenderer';
import 'jqplot/src/jqplot.divTitleRenderer';
import 'jqplot/src/jqplot.effects.core';
import 'jqplot/src/jqplot.effects.blind';
import 'jqplot/src/jqplot.linePattern';
import 'jqplot/src/jqplot.lineRenderer';
import 'jqplot/src/jqplot.linearAxisRenderer';
import 'jqplot/src/jqplot.linearTickGenerator';
import 'jqplot/src/jqplot.markerRenderer';
import 'jqplot/src/jqplot.shadowRenderer';
import 'jqplot/src/jqplot.shapeRenderer';
import 'jqplot/src/jqplot.sprintf';
import 'jqplot/src/jqplot.tableLegendRenderer';
import 'jqplot/src/jqplot.themeEngine';
import 'jqplot/src/jqplot.toImage';
import 'jqplot/src/jsdate';
import 'updated-jqplot';

import 'jqplot/src/plugins/jqplot.barRenderer';
import 'jqplot/src/plugins/jqplot.barRenderer.js';
import 'jqplot/src/plugins/jqplot.canvasAxisLabelRenderer';
import 'jqplot/src/plugins/jqplot.canvasAxisLabelRenderer.js';
import 'jqplot/src/plugins/jqplot.canvasAxisTickRenderer';
import 'jqplot/src/plugins/jqplot.canvasAxisTickRenderer.js';
import 'jqplot/src/plugins/jqplot.canvasTextRenderer';
import 'jqplot/src/plugins/jqplot.canvasTextRenderer.js';
import 'jqplot/src/plugins/jqplot.categoryAxisRenderer';
import 'jqplot/src/plugins/jqplot.categoryAxisRenderer.js';
import 'jqplot/src/plugins/jqplot.cursor';
import 'jqplot/src/plugins/jqplot.cursor.js';
import 'jqplot/src/plugins/jqplot.dateAxisRenderer';
import 'jqplot/src/plugins/jqplot.dateAxisRenderer.js';
import 'jqplot/src/plugins/jqplot.highlighter';
import 'jqplot/src/plugins/jqplot.highlighter.js';
import 'jqplot/src/plugins/jqplot.logAxisRenderer';
import 'jqplot/src/plugins/jqplot.logAxisRenderer.js';
import 'jqplot/src/plugins/jqplot.pointLabels';
import 'jqplot/src/plugins/jqplot.pointLabels.js';
import 'updated-jqplot/dist/plugins/jqplot.barRenderer';
import 'updated-jqplot/dist/plugins/jqplot.canvasAxisLabelRenderer';
import 'updated-jqplot/dist/plugins/jqplot.canvasAxisTickRenderer';
import 'updated-jqplot/dist/plugins/jqplot.canvasTextRenderer';
import 'updated-jqplot/dist/plugins/jqplot.categoryAxisRenderer';
import 'updated-jqplot/dist/plugins/jqplot.cursor';
import 'updated-jqplot/dist/plugins/jqplot.dateAxisRenderer';
import 'updated-jqplot/dist/plugins/jqplot.highlighter';
import 'updated-jqplot/dist/plugins/jqplot.logAxisRenderer';
import 'updated-jqplot/dist/plugins/jqplot.pointLabels';

import 'jqplot/src/jquery.jqplot.css';
import 'updated-jqplot/dist/jquery.jqplot.css';
23 changes: 11 additions & 12 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"history": "^4.10.1",
"indico-sui-theme": "^0.0.5",
"jed": "^1.1.1",
"jqplot": "github:jqplot/jqplot#d96a669fbb729f4f51e2214688e54320411219af",
"jquery": "^3.6.0",
"jquery-colorbox": "^1.6.4",
"jquery-form": "^4.3.0",
Expand Down Expand Up @@ -88,6 +87,7 @@
"taggle": "^1.15.0",
"ua-parser-js": "^0.7.28",
"underscore": "^1.13.0",
"updated-jqplot": "1.0.9-2",
"vanderlee-colorpicker": "^1.2.16"
},
"devDependencies": {
Expand Down

0 comments on commit 058d9b2

Please sign in to comment.