UserName разделен на FirstName и LastName

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

Common/Charts/DrawingObjects.js

@@ -930,7 +930,7 @@ function DrawingObjects() {
         for(i = 0; i < aImagesSync.length; ++i)
         {
 			var localUrl = aImagesSync[i];
-			if(api.DocInfo["OfflineApp"]) {
+			if(api.DocInfo.asc_getOfflineApp()) {
 				g_oDocumentUrls.addImageUrl(localUrl, api.FontLoader.fontFilesPath + "../Excel/document/media/" + localUrl);
 			}
             aImagesSync[i] = getFullImageSrc2(localUrl);

Excel/Private/api.js

@@ -26,8 +26,8 @@
 
   asc['spreadsheet_api'].prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
     var t = this;
-    if (this.DocInfo && this.DocInfo["Id"] && this.DocInfo["Url"]) {
-      CheckLicense(licenseUrl, customerId, this.DocInfo["UserId"], this.DocInfo["UserName"],  function(err, res) {
+    if (this.DocInfo && this.DocInfo.asc_getId() && this.DocInfo.asc_getUrl()) {
+      CheckLicense(licenseUrl, customerId, this.DocInfo.asc_getUserId(), this.DocInfo.get_UserName2(),  function(err, res) {
         t._onCheckLicenseEnd(err, res);
       });
     } else {

Excel/api.js

@@ -396,15 +396,15 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
     }
 
     if (this.DocInfo) {
-      this.documentId = this.DocInfo["Id"];
-      this.documentUserId = this.DocInfo["UserId"];
-      this.documentUrl = this.DocInfo["Url"];
-      this.documentTitle = this.DocInfo["Title"];
-      this.documentFormat = this.DocInfo["Format"];
-      this.documentVKey = this.DocInfo["VKey"];
-      this.chartEditor = this.DocInfo["ChartEditor"];
-      this.documentOpenOptions = this.DocInfo["Options"];
-      this.documentCallbackUrl = this.DocInfo["CallbackUrl"];
+      this.documentId = this.DocInfo.asc_getId();
+      this.documentUserId = this.DocInfo.asc_getUserId();
+      this.documentUrl = this.DocInfo.asc_getUrl();
+      this.documentTitle = this.DocInfo.asc_getTitle();
+      this.documentFormat = this.DocInfo.asc_getFormat();
+      this.documentVKey = this.DocInfo.asc_getVKey();
+      this.chartEditor = this.DocInfo.asc_getChartEditor();
+      this.documentOpenOptions = this.DocInfo.asc_getOptions();
+      this.documentCallbackUrl = this.DocInfo.asc_getCallbackUrl();
       // if(this.documentFormat)
       // {
       // switch(this.documentFormat)
@@ -420,8 +420,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 
       // Выставляем пользователя
       this.User = new asc.asc_CUser();
-      this.User.asc_setId(this.DocInfo["UserId"]);
-      this.User.asc_setUserName(this.DocInfo["UserName"]);
+      this.User.asc_setId(this.DocInfo.asc_getUserId());
+      this.User.asc_setUserName(this.DocInfo.asc_getUserName());
     }
 
     if (undefined !== window["AscDesktopEditor"]) {
@@ -894,7 +894,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
         if (!this.documentId) {
           this.documentId = '9876543210';
         }
-        this.DocInfo["OfflineApp"] = true;
+        this.DocInfo.asc_putOfflineApp(true);
         this._OfflineAppDocumentStartLoad(fCallback);
       } else {
         var v = {

PowerPoint/Build/Log/apiExport.js

@@ -1601,25 +1601,6 @@ CDocOpenProgress.prototype['get_FontsCount'] = CDocOpenProgress.prototype.get_Fo
 CDocOpenProgress.prototype['get_CurrentFont'] = CDocOpenProgress.prototype.get_CurrentFont;
 CDocOpenProgress.prototype['get_ImagesCount'] = CDocOpenProgress.prototype.get_ImagesCount;
 CDocOpenProgress.prototype['get_CurrentImage'] = CDocOpenProgress.prototype.get_CurrentImage;
-window['CDocInfo'] = CDocInfo;
-CDocInfo.prototype['get_Id'] = CDocInfo.prototype.get_Id;
-CDocInfo.prototype['put_Id'] = CDocInfo.prototype.put_Id;
-CDocInfo.prototype['get_Url'] = CDocInfo.prototype.get_Url;
-CDocInfo.prototype['put_Url'] = CDocInfo.prototype.put_Url;
-CDocInfo.prototype['get_Title'] = CDocInfo.prototype.get_Title;
-CDocInfo.prototype['put_Title'] = CDocInfo.prototype.put_Title;
-CDocInfo.prototype['get_Format'] = CDocInfo.prototype.get_Format;
-CDocInfo.prototype['put_Format'] = CDocInfo.prototype.put_Format;
-CDocInfo.prototype['get_VKey'] = CDocInfo.prototype.get_VKey;
-CDocInfo.prototype['put_VKey'] = CDocInfo.prototype.put_VKey;
-CDocInfo.prototype['get_OfflineApp'] = CDocInfo.prototype.get_OfflineApp;
-CDocInfo.prototype['put_OfflineApp'] = CDocInfo.prototype.put_OfflineApp;
-CDocInfo.prototype['get_UserId'] = CDocInfo.prototype.get_UserId;
-CDocInfo.prototype['put_UserId'] = CDocInfo.prototype.put_UserId;
-CDocInfo.prototype['get_UserName'] = CDocInfo.prototype.get_UserName;
-CDocInfo.prototype['put_UserName'] = CDocInfo.prototype.put_UserName;
-CDocInfo.prototype['get_Options'] = CDocInfo.prototype.get_Options;
-CDocInfo.prototype['put_Options'] = CDocInfo.prototype.put_Options;
 window['CAscColorScheme'] = CAscColorScheme;
 CAscColorScheme.prototype['get_colors'] = CAscColorScheme.prototype.get_colors;
 CAscColorScheme.prototype['get_name'] = CAscColorScheme.prototype.get_name;

PowerPoint/Private/api.js

@@ -19,7 +19,7 @@ asc_docs_api.prototype.asc_addComment = function(AscCommentData) {
 asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
   var t = this;
   if (this.DocInfo && this.DocInfo.get_Id()) {
-    CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), this.DocInfo.get_UserName(), function(err, res) {
+    CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), this.DocInfo.get_UserName2(), function(err, res) {
       t._onCheckLicenseEnd(err, res);
     });
   } else {

PowerPoint/apiCommon.js

@@ -17,76 +17,6 @@ CDocOpenProgress.prototype.get_CurrentFont = function(){return this.CurrentFont}
 CDocOpenProgress.prototype.get_ImagesCount = function(){return this.ImagesCount};
 CDocOpenProgress.prototype.get_CurrentImage = function(){return this.CurrentImage};
 
-function CDocInfo (obj){
-    if(obj){
-        if (typeof obj.Id != 'undefined'){
-            this.Id = obj.Id;
-        }
-        if (typeof obj.Url != 'undefined'){
-            this.Url = obj.Url;
-        }
-        if (typeof obj.Title != 'undefined'){
-            this.Title = obj.Title;
-        }
-        if (typeof obj.Format != 'undefined'){
-            this.Format = obj.Format;
-        }
-        if (typeof obj.VKey != 'undefined'){
-            this.VKey = obj.VKey;
-        }
-        if (typeof obj.UserId != 'undefined'){
-            this.UserId = obj.UserId;
-        }
-        if (typeof obj.UserName != 'undefined'){
-            this.UserName = obj.UserName;
-        }
-		if (typeof obj.Options != 'undefined'){
-            this.Options = obj.Options;
-        }
-        if (typeof obj.CallbackUrl != 'undefined'){
-            this.CallbackUrl = obj.CallbackUrl;
-        }
-        if (obj.OfflineApp === true)
-            this.OfflineApp = true;
-
-        this.TemplateReplacement = (undefined !== obj.TemplateReplacement && null !== obj.TemplateReplacement ? obj.TemplateReplacement : null)
-    }
-    else
-    {
-        this.Id                  = null;
-        this.Url                 = null;
-        this.Title               = null;
-        this.Format              = null;
-        this.VKey                = null;
-        this.UserId              = null;
-        this.UserName            = null;
-        this.Options             = null;
-        this.CallbackUrl         = null;
-        this.TemplateReplacement = null;
-    }
-}
-CDocInfo.prototype.get_Id = function(){return this.Id};
-CDocInfo.prototype.put_Id = function(v){this.Id = v;};
-CDocInfo.prototype.get_Url = function(){return this.Url;};
-CDocInfo.prototype.put_Url = function(v){this.Url = v;};
-CDocInfo.prototype.get_Title = function(){return this.Title;};
-CDocInfo.prototype.put_Title = function(v){this.Title = v;};
-CDocInfo.prototype.get_Format = function(){return this.Format;};
-CDocInfo.prototype.put_Format = function(v){this.Format = v;};
-CDocInfo.prototype.get_VKey = function(){return this.VKey;};
-CDocInfo.prototype.put_VKey = function(v){this.VKey = v;};
-CDocInfo.prototype.get_OfflineApp = function(){return this.OfflineApp;};
-CDocInfo.prototype.put_OfflineApp = function(v){this.OfflineApp = v;};
-CDocInfo.prototype.get_UserId = function(){return this.UserId;};
-CDocInfo.prototype.put_UserId = function(v){this.UserId = v;};
-CDocInfo.prototype.get_UserName = function(){return this.UserName;};
-CDocInfo.prototype.put_UserName = function(v){this.UserName = v;};
-CDocInfo.prototype.get_Options = function(){return this.Options;};
-CDocInfo.prototype.put_Options = function(v){this.Options = v;};
-CDocInfo.prototype.get_CallbackUrl = function(){return this.CallbackUrl;};
-CDocInfo.prototype.put_CallbackUrl = function(v){this.CallbackUrl = v;};
-CDocInfo.prototype.get_TemplateReplacement = function(){return this.TemplateReplacement;};
-CDocInfo.prototype.put_TemplateReplacement = function(v){this.TemplateReplacement = v;};
 // ---------------------------------------------------------------
 
 

PowerPoint/apiExport.js

@@ -456,29 +456,6 @@ CDocOpenProgress.prototype['get_FontsCount'] = CDocOpenProgress.prototype.get_Fo
 CDocOpenProgress.prototype['get_CurrentFont'] = CDocOpenProgress.prototype.get_CurrentFont;
 CDocOpenProgress.prototype['get_ImagesCount'] = CDocOpenProgress.prototype.get_ImagesCount;
 CDocOpenProgress.prototype['get_CurrentImage'] = CDocOpenProgress.prototype.get_CurrentImage;
-window['CDocInfo'] = CDocInfo;
-CDocInfo.prototype['get_Id'] = CDocInfo.prototype.get_Id;
-CDocInfo.prototype['put_Id'] = CDocInfo.prototype.put_Id;
-CDocInfo.prototype['get_Url'] = CDocInfo.prototype.get_Url;
-CDocInfo.prototype['put_Url'] = CDocInfo.prototype.put_Url;
-CDocInfo.prototype['get_Title'] = CDocInfo.prototype.get_Title;
-CDocInfo.prototype['put_Title'] = CDocInfo.prototype.put_Title;
-CDocInfo.prototype['get_Format'] = CDocInfo.prototype.get_Format;
-CDocInfo.prototype['put_Format'] = CDocInfo.prototype.put_Format;
-CDocInfo.prototype['get_VKey'] = CDocInfo.prototype.get_VKey;
-CDocInfo.prototype['put_VKey'] = CDocInfo.prototype.put_VKey;
-CDocInfo.prototype['get_OfflineApp'] = CDocInfo.prototype.get_OfflineApp;
-CDocInfo.prototype['put_OfflineApp'] = CDocInfo.prototype.put_OfflineApp;
-CDocInfo.prototype['get_UserId'] = CDocInfo.prototype.get_UserId;
-CDocInfo.prototype['put_UserId'] = CDocInfo.prototype.put_UserId;
-CDocInfo.prototype['get_UserName'] = CDocInfo.prototype.get_UserName;
-CDocInfo.prototype['put_UserName'] = CDocInfo.prototype.put_UserName;
-CDocInfo.prototype['get_Options'] = CDocInfo.prototype.get_Options;
-CDocInfo.prototype['put_Options'] = CDocInfo.prototype.put_Options;
-CDocInfo.prototype['get_CallbackUrl'] = CDocInfo.prototype.get_CallbackUrl;
-CDocInfo.prototype['put_CallbackUrl'] = CDocInfo.prototype.put_CallbackUrl;
-CDocInfo.prototype['get_TemplateReplacement'] = CDocInfo.prototype.get_TemplateReplacement;
-CDocInfo.prototype['put_TemplateReplacement'] = CDocInfo.prototype.put_TemplateReplacement;
 window['CAscSlideTiming'] = CAscSlideTiming;
 CAscSlideTiming.prototype['put_TransitionType'] = CAscSlideTiming.prototype.put_TransitionType;
 CAscSlideTiming.prototype['get_TransitionType'] = CAscSlideTiming.prototype.get_TransitionType;

Word/Build/Log/apiExport.js

@@ -1107,25 +1107,6 @@ CDocOpenProgress.prototype['get_FontsCount'] = CDocOpenProgress.prototype.get_Fo
 CDocOpenProgress.prototype['get_CurrentFont'] = CDocOpenProgress.prototype.get_CurrentFont;
 CDocOpenProgress.prototype['get_ImagesCount'] = CDocOpenProgress.prototype.get_ImagesCount;
 CDocOpenProgress.prototype['get_CurrentImage'] = CDocOpenProgress.prototype.get_CurrentImage;
-window['CDocInfo'] = CDocInfo;
-CDocInfo.prototype['get_Id'] = CDocInfo.prototype.get_Id;
-CDocInfo.prototype['put_Id'] = CDocInfo.prototype.put_Id;
-CDocInfo.prototype['get_Url'] = CDocInfo.prototype.get_Url;
-CDocInfo.prototype['put_Url'] = CDocInfo.prototype.put_Url;
-CDocInfo.prototype['get_Title'] = CDocInfo.prototype.get_Title;
-CDocInfo.prototype['put_Title'] = CDocInfo.prototype.put_Title;
-CDocInfo.prototype['get_Format'] = CDocInfo.prototype.get_Format;
-CDocInfo.prototype['put_Format'] = CDocInfo.prototype.put_Format;
-CDocInfo.prototype['get_VKey'] = CDocInfo.prototype.get_VKey;
-CDocInfo.prototype['put_VKey'] = CDocInfo.prototype.put_VKey;
-CDocInfo.prototype['get_OfflineApp'] = CDocInfo.prototype.get_OfflineApp;
-CDocInfo.prototype['put_OfflineApp'] = CDocInfo.prototype.put_OfflineApp;
-CDocInfo.prototype['get_UserId'] = CDocInfo.prototype.get_UserId;
-CDocInfo.prototype['put_UserId'] = CDocInfo.prototype.put_UserId;
-CDocInfo.prototype['get_UserName'] = CDocInfo.prototype.get_UserName;
-CDocInfo.prototype['put_UserName'] = CDocInfo.prototype.put_UserName;
-CDocInfo.prototype['get_Options'] = CDocInfo.prototype.get_Options;
-CDocInfo.prototype['put_Options'] = CDocInfo.prototype.put_Options;
 window['CListType'] = CListType;
 CListType.prototype['get_ListType'] = CListType.prototype.get_ListType;
 CListType.prototype['get_ListSubType'] = CListType.prototype.get_ListSubType;

Word/Private/api.js

@@ -26,7 +26,7 @@ asc_docs_api.prototype.asc_addComment = function(AscCommentData) {
 asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
   var t = this;
   if (this.DocInfo && this.DocInfo.get_Id()) {
-    CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), this.DocInfo.get_UserName(), function(err, res) {
+    CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), this.DocInfo.get_UserName2(), function(err, res) {
       t._onCheckLicenseEnd(err, res);
     });
   } else {

Word/api.js

@@ -34,77 +34,6 @@ CDocOpenProgress.prototype.get_CurrentFont = function(){return this.CurrentFont}
 CDocOpenProgress.prototype.get_ImagesCount = function(){return this.ImagesCount};
 CDocOpenProgress.prototype.get_CurrentImage = function(){return this.CurrentImage};
 
-function CDocInfo (obj){
-	if(obj){
-		if (typeof obj.Id != 'undefined'){
-			this.Id = obj.Id;
-		}
-		if (typeof obj.Url != 'undefined'){
-			this.Url = obj.Url;
-		}
-		if (typeof obj.Title != 'undefined'){
-			this.Title = obj.Title;
-		}
-		if (typeof obj.Format != 'undefined'){
-			this.Format = obj.Format;
-		}
-		if (typeof obj.VKey != 'undefined'){
-			this.VKey = obj.VKey;
-		}
-        if (typeof obj.UserId != 'undefined'){
-            this.UserId = obj.UserId;
-        }
-		if (typeof obj.UserName != 'undefined'){
-			this.UserName = obj.UserName;
-		}
-		if (typeof obj.Options != 'undefined'){
-			this.Options = obj.Options;
-		}
-        if (typeof obj.CallbackUrl != 'undefined'){
-            this.CallbackUrl = obj.CallbackUrl;
-        }
-        if (obj.OfflineApp === true)
-            this.OfflineApp = true;
-
-        this.TemplateReplacement = (undefined !== obj.TemplateReplacement && null !== obj.TemplateReplacement ? obj.TemplateReplacement : null)
-	}
-	else
-    {
-		this.Id                  = null;
-		this.Url                 = null;
-		this.Title               = null;
-		this.Format              = null;
-		this.VKey                = null;
-        this.UserId              = null;
-		this.UserName            = null;
-		this.Options             = null;
-        this.CallbackUrl         = null;
-        this.TemplateReplacement = null;
-	}
-}
-CDocInfo.prototype.get_Id = function(){return this.Id};
-CDocInfo.prototype.put_Id = function(v){this.Id = v;};
-CDocInfo.prototype.get_Url = function(){return this.Url;};
-CDocInfo.prototype.put_Url = function(v){this.Url = v;};
-CDocInfo.prototype.get_Title = function(){return this.Title;};
-CDocInfo.prototype.put_Title = function(v){this.Title = v;};
-CDocInfo.prototype.get_Format = function(){return this.Format;};
-CDocInfo.prototype.put_Format = function(v){this.Format = v;};
-CDocInfo.prototype.get_VKey = function(){return this.VKey;};
-CDocInfo.prototype.put_VKey = function(v){this.VKey = v;};
-CDocInfo.prototype.get_OfflineApp = function(){return this.OfflineApp;};
-CDocInfo.prototype.put_OfflineApp = function(v){this.OfflineApp = v;};
-CDocInfo.prototype.get_UserId = function(){return this.UserId;};
-CDocInfo.prototype.put_UserId = function(v){this.UserId = v;};
-CDocInfo.prototype.get_UserName = function(){return this.UserName;};
-CDocInfo.prototype.put_UserName = function(v){this.UserName = v;};
-CDocInfo.prototype.get_Options = function(){return this.Options;};
-CDocInfo.prototype.put_Options = function(v){this.Options = v;};
-CDocInfo.prototype.get_CallbackUrl = function(){return this.CallbackUrl;};
-CDocInfo.prototype.put_CallbackUrl = function(v){this.CallbackUrl = v;};
-CDocInfo.prototype.get_TemplateReplacement = function(){return this.TemplateReplacement;};
-CDocInfo.prototype.put_TemplateReplacement = function(v){this.TemplateReplacement = v;};
-
 function CAscSection()
 {
     this.PageWidth = 0;

Word/apiExport.js

@@ -4,29 +4,6 @@ CDocOpenProgress.prototype['get_FontsCount'] = CDocOpenProgress.prototype.get_Fo
 CDocOpenProgress.prototype['get_CurrentFont'] = CDocOpenProgress.prototype.get_CurrentFont;
 CDocOpenProgress.prototype['get_ImagesCount'] = CDocOpenProgress.prototype.get_ImagesCount;
 CDocOpenProgress.prototype['get_CurrentImage'] = CDocOpenProgress.prototype.get_CurrentImage;
-window['CDocInfo'] = CDocInfo;
-CDocInfo.prototype['get_Id'] = CDocInfo.prototype.get_Id;
-CDocInfo.prototype['put_Id'] = CDocInfo.prototype.put_Id;
-CDocInfo.prototype['get_Url'] = CDocInfo.prototype.get_Url;
-CDocInfo.prototype['put_Url'] = CDocInfo.prototype.put_Url;
-CDocInfo.prototype['get_Title'] = CDocInfo.prototype.get_Title;
-CDocInfo.prototype['put_Title'] = CDocInfo.prototype.put_Title;
-CDocInfo.prototype['get_Format'] = CDocInfo.prototype.get_Format;
-CDocInfo.prototype['put_Format'] = CDocInfo.prototype.put_Format;
-CDocInfo.prototype['get_VKey'] = CDocInfo.prototype.get_VKey;
-CDocInfo.prototype['put_VKey'] = CDocInfo.prototype.put_VKey;
-CDocInfo.prototype['get_OfflineApp'] = CDocInfo.prototype.get_OfflineApp;
-CDocInfo.prototype['put_OfflineApp'] = CDocInfo.prototype.put_OfflineApp;
-CDocInfo.prototype['get_UserId'] = CDocInfo.prototype.get_UserId;
-CDocInfo.prototype['put_UserId'] = CDocInfo.prototype.put_UserId;
-CDocInfo.prototype['get_UserName'] = CDocInfo.prototype.get_UserName;
-CDocInfo.prototype['put_UserName'] = CDocInfo.prototype.put_UserName;
-CDocInfo.prototype['get_Options'] = CDocInfo.prototype.get_Options;
-CDocInfo.prototype['put_Options'] = CDocInfo.prototype.put_Options;
-CDocInfo.prototype['get_CallbackUrl'] = CDocInfo.prototype.get_CallbackUrl;
-CDocInfo.prototype['put_CallbackUrl'] = CDocInfo.prototype.put_CallbackUrl;
-CDocInfo.prototype['get_TemplateReplacement'] = CDocInfo.prototype.get_TemplateReplacement;
-CDocInfo.prototype['put_TemplateReplacement'] = CDocInfo.prototype.put_TemplateReplacement;
 window['CAscSection'] = CAscSection;
 CAscSection.prototype['get_PageWidth'] = CAscSection.prototype.get_PageWidth;
 CAscSection.prototype['get_PageHeight'] = CAscSection.prototype.get_PageHeight;