Skip to content

Commit fc70ad7

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into grid
2 parents 97d8a2b + fe3b36b commit fc70ad7

Some content is hidden

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

58 files changed

+1852
-1359
lines changed

‎demos/demos.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ div.demo-description {
320320
#widget-docs .ui-tabs-nav li a:hover,
321321
#widget-docs .ui-tabs-nav li a:active { font-size:14px; padding:4px 1.2em 3px; color:#fff; }
322322

323-
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:link,
324-
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:visited,
325-
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:hover,
326-
#widget-docs .ui-tabs-nav li.ui-tabs-selected a:active { color:#e6820E; }
323+
#widget-docs .ui-tabs-nav li.ui-tabs-active a:link,
324+
#widget-docs .ui-tabs-nav li.ui-tabs-active a:visited,
325+
#widget-docs .ui-tabs-nav li.ui-tabs-active a:hover,
326+
#widget-docs .ui-tabs-nav li.ui-tabs-active a:active { color:#e6820E; }
327327

328328
#widget-docs .ui-tabs-panel { padding:20px 9px; font-size:12px; line-height:1.4; color:#000; }
329329

‎demos/tabs/ajax.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
<script>
1313
$(function() {
1414
$( "#tabs" ).tabs({
15-
ajaxOptions: {
16-
error: function( xhr, status, index, anchor ) {
17-
var selector = $( anchor ).attr( "aria-controls" );
18-
$( selector ).html(
15+
beforeLoad: function( event, ui ) {
16+
ui.jqXHR.error(function() {
17+
ui.panel.html(
1918
"Couldn't load this tab. We'll try to fix this as soon as possible. " +
2019
"If this wouldn't be a demo." );
21-
}
20+
});
2221
}
2322
});
2423
});

‎demos/tabs/bottom.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
.tabs-bottom .ui-tabs-panel { height: 140px; overflow: auto; }
2424
.tabs-bottom .ui-tabs-nav { position: absolute !important; left: 0; bottom: 0; right:0; padding: 0 0.2em 0.2em 0; }
2525
.tabs-bottom .ui-tabs-nav li { margin-top: -2px !important; margin-bottom: 1px !important; border-top: none; border-bottom-width: 1px; }
26-
.ui-tabs-selected { margin-top: -3px !important; }
2726
</style>
2827
</head>
2928
<body>

‎demos/tabs/sortable.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@
1313
<link rel="stylesheet" href="../demos.css">
1414
<script>
1515
$(function() {
16-
$( "#tabs" ).tabs().find( ".ui-tabs-nav" ).sortable({ axis: "x" });
16+
var tabs = $( "#tabs" ).tabs();
17+
tabs.find( ".ui-tabs-nav" ).sortable({
18+
axis: "x",
19+
stop: function() {
20+
tabs.tabs( "refresh" );
21+
}
22+
});
1723
});
1824
</script>
1925
</head>

‎demos/tabs/vertical.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
.ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 12em; }
2121
.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
2222
.ui-tabs-vertical .ui-tabs-nav li a { display:block; }
23-
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
23+
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
2424
.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right; width: 40em;}
2525
</style>
2626
</head>

‎demos/tooltip/custom-animation.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
<link type="text/css" href="../demos.css" rel="stylesheet" />
1212
<script type="text/javascript">
1313
$(function() {
14+
// TODO overhaul this with custom animation API
1415
$(".demo").tooltip({
1516
open: function() {
16-
$(this).tooltip("widget").stop(false, true).hide().slideDown();
17+
$(".ui-tooltip").stop(false, true).hide().slideDown();
1718
},
1819
close: function() {
19-
$(this).tooltip("widget").stop(false, true).show().slideUp();
20+
$(".ui-tooltip").stop(false, false).show().slideUp(function() {
21+
$(this).remove();
22+
});
2023
}
2124
});
2225
});

‎demos/tooltip/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ <h4>Examples</h4>
1414
<li><a href="tracking.html">Track the mouse</a></li>
1515
<li><a href="custom-animation.html">Custom animation</a></li>
1616
<li><a href="delegation-mixbag.html">Delegation Mixbag</a></li>
17+
<li><a href="lots.html">Lots</a></li>
1718
</ul>
1819
</div>
1920

‎demos/tooltip/tracking.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@
1313
$(function() {
1414
$(".demo").tooltip({
1515
open: function() {
16-
var tooltip = $(this).tooltip("widget");
17-
$(document).mousemove(function(event) {
18-
tooltip.position({
19-
my: "left center",
20-
at: "right center",
21-
offset: "25 25",
16+
var tooltip = $( ".ui-tooltip" );
17+
$(document).mousemove(function( event ) {
18+
tooltip.position( {
19+
my: "left+25 center",
20+
at: "right+25 center",
2221
of: event
2322
});
2423
})
2524
// trigger once to override element-relative positioning
2625
.mousemove();
2726
},
2827
close: function() {
29-
$(document).unbind("mousemove");
28+
$(document).unbind( "mousemove" );
3029
}
3130
});
3231
});

‎tests/static/menu/all-menus-icons.html

Lines changed: 0 additions & 172 deletions
This file was deleted.

‎tests/static/menu/default.html

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎tests/unit/accordion/accordion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="../testsuite.js"></script>
2121

2222
<script>
23-
function state( accordion ) {
23+
function accordion_state( accordion ) {
2424
var expected = $.makeArray( arguments ).slice( 1 );
2525
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
2626
return $( this ).css( "display" ) === "none" ? 0 : 1;

0 commit comments

Comments
 (0)