Commit 3fb08aa5 authored by yPhil's avatar yPhil

Dialog: escape & .ui-dialog-titlebar-close isNewFeed.remove()

parent a71c0ca8
......@@ -143,10 +143,6 @@ a:hover {
color: var(--ui-color-sec) !important;
}
i.feedControl:hover {
color: var(--ui-color-sec);
}
.rs-button:hover {
border-color: var(--ui-color-sec) !important;
}
......@@ -361,27 +357,6 @@ i.tabCloser {
top: 3px;
}
#tabs .newFeed,
#menu > .handle {
font-size: 2rem;
position:absolute;
}
#tabs .newFeed {
right:0;
top: 20vh;
}
#menu > .handle {
bottom: 20vh;
left:275px;
}
#menu > .handle > i {
border: none !important;
line-height: 0 !important;
}
#menu {
animation: fadeIn ease 6s;
}
......@@ -891,44 +866,30 @@ li.feed {
}
.mobHeader > .feedHandle {
flex-grow: 0;
flex-shrink: var(--handle-flex-shrink);
flex-basis: 4px;
cursor:move;
visibility: var(--handle-visibility);
/* background: linear-gradient(90deg, var(--bg-color-pri) 4px, transparent 1%) center, linear-gradient(var(--bg-color-pri) 4px, transparent 1%) center, var(--bg-color-ter); */
/* background-size: 6px 6px; */
/* background-position: 0 2px; */
background-color: transparent;
border-left: 3px dotted var(--bg-color-ter);
border-right: 3px dotted var(--bg-color-ter);
cursor:move;
flex-basis: 4px;
flex-grow: 0;
flex-shrink: var(--handle-flex-shrink);
visibility: var(--handle-visibility);
}
/* .feedSelect { */
/* visibility: var(--handle-visibility); */
/* } */
.mobHeader > .feedHandle > div {
}
.mobHeader > .myControlsToggleDiv {
flex-basis: auto;
flex-grow: 0;
flex-shrink: 0;
flex-basis: auto;
}
.mobHeader > .feedControls {
display: flex;
flex-basis: 0px;
flex-grow: 0;
flex-shrink: 0;
flex-basis: 0px;
/* overflow:hidden; */
display: flex;
}
.mobHeader .feedControls div {
......@@ -936,7 +897,6 @@ li.feed {
}
.mobHeader .feedControls div.collapsible {
/* visibility:hidden; */
display:none;
}
......@@ -946,8 +906,8 @@ li.feed {
margin: 0 0 0 2px;
}
.handle {
opacity: 0.6;
i.feedControl:hover {
color: var(--ui-color-sec);
}
#newTabButton {
......@@ -963,7 +923,6 @@ li.feed {
margin: 0;
padding: 0;
width: 100%;
/* color: var(--ui-color-pri) !important; */
}
i.tabCloser,
......
......@@ -145,7 +145,7 @@ MOB.dialog = {
$('.ui-dialog :button').focus();
$('.ui-widget-overlay').on('click', function() {
$('.ui-widget-overlay, .ui-dialog-titlebar-close').on('click', function() {
MOB.dialog.kill($dialog);
if (isNewFeed) {
......@@ -153,8 +153,18 @@ MOB.dialog = {
$feed.remove();
});
}
});
$(document).keyup(function(e) {
if (e.keyCode === 27) {
if (isNewFeed) {
$feed.hide('fade', 1000, function() {
$feed.remove();
});
}
} // esc
});
$.each(allGroups, function() {
......@@ -339,8 +349,8 @@ MOB.dialog = {
},
{
text: MOB.tr('Delete'),
title: MOB.tr('Delete'),
class: "dangerous translate",
title: MOB.tr('Wait! Are you sure?'),
class: "dangerous translate icon-trash-empty",
click: function() {
$selectedTab.remove();
......@@ -470,9 +480,8 @@ MOB.dialog = {
},
{
text: MOB.tr('Delete'),
title: MOB.tr('Delete'),
icon: "ui-icon-alert",
class: "dangerous translate",
title: MOB.tr('Wait! Are you sure?'),
class: "dangerous translate icon-trash-empty",
click: function() {
var $tabFeedId = $('#' + $(this).data('feedId'));
......
......@@ -113,6 +113,8 @@ MOB.i18n.translations = {
"Delete this source." : { fr: "Supprimer cette source." , ja: "このソースを削除してください。", es: "Eliminar esta fuente." },
"Wait! Are you sure?" : { fr: "Stop ! Vous êtes sûr ?" , ja: "待つ! 本気ですか?", es: "¡Espere! ¿Estás seguro?" },
"Select this source (for drag & drop)." : { fr: "Sélectionner cette source (pour le glisser-déposer)." , ja: "このソースを選択します(ドラッグ&ドロップ用)。", es: "Seleccione esta fuente (para arrastrar y soltar)." },
"Drag here to move this source (and all other selected sources) within this group, or into another." : { fr: "Attraper ici pour déplacer cette source (et toutes les autres sources sélectionnées) dans ce groupe ou dans un autre." , ja: "ここでドラッグすると、このグループ内のこのソース(および他のすべての選択されたソース)を別のグループに移動できます。", es: "Arrastre aquí para mover esta fuente (y todas las demás fuentes seleccionadas) dentro de este grupo o dentro de otra." },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment