hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3442_optimize-list-notifications_4.1-bis

Browse Source 
WIP
fix : click on "you have received a new basket" hides the message (thks Aina)
This commit is contained in:
jygaulier
2021-06-22 14:51:05 +02:00
parent 0305818a6e
commit 03e83d181a
4 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Phraseanet-production-client/dist/production.js vendored
View File

@@ -10111,7 +10111,8 @@ var workzone = function workzone(services) {
}
});
(0, _jquery2.default)('.basket_refresher').on('click', function () {
(0, _jquery2.default)('#idFrameC').on('click', '.basket_refresher', function () {
console.log("======= CLINK ======");
return workzoneOptions.refresh('current');
});
activeBaskets();
@@ -18916,12 +18917,11 @@ var notifyLayout = function notifyLayout(services) {
$notificationTrigger.on('mousedown', function (event) {
event.stopPropagation();
// toggle
//if ($notificationTrigger.hasClass('open')) {
if ((0, _jquery2.default)('#notification_box').is(':visible')) {
if ($notificationTrigger.hasClass('open')) {
$notificationBoxContainer.hide();
//$notificationTrigger.removeClass('open');
$notificationTrigger.removeClass('open'); // revert background in menubar
} else {
//$notificationTrigger.addClass('open');
$notificationTrigger.addClass('open'); // highlight background in menubar
$notificationBoxContainer.show();
commonModule.fixNotificationsHeight();
}
@@ -18932,7 +18932,7 @@ var notifyLayout = function notifyLayout(services) {
*/
(0, _jquery2.default)(document).on('mousedown', function () {
$notificationBoxContainer.hide();
//$notificationTrigger.removeClass('open');
$notificationTrigger.removeClass('open');
});
$notificationBoxContainer.on('mousedown', function (event) {
@@ -18943,7 +18943,7 @@ var notifyLayout = function notifyLayout(services) {
(0, _jquery2.default)(event.currentTarget).removeClass('hover');
})
/**
* click on "see all notification"
* click on "see all notifications"
*/
.on('click', '.notification__print-action', function (event) {
event.preventDefault();
@@ -19083,16 +19083,6 @@ var notifyLayout = function notifyLayout(services) {
(0, _jquery2.default)('.notification_' + notification_id + '_read', $notifications).show();
});
};
/*
const clear_notifications = () => {
var unread = $('#notification_box .unread');
if (unread.length === 0) {
return;
}
unread.removeClass('unread');
$('.notification_trigger .counter').css('visibility', 'hidden').empty();
};
*/
return {
initialize: initialize

24
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -10111,7 +10111,8 @@ var workzone = function workzone(services) {
}
});
(0, _jquery2.default)('.basket_refresher').on('click', function () {
(0, _jquery2.default)('#idFrameC').on('click', '.basket_refresher', function () {
console.log("======= CLINK ======");
return workzoneOptions.refresh('current');
});
activeBaskets();
@@ -18916,12 +18917,11 @@ var notifyLayout = function notifyLayout(services) {
$notificationTrigger.on('mousedown', function (event) {
event.stopPropagation();
// toggle
//if ($notificationTrigger.hasClass('open')) {
if ((0, _jquery2.default)('#notification_box').is(':visible')) {
if ($notificationTrigger.hasClass('open')) {
$notificationBoxContainer.hide();
//$notificationTrigger.removeClass('open');
$notificationTrigger.removeClass('open'); // revert background in menubar
} else {
//$notificationTrigger.addClass('open');
$notificationTrigger.addClass('open'); // highlight background in menubar
$notificationBoxContainer.show();
commonModule.fixNotificationsHeight();
}
@@ -18932,7 +18932,7 @@ var notifyLayout = function notifyLayout(services) {
*/
(0, _jquery2.default)(document).on('mousedown', function () {
$notificationBoxContainer.hide();
//$notificationTrigger.removeClass('open');
$notificationTrigger.removeClass('open');
});
$notificationBoxContainer.on('mousedown', function (event) {
@@ -18943,7 +18943,7 @@ var notifyLayout = function notifyLayout(services) {
(0, _jquery2.default)(event.currentTarget).removeClass('hover');
})
/**
* click on "see all notification"
* click on "see all notifications"
*/
.on('click', '.notification__print-action', function (event) {
event.preventDefault();
@@ -19083,16 +19083,6 @@ var notifyLayout = function notifyLayout(services) {
(0, _jquery2.default)('.notification_' + notification_id + '_read', $notifications).show();
});
};
/*
const clear_notifications = () => {
var unread = $('#notification_box .unread');
if (unread.length === 0) {
return;
}
unread.removeClass('unread');
$('.notification_trigger .counter').css('visibility', 'hidden').empty();
};
*/
return {
initialize: initialize

2
Phraseanet-production-client/src/components/notify/notifyLayout.js
View File

@@ -48,7 +48,7 @@ const notifyLayout = (services) => {
$(event.currentTarget).removeClass('hover');
})
/**
* click on "see all notification"
* click on "see all notifications"
*/
.on('click', '.notification__print-action', (event) => {
event.preventDefault();

2
Phraseanet-production-client/src/components/ui/workzone/index.js
View File

@@ -203,7 +203,7 @@ const workzone = (services) => {
}
});
$('.basket_refresher').on('click', function () {
$('#idFrameC').on('click', '.basket_refresher', function () {
return workzoneOptions.refresh('current');
});
activeBaskets();