haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 11:57:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1556 from haiwen/rename-fix

Browse Source 
Rename fix
This commit is contained in:
Daniel Pan
2017-04-22 17:49:07 +08:00
committed by GitHub
parent f9e9b44ed9 dbc8d1b041
commit 666063f47c
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/scripts/app/models/dirent.js
View File

@@ -108,7 +108,7 @@ define([
data: post_data, data: post_data,
success: function(data) { success: function(data) {
var renamed_dirent_data = { var renamed_dirent_data = {
'obj_name': options.newname, 'obj_name': data.obj_name,
'last_modified': new Date().getTime()/1000, 'last_modified': new Date().getTime()/1000,
'last_update': gettext("Just now") 'last_update': gettext("Just now")
}; };

1
static/scripts/app/views/dialogs/dirent-rename.js
View File

@@ -24,6 +24,7 @@ define([
var $input = this.$('[name="newname"]'); var $input = this.$('[name="newname"]');
var dot_index = this.dirent.get('obj_name').lastIndexOf('.'); var dot_index = this.dirent.get('obj_name').lastIndexOf('.');
if (!this.dirent.get('is_dir') && dot_index != -1) { if (!this.dirent.get('is_dir') && dot_index != -1) {
$input[0].focus();
$input[0].setSelectionRange(0, dot_index); $input[0].setSelectionRange(0, dot_index);
} else { } else {
$input.select(); $input.select();

7
static/scripts/app/views/dirent.js
View File

@@ -366,9 +366,12 @@ define([
$op.hide(); $op.hide();
$name.hide(); $name.hide();
this.$el.attr('draggable', false);
var $input = $('[name="newname"]', form); var $input = $('[name="newname"]', form);
var dot_index = dirent_name.lastIndexOf('.'); var dot_index = dirent_name.lastIndexOf('.');
if (!this.model.get('is_dir') && dot_index != -1) { if (!this.model.get('is_dir') && dot_index != -1) {
$input[0].focus();
$input[0].setSelectionRange(0, dot_index); $input[0].setSelectionRange(0, dot_index);
} else { } else {
$input.select(); $input.select();
@@ -383,6 +386,8 @@ define([
app.ui.currentHighlightedItem.rmHighlight(); app.ui.currentHighlightedItem.rmHighlight();
} }
_this.$el.attr('draggable', true);
if (_this.model.get('is_img')) { if (_this.model.get('is_img')) {
var index = $('.img-name-link', _this.dirView.$dirent_list).index(_this.$('.img-name-link')); var index = $('.img-name-link', _this.dirView.$dirent_list).index(_this.$('.img-name-link'));
_this.dirView.updateMagnificPopupOptions({ _this.dirView.updateMagnificPopupOptions({
@@ -403,6 +408,8 @@ define([
$td.attr('colspan', 1).css({ $td.attr('colspan', 1).css({
'width': $name.width() 'width': $name.width()
}); });
_this.$el.attr('draggable', true);
return false; // stop bubbling (to 'doc click to hide .hidden-op') return false; // stop bubbling (to 'doc click to hide .hidden-op')
}; };
$('.cancel', form).click(cancelRename); $('.cancel', form).click(cancelRename);