projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo
[vchess.git]
/
client
/
src
/
views
/
Problems.vue
diff --git
a/client/src/views/Problems.vue
b/client/src/views/Problems.vue
index
57473bc
..
057035a
100644
(file)
--- a/
client/src/views/Problems.vue
+++ b/
client/src/views/Problems.vue
@@
-8,7
+8,7
@@
main
.card
label.modal-close(for="modalRules")
a#variantNameInProblems(:href="'/#/variants/'+game.vname")
.card
label.modal-close(for="modalRules")
a#variantNameInProblems(:href="'/#/variants/'+game.vname")
- | {{
game.vname
}}
+ | {{
curproblem.vdisp
}}
div(v-html="rulesContent")
input#modalNewprob.modal(
type="checkbox"
div(v-html="rulesContent")
input#modalNewprob.modal(
type="checkbox"
@@
-44,17
+44,17
@@
main
fieldset
textarea.instructions-edit(
:placeholder="st.tr['Instructions']"
fieldset
textarea.instructions-edit(
:placeholder="st.tr['Instructions']"
- @input="adjustHeight(
$event
)"
+ @input="adjustHeight(
'instructions'
)"
v-model="curproblem.instruction"
)
v-model="curproblem.instruction"
)
-
p
(v-html="parseHtml(curproblem.instruction)")
+
.instructions
(v-html="parseHtml(curproblem.instruction)")
fieldset
textarea.solution-edit(
:placeholder="st.tr['Solution']"
fieldset
textarea.solution-edit(
:placeholder="st.tr['Solution']"
- @input="adjustHeight(
$event
)"
+ @input="adjustHeight(
'solution'
)"
v-model="curproblem.solution"
)
v-model="curproblem.solution"
)
-
p
(v-html="parseHtml(curproblem.solution)")
+
.solution
(v-html="parseHtml(curproblem.solution)")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
.row(v-if="showOne")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
.row(v-if="showOne")
@@
-63,19
+63,19
@@
main
.button-group(v-if="canIedit(curproblem.uid)")
button(@click="editProblem(curproblem)") {{ st.tr["Edit"] }}
button(@click="deleteProblem(curproblem)") {{ st.tr["Delete"] }}
.button-group(v-if="canIedit(curproblem.uid)")
button(@click="editProblem(curproblem)") {{ st.tr["Edit"] }}
button(@click="deleteProblem(curproblem)") {{ st.tr["Delete"] }}
- span.vname {{ curproblem.v
name
}}
+ span.vname {{ curproblem.v
disp
}}
span.uname ({{ curproblem.uname }})
button.marginleft(@click="backToList()") {{ st.tr["Back to list"] }}
button.nomargin(@click="gotoPrevNext(curproblem,1)")
| {{ st.tr["Previous_p"] }}
button.nomargin(@click="gotoPrevNext(curproblem,-1)")
| {{ st.tr["Next_p"] }}
span.uname ({{ curproblem.uname }})
button.marginleft(@click="backToList()") {{ st.tr["Back to list"] }}
button.nomargin(@click="gotoPrevNext(curproblem,1)")
| {{ st.tr["Previous_p"] }}
button.nomargin(@click="gotoPrevNext(curproblem,-1)")
| {{ st.tr["Next_p"] }}
-
p
.oneInstructions.clickable(
+
.instructions
.oneInstructions.clickable(
v-html="parseHtml(curproblem.instruction)"
@click="curproblem.showSolution=!curproblem.showSolution"
)
| {{ st.tr["Show solution"] }}
v-html="parseHtml(curproblem.instruction)"
@click="curproblem.showSolution=!curproblem.showSolution"
)
| {{ st.tr["Show solution"] }}
-
p
(
+
.solution
(
v-show="curproblem.showSolution"
v-html="parseHtml(curproblem.solution)"
)
v-show="curproblem.showSolution"
v-html="parseHtml(curproblem.solution)"
)
@@
-108,7
+108,7
@@
main
v-show="onlyMine || !selectedVar || p.vid == selectedVar"
@click="setHrefPid(p)"
)
v-show="onlyMine || !selectedVar || p.vid == selectedVar"
@click="setHrefPid(p)"
)
- td {{ p.v
name
}}
+ td {{ p.v
disp
}}
td {{ firstChars(p.instruction) }}
td {{ p.id }}
button#loadMoreBtn(
td {{ firstChars(p.instruction) }}
td {{ p.id }}
button#loadMoreBtn(
@@
-131,6
+131,7
@@
import params from "@/parameters";
import { getDiagram, replaceByDiag } from "@/utils/printDiagram";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
import { getDiagram, replaceByDiag } from "@/utils/printDiagram";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
+import afterRawLoad from "@/utils/afterRawLoad";
import BaseGame from "@/components/BaseGame.vue";
export default {
name: "my-problems",
import BaseGame from "@/components/BaseGame.vue";
export default {
name: "my-problems",
@@
-140,10
+141,7
@@
export default {
data: function() {
return {
st: store.state,
data: function() {
return {
st: store.state,
- emptyVar: {
- vid: 0,
- vname: ""
- },
+ emptyVar: { vid: 0 },
// Problem currently showed, or edited:
curproblem: {
id: 0, //used in case of edit
// Problem currently showed, or edited:
curproblem: {
id: 0, //used in case of edit
@@
-212,14
+210,16
@@
export default {
document.getElementById("inputFen").focus();
}
},
document.getElementById("inputFen").focus();
}
},
- adjustHeight: function(e) {
+ adjustHeight: function(e
lt
) {
// https://stackoverflow.com/a/48460773
// https://stackoverflow.com/a/48460773
- let t =
e.target
;
+ let t =
document.querySelector("." + elt + "-edit")
;
t.style.height = "";
t.style.height = "";
- t.style.height =
t.scrollHeight
+ "px";
+ t.style.height =
(t.scrollHeight + 3)
+ "px";
},
setVname: function(prob) {
},
setVname: function(prob) {
- prob.vname = this.st.variants.find(v => v.id == prob.vid).name;
+ const variant = this.st.variants.find(v => v.id == prob.vid);
+ prob.vname = variant.name;
+ prob.vdisp = variant.display;
},
// Add vname and user names:
decorate: function(problems, callback) {
},
// Add vname and user names:
decorate: function(problems, callback) {
@@
-249,7
+249,8
@@
export default {
}
}
);
}
}
);
- } else if (!!callback) callback();
+ }
+ else if (!!callback) callback();
},
firstChars: function(text) {
let preparedText = text
},
firstChars: function(text) {
let preparedText = text
@@
-281,6
+282,7
@@
export default {
this.curproblem.uid = 0;
this.curproblem.vid = "";
this.curproblem.vname = "";
this.curproblem.uid = 0;
this.curproblem.vid = "";
this.curproblem.vname = "";
+ this.curproblem.vdisp = "";
this.curproblem.fen = "";
this.curproblem.diag = "";
this.curproblem.instruction = "";
this.curproblem.fen = "";
this.curproblem.diag = "";
this.curproblem.instruction = "";
@@
-289,7
+291,10
@@
export default {
},
parseHtml: function(txt) {
return !txt.match(/<[/a-zA-Z]+>/)
},
parseHtml: function(txt) {
return !txt.match(/<[/a-zA-Z]+>/)
- ? txt.replace(/\n/g, "<br/>") //no HTML tag
+ ?
+ // No HTML tag
+ txt.replace(/\n\n/g, "<br/><div class='br'></div>")
+ .replace(/\n/g, "<br/>")
: txt;
},
changeVariant: function(prob) {
: txt;
},
changeVariant: function(prob) {
@@
-310,19
+315,13
@@
export default {
this.loadedVar = vid;
cb();
});
this.loadedVar = vid;
cb();
});
- // (AJAX) Request to get rules content (plain text, HTML)
this.rulesContent =
this.rulesContent =
- require(
- "raw-loader!@/translations/rules/" +
- variant.name + "/" +
- this.st.lang + ".pug"
- )
- // Next two lines fix a weird issue after last update (2019-11)
- .replace(/\\n/g, " ")
- .replace(/\\"/g, '"')
- .replace('module.exports = "', "")
- .replace(/"$/, "")
- .replace(/(fen:)([^:]*):/g, replaceByDiag);
+ afterRawLoad(
+ require(
+ "raw-loader!@/translations/rules/" + variant.name + "/" +
+ this.st.lang + ".pug"
+ ).default
+ ).replace(/(fen:)([^:]*):/g, replaceByDiag);
},
trySetDiagram: function(prob) {
// Problem edit: FEN could be wrong or incomplete,
},
trySetDiagram: function(prob) {
// Problem edit: FEN could be wrong or incomplete,
@@
-380,7
+379,8
@@
export default {
}
}
);
}
}
);
- } else processWhenWeHaveProb();
+ }
+ else processWhenWeHaveProb();
},
gotoPrevNext: function(prob, dir) {
const mode = (this.onlyMine ? "mine" : "others");
},
gotoPrevNext: function(prob, dir) {
const mode = (this.onlyMine ? "mine" : "others");
@@
-402,6
+402,8
@@
export default {
},
prepareNewProblem: function() {
this.resetCurProb();
},
prepareNewProblem: function() {
this.resetCurProb();
+ this.adjustHeight("instructions");
+ this.adjustHeight("solution");
window.doClick("modalNewprob");
},
sendProblem: function() {
window.doClick("modalNewprob");
},
sendProblem: function() {
@@
-449,6
+451,8
@@
export default {
// prob.diag might correspond to some other problem or be empty:
this.setDiagram(prob); //V is loaded at this stage
this.copyProblem(prob, this.curproblem);
// prob.diag might correspond to some other problem or be empty:
this.setDiagram(prob); //V is loaded at this stage
this.copyProblem(prob, this.curproblem);
+ this.adjustHeight("instructions");
+ this.adjustHeight("solution");
window.doClick("modalNewprob");
},
deleteProblem: function(prob) {
window.doClick("modalNewprob");
},
deleteProblem: function(prob) {
@@
-493,7
+497,8
@@
export default {
// (Unless the user navigated several times by URL to show a
// single problem...)
.sort((p1, p2) => p2.added - p1.added);
// (Unless the user navigated several times by URL to show a
// single problem...)
.sort((p1, p2) => p2.added - p1.added);
- } else this.hasMore[mode] = false;
+ }
+ else this.hasMore[mode] = false;
if (!!cb) cb(L);
}
}
if (!!cb) cb(L);
}
}
@@
-506,6
+511,13
@@
export default {
<style lang="sass">
@import "@/styles/_board_squares_img.sass"
@import "@/styles/_rules.sass"
<style lang="sass">
@import "@/styles/_board_squares_img.sass"
@import "@/styles/_rules.sass"
+.instructions, .solution
+ margin: 0 var(--universal-margin)
+ p, ul, ol, pre, table, h3, h4, h5, h6, blockquote
+ margin: var(--universal-margin) 0
+ .br
+ display: block
+ margin: 10px 0
</style>
<style lang="sass" scoped>
</style>
<style lang="sass" scoped>
@@
-552,7
+564,7
@@
button#loadMoreBtn
& > *
margin: 0
& > *
margin: 0
-
p
.oneInstructions
+.oneInstructions
margin: 0
padding: 2px 5px
background-color: lightgreen
margin: 0
padding: 2px 5px
background-color: lightgreen
@@
-561,7
+573,7
@@
p.oneInstructions
display: inline-block
#topPage
display: inline-block
#topPage
- span.v
name
+ span.v
disp
font-weight: bold
padding-left: var(--universal-margin)
span.uname
font-weight: bold
padding-left: var(--universal-margin)
span.uname