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

Merge branch 'develop' into feature/sse-filter-settings

Browse source
This commit is contained in:
Julia Radzhabova 2016-04-14 14:04:51 +03:00
parent 7057128636 ae19165f88
commit 1c7d0eea98
14 changed files with 80 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/main/lib/component/Window.js
View file

@ -301,9 +301,14 @@ define([
options.primary = 'ok';
var newBtns = {};
_.each(options.buttons, function(b){
newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''};
if (b=='custom')
newBtns[b].cls += ' custom';
if (typeof(b) == 'object') {
if (b.value !== undefined)
newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')};
} else {
newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''};
if (b=='custom')
newBtns[b].cls += ' custom';
}
});
options.buttons = newBtns;

18
apps/documenteditor/main/app/controller/Main.js
View file

@ -892,14 +892,19 @@ define([
if (now - value > 86400000) {
Common.localStorage.setItem("de-license-warning", now);
Common.UI.info({
width: 400,
title: this.textNoLicenseTitle,
msg : this.warnNoLicense,
buttons: ['custom'],
primary: 'custom',
customButtonText: this.textBuyNow,
buttons: [
{value: 'buynow', caption: this.textBuyNow},
{value: 'contact', caption: this.textContactUs}
],
primary: 'buynow',
callback: function(btn) {
if (btn == 'custom')
if (btn == 'buynow')
window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank");
else if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
}
});
}
@ -1791,8 +1796,9 @@ define([
textStrict: 'Strict mode',
txtErrorLoadHistory: 'Loading history failed',
textBuyNow: 'Buy now',
textNoLicenseTitle: 'License expired',
warnNoLicense: 'The license expired. You cannot create or edit files.<br>Click the \'Buy now\' button to prolong the license.'
textNoLicenseTitle: 'License expired or not found',
warnNoLicense: 'The license could not be found or expired. You cannot edit files.<br>Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.',
textContactUs: 'Contact us'
}
})(), DE.Controllers.Main || {}))
});

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

@ -329,7 +329,7 @@ define([
this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
value = Common.localStorage.getItem("de-settings-coauthmode");
var fast_coauth = (value===null || parseInt(value) == 1);
var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline);
item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)});
this.cmbCoAuthMode.setValue(item ? item.get('value') : 1);
@ -352,7 +352,7 @@ define([
this._oldUnits = this.cmbUnit.getValue();
value = Common.localStorage.getItem("de-settings-autosave");
this.chAutosave.setValue(fast_coauth);
this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1));
value = Common.localStorage.getItem("de-settings-spellcheck");
this.chSpell.setValue(value===null || parseInt(value) == 1);

2
apps/documenteditor/main/index.html
View file

@ -251,6 +251,7 @@
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguagesAll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
@ -364,7 +365,6 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/documentrenderer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>

5
apps/documenteditor/main/locale/en.json
View file

@ -234,7 +234,7 @@
"DE.Controllers.Main.textBuyNow": "Buy now",
"DE.Controllers.Main.textCloseTip": "\nClick to close the tip",
"DE.Controllers.Main.textLoadingDocument": "Loading document",
"DE.Controllers.Main.textNoLicenseTitle": "License expired",
"DE.Controllers.Main.textNoLicenseTitle": "License expired or not found",
"DE.Controllers.Main.textStrict": "Strict mode",
"DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
"DE.Controllers.Main.titleUpdateVersion": "Version changed",
@ -264,8 +264,9 @@
"DE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"DE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
"DE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
"DE.Controllers.Main.warnNoLicense": "The license expired. You cannot create or edit files.<br>Click the 'Buy now' button to prolong the license.",
"DE.Controllers.Main.warnNoLicense": "The license could not be found or expired. You cannot edit files.<br>Click 'Buy now' to purchase Enterprise Edition license or 'Contact us' if you use Integration Edition.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Main.textContactUs": "Contact us",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%",

18
apps/presentationeditor/main/app/controller/Main.js
View file

@ -683,14 +683,19 @@ define([
if (now - value > 86400000) {
Common.localStorage.setItem("de-license-warning", now);
Common.UI.info({
width: 400,
title: this.textNoLicenseTitle,
msg : this.warnNoLicense,
buttons: ['custom'],
primary: 'custom',
customButtonText: this.textBuyNow,
buttons: [
{value: 'buynow', caption: this.textBuyNow},
{value: 'contact', caption: this.textContactUs}
],
primary: 'buynow',
callback: function(btn) {
if (btn == 'custom')
if (btn == 'buynow')
window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank");
else if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
}
});
}
@ -1605,8 +1610,9 @@ define([
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
textBuyNow: 'Buy now',
textNoLicenseTitle: 'License expired',
warnNoLicense: 'The license expired. You cannot create or edit files.<br>Click the \'Buy now\' button to prolong the license.'
textNoLicenseTitle: 'License expired or not found',
warnNoLicense: 'The license could not be found or expired. You cannot edit files.<br>Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.',
textContactUs: 'Contact us'
}
})(), PE.Controllers.Main || {}))
});

4
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -273,7 +273,7 @@ define([
/** coauthoring begin **/
value = Common.localStorage.getItem("pe-settings-coauthmode");
var fast_coauth = (value===null || parseInt(value) == 1);
var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline);
item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)});
this.cmbCoAuthMode.setValue(item ? item.get('value') : 1);
@ -286,7 +286,7 @@ define([
this._oldUnits = this.cmbUnit.getValue();
value = Common.localStorage.getItem("pe-settings-autosave");
this.chAutosave.setValue(fast_coauth);
this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1));
value = Common.localStorage.getItem("pe-settings-showsnaplines");
this.chAlignGuides.setValue(value===null || parseInt(value) == 1);

25
apps/presentationeditor/main/index.html
View file

@ -235,21 +235,30 @@
<script type="text/javascript">
window.g_debug_mode = true;
</script>
<!-- sdk -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/ThemeLoader.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
@ -340,12 +349,8 @@
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Layout.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>

5
apps/presentationeditor/main/locale/en.json
View file

@ -147,7 +147,7 @@
"PE.Controllers.Main.textBuyNow": "Buy now",
"PE.Controllers.Main.textCloseTip": "\nClick to close the tip",
"PE.Controllers.Main.textLoadingDocument": "Loading presentation",
"PE.Controllers.Main.textNoLicenseTitle": "License expired",
"PE.Controllers.Main.textNoLicenseTitle": "License expired or not found",
"PE.Controllers.Main.textShape": "Shape",
"PE.Controllers.Main.textStrict": "Strict mode",
"PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
@ -212,8 +212,9 @@
"PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"PE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
"PE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
"PE.Controllers.Main.warnNoLicense": "The license expired. You cannot create or edit files.<br>Click the 'Buy now' button to prolong the license.",
"PE.Controllers.Main.warnNoLicense": "The license could not be found or expired. You cannot edit files.<br>Click 'Buy now' to purchase Enterprise Edition license or 'Contact us' if you use Integration Edition.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.textContactUs": "Contact us",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
"PE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.",

18
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -689,14 +689,19 @@ define([
if (now - value > 86400000) {
Common.localStorage.setItem("de-license-warning", now);
Common.UI.info({
width: 400,
title: this.textNoLicenseTitle,
msg : this.warnNoLicense,
buttons: ['custom'],
primary: 'custom',
customButtonText: this.textBuyNow,
buttons: [
{value: 'buynow', caption: this.textBuyNow},
{value: 'contact', caption: this.textContactUs}
],
primary: 'buynow',
callback: function(btn) {
if (btn == 'custom')
if (btn == 'buynow')
window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank");
else if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
}
});
}
@ -1778,8 +1783,9 @@ define([
errorOpenWarning: 'The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.',
errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.<br>Please check the data and try again.',
textBuyNow: 'Buy now',
textNoLicenseTitle: 'License expired',
warnNoLicense: 'The license expired. You cannot create or edit files.<br>Click the \'Buy now\' button to prolong the license.'
textNoLicenseTitle: 'License expired or not found',
warnNoLicense: 'The license could not be found or expired. You cannot edit files.<br>Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.',
textContactUs: 'Contact us'
}
})(), SSE.Controllers.Main || {}))
});

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -648,7 +648,7 @@ define([
this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
value = Common.localStorage.getItem("sse-settings-coauthmode");
var fast_coauth = (value===null || parseInt(value) == 1);
var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline);
item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)});
this.cmbCoAuthMode.setValue(item ? item.get('value') : 1);
@ -665,7 +665,7 @@ define([
this._oldUnits = this.cmbUnit.getValue();
value = Common.localStorage.getItem("sse-settings-autosave");
this.chAutosave.setValue(fast_coauth);
this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1));
value = Common.localStorage.getItem("sse-settings-func-locale");
if (value===null)

8
apps/spreadsheeteditor/main/index.html
View file

@ -247,13 +247,15 @@
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
@ -269,8 +271,6 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script>
@ -297,6 +297,7 @@
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
@ -304,7 +305,6 @@
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/StringRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellTextRender.js"></script>

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

@ -184,7 +184,7 @@
"SSE.Controllers.Main.textConfirm": "Confirmation",
"SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet",
"SSE.Controllers.Main.textNo": "No",
"SSE.Controllers.Main.textNoLicenseTitle": "License expired",
"SSE.Controllers.Main.textNoLicenseTitle": "License expired or not found",
"SSE.Controllers.Main.textPleaseWait": "The operation might take more time than expected. Please wait...",
"SSE.Controllers.Main.textRecalcFormulas": "Calculating formulas...",
"SSE.Controllers.Main.textShape": "Shape",
@ -216,8 +216,9 @@
"SSE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"SSE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
"SSE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
"SSE.Controllers.Main.warnNoLicense": "The license expired. You cannot create or edit files.<br>Click the 'Buy now' button to prolong the license.",
"SSE.Controllers.Main.warnNoLicense": "The license could not be found or expired. You cannot edit files.<br>Click 'Buy now' to purchase Enterprise Edition license or 'Contact us' if you use Integration Edition.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.textContactUs": "Contact us",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning",
"SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",

2
build/Gruntfile.js
View file

@ -173,7 +173,7 @@ module.exports = function(grunt) {
' *\n' +
' * <%= pkg.homepage %> \n' +
' *\n' +
' * Version: <%= pkg.version %> (build:<%= pkg.build %>, rev:' + (process.env['GIT_COMMIT'] || 'local') + ')\n' +
' * Version: ' + process.env['PRODUCT_VERSION'] + ' (build:' + process.env['BUILD_NUMBER'] + ')\n' +
' */\n'
},
dist: {