csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

wip

Browse Source
This commit is contained in:
jr-k 2024-08-25 02:11:27 +02:00
parent 1ef39dc0fb
commit d27adbd77a
7 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/www/css/compiled/main-dark-mode.css
View File

File diff suppressed because one or more lines are too long

2
data/www/css/compiled/main-light-mode.css
View File

File diff suppressed because one or more lines are too long

4
data/www/js/global.js
View File

@ -30,6 +30,10 @@ const hideDropdowns = function () {
$('.dropdown').removeClass('dropdown-show'); $('.dropdown').removeClass('dropdown-show');
}; };
const classColorXor = function(color, fallback) {
return color === 'gscaleF' ? 'gscale0' : (color === 'gscale0' ? 'gscaleF' : fallback);
};
const showToast = function (text) { const showToast = function (text) {
const $toast = $(".toast"); const $toast = $(".toast");
$toast.addClass('show'); $toast.addClass('show');

21
data/www/js/slideshow/content-composition.js
View File

@ -60,7 +60,7 @@ jQuery(document).ready(function ($) {
element.resizable({ element.resizable({
// containment: "#screen", // containment: "#screen",
handles: 'nw, ne, sw, se', handles: 'n, s, e, w, nw, ne, sw, se',
start: function (event, ui) { start: function (event, ui) {
focusElement(ui.element); focusElement(ui.element);
}, },
@ -315,7 +315,9 @@ jQuery(document).ready(function ($) {
unfocusElements(); unfocusElements();
} }
if (!currentElement) { const hasFocusInInput = $('input,textarea').is(':focus');
if (!currentElement || hasFocusInInput) {
return; return;
} }
@ -327,7 +329,7 @@ jQuery(document).ready(function ($) {
$('#elem-y').val(parseInt($('#elem-y').val()) - (e.shiftKey ? 10 : 1)).trigger('input'); $('#elem-y').val(parseInt($('#elem-y').val()) - (e.shiftKey ? 10 : 1)).trigger('input');
} else if (e.key === "ArrowDown") { } else if (e.key === "ArrowDown") {
$('#elem-y').val(parseInt($('#elem-y').val()) + (e.shiftKey ? 10 : 1)).trigger('input'); $('#elem-y').val(parseInt($('#elem-y').val()) + (e.shiftKey ? 10 : 1)).trigger('input');
} else if (e.key === "Backspace" && !$('input,textarea').is(':focus')) { } else if (e.key === "Backspace") {
if (confirm(l.js_common_are_you_sure)) { if (confirm(l.js_common_are_you_sure)) {
removeElementById(currentElement.attr('data-id')); removeElementById(currentElement.attr('data-id'));
} }
@ -350,10 +352,17 @@ jQuery(document).ready(function ($) {
$element.attr('data-content-type', content.type); $element.attr('data-content-type', content.type);
$element.data('content-metadata', content.metadata); $element.data('content-metadata', content.metadata);
const $elementList = $('.element-list-item[data-id='+$element.attr('data-id')+']'); const $elementList = $('.element-list-item[data-id='+$element.attr('data-id')+']');
const iconClasses = ['fa', content_type_icon_classes[content.type]].join(' '); $element.find('i').get(0).classList = [
$element.find('i').get(0).classList = iconClasses; 'fa',
content_type_icon_classes[content.type],
classColorXor(content_type_color_classes[content.type], content_type_color_classes[content.type])
].join(' ');
$elementList.find('label').text(content.name); $elementList.find('label').text(content.name);
$elementList.find('i:eq(0)').get(0).classList = iconClasses; $elementList.find('i:eq(0)').get(0).classList = [
'fa',
content_type_icon_classes[content.type],
content_type_color_classes[content.type]
].join(' ');
}; };
$(document).on('submit', 'form.form', function (e) { $(document).on('submit', 'form.form', function (e) {

2
data/www/js/slideshow/contents.js
View File

@ -24,7 +24,7 @@ jQuery(document).ready(function ($) {
$form.find('button[type=submit]').attr('class', [ $form.find('button[type=submit]').attr('class', [
'btn', 'btn',
`btn-${color}`, `btn-${color}`,
color === 'gscaleF' ? 'gscale0' : '' classColorXor(color, '')
].join(' ')); ].join(' '));
}; };

50
data/www/scss/pages/_content-composition.scss
View File

@ -121,36 +121,66 @@
} }
.ui-resizable-handle { .ui-resizable-handle {
$size: 10px;
$sizeOffset: -1*calc($size/2);
background: $gkscaleA; background: $gkscaleA;
border: 1px solid $gkscale5; border: 1px solid $gkscale5;
width: 10px; width: $size;
height: 10px; height: $size;
z-index: 90; z-index: 90;
display: none; display: none;
position: absolute; position: absolute;
&.ui-resizable-n {
cursor: n-resize;
top: $sizeOffset;
left: 50%;
margin-left: $sizeOffset;
}
&.ui-resizable-s {
cursor: s-resize;
bottom: $sizeOffset;
left: 50%;
margin-left: $sizeOffset;
}
&.ui-resizable-w {
cursor: w-resize;
left: $sizeOffset;
top: 50%;
margin-top: $sizeOffset;
}
&.ui-resizable-e {
cursor: e-resize;
right: $sizeOffset;
top: 50%;
margin-top: $sizeOffset;
}
&.ui-resizable-nw { &.ui-resizable-nw {
cursor: nw-resize; cursor: nw-resize;
top: -5px; top: $sizeOffset;
left: -5px; left: $sizeOffset;
} }
&.ui-resizable-ne { &.ui-resizable-ne {
cursor: ne-resize; cursor: ne-resize;
top: -5px; top: $sizeOffset;
right: -5px; right: $sizeOffset;
} }
&.ui-resizable-sw { &.ui-resizable-sw {
cursor: sw-resize; cursor: sw-resize;
bottom: -5px; bottom: $sizeOffset;
left: -5px; left: $sizeOffset;
} }
&.ui-resizable-se { &.ui-resizable-se {
cursor: se-resize; cursor: se-resize;
bottom: -5px; bottom: $sizeOffset;
right: -5px; right: $sizeOffset;
} }
} }
} }

7
views/slideshow/contents/edit-composition.jinja.html
View File

@ -15,7 +15,12 @@
<script> <script>
const content_type_icon_classes = { const content_type_icon_classes = {
{% for type in enum_content_type %} {% for type in enum_content_type %}
'{{ type.value }}': '{{ enum_content_type.get_fa_icon(type) ~ ' ' ~ enum_content_type.get_color_icon(type) }}', '{{ type.value }}': '{{ enum_content_type.get_fa_icon(type) }}',
{% endfor %}
};
const content_type_color_classes = {
{% for type in enum_content_type %}
'{{ type.value }}': '{{ enum_content_type.get_color_icon(type) }}',
{% endfor %} {% endfor %}
}; };
</script> </script>