Skip to content

Commit

Permalink
Better messages/ comments
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Mar 19, 2016
1 parent c536479 commit 00ce56d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/compile/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ export namespace stackScale {
const child = model.child();
const childDataComponent = child.component.data;

// If child doesn't have its own data source, but have stack scale source, then merge
// If child doesn't have its own data source, but has stack scale source, then merge
if (!childDataComponent.source && childDataComponent.stackScale) {
let stackComponent = childDataComponent.stackScale;

Expand Down
4 changes: 2 additions & 2 deletions src/compile/layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ export class LayerModel extends Model {
if (isArray(childScales.main.domain)) {
modelScales.main.domain = modelDomain.concat(childDomain);
} else {
model.addWarning('scales cannot be unioned with explicit domain');
model.addWarning('custom domain scale cannot be unioned with default field-based domain');
}
} else {
const unionedFields = isUnionedDomain(modelDomain) ? modelDomain.fields : [modelDomain] as VgDataRef[];

if (isArray(childDomain)) {
model.addWarning('scales cannot be unioned with explicit domain');
model.addWarning('custom domain scale cannot be unioned with default field-based domain');
}

let fields = isDataRefDomain(childDomain) ? unionedFields.concat([childDomain]) :
Expand Down

0 comments on commit 00ce56d

Please sign in to comment.