Merge branch 'newtoolbar' into hpbs

pull/1/head
yflory 8 years ago
commit 26bea774cb

@ -564,12 +564,20 @@ define([
$container.find('.cryptpad-dropdown').hide(); $container.find('.cryptpad-dropdown').hide();
}; };
var cancelEditTitle = function (e) { var cancelEditTitle = function (e) {
// Now we want to apply the title even if we click somewhere else
if ($(e.target).parents('.' + TITLE_CLS).length || !$titleElement) { if ($(e.target).parents('.' + TITLE_CLS).length || !$titleElement) {
return; return;
} }
var e = jQuery.Event("keyup");
e.which = 13;
$titleElement.find('input').trigger(e);
/*
$titleElement.find('input').hide(); $titleElement.find('input').hide();
$titleElement.find('span.title').show(); $titleElement.find('span.title').show();
$titleElement.find('span.pencilIcon').css('display', ''); $titleElement.find('span.pencilIcon').css('display', '');
*/
}; };
$(config.ifrw).on('click', removeDropdowns); $(config.ifrw).on('click', removeDropdowns);
$(config.ifrw).on('click', cancelEditTitle); $(config.ifrw).on('click', cancelEditTitle);

@ -488,7 +488,7 @@ define([
}; };
var suggestName = function (fallback) { var suggestName = function (fallback) {
return document.title || defaultName || ""; return (document.title === defaultName) ? "" : document.title;
}; };

Loading…
Cancel
Save