') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Attempt resolving conflicts in Pull 2911 by archmoj · Pull Request #2 · jonmmease/plotly.js · GitHub
Skip to content

Attempt resolving conflicts in Pull 2911 - #2

Closed
archmoj wants to merge 4823 commits into
jonmmease:typedArrayEncodingfrom
plotly:pull-2911_res-conflicts
Closed

Attempt resolving conflicts in Pull 2911#2
archmoj wants to merge 4823 commits into
jonmmease:typedArrayEncodingfrom
plotly:pull-2911_res-conflicts

Conversation

@archmoj

@archmojarchmoj commented Aug 4, 2020

Copy link
Copy Markdown

Added two commits to help resolve conflicts in plotly#2911

@jonmmease
cc: @plotly_js

archmojand others added 30 commits May 2, 2020 01:50
@archmoj
Merge pull request#4802from plotly/rebuild-package-lock-May01-2020
cbd7e6e
Rebuild package lock - May 2020
@archmoj
update package-lock May 2nd
10b8419
@archmoj
Merge pull request#4805from plotly/update-package-lock-May2
245eeec
update package-lock May 2nd
@archmoj
fix issue 4806 and 4808 - use and ensure stroke event only to activat…
3e96a40
…e editable shapes
@archmoj
allow activation of editable shapes using opaque fill
078c007
@archmoj
fixup config editable: true test
bb3f858
@archmoj
Merge pull request#4810from plotly/fix4808-shape-pointer-events
9112759
Apply and ensure stroke event only to activate editable shapes
@archmoj
install acorn v6 so that npm run preversion pass
ff4d016
@archmoj
Merge pull request#4811from plotly/use-acorn-v6
aa8ccc6
Downgrade acorn to v6
@archmoj
update changelog v1.54.1
e6e6f86
@archmoj
1.54.1
36b478d
@archmoj
correct release date in changelog
74dfee0
@archmoj
improve handling of gaps in distinctVals
615757f
@archmoj
add new mock to lock issue 4742
97f6b7b
@archmoj
fix issue 4807 - react plot_bgcolor
c89bcd2
@archmoj
Merge pull request#4816from plotly/react-plot_bgcolor
af8f15f
Fix react to plot_bgcolor changes
@archmoj
add new candlestick mock with rangebreaks - issue 4795
8a4bae3
@archmoj
BADNUM values sorted at the end - no need for first - tested in IE11
2f3b098
@archmoj
Merge pull request#4814from plotly/rangebreaks-ohlc
2a4f20e
Handle rangebreak gaps in `candlestick` & `ohlc`
@archmoj
refactor heatmap convertColumnData
de4ff4f
@archmoj
add heatmap rangebreak mocks with 1d & 2d z arrays
e85b04c
@archmoj
remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…
9051ab6
… z values from the array
@archmoj
correct baseline of heatmap with 2d-z-array
5f5f92d
@archmoj
extend mock data to next day over the break
e2cf395
@archmoj
add tests for coutour with rangebreaks & 1d and 2d z array
a7676bd
- remove duplicate points from heatmap mocks
@archmoj
Merge pull request#4821from plotly/rangebreaks-heatmap-2d-z-array
5d35b78
Fix rangebreaks on heatmap with 2d z array
@archmoj
clear legend title for react
2502876
@archmoj
Merge pull request#4827from plotly/react-legend-title
cbbb16c
Fix legend title react
@archmoj
add test for histogram2d with rangebreaks
dd9e7f5
@archmoj
fix issue 4825 - histogram2d with rangebreaks
948dc2a
archmojand others added 26 commits July 28, 2020 17:57
@archmoj
apply latest d3-time-format instead of d3 v3 time format
29ea31d
- support formatting options e.g. quarters, weeks and weekdays
- update description link to list various time format options
@archmoj
add test to display new formatting options
2315777
@archmoj
Revert "add test to display new formatting options"
e92a88c
This reverts commit 2315777.
@archmoj
apply latest d3-time-format in lib_date test
c877e72
@archmoj
fixup week-of-year index in the old test and add test for new time fo…
2f7a14e
…rmatting options namely q, u and W
@archmoj
add test for seconds and milliseconds since UNIX epoch
8cabb47
@archmoj
dev-install elliptic 6.5.3
c666200
@archmoj
bump karma 5.1.1
67b23f2
@archmoj
bump fuse.js 6.4.1
ee00a46
@archmoj
Merge pull request#5026from plotly/new-d3-time-format
0426df3
Upgrade d3 time format to expose new formatting options for weekdays, weeks and quarters
@archmoj
Merge pull request#5027from plotly/bump-karma-5.1.1
38a850c
bump karma 5.1.1
@archmoj
Merge pull request#5028from plotly/bump-fuse.js-6.4.1
0614631
bump fuse.js 6.4.1
@archmoj
Merge pull request#5029from plotly/bump-elliptic
648d4bb
dev-install elliptic 6.5.3
@archmoj
fix max latitude half span default
1420972
@archmoj
Merge pull request#5033from plotly/fix-max-latitude-span-dflt
0de3bf3
Fix default half span of latitude
@archmoj
fix typo - use mainplotinfo for the key
ca42e02
@archmoj
Merge pull request#5025from priyanomi/range-slider-touch-integration
3d516f0
Add Touch Support to RangeSlider #1098
@archmoj
Merge pull request#5035from plotly/fix-mainplotinfo-key
8415187
Fix typo in plotinfo keys
@archmoj
bump browserify 16.5.2
912cd18
@archmoj
bump eslint 7.6.0
1b5b915
@archmoj
bump prepend-file v2
4ce339b
@archmoj
Merge pull request#5041from plotly/browserify-16.5.2
29c860d
bump browserify 16.5.2
@archmoj
Merge pull request#5042from plotly/eslint-7.6.0
99604c6
bump eslint 7.6.0
@archmoj
Merge pull request#5043from plotly/prepend-file-2.0.0
a54c502
bump prepend-file v2
@archmoj
Merge remote-tracking branch 'origin/master' into pull-2911
6c23966
- and resolved conflicts in
- package.json
- src/lib/index.js
- src/lib/is_array.js
- src/plot_api/index.js
@archmoj
bump base64-arraybuffer - remove unused is_array file - apply new lint
cdf5fc8
@jonmmease

jonmmease commented Aug 5, 2020

Copy link
Copy Markdown
Owner

Thanks for resurrecting this @archmoj.

How do you and @alexcjohnson feel about including the Plotly.encode/Plotly.decode methods in Plotly.js at this point?

@jonmmease

jonmmease commented Aug 5, 2020

Copy link
Copy Markdown
Owner

Something else I would want to add to the encoded representation would be a shape attribute that holds the shape of the input array:

Here is the interpretation I was picturing:

  • If shape is a scalar number, then decode into a TypedArray. This is the current behavior of the PR.
  • If shape is an array of N numbers, then decode into an N dimensional ndarray. Assume and document whatever winding order is most natural for use with ndarray library.

Then to make use of this in Plotly.js:

  • Update heatmap and image traces to accept 2D ndarrays.
  • Update isosurface and volume traces to accept 3D ndarrays.

@archmojarchmoj closed this Jun 26, 2021
@archmoj
archmoj deleted the pull-2911_res-conflicts branch June 26, 2021 14:37
Sign up for freeto 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.

10 participants

@archmoj@jonmmease@alexcjohnson@MaksimLysakou@cy6eria@justin-sleep@jbampton@rio-yo@mtgto@priyanomi