Commit 95dd210a authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил в базу порт для сохранения файла

Добавил в js на клиенте отправку порта
Добавил на сервере проброс порта в базу и в запросе

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56194 954022d7-b5bf-4e40-9824-e11837661b57
parent 7c600a05
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
} }
}; };
CDocsCoApi.prototype.init = function (user, docid, token, serverHost, serverPath, callback, editorType, documentFormatSave) { CDocsCoApi.prototype.init = function (user, docid, token, serverHost, serverPort, serverPath, callback,
editorType, documentFormatSave) {
if (this._CoAuthoringApi && this._CoAuthoringApi.isRightURL()) { if (this._CoAuthoringApi && this._CoAuthoringApi.isRightURL()) {
var t = this; var t = this;
this._CoAuthoringApi.onAuthParticipantsChanged = function (e, count) {t.callback_OnAuthParticipantsChanged(e, count);}; this._CoAuthoringApi.onAuthParticipantsChanged = function (e, count) {t.callback_OnAuthParticipantsChanged(e, count);};
...@@ -46,7 +47,8 @@ ...@@ -46,7 +47,8 @@
// Callback есть пользователей больше 1 // Callback есть пользователей больше 1
this._CoAuthoringApi.onStartCoAuthoring = function (e) {t.callback_OnStartCoAuthoring(e);}; this._CoAuthoringApi.onStartCoAuthoring = function (e) {t.callback_OnStartCoAuthoring(e);};
this._CoAuthoringApi.init(user, docid, token, serverHost, serverPath, callback, editorType, documentFormatSave); this._CoAuthoringApi.init(user, docid, token, serverHost, serverPort, serverPath, callback,
editorType, documentFormatSave);
this._onlineWork = true; this._onlineWork = true;
} }
else { else {
...@@ -738,6 +740,7 @@ ...@@ -738,6 +740,7 @@
"locks":docsCoApi.ownedLockBlocks, "locks":docsCoApi.ownedLockBlocks,
"sessionId":docsCoApi._id, "sessionId":docsCoApi._id,
"serverHost": docsCoApi._serverHost, "serverHost": docsCoApi._serverHost,
"serverPort": docsCoApi._serverPort,
"serverPath": docsCoApi._serverPath, "serverPath": docsCoApi._serverPath,
"documentFormatSave": docsCoApi._documentFormatSave "documentFormatSave": docsCoApi._documentFormatSave
}); });
...@@ -785,7 +788,8 @@ ...@@ -785,7 +788,8 @@
} }
DocsCoApi.prototype.init = function (user, docid, token, serverHost, serverPath, callback, editorType, documentFormatSave) { DocsCoApi.prototype.init = function (user, docid, token, serverHost, serverPort, serverPath, callback,
editorType, documentFormatSave) {
this._user = user; this._user = user;
this._docid = docid; this._docid = docid;
this._token = token; this._token = token;
...@@ -795,6 +799,7 @@ ...@@ -795,6 +799,7 @@
var docsCoApi = this; var docsCoApi = this;
// Server info // Server info
this._serverHost = serverHost; this._serverHost = serverHost;
this._serverPort = serverPort;
this._serverPath = serverPath; this._serverPath = serverPath;
this.sockjs_url = this._url + '/doc/'+docid+'/c'; this.sockjs_url = this._url + '/doc/'+docid+'/c';
this.sockjs = initSocksJs(this.sockjs_url, this); this.sockjs = initSocksJs(this.sockjs_url, this);
......
...@@ -1655,7 +1655,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1655,7 +1655,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
}; };
this.CoAuthoringApi.init(t.User, t.documentId, 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){ this.CoAuthoringApi.init(t.User, t.documentId, 'fghhfgsjdgfjs', window.location.hostname,
window.location.port, g_sMainServiceLocalUrl, function(){
}, c_oEditorId.Speadsheet, t.documentFormatSave); }, c_oEditorId.Speadsheet, t.documentFormatSave);
}, },
......
...@@ -518,7 +518,8 @@ asc_docs_api.prototype._coAuthoringInit = function () { ...@@ -518,7 +518,8 @@ asc_docs_api.prototype._coAuthoringInit = function () {
} }
}; };
this.CoAuthoringApi.init (editor.User, documentId, 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){ this.CoAuthoringApi.init (editor.User, documentId, 'fghhfgsjdgfjs', window.location.hostname,
window.location.port, g_sMainServiceLocalUrl, function(){
}, c_oEditorId.Presentation, documentFormatSave); }, c_oEditorId.Presentation, documentFormatSave);
// ToDo init other callbacks // ToDo init other callbacks
......
...@@ -1598,7 +1598,8 @@ asc_docs_api.prototype._coAuthoringInit = function() ...@@ -1598,7 +1598,8 @@ asc_docs_api.prototype._coAuthoringInit = function()
} }
}; };
this.CoAuthoringApi.init (editor.User, documentId, 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){ this.CoAuthoringApi.init (editor.User, documentId, 'fghhfgsjdgfjs', window.location.hostname,
window.location.port, g_sMainServiceLocalUrl, function(){
}, c_oEditorId.Word, documentFormatSave); }, c_oEditorId.Word, documentFormatSave);
// ToDo init other callbacks // ToDo init other callbacks
......
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