Przeglądaj źródła

upgrade bootstrap to 5.3.7

El RIDO 1 rok temu
rodzic
commit
f68650ce5f

+ 1 - 1
CHANGELOG.md

@@ -9,7 +9,7 @@
 * CHANGED: Removed support for `privatebin_data`, `privatebin_db` & `zerobin_db` model class configurations, must be replaced with `Filesystem` or `Database` in `cfg/conf.php`, if still present
 * CHANGED: Removed support for `privatebin_data`, `privatebin_db` & `zerobin_db` model class configurations, must be replaced with `Filesystem` or `Database` in `cfg/conf.php`, if still present
 * CHANGED: Removed unused columns in database schema of tables `paste` & `comment`
 * CHANGED: Removed unused columns in database schema of tables `paste` & `comment`
 * CHANGED: Jdenticons are now used as the default icons
 * CHANGED: Jdenticons are now used as the default icons
-* CHANGED: Upgrading libraries to: jdenticon 2.0.0
+* CHANGED: Upgrading libraries to: bootstrap 5.3.7 & jdenticon 2.0.0
 * CHANGED: Minimum required PHP version is 7.4, due to a change in the jdenticon library
 * CHANGED: Minimum required PHP version is 7.4, due to a change in the jdenticon library
 * CHANGED: Set bootstrap5 template as default for PrivateBin (#1572)
 * CHANGED: Set bootstrap5 template as default for PrivateBin (#1572)
 * FIXED: Name mismatches in attached files (#1584)
 * FIXED: Name mismatches in attached files (#1584)

Plik diff jest za duży
+ 0 - 4
css/bootstrap5/bootstrap-5.3.3.css


Plik diff jest za duży
+ 4 - 0
css/bootstrap5/bootstrap-5.3.7.css


Plik diff jest za duży
+ 0 - 4
css/bootstrap5/bootstrap.rtl-5.3.3.css


Plik diff jest za duży
+ 4 - 0
css/bootstrap5/bootstrap.rtl-5.3.7.css


Plik diff jest za duży
+ 0 - 5
js/bootstrap-5.3.3.js


Plik diff jest za duży
+ 5 - 0
js/bootstrap-5.3.7.js


+ 0 - 1
js/common.js

@@ -18,7 +18,6 @@ global.showdown = require('./showdown-2.1.0');
 global.DOMPurify = require('./purify-3.2.6');
 global.DOMPurify = require('./purify-3.2.6');
 global.baseX = require('./base-x-4.0.0').baseX;
 global.baseX = require('./base-x-4.0.0').baseX;
 global.Legacy = require('./legacy').Legacy;
 global.Legacy = require('./legacy').Legacy;
-require('./bootstrap-3.4.1');
 require('./privatebin');
 require('./privatebin');
 
 
 // internal variables
 // internal variables

+ 3 - 3
js/test/Prompt.js

@@ -10,7 +10,7 @@ describe('Prompt', function () {
             'string',
             'string',
             function (password) {
             function (password) {
                 password = password.replace(/\r+|\n+/g, '');
                 password = password.replace(/\r+|\n+/g, '');
-                var clean = jsdom('', {url: 'ftp://example.com/?0000000000000000'});
+                const clean = jsdom('', {url: 'ftp://example.com/?0000000000000000'});
                 $('body').html(
                 $('body').html(
                     '<div id="passwordmodal" class="modal fade" role="dialog">' +
                     '<div id="passwordmodal" class="modal fade" role="dialog">' +
                     '<div class="modal-dialog"><div class="modal-content">' +
                     '<div class="modal-dialog"><div class="modal-content">' +
@@ -22,13 +22,14 @@ describe('Prompt', function () {
                 );
                 );
                 $.PrivateBin.Model.reset();
                 $.PrivateBin.Model.reset();
                 $.PrivateBin.Model.init();
                 $.PrivateBin.Model.init();
+                global.bootstrap = require('../bootstrap-5.3.7');
                 $.PrivateBin.Prompt.init();
                 $.PrivateBin.Prompt.init();
                 $.PrivateBin.Prompt.requestPassword();
                 $.PrivateBin.Prompt.requestPassword();
                 $('#passworddecrypt').val(password);
                 $('#passworddecrypt').val(password);
                 // TODO triggers error messages in current jsDOM version, find better solution
                 // TODO triggers error messages in current jsDOM version, find better solution
                 //$('#passwordform').submit();
                 //$('#passwordform').submit();
                 //var result = $.PrivateBin.Prompt.getPassword();
                 //var result = $.PrivateBin.Prompt.getPassword();
-                var result = $('#passworddecrypt').val();
+                const result = $('#passworddecrypt').val();
                 $.PrivateBin.Model.reset();
                 $.PrivateBin.Model.reset();
                 // TODO triggers error messages in jsDOM since version 11
                 // TODO triggers error messages in jsDOM since version 11
                 //clean();
                 //clean();
@@ -37,4 +38,3 @@ describe('Prompt', function () {
         );
         );
     });
     });
 });
 });
-

+ 1 - 1
lib/Configuration.php

@@ -110,7 +110,7 @@ class Configuration
         'sri' => array(
         'sri' => array(
             'js/base-x-4.0.0.js'     => 'sha512-nNPg5IGCwwrveZ8cA/yMGr5HiRS5Ps2H+s0J/mKTPjCPWUgFGGw7M5nqdnPD3VsRwCVysUh3Y8OWjeSKGkEQJQ==',
             'js/base-x-4.0.0.js'     => 'sha512-nNPg5IGCwwrveZ8cA/yMGr5HiRS5Ps2H+s0J/mKTPjCPWUgFGGw7M5nqdnPD3VsRwCVysUh3Y8OWjeSKGkEQJQ==',
             'js/bootstrap-3.4.1.js'  => 'sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==',
             'js/bootstrap-3.4.1.js'  => 'sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==',
-            'js/bootstrap-5.3.3.js'  => 'sha512-in2rcOpLTdJ7/pw5qjF4LWHFRtgoBDxXCy49H4YGOcVdGiPaQucGIbOqxt1JvmpvOpq3J/C7VTa0FlioakB2gQ==',
+            'js/bootstrap-5.3.7.js'  => 'sha512-UqmrCkPcp6WOB9cC/NB5GB7vQd2/sB70bLpFk0bqHz/WQIFucjAM0vFNI4xp8B7jJ8KIUWPblNAS/M30AHKSzA==',
             'js/dark-mode-switch.js' => 'sha512-BhY7dNU14aDN5L+muoUmA66x0CkYUWkQT0nxhKBLP/o2d7jE025+dvWJa4OiYffBGEFgmhrD/Sp+QMkxGMTz2g==',
             'js/dark-mode-switch.js' => 'sha512-BhY7dNU14aDN5L+muoUmA66x0CkYUWkQT0nxhKBLP/o2d7jE025+dvWJa4OiYffBGEFgmhrD/Sp+QMkxGMTz2g==',
             'js/jquery-3.7.1.js'     => 'sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==',
             'js/jquery-3.7.1.js'     => 'sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==',
             'js/kjua-0.9.0.js'       => 'sha512-CVn7af+vTMBd9RjoS4QM5fpLFEOtBCoB0zPtaqIDC7sF4F8qgUSRFQQpIyEDGsr6yrjbuOLzdf20tkHHmpaqwQ==',
             'js/kjua-0.9.0.js'       => 'sha512-CVn7af+vTMBd9RjoS4QM5fpLFEOtBCoB0zPtaqIDC7sF4F8qgUSRFQQpIyEDGsr6yrjbuOLzdf20tkHHmpaqwQ==',

+ 2 - 2
tpl/bootstrap5.php

@@ -10,7 +10,7 @@ use PrivateBin\I18n;
 		<meta name="robots" content="noindex" />
 		<meta name="robots" content="noindex" />
 		<meta name="google" content="notranslate">
 		<meta name="google" content="notranslate">
 		<title><?php echo I18n::_($NAME); ?></title>
 		<title><?php echo I18n::_($NAME); ?></title>
-		<link type="text/css" rel="stylesheet" href="css/bootstrap5/bootstrap<?php echo I18n::isRtl() ? '.rtl' : ''; ?>-5.3.3.css" />
+		<link type="text/css" rel="stylesheet" href="css/bootstrap5/bootstrap<?php echo I18n::isRtl() ? '.rtl' : ''; ?>-5.3.7.css" />
 		<link type="text/css" rel="stylesheet" href="css/bootstrap5/privatebin.css?<?php echo rawurlencode($VERSION); ?>" />
 		<link type="text/css" rel="stylesheet" href="css/bootstrap5/privatebin.css?<?php echo rawurlencode($VERSION); ?>" />
 <?php
 <?php
 if ($SYNTAXHIGHLIGHTING) :
 if ($SYNTAXHIGHLIGHTING) :
@@ -35,7 +35,7 @@ endif;
 ?>
 ?>
 		<?php $this->_scriptTag('js/zlib-1.3.1-1.js', 'defer'); ?>
 		<?php $this->_scriptTag('js/zlib-1.3.1-1.js', 'defer'); ?>
 		<?php $this->_scriptTag('js/base-x-4.0.0.js', 'defer'); ?>
 		<?php $this->_scriptTag('js/base-x-4.0.0.js', 'defer'); ?>
-		<?php $this->_scriptTag('js/bootstrap-5.3.3.js', 'async'); ?>
+		<?php $this->_scriptTag('js/bootstrap-5.3.7.js', 'async'); ?>
 		<?php $this->_scriptTag('js/dark-mode-switch.js', 'defer'); ?>
 		<?php $this->_scriptTag('js/dark-mode-switch.js', 'defer'); ?>
 <?php
 <?php
 if ($SYNTAXHIGHLIGHTING) :
 if ($SYNTAXHIGHLIGHTING) :

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików