Commit 15d7cda

authored

Merge pull request #5414 from plotly/cleanup-old-polar-framework

Cleanup legacy polar framework

2 parents 07fb7c3 + cc5d6a3 commit 15d7cdaCopy full SHA for 15d7cda

File tree

-57

lines changed

-57

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,10 +126,6 @@ queue.stopSequence = function(gd) {`
`126`	`126`	`queue.undo = function undo(gd) {`
`127`	`127`	`var queueObj, i;`
`128`	`128`
`129`		`- if(gd.framework && gd.framework.isPolar) {`
`130`		`- gd.framework.undo();`
`131`		`- return;`
`132`		`- }`
`133`	`129`	`if(gd.undoQueue === undefined \|\|`
`134`	`130`	`isNaN(gd.undoQueue.index) \|\|`
`135`	`131`	`gd.undoQueue.index <= 0) {`
`@@ -159,10 +155,6 @@ queue.undo = function undo(gd) {`
`159`	`155`	`queue.redo = function redo(gd) {`
`160`	`156`	`var queueObj, i;`
`161`	`157`
`162`		`- if(gd.framework && gd.framework.isPolar) {`
`163`		`- gd.framework.redo();`
`164`		`- return;`
`165`		`- }`
`166`	`158`	`if(gd.undoQueue === undefined \|\|`
`167`	`159`	`isNaN(gd.undoQueue.index) \|\|`
`168`	`160`	`gd.undoQueue.index >= gd.undoQueue.queue.length) {`

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,12 +152,6 @@ function _doPlot(gd, data, layout, config) {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- // polar need a different framework`
`156`		`- if(gd.framework !== makePlotFramework) {`
`157`		`- gd.framework = makePlotFramework;`
`158`		`- makePlotFramework(gd);`
`159`		`- }`
`160`		`-`
`161`	`155`	`// clear gradient defs on each .plot call, because we know we'll loop through all traces`
`162`	`156`	`Drawing.initGradients(gd);`
`163`	`157`
`@@ -1770,10 +1764,6 @@ function relayout(gd, astr, val) {`
`1770`	`1764`	`gd = Lib.getGraphDiv(gd);`
`1771`	`1765`	`helpers.clearPromiseQueue(gd);`
`1772`	`1766`
`1773`		`- if(gd.framework && gd.framework.isPolar) {`
`1774`		`- return Promise.resolve(gd);`
`1775`		`- }`
`1776`		`-`
`1777`	`1767`	`var aobj = {};`
`1778`	`1768`	`if(typeof astr === 'string') {`
`1779`	`1769`	`aobj[astr] = val;`
`@@ -2283,10 +2273,6 @@ function update(gd, traceUpdate, layoutUpdate, _traces) {`
`2283`	`2273`	`gd = Lib.getGraphDiv(gd);`
`2284`	`2274`	`helpers.clearPromiseQueue(gd);`
`2285`	`2275`
`2286`		`- if(gd.framework && gd.framework.isPolar) {`
`2287`		`- return Promise.resolve(gd);`
`2288`		`- }`
`2289`		`-`
`2290`	`2276`	`if(!Lib.isPlainObject(traceUpdate)) traceUpdate = {};`
`2291`	`2277`	`if(!Lib.isPlainObject(layoutUpdate)) layoutUpdate = {};`
`2292`	`2278`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1740,7 +1740,6 @@ plots.purge = function(gd) {`
`1740`	`1740`	`delete gd._fullData;`
`1741`	`1741`	`delete gd._fullLayout;`
`1742`	`1742`	`delete gd.calcdata;`
`1743`		`- delete gd.framework;`
`1744`	`1743`	`delete gd.empty;`
`1745`	`1744`
`1746`	`1745`	`delete gd.fid;`
`@@ -2235,8 +2234,6 @@ plots.graphJson = function(gd, dataonly, mode, output, useDefaults, includeConfi`
`2235`	`2234`	`}`
`2236`	`2235`	`}`
`2237`	`2236`
`2238`		`- if(gd.framework && gd.framework.isPolar) obj = gd.framework.getConfig();`
`2239`		`-`
`2240`	`2237`	`if(frames) obj.frames = stripObj(frames);`
`2241`	`2238`
`2242`	`2239`	`if(includeConfig) obj.config = stripObj(gd._context, true);`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,6 @@ function keyIsAxis(keyName) {`
`58`	`58`
`59`	`59`
`60`	`60`	`module.exports = function clonePlot(graphObj, options) {`
`61`		`- // Polar plot compatibility`
`62`		`- if(graphObj.framework && graphObj.framework.isPolar) {`
`63`		`- graphObj = graphObj.framework.getConfig();`
`64`		`- }`
`65`		`-`
`66`	`61`	`var i;`
`67`	`62`	`var oldData = graphObj.data;`
`68`	`63`	`var oldLayout = graphObj.layout;`

Lines changed: 0 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -377,33 +377,6 @@ describe('Plotly.___ methods', function() {`
`377`	`377`	`});`
`378`	`378`	`});`
`379`	`379`
`380`		`- describe('Plotly.relayout promise', function() {`
`381`		`- var promise;`
`382`		`- var promiseGd;`
`383`		`-`
`384`		`- beforeEach(function(done) {`
`385`		`- var data = [{ x: [1, 2, 3], y: [4, 5, 6] }];`
`386`		`- var layout = {hovermode: 'closest'};`
`387`		`- var initialDiv = createGraphDiv();`
`388`		`-`
`389`		`- Plotly.newPlot(initialDiv, data, layout);`
`390`		`-`
`391`		`- initialDiv.framework = { isPolar: true };`
`392`		`- promise = Plotly.relayout(initialDiv, 'hovermode', false);`
`393`		`-`
`394`		`- promise.then(function(gd) {`
`395`		`- promiseGd = gd;`
`396`		`- done();`
`397`		`- });`
`398`		`- });`
`399`		`-`
`400`		`- it('should be returned with the graph div unchanged when the framework is polar', function() {`
`401`		`- expect(promiseGd).toBeDefined();`
`402`		`- expect(typeof promiseGd).toBe('object');`
`403`		`- expect(promiseGd.changed).toBeFalsy();`
`404`		`- });`
`405`		`- });`
`406`		`-`
`407`	`380`	`describe('Plotly.relayout promise', function() {`
`408`	`381`	`var promise;`
`409`	`382`	`var promiseRejected = false;`

Comments

(0)