Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ecea48c

Browse files
committed
Issue 162. When using the same tooltip element using "tip" configuration variable you can still use the title- attribute as the tooltip
1 parent 81c382f commit ecea48c

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

src/dateinput/dateinput.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
if (conf.selectors) {
236236
var monthSelector = $("<select/>").attr("id", css.month),
237237
yearSelector = $("<select/>").attr("id", css.year);
238-
title.append(monthSelector.add(yearSelector));
238+
title.html(monthSelector.add(yearSelector));
239239
}
240240

241241
// day titles

src/tooltip/tooltip.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,16 @@
172172
// data-tooltip
173173
if (tipAttr) {
174174
tip = $(tipAttr);
175-
176-
// autogenerated tooltip
177-
} else if (title) {
178-
tip = $(conf.layout).addClass(conf.tipClass).appendTo(document.body)
179-
.hide().append(title);
180-
175+
181176
// single tip element for all
182177
} else if (conf.tip) {
183178
tip = $(conf.tip).eq(0);
184179

180+
// autogenerated tooltip
181+
} else if (title) {
182+
tip = $(conf.layout).addClass(conf.tipClass).appendTo(document.body)
183+
.hide().append(title);
184+
185185
// manual tooltip
186186
} else {
187187
tip = trigger.next();
@@ -199,7 +199,11 @@
199199
// get position
200200
var pos = getPosition(trigger, tip, conf);
201201

202-
202+
// restore title for single tooltip element
203+
if (conf.tip) {
204+
tip.html(trigger.data("title"));
205+
}
206+
203207
// onBeforeShow
204208
e = e || $.Event();
205209
e.type = "onBeforeShow";

test/dateinput/setmin.htm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
<!-- HTML5 date input -->
88
<input type="date" name="mydate" data-value="2010-12-01" min="2010-12-01" />
99

10+
<input type="date" name="mydate" data-value="2010-12-01" min="2010-12-01" />
11+
1012
<!-- make it happen -->
1113
<script>
12-
$(":date").dateinput({selectors: true});
14+
$(":date:first").dateinput({selectors: true});
15+
16+
$(":date:last").dateinput({selectors: false});
1317
</script>
1418

test/overlay/index.htm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@
3131
$("a[rel]").overlay({
3232
closeOnClick: false,
3333

34-
_mask: {
35-
34+
mask: {
3635
color: '#ccc',
3736
closeSpeed: 200
3837
}
3938
});
40-
</script>
39+
</script>

test/tooltip/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ <h3>Manual tooltip</h3>
108108

109109
<h3>Same tip element</h3>
110110

111-
<a class="trigger">trigger 1</a>
112-
<a class="trigger">trigger 2</a>
113-
<a class="trigger">trigger 3</a>
111+
<a class="trigger" title="you can now use different tip">trigger 1</a>
112+
<a class="trigger" title="you can now truly use different tip">trigger 2</a>
113+
<a class="trigger" title="different tip again">trigger 3</a>
114114

115115
<div id="sametip" class="tooltip">
116116
The same tooltip for multiple triggers
@@ -150,7 +150,7 @@ <h3>Slide effect</h3>
150150
<a class="trigger" title="This is the title">trigger 3</a>
151151

152152
<script>
153-
$("#slide a").tooltip({ effect: 'fade', opacity: 0.5 });
153+
$("#slide a").tooltip({ effect: 'slide', opacity: 0.7 });
154154
</script>
155155

156156
</div>

0 commit comments

Comments
 (0)