Merge pull request #3758 from alchemy-fr/PHRAS-3405_safari-classification-bad-rollover_MASTER

PHRAS-3405_safari-classification-bad-rollover_MASTER

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
 };

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() {

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() {

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() {

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() {

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');
                 }
+                //                    $('<style></style>').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');
+                //                    $('<style></style>').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 (<ul>), we must find the exact element of the mouseup
                 // too bad, jquery does not seem to handle that in a cross-browser way.
                 var target = typeof event.toElement === 'undefined' ? (0, _jquery2.default)(event.originalEvent.target) // ffox
                 : (0, _jquery2.default)(event.toElement); // chrome
 
+                console.log("drop", event, ui, target);
+                (0, _jquery2.default)('#THPD_T_tree', $container).removeClass('draggingOver');
+                (0, _jquery2.default)('#THPD_T_tree>LI', $container).removeClass('draggingOver');
+
                 var sbas_id = target.data('sbas_id'); // set on html by ThesaurusXmlHttpController.php
                 var tx_term_id = target.data('tx_term_id'); // set on html by ThesaurusXmlHttpController.php
 
@@ -11606,7 +11617,10 @@ var thesaurusService = function thesaurusService(services) {
                 dragTarget = null;
                   */
             }
-        });
+        })
+        //    .click(function() {return true;})
+        ;
+
         /*
                     // track the mouse
                     .mousemove( (event) => {
@@ -11616,25 +11630,21 @@ var thesaurusService = function thesaurusService(services) {
                             const tx_term_id = target.data('tx_term_id');   // set on html by ThesaurusXmlHttpController.php
                             const oldTarget = dragTarget;
                             dragTarget = (sbas_id && tx_term_id) ? target : null;
-        
+                             // const oldTargetId  = oldTarget ? oldTarget.attr('id') : null;
-                            // const oldTargetId  = oldTarget ? oldTarget.attr('id') : null;
                             // const dragTargetId = dragTarget ? dragTarget.attr('id') : null;
                             // console.log("oldTargetId="+oldTargetId+" ; dragTargetId="+dragTargetId);
-        
+                             if(oldTarget && !oldTarget.is(dragTarget)) {
-                            if(oldTarget && !oldTarget.is(dragTarget)) {
                                 // the mouse has quit a overed term (oldTargetId)
                                 oldTarget.removeClass('dragOver');
                                 console.log("OUT : " + oldTarget.attr('id'));
                             }
-        
+                             if(dragTarget && !dragTarget.is(oldTarget)) {
-                            if(dragTarget && !dragTarget.is(oldTarget)) {
                                 // the mouse just overs a new term
                                 dragTarget.addClass('dragOver');
                                 console.log("IN : " + dragTarget.attr('id'));
                             }
                         }
-        
+                     });
-                    });
         */
 
         searchValue = _underscore2.default.debounce(searchValue, 300);

Phraseanet-production-client/dist/production.min.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');
                 }
+                //                    $('<style></style>').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');
+                //                    $('<style></style>').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 (<ul>), we must find the exact element of the mouseup
                 // too bad, jquery does not seem to handle that in a cross-browser way.
                 var target = typeof event.toElement === 'undefined' ? (0, _jquery2.default)(event.originalEvent.target) // ffox
                 : (0, _jquery2.default)(event.toElement); // chrome
 
+                console.log("drop", event, ui, target);
+                (0, _jquery2.default)('#THPD_T_tree', $container).removeClass('draggingOver');
+                (0, _jquery2.default)('#THPD_T_tree>LI', $container).removeClass('draggingOver');
+
                 var sbas_id = target.data('sbas_id'); // set on html by ThesaurusXmlHttpController.php
                 var tx_term_id = target.data('tx_term_id'); // set on html by ThesaurusXmlHttpController.php
 
@@ -11606,7 +11617,10 @@ var thesaurusService = function thesaurusService(services) {
                 dragTarget = null;
                   */
             }
-        });
+        })
+        //    .click(function() {return true;})
+        ;
+
         /*
                     // track the mouse
                     .mousemove( (event) => {
@@ -11616,25 +11630,21 @@ var thesaurusService = function thesaurusService(services) {
                             const tx_term_id = target.data('tx_term_id');   // set on html by ThesaurusXmlHttpController.php
                             const oldTarget = dragTarget;
                             dragTarget = (sbas_id && tx_term_id) ? target : null;
-        
+                             // const oldTargetId  = oldTarget ? oldTarget.attr('id') : null;
-                            // const oldTargetId  = oldTarget ? oldTarget.attr('id') : null;
                             // const dragTargetId = dragTarget ? dragTarget.attr('id') : null;
                             // console.log("oldTargetId="+oldTargetId+" ; dragTargetId="+dragTargetId);
-        
+                             if(oldTarget && !oldTarget.is(dragTarget)) {
-                            if(oldTarget && !oldTarget.is(dragTarget)) {
                                 // the mouse has quit a overed term (oldTargetId)
                                 oldTarget.removeClass('dragOver');
                                 console.log("OUT : " + oldTarget.attr('id'));
                             }
-        
+                             if(dragTarget && !dragTarget.is(oldTarget)) {
-                            if(dragTarget && !dragTarget.is(oldTarget)) {
                                 // the mouse just overs a new term
                                 dragTarget.addClass('dragOver');
                                 console.log("IN : " + dragTarget.attr('id'));
                             }
                         }
-        
+                     });
-                    });
         */
 
         searchValue = _underscore2.default.debounce(searchValue, 300);

Phraseanet-production-client/dist/skin-000000.css

@@ -7422,6 +7422,25 @@ dans l'onglet thesaurus : arbres, menus contextuels
   text-decoration: underline;
 }
 
+#THPD_tabs .treeview {
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  /*
+        i {
+            // count of hits
+            color: #80ff80;
+            background-color: #606060;
+            font-style: normal;
+            margin-left: 10px;
+            padding-left: 3px;
+            padding-right: 3px;
+            font-family: courier;
+        }
+        */
+}
+
 #THPD_tabs .treeview ul {
   background-color: #292929;
   margin-left: -16px;
@@ -7436,10 +7455,16 @@ dans l'onglet thesaurus : arbres, menus contextuels
 #THPD_tabs .treeview span.tx_term {
   cursor: pointer;
   color: #a1a1a1;
+  /*
+            &.dragOver {
+                // highlited as a target for dropping
+                background-color: $highlightBackgroundColor;
+                color: $highlightTextColor;
+            }
+            */
 }
 
 #THPD_tabs .treeview span.tx_term.h {
-  /* highlighted (filtered as matching the filter input) */
   color: #884c92;
   font-weight: bold;
 }
@@ -7448,44 +7473,69 @@ dans l'onglet thesaurus : arbres, menus contextuels
   color: #ffffff;
 }
 
-#THPD_tabs .treeview span.tx_term.dragOver {
+#THPD_T_tree span.tx_term {
-  /* highlited as a target for dropping */
+  /*
-  background-color: #076882;
+        cursor: pointer;
-  color: #ffffff;
+        color: $mediumTextColor;
-}
+        &.h {
-
+            // highlighted (filtered as matching the filter input)
-#THPD_tabs .treeview i {
+            color: $thesaurusColor;
-  /* count of hits */
+            font-weight: bold;
-  color: #80ff80;
+        }
-  background-color: #606060;
+        &:hover {
-  font-style: normal;
+            color: $highlightTextColor;
-  margin-left: 10px;
+        }
-  padding-left: 3px;
+        */
-  padding-right: 3px;
+  /*
-  font-family: courier;
+        &.dragOver {
+            // highlited as a target for dropping
+            background-color: $highlightBackgroundColor;
+            color: $highlightTextColor;
+        }
+        */
 }
 
 #THPD_T_tree.draggingOver {
-  /* something is currently dragged over, we change some hover */
-}
-
-#THPD_T_tree.draggingOver:hover {
   cursor: not-allowed;
+  /*
+        &:hover {
+            // background-color: #8F0000; // debug purpose
+            cursor: not-allowed;
+        }
+        */
+  /*  debug purpose
+        span.tx_term:hover {
+            color: #ff00ff;
+        }
+        */
 }
 
-#THPD_T_tree.draggingOver span.tx_term:hover {
+#THPD_T_tree.draggingOver span.tx_term {
   color: #a1a1a1;
   cursor: not-allowed;
+  /*   debug purpose
+            &:hover {
+                color: #f9a732;
+            }
+            */
 }
 
-#THPD_T_tree.draggingOver LI.draggingOver:hover {
+#THPD_T_tree.draggingOver LI.draggingOver {
   cursor: default;
+  /*
+            &:hover {
+                // background-color: #008F00; // debug purpose
+                cursor: default;
+            }
+            */
+}
+
+#THPD_T_tree.draggingOver LI.draggingOver span.tx_term {
+  cursor: copy;
 }
 
 #THPD_T_tree.draggingOver LI.draggingOver span.tx_term:hover {
-  background-color: #076882;
   color: #ffffff;
-  cursor: copy;
 }
 
 #idFrameC .ui-tabs #THPD_C.ui-tabs-panel,

Phraseanet-production-client/dist/skin-959595.css

@@ -7437,6 +7437,25 @@ dans l'onglet thesaurus : arbres, menus contextuels
   text-decoration: underline;
 }
 
+#THPD_tabs .treeview {
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  /*
+        i {
+            // count of hits
+            color: #80ff80;
+            background-color: #606060;
+            font-style: normal;
+            margin-left: 10px;
+            padding-left: 3px;
+            padding-right: 3px;
+            font-family: courier;
+        }
+        */
+}
+
 #THPD_tabs .treeview ul {
   background-color: #9c9c9c;
   margin-left: -16px;
@@ -7451,56 +7470,87 @@ dans l'onglet thesaurus : arbres, menus contextuels
 #THPD_tabs .treeview span.tx_term {
   cursor: pointer;
   color: #333333;
+  /*
+            &.dragOver {
+                // highlited as a target for dropping
+                background-color: $highlightBackgroundColor;
+                color: $highlightTextColor;
+            }
+            */
 }
 
 #THPD_tabs .treeview span.tx_term.h {
-  /* highlighted (filtered as matching the filter input) */
   color: #884c92;
   font-weight: bold;
 }
 
 #THPD_tabs .treeview span.tx_term:hover {
-  color: #333333;
-}
-
-#THPD_tabs .treeview span.tx_term.dragOver {
-  /* highlited as a target for dropping */
-  background-color: #076882;
   color: #ffffff;
 }
 
-#THPD_tabs .treeview i {
+#THPD_T_tree span.tx_term {
-  /* count of hits */
+  /*
-  color: #80ff80;
+        cursor: pointer;
-  background-color: #606060;
+        color: $mediumTextColor;
-  font-style: normal;
+        &.h {
-  margin-left: 10px;
+            // highlighted (filtered as matching the filter input)
-  padding-left: 3px;
+            color: $thesaurusColor;
-  padding-right: 3px;
+            font-weight: bold;
-  font-family: courier;
+        }
+        &:hover {
+            color: $highlightTextColor;
+        }
+        */
+  /*
+        &.dragOver {
+            // highlited as a target for dropping
+            background-color: $highlightBackgroundColor;
+            color: $highlightTextColor;
+        }
+        */
 }
 
 #THPD_T_tree.draggingOver {
-  /* something is currently dragged over, we change some hover */
-}
-
-#THPD_T_tree.draggingOver:hover {
   cursor: not-allowed;
+  /*
+        &:hover {
+            // background-color: #8F0000; // debug purpose
+            cursor: not-allowed;
+        }
+        */
+  /*  debug purpose
+        span.tx_term:hover {
+            color: #ff00ff;
+        }
+        */
 }
 
-#THPD_T_tree.draggingOver span.tx_term:hover {
+#THPD_T_tree.draggingOver span.tx_term {
   color: #333333;
   cursor: not-allowed;
+  /*   debug purpose
+            &:hover {
+                color: #f9a732;
+            }
+            */
 }
 
-#THPD_T_tree.draggingOver LI.draggingOver:hover {
+#THPD_T_tree.draggingOver LI.draggingOver {
   cursor: default;
+  /*
+            &:hover {
+                // background-color: #008F00; // debug purpose
+                cursor: default;
+            }
+            */
+}
+
+#THPD_T_tree.draggingOver LI.draggingOver span.tx_term {
+  cursor: copy;
 }
 
 #THPD_T_tree.draggingOver LI.draggingOver span.tx_term:hover {
-  background-color: #076882;
   color: #ffffff;
-  cursor: copy;
 }
 
 #idFrameC .ui-tabs #THPD_C.ui-tabs-panel,

Phraseanet-production-client/dist/skin-FFFFFF.css

@@ -7439,6 +7439,25 @@ dans l'onglet thesaurus : arbres, menus contextuels
   text-decoration: underline;
 }
 
+#THPD_tabs .treeview {
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  /*
+        i {
+            // count of hits
+            color: #80ff80;
+            background-color: #606060;
+            font-style: normal;
+            margin-left: 10px;
+            padding-left: 3px;
+            padding-right: 3px;
+            font-family: courier;
+        }
+        */
+}
+
 #THPD_tabs .treeview ul {
   background-color: #bfbfbf;
   margin-left: -16px;
@@ -7453,56 +7472,87 @@ dans l'onglet thesaurus : arbres, menus contextuels
 #THPD_tabs .treeview span.tx_term {
   cursor: pointer;
   color: #333333;
+  /*
+            &.dragOver {
+                // highlited as a target for dropping
+                background-color: $highlightBackgroundColor;
+                color: $highlightTextColor;
+            }
+            */
 }
 
 #THPD_tabs .treeview span.tx_term.h {
-  /* highlighted (filtered as matching the filter input) */
   color: #884c92;
   font-weight: bold;
 }
 
 #THPD_tabs .treeview span.tx_term:hover {
-  color: #333333;
-}
-
-#THPD_tabs .treeview span.tx_term.dragOver {
-  /* highlited as a target for dropping */
-  background-color: #076882;
   color: #fff;
 }
 
-#THPD_tabs .treeview i {
+#THPD_T_tree span.tx_term {
-  /* count of hits */
+  /*
-  color: #80ff80;
+        cursor: pointer;
-  background-color: #606060;
+        color: $mediumTextColor;
-  font-style: normal;
+        &.h {
-  margin-left: 10px;
+            // highlighted (filtered as matching the filter input)
-  padding-left: 3px;
+            color: $thesaurusColor;
-  padding-right: 3px;
+            font-weight: bold;
-  font-family: courier;
+        }
+        &:hover {
+            color: $highlightTextColor;
+        }
+        */
+  /*
+        &.dragOver {
+            // highlited as a target for dropping
+            background-color: $highlightBackgroundColor;
+            color: $highlightTextColor;
+        }
+        */
 }
 
 #THPD_T_tree.draggingOver {
-  /* something is currently dragged over, we change some hover */
-}
-
-#THPD_T_tree.draggingOver:hover {
   cursor: not-allowed;
+  /*
+        &:hover {
+            // background-color: #8F0000; // debug purpose
+            cursor: not-allowed;
+        }
+        */
+  /*  debug purpose
+        span.tx_term:hover {
+            color: #ff00ff;
+        }
+        */
 }
 
-#THPD_T_tree.draggingOver span.tx_term:hover {
+#THPD_T_tree.draggingOver span.tx_term {
   color: #333333;
   cursor: not-allowed;
+  /*   debug purpose
+            &:hover {
+                color: #f9a732;
+            }
+            */
 }
 
-#THPD_T_tree.draggingOver LI.draggingOver:hover {
+#THPD_T_tree.draggingOver LI.draggingOver {
   cursor: default;
+  /*
+            &:hover {
+                // background-color: #008F00; // debug purpose
+                cursor: default;
+            }
+            */
+}
+
+#THPD_T_tree.draggingOver LI.draggingOver span.tx_term {
+  cursor: copy;
 }
 
 #THPD_T_tree.draggingOver LI.draggingOver span.tx_term:hover {
-  background-color: #076882;
   color: #fff;
-  cursor: copy;
 }
 
 #idFrameC .ui-tabs #THPD_C.ui-tabs-panel,

Phraseanet-production-client/src/components/thesaurus/index.js

@@ -40,7 +40,7 @@ const thesaurusService = services => {
         }
 
         startThesaurus();
-        console.log("hello from thesaurus ! container=", $container);
+        // console.log("hello from thesaurus ! container=", $container);
         let cclicks = 0;
         const cDelay = 350;
         let cTimer = null;
@@ -155,12 +155,18 @@ const thesaurusService = services => {
                 hoverClass: 'groupDrop',
                 tolerance: 'pointer',
                 over: function(event, ui) {
-                    console.log("over", event, ui, event.toElement);
+                    const target = typeof(event.toElement) === 'undefined' ?
+                        $(event.originalEvent.target)   // ffox
+                        :
+                        $(event.toElement);             // chrome
 
-                    $('#THPD_T_tree', $container).addClass('draggingOver');
+                    // console.log("over", event, ui, target);
+
+                    $('#THPD_T_tree', $container).addClass('draggingOver').click(function() {return true;});
                     if(dragUniqueSbid !== null && dragUniqueSbid !== false) {
                         $('#TX_P\\.'+dragUniqueSbid+'\\.T', $container).addClass('draggingOver');
                     }
+//                    $('<style></style>').appendTo($container).remove();
                     /*
                     $(this).addClass('draggingOver');
 
@@ -182,9 +188,16 @@ const thesaurusService = services => {
                     */
                 },
                 out: function(event, ui) {
-                    console.log("out", event, ui, event.toElement);
+                    const target = typeof(event.toElement) === 'undefined' ?
+                        $(event.originalEvent.target)   // ffox
+                        :
+                        $(event.toElement);             // chrome
+
+                    // console.log("out", event, ui, target);
+
                     $('#THPD_T_tree', $container).removeClass('draggingOver');
                     $('#THPD_T_tree>LI', $container).removeClass('draggingOver');
+//                    $('<style></style>').appendTo($container).remove();
                     /*
                     $(this).removeClass('draggingOver');
                     if(dragTarget) {
@@ -197,10 +210,6 @@ const thesaurusService = services => {
                      */
                 },
                 drop: (event, ui) => {
-                    console.log("drop", event, ui);
-                    $('#THPD_T_tree', $container).removeClass('draggingOver');
-                    $('#THPD_T_tree>LI', $container).removeClass('draggingOver');
-
                     // the event relates from the whole tx zone (<ul>), we must find the exact element of the mouseup
                     // too bad, jquery does not seem to handle that in a cross-browser way.
                     const target = typeof(event.toElement) === 'undefined' ?
@@ -208,6 +217,11 @@ const thesaurusService = services => {
                         :
                         $(event.toElement);             // chrome
 
+                    // console.log("drop", event, ui, target);
+
+                    $('#THPD_T_tree', $container).removeClass('draggingOver');
+                    $('#THPD_T_tree>LI', $container).removeClass('draggingOver');
+
                     let sbas_id = target.data('sbas_id');         // set on html by ThesaurusXmlHttpController.php
                     let tx_term_id = target.data('tx_term_id');   // set on html by ThesaurusXmlHttpController.php
 
@@ -233,35 +247,38 @@ const thesaurusService = services => {
                          */
                 }
             })
-/*
+        //    .click(function() {return true;})
-            // track the mouse
+        ;
-            .mousemove( (event) => {
-                if(dragging) {
-                    const target = $(event.toElement);
-                    const sbas_id = target.data('sbas_id');         // set on html by ThesaurusXmlHttpController.php
-                    const tx_term_id = target.data('tx_term_id');   // set on html by ThesaurusXmlHttpController.php
-                    const oldTarget = dragTarget;
-                    dragTarget = (sbas_id && tx_term_id) ? target : null;
 
-                    // const oldTargetId  = oldTarget ? oldTarget.attr('id') : null;
+        /*
-                    // const dragTargetId = dragTarget ? dragTarget.attr('id') : null;
+                    // track the mouse
-                    // console.log("oldTargetId="+oldTargetId+" ; dragTargetId="+dragTargetId);
+                    .mousemove( (event) => {
+                        if(dragging) {
+                            const target = $(event.toElement);
+                            const sbas_id = target.data('sbas_id');         // set on html by ThesaurusXmlHttpController.php
+                            const tx_term_id = target.data('tx_term_id');   // set on html by ThesaurusXmlHttpController.php
+                            const oldTarget = dragTarget;
+                            dragTarget = (sbas_id && tx_term_id) ? target : null;
 
-                    if(oldTarget && !oldTarget.is(dragTarget)) {
+                            // const oldTargetId  = oldTarget ? oldTarget.attr('id') : null;
-                        // the mouse has quit a overed term (oldTargetId)
+                            // const dragTargetId = dragTarget ? dragTarget.attr('id') : null;
-                        oldTarget.removeClass('dragOver');
+                            // console.log("oldTargetId="+oldTargetId+" ; dragTargetId="+dragTargetId);
-                        console.log("OUT : " + oldTarget.attr('id'));
-                    }
 
-                    if(dragTarget && !dragTarget.is(oldTarget)) {
+                            if(oldTarget && !oldTarget.is(dragTarget)) {
-                        // the mouse just overs a new term
+                                // the mouse has quit a overed term (oldTargetId)
-                        dragTarget.addClass('dragOver');
+                                oldTarget.removeClass('dragOver');
-                        console.log("IN : " + dragTarget.attr('id'));
+                                console.log("OUT : " + oldTarget.attr('id'));
-                    }
+                            }
-                }
 
-            });
+                            if(dragTarget && !dragTarget.is(oldTarget)) {
-*/
+                                // the mouse just overs a new term
+                                dragTarget.addClass('dragOver');
+                                console.log("IN : " + dragTarget.attr('id'));
+                            }
+                        }
+
+                    });
+        */
 
         searchValue = _.debounce(searchValue, 300);
     };

Phraseanet-production-client/src/skins/style/ui-components/_workzone-thesaurus.scss

@@ -130,6 +130,10 @@ dans l'onglet thesaurus : arbres, menus contextuels
         }
     }
     .treeview {
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
         ul {
             background-color: $darkBackgroundColor;
             margin-left: -16px;
@@ -143,21 +147,24 @@ dans l'onglet thesaurus : arbres, menus contextuels
             cursor: pointer;
             color: $mediumTextColor;
             &.h {
-                /* highlighted (filtered as matching the filter input) */
+                // highlighted (filtered as matching the filter input)
                 color: $thesaurusColor;
                 font-weight: bold;
             }
             &:hover {
-                color: $textPrimaryColor;
+                color: $highlightTextColor;
             }
+            /*
             &.dragOver {
-                /* highlited as a target for dropping */
+                // highlited as a target for dropping
                 background-color: $highlightBackgroundColor;
                 color: $highlightTextColor;
             }
+            */
         }
+        /*
         i {
-            /* count of hits */
+            // count of hits
             color: #80ff80;
             background-color: #606060;
             font-style: normal;
@@ -166,6 +173,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
             padding-right: 3px;
             font-family: courier;
         }
+        */
     }
 /*
     .treeview LI.selected SPAN {
@@ -188,25 +196,77 @@ dans l'onglet thesaurus : arbres, menus contextuels
  */
 }
 
-#THPD_T_tree.draggingOver {
+#THPD_T_tree {
-    //background-color: #FF0000;
+    span.tx_term {
-    /* something is currently dragged over, we change some hover */
+        /*
-    &:hover {
+        cursor: pointer;
-        cursor: not-allowed;
+        color: $mediumTextColor;
-    }
+        &.h {
-    span.tx_term:hover {
+            // highlighted (filtered as matching the filter input)
-        color: $mediumTextColor;    // no more highlight
+            color: $thesaurusColor;
-        cursor: not-allowed;
+            font-weight: bold;
-    }
-    LI.draggingOver {
-        //background-color: #00FF00;
-        &:hover {
-            cursor: default;
         }
-        span.tx_term:hover {
+        &:hover {
+            color: $highlightTextColor;
+        }
+        */
+        /*
+        &.dragOver {
+            // highlited as a target for dropping
             background-color: $highlightBackgroundColor;
             color: $highlightTextColor;
-            cursor: copy;
+        }
+        */
+    }
+    &.draggingOver {
+        // something is currently dragged over, we change some hover
+
+        // background-color: #000; // debug purpose
+
+        cursor: not-allowed;
+        /*
+        &:hover {
+            // background-color: #8F0000; // debug purpose
+            cursor: not-allowed;
+        }
+        */
+        /*  debug purpose
+        span.tx_term:hover {
+            color: #ff00ff;
+        }
+        */
+
+        span.tx_term {
+            // color: #7a43b6;          // debug purpose
+            color: $mediumTextColor;    // no more highlight
+            cursor: not-allowed;
+            /*   debug purpose
+            &:hover {
+                color: #f9a732;
+            }
+            */
+        }
+
+        LI.draggingOver {
+
+            // background-color: #00FF00; // debug purpose
+
+            cursor: default;
+            /*
+            &:hover {
+                // background-color: #008F00; // debug purpose
+                cursor: default;
+            }
+            */
+            span.tx_term {
+                cursor: copy;
+
+                &:hover {   // NOT WORKING IN SAFARI / WEBKIT : the :hover seems not applied when dragging (click down)
+                    // background-color: $highlightBackgroundColor;
+                    color: $highlightTextColor;
+                    // color: #fceb3f;          // debug purpose
+                }
+            }
         }
     }
 }

lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php

@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
     {
         return [
             // change this version when you change JS file to force the navigation to reload js file
-            'jsFileVersion' => 10
+            'jsFileVersion' => 11
         ];
 
     }