Commit 97b51c44 authored by Alexander.Trofimov's avatar Alexander.Trofimov

delete g_offline_doc

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66595 954022d7-b5bf-4e40-9824-e11837661b57
parent 1c376a5a
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
window.g_debug_mode = false; window.g_debug_mode = false;
window.g_offline_doc = "../Excel/document/";
//window.g_debug_mode = true; //window.g_debug_mode = true;
//]]> //]]>
</script> </script>
......
...@@ -677,16 +677,13 @@ var editor; ...@@ -677,16 +677,13 @@ var editor;
}; };
spreadsheet_api.prototype._OfflineAppDocumentStartLoad = function(fCallback) { spreadsheet_api.prototype._OfflineAppDocumentStartLoad = function(fCallback) {
var t = this, src = this.FontLoader.fontFilesPath; var t = this;
//window.g_offline_doc defined in external script, so use it in square breaks
src += window["g_offline_doc"] ? window["g_offline_doc"] : "../Excel/document/";
var scriptElem = document.createElement('script'); var scriptElem = document.createElement('script');
scriptElem.onload = scriptElem.onerror = function() { scriptElem.onload = scriptElem.onerror = function() {
t._OfflineAppDocumentEndLoad(fCallback); t._OfflineAppDocumentEndLoad(fCallback);
}; };
scriptElem.setAttribute('src', src + "editor.js"); scriptElem.setAttribute('src', this.documentUrl + "editor.js");
scriptElem.setAttribute('type', 'text/javascript'); scriptElem.setAttribute('type', 'text/javascript');
document.getElementsByTagName('head')[0].appendChild(scriptElem); document.getElementsByTagName('head')[0].appendChild(scriptElem);
}; };
...@@ -706,6 +703,8 @@ var editor; ...@@ -706,6 +703,8 @@ var editor;
this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open; this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open;
if (offlineMode === this.documentUrl) { if (offlineMode === this.documentUrl) {
// ToDo убрать зависимость от this.FontLoader.fontFilesPath
this.documentUrl = this.FontLoader.fontFilesPath + "../Excel/document/";
this.DocInfo.asc_putOfflineApp(true); this.DocInfo.asc_putOfflineApp(true);
this._OfflineAppDocumentStartLoad(fCallback); this._OfflineAppDocumentStartLoad(fCallback);
} else { } else {
......
...@@ -276,7 +276,6 @@ function asc_docs_api(name) ...@@ -276,7 +276,6 @@ function asc_docs_api(name)
this.documentFormatSave = c_oAscFileType.DOCX; this.documentFormatSave = c_oAscFileType.DOCX;
//todo убрать из native, copypaste, chart, loadfont //todo убрать из native, copypaste, chart, loadfont
//this.DocumentUrl = "";
this.InterfaceLocale = null; this.InterfaceLocale = null;
this.ShowParaMarks = false; this.ShowParaMarks = false;
......
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