Skip to content

Commit 8dc4b1b

Browse files
Merge pull request jquery-archive#5852 from frequent/table_refresh_XXX
table: added refresh method and tests for 1.3.1 - fixes jquery-archive#5842 and jquery-archive#5841 missing table-refresh methods
2 parents c9322d1 + 4bd5c29 commit 8dc4b1b

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

js/widgets/table.columntoggle.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ $.mobile.table.prototype.options.classes = $.extend(
3434
}
3535
);
3636

37-
$.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate", function( e ) {
38-
37+
$.mobile.document.delegate( ":jqmData(role='table')", "tablecreate refresh", function( e ) {
38+
3939
var $table = $( this ),
40-
event = e.type,
4140
self = $table.data( "mobile-table" ),
41+
event = e.type,
4242
o = self.options,
4343
ns = $.mobile.ns,
4444
id = ( $table.attr( "id" ) || o.classes.popup ) + "-popup"; //TODO BETTER FALLBACK ID HERE
@@ -47,7 +47,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
4747
return;
4848
}
4949

50-
if ( event !== "tableupdate" ) {
50+
if ( event !== "refresh" ) {
5151
self.element.addClass( o.classes.columnToggleTable );
5252

5353
var $menuButton = $( "<a href='#" + id + "' class='" + o.classes.columnBtn + "' data-" + ns + "rel='popup' data-" + ns + "mini='true'>" + o.columnBtnText + "</a>" ),
@@ -65,7 +65,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
6565

6666
$cells.addClass( o.classes.priorityPrefix + priority );
6767

68-
if ( event !== "tableupdate" ) {
68+
if ( event !== "refresh" ) {
6969
$("<label><input type='checkbox' checked />" + $( this ).text() + "</label>" )
7070
.appendTo( $menu )
7171
.children( 0 )
@@ -78,7 +78,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
7878
}
7979
}
8080
});
81-
if ( event !== "tableupdate" ) {
81+
if ( event !== "refresh" ) {
8282
$menu.appendTo( $popup );
8383
}
8484

@@ -89,7 +89,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
8989
$switchboard = $menu;
9090
}
9191

92-
if (event !== "tableupdate") {
92+
if (event !== "refresh") {
9393
$switchboard.on( "change", "input", function( e ){
9494
if( this.checked ){
9595
$( this ).jqmData( "cells" ).removeClass( "ui-table-cell-hidden" ).addClass( "ui-table-cell-visible" );
@@ -114,7 +114,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
114114
$switchboard.find( "input" ).each( function(){
115115
if (this.checked) {
116116
this.checked = $( this ).jqmData( "cells" ).eq(0).css( "display" ) === "table-cell";
117-
if (event === "tableupdate") {
117+
if (event === "refresh") {
118118
$( this ).jqmData( "cells" ).addClass('ui-table-cell-visible');
119119
}
120120
} else {
@@ -129,6 +129,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
129129
self.update();
130130

131131
});
132+
132133
})( jQuery );
133134
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
134135
});

js/widgets/table.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ $.widget( "mobile.table", $.mobile.widget, {
2424
},
2525

2626
refresh: function (create) {
27-
2827
var self = this,
2928
trs = this.element.find( "thead tr" );
3029

@@ -72,7 +71,7 @@ $.widget( "mobile.table", $.mobile.widget, {
7271

7372
// update table modes
7473
if ( create === undefined ) {
75-
this.element.trigger( 'tableupdate' );
74+
this.element.trigger( 'refresh' );
7675
}
7776
}
7877

@@ -82,6 +81,7 @@ $.widget( "mobile.table", $.mobile.widget, {
8281
$.mobile.document.bind( "pagecreate create", function( e ) {
8382
$.mobile.table.prototype.enhanceWithin( e.target );
8483
});
84+
8585
})( jQuery );
8686
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
8787
});

js/widgets/table.reflow.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $.mobile.table.prototype.options.classes = $.extend(
1919
}
2020
);
2121

22-
$.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate", function( e ) {
22+
$.mobile.document.delegate( ":jqmData(role='table')", "tablecreate refresh", function( e ) {
2323

2424
var $table = $( this ),
2525
event = e.type,
@@ -31,7 +31,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
3131
return;
3232
}
3333

34-
if ( event !== "tableupdate" ) {
34+
if ( event !== "refresh" ) {
3535
self.element.addClass( o.classes.reflowTable );
3636
}
3737

@@ -64,6 +64,7 @@ $.mobile.document.delegate( ":jqmData(role='table')", "tablecreate tableupdate",
6464
});
6565

6666
});
67+
6768
})( jQuery );
6869
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
6970
});

tests/unit/table/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<script src="../../swarminject.js"></script>
3636

3737
<script type="text/javascript">
38-
// basic
3938
$(window).on('refresh_test_table', function (e, data) {
4039
var tb = $(data).find('tbody'),
4140
newRow = '<tr><th data-test="abc">1</th><td>2</td><td>3</td><td data-col="3">4</td><td>5</td></tr>';

tests/unit/table/table_core.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
start();
138138
}, 800);
139139
});
140-
141140
asyncTest( "Column toggle table refresh" , function(){
142141
setTimeout(function () {
143142
// hide one column and refresh

0 commit comments

Comments
 (0)