Skip to content

Commit 0f575e0

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'master' into position-notification
Conflicts: tests/unit/position/position_core_within.js
2 parents af15762 + 9df981d commit 0f575e0

File tree

107 files changed

+5369
-1577
lines changed

Some content is hidden

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

107 files changed

+5369
-1577
lines changed

‎.jshintrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"curly": true,
3+
"eqnull": true,
4+
"eqeqeq": true,
5+
"expr": true,
6+
"latedef": true,
7+
"noarg": true,
8+
"onevar": true,
9+
"smarttabs": true,
10+
"trailing": true,
11+
"undef": true
12+
}

‎demos/autocomplete/custom-data.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
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">
82+
<img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default" alt="">
8383
<input id="project">
8484
<input type="hidden" id="project-id">
8585
<p id="project-description"></p>

‎demos/demos.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ body {
1818

1919
.layout-grid {
2020
width: 960px;
21+
border-spacing: 0;
22+
border-collapse: collapse;
2123
}
2224

2325
.layout-grid td {

‎demos/draggable/snap-to.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<body>
2929

3030
<div class="demo">
31-
31+
3232
<div id="snaptarget" class="ui-widget-header">
3333
<p>I'm a snap target</p>
3434
</div>
3535

36-
<br clear="both" />
36+
<br style="clear:both" />
3737

3838
<div id="draggable" class="draggable ui-widget-content">
3939
<p>Default (snap: true), snaps to all other draggable elements</p>

‎demos/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
</head>
270270
<body>
271271

272-
<table class="layout-grid" cellspacing="0" cellpadding="0">
272+
<table class="layout-grid">
273273
<tr>
274274
<td class="left-nav">
275275
<dl class="demos-nav">

‎demos/menu/default.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>jQuery UI Menu - Default demo</title>
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script src="../../jquery-1.7.2.js"></script>
@@ -15,7 +15,7 @@
1515
});
1616
</script>
1717
<style>
18-
18+
1919
</style>
2020
</head>
2121
<body>

‎demos/menu/navigationmenu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>jQuery UI Menu - Navigation Menu demo</title>
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script src="../../jquery-1.7.2.js"></script>

‎demos/menu/topalignmenu.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<!doctype html>
22
<html>
33
<head>
4+
<meta charset="utf-8">
45
<title>Menu Demo: Top-aligned Menu</title>
5-
<link rel="stylesheet" href="../demos.css" type="text/css" />
6-
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
7-
<script type="text/javascript" src="../../jquery-1.7.2.js"></script>
8-
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
9-
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
10-
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
11-
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
12-
<script type="text/javascript">
6+
<link type="text/css" href="../demos.css" rel="stylesheet" />
7+
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
8+
<script src="../../jquery-1.7.2.js"></script>
9+
<script src="../../ui/jquery.ui.core.js"></script>
10+
<script src="../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../ui/jquery.ui.position.js"></script>
12+
<script src="../../ui/jquery.ui.menu.js"></script>
13+
<script>
1314
$(function() {
1415
$("#topMenu").menu({
1516
position: { of: "ul:has(a.ui-state-focus):last" }

‎demos/position/cycler.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@
101101

102102
<div class="demo">
103103

104-
<img src="images/earth.jpg" width="458" height="308" />
105-
<img src="images/flight.jpg" width="512" height="307" />
106-
<img src="images/rocket.jpg" width="300" height="353" />
104+
<img src="images/earth.jpg" width="458" height="308" alt="earth" />
105+
<img src="images/flight.jpg" width="512" height="307" alt="flight" />
106+
<img src="images/rocket.jpg" width="300" height="353" alt="rocket" />
107107

108108
<a id="previous" href="#">Previous</a>
109109
<a id="next" href="#">Next</a>

‎demos/sortable/empty-lists.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<ul id="sortable3" class='droptrue'>
5252
</ul>
5353

54-
<br clear="both" />
54+
<br style="clear:both" />
5555

5656
</div><!-- End demo -->
5757

‎demos/tooltip/custom-content.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<div class="ui-widget photo">
5353
<div class="ui-widget-header ui-corner-all">
5454
<h2>St. Stephen's Cathedral</h2>
55-
<h3><a href="http://maps.google.com/maps?q=vienna,+austria&z=11" data-geo>Vienna, Austria</a></h3>
55+
<h3><a href="http://maps.google.com/maps?q=vienna,+austria&amp;z=11" data-geo>Vienna, Austria</a></h3>
5656
</div>
5757
<a href="http://en.wikipedia.org/wiki/File:Wien_Stefansdom_DSC02656.JPG">
5858
<img src="images/st-stephens.jpg" alt="St. Stephen's Cathedral" class="ui-corner-all">
@@ -62,7 +62,7 @@ <h3><a href="http://maps.google.com/maps?q=vienna,+austria&z=11" data-geo>Vienna
6262
<div class="ui-widget photo">
6363
<div class="ui-widget-header ui-corner-all">
6464
<h2>Tower Bridge</h2>
65-
<h3><a href="http://maps.google.com/maps?q=london,+england&z=11" data-geo>London, England</a></h3>
65+
<h3><a href="http://maps.google.com/maps?q=london,+england&amp;z=11" data-geo>London, England</a></h3>
6666
</div>
6767
<a href="http://en.wikipedia.org/wiki/File:Tower_bridge_London_Twilight_-_November_2006.jpg">
6868
<img src="images/tower-bridge.jpg" alt="Tower Bridge" class="ui-corner-all">

0 commit comments

Comments
 (0)