Skip to content
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

Jump to bottom

Reorganization [part 2] #2

Merged
merged 39 commits into from
Nov 16, 2015
Merged

Reorganization [part 2] #2

merged 39 commits into from
Nov 16, 2015

Conversation

etpinard
Copy link
Contributor

@alexcjohnson @bpostlethwaite @cldougl

This PR mostly moves files around in src/

css/
fonts/
snapshot/

assets/
  - topojson/
  - geo_assets.js

lib/
  - coerce.js 
  - nested_property.js
  - ... (including the current gl and geo lib modules)

components/
  - annotations/
  - color/
  - colorscale/
  - colorbar/
  - drawing/
  - errorbars/
  - shapes/
  - legend/
  - modebar/
  - titles/ (contents of Plotly.Plots.title)

constants/
  - geo_constants.js (the current geo/lib/params.js)
  - country-name_to_iso3.json
  - gl2d_dashes.json
  - gl3d_dashes.json
  - gl_markers.json

plot_api/ (the method to expose to users)
  - plot_api.js
  - plot_schema.js
plots/ 
  - cartesian/
    - axes.js
    - graph_interact.js (rename?, break up hover label stuff into components/hover_labels.js)
  - geo/
    - geo.js
    - layout/
      - attributes.js 
      - defaults.js
    - projections.js
    - set_scale.js
    - zoom.js
    - zoom_reset.js
  - gl2d/
    - scene2d.js
    - gl2daxes.js (convert step between plotly --> gl-vis)
    - camera.js
  - gl3d/
    - scene3d.js
    - layout/
       - attributes.js
       - defaults.js
      - attributes/
      - defaults/
      - convert.js
      - spikes.js
      - tick_marks.js
    - project.js
    - camera.js
  - plots.js  (what is left of Plotly.Plots)

traces/
  - scatter/
    - attributes.js
    - defaults.js
    - calc.js
    - plot.js 
    - style.js
    - scatter.js
  - bars/
  - boxes/
  - contour/
  - heatmap/
  - histogram/
  - pie/
  - scatter3d/
    - attributes.js
    - defaults.js
    - convert.js
    - plot.js 
    - scatter3d.js
  - surface/
  - mesh/
  - scattergeo/
  - choropleth/
  - scattergl/

plot_config.js
plotly.js
index.js  # the file to be browserify file exposing only Plotly.plot and friends

@etpinard
mv topojsons to src/assets/topojson
ba421a8
@etpinard
put all trace modules into src/traces/*/
edb54d3
@etpinard
put constants files into src/constants/
03fd865
@etpinard
put events.js & queue.js in lib/ rename plotly_util --> svg_text_utils
db76f02
@etpinard
put plot components into src/components/
ce39cf5
@etpinard
break up graph_obj.js:
97cb7bb 
- Plotly methods go in src/plot_api/plot_api.js
- Plotly.Plots module goes in src/plots/plots/plots.js
- break up attribute object in Plotly.Plots into seperate files
- factor Plotly.Plots.titles into components/titles/
@etpinard
put plot-type-specific lib functions in lib/
942e49e
@etpinard
change path to geo assets index file
dd7ccc5
@etpinard
put plot_schema in plot_api/
edae224
@etpinard
break lib.js into smaller lib modules:
df06911 
- coerce.js, dates.js, matrix.js nested_property.js,
  notifier.js, search.js, stats.js
@etpinard
split color attributes into attribute.js file
4181e97
@etpinard
make attributes files require in attributes file directly:
f842118 
- do not require in Plotly when not necessary
@etpinard
update colorbar Plotly.Plots.titles --> Plotly.Title.draw
01ee254
@etpinard
fix choropleth plot params --> constants
2d40132
@etpinard
mv geo module to plots/geo :
865476a 
- keep GeoLayout module (for now)
- merge GeoAxes into GeoLayout
@etpinard
put gl2d modules in src/plots/gl2d/
968257e
@etpinard
put gl3d module in plots/gl3d/ :
ff7c994 
- keep Gl3dLayout (for now)
- merge Gl3dAxes into Gl3dLayout
@etpinard
break attributes from axes.js
9edbce3
@etpinard
put graph_interact in plots/cartesian
769f6dd
@etpinard
put polar modules in plots/polar
914dcbf
@etpinard
re-org plotly.js
c833198
@etpinard
fix paths + lint
4f57bff
@etpinard
fix paths in jamsine tests
3349e7b
@etpinard
add index file exporting only API Plotly methods:
d3087b1 
- browserify that file so that window.Plotly doesn't contain
  internal methods
@etpinard
mv plots/plots/* to plots/* :
55e203a 
-  folders in plots/ are reserved for plot types
@etpinard
mv colorscale attributes out of colorbar/ into colorscale/
4fd274a
@etpinard
be more consistent about attribute file names:
ad49e57 
- attributes.js ALWAYS refers to trace attributes
- layout_attributes.js ALWAYS referes to layout attributes
@etpinard
rm check for Plotly.ErrorBars (rm sub-bundles for now)
9d2568d
@etpinard
rm check for Plotly.Queue:
94a450c 
  - Queue is now part of plotly.js and always there
@etpinard
lint
f8ce24a
etpinard and others added 7 commits November 13, 2015 18:51
@etpinard
Merge branch 'master' into reorg-src
f49923f
@etpinard
add postinstall hook to preprocess plot css and icons on install
7150055
@etpinard
make Snapshot and PlotSchema to 'beta' exposed methods
ce393fb
@etpinard
mv plot_config to plot_api/
dd8b3d3
@etpinard
add Plotly.setPlotConfig to API:
6d0e221 
- to extend the default config with the API.
@etpinard
change inner module pattern:
a2c72ed 
- rename src/$type/$module_name/$module_name.js ->
  src/$type/$module_name/index.js

  so that require('../$type/$module_name/$module_name') becomes
  require('../$type?$module_name')
@alexcjohnson
jshintrc copied from streambed
2de1313 
mainly so sublime doesn't complain about node
@alexcjohnson
Copy link
Collaborator

Beautiful. 💃

@etpinard
update jshintrc:
6c279ee 
- rm maxparms
- rm maxstatements
- bump maxdepth to 6
- add jasmine env
@etpinard
add jshint devDep and 'run lint' script
4491321
etpinard added a commit that referenced this pull request Nov 16, 2015
@etpinard
Merge pull request #2 from plotly/reorg-src
c3c71e6 
Reorganization [part 2]
@etpinard etpinard merged commit c3c71e6 into master Nov 16, 2015
@etpinard etpinard deleted the reorg-src branch November 16, 2015 03:04
@monfera monfera mentioned this pull request Mar 29, 2016
Open
etpinard pushed a commit that referenced this pull request Aug 2, 2016
@psalmody
Merge pull request #2 from psalmody/h-legend-cols
7ef2dff 
Horizontal legend in columns
etpinard pushed a commit that referenced this pull request Feb 8, 2017
@monfera
moving gd[].dimensions out of parcoords.js #2
e256929
@monfera monfera mentioned this pull request Mar 16, 2017
Closed
@kelegorm kelegorm mentioned this pull request Apr 6, 2017
Closed
@apalchys apalchys mentioned this pull request Aug 22, 2017
Merged
@nyan314sn nyan314sn mentioned this pull request Sep 1, 2017
Closed
monfera added a commit that referenced this pull request Oct 5, 2017
@monfera
globally safe clipPath #2
0fa1cc8
@monfera monfera mentioned this pull request Oct 20, 2017
Merged
jSharpWolf pushed a commit to jSharpWolf/plotly.js that referenced this pull request Mar 21, 2018
Bundle plotly#2
57b0a7f
etpinard pushed a commit that referenced this pull request Oct 5, 2018
@ErwanMAS
Merge pull request #2 from plotly/master
bdc94ce 
catch up
@Marc-Andre-Rivet Marc-Andre-Rivet mentioned this pull request Dec 4, 2019
Merged
@alexturcea alexturcea mentioned this pull request Jan 29, 2023
Open
This was referenced Jan 2, 2024
Merged
Open
ayjayt pushed a commit to geopozo/plotly.js that referenced this pull request Jan 29, 2024
@aliwelchoo
Merge pull request plotly#2 from geopozo/pikul-music-import-promise
80b4cf3 
FIX and Add options to chart2music plotly integration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@etpinard @alexcjohnson @bpostlethwaite