mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode

Browse source 
# Conflicts:
#	src/components/guide/guide.js
#	src/components/mediainfo/mediainfo.js
#	src/components/multiselect/multiselect.js
#	src/components/playback/brightnessosd.js
#	src/components/recordingcreator/recordingbutton.js
#	src/components/userdatabuttons/emby-ratingbutton.js
#	src/controllers/favorites.js
This commit is contained in:
grafixeyehero 2019-11-24 17:45:48 +03:00
commit 080b3365d6
145 changed files with 1438 additions and 4767 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/userdatabuttons/emby-ratingbutton.js
View file

@ -33,8 +33,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
var isFavorite = this.getAttribute('data-isfavorite') === 'true';
if (likes === 'true') {
likes = true;
}
else if (likes === 'false') {
} else if (likes === 'false') {
likes = false;
} else {
likes = null;
@ -64,7 +63,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
if (icon) {
icon.innerHTML = 'favorite';
icon.classList.add('ratingbutton-icon-withrating');
icon.classList.add('ratingbutton-icon-withrating');
}
button.classList.add('ratingbutton-withrating');
@ -73,7 +72,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
if (icon) {
icon.innerHTML = 'favorite';
icon.classList.remove('ratingbutton-icon-withrating');
icon.classList.remove('ratingbutton-icon-withrating');
//icon.innerHTML = 'thumb_up';
}
button.classList.remove('ratingbutton-withrating');
@ -82,7 +81,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
if (icon) {
icon.innerHTML = 'favorite';
icon.classList.remove('ratingbutton-icon-withrating');
icon.classList.remove('ratingbutton-icon-withrating');
//icon.innerHTML = 'thumb_down';
}
button.classList.remove('ratingbutton-withrating');
@ -91,7 +90,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
if (icon) {
icon.innerHTML = 'favorite';
icon.classList.remove('ratingbutton-icon-withrating');
icon.classList.remove('ratingbutton-icon-withrating');
//icon.innerHTML = 'thumbs_up_down';
}
button.classList.remove('ratingbutton-withrating');
@ -152,8 +151,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
var isFavorite = this.getAttribute('data-isfavorite') === 'true';
if (likes === 'true') {
likes = true;
}
else if (likes === 'false') {
} else if (likes === 'false') {
likes = false;
} else {
likes = null;