Skip to content

Commit 30ba90f

Browse files
fsbraunfsbraun
committed
chore: Remove inline js
1 parent a3673ee commit 30ba90f

File tree

9 files changed

+85
-24
lines changed

9 files changed

+85
-24
lines changed

‎filer/private/sass/settings/_custom.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ $icon-size: 16px;
3737

3838
$line-height-normal: 20px;
3939

40-
$border-radius-base: 3px;
41-
$border-radius-normal: 5px;
40+
$border-radius-base: var(--dca-btn-radius, 3px);
41+
$border-radius-normal: var(--dca-border-radius, 5px);
4242

4343
$padding-base: 3px;
4444
$padding-normal: 10px;
@@ -53,7 +53,7 @@ $screen-tablet-filer: 810px;
5353
//##############################################################################
5454
// BUTTONS
5555

56-
$btn-border-radius-base: $border-radius-base;
56+
$btn-border-radius-base: var(--button-radius, 3px);
5757
$btn-active-shadow: inset 0 3px 5px rgba($black, 0.125);
5858

5959
$btn-default-color: var(--dca-gray-light, var(--button-fg, #999));

‎filer/static/filer/css/admin_filer.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎filer/static/filer/css/maps/admin_filer.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎filer/static/filer/js/addons/popup_handling.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,37 @@ window.dismissRelatedFolderLookupPopup = (win, chosenId, chosenName) => {
100100
}
101101
win.close();
102102
};
103+
104+
// Handle popup dismiss links (for folder/image selection in popups)
105+
document.addEventListener('DOMContentLoaded', () => {
106+
document.querySelectorAll('.js-dismiss-popup').forEach((link) => {
107+
link.addEventListener('click', function (e) {
108+
e.preventDefault();
109+
110+
const fileId = this.dataset.fileId;
111+
const iconUrl = this.dataset.iconUrl;
112+
const label = this.dataset.label;
113+
114+
if (this.classList.contains('js-dismiss-image')) {
115+
const changeUrl = this.dataset.changeUrl || '';
116+
window.opener.dismissRelatedImageLookupPopup(
117+
window,
118+
fileId,
119+
iconUrl,
120+
label,
121+
changeUrl
122+
);
123+
} else if (this.classList.contains('js-dismiss-folder')) {
124+
window.opener.dismissRelatedFolderLookupPopup(window, fileId, label);
125+
}
126+
});
127+
});
128+
129+
// Auto-dismiss popup on page load (for dismiss_popup.html)
130+
const popupData = document.getElementById('popup-dismiss-data');
131+
if (popupData && window.opener) {
132+
const pk = popupData.dataset.pk;
133+
const label = popupData.dataset.label;
134+
window.opener.dismissRelatedPopup(window, pk, label);
135+
}
136+
});

‎filer/templates/admin/filer/delete_selected_files_confirmation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{% endif %}
4444
<input type="hidden" name="action" value="delete_files_or_folders">
4545
<input type="hidden" name="post" value="yes">
46-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "No, take me back" %}</a>
46+
<a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
4747
<input type="submit" value="{% translate 'Yes, I&#39;m sure' %}">
4848
</div>
4949
</form>

‎filer/templates/admin/filer/folder/choose_copy_destination.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
{% block extrahead %}
1515
{{ block.super }}
16+
<script src="{% static 'admin/js/cancel.js' %}" async></script>
1617
<script src="{% static 'filer/js/addons/tooltip.js' %}"></script>
1718
<script src="{% static 'filer/js/addons/copy-move-files.js' %}"></script>
1819
{% endblock %}
@@ -21,19 +22,19 @@
2122
{% if perms_lacking %}
2223
<p>{% blocktrans %}Your account doesn't have permissions to copy all of the selected files and/or folders.{% endblocktrans %}</p>
2324
<div class="text-right clearfix">
24-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "Take me back" %}</a>
25+
<a href="#" class="button cancel-link js-history-back">{% translate "Take me back" %}</a>
2526
</div>
2627
{% else %}
2728
{% if not destination_folders %}
2829
<p>{% blocktrans %}There are no destination folders available.{% endblocktrans %}</p>
2930
<div class="text-right clearfix">
30-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "Take me back" %}</a>
31+
<a href="#" class="button cancel-link js-history-back">{% translate "Take me back" %}</a>
3132
</div>
3233
{% else %}
3334
{% if not to_copy %}
3435
<p>{% blocktrans %}There are no files and/or folders available to copy.{% endblocktrans %}</p>
3536
<div class="text-right clearfix">
36-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "Take me back" %}</a>
37+
<a href="#" class="button cancel-link">{% translate "Take me back" %}</a>
3738
</div>
3839
{% else %}
3940
<p>{% blocktrans %}The following files and/or folders will be copied to a destination folder (retaining their tree structure):{% endblocktrans %}</p>
@@ -60,7 +61,7 @@
6061
{{ copy_form.as_p }}
6162

6263
<div class="submit-row text-right clearfix">
63-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "No, take me back" %}</a>
64+
<a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
6465
<input type="submit" value="{% translate 'Copy' %}" class="default js-submit-copy-move">
6566
<span class="js-disabled-btn-tooltip disabled-btn-tooltip js-filer-tooltip filer-tooltip-wrapper"
6667
title="{% translate 'It is not allowed to copy files into same folder' %}" tabindex="-1">

‎filer/templates/admin/filer/folder/choose_move_destination.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
{% block extrahead %}
1515
{{ block.super }}
16+
<script src="{% static 'admin/js/cancel.js' %}" async></script>
1617
<script src="{% static 'filer/js/addons/tooltip.js' %}"></script>
1718
<script src="{% static 'filer/js/addons/copy-move-files.js' %}"></script>
1819
{% endblock %}
@@ -21,19 +22,19 @@
2122
{% if perms_lacking %}
2223
<p>{% blocktrans %}Your account doesn't have permissions to move all of the selected files and/or folders.{% endblocktrans %}</p>
2324
<div class="text-right clearfix">
24-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "Take me back" %}</a>
25+
<a href="#" class="button cancel-link">{% translate "Take me back" %}</a>
2526
</div>
2627
{% else %}
2728
{% if not destination_folders %}
2829
<p>{% blocktrans %}There are no destination folders available.{% endblocktrans %}</p>
2930
<div class="text-right clearfix submit-row">
30-
<a href="#" onclick="window.history.back(); return false;" class="closelink">{% translate "Take me back" %}</a>
31+
<a href="#" class="button cancel-link">{% translate "Take me back" %}</a>
3132
</div>
3233
{% else %}
3334
{% if not to_move %}
3435
<p>{% blocktrans %}There are no files and/or folders available to move.{% endblocktrans %}</p>
3536
<div class="text-right clearfix submit-row">
36-
<a href="#" onclick="window.history.back(); return false;" class="closelink">{% translate "Take me back" %}</a>
37+
<a href="#" class="button cancel-link">{% translate "Take me back" %}</a>
3738
</div>
3839
{% else %}
3940
<p>{% blocktrans %}The following files and/or folders will be moved to a destination folder (retaining their tree structure):{% endblocktrans %}</p>
@@ -56,7 +57,7 @@
5657
</select></p>
5758

5859
<div class="text-right clearfix submit-row">
59-
<a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "No, take me back" %}</a>
60+
<a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
6061
<input type="submit" value="{% translate 'Move' %}" class="default js-submit-copy-move">
6162
<span class="js-disabled-btn-tooltip disabled-btn-tooltip js-filer-tooltip filer-tooltip-wrapper"
6263
title="{% translate 'It is not allowed to move files into same folder' %}" tabindex="-1">

‎filer/templates/admin/filer/folder/directory_table_list.html‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@
4545
<tr class="js-filer-dropzone js-filer-dropzone-folder" data-url="{% url 'admin:filer-ajax_upload' folder_id=subfolder.id %}" data-folder-name="{{ subfolder.name }}" data-max-uploader-connections="{{ uploader_connections }}" data-max-files="{{ max_files|safe }}" data-max-filesize="{{ max_filesize|safe }}">
4646
<td class="column-checkbox">
4747
{% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
48-
<a class="insertlink insertlinkButton"
49-
href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, '{{ subfolder.pk|safe }}', '{{ subfolder.pretty_logical_path }}'); return false;" >
48+
<a class="insertlink insertlinkButton js-dismiss-popup js-dismiss-folder"
49+
href="#"
50+
data-file-id="{{ subfolder.pk|safe }}"
51+
data-label="{{ subfolder.pretty_logical_path }}">
5052
<span class="fa fa-arrow-left filer-icon filer-icon-select"></span>
5153
</a>
5254
{% elif action_form and item.pk and not is_popup %}
@@ -92,15 +94,23 @@
9294
<tr>
9395
<td class="column-checkbox">
9496
{% if is_popup and filer_admin_context.pick_file %}
95-
<a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}', '{{ file.get_admin_change_url }}'); return false;"
97+
<a class="insertlink insertlinkButton js-dismiss-popup js-dismiss-image" href="#"
98+
data-file-id="{{ file.id|unlocalize }}"
99+
data-icon-url="{% file_icon_url file %}"
100+
data-label="{{ file.label }}"
101+
data-change-url="{{ file.get_admin_change_url }}"
96102
title="{% translate 'Select this file' %}"><span class="fa fa-arrow-left filer-icon filer-icon-select"></span></a>
97103
{% elif action_form and not is_popup %}
98104
<input type="checkbox" class="action-select" value="file-{{ item.pk|safe }}" name="_selected_action">
99105
{% endif %}
100106
</td>
101107
<td class="column-icon">
102108
{% if is_popup and filer_admin_context.pick_file %}
103-
<a href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}', '{{ file.get_admin_change_url }}'); return false;"
109+
<a href="#" class="js-dismiss-popup js-dismiss-image"
110+
data-file-id="{{ file.id|unlocalize }}"
111+
data-icon-url="{% file_icon_url file %}"
112+
data-label="{{ file.label }}"
113+
data-change-url="{{ file.get_admin_change_url }}"
104114
title="{% translate 'Select this file' %}">
105115
{% elif has_change_permission %}
106116
<a href="{{ file.get_admin_change_url }}{% filer_admin_context_url_params %}"
@@ -115,7 +125,11 @@
115125
<div>
116126
<strong>
117127
{% if is_popup and filer_admin_context.pick_file %}
118-
<a href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}', '{{ file.get_admin_change_url }}'); return false;"
128+
<a href="#" class="js-dismiss-popup js-dismiss-image"
129+
data-file-id="{{ file.id|unlocalize }}"
130+
data-icon-url="{% file_icon_url file %}"
131+
data-label="{{ file.label }}"
132+
data-change-url="{{ file.get_admin_change_url }}"
119133
title="{% translate 'Select this file' %}">
120134
{% elif has_change_permission %}
121135
<a href="{{ file.get_admin_change_url }}{% filer_admin_context_url_params %}"

‎filer/templates/admin/filer/folder/directory_thumbnail_list.html‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@
4747

4848
<div class="navigator-checkbox">
4949
{% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
50-
<a class="insertlink insertlinkButton"
51-
href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, '{{ subfolder.pk|safe }}', '{{ subfolder.quoted_logical_path }}'); return false;" >
50+
<a class="insertlink insertlinkButton js-dismiss-popup js-dismiss-folder"
51+
href="#"
52+
data-file-id="{{ subfolder.pk|safe }}"
53+
data-label="{{ subfolder.quoted_logical_path }}">
5254
&nbsp;
5355
</a>
5456
{% elif action_form and item.pk and not is_popup %}
@@ -91,7 +93,10 @@
9193
<div class="list-item thumbnail-item thumbnail-file-item">
9294
<div class="navigator-checkbox">
9395
{% if is_popup and filer_admin_context.pick_file %}
94-
<a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
96+
<a class="insertlink insertlinkButton js-dismiss-popup js-dismiss-image" href="#"
97+
data-file-id="{{ file.id|unlocalize }}"
98+
data-icon-url="{% file_icon_url file %}"
99+
data-label="{{ file.label }}"
95100
title="{% translate 'Select this file' %}">&nbsp;</a>
96101
{% elif action_form and not is_popup %}
97102
<input type="checkbox" class="action-select" value="file-{{ item.pk|safe }}" name="_selected_action">
@@ -100,7 +105,10 @@
100105
<div class="thumbnail-file-item-box">
101106
<div class="item-thumbnail">
102107
{% if is_popup and filer_admin_context.pick_file %}
103-
<a href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
108+
<a href="#" class="js-dismiss-popup js-dismiss-image"
109+
data-file-id="{{ file.id|unlocalize }}"
110+
data-icon-url="{% file_icon_url file %}"
111+
data-label="{{ file.label }}"
104112
title="{% translate 'Select this file' %}">
105113
{% elif has_change_permission %}
106114
<a href="{{ file.get_admin_change_url }}{% filer_admin_context_url_params %}"
@@ -115,7 +123,10 @@
115123
<div class="item-name">
116124
<div>
117125
{% if is_popup and filer_admin_context.pick_file %}
118-
<a href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
126+
<a href="#" class="js-dismiss-popup js-dismiss-image"
127+
data-file-id="{{ file.id|unlocalize }}"
128+
data-icon-url="{% file_icon_url file %}"
129+
data-label="{{ file.label }}"
119130
title="{% translate 'Select this file' %}">
120131
{% elif has_change_permission %}
121132
<a href="{{ file.get_admin_change_url }}{% filer_admin_context_url_params %}"

0 commit comments

Comments
 (0)