yaroslav
/
SequenceDiagram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch default divider to line, as this makes more sense [#39]

This commit is contained in:
David Evans 2018-01-21 23:59:20 +00:00
parent eb052bd29f
commit 1533a389b8
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/sequence-diagram.js
View File

@ -860,8 +860,8 @@ define('sequence/CodeMirrorMode',['core/ArrayUtilities'], (array) => {
'bar': {type: 'keyword', suggest: true, then: {}}, 'bar': {type: 'keyword', suggest: true, then: {}},
}}, }},
'divider': {type: 'keyword', suggest: true, then: Object.assign({ 'divider': {type: 'keyword', suggest: true, then: Object.assign({
'space': {type: 'keyword', suggest: true, then: divider},
'line': {type: 'keyword', suggest: true, then: divider}, 'line': {type: 'keyword', suggest: true, then: divider},
'space': {type: 'keyword', suggest: true, then: divider},
'delay': {type: 'keyword', suggest: true, then: divider}, 'delay': {type: 'keyword', suggest: true, then: divider},
'tear': {type: 'keyword', suggest: true, then: divider}, 'tear': {type: 'keyword', suggest: true, then: divider},
}, divider)}, }, divider)},
@ -1718,8 +1718,8 @@ define('sequence/Parser',[
}; };
const DIVIDER_TYPES = { const DIVIDER_TYPES = {
'space': {defaultHeight: 6},
'line': {defaultHeight: 6}, 'line': {defaultHeight: 6},
'space': {defaultHeight: 6},
'delay': {defaultHeight: 30}, 'delay': {defaultHeight: 30},
'tear': {defaultHeight: 6}, 'tear': {defaultHeight: 6},
}; };
@ -1947,7 +1947,7 @@ define('sequence/Parser',[
orEnd: true, orEnd: true,
}); });
const mode = joinLabel(line, 1, heightSep) || 'space'; const mode = joinLabel(line, 1, heightSep) || 'line';
if(!DIVIDER_TYPES[mode]) { if(!DIVIDER_TYPES[mode]) {
throw makeError('Unknown divider type', line[1]); throw makeError('Unknown divider type', line[1]);
} }
@ -6809,7 +6809,6 @@ define('sequence/themes/Basic',[
}; };
}); });
define('sequence/themes/Monospace',[ define('sequence/themes/Monospace',[
'./BaseTheme', './BaseTheme',
'svg/SVGUtilities', 'svg/SVGUtilities',

2
lib/sequence-diagram.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
scripts/sequence/CodeMirrorMode.js
View File

@ -257,8 +257,8 @@ define(['core/ArrayUtilities'], (array) => {
'bar': {type: 'keyword', suggest: true, then: {}}, 'bar': {type: 'keyword', suggest: true, then: {}},
}}, }},
'divider': {type: 'keyword', suggest: true, then: Object.assign({ 'divider': {type: 'keyword', suggest: true, then: Object.assign({
'space': {type: 'keyword', suggest: true, then: divider},
'line': {type: 'keyword', suggest: true, then: divider}, 'line': {type: 'keyword', suggest: true, then: divider},
'space': {type: 'keyword', suggest: true, then: divider},
'delay': {type: 'keyword', suggest: true, then: divider}, 'delay': {type: 'keyword', suggest: true, then: divider},
'tear': {type: 'keyword', suggest: true, then: divider}, 'tear': {type: 'keyword', suggest: true, then: divider},
}, divider)}, }, divider)},

2
scripts/sequence/CodeMirrorMode_spec.js
View File

@ -436,8 +436,8 @@ defineDescribe('Code Mirror Mode', [
cm.getDoc().setValue('divider '); cm.getDoc().setValue('divider ');
const hints = getHintTexts({line: 0, ch: 8}); const hints = getHintTexts({line: 0, ch: 8});
expect(hints).toEqual([ expect(hints).toEqual([
'space ',
'line ', 'line ',
'space ',
'delay ', 'delay ',
'tear ', 'tear ',
'\n', '\n',

4
scripts/sequence/Parser.js
View File

@ -109,8 +109,8 @@ define([
}; };
const DIVIDER_TYPES = { const DIVIDER_TYPES = {
'space': {defaultHeight: 6},
'line': {defaultHeight: 6}, 'line': {defaultHeight: 6},
'space': {defaultHeight: 6},
'delay': {defaultHeight: 30}, 'delay': {defaultHeight: 30},
'tear': {defaultHeight: 6}, 'tear': {defaultHeight: 6},
}; };
@ -338,7 +338,7 @@ define([
orEnd: true, orEnd: true,
}); });
const mode = joinLabel(line, 1, heightSep) || 'space'; const mode = joinLabel(line, 1, heightSep) || 'line';
if(!DIVIDER_TYPES[mode]) { if(!DIVIDER_TYPES[mode]) {
throw makeError('Unknown divider type', line[1]); throw makeError('Unknown divider type', line[1]);
} }

10
scripts/sequence/Parser_spec.js
View File

@ -478,7 +478,7 @@ defineDescribe('Sequence Parser', ['./Parser'], (Parser) => {
expect(parsed.stages).toEqual([{ expect(parsed.stages).toEqual([{
type: 'divider', type: 'divider',
ln: jasmine.anything(), ln: jasmine.anything(),
mode: 'space', mode: 'line',
height: 6, height: 6,
label: '', label: '',
}]); }]);
@ -486,8 +486,8 @@ defineDescribe('Sequence Parser', ['./Parser'], (Parser) => {
it('converts different divider types', () => { it('converts different divider types', () => {
const parsed = parser.parse( const parsed = parser.parse(
'divider space\n' +
'divider line\n' + 'divider line\n' +
'divider space\n' +
'divider delay\n' + 'divider delay\n' +
'divider tear\n' 'divider tear\n'
); );
@ -495,14 +495,14 @@ defineDescribe('Sequence Parser', ['./Parser'], (Parser) => {
{ {
type: 'divider', type: 'divider',
ln: jasmine.anything(), ln: jasmine.anything(),
mode: 'space', mode: 'line',
height: 6, height: 6,
label: jasmine.anything(), label: jasmine.anything(),
}, },
{ {
type: 'divider', type: 'divider',
ln: jasmine.anything(), ln: jasmine.anything(),
mode: 'line', mode: 'space',
height: 6, height: 6,
label: jasmine.anything(), label: jasmine.anything(),
}, },
@ -532,7 +532,7 @@ defineDescribe('Sequence Parser', ['./Parser'], (Parser) => {
{ {
type: 'divider', type: 'divider',
ln: jasmine.anything(), ln: jasmine.anything(),
mode: 'space', mode: 'line',
height: 40, height: 40,
label: '', label: '',
}, },