Add extention
This commit is contained in:
parent
e648acfbfc
commit
46b8b04edf
|
@ -218,11 +218,12 @@ define([
|
||||||
//config.isCrypted =true; //delete fore merge!
|
//config.isCrypted =true; //delete fore merge!
|
||||||
if ( this.labelDocName ) {
|
if ( this.labelDocName ) {
|
||||||
if ( config.isCrypted ) {
|
if ( config.isCrypted ) {
|
||||||
this.labelDocName.attr({'style':'text-align: left;'});
|
this.labelDocName.attr({'style':'text-align: left;'});
|
||||||
this.labelDocName.before(
|
this.labelDocName.before(
|
||||||
'<div class="inner-box-icon crypted">' +
|
'<div class="inner-box-icon crypted">' +
|
||||||
'<svg class="icon"><use xlink:href="#svg-icon-crypted"></use></svg>' +
|
'<svg class="icon"><use xlink:href="#svg-icon-crypted"></use></svg>' +
|
||||||
'</div>');
|
'</div>');
|
||||||
|
this.imgCrypted = this.labelDocName.parent().find('.crypted');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!config.isEdit || !config.customization || !config.customization.compactHeader) {
|
if (!config.isEdit || !config.customization || !config.customization.compactHeader) {
|
||||||
|
@ -356,19 +357,16 @@ define([
|
||||||
me.btnOptions.updateHint(me.tipViewSettings);
|
me.btnOptions.updateHint(me.tipViewSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
function cutDocName(name) {
|
|
||||||
var idx = name.lastIndexOf('.');
|
|
||||||
return (idx>0) ? name.substring(0, idx) : name ;
|
|
||||||
}
|
|
||||||
|
|
||||||
function onFocusDocName(e){
|
function onFocusDocName(e){
|
||||||
var me = this;
|
var me = this;
|
||||||
if(me.options.isNotTrimAfterPoint) return;
|
me.imgCrypted && me.imgCrypted.attr('hidden', true);
|
||||||
|
me.isSaveDocName =false;
|
||||||
var name = cutDocName(me.labelDocName.val());
|
if(me.withoutExt) return;
|
||||||
|
var name = me.cutDocName(me.labelDocName.val());
|
||||||
_.delay(function(){
|
_.delay(function(){
|
||||||
me.labelDocName.val(name);
|
me.labelDocName.val(name);
|
||||||
},100);
|
},100);
|
||||||
|
me.withoutExt = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onDocNameKeyDown(e) {
|
function onDocNameKeyDown(e) {
|
||||||
|
@ -377,34 +375,39 @@ define([
|
||||||
var name = me.labelDocName.val();
|
var name = me.labelDocName.val();
|
||||||
if ( e.keyCode == Common.UI.Keys.RETURN ) {
|
if ( e.keyCode == Common.UI.Keys.RETURN ) {
|
||||||
name = name.trim();
|
name = name.trim();
|
||||||
if ( !_.isEmpty(name) && cutDocName(me.documentCaption) !== name ) {
|
me.isSaveDocName =true;
|
||||||
|
if ( !_.isEmpty(name) && me.cutDocName(me.documentCaption) !== name ) {
|
||||||
if ( /[\t*\+:\"<>?|\\\\/]/gim.test(name) ) {
|
if ( /[\t*\+:\"<>?|\\\\/]/gim.test(name) ) {
|
||||||
_.defer(function() {
|
_.defer(function() {
|
||||||
Common.UI.error({
|
Common.UI.error({
|
||||||
msg: (new Common.Views.RenameDialog).txtInvalidName + "*+:\"<>?|\/"
|
msg: (new Common.Views.RenameDialog).txtInvalidName + "*+:\"<>?|\/"
|
||||||
, callback: function() {
|
, callback: function() {
|
||||||
_.delay(function() {
|
_.delay(function() {
|
||||||
me.options.isNotTrimAfterPoint = true;
|
|
||||||
me.labelDocName.focus();
|
me.labelDocName.focus();
|
||||||
|
me.isSaveDocName =true;
|
||||||
}, 50);
|
}, 50);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
me.labelDocName.blur();
|
//me.labelDocName.blur();
|
||||||
})
|
})
|
||||||
} else {
|
} else
|
||||||
|
if(me.withoutExt) {
|
||||||
me.options.wopi ? me.api.asc_wopi_renameFile(name) : Common.Gateway.requestRename(name);
|
me.options.wopi ? me.api.asc_wopi_renameFile(name) : Common.Gateway.requestRename(name);
|
||||||
|
name += me.fileExtention;
|
||||||
|
me.labelDocName.val(name);
|
||||||
|
me.withoutExt = false;
|
||||||
Common.NotificationCenter.trigger('edit:complete', me);
|
Common.NotificationCenter.trigger('edit:complete', me);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
me.labelDocName.val(me.documentCaption);
|
|
||||||
Common.NotificationCenter.trigger('edit:complete', me);
|
Common.NotificationCenter.trigger('edit:complete', me);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if ( e.keyCode == Common.UI.Keys.ESC ) {
|
if ( e.keyCode == Common.UI.Keys.ESC ) {
|
||||||
me.labelDocName.val(me.documentCaption);
|
|
||||||
Common.NotificationCenter.trigger('edit:complete', this);
|
Common.NotificationCenter.trigger('edit:complete', this);
|
||||||
} else {
|
} else {
|
||||||
me.labelDocName.attr('size', name.length > 10 ? name.length : 10);
|
me.labelDocName.attr('size', name.length + me.fileExtention.length > 10 ? name.length + me.fileExtention.length : 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -584,6 +587,7 @@ define([
|
||||||
!!me.labelDocName && me.labelDocName.hide().off(); // hide document title if it was created in right box
|
!!me.labelDocName && me.labelDocName.hide().off(); // hide document title if it was created in right box
|
||||||
me.labelDocName = $html.find('#title-doc-name');
|
me.labelDocName = $html.find('#title-doc-name');
|
||||||
me.labelDocName.val( me.documentCaption );
|
me.labelDocName.val( me.documentCaption );
|
||||||
|
me.options.wopi && me.labelDocName.attr('maxlength', me.options.wopi.FileNameMaxLength);
|
||||||
|
|
||||||
me.labelUserName = $('> #title-user-name', $html);
|
me.labelUserName = $('> #title-user-name', $html);
|
||||||
me.setUserName(me.options.userName);
|
me.setUserName(me.options.userName);
|
||||||
|
@ -649,6 +653,9 @@ define([
|
||||||
!value && (value = '');
|
!value && (value = '');
|
||||||
|
|
||||||
this.documentCaption = value;
|
this.documentCaption = value;
|
||||||
|
var idx = this.documentCaption.lastIndexOf('.');
|
||||||
|
if (idx>0)
|
||||||
|
this.fileExtention = this.documentCaption.substring(idx);
|
||||||
this.isModified && (value += '*');
|
this.isModified && (value += '*');
|
||||||
if ( this.labelDocName ) {
|
if ( this.labelDocName ) {
|
||||||
this.labelDocName.val( value );
|
this.labelDocName.val( value );
|
||||||
|
@ -700,7 +707,7 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
setCanRename: function (rename) {
|
setCanRename: function (rename) {
|
||||||
rename = true; //for merge rename = false; ??
|
// rename = true; //for merge rename = false; ??
|
||||||
|
|
||||||
var me = this;
|
var me = this;
|
||||||
me.options.canRename = rename;
|
me.options.canRename = rename;
|
||||||
|
@ -716,7 +723,11 @@ define([
|
||||||
'keydown': onDocNameKeyDown.bind(this),
|
'keydown': onDocNameKeyDown.bind(this),
|
||||||
'focus': onFocusDocName.bind(this),
|
'focus': onFocusDocName.bind(this),
|
||||||
'blur': function (e) {
|
'blur': function (e) {
|
||||||
me.options.isNotTrimAfterPoint =false;
|
me.imgCrypted && me.imgCrypted.attr('hidden', false);
|
||||||
|
if(!me.isSaveDocName) {
|
||||||
|
me.labelDocName.val(me.documentCaption);
|
||||||
|
me.withoutExt = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -733,6 +744,13 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
cutDocName: function(name) {
|
||||||
|
if((name.length <= this.fileExtention.length) && this.withoutExt) return;
|
||||||
|
var idx =name.length - this.fileExtention.length;
|
||||||
|
|
||||||
|
return (name.substring(idx) == this.fileExtention) ? name.substring(0, idx) : name ;
|
||||||
|
},
|
||||||
|
|
||||||
setUserName: function(name) {
|
setUserName: function(name) {
|
||||||
if ( !!this.labelUserName ) {
|
if ( !!this.labelUserName ) {
|
||||||
if ( !!name ) {
|
if ( !!name ) {
|
||||||
|
|
Loading…
Reference in a new issue