move hasColorbar check in colorbar/

etpinard · etpinard · commit 777709e2b3d2 · 2015-12-18T14:54:11.000-05:00
diff --git a/src/components/colorbar/has_colorbar.js b/src/components/colorbar/has_colorbar.js
@@ -0,0 +1,18 @@
+/**
+* Copyright 2012-2015, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+
+module.exports = function hasColorbar(container) {
+    return (
+        typeof container.colorbar === 'object' &&
+        container.colorbar !== null
+    );
+};
diff --git a/src/components/colorscale/index.js b/src/components/colorscale/index.js
@@ -109,10 +109,6 @@ colorscale.hasColorscale = function(trace, containerStr) {
     );
 };
 
-colorscale.hasColorbar = function(container) {
-    return typeof container.colorbar==='object' && container.colorbar!==null;
-};
-
 colorscale.handleDefaults = function(traceIn, traceOut, layout, coerce, opts) {
     var prefix = opts.prefix,
         cLetter = opts.cLetter,
diff --git a/test/jasmine/tests/colorbar_test.js b/test/jasmine/tests/colorbar_test.js
@@ -0,0 +1,31 @@
+var Colorbar = require('@src/components/colorbar');
+
+describe('Test colorbar:', function () {
+    'use strict';
+
+    describe('hasColorbar', function() {
+        var hasColorbar = Colorbar.hasColorbar,
+            trace;
+
+        it('should return true when marker colorbar is defined', function() {
+            trace = {
+                marker: {
+                    colorbar: {},
+                    line: {
+                        colorbar: {}
+                    }
+                }
+            };
+            expect(hasColorbar(trace.marker)).toBe(true);
+            expect(hasColorbar(trace.marker.line)).toBe(true);
+
+            trace = {
+                marker: {
+                    line: {}
+                }
+            };
+            expect(hasColorbar(trace.marker)).toBe(false);
+            expect(hasColorbar(trace.marker.line)).toBe(false);
+        });
+    });
+});
diff --git a/test/jasmine/tests/colorscale_test.js b/test/jasmine/tests/colorscale_test.js
@@ -180,32 +180,6 @@ describe('Test colorscale:', function () {
         });
     });
 
-    describe('hasColorbar', function() {
-        var hasColorbar = Plotly.Colorscale.hasColorbar,
-            trace;
-
-        it('should return true when marker colorbar is defined', function() {
-            trace = {
-                marker: {
-                    colorbar: {},
-                    line: {
-                        colorbar: {}
-                    }
-                }
-            };
-            expect(hasColorbar(trace.marker)).toBe(true);
-            expect(hasColorbar(trace.marker.line)).toBe(true);
-
-            trace = {
-                marker: {
-                    line: {}
-                }
-            };
-            expect(hasColorbar(trace.marker)).toBe(false);
-            expect(hasColorbar(trace.marker.line)).toBe(false);
-        });
-    });
-
     describe('handleDefaults (heatmap-like version)', function() {
         var handleDefaults = Plotly.Colorscale.handleDefaults,
             layout = {
