Merge branch 'develop' into hotfix/v5.1.3
maxkadushkin
GitHub
|
|
@ -1,14 +1,18 @@
|
|||
# Change log
|
||||
## 5.1.3
|
||||
## 5.1.1
|
||||
### All Editors
|
||||
* Customize initial zoom for the embedded editors
|
||||
* Replace image from context menu (bug #11493)
|
||||
* Customize availability of help in the editor
|
||||
|
||||
### Document Editor
|
||||
* Create and manage bookmarks
|
||||
* Create internal hyperlinks to bookmarks and headings
|
||||
* Export to RTF format
|
||||
|
||||
### Spreadsheet Editor
|
||||
* Add Spanish, French formula translations
|
||||
* Set options for saving in PDF format (bug #34914)
|
||||
* Change cell format from context menu (bug #16272)
|
||||
|
||||
### Presentation Editor
|
||||
|
|
|
|||
|
|
@ -119,7 +119,8 @@
|
|||
autosave: true,
|
||||
forcesave: false,
|
||||
commentAuthorOnly: false,
|
||||
showReviewChanges: false
|
||||
showReviewChanges: false,
|
||||
help: true
|
||||
},
|
||||
plugins: {
|
||||
autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
|
||||
|
|
@ -191,6 +192,7 @@
|
|||
_config.editorConfig.canSendEmailAddresses = _config.events && !!_config.events.onRequestEmailAddresses;
|
||||
_config.editorConfig.canRequestEditRights = _config.events && !!_config.events.onRequestEditRights;
|
||||
_config.editorConfig.canRequestClose = _config.events && !!_config.events.onRequestClose;
|
||||
_config.editorConfig.canRename = _config.events && !!_config.events.onRequestRename;
|
||||
_config.frameEditorId = placeholderId;
|
||||
|
||||
_config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead.");
|
||||
|
|
|
|||
|
|
@ -50,21 +50,26 @@ define([
|
|||
_.extend(config, opts);
|
||||
|
||||
if ( config.isDesktopApp ) {
|
||||
Common.NotificationCenter.on('app:ready', function (config) {
|
||||
Common.NotificationCenter.on('app:ready', function (opts) {
|
||||
_.extend(config, opts);
|
||||
!!app && app.execCommand('doc:onready', '');
|
||||
});
|
||||
}
|
||||
},
|
||||
process: function (opts) {
|
||||
if ( opts == 'goback' ) {
|
||||
if ( config.isDesktopApp && !!app ) {
|
||||
if ( config.isDesktopApp && !!app ) {
|
||||
if ( opts == 'goback' ) {
|
||||
app.execCommand('go:folder',
|
||||
config.isOffline ? 'offline' : config.customization.goback.url);
|
||||
return true;
|
||||
} else
|
||||
if ( opts == 'preloader:hide' ) {
|
||||
app.execCommand('editor:onready', '');
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -193,10 +193,12 @@ define([
|
|||
_handleInput: function(state) {
|
||||
if (this.handler) {
|
||||
if (this.cmbEncoding) {
|
||||
var delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
|
||||
var encoding = (!this.cmbEncoding.isDisabled()) ? this.cmbEncoding.getValue() :
|
||||
((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : 0),
|
||||
delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
|
||||
delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
|
||||
(delimiter == -1) && (delimiter = null);
|
||||
this.handler.call(this, this.cmbEncoding.getValue(), delimiter, delimiterChar);
|
||||
this.handler.call(this, encoding, delimiter, delimiterChar);
|
||||
} else {
|
||||
this.handler.call(this, state, this.inputPwd.getValue());
|
||||
}
|
||||
|
|
@ -206,7 +208,7 @@ define([
|
|||
},
|
||||
|
||||
initCodePages: function () {
|
||||
var i, c, codepage, encodedata = [], listItems = [], length = 0;
|
||||
var i, c, codepage, encodedata = [], listItems = [], length = 0, lcid_width = 0;
|
||||
|
||||
if (this.codepages) {
|
||||
encodedata = [];
|
||||
|
|
@ -215,218 +217,99 @@ define([
|
|||
c = [];
|
||||
c[0] = codepage.asc_getCodePage();
|
||||
c[1] = codepage.asc_getCodePageName();
|
||||
c[2] = codepage.asc_getLcid();
|
||||
|
||||
encodedata.push(c);
|
||||
}
|
||||
} else {
|
||||
encodedata = [
|
||||
[37, 'IBM EBCDIC (US-Canada)'],
|
||||
[437, 'OEM United States'],
|
||||
[500, 'IBM EBCDIC (International)'],
|
||||
[708, 'Arabic (ASMO 708)'],
|
||||
[720, 'Arabic (DOS)'],
|
||||
[737, 'Greek (DOS)'],
|
||||
[775, 'Baltic (DOS)'],
|
||||
[850, 'Western European (DOS)'],
|
||||
[852, 'Central European (DOS)'],
|
||||
[855, 'OEM Cyrillic'],
|
||||
[857, 'Turkish (DOS)'],
|
||||
[858, 'OEM Multilingual Latin I'],
|
||||
[860, 'Portuguese (DOS)'],
|
||||
[861, 'Icelandic (DOS)'],
|
||||
[862, 'Hebrew (DOS)'],
|
||||
[863, 'French Canadian (DOS)'],
|
||||
[864, 'Arabic (864) '],
|
||||
[865, 'Nordic (DOS)'],
|
||||
[866, 'Cyrillic (DOS)'],
|
||||
[869, 'Greek, Modern (DOS)'],
|
||||
[870, 'IBM EBCDIC (Multilingual Latin-2)'],
|
||||
[874, 'Thai (Windows)'],
|
||||
[875, 'IBM EBCDIC (Greek Modern)'],
|
||||
[932, 'Japanese (Shift-JIS)'],
|
||||
[936, 'Chinese Simplified (GB2312)'],
|
||||
[949, 'Korean'],
|
||||
[950, 'Chinese Traditional (Big5)'],
|
||||
[1026, 'IBM EBCDIC (Turkish Latin-5)'],
|
||||
[1047, 'IBM Latin-1'],
|
||||
[1140, 'IBM EBCDIC (US-Canada-Euro)'],
|
||||
[1141, 'IBM EBCDIC (Germany-Euro)'],
|
||||
[1142, 'IBM EBCDIC (Denmark-Norway-Euro)'],
|
||||
[1143, 'IBM EBCDIC (Finland-Sweden-Euro)'],
|
||||
[1144, 'IBM EBCDIC (Italy-Euro)'],
|
||||
[1145, 'IBM EBCDIC (Spain-Euro)'],
|
||||
[1146, 'IBM EBCDIC (UK-Euro)'],
|
||||
[1147, 'IBM EBCDIC (France-Euro)'],
|
||||
[1148, 'IBM EBCDIC (International-Euro)'],
|
||||
[1149, 'IBM EBCDIC (Icelandic-Euro)'],
|
||||
[1200, 'Unicode'],
|
||||
[1201, 'Unicode (Big-Endian)'],
|
||||
[1250, 'Central European (Windows)'],
|
||||
[1251, 'Cyrillic (Windows)'],
|
||||
[1252, 'Western European (Windows)'],
|
||||
[1253, 'Greek (Windows)'],
|
||||
[1254, 'Turkish (Windows)'],
|
||||
[1255, 'Hebrew (Windows) '],
|
||||
[1256, 'Arabic (Windows) '],
|
||||
[1257, 'Baltic (Windows)'],
|
||||
[1258, 'Vietnamese (Windows)'],
|
||||
[1361, 'Korean (Johab)'],
|
||||
[10000, 'Western European (Mac)'],
|
||||
[10001, 'Japanese (Mac)'],
|
||||
[10002, 'Chinese Traditional (Mac)'],
|
||||
[10003, 'Korean (Mac)'],
|
||||
[10004, 'Arabic (Mac) '],
|
||||
[10005, 'Hebrew (Mac)'],
|
||||
[10006, 'Greek (Mac) '],
|
||||
[10007, 'Cyrillic (Mac)'],
|
||||
[10008, 'Chinese Simplified (Mac)'],
|
||||
[10010, 'Romanian (Mac)'],
|
||||
[10017, 'Ukrainian (Mac)'],
|
||||
[10021, 'Thai (Mac)'],
|
||||
[10029, 'Central European (Mac) '],
|
||||
[10079, 'Icelandic (Mac)'],
|
||||
[10081, 'Turkish (Mac)'],
|
||||
[10082, 'Croatian (Mac)'],
|
||||
[12000, 'Unicode (UTF-32)'],
|
||||
[12001, 'Unicode (UTF-32 Big-Endian)'],
|
||||
[20000, 'Chinese Traditional (CNS)'],
|
||||
[20001, 'TCA Taiwan'],
|
||||
[20002, 'Chinese Traditional (Eten)'],
|
||||
[20003, 'IBM5550 Taiwan'],
|
||||
[20004, 'TeleText Taiwan'],
|
||||
[20005, 'Wang Taiwan'],
|
||||
[20105, 'Western European (IA5)'],
|
||||
[20106, 'German (IA5)'],
|
||||
[20107, 'Swedish (IA5) '],
|
||||
[20108, 'Norwegian (IA5) '],
|
||||
[20127, 'US-ASCII'],
|
||||
[20261, 'T.61 '],
|
||||
[20269, 'ISO-6937'],
|
||||
[20273, 'IBM EBCDIC (Germany)'],
|
||||
[20277, 'IBM EBCDIC (Denmark-Norway) '],
|
||||
[20278, 'IBM EBCDIC (Finland-Sweden)'],
|
||||
[20280, 'IBM EBCDIC (Italy)'],
|
||||
[20284, 'IBM EBCDIC (Spain)'],
|
||||
[20285, 'IBM EBCDIC (UK)'],
|
||||
[20290, 'IBM EBCDIC (Japanese katakana)'],
|
||||
[20297, 'IBM EBCDIC (France)'],
|
||||
[20420, 'IBM EBCDIC (Arabic)'],
|
||||
[20423, 'IBM EBCDIC (Greek)'],
|
||||
[20424, 'IBM EBCDIC (Hebrew)'],
|
||||
[20833, 'IBM EBCDIC (Korean Extended)'],
|
||||
[20838, 'IBM EBCDIC (Thai)'],
|
||||
[20866, 'Cyrillic (KOI8-R)'],
|
||||
[20871, 'IBM EBCDIC (Icelandic) '],
|
||||
[20880, 'IBM EBCDIC (Cyrillic Russian)'],
|
||||
[20905, 'IBM EBCDIC (Turkish)'],
|
||||
[20924, 'IBM Latin-1 '],
|
||||
[20932, 'Japanese (JIS 0208-1990 and 0212-1990)'],
|
||||
[20936, 'Chinese Simplified (GB2312-80) '],
|
||||
[20949, 'Korean Wansung '],
|
||||
[21025, 'IBM EBCDIC (Cyrillic Serbian-Bulgarian)'],
|
||||
[21866, 'Cyrillic (KOI8-U)'],
|
||||
[28591, 'Western European (ISO) '],
|
||||
[28592, 'Central European (ISO)'],
|
||||
[28593, 'Latin 3 (ISO)'],
|
||||
[28594, 'Baltic (ISO)'],
|
||||
[28595, 'Cyrillic (ISO) '],
|
||||
[28596, 'Arabic (ISO)'],
|
||||
[28597, 'Greek (ISO) '],
|
||||
[28598, 'Hebrew (ISO-Visual)'],
|
||||
[28599, 'Turkish (ISO)'],
|
||||
[28603, 'Estonian (ISO)'],
|
||||
[28605, 'Latin 9 (ISO)'],
|
||||
[29001, 'Europa'],
|
||||
[38598, 'Hebrew (ISO-Logical)'],
|
||||
[50220, 'Japanese (JIS)'],
|
||||
[50221, 'Japanese (JIS-Allow 1 byte Kana) '],
|
||||
[50222, 'Japanese (JIS-Allow 1 byte Kana - SO/SI)'],
|
||||
[50225, 'Korean (ISO)'],
|
||||
[50227, 'Chinese Simplified (ISO-2022)'],
|
||||
[51932, 'Japanese (EUC)'],
|
||||
[51936, 'Chinese Simplified (EUC) '],
|
||||
[51949, 'Korean (EUC)'],
|
||||
[52936, 'Chinese Simplified (HZ)'],
|
||||
[54936, 'Chinese Simplified (GB18030)'],
|
||||
[57002, 'ISCII Devanagari '],
|
||||
[57003, 'ISCII Bengali '],
|
||||
[57004, 'ISCII Tamil'],
|
||||
[57005, 'ISCII Telugu '],
|
||||
[57006, 'ISCII Assamese '],
|
||||
[57007, 'ISCII Oriya'],
|
||||
[57008, 'ISCII Kannada'],
|
||||
[57009, 'ISCII Malayalam '],
|
||||
[57010, 'ISCII Gujarati'],
|
||||
[57011, 'ISCII Punjabi'],
|
||||
[65000, 'Unicode (UTF-7)'],
|
||||
[65001, 'Unicode (UTF-8)']
|
||||
];
|
||||
lcid_width = 50;
|
||||
}
|
||||
|
||||
length = encodedata.length;
|
||||
|
||||
if (length) {
|
||||
for (i = 0; i < length; ++i) {
|
||||
listItems.push({
|
||||
value: encodedata[i][0],
|
||||
displayValue: encodedata[i][1] // Common.Utils.String.ellipsis(..., 37)
|
||||
});
|
||||
}
|
||||
|
||||
this.cmbEncoding = new Common.UI.ComboBox({
|
||||
el: $('#id-codepages-combo', this.$window),
|
||||
style: 'width: 230px;',
|
||||
menuStyle: 'min-width: 230px; max-height: 200px;',
|
||||
cls: 'input-group-nr',
|
||||
menuCls: 'scrollable-menu',
|
||||
data: listItems,
|
||||
editable: false
|
||||
for (i = 0; i < length; ++i) {
|
||||
listItems.push({
|
||||
value: encodedata[i][0],
|
||||
displayValue: Common.Utils.String.htmlEncode(encodedata[i][1]),
|
||||
lcid: encodedata[i][2] || ''
|
||||
});
|
||||
this.cmbEncoding.setValue( (this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0]);
|
||||
}
|
||||
|
||||
var itemsTemplate =
|
||||
_.template([
|
||||
'<% _.each(items, function(item) { %>',
|
||||
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
|
||||
'<div style="display: inline-block;"><%= item.displayValue %></div>',
|
||||
'<label style="text-align: right;width:' + lcid_width + 'px;"><%= item.lcid %></label>',
|
||||
'</a></li>',
|
||||
'<% }); %>'
|
||||
].join(''));
|
||||
|
||||
this.cmbEncoding = new Common.UI.ComboBox({
|
||||
el: $('#id-codepages-combo', this.$window),
|
||||
style: 'width: 230px;',
|
||||
menuStyle: 'min-width: 230px; max-height: 200px;',
|
||||
cls: 'input-group-nr',
|
||||
menuCls: 'scrollable-menu',
|
||||
data: listItems,
|
||||
editable: false,
|
||||
disabled: true,
|
||||
itemsTemplate: itemsTemplate
|
||||
});
|
||||
|
||||
if (length) {
|
||||
this.cmbEncoding.setDisabled(false);
|
||||
this.cmbEncoding.setValue((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0]);
|
||||
if (this.preview)
|
||||
this.cmbEncoding.on('selected', _.bind(this.onCmbEncodingSelect, this));
|
||||
|
||||
if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {
|
||||
this.cmbDelimiter = new Common.UI.ComboBox({
|
||||
el: $('#id-delimiters-combo', this.$window),
|
||||
style: 'width: 100px;',
|
||||
menuStyle: 'min-width: 100px;',
|
||||
cls: 'input-group-nr',
|
||||
data: [
|
||||
{value: 4, displayValue: this.txtComma},
|
||||
{value: 2, displayValue: this.txtSemicolon},
|
||||
{value: 3, displayValue: this.txtColon},
|
||||
{value: 1, displayValue: this.txtTab},
|
||||
{value: 5, displayValue: this.txtSpace},
|
||||
{value: -1, displayValue: this.txtOther}],
|
||||
editable: false
|
||||
});
|
||||
this.cmbDelimiter.setValue( (this.settings && this.settings.asc_getDelimiter()) ? this.settings.asc_getDelimiter() : 4);
|
||||
this.cmbDelimiter.on('selected', _.bind(this.onCmbDelimiterSelect, this));
|
||||
var ul = this.cmbEncoding.cmpEl.find('ul'),
|
||||
a = ul.find('li:nth(0) a'),
|
||||
width = ul.width() - parseInt(a.css('padding-left')) - parseInt(a.css('padding-right')) - 50;
|
||||
ul.find('li div').width(width + 10);
|
||||
}
|
||||
|
||||
this.inputDelimiter = new Common.UI.InputField({
|
||||
el : $('#id-delimiter-other'),
|
||||
style : 'width: 30px;',
|
||||
maxLength: 1,
|
||||
validateOnChange: true,
|
||||
validateOnBlur: false,
|
||||
value: (this.settings && this.settings.asc_getDelimiterChar()) ? this.settings.asc_getDelimiterChar() : ''
|
||||
});
|
||||
this.inputDelimiter.setVisible(false);
|
||||
if (this.preview)
|
||||
this.inputDelimiter.on ('changing', _.bind(this.updatePreview, this));
|
||||
}
|
||||
if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {
|
||||
this.cmbDelimiter = new Common.UI.ComboBox({
|
||||
el: $('#id-delimiters-combo', this.$window),
|
||||
style: 'width: 100px;',
|
||||
menuStyle: 'min-width: 100px;',
|
||||
cls: 'input-group-nr',
|
||||
data: [
|
||||
{value: 4, displayValue: this.txtComma},
|
||||
{value: 2, displayValue: this.txtSemicolon},
|
||||
{value: 3, displayValue: this.txtColon},
|
||||
{value: 1, displayValue: this.txtTab},
|
||||
{value: 5, displayValue: this.txtSpace},
|
||||
{value: -1, displayValue: this.txtOther}],
|
||||
editable: false
|
||||
});
|
||||
this.cmbDelimiter.setValue( (this.settings && this.settings.asc_getDelimiter()) ? this.settings.asc_getDelimiter() : 4);
|
||||
this.cmbDelimiter.on('selected', _.bind(this.onCmbDelimiterSelect, this));
|
||||
|
||||
this.inputDelimiter = new Common.UI.InputField({
|
||||
el : $('#id-delimiter-other'),
|
||||
style : 'width: 30px;',
|
||||
maxLength: 1,
|
||||
validateOnChange: true,
|
||||
validateOnBlur: false,
|
||||
value: (this.settings && this.settings.asc_getDelimiterChar()) ? this.settings.asc_getDelimiterChar() : ''
|
||||
});
|
||||
this.inputDelimiter.setVisible(false);
|
||||
if (this.preview)
|
||||
this.inputDelimiter.on ('changing', _.bind(this.updatePreview, this));
|
||||
}
|
||||
},
|
||||
|
||||
updatePreview: function() {
|
||||
var encoding = (!this.cmbEncoding.isDisabled()) ? this.cmbEncoding.getValue() :
|
||||
((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : 0);
|
||||
|
||||
if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {
|
||||
var delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
|
||||
delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
|
||||
(delimiter == -1) && (delimiter = null);
|
||||
this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(this.cmbEncoding.getValue(), delimiter, delimiterChar), _.bind(this.previewCallback, this));
|
||||
this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this));
|
||||
} else {
|
||||
this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(this.cmbEncoding.getValue()), _.bind(this.previewCallback, this));
|
||||
this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(encoding), _.bind(this.previewCallback, this));
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
1
apps/common/main/resources/img/doc-formats/blank.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2-1{opacity:0.2;}</style></defs><symbol id="svg-format-blank"><path fill="#fff" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2-1" d="M77,5H8A3,3,0,0,0,5,8V119a3,3,0,0,0,3,3H92a3,3,0,0,0,3-3V23ZM94,119a2,2,0,0,1-2,2H8a2,2,0,0,1-2-2V8A2,2,0,0,1,8,6H76.59l.41.41V20a3,3,0,0,0,3,3H93.59l.41.41Z"/><g class="cls-2-1"><rect x="50" y="86" width="25" height="2"/><rect x="25" y="80" width="50" height="2"/><rect x="25" y="74" width="50" height="2"/><rect x="25" y="68" width="50" height="2"/><rect x="25" y="62" width="50" height="2"/><rect x="25" y="43" width="24" height="2"/><rect x="25" y="37" width="19" height="2"/></g></symbol></svg>
|
||||
|
After Width: | Height: | Size: 788 B |
1
apps/common/main/resources/img/doc-formats/csv.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-csv"><path fill="#646464" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(38.97 113)">CSV</text><rect class="cls-4" x="21" y="90" width="17" height="2"/><rect class="cls-4" x="21" y="83" width="17" height="2"/><rect class="cls-4" x="21" y="76" width="17" height="2"/><rect class="cls-4" x="21" y="69" width="17" height="2"/><rect class="cls-4" x="21" y="62" width="17" height="2"/><rect class="cls-4" x="21" y="55" width="17" height="2"/><rect class="cls-4" x="21" y="48" width="17" height="2"/><rect class="cls-4" x="21" y="41" width="17" height="2"/><rect class="cls-4" x="21" y="34" width="17" height="2"/><rect class="cls-4" x="42" y="90" width="17" height="2"/><rect class="cls-4" x="42" y="83" width="17" height="2"/><rect class="cls-4" x="42" y="76" width="17" height="2"/><rect class="cls-4" x="42" y="69" width="17" height="2"/><rect class="cls-4" x="42" y="62" width="17" height="2"/><rect class="cls-4" x="42" y="55" width="17" height="2"/><rect class="cls-4" x="42" y="48" width="17" height="2"/><rect class="cls-4" x="42" y="41" width="17" height="2"/><rect class="cls-4" x="42" y="34" width="17" height="2"/><rect class="cls-4" x="63" y="90" width="17" height="2"/><rect class="cls-4" x="63" y="83" width="17" height="2"/><rect class="cls-4" x="63" y="76" width="17" height="2"/><rect class="cls-4" x="63" y="69" width="17" height="2"/><rect class="cls-4" x="63" y="62" width="17" height="2"/><rect class="cls-4" x="63" y="55" width="17" height="2"/><rect class="cls-4" x="63" y="48" width="17" height="2"/><rect class="cls-4" x="63" y="41" width="17" height="2"/><rect class="cls-4" x="63" y="34" width="17" height="2"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 2 KiB |
1
apps/common/main/resources/img/doc-formats/docx.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-docx"><path fill="#214479" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(32.96 113)">DOCX</text><polygon class="cls-4" points="67.8 48 61.5 75 54.5 48 51.5 48 48.5 48 41.5 75 35.2 48 29.4 48 37.9 82 44.3 82 51.5 54.1 58.7 82 65.1 82 73.6 48 67.8 48"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 651 B |
1
apps/common/main/resources/img/doc-formats/epub.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-epub"><path fill="#5892b6" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(34.31 113)">EPUB</text><path class="cls-4" d="M49,84V49s-9-6-24-7V75S42,76,49,84Z"/><path class="cls-4" d="M75,75V42c-15,1-24,7-24,7V84C58,76,75,75,75,75Z"/><path class="cls-4" d="M77,47V79s-15,0-27,8.3C38,79,23,79,23,79V47H20V82s13-2,30,6c17-8,30-6,30-6V47Z"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 734 B |
1
apps/common/main/resources/img/doc-formats/html.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-html"><path fill="#7c9a34" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(32.89 113)">HTML</text><polygon class="cls-4" points="62 53 62 57.8 75.5 62.5 62 67.2 62 72 80 64.2 80 60.8 62 53"/><polygon class="cls-4" points="40 75 45.5 75 59.5 50 54 50 40 75"/><polygon class="cls-4" points="19 64.2 37 72 37 67.2 23.5 62.5 37 57.8 37 53 19 60.8 19 64.2"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 751 B |
1
apps/common/main/resources/img/doc-formats/odp.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-odp"><path fill="#dd9426" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(37.02 113)">ODP</text><path class="cls-4" d="M78,52.74h0l-.29-.15a15,15,0,0,0-14,.53,14.93,14.93,0,0,0-14.3-.24l-.08,0a.25.25,0,0,0-.1.2.26.26,0,0,0,.26.26h.06a14.62,14.62,0,0,1,4.14-.18c4,.37,7.43,1.6,9.86,4.36.13.13.24.12.37,0C67,54,71.68,52.6,76.72,53.07c.28,0,.56.06.83.11l.33,0a.23.23,0,0,0,.26-.25A.25.25,0,0,0,78,52.74Z"/><path class="cls-4" d="M72.16,65.21l0,0A26,26,0,0,0,47.19,68,26,26,0,0,0,22.1,70.19l-.05,0a.41.41,0,0,0-.14.3.39.39,0,0,0,.38.39h.08l0,0a26.09,26.09,0,0,1,7.49-1.1c6.93,0,13.1,1.64,17.74,6l0,0a.38.38,0,0,0,.25.09.37.37,0,0,0,.3-.14l.22-.31c4.72-6.45,12.5-9.63,21.16-9.63.62,0,1.23,0,1.84.06l.55,0a.4.4,0,0,0,.39-.39A.38.38,0,0,0,72.16,65.21Z"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
1
apps/common/main/resources/img/doc-formats/ods.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-ods"><path fill="#237453" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(37.48 113)">ODS</text><path class="cls-4" d="M78,52.74h0l-.29-.15a15,15,0,0,0-14,.53,14.93,14.93,0,0,0-14.3-.24l-.08,0a.25.25,0,0,0-.1.2.26.26,0,0,0,.26.26h.06a14.62,14.62,0,0,1,4.14-.18c4,.37,7.43,1.6,9.86,4.36.13.13.24.12.37,0C67,54,71.68,52.6,76.72,53.07c.28,0,.56.06.83.11l.33,0a.23.23,0,0,0,.26-.25A.25.25,0,0,0,78,52.74Z"/><path class="cls-4" d="M72.16,65.21l0,0A26,26,0,0,0,47.19,68,26,26,0,0,0,22.1,70.19l-.05,0a.41.41,0,0,0-.14.3.39.39,0,0,0,.38.39h.08l0,0a26.09,26.09,0,0,1,7.49-1.1c6.93,0,13.1,1.64,17.74,6l0,0a.38.38,0,0,0,.25.09.37.37,0,0,0,.3-.14l.22-.31c4.72-6.45,12.5-9.63,21.16-9.63.62,0,1.23,0,1.84.06l.55,0a.4.4,0,0,0,.39-.39A.38.38,0,0,0,72.16,65.21Z"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
1
apps/common/main/resources/img/doc-formats/odt.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-odt"><path fill="#3c6d88" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(37.31 113)">ODT</text><path class="cls-4" d="M78,52.74h0l-.29-.15a15,15,0,0,0-14,.53,14.93,14.93,0,0,0-14.3-.24l-.08,0a.25.25,0,0,0-.1.2.26.26,0,0,0,.26.26h.06a14.62,14.62,0,0,1,4.14-.18c4,.37,7.43,1.6,9.86,4.36.13.13.24.12.37,0C67,54,71.68,52.6,76.72,53.07c.28,0,.56.06.83.11l.33,0a.23.23,0,0,0,.26-.25A.25.25,0,0,0,78,52.74Z"/><path class="cls-4" d="M72.16,65.21l0,0A26,26,0,0,0,47.19,68,26,26,0,0,0,22.1,70.19l-.05,0a.41.41,0,0,0-.14.3.39.39,0,0,0,.38.39h.08l0,0a26.09,26.09,0,0,1,7.49-1.1c6.93,0,13.1,1.64,17.74,6l0,0a.38.38,0,0,0,.25.09.37.37,0,0,0,.3-.14l.22-.31c4.72-6.45,12.5-9.63,21.16-9.63.62,0,1.23,0,1.84.06l.55,0a.4.4,0,0,0,.39-.39A.38.38,0,0,0,72.16,65.21Z"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
1
apps/common/main/resources/img/doc-formats/pdf.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-pdf"><path fill="#ba4c3f" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(38.5 113)">PDF</text><path id="path4463" class="cls-4" d="M40.42,66.69C42,63.55,43.84,60,45.3,56.46h0l.58-1.4c-1.9-7.25-3.05-13.07-2-16.83h0a2.59,2.59,0,0,1,2.62-1.57h.88c1.66,0,2.44,2.09,2.53,2.91h0a13.12,13.12,0,0,1-.48,3.68h0a9.11,9.11,0,0,0-.56-3.75h0C48.16,38,47.5,37.1,46.91,37h0a1.82,1.82,0,0,0-.68,1.4h0A19.67,19.67,0,0,0,46,41.59h0A36,36,0,0,0,47.45,51h0c.18-.54.34-1,.48-1.54h0c.2-.76,1.49-5.81,1.49-5.81h0s-.33,6.72-.78,8.76h0c-.1.43-.21.86-.32,1.29h0a29.59,29.59,0,0,0,7.37,11.52h0A23.75,23.75,0,0,0,60,68.12h0a57.72,57.72,0,0,1,8.65-.65h0c3.28,0,5.69.53,6.66,1.49h0A2.55,2.55,0,0,1,76,70.62h0a5.92,5.92,0,0,1-.14,1h0c0-.18,0-1-2.6-1.88h0c-2.07-.66-6-.64-10.61-.15h0c5.39,2.64,10.64,4,12.3,3.16h0a3.48,3.48,0,0,0,.9-.87h0a9.45,9.45,0,0,1-.51,1.66h0a2.54,2.54,0,0,1-1.29.88h0c-2.63.71-9.46-.92-15.42-4.32h0A125,125,0,0,0,38.8,74.79h0C33,84.88,28.71,89.51,25.19,87.75h0L23.9,87.1a1.5,1.5,0,0,1-.49-1.63h0c.41-2,2.93-5,8-8.06h0c.55-.33,3-1.61,3-1.61h0s-1.79,1.74-2.21,2.08h0c-4,3.31-7,7.47-6.95,9.09h0l0,.14c3.43-.49,8.57-7.48,15.19-20.42m2.1,1.07c-1.11,2.08-2.19,4-3.19,5.79h0a84.6,84.6,0,0,1,17.1-4.84h0c-.76-.53-1.49-1.08-2.19-1.67h0A29.28,29.28,0,0,1,47,57.66h0a81,81,0,0,1-4.52,10.1"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
1
apps/common/main/resources/img/doc-formats/pptx.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-pptx"><path fill="#dd682b" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(34.99 113)">PPTX</text><path class="cls-4" d="M50,69A16,16,0,0,0,66,53H50V37a16,16,0,0,0,0,32Z"/><path class="cls-4" d="M53,34V50H69A16,16,0,0,0,53,34Z"/><rect class="cls-4" x="25" y="89" width="50" height="2"/><rect class="cls-4" x="25" y="83" width="50" height="2"/><rect class="cls-4" x="25" y="77" width="50" height="2"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 798 B |
1
apps/common/main/resources/img/doc-formats/rtf.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-rtf"><path fill="#7c7c7d" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(39.27 113)">RTF</text><rect class="cls-4" x="49" y="38" width="25" height="2"/><rect class="cls-4" x="49" y="44" width="25" height="2"/><rect class="cls-4" x="49" y="50" width="25" height="2"/><rect class="cls-4" x="49" y="56" width="25" height="2"/><rect class="cls-4" x="25" y="62" width="49" height="2"/><rect class="cls-4" x="25" y="68" width="49" height="2"/><rect class="cls-4" x="25" y="74" width="49" height="2"/><rect class="cls-4" x="25" y="80" width="49" height="2"/><rect class="cls-4" x="25" y="86" width="49" height="2"/><rect class="cls-4" x="25" y="38" width="20" height="20"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 1 KiB |
1
apps/common/main/resources/img/doc-formats/txt.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-txt"><path fill="#7c7c7d" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(39.05 113)">TXT</text><rect class="cls-4" x="25" y="38" width="49" height="2"/><rect class="cls-4" x="25" y="44" width="49" height="2"/><rect class="cls-4" x="25" y="50" width="49" height="2"/><rect class="cls-4" x="25" y="56" width="49" height="2"/><rect class="cls-4" x="25" y="62" width="49" height="2"/><rect class="cls-4" x="25" y="68" width="49" height="2"/><rect class="cls-4" x="25" y="74" width="49" height="2"/><rect class="cls-4" x="25" y="80" width="49" height="2"/><rect class="cls-4" x="25" y="86" width="49" height="2"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 1,007 B |
1
apps/common/main/resources/img/doc-formats/xlsx.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-xlsx"><path fill="#1f7244" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(35.3 113)">XLSX</text><polygon class="cls-4" points="52.75 61.63 64 45 58.5 45 50 57.56 41.5 45 36 45 47.25 61.63 35.5 79 41 79 50 65.7 59 79 64.5 79 52.75 61.63"/></symbol></svg>
|
||||
|
After Width: | Height: | Size: 637 B |
|
|
@ -634,7 +634,7 @@ define([
|
|||
}
|
||||
return false;
|
||||
case 'help':
|
||||
if ( this.mode.isEdit ) { // TODO: unlock 'help' for 'view' mode
|
||||
if ( this.mode.isEdit && this.mode.canHelp ) { // TODO: unlock 'help' for 'view' mode
|
||||
Common.UI.Menu.Manager.hideAll();
|
||||
this.leftMenu.showMenu('file:help');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1082,13 +1082,14 @@ define([
|
|||
this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
|
||||
this.appOptions.canEditStyles = this.appOptions.canLicense && this.appOptions.canEdit;
|
||||
this.appOptions.canPrint = (this.permissions.print !== false);
|
||||
this.appOptions.canRename = !!this.permissions.rename;
|
||||
this.appOptions.canRename = this.editorConfig.canRename && !!this.permissions.rename;
|
||||
this.appOptions.buildVersion = params.asc_getBuildVersion();
|
||||
this.appOptions.canForcesave = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
|
||||
this.appOptions.forcesave = this.appOptions.canForcesave;
|
||||
this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
|
||||
this.appOptions.trialMode = params.asc_getLicenseMode();
|
||||
this.appOptions.canProtect = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
|
||||
this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
|
||||
|
||||
if ( this.appOptions.isLightVersion ) {
|
||||
this.appOptions.canUseHistory =
|
||||
|
|
@ -1589,6 +1590,8 @@ define([
|
|||
|
||||
Common.NotificationCenter.trigger('layout:changed', 'main');
|
||||
$('#loading-mask').hide().remove();
|
||||
|
||||
Common.Controllers.Desktop.process('preloader:hide');
|
||||
},
|
||||
|
||||
onDownloadUrl: function(url) {
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@
|
|||
<div class="separator long"></div>
|
||||
<div class="group">
|
||||
<span class="btn-slot text x-huge slot-inshyperlink"></span>
|
||||
<!--<span class="btn-slot text x-huge" id="slot-btn-bookmarks"></span>-->
|
||||
<span class="btn-slot text x-huge" id="slot-btn-bookmarks"></span>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -161,6 +161,13 @@ define([
|
|||
canFocused: false
|
||||
});
|
||||
|
||||
this.miHelp = new Common.UI.MenuItem({
|
||||
el : $('#fm-btn-help',this.el),
|
||||
action : 'help',
|
||||
caption : this.btnHelpCaption,
|
||||
canFocused: false
|
||||
});
|
||||
|
||||
this.items = [];
|
||||
this.items.push(
|
||||
new Common.UI.MenuItem({
|
||||
|
|
@ -192,12 +199,7 @@ define([
|
|||
caption : this.btnSettingsCaption,
|
||||
canFocused: false
|
||||
}),
|
||||
new Common.UI.MenuItem({
|
||||
el : $('#fm-btn-help',this.el),
|
||||
action : 'help',
|
||||
caption : this.btnHelpCaption,
|
||||
canFocused: false
|
||||
}),
|
||||
this.miHelp,
|
||||
new Common.UI.MenuItem({
|
||||
el : $('#fm-btn-back',this.el),
|
||||
action : 'exit',
|
||||
|
|
@ -211,8 +213,7 @@ define([
|
|||
// 'saveas' : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
|
||||
'opts' : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
|
||||
'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
|
||||
'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
|
||||
'help' : (new DE.Views.FileMenuPanels.Help({menu:me})).render()
|
||||
'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render()
|
||||
};
|
||||
|
||||
me.$el.find('.content-box').hide();
|
||||
|
|
@ -260,6 +261,9 @@ define([
|
|||
(this.document.info.sharingSettings&&this.document.info.sharingSettings.length>0 ||
|
||||
this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length))?'show':'hide']();
|
||||
|
||||
this.miHelp[this.mode.canHelp ?'show':'hide']();
|
||||
this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide']();
|
||||
|
||||
this.mode.canBack ? this.$el.find('#fm-btn-back').show().prev().show() :
|
||||
this.$el.find('#fm-btn-back').hide().prev().hide();
|
||||
|
||||
|
|
@ -291,7 +295,10 @@ define([
|
|||
} else if (this.mode.canDownloadOrigin)
|
||||
$('a',this.miDownload.$el).text(this.textDownload);
|
||||
|
||||
this.panels['help'].setLangConfig(this.mode.lang);
|
||||
if (this.mode.canHelp) {
|
||||
this.panels['help'] = ((new DE.Views.FileMenuPanels.Help({menu: this})).render());
|
||||
this.panels['help'].setLangConfig(this.mode.lang);
|
||||
}
|
||||
|
||||
this.miHistory[this.mode.canUseHistory&&!this.mode.isDisconnected?'show':'hide']();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -69,7 +69,9 @@ define([
|
|||
'<% _.each(rows, function(row) { %>',
|
||||
'<tr>',
|
||||
'<% _.each(row, function(item) { %>',
|
||||
'<td><span class="btn-doc-format img-doc-format <%= item.imgCls %>" format="<%= item.type %>"/></td>',
|
||||
'<td><div><svg class="btn-doc-format" format="<%= item.type %>">',
|
||||
'<use xlink:href="#svg-format-<%= item.imgCls %>"></use>',
|
||||
'</svg></div></td>',
|
||||
'<% }) %>',
|
||||
'</tr>',
|
||||
'<% }) %>',
|
||||
|
|
@ -530,7 +532,11 @@ define([
|
|||
template: _.template([
|
||||
'<h3 style="margin-top: 20px;"><%= scope.fromBlankText %></h3><hr noshade />',
|
||||
'<div class="blank-document">',
|
||||
'<div class="blank-document-btn img-doc-format"></div>',
|
||||
'<div class="blank-document-btn">',
|
||||
'<svg class="btn-doc-format">',
|
||||
'<use xlink:href="#svg-format-docx"></use>',
|
||||
'</svg>',
|
||||
'</div>',
|
||||
'<div class="blank-document-info">',
|
||||
'<h3><%= scope.newDocumentText %></h3>',
|
||||
'<%= scope.newDescriptionText %>',
|
||||
|
|
@ -540,7 +546,13 @@ define([
|
|||
'<div class="thumb-list">',
|
||||
'<% _.each(docs, function(item) { %>',
|
||||
'<div class="thumb-wrap" template="<%= item.url %>">',
|
||||
'<div class="thumb"<% if (!_.isEmpty(item.icon)) { %> style="background-image: url(<%= item.icon %>);" <% } %> />',
|
||||
'<div class="thumb"',
|
||||
'<% if (!_.isEmpty(item.icon)) { ' +
|
||||
'print(\" style=\'background-image: url(item.icon);\'>\")' +
|
||||
' } else { ' +
|
||||
'print(\"><svg class=\'btn-doc-format\'><use xlink:href=\'#svg-format-blank\'></use></svg>\")' +
|
||||
' } %>',
|
||||
'</div>',
|
||||
'<div class="title"><%= item.name %></div>',
|
||||
'</div>',
|
||||
'<% }) %>',
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ define([
|
|||
}, options || {});
|
||||
|
||||
this.template = [
|
||||
'<div class="box" style="height: 150px;">',
|
||||
'<div class="input-row hidden" style="margin-bottom: 10px;">',
|
||||
'<div class="box" style="height: 260px;">',
|
||||
'<div class="input-row" style="margin-bottom: 10px;">',
|
||||
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternal,'</button>',
|
||||
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;">', this.textInternal,'</button>',
|
||||
'</div>',
|
||||
|
|
@ -279,10 +279,9 @@ define([
|
|||
if (props) {
|
||||
var me = this;
|
||||
|
||||
// var bookmark = props.get_Bookmark(),
|
||||
// type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink;
|
||||
var bookmark = props.get_Bookmark(),
|
||||
type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink;
|
||||
|
||||
var type = c_oHyperlinkType.WebLink;
|
||||
(type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
|
||||
me.ShowHideElem(type);
|
||||
|
||||
|
|
@ -335,7 +334,7 @@ define([
|
|||
|
||||
url = url.replace(new RegExp("%20",'g')," ");
|
||||
props.put_Value(url);
|
||||
// props.put_Bookmark(null);
|
||||
props.put_Bookmark(null);
|
||||
display = url;
|
||||
} else {
|
||||
var rec = this.internalList.getSelectedRec();
|
||||
|
|
|
|||
|
|
@ -262,6 +262,13 @@
|
|||
|
||||
<script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
|
||||
<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/docx.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdf.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/txt.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/odt.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/rtf.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/html.svg">
|
||||
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/blank.svg">
|
||||
<script>
|
||||
var svgpoints = document.querySelectorAll('img.inline-svg');
|
||||
SVGInjector(svgpoints);
|
||||
|
|
|
|||
|
|
@ -283,6 +283,13 @@
|
|||
</script>
|
||||
|
||||
<inline src="resources/img/header/buttons.svg" />
|
||||
<inline src="resources/img/doc-formats/docx.svg" />
|
||||
<inline src="resources/img/doc-formats/pdf.svg" />
|
||||
<inline src="resources/img/doc-formats/txt.svg" />
|
||||
<inline src="resources/img/doc-formats/odt.svg" />
|
||||
<inline src="resources/img/doc-formats/rtf.svg" />
|
||||
<inline src="resources/img/doc-formats/html.svg" />
|
||||
<inline src="resources/img/doc-formats/blank.svg" />
|
||||
|
||||
<div id="viewport"></div>
|
||||
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 479 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 448 B After Width: | Height: | Size: 185 B |
|
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 277 B |
|
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 906 B |
|
Before Width: | Height: | Size: 664 B After Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 311 B |
|
Before Width: | Height: | Size: 571 B After Width: | Height: | Size: 226 B |
|
Before Width: | Height: | Size: 250 B After Width: | Height: | Size: 118 B |
|
Before Width: | Height: | Size: 163 B After Width: | Height: | Size: 89 B |
|
Before Width: | Height: | Size: 155 B After Width: | Height: | Size: 85 B |
|
Before Width: | Height: | Size: 109 B After Width: | Height: | Size: 84 B |
|
Before Width: | Height: | Size: 114 B After Width: | Height: | Size: 87 B |
|
Before Width: | Height: | Size: 111 B After Width: | Height: | Size: 84 B |
|
Before Width: | Height: | Size: 112 B After Width: | Height: | Size: 86 B |
|
Before Width: | Height: | Size: 112 B After Width: | Height: | Size: 85 B |
|
Before Width: | Height: | Size: 107 B After Width: | Height: | Size: 83 B |
|
Before Width: | Height: | Size: 156 B After Width: | Height: | Size: 83 B |
|
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 97 B |
|
Before Width: | Height: | Size: 778 B After Width: | Height: | Size: 513 B |
|
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 170 B |
|
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 194 B |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 122 B |
|
Before Width: | Height: | Size: 115 B After Width: | Height: | Size: 87 B |
|
Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 118 B |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 102 B |
|
Before Width: | Height: | Size: 235 B After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 507 B After Width: | Height: | Size: 225 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 4 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 95 B |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 9 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 358 B After Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 239 B After Width: | Height: | Size: 109 B |
|
Before Width: | Height: | Size: 245 B After Width: | Height: | Size: 127 B |
|
Before Width: | Height: | Size: 271 B After Width: | Height: | Size: 121 B |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 879 B After Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1,014 B |
|
Before Width: | Height: | Size: 125 B After Width: | Height: | Size: 103 B |
|
Before Width: | Height: | Size: 304 B After Width: | Height: | Size: 137 B |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 285 B After Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 300 B After Width: | Height: | Size: 132 B |
|
Before Width: | Height: | Size: 289 B After Width: | Height: | Size: 186 B |
|
Before Width: | Height: | Size: 237 B After Width: | Height: | Size: 113 B |
|
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 235 B After Width: | Height: | Size: 182 B |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 221 B After Width: | Height: | Size: 108 B |
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 102 B |
|
Before Width: | Height: | Size: 203 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 525 B |
|
Before Width: | Height: | Size: 248 B After Width: | Height: | Size: 150 B |
|
Before Width: | Height: | Size: 854 B After Width: | Height: | Size: 369 B |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 215 B After Width: | Height: | Size: 109 B |