mirror of
https://gitcode.com/gh_mirrors/hy/Hydro.git
synced 2026-10-20 01:38:19 +08:00
Merge branch 'master' into remove-union
This commit is contained in:
17 files changed
+107
-74
No files matched your search
@@ -145,5 +145,6 @@ export async function apply(ctx: Context) {
|
||||
ctx.on('system/setting', () => triggerHotUpdate());
|
||||
ctx.on('app/watch/change', triggerHotUpdate);
|
||||
ctx.on('app/watch/unlink', triggerHotUpdate);
|
||||
ctx.on('app/i18n/update', debouncedBuildUI);
|
||||
debouncedBuildUI();
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import $ from 'jquery';
|
||||
import { AutoloadPage } from 'vj/misc/Page';
|
||||
import { request } from 'vj/utils';
|
||||
import { request, tpl } from 'vj/utils';
|
||||
|
||||
function setStarButtonState($starButton: JQuery<any>, star: boolean) {
|
||||
if (star) {
|
||||
@@ -11,6 +11,29 @@ function setStarButtonState($starButton: JQuery<any>, star: boolean) {
|
||||
}
|
||||
|
||||
const starPage = new AutoloadPage('starPage', () => {
|
||||
function render(container) {
|
||||
const eles = $(container).find('[data-star]');
|
||||
for (const el of eles) {
|
||||
if ($(el).find('.star-form')) continue;
|
||||
const pid = $(el).closest('[data-pid]').data('pid');
|
||||
const star = $(el).data('star') === 'true' ? 1 : 0;
|
||||
if (!pid) continue;
|
||||
$(tpl`<form class="form--inline" action="/d/${UiContext.domain._id}/p/${pid}" method="post">
|
||||
<input type="hidden" name="operation" value="star">
|
||||
<input type="hidden" name="star" value="${star ? 'false' : 'true'}">
|
||||
<button class="star${star ? ' activated' : ''}" type="submit">
|
||||
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
|
||||
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
|
||||
</button>
|
||||
</form>`);
|
||||
}
|
||||
}
|
||||
|
||||
render(document);
|
||||
$(document).on('vjContentNew', (ev) => {
|
||||
render(ev.target);
|
||||
});
|
||||
|
||||
$(document).on('click', '.star', (ev) => {
|
||||
const $button = $(ev.currentTarget);
|
||||
const currentState = $button.hasClass('activated');
|
||||
|
||||
@@ -7,7 +7,8 @@ import { i18n, request, tpl } from 'vj/utils';
|
||||
|
||||
const page = new NamedPage([
|
||||
'problem_create', 'problem_edit', 'problem_solution', 'problem_submit',
|
||||
'problem_files', 'problem_detail', 'discussion_node', 'discussion_detail',
|
||||
'problem_config', 'problem_statistics', 'problem_files', 'problem_detail',
|
||||
'discussion_node', 'discussion_detail',
|
||||
], () => {
|
||||
$(document).on('click', '[name="problem-sidebar__show-category"]', (ev) => {
|
||||
$(ev.currentTarget).hide();
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
{% import "components/contest.html" as contest with context %}
|
||||
{% import "components/problem.html" as problem with context %}
|
||||
{% block content %}
|
||||
{{ set(UiContext, 'tdoc', tdoc) }}
|
||||
<div class="row">
|
||||
<div class="medium-9 columns">
|
||||
<div class="row">
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{% set pdocs = payload[0] %}
|
||||
{% set psdict = payload[1] %}
|
||||
{% if pdocs.length %}
|
||||
<div class="section side nojs--hide">
|
||||
<div class="section__header">
|
||||
@@ -7,15 +6,9 @@
|
||||
</div>
|
||||
<div class="section__body typo no-media col--problem-name">
|
||||
{%- for pdoc in pdocs -%}
|
||||
<form class="form--inline" action="{{ url('problem_main') }}" method="post">
|
||||
<input type="hidden" name="pid" value="{{ pdoc.docId }}">
|
||||
<input type="hidden" name="operation" value="unstar">
|
||||
<button class="star activated" type="submit">
|
||||
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
|
||||
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
|
||||
</button>
|
||||
</form>
|
||||
{{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false) }}<br/>
|
||||
<p data-pid="{{ pdoc.docId }}" data-star="true">
|
||||
{{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false) }}
|
||||
</p>
|
||||
{%- endfor -%}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -54,17 +54,7 @@
|
||||
<td class="col--status record-status--border edit-mode-hide"></td>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<td class="col--name col--problem-name">
|
||||
{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
|
||||
<form class="form--inline" action="{{ url('problem_main', domainId = pdoc.domainId) }}" method="post">
|
||||
<input type="hidden" name="pid" value="{{ pdoc.docId }}">
|
||||
<input type="hidden" name="operation" value="{{ "star" if not psdoc.star else "unstar" }}">
|
||||
<button class="star{% if psdoc.star %} activated{% endif %}" type="submit">
|
||||
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
|
||||
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
<td class="col--name col--problem-name" {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} data-star="{{ psdoc.star }}"{% endif %}>
|
||||
{{ problem.render_problem_title(pdoc) }}
|
||||
</td>
|
||||
<td class="col--ac-tried">{{ pdoc.nAccept }} / {{ pdoc.nSubmit }}</td>
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
{% set pdoc=pdict[pid] %}
|
||||
{% set psdoc=psdict[pid] %}
|
||||
{% set self_psdoc=selfPsdict[pid] %}
|
||||
<tr>
|
||||
<tr data-pid="{{ pid }}">
|
||||
{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
|
||||
{% if psdoc['rid'] %}
|
||||
{{ record.render_status_td(psdoc, rid_key='rid', short=should_compare) }}
|
||||
@@ -118,17 +118,7 @@
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<td class="col--name col--problem-name">
|
||||
{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
|
||||
<form class="form--inline" action="{{ url('problem_main') }}" method="post">
|
||||
<input type="hidden" name="pid" value="{{ pdoc.docId }}">
|
||||
<input type="hidden" name="operation" value="{% if not psdoc['star'] %}star{% else %}unstar{% endif %}">
|
||||
<button class="star{% if psdoc['star'] %} activated{% endif %}" type="submit">
|
||||
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
|
||||
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
<td class="col--name col--problem-name"{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} data-star="{{ psdoc.star }}"{% endif %}>
|
||||
{{ problem.render_problem_title(
|
||||
pdoc,
|
||||
invalid=not tsdoc['enroll'] or nsdict[node['_id']]['isInvalid'],
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) and not tdoc %}
|
||||
<form class="form--inline" action="{{ url('problem_main') }}" method="post">
|
||||
<input type="hidden" name="pid" value="{{ pdoc.docId }}">
|
||||
<input type="hidden" name="operation" value="{{ "star" if not psdoc.star else "unstar" }}">
|
||||
<form class="form--inline" action="" method="post">
|
||||
<input type="hidden" name="star" value="{{ 'true' if not psdoc.star else 'false' }}">
|
||||
<input type="hidden" name="operation" value="star">
|
||||
<button class="star{% if psdoc.star %} activated{% endif %}" type="submit">
|
||||
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
|
||||
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
|
||||
|
||||
Reference in new issue
Block a user