archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Use the nifty new DocumentTitleAPI to update notification count

Browse Source 
and page titles when browsing assets.

This removes the need for updateTitle()
This commit is contained in:
Pablo Vazquez 2017-10-05 14:58:54 +02:00 committed by Sybren A. Stüvel
parent f9e10976b8
commit 68c7a88fed
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scripts/tutti/0_navbar.js
View File

@ -31,16 +31,6 @@ var DocumentTitleAPI = {
},
};
var page_title = document.title;
function updateTitle(unread_on_load, page_title){
if (unread_on_load > 0){
document.title = '(' + unread_on_load + ') ' + page_title;
} else {
document.title = page_title;
}
}
/* Status Bar */
function statusBarClear(delay_class, delay_html){

11
src/scripts/tutti/5_1_notifications.js
View File

@ -98,9 +98,8 @@ function getNotifications(){
$notifications_count.html('<span>' + unread_new + '</span>');
$notifications_toggle.addClass('has-notifications');
// Let Pillar know the notifications total has been updated.
// Used for example to update of the page title via updateTitle();
$('body').trigger('pillar:notifications-total-updated', unread_new);
// Update notifications count on the document title
DocumentTitleAPI.set_notification_count(unread_new);
} else {
clearNotificationIcon();
@ -328,11 +327,9 @@ $(function() {
clearNotificationIcon();
unread_on_load = 0;
// Update notifications count on the document title
DocumentTitleAPI.set_notification_count(0);
// Let Pillar know the notifications total has been updated.
// Used for example to update of the page title via updateTitle();
$('body').trigger('pillar:notifications-total-updated', unread_on_load);
});
});

5
src/templates/nodes/edit_embed.pug
View File

@ -87,8 +87,9 @@ script(type="text/javascript").
$(function () {
$('#tags').select2();
page_title = 'Edit: {{ node.name }} — {{ project.name }}';
updateTitle(unread_on_load, page_title);
// Set the page title on the document
var page_title = 'Edit: {{ node.name }} - {{ project.name }} — Blender Cloud';
DocumentTitleAPI.set_page_title(page_title);
/* Build the markdown preview when typing in textarea */
var convert = new Markdown.getSanitizingConverter();

7
src/templates/projects/view.pug
View File

@ -340,10 +340,9 @@ script.
updateToggleProjHeaderMenuItem();
var nodeTitle = document.getElementById('node-title');
page_title = $(nodeTitle).text() + " - {{ project.name }} - Blender Cloud";
updateTitle(unread_on_load, page_title);
// Set the page title on the document
var page_title = $('#node-title').text() + " - {{ project.name }} — Blender Cloud";
DocumentTitleAPI.set_page_title(page_title);
// TODO: Maybe remove this, now it's also in loadNodeContent(), but double-check
// it's done like that in all users of updateUi().