Allow continues scales be partially out of domain

TargetProcess · Jan 16, 2016 · 8498805 · 8498805
1 parent f02e4fc
commit 8498805
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/examples/dev-quick-test/ex-048.js b/examples/dev-quick-test/ex-048.js
@@ -86,7 +86,7 @@ window.samples.push({
                 ,
                 {
                     dim: 'y1',
-                    val: [50, 75],
+                    val: [-50, 55],
                     text: '100 points',
                     position: 'front',
                     color: '#FFAB00'

diff --git a/plugins/annotations.js b/plugins/annotations.js
@@ -43,7 +43,14 @@
                     var to = metaInfo.to;
 
                     var primaryScaleInfo = chart.getScaleInfo(metaInfo.primaryScale);
-                    var isOutOfDomain = (!primaryScaleInfo.isInDomain(from) || !primaryScaleInfo.isInDomain(to));
+
+                    var isX0OutOfDomain = !primaryScaleInfo.isInDomain(from);
+                    var isX1OutOfDomain = !primaryScaleInfo.isInDomain(to);
+
+                    var isOutOfDomain = (primaryScaleInfo.discrete ?
+                        (isX0OutOfDomain || isX1OutOfDomain) :
+                        (isX0OutOfDomain && isX1OutOfDomain)
+                    );
 
                     if (isOutOfDomain) {
                         console.log('Annotation is out of domain');