fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e7d5de
)
Fix theme box selection and autocompletion.
author
Radek Czajka
<rczajka@rczajka.pl>
Tue, 7 Sep 2021 07:52:12 +0000
(09:52 +0200)
committer
Radek Czajka
<rczajka@rczajka.pl>
Tue, 7 Sep 2021 07:52:12 +0000
(09:52 +0200)
src/redakcja/static/js/wiki/view_editor_wysiwyg.js
patch
|
blob
|
history
diff --git
a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
index
5492589
..
7b4069c
100644
(file)
--- a/
src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/
src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@
-6,8
+6,8
@@
selection.removeAllRanges();
var range = document.createRange();
selection.removeAllRanges();
var range = document.createRange();
- var s = $("
.motyw
[theme-class='" + themeId + "']")[0];
- var e = $("
.end
[theme-class='" + themeId + "']")[0];
+ var s = $("
[x-node='motyw']
[theme-class='" + themeId + "']")[0];
+ var e = $("
[x-node='end']
[theme-class='" + themeId + "']")[0];
if (s && e) {
range.setStartAfter(s);
if (s && e) {
range.setStartAfter(s);
@@
-465,11
+465,11
@@
$('.akap-edit-button').remove();
}
$('.akap-edit-button').remove();
}
- if ($origin.is('
.motyw
')) {
+ if ($origin.is('
[x-node="motyw"]
')) {
$.themes.autocomplete($('textarea', $overlay));
}
$.themes.autocomplete($('textarea', $overlay));
}
- if ($origin.is('
.motyw
')){
+ if ($origin.is('
[x-node="motyw"]
')){
$('.delete-button', $overlay).click(function(){
if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten motyw?")) {
$('[theme-class="' + $origin.attr('theme-class') + '"]').remove();
$('.delete-button', $overlay).click(function(){
if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten motyw?")) {
$('[theme-class="' + $origin.attr('theme-class') + '"]').remove();
@@
-525,7
+525,7
@@
var nodeName = $box.attr('x-node') || 'pe';
var insertedText = $('textarea', $overlay).val();
var nodeName = $box.attr('x-node') || 'pe';
var insertedText = $('textarea', $overlay).val();
- if ($origin.is('
.motyw
')) {
+ if ($origin.is('
[x-node="motyw"]
')) {
insertedText = insertedText.replace(/,\s*$/, '');
}
insertedText = insertedText.replace(/,\s*$/, '');
}
@@
-687,7
+687,7
@@
}
}
- $(document).on('click', '
.motyw
', function(){
+ $(document).on('click', '
[x-node="motyw"]
', function(){
selectTheme($(this).attr('theme-class'));
});
selectTheme($(this).attr('theme-class'));
});