remove some stuff we (probably) won't implement in this PR

etpinard · etpinard · commit 2a7531a439da · 2017-10-31T17:36:13.000-04:00
diff --git a/src/traces/scatter/attributes.js b/src/traces/scatter/attributes.js
@@ -383,77 +383,37 @@ module.exports = {
                 valType: 'number',
                 min: 0,
                 max: 1,
-                arrayOk: true,
                 role: 'style',
                 editType: 'style',
                 description: 'Sets the marker opacity of selected points.'
             },
-            size: {
-                valType: 'number',
-                min: 0,
-                dflt: 6,
-                arrayOk: true,
+            color: {
+                valType: 'color',
                 role: 'style',
-                editType: 'calcIfAutorange',
-                description: 'Sets the marker size (in px) of selected points.'
-            },
-            line: extendFlat({
-                width: {
-                    valType: 'number',
-                    min: 0,
-                    arrayOk: true,
-                    role: 'style',
-                    editType: 'style',
-                    description: 'Sets the width (in px) of the lines bounding selected marker points.'
-                },
-                editType: 'calc'
-            },
-                colorAttributes('marker.line')
-            ),
-            editType: 'calc'
-        },
-            colorAttributes('marker')
-        )
+                editType: 'style',
+                description: 'Sets the marker color of selected points.'
+            }
+        })
     },
     unselected: {
         marker: extendFlat({
             opacity: {
                 valType: 'number',
                 min: 0,
                 max: 1,
-                dflt: 0.5,
-                arrayOk: true,
                 role: 'style',
                 editType: 'style',
                 description: 'Sets the marker opacity of unselected points, applied only when a selection exists.'
             },
-            size: {
-                valType: 'number',
-                min: 0,
-                dflt: 6,
-                arrayOk: true,
+            color: {
+                valType: 'color',
                 role: 'style',
-                editType: 'calcIfAutorange',
-                description: 'Sets the marker size (in px) of unselected points.'
-            },
-            line: extendFlat({
-                width: {
-                    valType: 'number',
-                    min: 0,
-                    arrayOk: true,
-                    role: 'style',
-                    editType: 'style',
-                    description: 'Sets the width (in px) of the lines bounding unselected marker points.'
-                },
-                editType: 'calc'
-            },
-                colorAttributes('marker.line')
-            ),
-            editType: 'calc'
-        },
-            colorAttributes('marker')
-        )
+                editType: 'style',
+                description: 'Sets the marker color of unselected points, applied only when a selection exists.'
+            }
+        })
     },
+
     selectedpoints: {
         valType: 'any',
         role: 'info',
@@ -466,18 +426,7 @@ module.exports = {
         editType: 'calc',
         description: 'Array containing `ids` of selected points.',
     },
-    hoverpoints: {
-        valType: 'any',
-        role: 'info',
-        editType: 'calc',
-        description: 'Array containing integer indices of hovered points.',
-    },
-    hoverids: {
-        valType: 'any',
-        role: 'info',
-        editType: 'calc',
-        description: 'Array containing `ids` of hovered points.',
-    },
+
     textposition: {
         valType: 'enumerated',
         values: [
diff --git a/src/traces/scatter/interaction_defaults.js b/src/traces/scatter/interaction_defaults.js
@@ -13,44 +13,37 @@ var Lib = require('../../lib');
 var isNumeric = require('fast-isnumeric');
 
 module.exports = function supplyInteractionDefaults (traceIn, traceOut, coerce) {
-
     function coerceInteractionDefault(attr, containsNumbers) {
         var i, arr;
 
-        if (!Array.isArray(traceIn[attr])) {
-            return;
-        }
-        coerce(attr);
+        if(!Array.isArray(traceIn[attr])) return;
 
+        coerce(attr);
         arr = traceOut[attr];
 
-        console.log('arr:', arr);
-
         if (containsNumbers) {
-            for (i = arr.length - 1; i >= 0; i--) {
-                if (!isNumeric(arr[i])) {
+            for(i = arr.length - 1; i >= 0; i--) {
+                if(!isNumeric(arr[i])) {
                     arr.splice(i, 1);
                 } else {
                     arr[i] = +arr[i];
                 }
             }
         } else { // only other implemented is integer:
-            for (i = arr.length - 1; i >= 0; i--) {
-                if (!arr[i]) {
+            for(i = arr.length - 1; i >= 0; i--) {
+                if(!arr[i]) {
                     arr.splice(i, 1);
                 } else {
                     arr[i] = String(arr[i]);
                 }
             }
         }
 
-        if (arr.length === 0) {
+        if(arr.length === 0) {
             delete traceOut[attr];
         }
     }
 
     coerceInteractionDefault('selectedpoints', true);
     coerceInteractionDefault('selectedids');
-    coerceInteractionDefault('hoverpoints', true);
-    coerceInteractionDefault('hoverids');
 };
