Commit 0e5c4460 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite uso de elementos dentro de tooltip 

Se introducen 2 excepciones para el cierre automático de tooltips, si el
elemento pulsado pertenece a otro tooltip (asumiendo que su creación
parte del principal) y es un desplegable de sugerencias de búsqueda
(como el de un filteringSelect que esté anidado). Con estos cambios,
vuelve a ser usable la búsqueda avanzada desde tooltip.

Actualiza submódulos.
parent 3d9faa3f

public/javascript/redmic/modules/base/_ManageClickEvent.js

+16 −0
Original line number Diff line number Diff line
@@ -44,6 +44,22 @@ define([ 
			var targets = this._getClickTargets(event);



			return targets.indexOf(node) !== -1;

		},



		_checkClickBelongsToNodeWithClass: function(event, className) {



			var targets = this._getClickTargets(event);



			for (var target of targets) {

				if (!target) {

					continue;

				}

				var targetClasses = target.classList;

				if (targetClasses && targetClasses.contains(className)) {

					return true;

				}

			}

			return false;

		}

	});

});

public/javascript/redmic/modules/base/_ShowInTooltip.js

+10 −3
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ define([ 


			this.inherited(arguments);



			var tooltipClass = 'tooltipContainer',

			this._tooltipClass = 'tooltipContainer';

			this._suggestionsClass = 'suggestions';



			var tooltipClass = this._tooltipClass,

				sourceIndicatorClass = 'tooltipSourceIndicator',

				defaultTooltipCloseTimeout = 1000;
@@ -63,9 +66,13 @@ define([ 
			}



			var nodeBelongsToTooltipContainer = this._checkClickBelongsToNode(evt, this.tooltipNode._popupWrapper),

				nodeBelongsToSourceNode = this._checkClickBelongsToNode(evt, this._tooltipSourceNode);

				nodeBelongsToSourceNode = this._checkClickBelongsToNode(evt, this._tooltipSourceNode),

				nodeBelongsToOtherTooltip = this._checkClickBelongsToNodeWithClass(evt, this._tooltipClass),

				nodeBelongsToSuggestions = this._checkClickBelongsToNodeWithClass(evt, this._suggestionsClass);



			if (!nodeBelongsToTooltipContainer && !nodeBelongsToSourceNode && !nodeBelongsToOtherTooltip &&

				!nodeBelongsToSuggestions) {



			if (!nodeBelongsToTooltipContainer && !nodeBelongsToSourceNode) {

				this._hideTooltip();

			}

		},

templates @ 5344f00f

Compare b53f060b to 5344f00f
Original line number Diff line number Diff line 
Subproject commit b53f060bd88d71365677c9f175848f68da4812ff
 
Subproject commit 5344f00f39a70543f3dc8accc266ecb3a0b31d4f

stylesheets @ ca1ded9b

Compare f68dff34 to ca1ded9b
Original line number Diff line number Diff line 
Subproject commit f68dff34be650b16a667ae070ef297ce5c7d31d3
 
Subproject commit ca1ded9b5f94105fe889df30e976437eb332a8d5