Skip to content

Commit afe0f72

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

56 files changed

Lines changed: 900 additions & 639 deletions

Some content is hidden

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

‎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

0 commit comments

Comments
 (0)