PCON-152 Fixed bootstrap tooltips by providing default values

redCOMPONENT-COM · Oct 11, 2017 · 2ebda6d · 2ebda6d
1 parent 5add401
commit 2ebda6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/extensions/libraries/redcore/form/fields/rmedia.php b/extensions/libraries/redcore/form/fields/rmedia.php
@@ -140,8 +140,8 @@ function closeModal(fieldId)
 		$html[] = '<div class="' . $inputClass . '">';
 
 		// The Preview.
-		$preview = (string) $this->element['preview'];
-		$showPreview = true;
+		$preview       = (string) $this->element['preview'];
+		$showPreview   = true;
 		$showAsTooltip = false;
 
 		switch ($preview)
@@ -160,8 +160,9 @@ function closeModal(fieldId)
 			case 'tooltip':
 			default:
 				$showAsTooltip = true;
-				$options = array(
-					'onShow' => 'jMediaRefreshPreviewTip',
+				$options       = array(
+					'onShow'  => 'jMediaRefreshPreviewTip',
+					'trigger' => 'hover, focus'
 				);
 				JHtml::_('rbootstrap.tooltip', '.hasTipPreview', $options);
 				break;

diff --git a/extensions/libraries/redcore/html/rbootstrap.php b/extensions/libraries/redcore/html/rbootstrap.php
@@ -482,7 +482,7 @@ public static function tooltip($selector = '.hasTooltip', $params = array())
 			$opt['placement'] = (isset($params['placement']) && ($params['placement'])) ? (string) $params['placement'] : null;
 			$opt['selector']  = (isset($params['selector']) && ($params['selector'])) ? (string) $params['selector'] : null;
 			$opt['title']     = (isset($params['title']) && ($params['title'])) ? (string) $params['title'] : null;
-			$opt['trigger']   = (isset($params['trigger']) && ($params['trigger'])) ? (string) $params['trigger'] : null;
+			$opt['trigger']   = (isset($params['trigger']) && ($params['trigger'])) ? (string) $params['trigger'] : 'hover focus';
 			$opt['delay']     = (isset($params['delay']) && ($params['delay'])) ? (is_array($params['delay']) ? $params['delay'] : (int) $params['delay']) : null;
 			$opt['container'] = (isset($params['container']) && ($params['container'])) ? (int) $params['container'] : 'body';
 			$opt['template']  = isset($params['template']) ? (string) $params['template'] : null;