PrivateCoffee/wishthis
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into release-candidate

Browse source
This commit is contained in:
grandeljay 2022-04-07 20:10:43 +02:00
commit 23592e9fbb
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/assets/js/default.js
View file

@ -40,8 +40,8 @@ $(function() {
placeholder: text.wishlist_no_selection
})
if ($_GET.wishlist) {
element.dropdown('set selected', $_GET.wishlist);
if ($_GET.id) {
element.dropdown('set selected', $_GET.id);
} else {
if (response.results[0]) {
element.dropdown('set selected', response.results[0].value);

2
src/assets/js/profile.js
View file

@ -31,7 +31,7 @@ $(function() {
});
$('.ui.progress').progress();
var isPWA = window.matchMedia('(display-mode: standalone)').matches;
var isPWA = navigator.standalone || window.matchMedia('(display-mode: standalone)').matches;
if (isPWA) {
$('.ui.dropdown.channel').dropdown('set selected', 'stable');

6
src/assets/js/wishlists.js
View file

@ -43,7 +43,7 @@ $(function () {
progress.addClass('indeterminate');
if (wishlistValue) {
$_GET.wishlist = wishlistValue;
$_GET.id = wishlistValue;
$('.wishlist-share').attr('href', '/?wishlist=' + wishlists[wishlistIndex].hash);
@ -274,7 +274,7 @@ $(function () {
wishlists.dropdown('clear');
urlParams.delete('wishlist');
urlParams.delete('id');
$('body').toast({ message:text.toast_wishlist_delete });
@ -426,7 +426,7 @@ $(function () {
.then(function(response) {
modalWishlistCreate.modal('hide');
urlParams.set('wishlist', response.data.lastInsertId);
urlParams.set('id', response.data.lastInsertId);
$('body').toast({ message: text.toast_wish_create });