Commit 6c1afedf authored by Sergey Luzyanin's avatar Sergey Luzyanin Committed by Alexander.Trofimov

Почключаем скрипты из списка mobile в конце.

parent dd0e985f
......@@ -94,7 +94,7 @@ module.exports = function(grunt) {
});
var mobileFiles = packageFile['compile']['sdk']['mobile'];
if(mobileFiles){
srcFiles = mobileFiles.concat(srcFiles);
srcFiles = srcFiles.concat(mobileFiles);
}
concat_src_with_banner_file = concat_src_with_banner_file.concat(packageFile['compile']['sdk']['mobile_banners']);
}
......@@ -164,5 +164,5 @@ module.exports = function(grunt) {
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('default', ['build_all']);
grunt.registerTask('default', ['build_webpowerpoint']);
};
\ No newline at end of file
......@@ -162,7 +162,6 @@
"../../web-apps/vendor/xregexp/xregexp-all-min.js"
],
"mobile": [
"../common/browser.js",
"../common/Native/Wrappers/memory.js",
"../common/Native/Wrappers/TextMeasurerWrapper.js",
"../common/Native/Wrappers/DrawingStream.js",
......@@ -171,16 +170,18 @@
"../slide/Native/native.js",
"../slide/Native/Wrappers/api.js",
"../slide/Native/Wrappers/HtmlPage.js",
"../slide/Native/Wrappers/DrawingDocument.js"
"../slide/Native/Wrappers/DrawingDocument.js",
"../cell/native/TextDrawer.js"
],
"exclude_mobile": [
"../common/browser.js",
"../word/Drawing/ShapeDrawer.js",
"../common/Overlay.js",
"../slide/Drawing/HtmlPage.js",
"../slide/Drawing/DrawingDocument.js",
"../common/FontsFreeType/FontFile.js",
"../common/FontsFreeType/FontManager.js"
"../common/FontsFreeType/FontManager.js",
"../common/FontsFreeType/TextMeasurer.js",
"../common/Drawings/TextDrawer.js"
],
"dst": "../slide/sdk-all.js",
"externs": [
......
"use strict";
(function (window, undefined) {
var PATH_DIV_EPSILON = 0.1;
var UNDERLINE_DIV_EPSILON = 3;
......@@ -2478,4 +2480,8 @@ function GetRectContentWidth(oContent, dMaxWidth)
}
}
return max_width + 2;
}
\ No newline at end of file
}
//--------------------------------------------------------export----------------------------------------------------
window['AscFormat'] = window['AscFormat'] || {};
window['AscFormat'].CTextDrawer = CTextDrawer;
})(window);
......@@ -373,7 +373,7 @@ function GetLoadInfoForMeasurer(info, lStyle)
}
return {
Path : window.g_font_files[index].Id,
Path : window.AscFonts.g_font_files[index].Id,
FaceIndex : faceIndex,
NeedBold : bNeedBold,
NeedItalic : bNeedItalic,
......
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