Добавил метод asc_getColorValue (хранится int)

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

Common/apiCommon.js

@@ -189,6 +189,7 @@
 		prot["getA"]	= prot.getA;
 		prot["get_hex"]	= prot.get_hex;
 
+		/** @constructor */
         function asc_ChartSettings()
         {
             this.style         = null;
@@ -422,6 +423,7 @@
 
         window["asc_ChartSettings"] = asc_ChartSettings;
 
+		/** @constructor */
         function asc_ValAxisSettings()
         {
             this.minValRule       = null;
@@ -624,6 +626,7 @@
     window["asc_ValAxisSettings"] = asc_ValAxisSettings;
 
 
+	/** @constructor */
     function asc_CatAxisSettings()
     {
         this.intervalBetweenTick       = null;

Common/commonDefines.js

@@ -8,7 +8,7 @@ var CellValueType =
 	String:1,	
 	Bool:2,
 	Error:3
-}
+};
 
 //NumFormat defines
 var c_oAscNumFormatType = {
@@ -23,7 +23,7 @@ var c_oAscNumFormatType = {
 	Time : 8,
 	Percent : 9,
 	Fraction : 10
-}
+};
 
 
 

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) {
			if ( !(this instanceof asc_CUser) ) {
				return new asc_CUser(val);
			}

			this.id				= null;					// уникальный id - пользователя
			this.userName		= null;					// имя пользователя
			this.state			= undefined;			// состояние (true - подключен, false - отключился)
			this.color			= null;					// цвет пользователя

			this._setUser(val);
			return this;
		}

		asc_CUser.prototype = {
			constructor: asc_CUser,
			_setUser: function (val) {
				if (val) {
					this.id = val["id"];
					this.userName = val["username"];
					this.color = val["color"];
					this.state = val["state"];
				} else {
					this.color = asc.generateColor();
				}
			},
			asc_getId: function () { return this.id; },
			asc_getUserName: function () { return this.userName; },
			asc_getState: function () { return this.state; },
			asc_getColor: function () { return this.color; },
			asc_setId: function (val) { this.id = val; },
			asc_setUserName: function (val) { this.userName = val; },
			asc_setState: function (val) { this.state = val; },
			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_setUserName"]			= prot.asc_setUserName;
		prot["asc_setState"]			= prot.asc_setState;
		prot["asc_setColor"]			= prot.asc_setColor;
	}
)(window);
+"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) {
			if ( !(this instanceof asc_CUser) ) {
				return new asc_CUser(val);
			}

			this.id				= null;					// уникальный id - пользователя
			this.userName		= null;					// имя пользователя
			this.state			= undefined;			// состояние (true - подключен, false - отключился)
			this.color			= null;					// цвет пользователя

			this._setUser(val);
			return this;
		}

		asc_CUser.prototype = {
			constructor: asc_CUser,
			_setUser: function (val) {
				if (val) {
					this.id = val["id"];
					this.userName = val["username"];
					this.color = val["color"];
					this.state = val["state"];
				} else {
					this.color = asc.generateColor();
				}
			},
			asc_getId: function () { return this.id; },
			asc_getUserName: function () { return this.userName; },
			asc_getState: function () { return this.state; },
			asc_getColor: function () { return '#' + ('000000' + this.color.toString(16)).substr(-6); },
			asc_getColorValue: function () { return this.color; },
			asc_setId: function (val) { this.id = val; },
			asc_setUserName: function (val) { this.userName = val; },
			asc_setState: function (val) { this.state = val; },
			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_setUserName"]			= prot.asc_setUserName;
		prot["asc_setState"]			= prot.asc_setState;
		prot["asc_setColor"]			= prot.asc_setColor;
	}
)(window);
\ No newline at end of file

Word/api.js

@@ -1556,7 +1556,7 @@ asc_docs_api.prototype._coAuthoringInit = function()
 	this.CoAuthoringApi.onSaveChanges				= function (e, userId, bSendEvent)
 	{
 		var oUser = t.CoAuthoringApi.getUser(userId);
-		var oColor = oUser ? oUser.asc_getColor() : null;
+		var oColor = oUser ? oUser.asc_getColorValue() : null;
 		// ToDo add select changes color
 
         var Count = e.length;