Skip to content

Commit afe0f72

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into widget-factory-demo
2 parents cfaddbf + 27a4fdd commit afe0f72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+900
-639
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ When looking at pull requests, first check for [proper commit messages](http://w
1414

1515
Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
1616

17-
git remote add [username] [his-fork.git] -f
17+
git remote add [username] [his-fork.git] -f
1818

1919
If you want just one commit and edit the commit message:
2020

21-
git cherry-pick -e [sha-of-commit]
21+
git cherry-pick -e [sha-of-commit]
2222

2323
If it should go to the stable brach, cherry-pick it to stable:
2424

25-
git checkout 1-8-stable
26-
git cherry-pick -x [sha-of-commit]
25+
git checkout 1-8-stable
26+
git cherry-pick -x [sha-of-commit]

‎demos/autocomplete/categories.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
{ label: "andreas andersson", category: "People" },
4848
{ label: "andreas johnson", category: "People" }
4949
];
50-
50+
5151
$( "#search" ).catcomplete({
5252
delay: 0,
5353
source: data
@@ -59,7 +59,7 @@
5959

6060
<div class="demo">
6161
<label for="search">Search: </label>
62-
<input id="search" />
62+
<input id="search">
6363
</div><!-- End demo -->
6464

6565

‎demos/autocomplete/combobox.html

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,16 @@
1414
<script src="../../ui/jquery.ui.tooltip.js"></script>
1515
<link rel="stylesheet" href="../demos.css">
1616
<style>
17-
.ui-button { margin-left: -1px; }
18-
.ui-button-icon-only .ui-button-text { padding: 0.35em; }
19-
.ui-autocomplete-input { margin: 0; padding: 0.4em 0 0.4em 0.45em; }
17+
.ui-button {
18+
margin-left: -1px;
19+
}
20+
.ui-button-icon-only .ui-button-text {
21+
padding: 0.35em;
22+
}
23+
.ui-autocomplete-input {
24+
margin: 0;
25+
padding: 0.4em 0 0.4em 0.45em;
26+
}
2027
</style>
2128
<script>
2229
(function( $ ) {
@@ -90,7 +97,7 @@
9097
.addClass( "ui-widget ui-widget-content ui-corner-left" );
9198

9299
input.data( "autocomplete" )._renderItem = function( ul, item ) {
93-
return $( "<li></li>" )
100+
return $( "<li>" )
94101
.data( "item.autocomplete", item )
95102
.append( "<a>" + item.label + "</a>" )
96103
.appendTo( ul );

‎demos/autocomplete/custom-data.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
}
6868
})
6969
.data( "autocomplete" )._renderItem = function( ul, item ) {
70-
return $( "<li></li>" )
70+
return $( "<li>" )
7171
.data( "item.autocomplete", item )
7272
.append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
7373
.appendTo( ul );
@@ -79,9 +79,9 @@
7979

8080
<div class="demo">
8181
<div id="project-label">Select a project (type "j" for a start):</div>
82-
<img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default"/>
83-
<input id="project"/>
84-
<input type="hidden" id="project-id"/>
82+
<img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default">
83+
<input id="project">
84+
<input type="hidden" id="project-id">
8585
<p id="project-description"></p>
8686
</div><!-- End demo -->
8787

‎demos/autocomplete/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<div class="ui-widget">
5151
<label for="tags">Tags: </label>
52-
<input id="tags" />
52+
<input id="tags">
5353
</div>
5454

5555
</div><!-- End demo -->

‎demos/autocomplete/folding.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<div class="ui-widget">
4747
<form>
4848
<label for="developer">Developer: </label>
49-
<input id="developer" />
49+
<input id="developer">
5050
</form>
5151
</div>
5252

‎demos/autocomplete/maxheight.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
</script>
6161
</head>
6262
<body>
63-
63+
6464
<div class="demo">
6565

6666
<div class="ui-widget">
6767
<label for="tags">Tags: </label>
68-
<input id="tags" />
68+
<input id="tags">
6969
</div>
7070

7171
</div><!-- End demo -->

‎demos/autocomplete/multiple-remote.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<script src="../../ui/jquery.ui.autocomplete.js"></script>
1313
<link rel="stylesheet" href="../demos.css">
1414
<style>
15-
.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
15+
.ui-autocomplete-loading {
16+
background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat;
17+
}
1618
</style>
1719
<script>
1820
$(function() {
@@ -69,7 +71,7 @@
6971

7072
<div class="ui-widget">
7173
<label for="birds">Birds: </label>
72-
<input id="birds" size="50" />
74+
<input id="birds" size="50">
7375
</div>
7476

7577
</div><!-- End demo -->

‎demos/autocomplete/multiple.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484

8585
<div class="ui-widget">
8686
<label for="tags">Tag programming languages: </label>
87-
<input id="tags" size="50" />
87+
<input id="tags" size="50">
8888
</div>
8989

9090
</div><!-- End demo -->

‎demos/autocomplete/remote-jsonp.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
<script src="../../ui/jquery.ui.autocomplete.js"></script>
1313
<link rel="stylesheet" href="../demos.css">
1414
<style>
15-
.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
15+
.ui-autocomplete-loading {
16+
background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat;
17+
}
1618
#city { width: 25em; }
1719
</style>
1820
<script>
1921
$(function() {
2022
function log( message ) {
21-
$( "<div/>" ).text( message ).prependTo( "#log" );
22-
$( "#log" ).attr( "scrollTop", 0 );
23+
$( "<div>" ).text( message ).prependTo( "#log" );
24+
$( "#log" ).scrollTop( 0 );
2325
}
2426

2527
$( "#city" ).autocomplete({
@@ -65,7 +67,7 @@
6567

6668
<div class="ui-widget">
6769
<label for="city">Your city: </label>
68-
<input id="city" />
70+
<input id="city">
6971
Powered by <a href="http://geonames.org">geonames.org</a>
7072
</div>
7173

‎demos/autocomplete/remote-with-cache.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<script src="../../ui/jquery.ui.autocomplete.js"></script>
1313
<link rel="stylesheet" href="../demos.css">
1414
<style>
15-
.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
15+
.ui-autocomplete-loading {
16+
background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat;
17+
}
1618
</style>
1719
<script>
1820
$(function() {
@@ -44,7 +46,7 @@
4446

4547
<div class="ui-widget">
4648
<label for="birds">Birds: </label>
47-
<input id="birds" />
49+
<input id="birds">
4850
</div>
4951

5052
</div><!-- End demo -->

‎demos/autocomplete/remote.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
<script src="../../ui/jquery.ui.autocomplete.js"></script>
1313
<link rel="stylesheet" href="../demos.css">
1414
<style>
15-
.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
15+
.ui-autocomplete-loading {
16+
background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat;
17+
}
1618
</style>
1719
<script>
1820
$(function() {
1921
function log( message ) {
20-
$( "<div/>" ).text( message ).prependTo( "#log" );
21-
$( "#log" ).attr( "scrollTop", 0 );
22+
$( "<div>" ).text( message ).prependTo( "#log" );
23+
$( "#log" ).scrollTop( 0 );
2224
}
2325

2426
$( "#birds" ).autocomplete({
@@ -39,7 +41,7 @@
3941

4042
<div class="ui-widget">
4143
<label for="birds">Birds: </label>
42-
<input id="birds" />
44+
<input id="birds">
4345
</div>
4446

4547
<div class="ui-widget" style="margin-top:2em; font-family:Arial">

‎demos/autocomplete/search.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
3+
sleep( 3 );
24
// no term passed - just exit early with no response
35
if (empty($_GET['term'])) exit ;
46
$q = strtolower($_GET["term"]);

‎demos/spinner/currency.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
max: 2500,
2828
step: 25,
2929
start: 1000,
30-
numberformat: "C"
30+
numberFormat: "C"
3131
});
3232

3333
});

‎demos/spinner/decimal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
$(function() {
1919
$("#spinner").spinner({
2020
step: 0.01,
21-
numberformat: "n"
21+
numberFormat: "n"
2222
});
2323

2424
$("#culture").change(function() {

‎demos/tooltip/custom-animation.html

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,64 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4+
<meta charset="utf-8">
45
<title>jQuery UI Tooltip - Custom animation demo</title>
5-
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
6-
<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
7-
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8-
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9-
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
10-
<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
11-
<link type="text/css" href="../demos.css" rel="stylesheet" />
12-
<script type="text/javascript">
6+
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7+
<script src="../../jquery-1.5.1.js"></script>
8+
<script src="../../ui/jquery.ui.core.js"></script>
9+
<script src="../../ui/jquery.ui.widget.js"></script>
10+
<script src="../../ui/jquery.ui.position.js"></script>
11+
<script src="../../ui/jquery.ui.tooltip.js"></script>
12+
<script src="../../ui/jquery.effects.core.js"></script>
13+
<script src="../../ui/jquery.effects.explode.js"></script>
14+
<link rel="stylesheet" href="../demos.css">
15+
<script>
1316
$(function() {
14-
$(".demo").tooltip({
17+
$( "#show-option" ).tooltip({
1518
show: {
1619
effect: "slideDown",
1720
delay: 250
18-
},
21+
}
22+
});
23+
$( "#hide-option" ).tooltip({
1924
hide: {
20-
effect: "hide",
25+
effect: "explode",
2126
delay: 250
2227
}
2328
});
29+
$( "#position-option" ).tooltip({
30+
position: {
31+
my: "left top",
32+
at: "left bottom+10",
33+
using: function( pos ) {
34+
$( this ).css({
35+
left: pos.left,
36+
top: pos.top - 10
37+
}).animate({ top: pos.top }, "fast" );
38+
}
39+
}
40+
});
2441
});
2542
</script>
26-
<style>
27-
label { display: inline-block; width: 5em; }
28-
</style>
2943
</head>
3044
<body>
3145

3246
<div class="demo">
3347

34-
<p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
35-
the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
36-
</p>
37-
<p>But as it's not a native tooltip, it can be styled. Any themes built with
38-
<a href="http://themeroller.com" title="ThemeRoller, jQuery UI's theme builder application">ThemeRoller</a>
39-
will also style tooltip's accordingly.</p>
40-
<p>Tooltip's are also useful for form elements, to show some additional information in the context of each field.</p>
41-
<p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes." /></p>
42-
<p>Click the field to see the tooltip; when you tab out of the field, it gets hidden.</p>
48+
<p>There are various ways to customize the animation of a tooltip.</p>
49+
<p>You can use the <a id="show-option" href="http://jqueryui.com/demos/tooltip/#option-show" title="slide down on show">show</a> and
50+
<a id="hide-option" href="http://jqueryui.com/demos/tooltip/#option-hide" title="explode on hide">hide</a> options.</p>
51+
<p>You can also use the <a id="position-option" href="http://jqueryui.com/demos/tooltip/#option-position" title="move down on show">position option</a>.</p>
4352

4453
</div><!-- End demo -->
4554

4655

4756

4857
<div class="demo-description">
49-
5058
<p>This demo shows how to customize animations. The tooltip is shown, after a
5159
delay of 250ms, using a slide down animation, and hidden, after another delay,
5260
without an animation.</p>
53-
5461
</div><!-- End demo-description -->
5562

56-
57-
5863
</body>
5964
</html>

0 commit comments

Comments
 (0)