Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
web-apps
Commits
dc1805a7
Commit
dc1805a7
authored
Sep 05, 2016
by
Boris Kocherov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix paths
parent
f171800e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
apps/common/main/lib/component/ComboBoxFonts.js
apps/common/main/lib/component/ComboBoxFonts.js
+2
-2
apps/common/main/resources/less/variables.less
apps/common/main/resources/less/variables.less
+1
-1
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-1
apps/spreadsheeteditor/main/app/view/FormulaLang.js
apps/spreadsheeteditor/main/app/view/FormulaLang.js
+3
-3
No files found.
apps/common/main/lib/component/ComboBoxFonts.js
View file @
dc1805a7
...
...
@@ -54,8 +54,8 @@ define([
isRetina
=
window
.
devicePixelRatio
>
1
,
thumbCanvas
=
document
.
createElement
(
'
canvas
'
),
thumbContext
=
thumbCanvas
.
getContext
(
'
2d
'
),
thumbPath
=
'
.
./../../..
/sdkjs/common/Images/fonts_thumbnail.png
'
,
thumbPath2x
=
'
.
./../../..
/sdkjs/common/Images/fonts_thumbnail@2x.png
'
,
thumbPath
=
'
./sdkjs/common/Images/fonts_thumbnail.png
'
,
thumbPath2x
=
'
./sdkjs/common/Images/fonts_thumbnail@2x.png
'
,
listItemHeight
=
36
;
if
(
typeof
window
[
'
AscDesktopEditor
'
]
===
'
object
'
)
{
...
...
apps/common/main/resources/less/variables.less
View file @
dc1805a7
...
...
@@ -785,4 +785,4 @@
@dl-horizontal-offset: @component-offset-horizontal;
// Point at which .dl-horizontal becomes horizontal
@dl-horizontal-breakpoint: @grid-float-breakpoint;
\ No newline at end of file
@dl-horizontal-breakpoint: @grid-float-breakpoint;
apps/presentationeditor/main/app/controller/Main.js
View file @
dc1805a7
...
...
@@ -146,7 +146,7 @@ define([
if
(
this
.
api
){
this
.
api
.
SetDrawingFreeze
(
true
);
this
.
api
.
SetThemesPath
(
"
.
./../../..
/sdkjs/slide/themes/
"
);
this
.
api
.
SetThemesPath
(
"
./sdkjs/slide/themes/
"
);
this
.
api
.
asc_registerCallback
(
'
asc_onError
'
,
_
.
bind
(
this
.
onError
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onDocumentContentReady
'
,
_
.
bind
(
this
.
onDocumentContentReady
,
this
));
...
...
apps/spreadsheeteditor/main/app/view/FormulaLang.js
View file @
dc1805a7
...
...
@@ -71,7 +71,7 @@ define([
try
{
var
xhrObj
=
_createXMLHTTPObject
();
if
(
xhrObj
&&
lang
)
{
xhrObj
.
open
(
'
GET
'
,
'
resources/formula-lang/
'
+
lang
+
'
.json
'
,
false
);
xhrObj
.
open
(
'
GET
'
,
'
apps/spreadsheeteditor/main/
resources/formula-lang/
'
+
lang
+
'
.json
'
,
false
);
xhrObj
.
send
(
''
);
langJson
[
lang
]
=
eval
(
"
(
"
+
xhrObj
.
responseText
+
"
)
"
);
return
langJson
[
lang
];
...
...
@@ -95,12 +95,12 @@ define([
try
{
var
xhrObj
=
_createXMLHTTPObject
();
if
(
xhrObj
&&
lang
)
{
xhrObj
.
open
(
'
GET
'
,
'
resources/formula-lang/
'
+
lang
+
'
_desc.json
'
,
false
);
xhrObj
.
open
(
'
GET
'
,
'
apps/spreadsheeteditor/main/
resources/formula-lang/
'
+
lang
+
'
_desc.json
'
,
false
);
xhrObj
.
send
(
''
);
if
(
xhrObj
.
status
==
200
)
langDescJson
[
lang
]
=
eval
(
"
(
"
+
xhrObj
.
responseText
+
"
)
"
);
else
{
xhrObj
.
open
(
'
GET
'
,
'
resources/formula-lang/en_desc.json
'
,
false
);
xhrObj
.
open
(
'
GET
'
,
'
apps/spreadsheeteditor/main/
resources/formula-lang/en_desc.json
'
,
false
);
xhrObj
.
send
(
''
);
langDescJson
[
lang
]
=
eval
(
"
(
"
+
xhrObj
.
responseText
+
"
)
"
);
}
...
...
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