Skip to content

Commit cb8f5b7

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'master' into widget-events
Conflicts: ui/jquery.ui.widget.js
2 parents bb857dd + effbb2c commit cb8f5b7

29 files changed

+1845
-958
lines changed

‎demos/datepicker/date-range.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
numberOfMonths: 3,
1818
onSelect: function( selectedDate ) {
1919
var option = this.id == "from" ? "minDate" : "maxDate",
20-
instance = $( this ).data( "datepicker" );
20+
instance = $( this ).data( "datepicker" ),
2121
date = $.datepicker.parseDate(
2222
instance.settings.dateFormat ||
2323
$.datepicker._defaults.dateFormat,

‎demos/datepicker/localization.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<script src="../../ui/jquery.ui.datepicker.js"></script>
1111
<script src="../../ui/i18n/jquery.ui.datepicker-af.js"></script>
1212
<script src="../../ui/i18n/jquery.ui.datepicker-ar.js"></script>
13+
<script src="../../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
1314
<script src="../../ui/i18n/jquery.ui.datepicker-az.js"></script>
1415
<script src="../../ui/i18n/jquery.ui.datepicker-bg.js"></script>
1516
<script src="../../ui/i18n/jquery.ui.datepicker-bs.js"></script>
@@ -87,6 +88,7 @@
8788
<select id="locale">
8889
<option value="af">Afrikaans</option>
8990
<option value="sq">Albanian (Gjuha shqipe)</option>
91+
<option value="ar-DZ">Algerian Arabic</option>
9092
<option value="ar">Arabic (&#8235;(&#1604;&#1593;&#1585;&#1576;&#1610;</option>
9193
<option value="hy">Armenian (&#1344;&#1377;&#1397;&#1381;&#1408;&#1381;&#1398;)</option>
9294
<option value="az">Azerbaijani (Az&#601;rbaycan dili)</option>

‎demos/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<script src="../ui/jquery.effects.transfer.js"></script>
4545
<script src="../ui/i18n/jquery.ui.datepicker-af.js"></script>
4646
<script src="../ui/i18n/jquery.ui.datepicker-ar.js"></script>
47+
<script src="../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
4748
<script src="../ui/i18n/jquery.ui.datepicker-az.js"></script>
4849
<script src="../ui/i18n/jquery.ui.datepicker-bs.js"></script>
4950
<script src="../ui/i18n/jquery.ui.datepicker-bg.js"></script>

‎external/jquery.global.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,24 @@ Globalization.format = function(value, format, culture) {
151151
Globalization.parseInt = function(value, radix, culture) {
152152
return Math.floor( this.parseFloat( value, radix, culture ) );
153153
}
154-
Globalization.parseCurrency = function(value, culture) {
155-
return this.parseFloat(value.replace(/[^\d,.-]/g, ""), 10, culture);
156-
}
157154
Globalization.parseFloat = function(value, radix, culture) {
155+
// make radix optional
156+
if (typeof radix === "string") {
157+
culture = radix;
158+
radix = 10;
159+
}
160+
158161
culture = this.findClosestCulture( culture );
159162
var ret = NaN,
160163
nf = culture.numberFormat;
161164

165+
if (value.indexOf(culture.numberFormat.currency.symbol) > -1) {
166+
// remove currency symbol
167+
value = value.replace(culture.numberFormat.currency.symbol, "");
168+
// replace decimal seperator
169+
value = value.replace(culture.numberFormat.currency["."], culture.numberFormat["."]);
170+
}
171+
162172
// trim leading and trailing whitespace
163173
value = trim( value );
164174

‎external/qunit.css

Lines changed: 69 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/** Resets */
1212

13-
#qunit-tests, #qunit-tests li ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
13+
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
1414
margin: 0;
1515
padding: 0;
1616
}
@@ -20,10 +20,13 @@
2020

2121
#qunit-header {
2222
padding: 0.5em 0 0.5em 1em;
23-
24-
color: #fff;
25-
text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
23+
24+
color: #8699a4;
2625
background-color: #0d3349;
26+
27+
font-size: 1.5em;
28+
line-height: 1em;
29+
font-weight: normal;
2730

2831
border-radius: 15px 15px 0 0;
2932
-moz-border-radius: 15px 15px 0 0;
@@ -33,15 +36,22 @@
3336

3437
#qunit-header a {
3538
text-decoration: none;
36-
color: white;
39+
color: #c2ccd1;
40+
}
41+
42+
#qunit-header a:hover,
43+
#qunit-header a:focus {
44+
color: #fff;
3745
}
3846

3947
#qunit-banner {
4048
height: 5px;
4149
}
4250

4351
#qunit-testrunner-toolbar {
44-
padding: 0em 0 0.5em 2em;
52+
padding: 0.5em 0 0.5em 2em;
53+
color: #5E740B;
54+
background-color: #eee;
4555
}
4656

4757
#qunit-userAgent {
@@ -68,7 +78,7 @@
6878
cursor: pointer;
6979
}
7080

71-
#qunit-tests li ol {
81+
#qunit-tests ol {
7282
margin-top: 0.5em;
7383
padding: 0.5em;
7484

@@ -83,6 +93,45 @@
8393
-webkit-box-shadow: inset 0px 2px 13px #999;
8494
}
8595

96+
#qunit-tests table {
97+
border-collapse: collapse;
98+
margin-top: .2em;
99+
}
100+
101+
#qunit-tests th {
102+
text-align: right;
103+
vertical-align: top;
104+
padding: 0 .5em 0 0;
105+
}
106+
107+
#qunit-tests td {
108+
vertical-align: top;
109+
}
110+
111+
#qunit-tests pre {
112+
margin: 0;
113+
white-space: pre-wrap;
114+
word-wrap: break-word;
115+
}
116+
117+
#qunit-tests del {
118+
background-color: #e0f2be;
119+
color: #374e0c;
120+
text-decoration: none;
121+
}
122+
123+
#qunit-tests ins {
124+
background-color: #ffcaca;
125+
color: #500;
126+
text-decoration: none;
127+
}
128+
129+
/*** Test Counts */
130+
131+
#qunit-tests b.counts { color: black; }
132+
#qunit-tests b.passed { color: #5E740B; }
133+
#qunit-tests b.failed { color: #710909; }
134+
86135
#qunit-tests li li {
87136
margin: 0.5em;
88137
padding: 0.4em 0.5em 0.4em 0.5em;
@@ -99,13 +148,11 @@
99148
border-left: 26px solid #C6E746;
100149
}
101150

102-
#qunit-tests li.pass { color: #528CE0; background-color: #D2E0E6; }
103-
#qunit-tests li.pass span.test-name { color: #366097; }
151+
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
152+
#qunit-tests .pass .test-name { color: #366097; }
104153

105-
#qunit-tests li li.pass span.test-actual,
106-
#qunit-tests li li.pass span.test-expected { color: #999999; }
107-
108-
strong b.pass { color: #5E740B; }
154+
#qunit-tests .pass .test-actual,
155+
#qunit-tests .pass .test-expected { color: #999999; }
109156

110157
#qunit-banner.qunit-pass { background-color: #C6E746; }
111158

@@ -117,31 +164,28 @@ strong b.pass { color: #5E740B; }
117164
border-left: 26px solid #EE5757;
118165
}
119166

120-
#qunit-tests li.fail { color: #000000; background-color: #EE5757; }
121-
#qunit-tests li.fail span.test-name,
122-
#qunit-tests li.fail span.module-name { color: #000000; }
123-
124-
#qunit-tests li li.fail span.test-actual { color: #EE5757; }
125-
#qunit-tests li li.fail span.test-expected { color: green; }
167+
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
168+
#qunit-tests .fail .test-name,
169+
#qunit-tests .fail .module-name { color: #000000; }
126170

127-
strong b.fail { color: #710909; }
171+
#qunit-tests .fail .test-actual { color: #EE5757; }
172+
#qunit-tests .fail .test-expected { color: green; }
128173

129-
#qunit-banner.qunit-fail,
130-
#qunit-testrunner-toolbar { background-color: #EE5757; }
174+
#qunit-banner.qunit-fail { background-color: #EE5757; }
131175

132176

133177
/** Footer */
134178

135179
#qunit-testresult {
136180
padding: 0.5em 0.5em 0.5em 2.5em;
137-
181+
138182
color: #2b81af;
139183
background-color: #D2E0E6;
140184

141185
border-radius: 0 0 15px 15px;
142186
-moz-border-radius: 0 0 15px 15px;
143187
-webkit-border-bottom-right-radius: 15px;
144-
-webkit-border-bottom-left-radius: 15px;
188+
-webkit-border-bottom-left-radius: 15px;
145189
}
146190

147191
/** Fixture */
@@ -150,4 +194,4 @@ strong b.fail { color: #710909; }
150194
position: absolute;
151195
top: -10000px;
152196
left: -10000px;
153-
}
197+
}

0 commit comments

Comments
 (0)