fix and test overrideCursor

Author: alexcjohnson

src/lib/override_cursor.js

@@ -12,6 +12,7 @@
 var setCursor = require('./setcursor');
 
 var STASHATTR = 'data-savedcursor';
+var NO_CURSOR = '!!';
 
 /*
  * works with our CSS cursor classes (see css/_cursor.scss)
@@ -22,10 +23,7 @@ var STASHATTR = 'data-savedcursor';
 module.exports = function overrideCursor(el3, csr) {
     var savedCursor = el3.attr(STASHATTR);
     if(csr) {
-        if(savedCursor) {
-            setCursor(el3, csr);
-        }
-        else {
+        if(!savedCursor) {
             var classes = (el3.attr('class') || '').split(' ');
             for(var i = 0; i < classes.length; i++) {
                 var cls = classes[i];
@@ -34,10 +32,16 @@ module.exports = function overrideCursor(el3, csr) {
                         .classed(cls, false);
                 }
             }
+            if(!el3.attr(STASHATTR)) {
+                el3.attr(STASHATTR, NO_CURSOR);
+            }
         }
+        setCursor(el3, csr);
     }
     else if(savedCursor) {
         el3.attr(STASHATTR, null);
-        setCursor(el3, savedCursor);
+
+        if(savedCursor === NO_CURSOR) setCursor(el3);
+        else setCursor(el3, savedCursor);
     }
 };

test/jasmine/tests/lib_test.js

@@ -1,5 +1,6 @@
 var Lib = require('@src/lib');
 var setCursor = require('@src/lib/setcursor');
+var overrideCursor = require('@src/lib/override_cursor');
 
 var d3 = require('d3');
 var Plotly = require('@lib');
@@ -1191,6 +1192,56 @@ describe('Test lib.js:', function() {
         });
     });
 
+    describe('overrideCursor', function() {
+
+        beforeEach(function() {
+            this.el3 = d3.select(createGraphDiv());
+        });
+
+        afterEach(destroyGraphDiv);
+
+        it('should apply the new cursor(s) and revert to the original when removed', function() {
+            this.el3
+                .classed('cursor-before', true)
+                .classed('not-a-cursor', true)
+                .classed('another', true);
+
+            overrideCursor(this.el3, 'after');
+            expect(this.el3.attr('class')).toBe('not-a-cursor another cursor-after');
+
+            overrideCursor(this.el3, 'later');
+            expect(this.el3.attr('class')).toBe('not-a-cursor another cursor-later');
+
+            overrideCursor(this.el3);
+            expect(this.el3.attr('class')).toBe('not-a-cursor another cursor-before');
+        });
+
+        it('should apply the new cursor(s) and revert to the none when removed', function() {
+            this.el3
+                .classed('not-a-cursor', true)
+                .classed('another', true);
+
+            overrideCursor(this.el3, 'after');
+            expect(this.el3.attr('class')).toBe('not-a-cursor another cursor-after');
+
+            overrideCursor(this.el3, 'later');
+            expect(this.el3.attr('class')).toBe('not-a-cursor another cursor-later');
+
+            overrideCursor(this.el3);
+            expect(this.el3.attr('class')).toBe('not-a-cursor another');
+        });
+
+        it('should do nothing if no existing or new override is present', function() {
+            this.el3
+                .classed('cursor-before', true)
+                .classed('not-a-cursor', true);
+
+            overrideCursor(this.el3);
+
+            expect(this.el3.attr('class')).toBe('cursor-before not-a-cursor');
+        });
+    });
+
     describe('getTranslate', function() {
 
         it('should work with regular DOM elements', function() {