Skip to content

Commit 121a2ea

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into grid
2 parents 19738d1 + 66f9e12 commit 121a2ea

32 files changed

+322
-74
lines changed

‎build/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
<echo message="Comparing file size with previous build" />
321321
<exec executable="bash">
322322
<arg value="-c" />
323-
<arg value="wc -c ${size.dir}/* | `which node nodejs` build/sizer.js" />
323+
<arg value="wc -c ${size.dir}/* | `which node nodejs 2>/dev/null` build/sizer.js" />
324324
</exec>
325325
<delete dir="${size.dir}" />
326326
</target>

‎build/build/minify-js.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22
dir=$(dirname $0)
3-
`which node nodejs` $dir/uglify.js $1 > $2
3+
`which node nodejs 2> /dev/null` $dir/uglify.js $1 > $2

‎demos/accordion/custom-icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
icons: icons
2121
});
2222
$( "#toggle" ).button().toggle(function() {
23-
$( "#accordion" ).accordion( "option", "icons", false );
23+
$( "#accordion" ).accordion( "option", "icons", null );
2424
}, function() {
2525
$( "#accordion" ).accordion( "option", "icons", icons );
2626
});

‎demos/accordion/hoverintent.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
3030
},
3131
handler: function( event ) {
32-
event.type = "hoverintent";
3332
var self = this,
3433
args = arguments,
3534
target = $( event.target ),
@@ -50,6 +49,7 @@
5049
function handler() {
5150
if ( ( Math.abs( pX - cX ) + Math.abs( pY - cY ) ) < cfg.sensitivity ) {
5251
clear();
52+
event.type = "hoverintent";
5353
jQuery.event.handle.apply( self, args );
5454
} else {
5555
pX = cX;

‎demos/datepicker/localization.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<script src="../../ui/i18n/jquery.ui.datepicker-bs.js"></script>
1717
<script src="../../ui/i18n/jquery.ui.datepicker-ca.js"></script>
1818
<script src="../../ui/i18n/jquery.ui.datepicker-cs.js"></script>
19+
<script src="../../ui/i18n/jquery.ui.datepicker-cy-GB.js"></script>
1920
<script src="../../ui/i18n/jquery.ui.datepicker-da.js"></script>
2021
<script src="../../ui/i18n/jquery.ui.datepicker-de.js"></script>
2122
<script src="../../ui/i18n/jquery.ui.datepicker-el.js"></script>
@@ -42,11 +43,14 @@
4243
<script src="../../ui/i18n/jquery.ui.datepicker-ja.js"></script>
4344
<script src="../../ui/i18n/jquery.ui.datepicker-kk.js"></script>
4445
<script src="../../ui/i18n/jquery.ui.datepicker-ko.js"></script>
46+
<script src="../../ui/i18n/jquery.ui.datepicker-lb.js"></script>
4547
<script src="../../ui/i18n/jquery.ui.datepicker-lt.js"></script>
4648
<script src="../../ui/i18n/jquery.ui.datepicker-lv.js"></script>
49+
<script src="../../ui/i18n/jquery.ui.datepicker-mk.js"></script>
4750
<script src="../../ui/i18n/jquery.ui.datepicker-ml.js"></script>
4851
<script src="../../ui/i18n/jquery.ui.datepicker-ms.js"></script>
4952
<script src="../../ui/i18n/jquery.ui.datepicker-nl.js"></script>
53+
<script src="../../ui/i18n/jquery.ui.datepicker-nl-BE.js"></script>
5054
<script src="../../ui/i18n/jquery.ui.datepicker-no.js"></script>
5155
<script src="../../ui/i18n/jquery.ui.datepicker-pl.js"></script>
5256
<script src="../../ui/i18n/jquery.ui.datepicker-pt.js"></script>
@@ -103,6 +107,7 @@
103107
<option value="hr">Croatian (Hrvatski jezik)</option>
104108
<option value="cs">Czech (&#269;e&#353;tina)</option>
105109
<option value="da">Danish (Dansk)</option>
110+
<option value="nl-BE">Dutch (Belgium)</option>
106111
<option value="nl">Dutch (Nederlands)</option>
107112
<option value="en-AU">English/Australia</option>
108113
<option value="en-NZ">English/New Zealand</option>
@@ -127,6 +132,8 @@
127132
<option value="ko">Korean (&#54620;&#44397;&#50612;)</option>
128133
<option value="lv">Latvian (Latvie&ouml;u Valoda)</option>
129134
<option value="lt">Lithuanian (lietuviu kalba)</option>
135+
<option value="lb">Luxembourgish</option>
136+
<option value="mk">Macedonian</option>
130137
<option value="ml">Malayalam</option>
131138
<option value="ms">Malaysian (Bahasa Malaysia)</option>
132139
<option value="no">Norwegian (Norsk)</option>
@@ -148,6 +155,7 @@
148155
<option value="tr">Turkish (T&uuml;rk&ccedil;e)</option>
149156
<option value="uk">Ukranian (&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;)</option>
150157
<option value="vi">Vietnamese (Ti&#7871;ng Vi&#7879;t)</option>
158+
<option value="cy-GB">Welsh/UK (Cymraeg)</option>
151159
</select></p>
152160

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

‎demos/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<script src="../ui/i18n/jquery.ui.datepicker-bg.js"></script>
5353
<script src="../ui/i18n/jquery.ui.datepicker-ca.js"></script>
5454
<script src="../ui/i18n/jquery.ui.datepicker-cs.js"></script>
55+
<script src="../ui/i18n/jquery.ui.datepicker-cy-GB.js"></script>
5556
<script src="../ui/i18n/jquery.ui.datepicker-da.js"></script>
5657
<script src="../ui/i18n/jquery.ui.datepicker-de.js"></script>
5758
<script src="../ui/i18n/jquery.ui.datepicker-el.js"></script>
@@ -78,11 +79,14 @@
7879
<script src="../ui/i18n/jquery.ui.datepicker-ja.js"></script>
7980
<script src="../ui/i18n/jquery.ui.datepicker-kk.js"></script>
8081
<script src="../ui/i18n/jquery.ui.datepicker-ko.js"></script>
82+
<script src="../ui/i18n/jquery.ui.datepicker-lb.js"></script>
8183
<script src="../ui/i18n/jquery.ui.datepicker-lt.js"></script>
8284
<script src="../ui/i18n/jquery.ui.datepicker-lv.js"></script>
85+
<script src="../ui/i18n/jquery.ui.datepicker-mk.js"></script>
8386
<script src="../ui/i18n/jquery.ui.datepicker-ml.js"></script>
8487
<script src="../ui/i18n/jquery.ui.datepicker-ms.js"></script>
8588
<script src="../ui/i18n/jquery.ui.datepicker-nl.js"></script>
89+
<script src="../ui/i18n/jquery.ui.datepicker-nl-BE.js"></script>
8690
<script src="../ui/i18n/jquery.ui.datepicker-no.js"></script>
8791
<script src="../ui/i18n/jquery.ui.datepicker-pl.js"></script>
8892
<script src="../ui/i18n/jquery.ui.datepicker-pt.js"></script>

‎demos/spinner/currency.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
<script>
1818
$(function() {
1919
$( "#currency" ).change(function() {
20-
var current = $( "#spinner" ).spinner( "value" );
21-
Globalize.culture( $(this).val() );
22-
$( "#spinner" ).spinner( "value", current );
20+
$( "#spinner" ).spinner( "option", "culture", $( this ).val() );
2321
});
2422

2523
$( "#spinner" ).spinner({

‎demos/tooltip/custom-style.html

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>jQuery UI Tooltip - Default functionality</title>
6+
<link rel="stylesheet" href="../../themes/base/jquery.ui.tooltip.css">
7+
<script src="../../jquery-1.7.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+
<link rel="stylesheet" href="../demos.css">
13+
<script>
14+
$(function() {
15+
$( ".demo" ).tooltip({
16+
open: function(event, ui) {
17+
$("<div>").addClass("arrow").appendTo(ui.tooltip);
18+
},
19+
position: {
20+
my: "center bottom",
21+
at: "center top",
22+
offset: "0 -20px"
23+
}
24+
});
25+
});
26+
</script>
27+
<style>
28+
label {
29+
display: inline-block;
30+
width: 5em;
31+
}
32+
.demo {
33+
margin: 10em 0 0 10em;
34+
}
35+
.ui-tooltip, .arrow:after {
36+
background: black;
37+
border: 2px solid white;
38+
}
39+
.ui-tooltip {
40+
display: inline-block;
41+
position: relative;
42+
padding: 10px 20px;
43+
color: white;
44+
border-radius: 20px;
45+
text-align: center;
46+
font: bold 14px "Helvetica Neue", Sans-Serif;
47+
font-stretch: condensed;
48+
text-decoration: none;
49+
text-transform: uppercase;
50+
box-shadow: 0 0 7px black;
51+
}
52+
.arrow {
53+
width: 70px;
54+
height: 16px;
55+
overflow: hidden;
56+
position: absolute;
57+
left: 50%;
58+
margin-left: -35px;
59+
bottom: -16px;
60+
}
61+
.arrow:after {
62+
content: "";
63+
position: absolute;
64+
left: 20px;
65+
top: -20px;
66+
width: 25px;
67+
height: 25px;
68+
-webkit-box-shadow: 6px 5px 9px -9px black,
69+
5px 6px 9px -9px black;
70+
-moz-box-shadow: 6px 5px 9px -9px black,
71+
5px 6px 9px -9px black;
72+
box-shadow: 6px 5px 9px -9px black,
73+
5px 6px 9px -9px black;
74+
-webkit-transform: rotate(45deg);
75+
-moz-transform: rotate(45deg);
76+
-ms-transform: rotate(45deg);
77+
-o-transform: rotate(45deg);
78+
}
79+
div[data-tooltip].active {
80+
opacity: 1;
81+
margin-top: 6px;
82+
}
83+
div[data-tooltip].out {
84+
opacity: 0;
85+
margin-top: -20px;
86+
}
87+
</style>
88+
</head>
89+
<body>
90+
91+
<div class="demo">
92+
93+
<p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
94+
the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.</p>
95+
<p>But as it's not a native tooltip, it can be styled. Any themes built with
96+
<a href="http://themeroller.com" title="ThemeRoller: jQuery UI's theme builder application">ThemeRoller</a>
97+
will also style tooltips accordingly.</p>
98+
<p>Tooltips are also useful for form elements, to show some additional information in the context of each field.</p>
99+
<p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes."></p>
100+
<p>Hover the field to see the tooltip.</p>
101+
102+
</div><!-- End demo -->
103+
104+
105+
106+
<div class="demo-description">
107+
<p>Hover the links above or use the tab key to cycle the focus on each element.</p>
108+
</div><!-- End demo-description -->
109+
110+
</body>
111+
</html>

‎demos/tooltip/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<h4>Examples</h4>
1212
<ul>
1313
<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
14+
<li><a href="custom-style.html">Custom style with arrow</a></li>
1415
<li><a href="forms.html">Forms with tooltips</a></li>
1516
<li><a href="tracking.html">Track the mouse</a></li>
1617
<li><a href="custom-animation.html">Custom animation</a></li>

‎demos/widget/default.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
// always refresh when changing options
107107
_setOptions: function() {
108108
// _super and _superApply handle keeping the right this-context
109-
this._superApply( "_setOptions", arguments );
109+
this._superApply( arguments );
110110
this._refresh();
111111
},
112112

@@ -116,7 +116,7 @@
116116
if ( /red|green|blue/.test(key) && (value < 0 || value > 255) ) {
117117
return;
118118
}
119-
this._super( "_setOption", key, value );
119+
this._super( key, value );
120120
}
121121
});
122122

‎tests/unit/spinner/spinner_options.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ test( "numberFormat, currency", function() {
9696
equal( element.val(), "$1.00", "formatted after step" );
9797
});
9898

99+
test( "numberFormat, change", function() {
100+
expect( 2 );
101+
var element = $( "#spin" ).val( 5 ).spinner({ numberFormat: "n1" });
102+
equal( element.val(), "5.0", "formatted on init" );
103+
element.spinner( "option", "numberFormat", "c" );
104+
equal( element.val(), "$5.00", "formatted after change" );
105+
});
106+
99107
test( "culture, null", function() {
100108
expect( 2 );
101109
Globalize.culture( "ja-JP" );
@@ -119,6 +127,17 @@ test( "currency, ja-JP", function() {
119127
equal( element.val(), "¥1", "formatted after step" );
120128
});
121129

130+
test( "currency, change", function() {
131+
expect( 2 );
132+
var element = $( "#spin" ).val( 5 ).spinner({
133+
numberFormat: "C",
134+
culture: "ja-JP"
135+
});
136+
equal( element.val(), "¥5", "formatted on init" );
137+
element.spinner( "option", "culture", "en" );
138+
equal( element.val(), "$5.00", "formatted after change" );
139+
});
140+
122141
test( "max", function() {
123142
expect( 3 );
124143
var element = $( "#spin" ).val( 1000 ).spinner({ max: 100 });

‎tests/unit/widget/widget_core.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,15 @@ test( "._super()", function() {
346346
same( this, instance, "this is correct in testWidget2" );
347347
same( a, 5, "parameter passed to testWidget2" );
348348
same( b, 10, "parameter passed to testWidget2" );
349-
return this._super( "method", a, b*2 );
349+
return this._super( a, b*2 );
350350
}
351351
});
352352

353353
$.widget( "ui.testWidget3", $.ui.testWidget2, {
354354
method: function( a ) {
355355
same( this, instance, "this is correct in testWidget3" );
356356
same( a, 5, "parameter passed to testWidget3" );
357-
var ret = this._super( "method", a, a*2 );
357+
var ret = this._super( a, a*2 );
358358
same( ret, 25, "super returned value" );
359359
}
360360
});
@@ -382,7 +382,7 @@ test( "._superApply()", function() {
382382
same( this, instance, "this is correct in testWidget2" );
383383
same( a, 5, "parameter passed to testWidget2" );
384384
same( b, 10, "second parameter passed to testWidget2" );
385-
return this._superApply( "method", arguments );
385+
return this._superApply( arguments );
386386
}
387387
});
388388

@@ -391,7 +391,7 @@ test( "._superApply()", function() {
391391
same( this, instance, "this is correct in testWidget3" );
392392
same( a, 5, "parameter passed to testWidget3" );
393393
same( b, 10, "second parameter passed to testWidget3" );
394-
var ret = this._superApply( "method", arguments );
394+
var ret = this._superApply( arguments );
395395
same( ret, 15, "super returned value" );
396396
}
397397
});
@@ -1031,7 +1031,7 @@ test( "redefine", function() {
10311031
$.widget( "ui.testWidget", $.ui.testWidget, {
10321032
method: function( str ) {
10331033
equal( str, "foo", "new invoked with correct parameter" );
1034-
this._super( "method", "bar" );
1034+
this._super();
10351035
}
10361036
});
10371037

‎ui/i18n/jquery.ui.datepicker-ca.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
/* Inicialització en català per a l'extenció 'calendar' per jQuery. */
1+
/* Inicialització en català per a l'extensió 'UI date picker' per jQuery. */
22
/* Writers: (joan.leon@gmail.com). */
33
jQuery(function($){
44
$.datepicker.regional['ca'] = {
5-
closeText: 'Tancar',
6-
prevText: '&#x3C;Ant',
7-
nextText: 'Seg&#x3E;',
5+
closeText: 'Tanca',
6+
prevText: 'Anterior',
7+
nextText: 'Següent',
88
currentText: 'Avui',
9-
monthNames: ['Gener','Febrer','Mar&#xE7;','Abril','Maig','Juny',
10-
'Juliol','Agost','Setembre','Octubre','Novembre','Desembre'],
11-
monthNamesShort: ['Gen','Feb','Mar','Abr','Mai','Jun',
12-
'Jul','Ago','Set','Oct','Nov','Des'],
13-
dayNames: ['Diumenge','Dilluns','Dimarts','Dimecres','Dijous','Divendres','Dissabte'],
14-
dayNamesShort: ['Dug','Dln','Dmt','Dmc','Djs','Dvn','Dsb'],
15-
dayNamesMin: ['Dg','Dl','Dt','Dc','Dj','Dv','Ds'],
16-
weekHeader: 'Sm',
9+
monthNames: ['gener','febrer','març','abril','maig','juny',
10+
'juliol','agost','setembre','octubre','novembre','desembre'],
11+
monthNamesShort: ['gen','feb','març','abr','maig','juny',
12+
'jul','ag','set','oct','nov','des'],
13+
dayNames: ['diumenge','dilluns','dimarts','dimecres','dijous','divendres','dissabte'],
14+
dayNamesShort: ['dg','dl','dt','dc','dj','dv','ds'],
15+
dayNamesMin: ['dg','dl','dt','dc','dj','dv','ds'],
16+
weekHeader: 'Set',
1717
dateFormat: 'dd/mm/yy',
1818
firstDay: 1,
1919
isRTL: false,
2020
showMonthAfterYear: false,
2121
yearSuffix: ''};
2222
$.datepicker.setDefaults($.datepicker.regional['ca']);
23-
});
23+
});

‎ui/i18n/jquery.ui.datepicker-cy-GB.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* Welsh/UK initialisation for the jQuery UI date picker plugin. */
2+
/* Written by William Griffiths. */
3+
jQuery(function($){
4+
$.datepicker.regional['cy-GB'] = {
5+
closeText: 'Done',
6+
prevText: 'Prev',
7+
nextText: 'Next',
8+
currentText: 'Today',
9+
monthNames: ['Ionawr','Chwefror','Mawrth','Ebrill','Mai','Mehefin',
10+
'Gorffennaf','Awst','Medi','Hydref','Tachwedd','Rhagfyr'],
11+
monthNamesShort: ['Ion', 'Chw', 'Maw', 'Ebr', 'Mai', 'Meh',
12+
'Gor', 'Aws', 'Med', 'Hyd', 'Tac', 'Rha'],
13+
dayNames: ['Dydd Sul', 'Dydd Llun', 'Dydd Mawrth', 'Dydd Mercher', 'Dydd Iau', 'Dydd Gwener', 'Dydd Sadwrn'],
14+
dayNamesShort: ['Sul', 'Llu', 'Maw', 'Mer', 'Iau', 'Gwe', 'Sad'],
15+
dayNamesMin: ['Su','Ll','Ma','Me','Ia','Gw','Sa'],
16+
weekHeader: 'Wy',
17+
dateFormat: 'dd/mm/yy',
18+
firstDay: 1,
19+
isRTL: false,
20+
showMonthAfterYear: false,
21+
yearSuffix: ''};
22+
$.datepicker.setDefaults($.datepicker.regional['cy-GB']);
23+
});

0 commit comments

Comments
 (0)