',
@@ -468,9 +485,6 @@ define([
].join('');
this.options.tpl = _.template(this.template)(this.options);
- this.api = this.options.api;
- this.type = this.options.type || 0; // 0 - close on OK, single adding symbol
- this.showShortcutKey = this.options.showShortcutKey || false;
var init = (aFontSelects.length<1);
init && this.initFonts();
@@ -730,17 +744,17 @@ define([
simpleAddMode: true,
template: _.template(['
',
- '
<%= symbol %>
',
- '
<%= description %>
',
- '<% if (' + this.showShortcutKey + ') { %>',
- '
<%= shortcutKey %>
',
- '<% } %>',
+ '
',
+ '
<%= symbol %>
',
+ '
<%= description %>
',
+ '<% if (' + this.showShortcutKey + ') { %>',
+ '
<%= shortcutKey %>
',
+ '<% } %>',
'
'
].join(''))
});
- // this.specialList.on('item:dblclick', _.bind(this.onDblClickItem, this))
- // .on('entervalue', _.bind(this.onDblClickItem, this));
+ this.specialList.on('item:dblclick', _.bind(this.onDblClickSpecialItem, this))
+ .on('entervalue', _.bind(this.onDblClickSpecialItem, this));
this.specialList.selectByIndex(0);
this.lblShortCut = $window.find('#symbol-table-lbl-shortcut');
@@ -761,21 +775,16 @@ define([
$(document).on('keydown.' + this.cid, '#symbol-table-scrollable-div #id-preview-data, #symbol-table-recent', this.binding.keydownSymbols);
$(document).on('keypress.' + this.cid, '#symbol-table-scrollable-div #id-preview-data, #symbol-table-recent', this.binding.keypressSymbols);
- var special = !!Common.Utils.InternalSettings.get(this.appPrefix + "symbol-table-special");
+ var special = this.special && !!Common.Utils.InternalSettings.get(this.appPrefix + "symbol-table-special");
special ? this.btnSpecial.toggle(true) : this.btnSymbols.toggle(true);
this.ShowHideElem(special);
-
- var me = this;
- _.delay(function(){
- me.previewPanel.focus();
- },50);
},
close: function(suppressevent) {
$(document).off('keydown.' + this.cid, this.binding.keydownSymbols);
$(document).off('keypress.' + this.cid, this.binding.keypressSymbols);
- Common.Utils.InternalSettings.set(this.appPrefix + "symbol-table-special", this.btnSpecial.isActive());
+ this.special && Common.Utils.InternalSettings.set(this.appPrefix + "symbol-table-special", this.btnSpecial.isActive());
Common.UI.Window.prototype.close.apply(this, arguments);
},
@@ -1047,6 +1056,15 @@ define([
}
},
+ onDblClickSpecialItem: function(e) {
+ if (!this.type)
+ this._handleInput('ok');
+ else {
+ var settings = this.getSpecialSymbol();
+ this.fireEvent('symbol:dblclick', this, 'ok', settings);
+ }
+ },
+
updateRecents: function(){
var oRecentsDiv = this.recentPanel;
oRecentsDiv.empty();
@@ -1401,7 +1419,7 @@ define([
this.curSize = {resize: false, width: size[0], height: size[1]};
} else if (this.curSize.resize) {
this._preventUpdateScroll = false;
- this.curSize.height = size[1] - 302;
+ this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
height = rows*CELL_HEIGHT;
@@ -1412,8 +1430,9 @@ define([
this.updateView(undefined, undefined, undefined, true);
- this.specialList.cmpEl.height(size[1] - 156);
+ this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
+ !this.special && (size[1] += 38);
var valJson = JSON.stringify(size);
Common.localStorage.setItem(this.appPrefix + 'settings-size-symbol-table', valJson);
Common.Utils.InternalSettings.set(this.appPrefix + 'settings-size-symbol-table', valJson);
@@ -1429,7 +1448,7 @@ define([
this.curSize.resize = true;
this.curSize.width = size[0];
- this.curSize.height = size[1] - 302;
+ this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
height = rows*CELL_HEIGHT;
@@ -1438,7 +1457,7 @@ define([
this.previewPanel.css({'height': height + 'px'});
this.previewScrolled.css({'height': height + 'px'});
- this.specialList.cmpEl.height(size[1] - 156);
+ this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
this.updateView(undefined, undefined, undefined, true);
}
@@ -1451,6 +1470,11 @@ define([
ShowHideElem: function(special) {
this.symbolsPanel.toggleClass('hidden', special);
this.specialPanel.toggleClass('hidden', !special);
+ var me = this;
+ _.delay(function(){
+ special ? me.specialList.cmpEl.find('.listview').focus() : me.previewPanel.focus();
+ },50);
+
},
textTitle: 'Symbol',
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index ea0a27083..a5b9367cf 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -2562,6 +2562,8 @@ define([
lang: me.mode.lang,
modal: false,
type: 1,
+ special: true,
+ showShortcutKey: true,
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
handler: function(dlg, result, settings) {
if (result == 'ok') {
@@ -2572,7 +2574,7 @@ define([
});
me.dlgSymbolTable.show();
me.dlgSymbolTable.on('symbol:dblclick', function(cmp, result, settings) {
- me.api.asc_insertSymbol(settings.font, settings.code);
+ me.api.asc_insertSymbol(settings.font ? settings.font : me.api.get_TextProps().get_TextPr().get_FontFamily().get_Name(), settings.code);
});
}
},
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 8424d3d9c..57a487fe7 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -362,6 +362,28 @@
"Common.Views.SymbolTableDialog.textRange": "Range",
"Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
+ "Common.Views.SymbolTableDialog.textSymbols": "Symbols",
+ "Common.Views.SymbolTableDialog.textSpecial": "Special characters",
+ "Common.Views.SymbolTableDialog.textCharacter": "Character",
+ "Common.Views.SymbolTableDialog.textShortcut": "Shortcut key",
+ "Common.Views.SymbolTableDialog.textEmDash": "Em Dash",
+ "Common.Views.SymbolTableDialog.textEnDash": "En Dash",
+ "Common.Views.SymbolTableDialog.textNBHyphen": "Non-breaking Hyphen",
+ "Common.Views.SymbolTableDialog.textSHyphen": "Soft Hyphen",
+ "Common.Views.SymbolTableDialog.textEmSpace": "Em Space",
+ "Common.Views.SymbolTableDialog.textEnSpace": "En Space",
+ "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em Space",
+ "Common.Views.SymbolTableDialog.textNBSpace": "No-break Space",
+ "Common.Views.SymbolTableDialog.textCopyright": "Copyright Sign",
+ "Common.Views.SymbolTableDialog.textRegistered": "Registered Sign",
+ "Common.Views.SymbolTableDialog.textTradeMark": "Trade Mark Sign",
+ "Common.Views.SymbolTableDialog.textSection": "Section Sign",
+ "Common.Views.SymbolTableDialog.textPilcrow": "Pilcrow Sign",
+ "Common.Views.SymbolTableDialog.textEllipsis": "Horizontal Ellipsis",
+ "Common.Views.SymbolTableDialog.textSOQuote": "Single Opening Quote",
+ "Common.Views.SymbolTableDialog.textSCQuote": "Single Closing Quote",
+ "Common.Views.SymbolTableDialog.textDOQuote": "Double Opening Quote",
+ "Common.Views.SymbolTableDialog.textDCQuote": "Double Closing Quote",
"DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.
Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
"DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 632d45267..6d4c89df1 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -1861,17 +1861,18 @@ define([
api: me.api,
lang: me.toolbar.mode.lang,
type: 1,
+ special: true,
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
handler: function(dlg, result, settings) {
if (result == 'ok') {
- me.api.asc_insertSymbol(settings.font, settings.code);
+ me.api.asc_insertSymbol(settings.font ? settings.font : me.api.get_TextProps().get_TextPr().get_FontFamily().get_Name(), settings.code);
} else
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
win.show();
win.on('symbol:dblclick', function(cmp, result, settings) {
- me.api.asc_insertSymbol(settings.font, settings.code);
+ me.api.asc_insertSymbol(settings.font ? settings.font : me.api.get_TextProps().get_TextPr().get_FontFamily().get_Name(), settings.code);
});
}
},
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 0f00e2158..74ca7d88e 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -244,6 +244,28 @@
"Common.Views.SymbolTableDialog.textRange": "Range",
"Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
+ "Common.Views.SymbolTableDialog.textSymbols": "Symbols",
+ "Common.Views.SymbolTableDialog.textSpecial": "Special characters",
+ "Common.Views.SymbolTableDialog.textCharacter": "Character",
+ "Common.Views.SymbolTableDialog.textShortcut": "Shortcut key",
+ "Common.Views.SymbolTableDialog.textEmDash": "Em Dash",
+ "Common.Views.SymbolTableDialog.textEnDash": "En Dash",
+ "Common.Views.SymbolTableDialog.textNBHyphen": "Non-breaking Hyphen",
+ "Common.Views.SymbolTableDialog.textSHyphen": "Soft Hyphen",
+ "Common.Views.SymbolTableDialog.textEmSpace": "Em Space",
+ "Common.Views.SymbolTableDialog.textEnSpace": "En Space",
+ "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em Space",
+ "Common.Views.SymbolTableDialog.textNBSpace": "No-break Space",
+ "Common.Views.SymbolTableDialog.textCopyright": "Copyright Sign",
+ "Common.Views.SymbolTableDialog.textRegistered": "Registered Sign",
+ "Common.Views.SymbolTableDialog.textTradeMark": "Trade Mark Sign",
+ "Common.Views.SymbolTableDialog.textSection": "Section Sign",
+ "Common.Views.SymbolTableDialog.textPilcrow": "Pilcrow Sign",
+ "Common.Views.SymbolTableDialog.textEllipsis": "Horizontal Ellipsis",
+ "Common.Views.SymbolTableDialog.textSOQuote": "Single Opening Quote",
+ "Common.Views.SymbolTableDialog.textSCQuote": "Single Closing Quote",
+ "Common.Views.SymbolTableDialog.textDOQuote": "Double Opening Quote",
+ "Common.Views.SymbolTableDialog.textDCQuote": "Double Closing Quote",
"PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
"PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
"PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 91241cf98..c3ed3e331 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -2742,17 +2742,18 @@ define([
api: me.api,
lang: me.toolbar.mode.lang,
type: 1,
+ special: true,
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
handler: function(dlg, result, settings) {
if (result == 'ok') {
- me.api.asc_insertSymbol(settings.font, settings.code);
+ me.api.asc_insertSymbol(settings.font ? settings.font : me.api.asc_getCellInfo().asc_getFont().asc_getName(), settings.code);
} else
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
win.show();
win.on('symbol:dblclick', function(cmp, result, settings) {
- me.api.asc_insertSymbol(settings.font, settings.code);
+ me.api.asc_insertSymbol(settings.font ? settings.font : me.api.asc_getCellInfo().asc_getFont().asc_getName(), settings.code);
});
}
},
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index de0c53273..b8d0edbdf 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -242,6 +242,28 @@
"Common.Views.SymbolTableDialog.textRange": "Range",
"Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
+ "Common.Views.SymbolTableDialog.textSymbols": "Symbols",
+ "Common.Views.SymbolTableDialog.textSpecial": "Special characters",
+ "Common.Views.SymbolTableDialog.textCharacter": "Character",
+ "Common.Views.SymbolTableDialog.textShortcut": "Shortcut key",
+ "Common.Views.SymbolTableDialog.textEmDash": "Em Dash",
+ "Common.Views.SymbolTableDialog.textEnDash": "En Dash",
+ "Common.Views.SymbolTableDialog.textNBHyphen": "Non-breaking Hyphen",
+ "Common.Views.SymbolTableDialog.textSHyphen": "Soft Hyphen",
+ "Common.Views.SymbolTableDialog.textEmSpace": "Em Space",
+ "Common.Views.SymbolTableDialog.textEnSpace": "En Space",
+ "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em Space",
+ "Common.Views.SymbolTableDialog.textNBSpace": "No-break Space",
+ "Common.Views.SymbolTableDialog.textCopyright": "Copyright Sign",
+ "Common.Views.SymbolTableDialog.textRegistered": "Registered Sign",
+ "Common.Views.SymbolTableDialog.textTradeMark": "Trade Mark Sign",
+ "Common.Views.SymbolTableDialog.textSection": "Section Sign",
+ "Common.Views.SymbolTableDialog.textPilcrow": "Pilcrow Sign",
+ "Common.Views.SymbolTableDialog.textEllipsis": "Horizontal Ellipsis",
+ "Common.Views.SymbolTableDialog.textSOQuote": "Single Opening Quote",
+ "Common.Views.SymbolTableDialog.textSCQuote": "Single Closing Quote",
+ "Common.Views.SymbolTableDialog.textDOQuote": "Double Opening Quote",
+ "Common.Views.SymbolTableDialog.textDCQuote": "Double Closing Quote",
"SSE.Controllers.DataTab.textWizard": "Text to Columns",
"SSE.Controllers.DocumentHolder.alignmentText": "Alignment",
"SSE.Controllers.DocumentHolder.centerText": "Center",