asc_CHandlersList перевел на prototype

DrawingContext перевел на prototype

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

Excel/graphics/pdfprinter.js

@@ -34,7 +34,7 @@ function Common_CopyObj(Obj)
         }
     }
     return c;
-};
+}
 
 var vector_koef = 25.4 / 72;
 

Excel/view/HandlerList.js

@@ -17,80 +17,63 @@
 		 * -----------------------------------------------------------------------------
 		*/
 		var asc = window["Asc"],
-		asc_typeOf = asc.typeOf;
+			asc_typeOf = asc.typeOf;
 
 
 		/** @constructor */
 		function asc_CHandlersList(handlers) {
-			if ( !(this instanceof asc_CHandlersList) ) {
-				return new asc_CHandlersList(handlers);
-			}
 			this.handlers = handlers || {};
 			return this;
 		}
 
-		asc_CHandlersList.prototype = {
-
-			trigger: function (eventName) {
-				var h = this.handlers[eventName], t = asc_typeOf(h), a = Array.prototype.slice.call(arguments, 1), i;
-				if (t === "function") {
-					return h.apply(this, a);
+		asc_CHandlersList.prototype.trigger = function (eventName) {
+			var h = this.handlers[eventName], t = asc_typeOf(h), a = Array.prototype.slice.call(arguments, 1), i;
+			if (t === "function") {
+				return h.apply(this, a);
+			}
+			if (t === "array") {
+				for (i = 0; i < h.length; i += 1) {
+					if (asc_typeOf(h[i]) === "function") {h[i].apply(this, a);}
 				}
-				if (t === "array") {
-					for (i = 0; i < h.length; i += 1) {
-						if (asc_typeOf(h[i]) === "function") {h[i].apply(this, a);}
-					}
-					return true;
+				return true;
+			}
+			return false;
+		};
+		asc_CHandlersList.prototype.add = function (eventName, eventHandler, replaceOldHandler) {
+			var th = this.handlers, h, old, t;
+			if (replaceOldHandler || !th.hasOwnProperty(eventName)) {
+				th[eventName] = eventHandler;
+			} else {
+				old = h = th[eventName];
+				t = asc_typeOf(old);
+				if (t !== "array") {
+					h = th[eventName] = [];
+					if (t === "function") {h.push(old);}
 				}
-				return false;
-			},
-
-			add: function (eventName, eventHandler, replaceOldHandler) {
-				var th = this.handlers, h, old, t;
-				if (replaceOldHandler || !th.hasOwnProperty(eventName)) {
-					th[eventName] = eventHandler;
-				} else {
-					old = h = th[eventName];
-					t = asc_typeOf(old);
-					if (t !== "array") {
-						h = th[eventName] = [];
-						if (t === "function") {h.push(old);}
-					}
-					h.push(eventHandler);
+				h.push(eventHandler);
+			}
+		};
+		asc_CHandlersList.prototype.remove = function (eventName, eventHandler) {
+			var th = this.handlers, h = th[eventName], i;
+			if (th.hasOwnProperty(eventName)) {
+				if (asc_typeOf(h) !== "array" || asc_typeOf(eventHandler) !== "function") {
+					delete th[eventName];
+					return true;
 				}
-			},
-
-			remove: function (eventName, eventHandler) {
-				var th = this.handlers, h = th[eventName], i;
-				if (th.hasOwnProperty(eventName)) {
-					if (asc_typeOf(h) !== "array" || asc_typeOf(eventHandler) !== "function") {
-						delete th[eventName];
+				for (i = h.length - 1; i >= 0; i -= 1) {
+					if (h[i] === eventHandler) {
+						delete h[i];
 						return true;
 					}
-					for (i = h.length - 1; i >= 0; i -= 1) {
-						if (h[i] === eventHandler) {
-							delete h[i];
-							return true;
-						}
-					}
 				}
-				return false;
 			}
-
+			return false;
 		};
 
-
 		/*
 		 * Export
 		 * -----------------------------------------------------------------------------
 		 */
-		var prot;
-
-		window["Asc"]["asc_CHandlersList"] = window["Asc"].asc_CHandlersList = asc_CHandlersList;
-		prot = asc_CHandlersList.prototype;
-		prot["trigger"] = prot.trigger = prot.trigger;
-		prot["add"] = prot.add = prot.add;
-		prot["remove"] = prot.remove = prot.remove;
-
+		asc.asc_CHandlersList = asc_CHandlersList;
 	}
 )(jQuery, window);
\ No newline at end of file

Excel/view/WorkbookView.js

@@ -1988,13 +1988,10 @@
 			if (!this.maxDigitWidth) {throw "Error: can't measure text string";}
 		};
 
-
 		/*
 		 * Export
 		 * -----------------------------------------------------------------------------
 		 */
 		window["Asc"].WorkbookView = WorkbookView;
-
-
 	}
 )(jQuery, window);