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

[DE] refactoring

Browse source
This commit is contained in:
Maxim Kadushkin 2019-02-26 12:33:24 +03:00
parent 8ee39e65f9
commit 8b06eb1461
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,9 +316,9 @@ define([
});
}
this.warnNoLicense = this.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
this.warnNoLicenseUsers = this.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
this.textNoLicenseTitle = this.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -1442,7 +1442,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '<a href=\"{{API_URL_EDITING_CALLBACK}}\" target=\"_blank\">here</a>');
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.closable = false;
break;
@ -2335,7 +2335,7 @@ define([
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server %1',
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
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',
txtErrorLoadHistory: 'Loading history failed',

16
build/Gruntfile.js
View file

@ -287,22 +287,6 @@ module.exports = function(grunt) {
}
}
});
var extr = process.env['ASCREPLACE'];
if ( !!extr ) {
var replace = grunt.config.get('replace');
var pairs = extr.split(';');
for (var i in pairs) {
var v = pairs[i].split(':');
replace.writeVersion.replacements.push({
from: v[0],
to: v[1] || ''
});
}
grunt.config.set('replace', replace);
}
});
grunt.registerTask('deploy-reporter', function(){