8000 Reorganization [part 1] by etpinard · Pull Request #1 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Reorganization [part 1] #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Nov 13, 2015
Merged

Reorganization [part 1] #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0d54d1f
tmp commit with unfinished files
etpinard Nov 7, 2015
0b51d05
add browserify transform modifying require path in jasmine tests
etpinard Nov 10, 2015
f4811f2
update karma configs
etpinard Nov 10, 2015
5b27e7f
mv jasmine test files to test/jasmine/tests/
etpinard Nov 10, 2015
6b68088
add jQuery as jasmine test asset
etpinard Nov 10, 2015
8dbcf9f
update contributors and add main field in package.json
etpinard Nov 10, 2015
99484a1
add .ackrc
etpinard Nov 10, 2015
768d24f
add mathjax/ to dist/extras/
etpinard Nov 10, 2015
e8d75fd
rm useless test_dashboard files
etpinard Nov 10, 2015
6bca872
rename testplots/ --> testplots-3d/
etpinard Nov 10, 2015
3a874e5
clean up test_dashboard index
etpinard Nov 10, 2015
94f9cd4
generalize shortcut paths browserify transform
etpinard Nov 10, 2015
c454258
use Chrome in local dev by default, Firefox on CI (for better coverage)
etpinard Nov 10, 2015
ef3053c
add typedarray.min.js to dist/extras/
etpinard Nov 10, 2015
a509445
build ploticon.js and plotcss.js in ./build/
etpinard Nov 10, 2015
1d6f218
modif watch script to watch_plotly,
etpinard Nov 10, 2015
09ca8a7
clean up in tasks/ scripts
etpinard Nov 10, 2015
c77b3b3
rename build.js --> bundle.js (build step include preprocess.js)
etpinard Nov 10, 2015
5a536d3
mv scss files to src/css/
etpinard Nov 10, 2015
953c259
rm plotcss.js and ploticon.js + require ignored files in build/
etpinard Nov 10, 2015
732efea
rn src/isnumeric, use 'fast-isnumeric' npm package
etpinard Nov 10, 2015
96b5c1c
add dev dependencies to package.json
etpinard Nov 10, 2015
22ee1fa
update scripts in package.json
etpinard Nov 10, 2015
eeb1b26
update test_dashboard server file (re-use watch_plotly.js!)
etpinard Nov 10, 2015
535cb8b
use @mocks shortcut to import geo_ test mocks
etpinard Nov 10, 2015
85e929b
require d3 into image_viewer bundle
etpinard Nov 10, 2015
5efe5af
update image_viewer server.js (more to come)
etpinard Nov 10, 2015
f3646da
add paths to test dashboard and image viewer build files to constants
etpinard Nov 10, 2015
8131509
split watch_plotly into module and run-script
etpinard Nov 12, 2015
d3b9f1f
rm un-finished scripts (for now)
etpinard Nov 12, 2015
e535fe9
add append version util, use it to add version in bundles
etpinard Nov 13, 2015
2abf31f
add dist/ to gitignore (dist/ commits will be -f)
etpinard Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rn src/isnumeric, use 'fast-isnumeric' npm package
  • Loading branch information
@etpinard
etpinard committed Nov 10, 2015
commit 732efea1daa3bde847d0c38acae005f64266fc74
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"d3": "3.5.6",
"delaunay-triangulate": "^1.1.6",
"es6-promise": "^3.0.2",
"fast-isnumeric": "^1.1.1",
"gl-error2d": "^1.0.0",
"gl-error3d": "^1.0.0",
"gl-line2d": "^1.2.1",
Expand Down
6 changes: 3 additions & 3 deletions src/annotations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var annotations = module.exports = {};

Expand Down
9 changes: 3 additions & 6 deletions src/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
'use strict';

// ---external global dependencies
/* Promise:false */

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var axes = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/bars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var bars = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/boxes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var boxes = module.exports = {};

Expand Down
4 changes: 2 additions & 2 deletions src/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var tinycolor = require('tinycolor2'),
isNumeric = require('./isnumeric');
var tinycolor = require('tinycolor2');
var isNumeric = require('fast-isnumeric');

var color = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/colorbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var colorbar = module.exports = function(td, id) {
// opts: options object, containing everything from attributes
Expand Down
8 changes: 4 additions & 4 deletions src/colorscale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
tinycolor = require('tinycolor2'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var tinycolor = require('tinycolor2');
var isNumeric = require('fast-isnumeric');

var colorscale = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/drawing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var drawing = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/errorbars.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/* jshint camelcase: false */

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var errorBars = module.exports = {};

Expand Down
2 changes: 1 addition & 1 deletion src/gl2d/scattergl/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var createError = require('gl-error2d');

var str2RGBArray = require('../../gl3d/lib/str2rgbarray');
var formatColor = require('../../gl3d/lib/format-color');
var isNumeric = require('../../isnumeric');
var isNumeric = require('fast-isnumeric');

var MARKER_SYMBOLS = require('../../gl3d/lib/markers.json');
var DASHES = require('../lib/dashes.json');
Expand Down
8 changes: 4 additions & 4 deletions src/gl3d/lib/format-color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var tinycolor = require('tinycolor2'),
isNumeric = require('../../isnumeric'),
str2RgbaArray = require('./str2rgbarray'),
Plotly = require('../../plotly');
var Plotly = require('../../plotly');
var tinycolor = require('tinycolor2');
var isNumeric = require('fast-isnumeric');
var str2RgbaArray = require('./str2rgbarray');

var colorDflt = Plotly.Color.defaultLine,
opacityDflt = 1;
Expand Down
10 changes: 5 additions & 5 deletions src/graph_interact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
tinycolor = require('tinycolor2'),
isNumeric = require('./isnumeric'),
Events = require('./events');
var Plotly = require('./plotly');
var d3 = require('d3');
var tinycolor = require('tinycolor2');
var isNumeric = require('fast-isnumeric');
var Events = require('./events');

var fx = module.exports = {};

Expand Down
13 changes: 5 additions & 8 deletions src/graph_obj.js
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
'use strict';

// ---external global dependencies
/* global Promise:false */

var Plotly = require('./plotly'),
d3 = require('d3'),
m4FromQuat = require('gl-mat4/fromQuat'),
isNumeric = require('./isnumeric'),
Events = require('./events');
var Plotly = require('./plotly');
var d3 = require('d3');
var m4FromQuat = require('gl-mat4/fromQuat');
var isNumeric = require('fast-isnumeric');
var Events = require('./events');

var plots = module.exports = {};
// Most of the generic plotting functions get put into Plotly.Plots,
Expand Down
8 changes: 4 additions & 4 deletions src/heatmap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
tinycolor = require('tinycolor2'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var tinycolor = require('tinycolor2');
var isNumeric = require('fast-isnumeric');

var heatmap = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/histogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

var Plotly = require('./plotly'),
isNumeric = require('./isnumeric'),
barAttrs = Plotly.Bars.attributes;
var Plotly = require('./plotly');
var isNumeric = require('fast-isnumeric');
var barAttrs = Plotly.Bars.attributes;

var histogram = module.exports = {};

Expand Down
55 changes: 0 additions & 55 deletions src/isnumeric.js
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/lib/lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var Plotly = require('../plotly'),
d3 = require('d3'),
tinycolor = require('tinycolor2'),
isNumeric = require('../isnumeric');
var Plotly = require('../plotly');
var d3 = require('d3');
var tinycolor = require('tinycolor2');
var isNumeric = require('fast-isnumeric');

var lib = module.exports = {};

Expand Down
8 changes: 4 additions & 4 deletions src/pie.js
View file
Open in desktop 2851
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric'),
tinycolor = require('tinycolor2');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolo F0AB r2');

var pie = module.exports = {};

Expand Down
6 changes: 3 additions & 3 deletions src/scatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/* jshint camelcase: false */

var Plotly = require('./plotly'),
d3 = require('d3'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var d3 = require('d3');
var isNumeric = require('fast-isnumeric');

var scatter = module.exports = {};

Expand Down
4 changes: 2 additions & 2 deletions src/shapes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('./plotly'),
isNumeric = require('./isnumeric');
var Plotly = require('./plotly');
var isNumeric = require('fast-isnumeric');

var shapes = module.exports = {};

Expand Down
0