deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

isDefaultName flag on newChapter

pull/7324/head
Ulises Torrella 2020-09-17 13:12:46 -03:00
parent 65ac5cbe3c
commit 40b932ef67
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/study/src/main/ChapterMaker.scala
View File

@ -48,7 +48,7 @@ final private class ChapterMaker(
parsed
.tags(_.Black)
.ifTrue {
data.name.value.isEmpty || Chapter.isDefaultName(data.name)
data.name.value.isEmpty || data.isDefaultName
}
.map { black =>
Chapter.Name(s"$white - $black")
@ -125,7 +125,7 @@ final private class ChapterMaker(
root <- game2root(game, initialFen)
tags <- pgnDump.tags(game, initialFen, none, withOpening = true)
name <- {
if (Chapter isDefaultName data.name)
if (data.isDefaultName)
Namer.gameVsText(game, withRatings = false)(lightUser.async) dmap Chapter.Name.apply
else fuccess(data.name)
}
@ -211,7 +211,8 @@ private[study] object ChapterMaker {
pgn: Option[String] = None,
orientation: String = "white",
mode: String = ChapterMaker.Mode.Normal.key,
initial: Boolean = false
initial: Boolean = false,
isDefaultName: Boolean = true,
) extends ChapterData {
def manyGames =

7
ui/analyse/src/study/chapterNewForm.ts
View File

@ -118,6 +118,7 @@ export function view(ctrl: StudyChapterNewFormCtrl): VNode {
const currentChapter = ctrl.root.study!.data.chapter;
const mode = currentChapter.practice ? 'practice' : (defined(currentChapter.conceal) ? 'conceal' : (currentChapter.gamebook ? 'gamebook' : 'normal'));
const noarg = trans.noarg;
let isDefaultName = true;
return modal.modal({
class: 'chapter-new',
@ -137,7 +138,8 @@ export function view(ctrl: StudyChapterNewFormCtrl): VNode {
h('form.form3', {
hook: bindSubmit(e => {
const o: any = {
fen: fieldValue(e, 'fen') || (ctrl.vm.tab() === 'edit' ? ctrl.vm.editorFen() : null)
fen: fieldValue(e, 'fen') || (ctrl.vm.tab() === 'edit' ? ctrl.vm.editorFen() : null),
isDefaultName: isDefaultName
};
'name game variant pgn orientation mode'.split(' ').forEach(field => {
o[field] = fieldValue(e, field);
@ -157,6 +159,9 @@ export function view(ctrl: StudyChapterNewFormCtrl): VNode {
hook: onInsert<HTMLInputElement>(el => {
if (!el.value) {
el.value = trans('chapterX', (ctrl.vm.initial() ? 1 : (ctrl.chapters().length + 1)));
el.onchange = function (){
isDefaultName = false;
};
el.select();
el.focus();
}