transforms: replace 'active' attribute by 'enabled'

Author: etpinard

src/transforms/filter.js

@@ -16,11 +16,11 @@ exports.moduleType = 'transform';
 exports.name = 'filter';
 
 exports.attributes = {
-    active: {
+    enabled: {
         valType: 'boolean',
         dflt: true,
         description: [
-            'Toggles whether or not the filter is active.'
+            'Determines whether this filter transform is enabled or disabled.'
         ].join(' ')
     },
     filtersrc: {
@@ -74,9 +74,9 @@ exports.supplyDefaults = function(transformIn) {
         return Lib.coerce(transformIn, transformOut, exports.attributes, attr, dflt);
     }
 
-    var active = coerce('active');
+    var enabled = coerce('enabled');
 
-    if(active) {
+    if(enabled) {
         var operation = coerce('operation');
 
         coerce('value');
@@ -97,7 +97,7 @@ exports.transform = function(data) {
 exports.calcTransform = function(gd, trace, opts) {
     var filtersrc = opts.filtersrc;
 
-    if(!opts.active || !trace[filtersrc]) return;
+    if(!opts.enabled || !trace[filtersrc]) return;
 
     var dataToCoord = getDataToCoordFunc(gd, filtersrc),
         filterFunc = getFilterFunc(opts, dataToCoord);

src/transforms/groupby.js

@@ -15,11 +15,11 @@ exports.moduleType = 'transform';
 exports.name = 'groupby';
 
 exports.attributes = {
-    active: {
+    enabled: {
         valType: 'boolean',
         dflt: true,
         description: [
-            'Toggles whether or not the filter is active.'
+            'Determines whether this group-by transform is enabled or disabled.'
         ].join(' ')
     },
     groups: {
@@ -65,9 +65,9 @@ exports.supplyDefaults = function(transformIn) {
         return Lib.coerce(transformIn, transformOut, exports.attributes, attr, dflt);
     }
 
-    var active = coerce('active');
+    var enabled = coerce('enabled');
 
-    if(!active) return transformOut;
+    if(!enabled) return transformOut;
 
     coerce('groups');
     coerce('style');

test/jasmine/tests/transform_filter_test.js

@@ -25,18 +25,18 @@ describe('filter transforms defaults:', function() {
 
         expect(traceOut.transforms).toEqual([{
             type: 'filter',
-            active: true,
+            enabled: true,
             operation: '=',
             value: 0,
             filtersrc: 'x'
         }]);
     });
 
-    it('supplyTraceDefaults should not coerce attributes if active: false', function() {
+    it('supplyTraceDefaults should not coerce attributes if enabled: false', function() {
         traceIn = {
             x: [1, 2, 3],
             transforms: [{
-                active: false,
+                enabled: false,
                 type: 'filter',
                 value: 0
             }]
@@ -46,7 +46,7 @@ describe('filter transforms defaults:', function() {
 
         expect(traceOut.transforms).toEqual([{
             type: 'filter',
-            active: false,
+            enabled: false,
         }]);
     });
 
@@ -121,11 +121,11 @@ describe('filter transforms calc:', function() {
         expect(out[0].y).toEqual(base.y);
     });
 
-    it('filters should skip if *active* is false', function() {
+    it('filters should skip if *enabled* is false', function() {
         var out = _transform([Lib.extendDeep({}, base, {
             transforms: [{
                 type: 'filter',
-                active: false,
+                enabled: false,
                 operation: '>',
                 value: 0,
                 filtersrc: 'x'
@@ -164,7 +164,7 @@ describe('filter transforms calc:', function() {
                 filtersrc: 'x'
             }, {
                 type: 'filter',
-                active: false,
+                enabled: false,
                 operation: '>',
                 value: 2,
                 filtersrc: 'y'

test/jasmine/tests/transform_multi_test.js

@@ -23,7 +23,7 @@ describe('general transforms:', function() {
 
         expect(traceOut.transforms).toEqual([{
             type: 'filter',
-            active: true,
+            enabled: true,
             operation: '=',
             value: 0,
             filtersrc: 'x'
@@ -62,15 +62,15 @@ describe('general transforms:', function() {
 
         expect(traceOut.transforms[0]).toEqual({
             type: 'filter',
-            active: true,
+            enabled: true,
             operation: '=',
             value: 0,
             filtersrc: 'x'
         }, '- global first');
 
         expect(traceOut.transforms[1]).toEqual({
             type: 'filter',
-            active: true,
+            enabled: true,
             operation: '>',
             strictinterval: true,
             value: 0,
@@ -111,7 +111,7 @@ describe('general transforms:', function() {
         msg = 'supplying the transform defaults';
         expect(dataOut[1].transforms[0]).toEqual({
             type: 'filter',
-            active: true,
+            enabled: true,
             operation: '>',
             value: 0,
             strictinterval: true,
@@ -131,7 +131,7 @@ describe('general transforms:', function() {
         msg = 'keeping refs to full transforms array';
         expect(dataOut[1]._fullInput.transforms).toEqual([{
             type: 'filter',
-            active: true,
+            enabled: true,
             operation: '>',
             value: 0,
             strictinterval: true,