cleanup old polar framework from gd

archmoj · archmoj · commit cc5d6a347dc3 · 2021-01-15T17:26:10.000-05:00
diff --git a/src/lib/queue.js b/src/lib/queue.js
@@ -126,10 +126,6 @@ queue.stopSequence = function(gd) {
 queue.undo = function undo(gd) {
     var queueObj, i;
 
-    if(gd.framework && gd.framework.isPolar) {
-        gd.framework.undo();
-        return;
-    }
     if(gd.undoQueue === undefined ||
             isNaN(gd.undoQueue.index) ||
             gd.undoQueue.index <= 0) {
@@ -159,10 +155,6 @@ queue.undo = function undo(gd) {
 queue.redo = function redo(gd) {
     var queueObj, i;
 
-    if(gd.framework && gd.framework.isPolar) {
-        gd.framework.redo();
-        return;
-    }
     if(gd.undoQueue === undefined ||
             isNaN(gd.undoQueue.index) ||
             gd.undoQueue.index >= gd.undoQueue.queue.length) {
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -152,12 +152,6 @@ function plot(gd, data, layout, config) {
         }
     }
 
-    // polar need a different framework
-    if(gd.framework !== makePlotFramework) {
-        gd.framework = makePlotFramework;
-        makePlotFramework(gd);
-    }
-
     // clear gradient defs on each .plot call, because we know we'll loop through all traces
     Drawing.initGradients(gd);
 
@@ -1770,10 +1764,6 @@ function relayout(gd, astr, val) {
     gd = Lib.getGraphDiv(gd);
     helpers.clearPromiseQueue(gd);
 
-    if(gd.framework && gd.framework.isPolar) {
-        return Promise.resolve(gd);
-    }
-
     var aobj = {};
     if(typeof astr === 'string') {
         aobj[astr] = val;
@@ -2283,10 +2273,6 @@ function update(gd, traceUpdate, layoutUpdate, _traces) {
     gd = Lib.getGraphDiv(gd);
     helpers.clearPromiseQueue(gd);
 
-    if(gd.framework && gd.framework.isPolar) {
-        return Promise.resolve(gd);
-    }
-
     if(!Lib.isPlainObject(traceUpdate)) traceUpdate = {};
     if(!Lib.isPlainObject(layoutUpdate)) layoutUpdate = {};
 
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1740,7 +1740,6 @@ plots.purge = function(gd) {
     delete gd._fullData;
     delete gd._fullLayout;
     delete gd.calcdata;
-    delete gd.framework;
     delete gd.empty;
 
     delete gd.fid;
@@ -2235,8 +2234,6 @@ plots.graphJson = function(gd, dataonly, mode, output, useDefaults, includeConfi
         }
     }
 
-    if(gd.framework && gd.framework.isPolar) obj = gd.framework.getConfig();
-
     if(frames) obj.frames = stripObj(frames);
 
     if(includeConfig) obj.config = stripObj(gd._context, true);
diff --git a/src/snapshot/cloneplot.js b/src/snapshot/cloneplot.js
@@ -58,11 +58,6 @@ function keyIsAxis(keyName) {
 
 
 module.exports = function clonePlot(graphObj, options) {
-    // Polar plot compatibility
-    if(graphObj.framework && graphObj.framework.isPolar) {
-        graphObj = graphObj.framework.getConfig();
-    }
-
     var i;
     var oldData = graphObj.data;
     var oldLayout = graphObj.layout;
diff --git a/test/jasmine/tests/plot_promise_test.js b/test/jasmine/tests/plot_promise_test.js
@@ -373,33 +373,6 @@ describe('Plotly.___ methods', function() {
         });
     });
 
-    describe('Plotly.relayout promise', function() {
-        var promise;
-        var promiseGd;
-
-        beforeEach(function(done) {
-            var data = [{ x: [1, 2, 3], y: [4, 5, 6] }];
-            var layout = {hovermode: 'closest'};
-            var initialDiv = createGraphDiv();
-
-            Plotly.newPlot(initialDiv, data, layout);
-
-            initialDiv.framework = { isPolar: true };
-            promise = Plotly.relayout(initialDiv, 'hovermode', false);
-
-            promise.then(function(gd) {
-                promiseGd = gd;
-                done();
-            });
-        });
-
-        it('should be returned with the graph div unchanged when the framework is polar', function() {
-            expect(promiseGd).toBeDefined();
-            expect(typeof promiseGd).toBe('object');
-            expect(promiseGd.changed).toBeFalsy();
-        });
-    });
-
     describe('Plotly.relayout promise', function() {
         var promise;
         var promiseRejected = false;

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);`