Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving to BS5 with a bit of 3rd party updating #531

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
37f4324
Updated template to BS5 styles
trollfot Nov 21, 2023
b84faf3
Updated tinyMCE to the latest Free version, 6.3
trollfot Nov 21, 2023
74367e3
Fix tests for select and tinymce widgets
goschtl Nov 21, 2023
4634094
Fix length of assertation
goschtl Nov 21, 2023
5e992db
format default_options
goschtl Nov 21, 2023
e419cc5
Fixed sequence item 'invalid'/error markings. Removed error class fro…
trollfot Nov 22, 2023
ffa0fea
Fixed bug where the errors were NOT showing when using dateparts.
trollfot Nov 22, 2023
903fc4f
Work on the 'required' part. This is still uncomplete
trollfot Nov 22, 2023
1a5d917
Applied required on checkbox, dateparts, radio and select
trollfot Nov 22, 2023
1530110
Added required and error class for time, password, checkedinput
trollfot Nov 22, 2023
5bd7781
Work on autocomplete, checked_input, checked_password and money_input…
trollfot Nov 22, 2023
696a303
Fixed checked_password error_class display
trollfot Nov 22, 2023
7e598ed
Attempt at making checked_password a tighter input with input-group. …
trollfot Nov 22, 2023
77f1f95
Fixed description class in mapping item.
trollfot Nov 29, 2023
6b6af4a
Made checked_input an input-group
trollfot Nov 29, 2023
e9ad957
DummyField has now a 'required' attribute
trollfot Nov 29, 2023
3e9485b
checkbox with dummy in tests is now required
trollfot Nov 29, 2023
63b4922
Added invalid class at the wrapper level in checkbox_choice template …
trollfot Nov 30, 2023
c8ff367
Fixed 'required' and error classes for dateinput and textaread
trollfot Dec 1, 2023
e26e415
deformdemo from the fork.
trollfot Dec 1, 2023
fcb6b5b
Added invalid to time input field
trollfot Dec 8, 2023
fff4fe3
Fixed styles and markup for errors.
trollfot Dec 13, 2023
2ab37ed
Fixed missing languages in tinymce. Fixed fileupload by removing cust…
trollfot Dec 13, 2023
b2f1257
Made date parts a single input group
trollfot Dec 13, 2023
0d55c59
Update version of dependencies
trollfot Dec 15, 2023
4fdc2ea
reverted version. Just made sure colander is 1.0 stable
trollfot Dec 15, 2023
11f051b
fixing tinymce preload
trollfot Feb 12, 2024
9a6439d
Fixed tinymce selector
trollfot Feb 12, 2024
251ed49
Added error styles on tinymce
trollfot Feb 12, 2024
1fadd9d
blacked
trollfot Feb 12, 2024
0210067
Update CHANGES.txt
trollfot Feb 12, 2024
20b100d
Update TODO.txt
trollfot Feb 12, 2024
048e9ba
Update CHANGES.txt
trollfot Feb 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed tinymce selector
  • Loading branch information
trollfot committed Feb 12, 2024
commit 9a6439d08790696849dddad7cd9cb37ede2da743
8 changes: 5 additions & 3 deletions deform/templates/richtext.pt
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@
-->
<script type="text/javascript">
(function($){
deform.addCallback('${oid}', function(oid) {
deform.addCallback('${oid}', function(oid) {
console.log(oid);
var options = {
language: '<tal:block i18n:translate="language-code">en</tal:block>',
body_class: 'form-control',
<tal:block condition="tinymce_options">${tinymce_options},</tal:block>
elements: oid
selector: '#' + oid
};
var jqoid = $('#' + oid);
if ('${delayed_load and not field.error}' == 'True') {
jqoid.one('click', function(){
tinyMCE.init(options);
});
} else {
} else {
console.log('init');
tinyMCE.init(options);
}
});
Expand Down
Loading