artin/nzbhydra2
1
0
Fork 0
mirror of https://github.com/theotherp/nzbhydra2.git synced 2026-02-06 11:17:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove leading whitespaces in titles in search results

Browse Source 
Closes #900
This commit is contained in:
TheOtherP 2023-11-20 22:30:34 +01:00
parent acd67b64cd
commit f640aa90d8
5 changed files with 37 additions and 11525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11487
core/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

35
core/package.json
View File

@ -6,58 +6,59 @@
"dependencies": {
"add-stream": "^1.0.0",
"bower": "^1.8.2",
"grunt-bower-concat": "^0.5.0",
"grunt": "^0.4.5",
"grunt-bowercopy": "^1.2.3",
"grunt-bower-concat": "^0.5.0",
"grunt-bower-task": "^0.4.0",
"grunt-bowercopy": "^1.2.3",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-cssmin": "^0.12.3",
"grunt-contrib-watch": "^0.6.1",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-uglify": "^0.9.2",
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^2.3.1",
"grunt-filerev-replace": "^0.1.4",
"grunt-injector": "^0.6.0",
"grunt-ng-annotate": "^1.0.1",
"grunt-jsx": "^0.1.8",
"grunt-ng-annotate": "^1.0.1",
"grunt-react": "^0.10.0",
"grunt-shell": "^1.1.2",
"grunt-usemin": "^3.1.1",
"grunt-react": "^0.10.0",
"gulp": "^3.9.0",
"grunt-userev": "^0.0.6",
"gulp": "^3.9.0",
"gulp-angular-filesort": "^1.1.1",
"gulp-angular-templatecache": "^2.0.0",
"gulp-cached": "^1.1.1",
"gulp-clean": "^0.3.1",
"gulp-changed": "^1.3.0",
"gulp-clean": "^0.3.1",
"gulp-clean-css": "^3.9.0",
"gulp-concat-css": "^2.3.0",
"gulp-concat": "^2.6.0",
"gulp-concat-css": "^2.3.0",
"gulp-copy": "^0.0.2",
"gulp-flatten": "^0.2.0",
"gulp-git": "^1.6.0",
"gulp-htmlmin": "^5.0.1",
"gulp-inject": "^3.0.0",
"gulp-less": "^3.3.2",
"gulp-install": "^0.6.0",
"gulp-jsbeautifier": "^2.1.1",
"gulp-less": "^3.3.2",
"gulp-less-sourcemap": "^1.4.3",
"gulp-livereload": "^3.8.1",
"gulp-newer": "^0.5.1",
"gulp-load-plugins": "^1.0.0",
"gulp-merge": "^0.1.1",
"gulp-newer": "^0.5.1",
"gulp-ng-annotate": "^1.1.0",
"gulp-print": "^2.0.1",
"gulp-rev-all": "^0.8.22",
"gulp-sequence": "^0.4.1",
"gulp-rename": "^1.2.2",
"gulp-rev": "^6.0.1",
"gulp-sort": "^2.0.0",
"gulp-rev-all": "^0.8.22",
"gulp-rev-collector": "^1.0.2",
"gulp-sequence": "^0.4.1",
"gulp-sort": "^2.0.0",
"gulp-sourcemaps": "^1.6.0",
"gulp-uglifyjs": "^0.6.2",
"gulp-uglify": "^1.5.4",
"gulp-uglifyjs": "^0.6.2",
"gulp-watch": "^4.3.5",
"main-bower-files": "^2.9.0",
"merge-stream": "^1.0.0",
@ -72,8 +73,8 @@
"type": "git",
"url": "git+https://github.com/theotherp/nzbhydra2.git"
},
"resolutions": {
"graceful-fs": "^4.2.4"
"overrides": {
"graceful-fs": "^4.2.11"
},
"keywords": [
"usenet",

6
core/src/main/resources/changelog.yaml
View File

@ -1,4 +1,10 @@
#@formatter:off
- version: "v5.3.4"
date: "2023-11-20"
changes:
- type: "fix"
text: "Remove leading whitespaces in titles in search results. See #900"
final: true
- version: "v5.3.3"
date: "2023-11-20"
changes:

2
core/src/main/resources/static/js/templates.js
View File

File diff suppressed because one or more lines are too long

32
core/ui-src/html/directives/search-result.html
View File

@ -3,38 +3,30 @@
<td class="col-md-13 search-results-cell result-title" style="margin:0;">
<input type="checkbox"
ng-model="foo.selected"
ng-click="clickCheckbox($event, result)" data-checkbox-index="0" class="result-checkbox"/>
<a href="" ng-click="toggleTitleExpansion()"
ng-click="clickCheckbox($event, result)" data-checkbox-index="0" class="result-checkbox"/><a href="" ng-click="toggleTitleExpansion()"
ng-class="{'visibility-hidden': (result.titlesLength === 1 || result.titleGroupIndex > 0 || result.duplicateGroupIndex > 0)}"
class="title-expand-toggle"
uib-tooltip="Click to see or hide all results with the same title"
tooltip-placement="top"
tooltip-trigger="mouseenter"
style="text-decoration: none">
<span class="glyphicon"
ng-class="{'glyphicon-minus': titlesExpanded, 'glyphicon-plus': !titlesExpanded}"></span></a>
<a ng-if="foo.duplicatesDisplayed" href="" ng-click="toggleDuplicateExpansion()"
style="text-decoration: none"><span class="glyphicon"
ng-class="{'glyphicon-minus': titlesExpanded, 'glyphicon-plus': !titlesExpanded}"></span></a><a
ng-if="foo.duplicatesDisplayed" href="" ng-click="toggleDuplicateExpansion()"
ng-class="{'visibility-hidden': (result.duplicatesLength == 1 || result.duplicateGroupIndex > 0)}"
class="duplicate-expand-toggle"
uib-tooltip="Click to see or hide all duplicates of this result"
tooltip-placement="right"
tooltip-trigger="mouseenter" style="text-decoration: none"
><span class="glyphicon"
ng-class="{'glyphicon-minus': duplicatesExpanded, 'glyphicon-plus': !duplicatesExpanded}"></span>
</a>
<span class="title">
{{result.alwaysShowTitles}}
<span ng-if="(result.titleGroupIndex === 0 && result.duplicateGroupIndex === 0) || searchResultsControllerShared.isGroupEpisodes || foo.alwaysShowTitles">
<img ng-if="result.cover && foo.showCovers" ng-src="{{::result.cover}}" width="{{::coverSize}}px" style="margin-right: 5px" ng-click="showCover(result.cover)"/>
<span ng-if="result.downloadedAt && searchResultsControllerShared.showDownloadedIndicator" class="fa fa-check" uib-tooltip="Already downloaded at {{::result.downloadedAt}}"
tooltip-placement="top"
tooltip-trigger="mouseenter"></span>
{{ ::result.title }}
</span>
</span>
>
<!-- Formatting must be so weird because otherwise we'll have leading whitespaces in the titles -->
<span class="glyphicon" ng-class="{'glyphicon-minus': duplicatesExpanded, 'glyphicon-plus': !duplicatesExpanded}"></span></a><span class="title">{{result.alwaysShowTitles}}<span
ng-if="(result.titleGroupIndex === 0 && result.duplicateGroupIndex === 0) || searchResultsControllerShared.isGroupEpisodes || foo.alwaysShowTitles"><img
ng-if="result.cover && foo.showCovers" ng-src="{{::result.cover}}" width="{{::coverSize}}px" style="margin-right: 5px" ng-click="showCover(result.cover)"/><span
ng-if="result.downloadedAt && searchResultsControllerShared.showDownloadedIndicator" class="fa fa-check" uib-tooltip="Already downloaded at {{::result.downloadedAt}}"
tooltip-placement="top" tooltip-trigger="mouseenter"></span>{{ ::result.title }}</span></span>
<span class="badge" ng-if="result.torrentDownloadFactor">{{::result.torrentDownloadFactor}}</span>
</td>
<td class="col-md-1 search-results-cell result-indexer" style="text-align: right">
{{ ::result.indexer }}
</td>