kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'calcms/master'

Browse Source 
edit-event.html: hide unused user excerpt
edit-event: register page leave handler later
jquery.min.js: upgrade 3.7.1
This commit is contained in:
www-data
2024-03-04 08:51:56 +01:00
parent 9ca6ccdac1 9e14232bff
commit 45066f704c
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/agenda/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
website/agenda/planung/js/edit-event.js
View File

@@ -287,7 +287,7 @@ function checkFields(){
function copyEventToClipboard(){ function copyEventToClipboard(){
var text = $('textarea[name="excerpt"]').val()+"\n"; var text = $('textarea[name="excerpt"]').val()+"\n";
text += $('textarea[name="user_excerpt"]').val()+"\n"; if ($('textarea[name="user_excerpt"]').val()) text += $('textarea[name="user_excerpt"]').val()+"\n";
text += $('textarea[name="topic"]').val()+"\n\n"; text += $('textarea[name="topic"]').val()+"\n\n";
text += $('textarea[name="content"]').val()+"\n"; text += $('textarea[name="content"]').val()+"\n";
@@ -319,8 +319,6 @@ $(document).ready(
} }
onDateModified(); onDateModified();
pageLeaveHandler();
checkFields(); checkFields();
$('textarea').autosize(); $('textarea').autosize();
@@ -335,11 +333,10 @@ $(document).ready(
} }
) )
jQuery.getJSON("help-texts.cgi?project_id="+getProjectId()+"&studio_id="+getStudioId()+"&action=get", jQuery.getJSON("help-texts.cgi?project_id="+getProjectId()+"&studio_id="+getStudioId()+"&action=get")
function(data){ .done( function(data) {
for (col in data){ for (col in data){
let value = data[col]; let value = data[col];
console.log(col+" "+value)
$(`input[name="${col}"]`).hover(function() { $(`input[name="${col}"]`).hover(function() {
$(this).attr("title",value) $(this).attr("title",value)
}); });
@@ -347,6 +344,10 @@ $(document).ready(
$(this).attr("title",value) $(this).attr("title",value)
}); });
} }
})
.always( function() {
console.log("register page leave handler");
pageLeaveHandler();
}); });
console.log("done") console.log("done")

4
website/agenda/planung/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
website/agenda/planung/templates/edit-event.html
View File

@@ -438,7 +438,12 @@
</tr> </tr>
<tr id="user_excerpt"> <tr id="user_excerpt">
<td class="label"><TMPL_VAR .loc.label_excerpt_extension></td> <td class="label">
<TMPL_IF .allow.update_event_field_excerpt_extension><TMPL_VAR .loc.label_excerpt_extension>
<TMPL_ELSE>
<TMPL_IF user_excerpt><TMPL_VAR .loc.label_excerpt_extension></TMPL_IF>
</TMPL_IF>
</td>
<td> <td>
<div id="excerpt_extension_too_long" class="error" style="display:none"><TMPL_VAR .loc.label_excerpt_extension_too_long></div> <div id="excerpt_extension_too_long" class="error" style="display:none"><TMPL_VAR .loc.label_excerpt_extension_too_long></div>
<TMPL_IF .allow.update_event_field_excerpt_extension> <TMPL_IF .allow.update_event_field_excerpt_extension>