Commit 83f87449 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

documentUrlChanges to base

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66376 954022d7-b5bf-4e40-9824-e11837661b57
parent c74c670e
...@@ -86,7 +86,7 @@ baseEditorsApi.prototype.asc_showRevision = function(newObj) { ...@@ -86,7 +86,7 @@ baseEditorsApi.prototype.asc_showRevision = function(newObj) {
this.DocInfo.put_Id(this.VersionHistory.docId); this.DocInfo.put_Id(this.VersionHistory.docId);
this.DocInfo.put_Url(this.VersionHistory.url); this.DocInfo.put_Url(this.VersionHistory.url);
documentUrlChanges = this.VersionHistory.urlChanges; this.documentUrlChanges = this.VersionHistory.urlChanges;
this.asc_setDocInfo(this.DocInfo); this.asc_setDocInfo(this.DocInfo);
this.LoadDocument(true); this.LoadDocument(true);
} else if (this.VersionHistory.currentChangeId < newObj.currentChangeId) { } else if (this.VersionHistory.currentChangeId < newObj.currentChangeId) {
......
...@@ -22,6 +22,7 @@ function baseEditorsApi(name) { ...@@ -22,6 +22,7 @@ function baseEditorsApi(name) {
this.documentId = undefined; this.documentId = undefined;
this.documentUserId = undefined; this.documentUserId = undefined;
this.documentUrl = "null"; this.documentUrl = "null";
this.documentUrlChanges = null;
this.documentCallbackUrl = undefined; // Ссылка для отправления информации о документе this.documentCallbackUrl = undefined; // Ссылка для отправления информации о документе
// Тип состояния на данный момент (сохранение, открытие или никакое) // Тип состояния на данный момент (сохранение, открытие или никакое)
......
...@@ -43,7 +43,6 @@ var editor; ...@@ -43,7 +43,6 @@ var editor;
this.wbModel = null; this.wbModel = null;
this.DocumentName = ""; this.DocumentName = "";
this.documentUrlChanges = null;
this.documentTitle = "null"; this.documentTitle = "null";
this.documentFormat = "null"; this.documentFormat = "null";
this.documentVKey = null; this.documentVKey = null;
......
"use strict"; "use strict";
var documentUrlChanges = null;
var documentTitle = 'null'; var documentTitle = 'null';
var documentTitleWithoutExtention = 'null'; var documentTitleWithoutExtention = 'null';
var documentFormat = 'null'; var documentFormat = 'null';
...@@ -4962,7 +4961,7 @@ asc_docs_api.prototype.sync_ContextMenuCallback = function(Data) ...@@ -4962,7 +4961,7 @@ asc_docs_api.prototype.sync_ContextMenuCallback = function(Data)
}; };
function _onOpenCommand(fCallback, incomeObject) { function _onOpenCommand(fCallback, incomeObject) {
g_fOpenFileCommand(incomeObject["data"], documentUrlChanges, c_oSerFormat.Signature, function (error, result) { g_fOpenFileCommand(incomeObject["data"], editor.documentUrlChanges, c_oSerFormat.Signature, function (error, result) {
if (error || !result.bSerFormat) { if (error || !result.bSerFormat) {
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical); editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
if(fCallback) fCallback(); if(fCallback) fCallback();
......
"use strict"; "use strict";
var documentUrlChanges = null;
var documentTitle = 'null'; var documentTitle = 'null';
var documentTitleWithoutExtention = 'null'; var documentTitleWithoutExtention = 'null';
var documentFormat = 'null'; var documentFormat = 'null';
...@@ -6565,7 +6564,7 @@ window["asc_nativeOnSpellCheck"] = function (response) ...@@ -6565,7 +6564,7 @@ window["asc_nativeOnSpellCheck"] = function (response)
}; };
function _onOpenCommand(fCallback, incomeObject) { function _onOpenCommand(fCallback, incomeObject) {
g_fOpenFileCommand(incomeObject["data"], documentUrlChanges, c_oSerFormat.Signature, function (error, result) { g_fOpenFileCommand(incomeObject["data"], editor.documentUrlChanges, c_oSerFormat.Signature, function (error, result) {
if (error) { if (error) {
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical); editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
if(fCallback) fCallback(); if(fCallback) fCallback();
......
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