mirror of
https://github.com/gtbu/Typesetter-5.3-p8.git
synced 2025-03-12 02:53:14 +01:00
ony jqery 3.6.3 and Ajax -deprecation
removed jquery 3.7 - now only 3.6.3 (overlooked) -- added missing popper-map -- deprecation of Ajax which is now also safer
This commit is contained in:
parent
81c478c820
commit
56e40ee8ae
6 changed files with 1140 additions and 844 deletions
1
include/thirdparty/Popper.js/popper.min.js.map
vendored
Normal file
1
include/thirdparty/Popper.js/popper.min.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
1925
include/thirdparty/js/jquery.js
vendored
1925
include/thirdparty/js/jquery.js
vendored
File diff suppressed because it is too large
Load diff
4
include/thirdparty/js/jquery.min.js
vendored
4
include/thirdparty/js/jquery.min.js
vendored
File diff suppressed because one or more lines are too long
2
include/thirdparty/js/jquery.min.map
vendored
2
include/thirdparty/js/jquery.min.map
vendored
File diff suppressed because one or more lines are too long
|
@ -292,35 +292,40 @@ namespace gp\tool\Output{
|
|||
* Remove scripts that have already been sent to the server
|
||||
*
|
||||
*/
|
||||
public static function RemoveSent($scripts){
|
||||
public static function RemoveSent(array $scripts): array
|
||||
{
|
||||
$definedObjects = [];
|
||||
|
||||
$cleansed = array();
|
||||
$defined_objects = explode(',',$_REQUEST['defined_objects']);
|
||||
if (isset($_GET['defined_objects']) && is_string($_GET['defined_objects'])) {
|
||||
$definedObjects = explode(',', $_GET['defined_objects']);
|
||||
$definedObjects = array_map('trim', $definedObjects); // Trim whitespace
|
||||
|
||||
foreach($scripts as $script){
|
||||
} else {
|
||||
// Log or handle missing 'defined_objects' here
|
||||
error_log("Warning: 'defined_objects' not found in \$_GET. Continuing with empty array."); //Example log
|
||||
throw new InvalidArgumentException("'defined_objects' parameter is required.");
|
||||
}
|
||||
|
||||
$cleansed = [];
|
||||
foreach ($scripts as $script) {
|
||||
$object = false;
|
||||
|
||||
$object = false;
|
||||
if (is_array($script) && !empty($script['object'])) {
|
||||
$object = $script['object'];
|
||||
} elseif (is_string($script) && isset(self::$script_objects[$script])) {
|
||||
$object = self::$script_objects[$script];
|
||||
}
|
||||
|
||||
if( is_array($script) && !empty($script['object']) ){
|
||||
$object = $script['object'];
|
||||
if ($object !== false && in_array($object, $definedObjects, true)) {
|
||||
error_log("Object $object already defined");
|
||||
continue;
|
||||
}
|
||||
|
||||
}elseif( is_string($script) && isset(self::$script_objects[$script]) ){
|
||||
$object = self::$script_objects[$script];
|
||||
|
||||
}
|
||||
|
||||
if( $object !== false && in_array($object, $defined_objects) ){
|
||||
echo "\n\n/** Object Already Defined: ".$object." **/\n\n";
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$cleansed[] = $script;
|
||||
}
|
||||
|
||||
return $cleansed;
|
||||
}
|
||||
$cleansed[] = $script;
|
||||
}
|
||||
|
||||
return $cleansed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get scripts for editing inline text using ckeditor
|
||||
|
|
|
@ -706,6 +706,7 @@ class Session{
|
|||
'Sections' => 'Sections',
|
||||
'Section Attributes' => 'SectionAttributes',
|
||||
'Available Classes' => 'AvailableClasses',
|
||||
'category' => 'Category',
|
||||
'Attribute' => 'Attribute',
|
||||
'Add Attribute' => 'AddAttribute',
|
||||
'Value' => 'Value',
|
||||
|
|
Loading…
Reference in a new issue