haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-18 15:08:22 +00:00
Code Issues Releases Wiki Activity

Merge pull request #720 from haiwen/sort

Browse Source 
Sort
This commit is contained in:
llj 2015-07-14 14:49:07 +08:00
commit 7e325c815a
6 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
seahub/templates/js/templates.html
View File

@ -173,10 +173,10 @@
</th> </th>
<th class="star"></th> <th class="star"></th>
<th class="dirent-icon"></th> <th class="dirent-icon"></th>
<th><span class="dirent-name">{% trans "Name"%} <span id="by-name" class="icon-caret-up cspt"></span></span></th> <th class="by-name cspt"><span class="dirent-name">{% trans "Name"%} <span class="sort-icon icon-caret-up"></span></span></th>
<th class="dirent-op"></th> <th class="dirent-op"></th>
<th class="dirent-size">{% trans "Size"%}</th> <th class="dirent-size">{% trans "Size"%}</th>
<th class="dirent-update">{% trans "Last Update" %} <span id="by-time" class="icon-caret-down cspt"></span></th> <th class="dirent-update by-time cspt">{% trans "Last Update" %} <span class="sort-icon icon-caret-down hide"></span></th>
</tr> </tr>
</script> </script>
<script type="text/template" id="dirent-tmpl"> <script type="text/template" id="dirent-tmpl">
@ -702,19 +702,19 @@
<script type="text/template" id="my-repos-hd-tmpl"> <script type="text/template" id="my-repos-hd-tmpl">
<tr> <tr>
<th width="4%"><!--icon--></th> <th width="4%"><!--icon--></th>
<th width="46%">{% trans "Name" %} <span class="by-name icon-caret-up cspt"></span></th> <th width="46%" class="by-name cspt">{% trans "Name" %} <span class="sort-icon icon-caret-down hide"></span></th>
<th width="10%"><!--op--></th> <th width="10%"><!--op--></th>
<th width="20%">{% trans "Size" %}</th> <th width="20%">{% trans "Size" %}</th>
<th width="20%">{% trans "Last Update" %} <span class="by-time icon-caret-down cspt"></span></th> <th width="20%" class="by-time cspt">{% trans "Last Update" %} <span class="sort-icon icon-caret-up"></span></th>
</tr> </tr>
</script> </script>
<script type="text/template" id="shared-repos-hd-tmpl"> <script type="text/template" id="shared-repos-hd-tmpl">
<tr> <tr>
<th width="4%"><!--icon--></th> <th width="4%"><!--icon--></th>
<th width="40%">{% trans "Name" %} <span class="by-name icon-caret-up cspt"></span></th> <th width="40%" class="by-name cspt">{% trans "Name" %} <span class="sort-icon icon-caret-down hide"></span></th>
<th width="8%"><!--op--></th> <th width="8%"><!--op--></th>
<th width="14%">{% trans "Size" %}</th> <th width="14%">{% trans "Size" %}</th>
<th width="18%">{% trans "Last Update" %} <span class="by-time icon-caret-down cspt"></span></th> <th width="18%" class="by-time cspt">{% trans "Last Update" %} <span class="sort-icon icon-caret-up"></span></th>
<th width="16%">{% trans "Shared By" %}</th> <th width="16%">{% trans "Shared By" %}</th>
</tr> </tr>
</script> </script>

24
static/scripts/app/views/dir.js
View File

@ -293,8 +293,8 @@ define([
'click #mv-dirents': 'mv', 'click #mv-dirents': 'mv',
'click #cp-dirents': 'cp', 'click #cp-dirents': 'cp',
'click #del-dirents': 'del', 'click #del-dirents': 'del',
'click #by-name': 'sortByName', 'click .by-name': 'sortByName',
'click #by-time': 'sortByTime' 'click .by-time': 'sortByTime'
}, },
newDir: function() { newDir: function() {
@ -450,13 +450,16 @@ define([
}, },
sortByName: function() { sortByName: function() {
this.$('.by-time .sort-icon').hide();
var dirents = this.dir; var dirents = this.dir;
var el = $('#by-name'); var el = this.$('.by-name .sort-icon');
dirents.comparator = function(a, b) { dirents.comparator = function(a, b) {
if (a.get('is_dir') && b.get('is_file')) { if (a.get('is_dir') && b.get('is_file')) {
return -1; return -1;
} else if (a.get('is_file') && b.get('is_dir')) { }
if (a.get('is_file') && b.get('is_dir')) {
return 1; return 1;
} }
@ -467,21 +470,25 @@ define([
return result; return result;
} }
}; };
dirents.sort(); dirents.sort();
this.$dirent_list.empty(); this.$dirent_list.empty();
dirents.each(this.addOne, this); dirents.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
dirents.comparator = null; dirents.comparator = null;
}, },
sortByTime: function () { sortByTime: function () {
this.$('.by-name .sort-icon').hide();
var dirents = this.dir; var dirents = this.dir;
var el = $('#by-time'); var el = this.$('.by-time .sort-icon');
dirents.comparator = function(a, b) { dirents.comparator = function(a, b) {
if (a.get('is_dir') && b.get('is_file')) { if (a.get('is_dir') && b.get('is_file')) {
return -1; return -1;
} }
if (a.get('is_file') && b.get('is_dir')) {
return 1;
}
if (el.hasClass('icon-caret-down')) { if (el.hasClass('icon-caret-down')) {
return a.get('last_modified') < b.get('last_modified') ? 1 : -1; return a.get('last_modified') < b.get('last_modified') ? 1 : -1;
} else { } else {
@ -489,9 +496,10 @@ define([
} }
}; };
dirents.sort(); dirents.sort();
this.$dirent_list.empty(); this.$dirent_list.empty();
dirents.each(this.addOne, this); dirents.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
dirents.comparator = null; dirents.comparator = null;
}, },

15
static/scripts/app/views/group.js
View File

@ -18,8 +18,8 @@ define([
events: { events: {
'click .repo-create': 'createRepo', 'click .repo-create': 'createRepo',
'click #grp-repos .by-name': 'sortByName', 'click .by-name': 'sortByName',
'click #grp-repos .by-time': 'sortByTime' 'click .by-time': 'sortByTime'
}, },
initialize: function(options) { initialize: function(options) {
@ -131,8 +131,9 @@ define([
}, },
sortByName: function() { sortByName: function() {
this.$('.by-time .sort-icon').hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-name', this.$table); var el = this.$('.by-name .sort-icon');
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
var result = Common.compareTwoWord(a.get('name'), b.get('name')); var result = Common.compareTwoWord(a.get('name'), b.get('name'));
if (el.hasClass('icon-caret-up')) { if (el.hasClass('icon-caret-up')) {
@ -144,14 +145,14 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
}, },
sortByTime: function() { sortByTime: function() {
this.$('.by-name .sort-icon').hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-time', this.$table); var el = this.$('.by-time .sort-icon');
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
if (el.hasClass('icon-caret-down')) { if (el.hasClass('icon-caret-down')) {
return a.get('mtime') < b.get('mtime') ? 1 : -1; return a.get('mtime') < b.get('mtime') ? 1 : -1;
@ -162,7 +163,7 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
}, },

10
static/scripts/app/views/myhome-repos.js
View File

@ -114,8 +114,9 @@ define([
}, },
sortByName: function() { sortByName: function() {
$('.by-time .sort-icon').hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-name', this.$table); var el = $('.by-name .sort-icon', this.$table);
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
var result = Common.compareTwoWord(a.get('name'), b.get('name')); var result = Common.compareTwoWord(a.get('name'), b.get('name'));
if (el.hasClass('icon-caret-up')) { if (el.hasClass('icon-caret-up')) {
@ -127,13 +128,14 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
}, },
sortByTime: function() { sortByTime: function() {
$('.by-name .sort-icon').hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-time', this.$table); var el = $('.by-time .sort-icon', this.$table);
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
if (el.hasClass('icon-caret-down')) { if (el.hasClass('icon-caret-down')) {
return a.get('mtime') < b.get('mtime') ? 1 : -1; return a.get('mtime') < b.get('mtime') ? 1 : -1;
@ -144,7 +146,7 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
} }

10
static/scripts/app/views/myhome-shared-repos.js
View File

@ -100,8 +100,9 @@ define([
}, },
sortByName: function() { sortByName: function() {
$('.by-time .sort-icon', this.$table).hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-name', this.$table); var el = $('.by-name .sort-icon', this.$table);
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
var result = Common.compareTwoWord(a.get('name'), b.get('name')); var result = Common.compareTwoWord(a.get('name'), b.get('name'));
if (el.hasClass('icon-caret-up')) { if (el.hasClass('icon-caret-up')) {
@ -113,13 +114,14 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
}, },
sortByTime: function() { sortByTime: function() {
$('.by-name .sort-icon', this.$table).hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-time', this.$table); var el = $('.by-time .sort-icon', this.$table);
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
if (el.hasClass('icon-caret-down')) { if (el.hasClass('icon-caret-down')) {
return a.get('mtime') < b.get('mtime') ? 1 : -1; return a.get('mtime') < b.get('mtime') ? 1 : -1;
@ -130,7 +132,7 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
} }

10
static/scripts/app/views/organization.js
View File

@ -139,8 +139,9 @@ define([
}, },
sortByName: function() { sortByName: function() {
$('.by-time .sort-icon', this.$table).hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-name', this.$table); var el = $('.by-name .sort-icon', this.$table);
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
var result = Common.compareTwoWord(a.get('name'), b.get('name')); var result = Common.compareTwoWord(a.get('name'), b.get('name'));
if (el.hasClass('icon-caret-up')) { if (el.hasClass('icon-caret-up')) {
@ -152,13 +153,14 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
}, },
sortByTime: function() { sortByTime: function() {
$('.by-name .sort-icon', this.$table).hide();
var repos = this.repos; var repos = this.repos;
var el = $('.by-time', this.$table); var el = $('.by-time .sort-icon', this.$table);
repos.comparator = function(a, b) { // a, b: model repos.comparator = function(a, b) { // a, b: model
if (el.hasClass('icon-caret-down')) { if (el.hasClass('icon-caret-down')) {
return a.get('mtime') < b.get('mtime') ? 1 : -1; return a.get('mtime') < b.get('mtime') ? 1 : -1;
@ -169,7 +171,7 @@ define([
repos.sort(); repos.sort();
this.$tableBody.empty(); this.$tableBody.empty();
repos.each(this.addOne, this); repos.each(this.addOne, this);
el.toggleClass('icon-caret-up icon-caret-down'); el.toggleClass('icon-caret-up icon-caret-down').show();
repos.comparator = null; repos.comparator = null;
}, },