From df7d103ff66d27cc2cc12edf1904207891ddc7f9 Mon Sep 17 00:00:00 2001 From: jygaulier Date: Tue, 23 Mar 2021 12:38:26 +0100 Subject: [PATCH] PHRAS-3405_safari-classification-bad-rollover_MASTER fix : better cursor feedback with safari, still no highlight of the term while dragging --- Phraseanet-production-client/config/config.js | 2 +- .../dist/authenticate.js | 2 +- .../dist/authenticate.min.js | 2 +- Phraseanet-production-client/dist/commons.js | 2 +- .../dist/commons.min.js | 2 +- .../dist/production.js | 44 +++++--- .../dist/production.min.js | 44 +++++--- .../dist/skin-000000.css | 98 ++++++++++++----- .../dist/skin-000000.min.css | 2 +- .../dist/skin-959595.css | 98 ++++++++++++----- .../dist/skin-959595.min.css | 2 +- .../dist/skin-FFFFFF.css | 98 ++++++++++++----- .../dist/skin-FFFFFF.min.css | 2 +- .../src/components/thesaurus/index.js | 83 +++++++++------ .../ui-components/_workzone-thesaurus.scss | 100 ++++++++++++++---- .../Phrasea/Twig/PhraseanetExtension.php | 2 +- 16 files changed, 415 insertions(+), 168 deletions(-) diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js index bf72c993c8..c0b6c50e54 100644 --- a/Phraseanet-production-client/config/config.js +++ b/Phraseanet-production-client/config/config.js @@ -13,5 +13,5 @@ module.exports = { setupDir: _root + 'tests/setup/node.js', karmaConf: _root + 'config/karma.conf.js', // change this version when you change JS file for lazy loading - jsFileVersion: 10 + jsFileVersion: 11 }; diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js index ba3d35e950..20e85a7103 100644 --- a/Phraseanet-production-client/dist/authenticate.js +++ b/Phraseanet-production-client/dist/authenticate.js @@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=10"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=11"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js index 26a0a9e10c..ba05be7284 100644 --- a/Phraseanet-production-client/dist/authenticate.min.js +++ b/Phraseanet-production-client/dist/authenticate.min.js @@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=10"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=11"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js index 1f20846ce0..e70c1e6632 100644 --- a/Phraseanet-production-client/dist/commons.js +++ b/Phraseanet-production-client/dist/commons.js @@ -91,7 +91,7 @@ /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=10"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=11"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js index 5583141b43..6ed4e9068c 100644 --- a/Phraseanet-production-client/dist/commons.min.js +++ b/Phraseanet-production-client/dist/commons.min.js @@ -91,7 +91,7 @@ /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=10"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=11"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js index e1d7baa974..0728298894 100644 --- a/Phraseanet-production-client/dist/production.js +++ b/Phraseanet-production-client/dist/production.js @@ -11427,7 +11427,7 @@ var thesaurusService = function thesaurusService(services) { } startThesaurus(); - console.log("hello from thesaurus ! container=", $container); + // console.log("hello from thesaurus ! container=", $container); var cclicks = 0; var cDelay = 350; var cTimer = null; @@ -11534,12 +11534,18 @@ var thesaurusService = function thesaurusService(services) { hoverClass: 'groupDrop', tolerance: 'pointer', over: function over(event, ui) { - console.log("over", event, ui, event.toElement); + var target = typeof event.toElement === 'undefined' ? (0, _jquery2.default)(event.originalEvent.target) // ffox + : (0, _jquery2.default)(event.toElement); // chrome - (0, _jquery2.default)('#THPD_T_tree', $container).addClass('draggingOver'); + console.log("over", event, ui, target); + + (0, _jquery2.default)('#THPD_T_tree', $container).addClass('draggingOver').click(function () { + return true; + }); if (dragUniqueSbid !== null && dragUniqueSbid !== false) { (0, _jquery2.default)('#TX_P\\.' + dragUniqueSbid + '\\.T', $container).addClass('draggingOver'); } + // $('').appendTo($container).remove(); /* $(this).addClass('draggingOver'); if(dragTarget) { @@ -11560,9 +11566,14 @@ var thesaurusService = function thesaurusService(services) { */ }, out: function out(event, ui) { - console.log("out", event, ui, event.toElement); + var target = typeof event.toElement === 'undefined' ? (0, _jquery2.default)(event.originalEvent.target) // ffox + : (0, _jquery2.default)(event.toElement); // chrome + + console.log("out", event, ui, target); + (0, _jquery2.default)('#THPD_T_tree', $container).removeClass('draggingOver'); (0, _jquery2.default)('#THPD_T_tree>LI', $container).removeClass('draggingOver'); + // $('').appendTo($container).remove(); /* $(this).removeClass('draggingOver'); if(dragTarget) { @@ -11574,15 +11585,15 @@ var thesaurusService = function thesaurusService(services) { */ }, drop: function drop(event, ui) { - console.log("drop", event, ui); - (0, _jquery2.default)('#THPD_T_tree', $container).removeClass('draggingOver'); - (0, _jquery2.default)('#THPD_T_tree>LI', $container).removeClass('draggingOver'); - // the event relates from the whole tx zone (