Skip to content

Commit 96de0c4

Browse files
authored
Merge branch 'develop' into master
2 parents a861f6a + d6df2b8 commit 96de0c4

File tree

3 files changed

+50
-32
lines changed

3 files changed

+50
-32
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+45-27
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,65 @@
1-
<!-- Please use English language -->
2-
<!-- Please don't delete this template -->
1+
<!--
2+
PULL REQUEST TEMPLATE
3+
---
4+
Please use English language
5+
Please don't delete this template
6+
---
7+
Update "[ ]" to "[x]" to check a box in any list below.
8+
---
9+
To avoid wasting your time, it's best to open a **feature request issue** first and wait for approval before working on it.
10+
-->
311

4-
<!-- PULL REQUEST TEMPLATE -->
5-
<!-- (Update "[ ]" to "[x]" to check a box) -->
12+
## **Summary**
613

7-
**Summary**
14+
<!--
15+
THIS IS REQUIRED! Please describe what the change does and why it should be merged.
16+
-->
817

9-
**What kind of change does this PR introduce?** (check at least one)
18+
<!--
19+
If changing the UI in any way, please provide the a **before/after** screenshot:
20+
-->
1021

11-
- [ ] Bugfix
12-
- [ ] Feature
13-
- [ ] Code style update
14-
- [ ] Refactor
15-
- [ ] Docs
16-
- [ ] Build-related changes
17-
- [ ] Repo settings
18-
- [ ] Other, please describe:
22+
## **What kind of change does this PR introduce?**
1923

20-
If changing the UI of default theme, please provide the **before/after** screenshot:
24+
<!--
25+
Copy/paste one of the following options:
26+
-->
2127

22-
**Does this PR introduce a breaking change?** (check one)
28+
<!--
29+
Bugfix
30+
Feature
31+
Code style update
32+
Refactor
33+
Docs
34+
Build-related changes
35+
Repo settings
36+
Other
37+
-->
38+
39+
<!--
40+
If you chose Other, please describe.
41+
-->
42+
43+
## **For any code change,**
44+
45+
- [ ] Related documentation has been updated if needed
46+
- [ ] Related tests have been updated or tests have been added
47+
48+
## **Does this PR introduce a breaking change?** (check one)
2349

2450
- [ ] Yes
2551
- [ ] No
2652

2753
If yes, please describe the impact and migration path for existing applications:
2854

29-
**The PR fulfills these requirements:**
55+
## **Related issue, if any:**
3056

31-
- [ ] When resolving a specific issue, it's referenced in the PR's title (e.g. `fix #xxx[,#xxx]`, where "xxx" is the issue number)
57+
<!-- Paste issue's link or number hashtag here. -->
3258

33-
You have tested in the following browsers: (Providing a detailed version will be better.)
59+
## **Tested in the following browsers:**
3460

3561
- [ ] Chrome
3662
- [ ] Firefox
3763
- [ ] Safari
3864
- [ ] Edge
3965
- [ ] IE
40-
41-
If adding a **new feature**, the PR's description includes:
42-
43-
- [ ] A convincing reason for adding this feature
44-
- [ ] Related documents have been updated
45-
- [ ] Related tests have been updated
46-
47-
To avoid wasting your time, it's best to open a **feature request issue** first and wait for approval before working on it.

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: npm run test:unit -- -ci --runInBand
3232
- name: integration tests
3333
run: npm run test:integration -- -ci --runInBand
34-
- uses: microsoft/playwright-github-action@v1.3.0
34+
- uses: microsoft/playwright-github-action@v1
3535
- name: e2e tests
3636
run: npm run test:e2e -- --ci --runInBand
3737
- name: Upload artifacts (diff output)

src/plugins/search/component.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ function doSearch(value) {
137137
$panel.innerHTML = '';
138138

139139
if (options.hideOtherSidebarContent) {
140-
$sidebarNav.classList.remove('hide');
141-
$appName.classList.remove('hide');
140+
$sidebarNav && $sidebarNav.classList.remove('hide');
141+
$appName && $appName.classList.remove('hide');
142142
}
143143

144144
return;
@@ -160,8 +160,8 @@ function doSearch(value) {
160160
$clearBtn.classList.add('show');
161161
$panel.innerHTML = html || `<p class="empty">${NO_DATA_TEXT}</p>`;
162162
if (options.hideOtherSidebarContent) {
163-
$sidebarNav.classList.add('hide');
164-
$appName.classList.add('hide');
163+
$sidebarNav && $sidebarNav.classList.add('hide');
164+
$appName && $appName.classList.add('hide');
165165
}
166166
}
167167

0 commit comments

Comments
 (0)