Fix Bug 48087
This commit is contained in:
parent
24a9f3674b
commit
8c3c2b6cf6
|
@ -800,14 +800,17 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
getPasteSymbol: function(cellId) {
|
getPasteSymbol: function(cellId) {
|
||||||
var bUpdateRecents = cellId[0] === 'c';
|
var bUpdateRecents = false;
|
||||||
var sFont;
|
var sFont;
|
||||||
|
if (cellId && cellId.length>0) {
|
||||||
|
bUpdateRecents = (cellId[0] === 'c');
|
||||||
if(bUpdateRecents){
|
if(bUpdateRecents){
|
||||||
sFont = aFontSelects[nCurrentFont].displayValue;
|
sFont = aFontSelects[nCurrentFont].displayValue;
|
||||||
} else {
|
} else {
|
||||||
var nFontId = parseInt(cellId.split('_')[2]);
|
var nFontId = parseInt(cellId.split('_')[2]);
|
||||||
sFont = aFontSelects[nFontId].displayValue;
|
sFont = aFontSelects[nFontId].displayValue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents};
|
return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -831,7 +834,7 @@ define([
|
||||||
}
|
}
|
||||||
|
|
||||||
var special = this.btnSpecial.isActive();
|
var special = this.btnSpecial.isActive();
|
||||||
var settings = special ? this.getSpecialSymbol() : this.getPasteSymbol(this.$window.find('.cell-selected').attr('id'));
|
var settings = (state=='ok') ? (special ? this.getSpecialSymbol() : this.getPasteSymbol(this.$window.find('.cell-selected').attr('id'))) : {};
|
||||||
if (this.options.handler) {
|
if (this.options.handler) {
|
||||||
this.options.handler.call(this, this, state, settings);
|
this.options.handler.call(this, this, state, settings);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue