Merge

2026-09-24 16:30:27 +08:00 · 2015-03-04 13:17:57 -05:00
parent a5a64c648d aa9c7e604e
commit c70f6dc041
3 changed files with 5 additions and 3 deletions
@@ -439,7 +439,7 @@ var MultiPanelColumns = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
            // default
            update : {
                text: _l( 'most recent first' ),
-                fn: _comparator( function( h ){ return Date( h.get( 'update_time' ) ); }, { asc : false })
+                fn: _comparator( function( h ){ return new Date( h.get( 'update_time' ) ); }, { asc : false })
            },
            'name' : {
                text: _l( 'name, a to z' ),
@@ -542,6 +542,7 @@ var MultiPanelColumns = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
     *      (sorting the collection will re-render the panel)
     */
    sortCollection : function( order, options ){
+        order = !_.isUndefined( order )? order : this.order;
        if( !( order in this.sortOrders ) ){
            order = 'update';
        }
@@ -439,7 +439,7 @@ var MultiPanelColumns = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
            // default
            update : {
                text: _l( 'most recent first' ),
-                fn: _comparator( function( h ){ return Date( h.get( 'update_time' ) ); }, { asc : false })
+                fn: _comparator( function( h ){ return new Date( h.get( 'update_time' ) ); }, { asc : false })
            },
            'name' : {
                text: _l( 'name, a to z' ),
@@ -542,6 +542,7 @@ var MultiPanelColumns = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
     *      (sorting the collection will re-render the panel)
     */
    sortCollection : function( order, options ){
+        order = !_.isUndefined( order )? order : this.order;
        if( !( order in this.sortOrders ) ){
            order = 'update';
        }