documentUrl в base

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66370 954022d7-b5bf-4e40-9824-e11837661b57

Common/apiBase.js

@@ -20,6 +20,7 @@ function baseEditorsApi(name) {
   this.DocumentType = 0; // 0 - empty, 1 - test, 2 - document (from json)
   this.DocInfo = null;
   this.documentId = undefined;
+  this.documentUrl = "null";
 
   // Тип состояния на данный момент (сохранение, открытие или никакое)
   this.advancedOptionsAction = c_oAscAdvancedOptionsAction.None;

Excel/api.js

@@ -44,7 +44,6 @@ var editor;
 
     this.DocumentName = "";
     this.documentUserId = undefined;
-    this.documentUrl = "null";
     this.documentUrlChanges = null;
     this.documentTitle = "null";
     this.documentFormat = "null";

PowerPoint/api.js

 "use strict";
 
 var documentUserId = undefined;
-var documentUrl = 'null';
 var documentUrlChanges = null;
 var documentTitle = 'null';
 var documentTitleWithoutExtention = 'null';
@@ -468,7 +467,7 @@ asc_docs_api.prototype._coAuthoringInit = function() {
 
   //в обычном серверном режиме портим ссылку, потому что CoAuthoring теперь имеет встроенный адрес
   //todo надо использовать проверку get_OfflineApp, но она инициализируется только после loadDocument
-  if (!(window["NATIVE_EDITOR_ENJINE"] || offlineMode === documentUrl)) {
+  if (!(window["NATIVE_EDITOR_ENJINE"] || offlineMode === this.documentUrl)) {
     this.CoAuthoringApi.set_url(null);
   }
   this.CoAuthoringApi.init(this.User, this.documentId, documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Presentation, documentFormatSave);
@@ -648,7 +647,7 @@ asc_docs_api.prototype.asc_setDocInfo = function(c_DocInfo) {
   if (this.DocInfo) {
     this.documentId = this.DocInfo.get_Id();
     documentUserId = this.DocInfo.get_UserId();
-    documentUrl = this.DocInfo.get_Url();
+    this.documentUrl = this.DocInfo.get_Url();
     documentTitle = this.DocInfo.get_Title();
     documentFormat = this.DocInfo.get_Format();
     documentCallbackUrl = this.DocInfo.get_CallbackUrl();
@@ -686,7 +685,7 @@ asc_docs_api.prototype.LoadDocument = function() {
   // Меняем тип состояния (на открытие)
   this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open;
 
-  if (offlineMode !== documentUrl) {
+  if (offlineMode !== this.documentUrl) {
     this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open);
     var rData = {
       "id": this.documentId,
@@ -695,7 +694,7 @@ asc_docs_api.prototype.LoadDocument = function() {
       "vkey": documentVKey,
       "editorid": c_oEditorId.Presentation,
       "c": "open",
-      "url": documentUrl,
+      "url": this.documentUrl,
       "title": documentTitle,
       "embeddedfonts": this.isUseEmbeddedCutFonts,
       "viewmode": this.isViewMode
@@ -704,7 +703,7 @@ asc_docs_api.prototype.LoadDocument = function() {
     sendCommand2(this, null, rData);
   } else {
     // ToDo убрать зависимость от this.FontLoader.fontFilesPath
-    documentUrl = this.FontLoader.fontFilesPath + "../PowerPoint/document/";
+    this.documentUrl = this.FontLoader.fontFilesPath + "../PowerPoint/document/";
     this.DocInfo.put_OfflineApp(true);
 
     this._OfflineAppDocumentStartLoad();
@@ -905,7 +904,7 @@ asc_docs_api.prototype._OfflineAppDocumentStartLoad = function() {
     t._OfflineAppDocumentEndLoad();
   };
 
-  scriptElem.setAttribute('src', documentUrl + "editor.js");
+  scriptElem.setAttribute('src', this.documentUrl + "editor.js");
   scriptElem.setAttribute('type', 'text/javascript');
   document.getElementsByTagName('head')[0].appendChild(scriptElem);
 };
@@ -914,7 +913,7 @@ asc_docs_api.prototype._OfflineAppDocumentEndLoad = function() {
   if (undefined == window["editor_bin"])
     return;
 
-  this.OpenDocument2(documentUrl, window["editor_bin"]);
+  this.OpenDocument2(this.documentUrl, window["editor_bin"]);
   //callback
   this.DocumentOrientation = (null == this.WordControl.m_oLogicDocument) ? true : !this.WordControl.m_oLogicDocument.Orientation;
 };
@@ -3625,7 +3624,7 @@ asc_docs_api.prototype.asyncFontsDocumentStartLoaded = function()
 			for (var i in _loader_object.ImageMap) {
 				if(this.DocInfo.get_OfflineApp()) {
 					var localUrl = _loader_object.ImageMap[i];
-					g_oDocumentUrls.addImageUrl(localUrl, documentUrl + 'media/' + localUrl);
+					g_oDocumentUrls.addImageUrl(localUrl, this.documentUrl + 'media/' + localUrl);
 				}
                 ++_count;
 			}

Word/Private/TrackRevisions.js

@@ -14,8 +14,6 @@ asc_docs_api.prototype.asc_SetTrackRevisions = function(bTrack)
 };
 asc_docs_api.prototype.asc_IsTrackRevisions = function()
 {
-    if (this.isViewMode)
-        return false;
     return this.WordControl.m_oLogicDocument.Is_TrackRevisions();
 };
 asc_docs_api.prototype.sync_BeginCatchRevisionsChanges = function()

Word/api.js

 "use strict";
 
 var documentUserId = undefined;
-var documentUrl = 'null';
 var documentUrlChanges = null;
 var documentTitle = 'null';
 var documentTitleWithoutExtention = 'null';
@@ -579,7 +578,7 @@ asc_docs_api.prototype.asc_setDocInfo = function(c_DocInfo) {
   if (this.DocInfo) {
     this.documentId = this.DocInfo.get_Id();
     documentUserId = this.DocInfo.get_UserId();
-    documentUrl = this.DocInfo.get_Url();
+    this.documentUrl = this.DocInfo.get_Url();
     documentTitle = this.DocInfo.get_Title();
     documentFormat = this.DocInfo.get_Format();
     documentCallbackUrl = this.DocInfo.get_CallbackUrl();
@@ -619,7 +618,7 @@ asc_docs_api.prototype.LoadDocument = function(isVersionHistory) {
   // Меняем тип состояния (на открытие)
   this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open;
 
-  if (offlineMode !== documentUrl) {
+  if (offlineMode !== this.documentUrl) {
     var rData = {
       "c": 'open',
       "id": this.documentId,
@@ -627,7 +626,7 @@ asc_docs_api.prototype.LoadDocument = function(isVersionHistory) {
       "format": documentFormat,
       "vkey": documentVKey,
       "editorid": c_oEditorId.Word,
-      "url": documentUrl,
+      "url": this.documentUrl,
       "title": documentTitle,
       "embeddedfonts": this.isUseEmbeddedCutFonts,
       "viewmode": this.isViewMode
@@ -641,7 +640,7 @@ asc_docs_api.prototype.LoadDocument = function(isVersionHistory) {
     sendCommand2(this, null, rData);
   } else {
     // ToDo убрать зависимость от this.FontLoader.fontFilesPath
-    documentUrl = this.FontLoader.fontFilesPath + "../Word/document/";
+    this.documentUrl = this.FontLoader.fontFilesPath + "../Word/document/";
     this.DocInfo.put_OfflineApp(true);
 
     this._OfflineAppDocumentStartLoad();
@@ -1233,7 +1232,7 @@ asc_docs_api.prototype._coAuthoringInit = function() {
   };
   //в обычном серверном режиме портим ссылку, потому что CoAuthoring теперь имеет встроенный адрес
   //todo надо использовать проверку get_OfflineApp, но она инициализируется только после loadDocument
-  if (!(window["NATIVE_EDITOR_ENJINE"] || offlineMode === documentUrl)) {
+  if (!(window["NATIVE_EDITOR_ENJINE"] || offlineMode === this.documentUrl)) {
     this.CoAuthoringApi.set_url(null);
   }
   this.CoAuthoringApi.init(this.User, this.documentId, documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Word, documentFormatSave);
@@ -2134,7 +2133,7 @@ asc_docs_api.prototype.asc_setAdvancedOptions = function(idOption, option) {
             "vkey": documentVKey,
             "editorid": c_oEditorId.Word,
             "c":"reopen",
-            "url": documentUrl,
+            "url": this.documentUrl,
             "title": documentTitle,
             "codepage": option.asc_getCodePage(),
             "embeddedfonts": t.isUseEmbeddedCutFonts
@@ -5505,7 +5504,7 @@ asc_docs_api.prototype.asyncFontsDocumentStartLoaded = function()
             for (var i in _loader_object.ImageMap) {
 				if(this.DocInfo.get_OfflineApp()) {
 					var localUrl = _loader_object.ImageMap[i];
-					g_oDocumentUrls.addImageUrl(localUrl, documentUrl + 'media/' + localUrl);
+					g_oDocumentUrls.addImageUrl(localUrl, this.documentUrl + 'media/' + localUrl);
 				}
                 ++_count;
 			}
@@ -6513,7 +6512,7 @@ asc_docs_api.prototype._OfflineAppDocumentStartLoad = function() {
     t._OfflineAppDocumentEndLoad();
   };
 
-  scriptElem.setAttribute('src', documentUrl + "editor.js");
+  scriptElem.setAttribute('src', this.documentUrl + "editor.js");
   scriptElem.setAttribute('type', 'text/javascript');
   document.getElementsByTagName('head')[0].appendChild(scriptElem);
 };
@@ -6527,9 +6526,9 @@ asc_docs_api.prototype._OfflineAppDocumentEndLoad = function() {
   }
 
   if (bIsViewer) {
-    this.OpenDocument(documentUrl, sData);
+    this.OpenDocument(this.documentUrl, sData);
   } else {
-    this.OpenDocument2(documentUrl, sData);
+    this.OpenDocument2(this.documentUrl, sData);
   }
 };