Merge branch 'develop' into update-contributing

sy-records · web-flow · commit 87272e28cb02 · 2021-03-12T08:49:50.000+08:00
diff --git a/src/plugins/search/component.js b/src/plugins/search/component.js
@@ -137,8 +137,8 @@ function doSearch(value) {
     $panel.innerHTML = '';
 
     if (options.hideOtherSidebarContent) {
-      $sidebarNav.classList.remove('hide');
-      $appName.classList.remove('hide');
+      $sidebarNav && $sidebarNav.classList.remove('hide');
+      $appName && $appName.classList.remove('hide');
     }
 
     return;
@@ -160,8 +160,8 @@ function doSearch(value) {
   $clearBtn.classList.add('show');
   $panel.innerHTML = html || `<p class="empty">${NO_DATA_TEXT}</p>`;
   if (options.hideOtherSidebarContent) {
-    $sidebarNav.classList.add('hide');
-    $appName.classList.add('hide');
+    $sidebarNav && $sidebarNav.classList.add('hide');
+    $appName && $appName.classList.add('hide');
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ function doSearch(value) {`
`137`	`137`	`$panel.innerHTML = '';`
`138`	`138`
`139`	`139`	`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');`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`return;`
`@@ -160,8 +160,8 @@ function doSearch(value) {`
`160`	`160`	`$clearBtn.classList.add('show');`
`161`	`161`	$panel.innerHTML = html \|\| `<p class="empty">${NO_DATA_TEXT}</p>`;
`162`	`162`	`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');`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`