Commit f2ac0736 authored by Boris Kocherov's avatar Boris Kocherov

fix paths

parent 602c1494
......@@ -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') {
......
......@@ -5,8 +5,8 @@
// Paths
// -------------------------
@app-image-path: "resources/img";
@common-image-path: "../../common/main/resources/img";
@app-image-path: "../img";
@common-image-path: "../../../../common/main/resources/img";
// Grays
// -------------------------
......
......@@ -112,7 +112,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));
......
......@@ -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 + ")");
}
......
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