Remove updatevalue and updateevent

Author: rreusser

src/components/sliders/attributes.js

@@ -78,39 +78,6 @@ module.exports = {
 
     steps: stepsAttrs,
 
-    updateevent: {
-        valType: 'string',
-        arrayOk: true,
-        role: 'info',
-        description: [
-            'The name of the event to which this component subscribes',
-            'in order to trigger updates. When the event is received',
-            'the component will attempt to update the slider position',
-            'to reflect the value passed as the data property of the',
-            'event. The corresponding step\'s API method is assumed to',
-            'have been triggered externally and so is not triggered again',
-            'when the event is received. If an array is provided, multiple',
-            'events will be subscribed to for updates.'
-        ].join(' ')
-    },
-
-    updatevalue: {
-        valType: 'string',
-        arrayOk: true,
-        role: 'info',
-        description: [
-            'The property of the event data that is matched to a slider',
-            'value when an event of type `updateevent` is received. If',
-            'undefined, the data argument itself is used. If a string,',
-            'that property is used, and if a string with dots, e.g.',
-            '`item.0.label`, then `data[0].label` is used. If an array,',
-            'it is matched to the respective updateevent item or if there',
-            'is no corresponding updatevalue for a particular updateevent,',
-            'it is interpreted as `undefined` and defaults to the data',
-            'property itself.'
-        ].join(' ')
-    },
-
     lenmode: {
         valType: 'enumerated',
         values: ['fraction', 'pixels'],

src/components/sliders/defaults.js

@@ -70,28 +70,9 @@ function sliderDefaults(sliderIn, sliderOut, layoutOut) {
     coerce('currentvalue.prefix');
     coerce('currentvalue.offset');
 
-    coerce('updateevent');
-    coerce('updatevalue');
-
     coerce('transition.duration');
     coerce('transition.easing');
 
-    if(sliderOut.updateevent) {
-        if(!Array.isArray(sliderOut.updateevent)) {
-            sliderOut.updateevent = [sliderOut.updateevent];
-        }
-    } else {
-        sliderOut.updateevent = [];
-    }
-
-    if(sliderOut.updatevalue) {
-        if(!Array.isArray(sliderOut.updatevalue)) {
-            sliderOut.updatevalue = [sliderOut.updatevalue];
-        }
-    } else {
-        sliderOut.updatevalue = [];
-    }
-
     Lib.coerceFont(coerce, 'font', layoutOut.font);
     Lib.coerceFont(coerce, 'currentvalue.font', layoutOut.font);
 

src/components/sliders/draw.js

@@ -227,11 +227,6 @@ function drawSlider(gd, sliderGroup, sliderOpts) {
     // Position the rectangle:
     Lib.setTranslate(sliderGroup, sliderOpts.lx + sliderOpts.pad.l, sliderOpts.ly + sliderOpts.pad.t);
 
-    // Every time the slider is draw from scratch, just detach and reattach the event listeners.
-    // This could perhaps be avoided.
-    removeListeners(gd, sliderGroup, sliderOpts);
-    attachListeners(gd, sliderGroup, sliderOpts);
-
     setActive(gd, sliderGroup, sliderOpts, sliderOpts.active, false, false);
 }
 
@@ -282,52 +277,6 @@ function drawCurrentValue(sliderGroup, sliderOpts, valueOverride) {
     return text;
 }
 
-function removeListeners(gd, sliderGroup, sliderOpts) {
-    var listeners = sliderOpts._input.listeners;
-    var eventNames = sliderOpts._input.eventNames;
-    if(!Array.isArray(listeners) || !Array.isArray(eventNames)) return;
-    while(listeners.length) {
-        gd._removeInternalListener(eventNames.pop(), listeners.pop());
-    }
-}
-
-function attachListeners(gd, sliderGroup, sliderOpts) {
-    if(!sliderOpts.updateevent || !sliderOpts.updateevent.length) {
-        return;
-    }
-
-    var listeners = sliderOpts._input.listeners = [];
-    var eventNames = sliderOpts._input.eventNames = [];
-
-    function makeListener(eventname, updatevalue) {
-        return function(data) {
-            var value = data;
-            if(updatevalue) {
-                value = Lib.nestedProperty(data, updatevalue).get();
-            }
-
-            // If it's *currently* invoking a command an event is received,
-            // then we'll ignore the event in order to avoid complicated
-            // infinite loops.
-            if(sliderOpts._invokingCommand) return;
-
-            setActiveByLabel(gd, sliderGroup, sliderOpts, value, false, true);
-        };
-    }
-
-    for(var i = 0; i < sliderOpts.updateevent.length; i++) {
-        var updateEventName = sliderOpts.updateevent[i];
-        var updatevalue = (sliderOpts.updatevalue || [])[i];
-
-        var updatelistener = makeListener(updateEventName, updatevalue);
-
-        gd._internalEv.on(updateEventName, updatelistener);
-
-        eventNames.push(updateEventName);
-        listeners.push(updatelistener);
-    }
-}
-
 function drawGrip(sliderGroup, gd, sliderOpts) {
     var grip = sliderGroup.selectAll('rect.' + constants.gripRectClass)
         .data([0]);

test/jasmine/tests/sliders_test.js

@@ -253,76 +253,3 @@ describe('update sliders interactions', function() {
         expect(d3.selectAll(query).size()).toEqual(cnt);
     }
 });
-
-describe('updateevent and updatevalue', function() {
-    'use strict';
-
-    var mock = require('@mocks/sliders.json');
-
-    var gd;
-
-    beforeEach(function(done) {
-        gd = createGraphDiv();
-
-        var mockCopy = Lib.extendDeep({}, mock);
-
-        Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(done);
-    });
-
-    afterEach(function() {
-        Plotly.purge(gd);
-        destroyGraphDiv();
-    });
-
-    it('updates a slider when an event is triggered', function(done) {
-        Plotly.relayout(gd, {
-            'sliders[0].updateevent': 'plotly_someevent',
-            'sliders[0].updatevalue': 'value'
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(2);
-            gd.emit('plotly_someevent', {value: 'green'});
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(3);
-        }).catch(fail).then(done);
-    });
-
-    it('updates a slider when updatevalue unspecified', function(done) {
-        Plotly.relayout(gd, {
-            'sliders[0].updateevent': 'plotly_someevent'
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(2);
-            gd.emit('plotly_someevent', 'green');
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(3);
-        }).catch(fail).then(done);
-    });
-
-    it('updates a slider when any of multiple updateevents occurs', function(done) {
-        Plotly.relayout(gd, {
-            'sliders[0].updateevent': ['plotly_someevent', 'plotly_anotherevent']
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(2);
-            gd.emit('plotly_someevent', 'green');
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(3);
-            gd.emit('plotly_anotherevent', 'yellow');
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(2);
-        }).catch(fail).then(done);
-    });
-
-    it('matches update events with update values', function(done) {
-        Plotly.relayout(gd, {
-            'sliders[0].updateevent': ['plotly_someevent', 'plotly_anotherevent'],
-            'sliders[0].updatevalue': ['foo', 'bar']
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(2);
-            gd.emit('plotly_someevent', {foo: 'green'});
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(3);
-            gd.emit('plotly_anotherevent', {bar: 'yellow'});
-        }).then(function() {
-            expect(gd._fullLayout.sliders[0].active).toEqual(2);
-        }).catch(fail).then(done);
-    });
-});