Skip to content

Commit c2227b7

Browse files
committed
tooltip-hidden attribute as in #110
1 parent 385bb7e commit c2227b7

12 files changed

+86
-23
lines changed

Readme.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,20 @@ Call the directive wherever you want in your html page
8383
Option | Type | Default | Description
8484
------------- | ------------- | ------------- | -------------
8585
tooltip-side="" | String('left','right','top','bottom') | 'top' | Set your tooltip to show on `left` or `right` or `top` or `bottom` position
86-
tooltip-template="" | String() | false | Set your tooltip template (HTML or just Text)
87-
tooltip-template-url="" | String() | false | Set your external tooltip template PATH
86+
tooltip-template="" | String() | '' | Set your tooltip template (HTML or just Text)
87+
tooltip-template-url="" | String() | '' | Set your external tooltip template PATH
8888
tooltip-smart="" | String(Boolean) | false | Set the tooltip to automatically search the best position on the screen
8989
tooltip-show-trigger="" | String('event1 event2') | 'mouseover' | Show the tooltip on specific event/events
9090
tooltip-hide-trigger="" | String('event1 event2') | 'mouseleave' | Hide the tooltip on specific event/events
9191
tooltip-close-button="" | String(Boolean) | false | Enable the tooltip close button
92-
tooltip-class="" | String() | false | Set custom tooltip CSS class/classes
92+
tooltip-class="" | String() | '' | Set custom tooltip CSS class/classes
9393
tooltip-size="" | String('large', 'small') | 'medium' | Set your tooltip dimensions
9494
tooltip-speed="" | String('fast', 'slow', 'medium') | 'medium' | Set your tooltip show & hide transition speed
95+
tooltip-hidden="" | String(Boolean) | false | hides at all the tooltip from element
96+
9597

9698
##Globals
97-
Sometimes you may need to set all of your tooltips options in one place, you can achieve this using `tooltipConfProvider` like this:
99+
Sometimes you may need to set all of your tooltips options in one place, you can achieve this using `tooltipsConfProvider` like this:
98100

99101
```javascript
100102
.config(['tooltipsConfProvider', function configConf(tooltipsConfProvider) {

demo/js/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
function controllerCtrl($timeout) {
1818
var that = this;
1919

20+
that.isHidden = true;
2021
that.tooltipContentText = 'I\'m a content text from module controller';
2122
that.tooltipText = 'I\'m a text from module controller';
2223
that.class = 'a-class';
@@ -39,15 +40,18 @@
3940

4041
that.class = 'another-class';
4142
}, 8000);
42-
$timeout(function () {
43+
$timeout(function changeSize() {
4344

4445
that.sizeFromModel = 'large';
4546
}, 9000);
46-
$timeout(function () {
47+
$timeout(function changeSpeed() {
4748

4849
that.speedFromModel = 'slow';
4950
}, 10000);
51+
$timeout(function changeIsHidden() {
5052

53+
that.isHidden = false;
54+
}, 11000);
5155

5256
that.generateHTMLextra = function generateHTMLextra(item) {
5357

dist/angular-tooltips.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-tooltips.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-tooltips.css.min.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-tooltips.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,12 @@
248248

249249
return {
250250
'configure': function configure(configuration) {
251+
var configurationKeys = Object.keys(tooltipConfiguration)
252+
, configurationIndex = 0
253+
, aConfigurationKey;
251254

252255
if (configuration) {
253-
var configurationKeys = Object.keys(tooltipConfiguration)
254-
, configurationIndex = 0
255-
, aConfigurationKey;
256+
256257
for (; configurationIndex < configurationKeys.length; configurationIndex += 1) {
257258

258259
aConfigurationKey = configurationKeys[configurationIndex];
@@ -408,7 +409,8 @@
408409
}
409410

410411
tipElement.removeClass('_hidden');
411-
if (event) {
412+
if (event &&
413+
attrs.tooltipHidden !== 'true') {
412414

413415
element.addClass('active');
414416
}
@@ -505,6 +507,13 @@
505507
oldTooltipClass = newValue;
506508
}
507509
}
510+
, onTooltipSmartChange = function onTooltipSmartChange() {
511+
512+
if (typeof attrs.tooltipSmart !== 'boolean') {
513+
514+
attrs.tooltipSmart = attrs.tooltipSmart === 'true';
515+
}
516+
}
508517
, onTooltipCloseButtonChange = function onTooltipCloseButtonChange(newValue) {
509518
var theXButton = angular.element(element.find('tip-tip').children()[0])
510519
, enableButton = newValue === 'true';
@@ -551,6 +560,7 @@
551560
, unregisterOnTooltipShowTrigger = attrs.$observe('tooltipShowTrigger', onTooltipShowTrigger)
552561
, unregisterOnTooltipHideTrigger = attrs.$observe('tooltipHideTrigger', onTooltipHideTrigger)
553562
, unregisterOnTooltipClassChange = attrs.$observe('tooltipClass', onTooltipClassChange)
563+
, unregisterOnTooltipSmartChange = attrs.$observe('tooltipSmart', onTooltipSmartChange)
554564
, unregisterOnTooltipCloseButtonChange = attrs.$observe('tooltipCloseButton', onTooltipCloseButtonChange)
555565
, unregisterOnTooltipSizeChange = attrs.$observe('tooltipSize', onTooltipSizeChange)
556566
, unregisterOnTooltipSpeedChange = attrs.$observe('tooltipSpeed', onTooltipSpeedChange)
@@ -585,6 +595,7 @@
585595
unregisterOnTooltipShowTrigger();
586596
unregisterOnTooltipHideTrigger();
587597
unregisterOnTooltipClassChange();
598+
unregisterOnTooltipSmartChange();
588599
unregisterOnTooltipCloseButtonChange();
589600
unregisterOnTooltipSizeChange();
590601
unregisterOnTooltipSpeedChange();

0 commit comments

Comments
 (0)