gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-27 10:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2025-09-30 08:05:04 +02:00
commit 8a78f8ab66
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer-dist.json
View File

@ -28,6 +28,7 @@
"zf1/zend-search-lucene": "*",
"symfony/http-foundation": "^5.4",
"php-di/php-di": "^6.4",
"hfig/mapi": "*",
"slim/psr7": "^1.7",
"bacon/bacon-qr-code": "^3.0",
"seeddms/core": "dev-__CORE_BRANCH__",

1
composer.json
View File

@ -44,6 +44,7 @@
"zf1/zend-search-lucene": "*",
"symfony/http-foundation": "^5.4",
"php-di/php-di": "^6.4",
"hfig/mapi": "*",
"slim/psr7": "^1.7",
"bacon/bacon-qr-code": "^3.0",
"seeddms/core": "dev-seeddms-6.0.x",

3
views/bootstrap/styles/application.js
View File

@ -1147,9 +1147,11 @@ $(document).ready(function() { /* {{{ */
e.stopPropagation();
e.preventDefault();
$(this).css('border', '2px dashed #0B85A1');
$(this).css('background-color', '#80808080');
});
$(document).on('dragleave', "#draganddrophandler", function (e) {
$(this).css('border', '0px solid white');
$(this).css('background-color', '');
});
$(document).on('dragover', "#draganddrophandler", function (e) {
e.stopPropagation();
@ -1157,6 +1159,7 @@ $(document).ready(function() { /* {{{ */
});
$(document).on('drop', "#draganddrophandler", function (e) {
$(this).css('border', '0px dotted #0B85A1');
$(this).css('background-color', '');
e.preventDefault();
attr_rel = $(this).data('droptarget');

3
views/bootstrap4/styles/application.js
View File

@ -1195,9 +1195,11 @@ $(document).ready(function() { /* {{{ */
e.stopPropagation();
e.preventDefault();
$(this).css('border', '2px dashed #0B85A1');
$(this).css('background-color', '#80808080');
});
$(document).on('dragleave', "#draganddrophandler", function (e) {
$(this).css('border', '0px solid white');
$(this).css('background-color', '');
});
$(document).on('dragover', "#draganddrophandler", function (e) {
e.stopPropagation();
@ -1205,6 +1207,7 @@ $(document).ready(function() { /* {{{ */
});
$(document).on('drop', "#draganddrophandler", function (e) {
$(this).css('border', '0px dotted #0B85A1');
$(this).css('background-color', '');
e.preventDefault();
attr_rel = $(this).data('droptarget');