Skip to content

Commit a2d5b5f

Browse files
committed
Switch from $.global to Globalize
1 parent f936455 commit a2d5b5f

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

grid-datamodel/datasort.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<link rel="stylesheet" href="grid.css">
88
<script src="../jquery-1.6.2.js"></script>
99
<script src="../external/jquery.tmpl.js"></script>
10-
<script src="../external/jquery.global.js"></script>
11-
<script src="../external/jquery.global.de-DE.js"></script>
12-
<script src="../external/jquery.global.ja-JP.js"></script>
10+
<script src="../external/globalize.js"></script>
11+
<script src="../external/globalize.culture.de-DE.js"></script>
12+
<script src="../external/globalize.culture.ja-JP.js"></script>
1313
<script src="../ui/jquery.ui.core.js"></script>
1414
<script src="../ui/jquery.ui.widget.js"></script>
1515
<script src="dataitem.js"></script>
@@ -43,9 +43,9 @@
4343
function extract( row ) {
4444
var text = row.options.data[ fieldname ];
4545
if ( field.type == "currency" ) {
46-
return $.global.parseFloat( text, field.culture );
46+
return Globalize.parseFloat( text, field.culture );
4747
} else if ( field.type == "date" ) {
48-
return $.global.parseDate( text, field.format, field.culture );
48+
return Globalize.parseDate( text, field.format, field.culture );
4949
} else {
5050
return text;
5151
}

grid-type/detection.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<meta charset="utf-8">
66
<link rel="stylesheet" href="../themes/base/jquery.ui.all.css" title="ui-theme" />
77
<script src="../jquery-1.6.2.js"></script>
8-
<script src="../external/jquery.global.js"></script>
9-
<script src="../external/jquery.global.de-DE.js"></script>
10-
<script src="../external/jquery.global.ja-JP.js"></script>
8+
<script src="../external/globalize.js"></script>
9+
<script src="../external/globalize.culture.de-DE.js"></script>
10+
<script src="../external/globalize.culture.ja-JP.js"></script>
1111
<script>
1212
$(function() {
1313
var table = $( "table" );
@@ -20,16 +20,16 @@
2020

2121
tbody.children().each( function() {
2222
var cell = $( this.cells[ index ] ).text();
23-
if ( $.global.parseDate( cell ) ) {
23+
if ( Globalize.parseDate( cell ) ) {
2424
type = "date";
25-
} else if ( $.global.parseFloat( cell ) ) {
25+
} else if ( Globalize.parseFloat( cell ) ) {
2626
type = "number"
27-
if ( cell.indexOf( $.global.cultures["default"].numberFormat.currency.symbol ) > -1 ) {
27+
if ( cell.indexOf( Globalize.cultures["default"].numberFormat.currency.symbol ) > -1 ) {
2828
type = "currency";
2929
}
3030
}
3131
});
32-
32+
3333
$( this ).text( function( index, text ) {
3434
return text + " (" + type + ")";
3535
})

0 commit comments

Comments
 (0)