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

Merge pull request #18 from ONLYOFFICE/release/v4.1.0

Browse source 
Release/v4.1.0
This commit is contained in:
Julia Radzhabova 2016-08-29 16:48:24 +03:00 committed by GitHub
parent a1ebc44288 878f1880c3
commit d6c7684bed
8 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/ChartSettings.js
View file

@ -577,7 +577,7 @@ define([
textBar: 'Bar Chart', textBar: 'Bar Chart',
textArea: 'Area Chart', textArea: 'Area Chart',
textPie: 'Pie Chart', textPie: 'Pie Chart',
textPoint: 'Point Chart', textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart', textStock: 'Stock Chart',
textStyle: 'Style' textStyle: 'Style'

6
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -242,10 +242,10 @@ define([
if (this._state.isOleObject) { if (this._state.isOleObject) {
var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
} else { } else {
this.btnInsertFromUrl.setDisabled(pluginGuid===null); this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
this.btnInsertFromFile.setDisabled(pluginGuid===null); this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
} }
} }
}, },

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1815,7 +1815,7 @@ define([
textBar: 'Bar Chart', textBar: 'Bar Chart',
textArea: 'Area Chart', textArea: 'Area Chart',
textPie: 'Pie Chart', textPie: 'Pie Chart',
textPoint: 'Point Chart', textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart', textStock: 'Stock Chart',
tipColorSchemas: 'Change Color Scheme', tipColorSchemas: 'Change Color Scheme',
tipInsertText: 'Insert Text', tipInsertText: 'Insert Text',

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

@ -512,7 +512,7 @@ define([
textBar: 'Bar Chart', textBar: 'Bar Chart',
textArea: 'Area Chart', textArea: 'Area Chart',
textPie: 'Pie Chart', textPie: 'Pie Chart',
textPoint: 'Point Chart', textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart', textStock: 'Stock Chart',
textStyle: 'Style' textStyle: 'Style'
}, PE.Views.ChartSettings || {})); }, PE.Views.ChartSettings || {}));

6
apps/presentationeditor/main/app/view/ImageSettings.js
View file

@ -181,10 +181,10 @@ define([
if (this._state.isOleObject) { if (this._state.isOleObject) {
var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
} else { } else {
this.btnInsertFromUrl.setDisabled(pluginGuid===null); this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
this.btnInsertFromFile.setDisabled(pluginGuid===null); this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
} }
} }
}, },

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

@ -1595,7 +1595,7 @@ define([
textBar: 'Bar Chart', textBar: 'Bar Chart',
textArea: 'Area Chart', textArea: 'Area Chart',
textPie: 'Pie Chart', textPie: 'Pie Chart',
textPoint: 'Point Chart', textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart', textStock: 'Stock Chart',
tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.', tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.',
txtScheme1: 'Office', txtScheme1: 'Office',

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

@ -528,7 +528,7 @@ define([
textBar: 'Bar Chart', textBar: 'Bar Chart',
textArea: 'Area Chart', textArea: 'Area Chart',
textPie: 'Pie Chart', textPie: 'Pie Chart',
textPoint: 'Point Chart', textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart', textStock: 'Stock Chart',
textStyle: 'Style', textStyle: 'Style',
textAdvanced: 'Show advanced settings' textAdvanced: 'Show advanced settings'

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

@ -236,10 +236,10 @@ define([
if (this._state.isOleObject) { if (this._state.isOleObject) {
var plugin = SSE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); var plugin = SSE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
} else { } else {
this.btnInsertFromUrl.setDisabled(pluginGuid===null); this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
this.btnInsertFromFile.setDisabled(pluginGuid===null); this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
} }
} }
}, },