Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
6c1afedf
Commit
6c1afedf
authored
Apr 26, 2016
by
Sergey Luzyanin
Committed by
Alexander.Trofimov
May 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Почключаем скрипты из списка mobile в конце.
parent
dd0e985f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
8 deletions
+15
-8
build/Gruntfile.js
build/Gruntfile.js
+2
-2
build/configs/webpowerpoint.json
build/configs/webpowerpoint.json
+5
-4
cell/native/TextDrawer.js
cell/native/TextDrawer.js
+7
-1
common/Native/Wrappers/TextMeasurerWrapper.js
common/Native/Wrappers/TextMeasurerWrapper.js
+1
-1
No files found.
build/Gruntfile.js
View file @
6c1afedf
...
@@ -94,7 +94,7 @@ module.exports = function(grunt) {
...
@@ -94,7 +94,7 @@ module.exports = function(grunt) {
});
});
var
mobileFiles
=
packageFile
[
'
compile
'
][
'
sdk
'
][
'
mobile
'
];
var
mobileFiles
=
packageFile
[
'
compile
'
][
'
sdk
'
][
'
mobile
'
];
if
(
mobileFiles
){
if
(
mobileFiles
){
srcFiles
=
mobileFiles
.
concat
(
src
Files
);
srcFiles
=
srcFiles
.
concat
(
mobile
Files
);
}
}
concat_src_with_banner_file
=
concat_src_with_banner_file
.
concat
(
packageFile
[
'
compile
'
][
'
sdk
'
][
'
mobile_banners
'
]);
concat_src_with_banner_file
=
concat_src_with_banner_file
.
concat
(
packageFile
[
'
compile
'
][
'
sdk
'
][
'
mobile_banners
'
]);
}
}
...
@@ -164,5 +164,5 @@ module.exports = function(grunt) {
...
@@ -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
'
,
[
'
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
'
,
[
'
build_
all
'
]);
grunt
.
registerTask
(
'
default
'
,
[
'
build_
webpowerpoint
'
]);
};
};
\ No newline at end of file
build/configs/webpowerpoint.json
View file @
6c1afedf
...
@@ -162,7 +162,6 @@
...
@@ -162,7 +162,6 @@
"../../web-apps/vendor/xregexp/xregexp-all-min.js"
"../../web-apps/vendor/xregexp/xregexp-all-min.js"
],
],
"mobile"
:
[
"mobile"
:
[
"../common/browser.js"
,
"../common/Native/Wrappers/memory.js"
,
"../common/Native/Wrappers/memory.js"
,
"../common/Native/Wrappers/TextMeasurerWrapper.js"
,
"../common/Native/Wrappers/TextMeasurerWrapper.js"
,
"../common/Native/Wrappers/DrawingStream.js"
,
"../common/Native/Wrappers/DrawingStream.js"
,
...
@@ -171,16 +170,18 @@
...
@@ -171,16 +170,18 @@
"../slide/Native/native.js"
,
"../slide/Native/native.js"
,
"../slide/Native/Wrappers/api.js"
,
"../slide/Native/Wrappers/api.js"
,
"../slide/Native/Wrappers/HtmlPage.js"
,
"../slide/Native/Wrappers/HtmlPage.js"
,
"../slide/Native/Wrappers/DrawingDocument.js"
"../slide/Native/Wrappers/DrawingDocument.js"
,
"../cell/native/TextDrawer.js"
],
],
"exclude_mobile"
:
[
"exclude_mobile"
:
[
"../common/browser.js"
,
"../word/Drawing/ShapeDrawer.js"
,
"../word/Drawing/ShapeDrawer.js"
,
"../common/Overlay.js"
,
"../common/Overlay.js"
,
"../slide/Drawing/HtmlPage.js"
,
"../slide/Drawing/HtmlPage.js"
,
"../slide/Drawing/DrawingDocument.js"
,
"../slide/Drawing/DrawingDocument.js"
,
"../common/FontsFreeType/FontFile.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"
,
"dst"
:
"../slide/sdk-all.js"
,
"externs"
:
[
"externs"
:
[
...
...
cell/native/TextDrawer.js
View file @
6c1afedf
"
use strict
"
;
"
use strict
"
;
(
function
(
window
,
undefined
)
{
var
PATH_DIV_EPSILON
=
0.1
;
var
PATH_DIV_EPSILON
=
0.1
;
var
UNDERLINE_DIV_EPSILON
=
3
;
var
UNDERLINE_DIV_EPSILON
=
3
;
...
@@ -2478,4 +2480,8 @@ function GetRectContentWidth(oContent, dMaxWidth)
...
@@ -2478,4 +2480,8 @@ function GetRectContentWidth(oContent, dMaxWidth)
}
}
}
}
return
max_width
+
2
;
return
max_width
+
2
;
}
}
\ No newline at end of file
//--------------------------------------------------------export----------------------------------------------------
window
[
'
AscFormat
'
]
=
window
[
'
AscFormat
'
]
||
{};
window
[
'
AscFormat
'
].
CTextDrawer
=
CTextDrawer
;
})(
window
);
common/Native/Wrappers/TextMeasurerWrapper.js
View file @
6c1afedf
...
@@ -373,7 +373,7 @@ function GetLoadInfoForMeasurer(info, lStyle)
...
@@ -373,7 +373,7 @@ function GetLoadInfoForMeasurer(info, lStyle)
}
}
return
{
return
{
Path
:
window
.
g_font_files
[
index
].
Id
,
Path
:
window
.
AscFonts
.
g_font_files
[
index
].
Id
,
FaceIndex
:
faceIndex
,
FaceIndex
:
faceIndex
,
NeedBold
:
bNeedBold
,
NeedBold
:
bNeedBold
,
NeedItalic
:
bNeedItalic
,
NeedItalic
:
bNeedItalic
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment