Реализовал новый способ генерации цветов для пользователей.

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

Common/docscoapi.js

@@ -237,13 +237,6 @@
     }
   };
 
-  CDocsCoApi.prototype.getUser = function(userId) {
-    if (this._CoAuthoringApi && this._onlineWork) {
-      return this._CoAuthoringApi.getUser(userId);
-    }
-    return null;
-  };
-
   CDocsCoApi.prototype.getUserConnectionId = function() {
     if (this._CoAuthoringApi && this._onlineWork) {
       return this._CoAuthoringApi.getUserConnectionId();
@@ -498,10 +491,6 @@
     return this._userId;
   };
 
-  DocsCoApi.prototype.getUser = function() {
-    return this._user;
-  };
-
   DocsCoApi.prototype.getLocks = function() {
     return this._locks;
   };
@@ -677,10 +666,6 @@
     }
   };
 
-  DocsCoApi.prototype.getUser = function(userId) {
-    return this._participants[userId];
-  };
-
   DocsCoApi.prototype.disconnect = function() {
     // Отключаемся сами
     clearInterval(this.pingIntervalID);

Common/docscoapicommon.js

-"use strict";
/* docscoapicommon.js
 *
 * Author: Alexander.Trofimov
 * Date: 09.11.12
 */(	/**
	 * @param {Window} window
	 * @param {undefined} undefined
	 */
	function (window, undefined) {
		/*
		 * Import
		 * -----------------------------------------------------------------------------
		 */
		var asc = window["Asc"] ? window["Asc"] : (window["Asc"] = {});
		var prot;
		
		/**
		 * Класс user для совместного редактирования/просмотра документа
		 * -----------------------------------------------------------------------------
		 *
		 * @constructor
		 * @memberOf Asc
		 */
		function asc_CUser (val) {
			this.id				= null;					// уникальный id - пользователя
			this.userName		= null;					// имя пользователя
			this.state			= undefined;			// состояние (true - подключен, false - отключился)
			this.indexUser		= -1;					// Индекс пользователя (фактически равно числу заходов в документ на сервере)
			this.color			= null;					// цвет пользователя
			this.view			= false;				// просмотр(true), редактор(false)

			this._setUser(val);
			return this;
		}

		asc_CUser.prototype._setUser = function (val) {
			if (val) {
				this.id = val['id'];
				this.userName = val['username'];
				this.indexUser = val['indexUser'];
				this.color = c_oAscArrUserColors[(this.indexUser - 1) % c_oAscArrUserColors.length];
				this.state = val['state'];
				this.view = val['view'];
			}
		};
		asc_CUser.prototype.asc_getId = function () { return this.id; };
		asc_CUser.prototype.asc_getUserName = function () { return this.userName; };
		asc_CUser.prototype.asc_getState = function () { return this.state; };
		asc_CUser.prototype.asc_getColor = function () { return '#' + ('000000' + this.color.toString(16)).substr(-6); };
		asc_CUser.prototype.asc_getColorValue = function () { return this.color; };
		asc_CUser.prototype.asc_getView = function () { return this.view; };
		asc_CUser.prototype.asc_setId = function (val) { this.id = val; };
		asc_CUser.prototype.asc_setUserName = function (val) { this.userName = val; };
		asc_CUser.prototype.asc_setState = function (val) { this.state = val; };
		asc_CUser.prototype.asc_setColor = function (val) { this.color = val; };
		
		/*
		 * Export
		 * -----------------------------------------------------------------------------
		 */
		window["Asc"]["asc_CUser"] = window["Asc"].asc_CUser = asc_CUser;
		prot = asc_CUser.prototype;
		prot["asc_getId"]				= prot.asc_getId;
		prot["asc_getUserName"]			= prot.asc_getUserName;
		prot["asc_getState"]			= prot.asc_getState;
		prot["asc_setId"]				= prot.asc_setId;
		prot["asc_getColor"]			= prot.asc_getColor;
		prot["asc_getColorValue"]		= prot.asc_getColorValue;
		prot["asc_getView"]				= prot.asc_getView;
		prot["asc_setUserName"]			= prot.asc_setUserName;
		prot["asc_setState"]			= prot.asc_setState;
		prot["asc_setColor"]			= prot.asc_setColor;
	}
)(window);

var ConnectionState = {
  Reconnect: -1,	// reconnect state
  None: 0,	// not initialized
  WaitAuth: 1,	// waiting session id
  Authorized: 2,	// authorized
  ClosedCoAuth: 3,	// closed coauthoring
  ClosedAll: 4,	// closed all

  SaveChanges: 10		// save
};
\ No newline at end of file
+"use strict";
/* docscoapicommon.js
 *
 * Author: Alexander.Trofimov
 * Date: 09.11.12
 */(	/**
	 * @param {Window} window
	 * @param {undefined} undefined
	 */
	function (window, undefined) {
		/*
		 * Import
		 * -----------------------------------------------------------------------------
		 */
		var asc = window["Asc"] ? window["Asc"] : (window["Asc"] = {});
		var prot;
		
		/**
		 * Класс user для совместного редактирования/просмотра документа
		 * -----------------------------------------------------------------------------
		 *
		 * @constructor
		 * @memberOf Asc
		 */
		function asc_CUser (val) {
			this.id				= null;					// уникальный id - пользователя
			this.userName		= null;					// имя пользователя
			this.state			= undefined;			// состояние (true - подключен, false - отключился)
			this.indexUser		= -1;					// Индекс пользователя (фактически равно числу заходов в документ на сервере)
			this.color			= null;					// цвет пользователя
			this.view			= false;				// просмотр(true), редактор(false)

			this._setUser(val);
			return this;
		}

		asc_CUser.prototype._setUser = function (val) {
			if (val) {
				this.id = val['id'];
				this.userName = val['username'];
				this.indexUser = val['indexUser'];
				this.color = getUserColorById(this.id, this.userName);
				this.state = val['state'];
				this.view = val['view'];
			}
		};
		asc_CUser.prototype.asc_getId = function () { return this.id; };
		asc_CUser.prototype.asc_getUserName = function () { return this.userName; };
		asc_CUser.prototype.asc_getState = function () { return this.state; };
		asc_CUser.prototype.asc_getColor = function () { return '#' + ('000000' + this.color.toString(16)).substr(-6); };
		asc_CUser.prototype.asc_getColorValue = function () { return this.color; };
		asc_CUser.prototype.asc_getView = function () { return this.view; };
		asc_CUser.prototype.asc_setId = function (val) { this.id = val; };
		asc_CUser.prototype.asc_setUserName = function (val) { this.userName = val; };
		asc_CUser.prototype.asc_setState = function (val) { this.state = val; };
		asc_CUser.prototype.asc_setColor = function (val) { this.color = val; };
		
		/*
		 * Export
		 * -----------------------------------------------------------------------------
		 */
		window["Asc"]["asc_CUser"] = window["Asc"].asc_CUser = asc_CUser;
		prot = asc_CUser.prototype;
		prot["asc_getId"]				= prot.asc_getId;
		prot["asc_getUserName"]			= prot.asc_getUserName;
		prot["asc_getState"]			= prot.asc_getState;
		prot["asc_setId"]				= prot.asc_setId;
		prot["asc_getColor"]			= prot.asc_getColor;
		prot["asc_getColorValue"]		= prot.asc_getColorValue;
		prot["asc_getView"]				= prot.asc_getView;
		prot["asc_setUserName"]			= prot.asc_setUserName;
		prot["asc_setState"]			= prot.asc_setState;
		prot["asc_setColor"]			= prot.asc_setColor;
	}
)(window);

var ConnectionState = {
  Reconnect: -1,	// reconnect state
  None: 0,	// not initialized
  WaitAuth: 1,	// waiting session id
  Authorized: 2,	// authorized
  ClosedCoAuth: 3,	// closed coauthoring
  ClosedAll: 4,	// closed all

  SaveChanges: 10		// save
};
\ No newline at end of file

Common/editorscommon.js

@@ -2155,6 +2155,19 @@ CContentChangesElement.prototype.Make_ArrayOfSimpleActions = function(Type, Pos,
 
 	return Positions;
 };
+var g_oUserColorById = {}, g_oUserNextColorIndex = 0;
+function getUserColorById(userId, userName) {
+  var res;
+  if (g_oUserColorById.hasOwnProperty(userId)) {
+    res = g_oUserColorById[userId];
+  } else if (g_oUserColorById.hasOwnProperty(userName)) {
+    res = g_oUserColorById[userName];
+  } else {
+    res = g_oUserColorById[userId] = c_oAscArrUserColors[g_oUserNextColorIndex % c_oAscArrUserColors.length];
+    ++g_oUserNextColorIndex;
+  }
+  return res;
+}
 
 var g_oIdCounter = new CIdCounter();
 var g_oTableId = null;
\ No newline at end of file

PowerPoint/Drawing/DrawingDocument.js

@@ -1004,9 +1004,8 @@ CDrawingCollaborativeTarget.prototype =
             this.HtmlElement.width = 1;
             this.HtmlElement.height = 1;
 
-            var oUser = _drawing_doc.m_oWordControl.m_oApi.CoAuthoringApi.getUser(this.Id);
-            var nColor = oUser ? oUser.asc_getColorValue() :  null;
-            var oColor = (null !== nColor ? new CDocumentColor( (nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF ) : new CDocumentColor( 191, 255, 199 ));
+            var nColor = getUserColorById(this.Id);
+            var oColor = new CDocumentColor( (nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF );
 
             var Y  = Math.max(0, Math.min(255,       0.299    * oColor.r + 0.587    * oColor.g + 0.114    * oColor.b));
             var Cb = Math.max(0, Math.min(255, 128 - 0.168736 * oColor.r - 0.331264 * oColor.g + 0.5      * oColor.b));

Word/Drawing/DrawingDocument.js

@@ -2085,9 +2085,8 @@ CDrawingCollaborativeTarget.prototype =
             this.HtmlElement.width = 1;
             this.HtmlElement.height = 1;
 
-            var oUser = _drawing_doc.m_oWordControl.m_oApi.CoAuthoringApi.getUser(this.Id);
-            var nColor = oUser ? oUser.asc_getColorValue() :  null;
-            var oColor = (null !== nColor ? new CDocumentColor( (nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF ) : new CDocumentColor( 191, 255, 199 ));
+            var nColor = getUserColorById(this.Id);
+            var oColor = new CDocumentColor( (nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF );
 
             var Y  = Math.max(0, Math.min(255,       0.299    * oColor.r + 0.587    * oColor.g + 0.114    * oColor.b));
             var Cb = Math.max(0, Math.min(255, 128 - 0.168736 * oColor.r - 0.331264 * oColor.g + 0.5      * oColor.b));

Word/api.js

@@ -965,9 +965,8 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
       bUseColor = false;
     }
 
-    var oUser = t.CoAuthoringApi.getUser(userId);
-    var nColor = oUser ? oUser.asc_getColorValue() : null;
-    var oColor = false === bUseColor ? null : (null !== nColor ? new CDocumentColor((nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF) : new CDocumentColor(191, 255, 199));
+    var nColor = getUserColorById(userId);
+    var oColor = false === bUseColor ? null : new CDocumentColor((nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF);
 
     t._coAuthoringSetChange(e, oColor);
     // т.е. если bSendEvent не задан, то посылаем  сообщение + когда загрузился документ