Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'release/v6.1.0' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2020-10-27 21:55:00 +03:00
parent 31f0e37086 87271b8398
commit 222113d277
98 changed files with 362 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/check.yml vendored Normal file
View file

@ -0,0 +1,15 @@
name: check
on: [push]
jobs:
project-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 12
uses: actions/setup-node@v1
with:
node-version: 12
- name: Build using grunt
run: |
npm install --prefix build
grunt --level=ADVANCED --base build --gruntfile build/Gruntfile.js

9
.travis.yml
View file

@ -1,9 +0,0 @@
language: node_js
node_js:
- '12'
before_install: npm install -g grunt-cli
before_script:
- cd build
script:
- npm install
- grunt --level=ADVANCED

7
apps/api/documents/index.html.desktop
View file

@ -80,7 +80,7 @@
}
function getDocumentData(urlParams) {
return {
let docparams = {
key: urlParams["key"],
url: urlParams["url"] || '_offline_',
title: urlParams["title"],
@ -91,6 +91,11 @@
download: true
}
};
if (urlParams['mode'] == 'review')
docparams.permissions.edit = !(docparams.permissions.review = true);
return docparams;
}
function getEditorConfig(urlParams) {

80
apps/common/main/lib/view/AutoCorrectDialog.js
View file

@ -86,8 +86,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
'<div class="separator horizontal"></div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
'<button class="btn normal dlg-btn primary can-apply hidden" result="ok" style="width: 86px;">' + this.okButtonText + '</button>',
'<button class="btn normal dlg-btn can-apply hidden" result="cancel" style="width: 86px;">' + this.cancelButtonText + '</button>',
'</div>'
].join('')
}, options || {});
@ -105,44 +103,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
this.arrAddRec = value ? JSON.parse(value) : [];
value = Common.Utils.InternalSettings.get(path + "-rem");
this.arrRemRec = value ? JSON.parse(value) : [];
if (this.appPrefix=='de-' || this.appPrefix=='pe-') {
var me = this;
this.options.handler = function(result, value) {
if ( result == 'ok' ) {
var value = me.chBulleted.getValue()==='checked';
Common.localStorage.setBool(this.appPrefix + "settings-autoformat-bulleted", value);
Common.Utils.InternalSettings.set(this.appPrefix + "settings-autoformat-bulleted", value);
me.api.asc_SetAutomaticBulletedLists(value);
value = me.chNumbered.getValue()==='checked';
Common.localStorage.setBool(this.appPrefix + "settings-autoformat-numbered", value);
Common.Utils.InternalSettings.set(this.appPrefix + "settings-autoformat-numbered", value);
me.api.asc_SetAutomaticNumberedLists(value);
value = me.chQuotes.getValue()==='checked';
Common.localStorage.setBool(this.appPrefix + "settings-autoformat-smart-quotes", value);
Common.Utils.InternalSettings.set(this.appPrefix + "settings-autoformat-smart-quotes", value);
me.api.asc_SetAutoCorrectSmartQuotes(value);
value = me.chHyphens.getValue()==='checked';
Common.localStorage.setBool(this.appPrefix + "settings-autoformat-hyphens", value);
Common.Utils.InternalSettings.set(this.appPrefix + "settings-autoformat-hyphens", value);
me.api.asc_SetAutoCorrectHyphensWithDash(value);
}
};
} else if (this.appPrefix=='sse-') {
var me = this;
this.options.handler = function(result, value) {
if ( result == 'ok' ) {
var value = me.chNewRows.getValue()==='checked';
Common.localStorage.setBool("sse-settings-autoformat-new-rows", value);
Common.Utils.InternalSettings.set("sse-settings-autoformat-new-rows", value);
me.api.asc_setIncludeNewRowColTable(value);
}
};
}
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},
@ -323,36 +283,57 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
el: $('#id-autocorrect-dialog-chk-quotes'),
labelText: this.textQuotes,
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-smart-quotes")
}).on('change', function(field, newValue, oldValue, eOpts){
var checked = (field.getValue()==='checked');
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-smart-quotes", checked);
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-smart-quotes", checked);
me.api.asc_SetAutoCorrectSmartQuotes(checked);
});
this.chHyphens = new Common.UI.CheckBox({
el: $('#id-autocorrect-dialog-chk-hyphens'),
labelText: this.textHyphens,
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyphens")
}).on('change', function(field, newValue, oldValue, eOpts){
var checked = (field.getValue()==='checked');
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyphens", checked);
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyphens", checked);
me.api.asc_SetAutoCorrectHyphensWithDash(checked);
});
this.chBulleted = new Common.UI.CheckBox({
el: $('#id-autocorrect-dialog-chk-bulleted'),
labelText: this.textBulleted,
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-bulleted")
}).on('change', function(field, newValue, oldValue, eOpts){
var checked = (field.getValue()==='checked');
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-bulleted", checked);
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-bulleted", checked);
me.api.asc_SetAutomaticBulletedLists(checked);
});
this.chNumbered = new Common.UI.CheckBox({
el: $('#id-autocorrect-dialog-chk-numbered'),
labelText: this.textNumbered,
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-numbered")
}).on('change', function(field, newValue, oldValue, eOpts){
var checked = (field.getValue()==='checked');
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-numbered", checked);
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-numbered", checked);
me.api.asc_SetAutomaticNumberedLists(checked);
});
} else if (this.appPrefix=='sse-') {
this.chNewRows = new Common.UI.CheckBox({
el: $('#id-autocorrect-dialog-chk-new-rows'),
labelText: this.textNewRowCol,
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-new-rows")
}).on('change', function(field, newValue, oldValue, eOpts){
var checked = (field.getValue()==='checked');
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-new-rows", checked);
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-new-rows", checked);
me.api.asc_setIncludeNewRowColTable(checked);
});
}
this.applyButtons = $window.find('.dlg-btn.can-apply');
this.closeButtons = $window.find('.dlg-btn:not(.can-apply)');
this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false));
this.btnsCategory[1].on('click', _.bind(this.onRecCategoryClick, this, false));
this.btnsCategory[2] && this.btnsCategory[2].on('click', _.bind(this.updateFooterButtons, this, true));
this.afterRender();
},
@ -411,7 +392,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
var value = this.getActiveCategory();
if (value==0) this.onMathCategoryClick(true);
else if (value==1) this.onRecCategoryClick(true);
this.updateFooterButtons(value>1);
},
close: function() {
@ -421,8 +401,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
},
onMathCategoryClick: function(delay) {
this.updateFooterButtons(false);
var me = this;
_.delay(function(){
$('input', me.inputReplace.cmpEl).select().focus();
@ -682,8 +660,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
},
onRecCategoryClick: function(delay) {
this.updateFooterButtons(false);
var me = this;
_.delay(function(){
$('input', me.inputRecFind.cmpEl).select().focus();
@ -775,12 +751,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
this.btnAddRec.setDisabled(!!rec || !value);
},
updateFooterButtons: function(apply) {
this.applyButtons.toggleClass('hidden', !apply);
this.closeButtons.toggleClass('hidden', apply);
},
textTitle: 'AutoCorrect',
textMathCorrect: 'Math AutoCorrect',
textReplace: 'Replace',

8
apps/common/main/lib/view/SymbolTableDialog.js
View file

@ -817,7 +817,7 @@ define([
},
onBtnClick: function(event) {
this._handleInput(event.currentTarget.attributes['result'].value);
this._handleInput(event.currentTarget.attributes['result'].value, true);
},
onPrimary: function(event) {
@ -825,7 +825,11 @@ define([
return false;
},
_handleInput: function(state) {
_handleInput: function(state, fromButton) {
if(!fromButton && document.activeElement && document.activeElement.localName == 'textarea' && /area_id/.test(document.activeElement.id)){
return;
}
var special = this.btnSpecial.isActive();
var settings = special ? this.getSpecialSymbol() : this.getPasteSymbol(this.$window.find('.cell-selected').attr('id'));
if (this.options.handler) {

2
apps/common/main/resources/less/tabbar.less
View file

@ -26,7 +26,7 @@
padding-top: 0;
padding-bottom: 0;
white-space: pre-wrap;
white-space: pre;
text-align: center;
&::after {

2
apps/common/mobile/lib/component/ThemeColorPalette.js
View file

@ -214,7 +214,7 @@ define([
}
if (/^[a-fA-F0-9]{6}|transparent$/.test(color) || _.indexOf(Common.Utils.ThemeColor.getStandartColors(), color) > -1 || _.indexOf(this.dynamicColors, color) > -1) {
el.find('.color-palette a[data-color=' + color + ']').first().addClass('active');
el.find('.standart-colors a[data-color=' + color + '], .dynamic-colors a[data-color=' + color + ']').first().addClass('active');
}
}

4
apps/documenteditor/main/app/view/ControlSettingsDialog.js
View file

@ -552,6 +552,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
val = formTextPr.get_Width();
this.spnWidth.setValue(val ? val : '', true);
}
if ((type == Asc.c_oAscContentControlSpecificType.CheckBox || type == Asc.c_oAscContentControlSpecificType.Picture) && !formPr ) {// standart checkbox or picture
this.txtPlaceholder.cmpEl && this.txtPlaceholder.cmpEl.closest('tr').hide();
}
}
},

4
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -3110,7 +3110,7 @@ define([
cls = 'menu__icon text-orient-rdown';
break;
case Asc.c_oAscCellTextDirection.BTLR:
cls = 'menu__icon btn-align-rup';
cls = 'menu__icon text-orient-rup';
break;
}
menuTableDirection.setIconCls(cls);
@ -3795,7 +3795,7 @@ define([
cls = 'menu__icon text-orient-rdown';
break;
case Asc.c_oAscVertDrawingText.vert270:
cls = 'menu__icon btn-align-rup';
cls = 'menu__icon text-orient-rup';
break;
}
menuParagraphDirection.setIconCls(cls);

12
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -410,7 +410,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -421,7 +421,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -463,7 +463,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
@ -941,10 +941,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.get_colors(),
@ -1945,7 +1945,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -275,7 +275,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -286,7 +286,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -329,7 +329,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.asc_TextArtProperties();
var fill = new Asc.asc_CShapeFill();
@ -615,10 +615,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.get_colors(),
@ -1280,7 +1280,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);

4
apps/documenteditor/main/locale/es.json
View file

@ -157,9 +157,9 @@
"Common.Views.About.txtPoweredBy": "Desarrollado por",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versión ",
"Common.Views.AutoCorrectDialog.textBy": "Por:",
"Common.Views.AutoCorrectDialog.textBy": "Por",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Autocorrección matemática",
"Common.Views.AutoCorrectDialog.textReplace": "Reemplazar:",
"Common.Views.AutoCorrectDialog.textReplace": "Reemplazar",
"Common.Views.AutoCorrectDialog.textTitle": "Autocorrección",
"Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Añadir",

4
apps/documenteditor/main/locale/fr.json
View file

@ -157,8 +157,8 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tél.: ",
"Common.Views.About.txtVersion": "Version ",
"Common.Views.AutoCorrectDialog.textBy": "Par:",
"Common.Views.AutoCorrectDialog.textReplace": "Remplacer:",
"Common.Views.AutoCorrectDialog.textBy": "Par",
"Common.Views.AutoCorrectDialog.textReplace": "Remplacer",
"Common.Views.AutoCorrectDialog.textTitle": "Correction automatique",
"Common.Views.Chat.textSend": "Envoyer",
"Common.Views.Comments.textAdd": "Ajouter",

4
apps/documenteditor/main/locale/it.json
View file

@ -157,9 +157,9 @@
"Common.Views.About.txtPoweredBy": "Con tecnologia",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versione ",
"Common.Views.AutoCorrectDialog.textBy": "Di:",
"Common.Views.AutoCorrectDialog.textBy": "Di",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Correzione automatica matematica",
"Common.Views.AutoCorrectDialog.textReplace": "Sostituisci:",
"Common.Views.AutoCorrectDialog.textReplace": "Sostituisci",
"Common.Views.AutoCorrectDialog.textTitle": "Correzione automatica",
"Common.Views.Chat.textSend": "Invia",
"Common.Views.Comments.textAdd": "Aggiungi",

2
apps/documenteditor/main/locale/ja.json
View file

@ -158,7 +158,7 @@
"Common.Views.About.txtTel": "電話番号：",
"Common.Views.About.txtVersion": "バージョン",
"Common.Views.AutoCorrectDialog.textMathCorrect": "数式オートコレクト",
"Common.Views.AutoCorrectDialog.textReplace": "置き換える:",
"Common.Views.AutoCorrectDialog.textReplace": "置き換える",
"Common.Views.AutoCorrectDialog.textTitle": "オートコレクト",
"Common.Views.Chat.textSend": "送信",
"Common.Views.Comments.textAdd": "追加",

2
apps/documenteditor/main/locale/nb.json
View file

@ -44,7 +44,7 @@
"Common.UI.Window.textWarning": "Advarsel",
"Common.Utils.Metric.txtCm": "cm",
"Common.Views.About.txtAddress": "adresse:",
"Common.Views.AutoCorrectDialog.textBy": "Av:",
"Common.Views.AutoCorrectDialog.textBy": "Av",
"Common.Views.AutoCorrectDialog.textTitle": "Autokorrektur",
"Common.Views.Comments.textAdd": "Legg til",
"Common.Views.Comments.textAddComment": "Tilføy",

4
apps/documenteditor/main/locale/nl.json
View file

@ -157,9 +157,9 @@
"Common.Views.About.txtPoweredBy": "Aangedreven door",
"Common.Views.About.txtTel": "Tel.:",
"Common.Views.About.txtVersion": "Versie",
"Common.Views.AutoCorrectDialog.textBy": "Door:",
"Common.Views.AutoCorrectDialog.textBy": "Door",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Wiskundige autocorrectie",
"Common.Views.AutoCorrectDialog.textReplace": "Vervangen:",
"Common.Views.AutoCorrectDialog.textReplace": "Vervangen",
"Common.Views.AutoCorrectDialog.textTitle": "Automatische spellingscontrole",
"Common.Views.Chat.textSend": "Verzenden",
"Common.Views.Comments.textAdd": "Toevoegen",

4
apps/documenteditor/main/locale/ru.json
View file

@ -157,9 +157,9 @@
"Common.Views.About.txtPoweredBy": "Разработано",
"Common.Views.About.txtTel": "тел.: ",
"Common.Views.About.txtVersion": "Версия ",
"Common.Views.AutoCorrectDialog.textBy": "На:",
"Common.Views.AutoCorrectDialog.textBy": "На",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Автозамена математическими символами",
"Common.Views.AutoCorrectDialog.textReplace": "Заменить:",
"Common.Views.AutoCorrectDialog.textReplace": "Заменить",
"Common.Views.AutoCorrectDialog.textTitle": "Автозамена",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.textAdd": "Добавить",

2
apps/documenteditor/main/locale/sk.json
View file

@ -152,7 +152,7 @@
"Common.Views.About.txtPoweredBy": "Poháňaný ",
"Common.Views.About.txtTel": "tel.:",
"Common.Views.About.txtVersion": "Verzia",
"Common.Views.AutoCorrectDialog.textBy": "Od:",
"Common.Views.AutoCorrectDialog.textBy": "Od",
"Common.Views.AutoCorrectDialog.textTitle": "Automatická oprava",
"Common.Views.Chat.textSend": "Poslať",
"Common.Views.Comments.textAdd": "Pridať",

4
apps/documenteditor/main/locale/sl.json
View file

@ -135,8 +135,8 @@
"Common.Views.About.txtPoweredBy": "Poganja",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Različica",
"Common.Views.AutoCorrectDialog.textBy": "Od:",
"Common.Views.AutoCorrectDialog.textReplace": "Zamenjaj:",
"Common.Views.AutoCorrectDialog.textBy": "Od",
"Common.Views.AutoCorrectDialog.textReplace": "Zamenjaj",
"Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj",

2
apps/documenteditor/main/locale/zh.json
View file

@ -159,7 +159,7 @@
"Common.Views.About.txtVersion": "版本",
"Common.Views.AutoCorrectDialog.textBy": "依据",
"Common.Views.AutoCorrectDialog.textMathCorrect": "数学自动修正",
"Common.Views.AutoCorrectDialog.textReplace": "替换:",
"Common.Views.AutoCorrectDialog.textReplace": "替换",
"Common.Views.AutoCorrectDialog.textTitle": "自动修正",
"Common.Views.Chat.textSend": "发送",
"Common.Views.Comments.textAdd": "添加",

7
apps/documenteditor/mobile/app/controller/add/AddImage.js
View file

@ -115,16 +115,17 @@ define([
if ((/((^https?)|(^ftp)):\/\/.+/i.test(value))) {
DE.getController('AddContainer').hideModal();
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
textEmptyImgUrl : 'You need to specify image URL.',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), DE.Controllers.AddImage || {}))
});

4
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file

@ -467,8 +467,8 @@ define([
textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel',
//textContinue: 'Continue',
textDelete: 'Delete'
textDelete: 'Delete',
notcriticalErrorTitle: 'Warning'
}
})(), DE.Controllers.AddOther || {}))
});

5
apps/documenteditor/mobile/app/controller/edit/EditHyperlink.js
View file

@ -114,7 +114,7 @@ define([
isEmail = (urltype == 2);
if (urltype < 1) {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
return;
}
@ -172,7 +172,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
};
})(), DE.Controllers.EditHyperlink || {}))
});

7
apps/documenteditor/mobile/app/controller/edit/EditImage.js
View file

@ -318,10 +318,10 @@ define([
me.api.ImgApply(image);
});
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
@ -400,7 +400,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), DE.Controllers.EditImage || {}))
});

2
apps/documenteditor/mobile/app/view/edit/EditTable.js
View file

@ -114,7 +114,7 @@ define([
renderStyles: function() {
var $styleContainer = $('#edit-table-styles .item-inner');
if ($styleContainer.length > 0) {
if ($styleContainer.length > 0 && $styleContainer.is(':visible')) {
var columns = parseInt(($styleContainer.width() - 15) / 70), // magic
row = -1,
styles = [];

6
apps/documenteditor/mobile/locale/en.json
View file

@ -106,6 +106,7 @@
"DE.Controllers.AddContainer.textTable": "Table",
"DE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
"DE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.AddImage.notcriticalErrorTitle": "Warning",
"DE.Controllers.AddOther.textBelowText": "Below Text",
"DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page",
"DE.Controllers.AddOther.textCancel": "Cancel",
@ -113,6 +114,7 @@
"DE.Controllers.AddOther.textDelete": "Delete",
"DE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete the draft?",
"DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.AddOther.notcriticalErrorTitle": "Warning",
"DE.Controllers.AddTable.textCancel": "Cancel",
"DE.Controllers.AddTable.textColumns": "Columns",
"DE.Controllers.AddTable.textRows": "Rows",
@ -150,8 +152,12 @@
"DE.Controllers.EditContainer.textShape": "Shape",
"DE.Controllers.EditContainer.textTable": "Table",
"DE.Controllers.EditContainer.textText": "Text",
"DE.Controllers.EditHyperlink.textEmptyImgUrl": "You need to specify image URL.",
"DE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.EditHyperlink.notcriticalErrorTitle": "Warning",
"DE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"DE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.EditImage.notcriticalErrorTitle": "Warning",
"DE.Controllers.EditText.textAuto": "Auto",
"DE.Controllers.EditText.textFonts": "Fonts",
"DE.Controllers.EditText.textPt": "pt",

13
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -686,9 +686,13 @@ define([
shape_locked = pr.get_Locked();
no_object = false;
if (type == Asc.c_oAscTypeSelectElement.Table ||
type == Asc.c_oAscTypeSelectElement.Shape && !pr.get_FromImage() && !pr.get_FromChart()) {
type == Asc.c_oAscTypeSelectElement.Shape && !pr.get_FromImage()) {
no_text = false;
}
if (type == Asc.c_oAscTypeSelectElement.Table ||
type == Asc.c_oAscTypeSelectElement.Shape && !pr.get_FromImage() && !pr.get_FromChart()) {
no_paragraph = false;
}
in_chart = type == Asc.c_oAscTypeSelectElement.Chart;
} else if (type === Asc.c_oAscTypeSelectElement.Math) {
in_equation = true;
@ -700,16 +704,17 @@ define([
this._state.in_chart = in_chart;
}
if (paragraph_locked!==undefined && this._state.prcontrolsdisable !== paragraph_locked) {
if (this._state.prcontrolsdisable !== paragraph_locked) {
if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked;
this.toolbar.lockToolbar(PE.enumLock.paragraphLock, paragraph_locked, {array: me.toolbar.paragraphControls.concat(me.toolbar.btnInsDateTime, me.toolbar.btnInsSlideNum)});
if (paragraph_locked!==undefined)
this.toolbar.lockToolbar(PE.enumLock.paragraphLock, paragraph_locked, {array: me.toolbar.paragraphControls});
this.toolbar.lockToolbar(PE.enumLock.paragraphLock, paragraph_locked===true, {array: [me.toolbar.btnInsDateTime, me.toolbar.btnInsSlideNum]});
}
if (this._state.no_paragraph !== no_paragraph) {
if (this._state.activated) this._state.no_paragraph = no_paragraph;
this.toolbar.lockToolbar(PE.enumLock.noParagraphSelected, no_paragraph, {array: me.toolbar.paragraphControls});
this.toolbar.lockToolbar(PE.enumLock.noParagraphSelected, no_paragraph, {array: [me.toolbar.btnCopyStyle]});
this.toolbar.lockToolbar(PE.enumLock.paragraphLock, !no_paragraph && this._state.prcontrolsdisable, {array: [me.toolbar.btnInsDateTime, me.toolbar.btnInsSlideNum]});
}
if (this._state.no_text !== no_text) {

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -3137,7 +3137,7 @@ define([
cls = 'menu__icon text-orient-rdown';
break;
case Asc.c_oAscVertDrawingText.vert270:
cls = 'menu__icon btn-align-rup';
cls = 'menu__icon text-orient-rup';
break;
}
menuParagraphDirection.setIconCls(cls);

12
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -394,7 +394,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -405,7 +405,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -447,7 +447,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
@ -855,10 +855,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.get_colors(),
@ -1817,7 +1817,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);

12
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -496,7 +496,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked.background);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -507,7 +507,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -549,7 +549,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.CAscSlideProps();
var fill = new Asc.asc_CShapeFill();
@ -1303,10 +1303,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.get_colors(),
@ -1627,7 +1627,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);

12
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -395,7 +395,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -406,7 +406,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -449,7 +449,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.asc_TextArtProperties();
var fill = new Asc.asc_CShapeFill();
@ -809,10 +809,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.get_colors(),
@ -1711,7 +1711,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);

10
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -354,7 +354,7 @@ define([
id: 'id-toolbar-btn-markers',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-setmarkers',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
enableToggle: true,
toggleGroup: 'markersGroup',
split: true,
@ -366,7 +366,7 @@ define([
id: 'id-toolbar-btn-numbering',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-numbering',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
enableToggle: true,
toggleGroup: 'markersGroup',
split: true,
@ -394,7 +394,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-align-left',
icls: 'btn-align-left',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
menu: new Common.UI.Menu({
items: [
{
@ -442,7 +442,7 @@ define([
me.btnVerticalAlign = new Common.UI.Button({
id: 'id-toolbar-btn-valign',
cls: 'btn-toolbar',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.noObjectSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.noObjectSelected],
iconCls: 'toolbar__icon btn-align-middle',
icls: 'btn-align-middle',
menu: new Common.UI.Menu({
@ -500,7 +500,7 @@ define([
id: 'id-toolbar-btn-linespace',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-linespace',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
menu: new Common.UI.Menu({
style: 'min-width: 60px;',
items: [

2
apps/presentationeditor/main/locale/es.json
View file

@ -58,7 +58,7 @@
"Common.Views.About.txtPoweredBy": "Desarrollado por",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versión ",
"Common.Views.AutoCorrectDialog.textBy": "Por:",
"Common.Views.AutoCorrectDialog.textBy": "Por",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Autocorrección matemática",
"Common.Views.AutoCorrectDialog.textReplace": "Reemplazar",
"Common.Views.AutoCorrectDialog.textTitle": "Autocorrección",

4
apps/presentationeditor/main/locale/it.json
View file

@ -58,9 +58,9 @@
"Common.Views.About.txtPoweredBy": "Con tecnologia",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versione ",
"Common.Views.AutoCorrectDialog.textBy": "Di:",
"Common.Views.AutoCorrectDialog.textBy": "Di",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Correzione automatica matematica",
"Common.Views.AutoCorrectDialog.textReplace": "Sostituisci:",
"Common.Views.AutoCorrectDialog.textReplace": "Sostituisci",
"Common.Views.AutoCorrectDialog.textTitle": "Correzione automatica",
"Common.Views.Chat.textSend": "Invia",
"Common.Views.Comments.textAdd": "Aggiungi",

4
apps/presentationeditor/main/locale/nl.json
View file

@ -58,9 +58,9 @@
"Common.Views.About.txtPoweredBy": "Aangedreven door",
"Common.Views.About.txtTel": "Tel.:",
"Common.Views.About.txtVersion": "Versie",
"Common.Views.AutoCorrectDialog.textBy": "Door:",
"Common.Views.AutoCorrectDialog.textBy": "Door",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Wiskundige autocorrectie",
"Common.Views.AutoCorrectDialog.textReplace": "Vervangen:",
"Common.Views.AutoCorrectDialog.textReplace": "Vervangen",
"Common.Views.AutoCorrectDialog.textTitle": "Automatische spellingscontrole",
"Common.Views.Chat.textSend": "Verzenden",
"Common.Views.Comments.textAdd": "Toevoegen",

4
apps/presentationeditor/main/locale/ru.json
View file

@ -58,9 +58,9 @@
"Common.Views.About.txtPoweredBy": "Разработано",
"Common.Views.About.txtTel": "тел.: ",
"Common.Views.About.txtVersion": "Версия ",
"Common.Views.AutoCorrectDialog.textBy": "На:",
"Common.Views.AutoCorrectDialog.textBy": "На",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Автозамена математическими символами",
"Common.Views.AutoCorrectDialog.textReplace": "Заменить:",
"Common.Views.AutoCorrectDialog.textReplace": "Заменить",
"Common.Views.AutoCorrectDialog.textTitle": "Автозамена",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.textAdd": "Добавить",

2
apps/presentationeditor/main/locale/sk.json
View file

@ -56,7 +56,7 @@
"Common.Views.About.txtPoweredBy": "Poháňaný ",
"Common.Views.About.txtTel": "tel.:",
"Common.Views.About.txtVersion": "Verzia",
"Common.Views.AutoCorrectDialog.textBy": "Od:",
"Common.Views.AutoCorrectDialog.textBy": "Od",
"Common.Views.AutoCorrectDialog.textTitle": "Automatická oprava",
"Common.Views.Chat.textSend": "Poslať",
"Common.Views.Comments.textAdd": "Pridať",

2
apps/presentationeditor/main/locale/sl.json
View file

@ -51,7 +51,7 @@
"Common.Views.About.txtPoweredBy": "Poganja",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Različica",
"Common.Views.AutoCorrectDialog.textBy": "Od:",
"Common.Views.AutoCorrectDialog.textBy": "Od",
"Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj",

2
apps/presentationeditor/main/locale/zh.json
View file

@ -60,7 +60,7 @@
"Common.Views.About.txtVersion": "版本",
"Common.Views.AutoCorrectDialog.textBy": "依据",
"Common.Views.AutoCorrectDialog.textMathCorrect": "数学自动修正",
"Common.Views.AutoCorrectDialog.textReplace": "替换:",
"Common.Views.AutoCorrectDialog.textReplace": "替换",
"Common.Views.AutoCorrectDialog.textTitle": "自动修正",
"Common.Views.Chat.textSend": "发送",
"Common.Views.Comments.textAdd": "添加",

5
apps/presentationeditor/mobile/app/controller/Toolbar.js
View file

@ -80,6 +80,7 @@ define([
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this));
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this));
},
setMode: function (mode) {
@ -173,6 +174,10 @@ define([
}
},
onApiCountPages: function (count) {
$('#toolbar-preview').toggleClass('disabled', count<=0);
},
activateControls: function() {
$('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document, #toolbar-collaboration').removeClass('disabled');
},

7
apps/presentationeditor/mobile/app/controller/add/AddImage.js
View file

@ -112,16 +112,17 @@ define([
if ((/((^https?)|(^ftp)):\/\/.+/i.test(value))) {
PE.getController('AddContainer').hideModal();
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
textEmptyImgUrl : 'You need to specify image URL.',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), PE.Controllers.AddImage || {}))
});

4
apps/presentationeditor/mobile/app/controller/add/AddLink.js
View file

@ -209,8 +209,8 @@ define([
textLast: 'Last Slide',
textSlide: 'Slide',
textExternalLink: 'External Link',
textInternalLink: 'Slide in this Presentation'
textInternalLink: 'Slide in this Presentation',
notcriticalErrorTitle: 'Warning'
}
})(), PE.Controllers.AddLink || {}))
});

7
apps/presentationeditor/mobile/app/controller/edit/EditImage.js
View file

@ -155,10 +155,10 @@ define([
me.api.ImgApply(image);
});
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
@ -244,7 +244,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), PE.Controllers.EditImage || {}))
});

9
apps/presentationeditor/mobile/app/controller/edit/EditLink.js
View file

@ -203,6 +203,10 @@ define([
}
$('#edit-link-edit').toggleClass('disabled', (_linkType==c_oHyperlinkType.WebLink) && _.isEmpty($('#edit-link-url input').val()));
$('#edit-link-url input[type=url]').single('input', _.bind(function (e) {
$('#edit-link-edit').toggleClass('disabled', _.isEmpty($(e.currentTarget).val()));
}, me));
}
},
@ -229,7 +233,7 @@ define([
urltype = me.api.asc_getUrlType($.trim(url)),
isEmail = (urltype == 2);
if (urltype < 1) {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
return;
}
@ -352,7 +356,8 @@ define([
textLast: 'Last Slide',
textSlide: 'Slide',
textExternalLink: 'External Link',
textInternalLink: 'Slide in this Presentation'
textInternalLink: 'Slide in this Presentation',
notcriticalErrorTitle: 'Warning'
};
})(), PE.Controllers.EditLink || {}))
});

8
apps/presentationeditor/mobile/app/template/EditSlide.template
View file

@ -44,16 +44,16 @@
<ul>
<li>
<% if (android) { %>
<a id="slide-duplicate" class="button button-raised button-fill" style="margin: 20px 16px;"><%= scope.textDuplicateSlide %></a>
<a id="slide-duplicate" class="button button-raised button-fill no-ripple" style="margin: 20px 16px;"><%= scope.textDuplicateSlide %></a>
<% } else { %>
<a id="slide-duplicate" class="item-link list-button" style="text-align: center;"><%= scope.textDuplicateSlide %></a>
<a id="slide-duplicate" class="item-link list-button no-ripple" style="text-align: center;"><%= scope.textDuplicateSlide %></a>
<% } %>
</li>
<li>
<% if (android) { %>
<a id="slide-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemoveSlide %></a>
<a id="slide-remove" class="button button-raised button-fill no-ripple" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemoveSlide %></a>
<% } else { %>
<a id="slide-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemoveSlide %></a>
<a id="slide-remove" class="item-link list-button no-ripple" style="text-align: center; color: #f00"><%= scope.textRemoveSlide %></a>
<% } %>
</li>
</ul>

4
apps/presentationeditor/mobile/app/view/Settings.js
View file

@ -219,7 +219,9 @@ define([
showSetApp: function () {
this.showPage('#settings-application-view');
$('.page[data-page=settings-application-view] .page-content > :not(.display-view)').hide();
if (!isEdit) {
$('.page[data-page=settings-application-view] .page-content > :not(.display-view)').hide();
}
if (isShowMacros) {
$('#settings-macros').single('click', _.bind(this.showMacros, this));
}

2
apps/presentationeditor/mobile/app/view/edit/EditTable.js
View file

@ -115,7 +115,7 @@ define([
renderStyles: function() {
var $styleContainer = $('#edit-table-styles .item-inner');
if ($styleContainer.length > 0) {
if ($styleContainer.length > 0 && $styleContainer.is(':visible')) {
var columns = parseInt($styleContainer.width() / 70), // magic
row = -1,
styles = [];

4
apps/presentationeditor/mobile/locale/en.json
View file

@ -34,6 +34,7 @@
"PE.Controllers.AddContainer.textTable": "Table",
"PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
"PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.AddImage.notcriticalErrorTitle": "Warning",
"PE.Controllers.AddLink.textDefault": "Selected text",
"PE.Controllers.AddLink.textExternalLink": "External Link",
"PE.Controllers.AddLink.textFirst": "First Slide",
@ -43,6 +44,7 @@
"PE.Controllers.AddLink.textPrev": "Previous Slide",
"PE.Controllers.AddLink.textSlide": "Slide",
"PE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.AddLink.notcriticalErrorTitle": "Warning",
"PE.Controllers.AddOther.textCancel": "Cancel",
"PE.Controllers.AddOther.textContinue": "Continue",
"PE.Controllers.AddOther.textDelete": "Delete",
@ -76,6 +78,7 @@
"PE.Controllers.EditContainer.textText": "Text",
"PE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"PE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.EditImage.notcriticalErrorTitle": "Warning",
"PE.Controllers.EditLink.textDefault": "Selected text",
"PE.Controllers.EditLink.textExternalLink": "External Link",
"PE.Controllers.EditLink.textFirst": "First Slide",
@ -85,6 +88,7 @@
"PE.Controllers.EditLink.textPrev": "Previous Slide",
"PE.Controllers.EditLink.textSlide": "Slide",
"PE.Controllers.EditLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.EditLink.notcriticalErrorTitle": "Warning",
"PE.Controllers.EditSlide.textSec": "s",
"PE.Controllers.EditText.textAuto": "Auto",
"PE.Controllers.EditText.textFonts": "Fonts",

1
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

@ -7670,7 +7670,6 @@ html.pixel-ratio-3 .numbers li {
}
.slide-theme .row div {
margin: 0;
padding: 3px;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15);
width: 85px;
height: 38px;

1
apps/presentationeditor/mobile/resources/css/app-material.css
View file

@ -7589,7 +7589,6 @@ html.pixel-ratio-3 .numbers li {
}
.slide-theme .row div {
margin: 0;
padding: 3px;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15);
width: 85px;
height: 38px;

1
apps/presentationeditor/mobile/resources/less/app-ios.less
View file

@ -217,7 +217,6 @@ input, textarea {
div {
margin: 0;
padding: 3px;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15);
width: 85px;
height: 38px;

1
apps/presentationeditor/mobile/resources/less/app-material.less
View file

@ -229,7 +229,6 @@ input, textarea {
div {
margin: 0;
padding: 3px;
box-shadow: 0 0 0 1px rgba(0,0,0,0.15);
width: 85px;
height: 38px;

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1804,7 +1804,7 @@ define([
cls = 'menu__icon text-orient-rdown';
break;
case Asc.c_oAscVertDrawingText.vert270:
cls = 'menu__icon btn-align-rup';
cls = 'menu__icon text-orient-rup';
break;
}
documentHolder.menuParagraphDirection.setIconCls(cls);

37
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -274,6 +274,7 @@ define([
if (toolbar.cmbNumberFormat.cmpEl)
toolbar.cmbNumberFormat.cmpEl.on('click', '#id-toolbar-mnu-item-more-formats a', _.bind(this.onNumberFormatSelect, this));
toolbar.btnEditChart.on('click', _.bind(this.onEditChart, this));
toolbar.btnEditChartData.on('click', _.bind(this.onEditChartData, this));
} else
if ( me.appConfig.isEditMailMerge ) {
toolbar.btnUndo.on('click', _.bind(this.onUndo, this));
@ -950,6 +951,7 @@ define([
{
chartSettings: props,
imageSettings: imageSettings,
isDiagramMode: me.toolbar.mode.isEditDiagram,
isChart: true,
api: me.api,
handler: function(result, value) {
@ -968,6 +970,35 @@ define([
}
},
onEditChartData: function(btn) {
if (!this.editMode) return;
var me = this;
var props;
if (me.api){
props = me.api.asc_getChartObject();
if (props) {
me._isEditRanges = true;
props.startEdit();
var win = new SSE.Views.ChartDataDialog({
chartSettings: props,
api: me.api,
handler: function(result, value) {
if (result == 'ok') {
props.endEdit();
me._isEditRanges = false;
}
Common.NotificationCenter.trigger('edit:complete', me);
}
}).on('close', function() {
me._isEditRanges && props.cancelEdit();
me._isEditRanges = false;
});
win.show();
}
}
},
onSelectChart: function(group, type) {
if (!this.editMode) return;
var me = this,
@ -1817,7 +1848,7 @@ define([
var toolbar = this.toolbar;
if (toolbar.mode.isEditDiagram || toolbar.mode.isEditMailMerge) {
is_cell_edited = (state == Asc.c_oAscCellEditorState.editStart);
toolbar.lockToolbar(SSE.enumLock.editCell, state == Asc.c_oAscCellEditorState.editStart, {array: [toolbar.btnDecDecimal,toolbar.btnIncDecimal,toolbar.cmbNumberFormat]});
toolbar.lockToolbar(SSE.enumLock.editCell, state == Asc.c_oAscCellEditorState.editStart, {array: [toolbar.btnDecDecimal,toolbar.btnIncDecimal,toolbar.cmbNumberFormat, toolbar.btnEditChartData]});
} else
if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) {
toolbar.lockToolbar(SSE.enumLock.editCell, state == Asc.c_oAscCellEditorState.editStart, {
@ -2556,6 +2587,10 @@ define([
if ( _disableEditOptions(selectionType, coauth_disable) ) return;
var need_disable = (selectionType === Asc.c_oAscSelectionType.RangeCells || selectionType === Asc.c_oAscSelectionType.RangeCol ||
selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeMax);
this.toolbar.lockToolbar( SSE.enumLock.selRange, need_disable, {array:[this.toolbar.btnEditChartData]} );
if (selectionType == Asc.c_oAscSelectionType.RangeChart || selectionType == Asc.c_oAscSelectionType.RangeChartText)
return;

3
apps/spreadsheeteditor/main/app/controller/ViewTab.js
View file

@ -115,6 +115,9 @@ define([
onSelectionChanged: function(info) {
if (!this.toolbar.editMode || !this.view) return;
Common.Utils.lockControls(SSE.enumLock.sheetView, this.api.asc_getActiveNamedSheetView && !this.api.asc_getActiveNamedSheetView(this.api.asc_getActiveWorksheetIndex()),
{array: [this.view.btnCloseView]});
},
onFreeze: function(state) {

1
apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
View file

@ -30,6 +30,7 @@
<div class="group">
<div class="elset">
<span class="btn-slot border" id="slot-btn-chart" style="width: auto;"></span>
<span class="btn-slot border" id="slot-btn-chart-data" style="width: auto;margin-left: 12px;"></span>
</div>
</div>
<div class="group" style="width: 100%;"></div>

6
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -663,7 +663,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
}
@ -1049,7 +1049,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls);
this.GradLinearDirectionType = rawData.type;
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
@ -1103,7 +1103,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
if (this.gradient == null) {
this.gradient = new Asc.asc_CGradientFill();
this.gradient.asc_setType(this.GradFillType);

78
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -96,6 +96,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.imageSettings = this.options.imageSettings;
this.sparklineStyles = this.options.sparklineStyles;
this.isChart = this.options.isChart;
this.isDiagramMode = !!this.options.isDiagramMode;
this.vertAxisProps = null;
this.horAxisProps = null;
this.currentAxisProps = null;
@ -114,29 +115,31 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
// Layout
// this.btnChartType = new Common.UI.Button({
// cls : 'btn-large-dataview',
// iconCls : 'svgicon chart-bar-normal',
// menu : new Common.UI.Menu({
// style: 'width: 364px; padding-top: 12px;',
// additionalAlign: this.menuAddAlign,
// items: [
// { template: _.template('<div id="id-chart-dlg-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
// ]
// })
// });
// this.btnChartType.on('render:after', function(btn) {
// me.mnuChartTypePicker = new Common.UI.DataView({
// el: $('#id-chart-dlg-menu-type'),
// parentMenu: btn.menu,
// restoreHeight: 421,
// groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
// store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
// itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>')
// });
// });
// this.btnChartType.render($('#chart-dlg-button-type'));
// this.mnuChartTypePicker.on('item:click', _.bind(this.onSelectType, this, this.btnChartType));
if (this.isDiagramMode) {
this.btnChartType = new Common.UI.Button({
cls : 'btn-large-dataview',
iconCls : 'svgicon chart-bar-normal',
menu : new Common.UI.Menu({
style: 'width: 364px; padding-top: 12px;',
additionalAlign: this.menuAddAlign,
items: [
{ template: _.template('<div id="id-chart-dlg-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
})
});
this.btnChartType.on('render:after', function(btn) {
me.mnuChartTypePicker = new Common.UI.DataView({
el: $('#id-chart-dlg-menu-type'),
parentMenu: btn.menu,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>')
});
});
this.btnChartType.render($('#chart-dlg-button-type'));
this.mnuChartTypePicker.on('item:click', _.bind(this.onSelectType, this, this.btnChartType));
}
// this.cmbDataDirect = new Common.UI.ComboBox({
// el : $('#chart-dlg-combo-range'),
@ -1038,7 +1041,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.setTitle((this.isChart) ? this.textTitle : this.textTitleSparkline);
this.btnsCategory[0].setVisible(false); // hide type for charts
this.btnsCategory[0].setVisible(this.isDiagramMode); // hide type for charts
if (this.isChart) {
this.btnsCategory[4].setVisible(false);
this.btnsCategory[5].setVisible(false);
@ -1343,12 +1346,14 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
// Layout
// var record = this.mnuChartTypePicker.store.findWhere({type: this._state.ChartType});
// this.mnuChartTypePicker.selectRecord(record, true);
// if (record) {
// this.btnChartType.setIconCls('svgicon ' + 'chart-' + record.get('iconCls'));
// } else
// this.btnChartType.setIconCls('svgicon');
if (this.isDiagramMode) {
var record = this.mnuChartTypePicker.store.findWhere({type: this._state.ChartType});
this.mnuChartTypePicker.selectRecord(record, true);
if (record) {
this.btnChartType.setIconCls('svgicon ' + 'chart-' + record.get('iconCls'));
} else
this.btnChartType.setIconCls('svgicon');
}
this._noApply = false;
@ -1477,9 +1482,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
var value;
if (this.isChart) {
// var rec = this.mnuChartTypePicker.getSelectedRec(),
// type = (rec) ? rec.get('type') : this.currentChartType;
var type = this.currentChartType;
if (this.isDiagramMode) {
var rec = this.mnuChartTypePicker.getSelectedRec();
rec && (type = rec.get('type'));
}
this.chartSettings.putType(type);
@ -1548,10 +1555,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
var isvalid,
range = this.chartSettings.getRange();
if (!_.isEmpty(range)) {
// var rec = this.mnuChartTypePicker.getSelectedRec(),
// type = (rec) ? rec.get('type') : this.currentChartType;
var type = this.currentChartType;
if (this.isDiagramMode) {
var rec = this.mnuChartTypePicker.getSelectedRec();
rec && (type = rec.get('type'));
}
isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, range, true, !this.chartSettings.getInColumns(), type);
if (isvalid == Asc.c_oAscError.ID.No)
return true;

12
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -406,7 +406,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -417,7 +417,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -460,7 +460,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
@ -879,10 +879,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.asc_getColors(),
@ -1848,7 +1848,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD);

12
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -396,7 +396,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
@ -407,7 +407,7 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
this.numGradientAngle.setDisabled(true);
}
@ -450,7 +450,7 @@ define([
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
this.numGradientAngle.setValue(rawData.type);
this.numGradientAngle.setValue(rawData.type, true);
var props = new Asc.asc_TextArtProperties();
var fill = new Asc.asc_CShapeFill();
@ -813,10 +813,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(value);
this.numGradientAngle.setValue(value, true);
}
} else
this.numGradientAngle.setValue(0);
this.numGradientAngle.setValue(0, true);
var me = this;
var colors = fill.asc_getColors(),
@ -1714,7 +1714,7 @@ define([
},
onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
if (this.api) {
if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties();
var fill = new Asc.asc_CShapeFill();
fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_GRAD);

17
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -97,7 +97,8 @@ define([
selSlicer: 'sel-slicer',
cantSort: 'cant-sort',
pivotLock: 'pivot-lock',
tableHasSlicer: 'table-has-slicer'
tableHasSlicer: 'table-has-slicer',
sheetView: 'sheet-view'
};
SSE.Views.Toolbar = Common.UI.Mixtbar.extend(_.extend({
@ -276,6 +277,14 @@ define([
lock : [_set.lostConnect],
style : 'width: 120px;'
});
me.btnEditChartData = new Common.UI.Button({
id : 'id-toolbar-rtn-edit-chart-data',
cls : 'btn-toolbar btn-text-value',
caption : me.tipEditChartData,
lock : [_set.editCell, _set.selRange, _set.selRangeEdit, _set.lostConnect],
style : 'width: 120px;'
});
} else
if ( config.isEditMailMerge ) {
me.$layout = $(_.template(simple)(config));
@ -1629,6 +1638,7 @@ define([
_injectComponent('#slot-btn-inschart', this.btnInsertChart);
_injectComponent('#slot-field-styles', this.listStyles);
_injectComponent('#slot-btn-chart', this.btnEditChart);
_injectComponent('#slot-btn-chart-data', this.btnEditChartData);
_injectComponent('#slot-btn-pageorient', this.btnPageOrient);
_injectComponent('#slot-btn-pagemargins', this.btnPageMargins);
_injectComponent('#slot-btn-pagesize', this.btnPageSize);
@ -1973,7 +1983,7 @@ define([
if (mode.isDisconnected) {
this.lockToolbar( SSE.enumLock.lostConnect, true );
this.lockToolbar( SSE.enumLock.lostConnect, true,
{array:[this.btnEditChart,this.btnUndo,this.btnRedo]} );
{array:[this.btnEditChart, this.btnEditChartData, this.btnUndo,this.btnRedo]} );
if (!mode.enableDownload)
this.lockToolbar(SSE.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else {
@ -2436,6 +2446,7 @@ define([
capBtnInsSlicer: 'Slicer',
tipInsertSlicer: 'Insert slicer',
textVertical: 'Vertical Text',
textTabView: 'View'
textTabView: 'View',
tipEditChartData: 'Select Data'
}, SSE.Views.Toolbar || {}));
});

2
apps/spreadsheeteditor/main/app/view/ViewTab.js
View file

@ -114,7 +114,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-sheet-view-close',
caption : this.textClose,
lock : [_set.coAuth, _set.lostConnect]
lock : [_set.sheetView, _set.coAuth, _set.lostConnect]
});
this.lockedControls.push(this.btnCloseView);
Common.Utils.injectComponent($host.find('#slot-closeview'), this.btnCloseView);

4
apps/spreadsheeteditor/main/locale/de.json
View file

@ -58,9 +58,9 @@
"Common.Views.About.txtPoweredBy": "Betrieben von",
"Common.Views.About.txtTel": "Tel.: ",
"Common.Views.About.txtVersion": "Version ",
"Common.Views.AutoCorrectDialog.textBy": "Nach:",
"Common.Views.AutoCorrectDialog.textBy": "Nach",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Mathe Autokorrektur",
"Common.Views.AutoCorrectDialog.textReplace": "Ersetze:",
"Common.Views.AutoCorrectDialog.textReplace": "Ersetze",
"Common.Views.AutoCorrectDialog.textTitle": "Autokorrektur",
"Common.Views.Chat.textSend": "Senden",
"Common.Views.Comments.textAdd": "Hinzufügen",

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2901,6 +2901,7 @@
"SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells",
"SSE.Views.Toolbar.txtYen": "¥ Yen",
"SSE.Views.Toolbar.textTabView": "View",
"SSE.Views.Toolbar.tipEditChartData": "Select Data",
"SSE.Views.Top10FilterDialog.textType": "Show",
"SSE.Views.Top10FilterDialog.txtBottom": "Bottom",
"SSE.Views.Top10FilterDialog.txtBy": "by",

4
apps/spreadsheeteditor/main/locale/es.json
View file

@ -59,9 +59,9 @@
"Common.Views.About.txtPoweredBy": "Desarrollado por",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versión ",
"Common.Views.AutoCorrectDialog.textBy": "Por:",
"Common.Views.AutoCorrectDialog.textBy": "Por",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Autocorrección matemática",
"Common.Views.AutoCorrectDialog.textReplace": "Reemplazar:",
"Common.Views.AutoCorrectDialog.textReplace": "Reemplazar",
"Common.Views.AutoCorrectDialog.textTitle": "Autocorrección",
"Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Añadir",

4
apps/spreadsheeteditor/main/locale/fr.json
View file

@ -59,9 +59,9 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tél.: ",
"Common.Views.About.txtVersion": "Version ",
"Common.Views.AutoCorrectDialog.textBy": "Par:",
"Common.Views.AutoCorrectDialog.textBy": "Par",
"Common.Views.AutoCorrectDialog.textMathCorrect": "AutoMaths",
"Common.Views.AutoCorrectDialog.textReplace": "Remplacer :",
"Common.Views.AutoCorrectDialog.textReplace": "Remplacer",
"Common.Views.AutoCorrectDialog.textTitle": "Correction automatique",
"Common.Views.Chat.textSend": "Envoyer",
"Common.Views.Comments.textAdd": "Ajouter",

4
apps/spreadsheeteditor/main/locale/it.json
View file

@ -59,9 +59,9 @@
"Common.Views.About.txtPoweredBy": "Con tecnologia",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versione",
"Common.Views.AutoCorrectDialog.textBy": "Di:",
"Common.Views.AutoCorrectDialog.textBy": "Di",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Correzione automatica matematica",
"Common.Views.AutoCorrectDialog.textReplace": "Sostituisci:",
"Common.Views.AutoCorrectDialog.textReplace": "Sostituisci",
"Common.Views.AutoCorrectDialog.textTitle": "Correzione automatica",
"Common.Views.Chat.textSend": "Invia",
"Common.Views.Comments.textAdd": "Aggiungi",

2
apps/spreadsheeteditor/main/locale/ko.json
View file

@ -47,7 +47,7 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tel .:",
"Common.Views.About.txtVersion": "버전",
"Common.Views.AutoCorrectDialog.textBy": "~로:",
"Common.Views.AutoCorrectDialog.textBy": "~로",
"Common.Views.AutoCorrectDialog.textTitle": "자동 수정",
"Common.Views.Chat.textSend": "보내기",
"Common.Views.Comments.textAdd": "추가",

4
apps/spreadsheeteditor/main/locale/nl.json
View file

@ -59,9 +59,9 @@
"Common.Views.About.txtPoweredBy": "Aangedreven door",
"Common.Views.About.txtTel": "Tel.:",
"Common.Views.About.txtVersion": "Versie",
"Common.Views.AutoCorrectDialog.textBy": "Door:",
"Common.Views.AutoCorrectDialog.textBy": "Door",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Wiskundige autocorrectie",
"Common.Views.AutoCorrectDialog.textReplace": "Vervangen:",
"Common.Views.AutoCorrectDialog.textReplace": "Vervangen",
"Common.Views.AutoCorrectDialog.textTitle": "Automatische spellingscontrole",
"Common.Views.Chat.textSend": "Verzenden",
"Common.Views.Comments.textAdd": "Toevoegen",

6
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -59,9 +59,9 @@
"Common.Views.About.txtPoweredBy": "Разработано",
"Common.Views.About.txtTel": "тел.: ",
"Common.Views.About.txtVersion": "Версия ",
"Common.Views.AutoCorrectDialog.textBy": "На:",
"Common.Views.AutoCorrectDialog.textBy": "На",
"Common.Views.AutoCorrectDialog.textMathCorrect": "Автозамена математическими символами",
"Common.Views.AutoCorrectDialog.textReplace": "Заменить:",
"Common.Views.AutoCorrectDialog.textReplace": "Заменить",
"Common.Views.AutoCorrectDialog.textTitle": "Автозамена",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.textAdd": "Добавить",
@ -1230,7 +1230,7 @@
"SSE.Views.AutoFilterDialog.txtLess": "Меньше...",
"SSE.Views.AutoFilterDialog.txtLessEquals": "Меньше или равно...",
"SSE.Views.AutoFilterDialog.txtNotBegins": "Не начинается с...",
"SSE.Views.AutoFilterDialog.txtNotBetween": "не между...",
"SSE.Views.AutoFilterDialog.txtNotBetween": "Не между...",
"SSE.Views.AutoFilterDialog.txtNotContains": "Не содержит...",
"SSE.Views.AutoFilterDialog.txtNotEnds": "Не оканчивается на...",
"SSE.Views.AutoFilterDialog.txtNotEquals": "Не равно...",

2
apps/spreadsheeteditor/main/locale/sk.json
View file

@ -58,7 +58,7 @@
"Common.Views.About.txtPoweredBy": "Poháňaný ",
"Common.Views.About.txtTel": "tel.:",
"Common.Views.About.txtVersion": "Verzia",
"Common.Views.AutoCorrectDialog.textBy": "Od:",
"Common.Views.AutoCorrectDialog.textBy": "Od",
"Common.Views.AutoCorrectDialog.textTitle": "Automatická oprava",
"Common.Views.Chat.textSend": "Poslať",
"Common.Views.Comments.textAdd": "Pridať",

2
apps/spreadsheeteditor/main/locale/sl.json
View file

@ -50,7 +50,7 @@
"Common.Views.About.txtPoweredBy": "Poganja",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Različica",
"Common.Views.AutoCorrectDialog.textBy": "Od:",
"Common.Views.AutoCorrectDialog.textBy": "Od",
"Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj",

2
apps/spreadsheeteditor/main/locale/zh.json
View file

@ -60,7 +60,7 @@
"Common.Views.About.txtVersion": "版本",
"Common.Views.AutoCorrectDialog.textBy": "依据",
"Common.Views.AutoCorrectDialog.textMathCorrect": "数学自动修正",
"Common.Views.AutoCorrectDialog.textReplace": "替换:",
"Common.Views.AutoCorrectDialog.textReplace": "替换",
"Common.Views.AutoCorrectDialog.textTitle": "自动修正",
"Common.Views.Chat.textSend": "发送",
"Common.Views.Comments.textAdd": "添加",

1
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -183,7 +183,6 @@
border-left: 1px solid @gray-dark;
border-right: 1px solid @gray-dark;
border-top: 1px solid @gray-dark;
white-space: nowrap;
&:hover {
border-top-color: @gray-dark;

5
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -207,7 +207,7 @@ define([
case 'merge':
if (me.api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
_.defer(function () {
uiApp.confirm(me.warnMergeLostData, undefined, function(){
uiApp.confirm(me.warnMergeLostData, me.notcriticalErrorTitle, function(){
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
});
});
@ -521,7 +521,8 @@ define([
menuAddComment: 'Add Comment',
textCopyCutPasteActions: 'Copy, Cut and Paste Actions',
errorCopyCutPaste: 'Copy, cut and paste actions using the context menu will be performed within the current file only.',
textDoNotShowAgain: 'Don\'t show again'
textDoNotShowAgain: 'Don\'t show again',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.DocumentHolder || {}))
});

8
apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
View file

@ -254,12 +254,12 @@ define([
var me = this;
if (me.sheets.length == 1) {
uiApp.alert(me.errorLastSheet);
uiApp.alert(me.errorLastSheet, me.notcriticalErrorTitle);
} else {
uiApp.confirm(me.warnDeleteSheet, undefined, _.buffered(function() {
uiApp.confirm(me.warnDeleteSheet, me.notcriticalErrorTitle, _.buffered(function() {
if ( !me.api.asc_deleteWorksheet() ) {
_.defer(function(){
uiApp.alert(me.errorRemoveSheet);
uiApp.alert(me.errorRemoveSheet, me.notcriticalErrorTitle);
});
}
}, 300));
@ -269,7 +269,7 @@ define([
hideWorksheet: function(hide, index) {
if ( hide ) {
this.sheets.length == 1 ?
uiApp.alert(this.errorLastSheet) :
uiApp.alert(this.errorLastSheet, this.notcriticalErrorTitle) :
this.api['asc_hideWorksheet']([index]);
} else {
this.api['asc_showWorksheet'](index);

3
apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
View file

@ -175,7 +175,8 @@ define([
},
textInvalidRange : 'ERROR! Invalid cells range',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.AddLink || {}))
});

7
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
View file

@ -174,10 +174,10 @@ define([
if ((/((^https?)|(^ftp)):\/\/.+/i.test(url))) {
SSE.getController('AddContainer').hideModal();
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
} else {
SSE.getController('AddContainer').hideModal();
@ -202,7 +202,8 @@ define([
textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel',
//textContinue: 'Continue',
textDelete: 'Delete'
textDelete: 'Delete',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.AddOther || {}))
});

7
apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
View file

@ -200,7 +200,7 @@ define([
isValidRange = /^[A-Z]+[1-9]\d*$/.test(range);
if (!isValidRange) {
uiApp.alert(me.textInvalidRange);
uiApp.alert(me.textInvalidRange, me.notcriticalErrorTitle);
return;
}
@ -214,7 +214,7 @@ define([
var urlType = me.api.asc_getUrlType($.trim(url));
if (urlType < 1) {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
return;
}
@ -253,7 +253,8 @@ define([
textDefault: 'Selected range',
textInvalidRange: 'Invalid cells range',
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.EditHyperlink || {}))
});

7
apps/spreadsheeteditor/mobile/app/controller/edit/EditImage.js
View file

@ -191,10 +191,10 @@ define([
me.api.asc_setGraphicObjectProps(image);
});
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
@ -262,7 +262,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.EditImage || {}))
});

2
apps/spreadsheeteditor/mobile/app/template/EditImage.template
View file

@ -33,7 +33,7 @@
</li>
<li>
<% if (android) { %>
<a id="image-default" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
<a id="image-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
<% } else { %>
<a id="image-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemove %></a>
<% } %>

2
apps/spreadsheeteditor/mobile/locale/bg.json
View file

@ -528,7 +528,7 @@
"SSE.Views.Search.textSheet": "Лист",
"SSE.Views.Search.textValues": "Стойности",
"SSE.Views.Search.textWorkbook": "Работна книга",
"SSE.Views.Settings. textLocation": "местоположение",
"SSE.Views.Settings.textLocation": "местоположение",
"SSE.Views.Settings.textAbout": "Относно",
"SSE.Views.Settings.textAddress": "адрес",
"SSE.Views.Settings.textApplication": "Приложение",

2
apps/spreadsheeteditor/mobile/locale/cs.json
View file

@ -567,7 +567,7 @@
"SSE.Views.Search.textSheet": "List",
"SSE.Views.Search.textValues": "Hodnoty",
"SSE.Views.Search.textWorkbook": "Sešit",
"SSE.Views.Settings. textLocation": "Umístění",
"SSE.Views.Settings.textLocation": "Umístění",
"SSE.Views.Settings.textAbout": "O",
"SSE.Views.Settings.textAddress": "Adresa",
"SSE.Views.Settings.textApplication": "Aplikace",

2
apps/spreadsheeteditor/mobile/locale/de.json
View file

@ -567,7 +567,7 @@
"SSE.Views.Search.textSheet": "Sheet",
"SSE.Views.Search.textValues": "Werte",
"SSE.Views.Search.textWorkbook": "Arbeitsmappe",
"SSE.Views.Settings. textLocation": "Speicherort",
"SSE.Views.Settings.textLocation": "Speicherort",
"SSE.Views.Settings.textAbout": "Über",
"SSE.Views.Settings.textAddress": "Adresse",
"SSE.Views.Settings.textApplication": "Anwendung",

9
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -37,12 +37,14 @@
"SSE.Controllers.AddContainer.textShape": "Shape",
"SSE.Controllers.AddLink.textInvalidRange": "ERROR! Invalid cells range",
"SSE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.AddLink.notcriticalErrorTitle": "Warning",
"SSE.Controllers.AddOther.textCancel": "Cancel",
"SSE.Controllers.AddOther.textContinue": "Continue",
"SSE.Controllers.AddOther.textDelete": "Delete",
"SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete the draft?",
"SSE.Controllers.AddOther.textEmptyImgUrl": "You need to specify image URL.",
"SSE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.AddOther.notcriticalErrorTitle": "Warning",
"SSE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
"SSE.Controllers.DocumentHolder.menuAddComment": "Add Comment",
"SSE.Controllers.DocumentHolder.menuAddLink": "Add Link",
@ -67,6 +69,7 @@
"SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Do not show again",
"SSE.Controllers.DocumentHolder.warnMergeLostData": "Operation can destroy data in the selected cells.<br>Continue?",
"SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
"SSE.Controllers.EditCell.textAuto": "Auto",
"SSE.Controllers.EditCell.textFonts": "Fonts",
"SSE.Controllers.EditCell.textPt": "pt",
@ -126,6 +129,10 @@
"SSE.Controllers.EditHyperlink.textInternalLink": "Internal Data Range",
"SSE.Controllers.EditHyperlink.textInvalidRange": "Invalid cells range",
"SSE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
"SSE.Controllers.EditHyperlink.notcriticalErrorTitle": "Warning",
"SSE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"SSE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.EditImage.notcriticalErrorTitle": "Warning",
"SSE.Controllers.FilterOptions.textEmptyItem": "{Blanks}",
"SSE.Controllers.FilterOptions.textErrorMsg": "You must choose at least one value",
"SSE.Controllers.FilterOptions.textErrorTitle": "Warning",
@ -569,7 +576,7 @@
"SSE.Views.Search.textSheet": "Sheet",
"SSE.Views.Search.textValues": "Values",
"SSE.Views.Search.textWorkbook": "Workbook",
"SSE.Views.Settings. textLocation": "Location",
"SSE.Views.Settings.textLocation": "Location",
"SSE.Views.Settings.textAbout": "About",
"SSE.Views.Settings.textAddress": "address",
"SSE.Views.Settings.textApplication": "Application",

2
apps/spreadsheeteditor/mobile/locale/es.json
View file

@ -569,7 +569,7 @@
"SSE.Views.Search.textSheet": "Hoja",
"SSE.Views.Search.textValues": "Valores",
"SSE.Views.Search.textWorkbook": "Libro de trabajo",
"SSE.Views.Settings. textLocation": "Ubicación",
"SSE.Views.Settings.textLocation": "Ubicación",
"SSE.Views.Settings.textAbout": "Acerca de producto",
"SSE.Views.Settings.textAddress": "dirección",
"SSE.Views.Settings.textApplication": "Aplicación",

2
apps/spreadsheeteditor/mobile/locale/fr.json
View file

@ -568,7 +568,7 @@
"SSE.Views.Search.textSheet": "Feuille",
"SSE.Views.Search.textValues": "Valeurs",
"SSE.Views.Search.textWorkbook": "Classeur",
"SSE.Views.Settings. textLocation": "Emplacement",
"SSE.Views.Settings.textLocation": "Emplacement",
"SSE.Views.Settings.textAbout": "À propos de",
"SSE.Views.Settings.textAddress": "adresse",
"SSE.Views.Settings.textApplication": "Application",

2
apps/spreadsheeteditor/mobile/locale/hu.json
View file

@ -529,7 +529,7 @@
"SSE.Views.Search.textSheet": "Munkalap",
"SSE.Views.Search.textValues": "Értékek",
"SSE.Views.Search.textWorkbook": "Munkafüzet",
"SSE.Views.Settings. textLocation": "Hely",
"SSE.Views.Settings.textLocation": "Hely",
"SSE.Views.Settings.textAbout": "Névjegy",
"SSE.Views.Settings.textAddress": "Cím",
"SSE.Views.Settings.textApplication": "Alkalmazás",

2
apps/spreadsheeteditor/mobile/locale/it.json
View file

@ -543,7 +543,7 @@
"SSE.Views.Search.textSheet": "Foglio",
"SSE.Views.Search.textValues": "Valori",
"SSE.Views.Search.textWorkbook": "Cartella di lavoro",
"SSE.Views.Settings. textLocation": "Posizione",
"SSE.Views.Settings.textLocation": "Posizione",
"SSE.Views.Settings.textAbout": "Informazioni su",
"SSE.Views.Settings.textAddress": "Indirizzo",
"SSE.Views.Settings.textApplication": "Applicazione",

2
apps/spreadsheeteditor/mobile/locale/pt.json
View file

@ -527,7 +527,7 @@
"SSE.Views.Search.textSheet": "Folha",
"SSE.Views.Search.textValues": "Valores",
"SSE.Views.Search.textWorkbook": "Pasta de trabalho",
"SSE.Views.Settings. textLocation": "Localização",
"SSE.Views.Settings.textLocation": "Localização",
"SSE.Views.Settings.textAbout": "Sobre",
"SSE.Views.Settings.textAddress": "endereço",
"SSE.Views.Settings.textApplication": "Aplicativo",

2
apps/spreadsheeteditor/mobile/locale/ru.json
View file

@ -569,7 +569,7 @@
"SSE.Views.Search.textSheet": "На листе",
"SSE.Views.Search.textValues": "Значения",
"SSE.Views.Search.textWorkbook": "В книге",
"SSE.Views.Settings. textLocation": "Размещение",
"SSE.Views.Settings.textLocation": "Размещение",
"SSE.Views.Settings.textAbout": "О программе",
"SSE.Views.Settings.textAddress": "адрес",
"SSE.Views.Settings.textApplication": "Приложение",

2
apps/spreadsheeteditor/mobile/locale/sk.json
View file

@ -567,7 +567,7 @@
"SSE.Views.Search.textSheet": "List",
"SSE.Views.Search.textValues": "Hodnoty",
"SSE.Views.Search.textWorkbook": "Zošit",
"SSE.Views.Settings. textLocation": "Umiestnenie",
"SSE.Views.Settings.textLocation": "Umiestnenie",
"SSE.Views.Settings.textAbout": "O aplikácii",
"SSE.Views.Settings.textAddress": "adresa",
"SSE.Views.Settings.textApplication": "Aplikácia",

2
apps/spreadsheeteditor/mobile/locale/sl.json
View file

@ -487,7 +487,7 @@
"SSE.Views.Search.textSheet": "Stran",
"SSE.Views.Search.textValues": "Vrednosti",
"SSE.Views.Search.textWorkbook": "Delovni zvezek",
"SSE.Views.Settings. textLocation": "Lokacija",
"SSE.Views.Settings.textLocation": "Lokacija",
"SSE.Views.Settings.textAbout": "O programu",
"SSE.Views.Settings.textAddress": "naslov",
"SSE.Views.Settings.textApplication": "Aplikacija",

2
apps/spreadsheeteditor/mobile/locale/zh.json
View file

@ -568,7 +568,7 @@
"SSE.Views.Search.textSheet": "表格",
"SSE.Views.Search.textValues": "值",
"SSE.Views.Search.textWorkbook": "工作簿",
"SSE.Views.Settings. textLocation": "位置",
"SSE.Views.Settings.textLocation": "位置",
"SSE.Views.Settings.textAbout": "关于",
"SSE.Views.Settings.textAddress": "地址",
"SSE.Views.Settings.textApplication": "应用",

2
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -7876,7 +7876,7 @@ html.pixel-ratio-3 .statusbar .button:after {
.box-tabs ul {
margin: 0;
padding: 0;
white-space: nowrap;
white-space: pre;
overflow: hidden;
}
.box-tabs ul > li {

2
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -7863,7 +7863,7 @@ html.pixel-ratio-3 .statusbar .button:after {
.box-tabs ul {
margin: 0;
padding: 0;
white-space: nowrap;
white-space: pre;
overflow: hidden;
}
.box-tabs ul > li {

2
apps/spreadsheeteditor/mobile/resources/less/statusbar.less
View file

@ -47,7 +47,7 @@
ul {
margin: 0;
padding: 0;
white-space: nowrap;
white-space: pre;
overflow: hidden;
> li {