Commit 4b7ae689 authored by Sergey Luzyanin's avatar Sergey Luzyanin

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

parents 093c5865 feae3232
...@@ -36,23 +36,6 @@ module.exports = function(grunt) { ...@@ -36,23 +36,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-exec'); grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-replace'); grunt.loadNpmTasks('grunt-replace');
grunt.registerTask('get_svn_info', 'Initialize svn information', function () {
// Instruct this task to wait until we call the done() method to continue
var done = this.async();
grunt.util.spawn({
cmd: 'svnversion',
args: ['../../'],
}, function (error, result, code) {
if (null === error) {
revision = result;
}
// All done, continue to the next tasks
done();
});
});
grunt.registerTask('build_webword_init', 'Initialize build WebWord SDK.', function(){ grunt.registerTask('build_webword_init', 'Initialize build WebWord SDK.', function(){
defaultConfig = path + '/webword.json'; defaultConfig = path + '/webword.json';
packageFile = require(defaultConfig); packageFile = require(defaultConfig);
...@@ -141,13 +124,7 @@ module.exports = function(grunt) { ...@@ -141,13 +124,7 @@ module.exports = function(grunt) {
packageFile['info']['build'] = parseInt(process.env['BUILD_NUMBER']); packageFile['info']['build'] = parseInt(process.env['BUILD_NUMBER']);
pkg.info.build = packageFile['info']['build']; pkg.info.build = packageFile['info']['build'];
} }
if(undefined !== process.env['SVN_REVISION']){ packageFile['info']['rev'] = process.env['SVN_REVISION'] || revision;
packageFile['info']['rev'] = process.env['SVN_REVISION'];
}
else{
grunt.log.ok('Use revision number \"' + revision + '\" from svnversion!'.yellow);
packageFile['info']['rev'] = revision;
}
grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4)); grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4));
}); });
...@@ -253,5 +230,5 @@ module.exports = function(grunt) { ...@@ -253,5 +230,5 @@ module.exports = function(grunt) {
grunt.registerTask('compile_sdk', ['compile_sdk_init:' + level, 'closure-compiler', 'concat', 'replace', 'clean']); grunt.registerTask('compile_sdk', ['compile_sdk_init:' + level, 'closure-compiler', 'concat', 'replace', 'clean']);
grunt.registerTask('compile_sdk_native', ['compile_sdk_init:' + level, 'closure-compiler:sdk', 'concat', 'replace', 'clean']); grunt.registerTask('compile_sdk_native', ['compile_sdk_init:' + level, 'closure-compiler:sdk', 'concat', 'replace', 'clean']);
grunt.registerTask('default', ['get_svn_info', 'build_all']); grunt.registerTask('default', ['build_all']);
}; };
\ No newline at end of file
...@@ -2123,6 +2123,8 @@ Paragraph.prototype = ...@@ -2123,6 +2123,8 @@ Paragraph.prototype =
Element = aUnderline.Get_Next(); Element = aUnderline.Get_Next();
} }
if (pGraphics.RENDERER_PDF_FLAG !== true)
{
// Рисуем красный рект вокруг измененных ранов // Рисуем красный рект вокруг измененных ранов
var arrRunReviewRectsLine = []; var arrRunReviewRectsLine = [];
Element = aRunReview.Get_NextForward(); Element = aRunReview.Get_NextForward();
...@@ -2171,6 +2173,8 @@ Paragraph.prototype = ...@@ -2171,6 +2173,8 @@ Paragraph.prototype =
} }
} }
} }
}
if(pGraphics.End_Command) if(pGraphics.End_Command)
{ {
pGraphics.End_Command() pGraphics.End_Command()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment