dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to jQuery 3.6.1 (#6491) 

This commit updates FusionPBX to use jQuery 3.6.1 and also adds a fallback to the other variable name for offhook autodial on the HT802.
This commit is contained in:
Dan 2022-11-07 07:58:38 -08:00 committed by GitHub
parent b241b921fa
commit 4a1913b447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/contacts/contact_timer.php
View File

@ -300,7 +300,7 @@
</style>
<script language='JavaScript' type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-3.4.1.min.js'></script>
<script language='JavaScript' type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-3.6.1.min.js'></script>
<script src='https://code.jquery.com/jquery-migrate-3.1.0.js'></script>
<script type="text/javascript">
$(document).ready(function(){
@ -362,4 +362,4 @@
</form>
<?php if ($timer_state == 'stopped') { ?><script>$('#timer_description').trigger('focus');</script><?php } ?>
</body>
</html>
</html>

2
resources/jquery/jquery-3.4.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/jquery/jquery-3.6.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
resources/jquery/jquery.min.js.php
View File

@ -5,6 +5,6 @@ header('Content-type: text/javascript; charset: UTF-8');
header('Cache-Control: must-revalidate');
header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
include_once 'jquery-3.4.1.min.js';
include_once 'jquery-3.6.1.min.js';
?>
?>

2
resources/templates/provision/grandstream/ht802/{$mac}.xml
View File

@ -882,7 +882,7 @@
<!-- # Offhook Auto-Dial (User ID/extension to dial automatically when offhook) -->
<!-- # String: 0-9, #, * -->
<!-- # Mandatory -->
<P71>{$grandstream_auto_dial_number}</P71>
{if isset($grandstream_offhook_auto_dial_1)}<P71>{$grandstream_offhook_auto_dial_1}</P71>{else}<P71>{$grandstream_auto_dial_number}</P71>{/if}
<!-- # Offhook Auto-Dial Delay (0-60 seconds, default is 0) -->
<!-- # Number: 0 to 60 -->