Przeglądaj źródła

Fix incoherent formatting

dev_h
Ophir LOJKINE 4 lat temu
rodzic
commit
ed12e5d7e5
1 zmienionych plików z 38 dodań i 38 usunięć
  1. 38
    38
      client-data/tools/hand/hand.js

+ 38
- 38
client-data/tools/hand/hand.js Wyświetl plik

42
 	var selectionButtons = {};
42
 	var selectionButtons = {};
43
 
43
 
44
 	selectionButtons["delete"] = createButton("delete", "delete", 22, 22,
44
 	selectionButtons["delete"] = createButton("delete", "delete", 22, 22,
45
-		function(me, bbox, s) {
45
+		function (me, bbox, s) {
46
 			me.width.baseVal.value = me.origWidth / s;
46
 			me.width.baseVal.value = me.origWidth / s;
47
 			me.height.baseVal.value = me.origHeight / s;
47
 			me.height.baseVal.value = me.origHeight / s;
48
 			me.x.baseVal.value = bbox.r[0];
48
 			me.x.baseVal.value = bbox.r[0];
49
 			me.y.baseVal.value = bbox.r[1] - (me.origHeight + 3) / s;
49
 			me.y.baseVal.value = bbox.r[1] - (me.origHeight + 3) / s;
50
 			me.style.display = "";
50
 			me.style.display = "";
51
 		},
51
 		},
52
-									deleteSelection);
52
+		deleteSelection);
53
 
53
 
54
 	selectionButtons["duplicate"] = createButton("duplicate", "duplicate", 22, 22,
54
 	selectionButtons["duplicate"] = createButton("duplicate", "duplicate", 22, 22,
55
-		function(me, bbox, s) {
55
+		function (me, bbox, s) {
56
 			me.width.baseVal.value = me.origWidth / s;
56
 			me.width.baseVal.value = me.origWidth / s;
57
 			me.height.baseVal.value = me.origHeight / s;
57
 			me.height.baseVal.value = me.origHeight / s;
58
 			me.x.baseVal.value = bbox.r[0] + (me.origWidth + 2) / s;
58
 			me.x.baseVal.value = bbox.r[0] + (me.origWidth + 2) / s;
59
 			me.y.baseVal.value = bbox.r[1] - (me.origHeight + 3) / s;
59
 			me.y.baseVal.value = bbox.r[1] - (me.origHeight + 3) / s;
60
 			me.style.display = "";
60
 			me.style.display = "";
61
 		},
61
 		},
62
-									   duplicateSelection);
62
+		duplicateSelection);
63
 	selectionButtons["scale"] = createButton("scaleHandle", "handle", 14, 14,
63
 	selectionButtons["scale"] = createButton("scaleHandle", "handle", 14, 14,
64
-		function(me, bbox, s) {
64
+		function (me, bbox, s) {
65
 			me.width.baseVal.value = me.origWidth / s;
65
 			me.width.baseVal.value = me.origWidth / s;
66
 			me.height.baseVal.value = me.origHeight / s;
66
 			me.height.baseVal.value = me.origHeight / s;
67
-			me.x.baseVal.value = bbox.r[0] + bbox.a[0] - me.origWidth/(2*s);
68
-			me.y.baseVal.value = bbox.r[1] + bbox.b[1] - me.origHeight/(2*s);
67
+			me.x.baseVal.value = bbox.r[0] + bbox.a[0] - me.origWidth / (2 * s);
68
+			me.y.baseVal.value = bbox.r[1] + bbox.b[1] - me.origHeight / (2 * s);
69
 			me.style.display = "";
69
 			me.style.display = "";
70
 		},
70
 		},
71
-								startScalingTransform);
71
+		startScalingTransform);
72
 
72
 
73
 	for (i in blockedSelectionButtons) {
73
 	for (i in blockedSelectionButtons) {
74
 		delete selectionButtons[blockedSelectionButtons[i]];
74
 		delete selectionButtons[blockedSelectionButtons[i]];
75
 	}
75
 	}
76
-	selectionButtons = Object.keys(selectionButtons).map(function(k) {
77
-			return selectionButtons[k];
78
-		});
76
+	selectionButtons = Object.keys(selectionButtons).map(function (k) {
77
+		return selectionButtons[k];
78
+	});
79
 
79
 
80
 	var getScale = Tools.getScale;
80
 	var getScale = Tools.getScale;
81
 
81
 
87
 			els.unshift(a);
87
 			els.unshift(a);
88
 			a = a.parentElement;
88
 			a = a.parentElement;
89
 		}
89
 		}
90
-		var parentMathematics = els.find(function(el) {
91
-				return el.getAttribute("class") === "MathElement";
92
-			});
90
+		var parentMathematics = els.find(function (el) {
91
+			return el.getAttribute("class") === "MathElement";
92
+		});
93
 		if ((parentMathematics) && parentMathematics.tagName === "svg") {
93
 		if ((parentMathematics) && parentMathematics.tagName === "svg") {
94
 			target = parentMathematics;
94
 			target = parentMathematics;
95
 		}
95
 		}
97
 	}
97
 	}
98
 
98
 
99
 	function deleteSelection() {
99
 	function deleteSelection() {
100
-		var msgs = selected_els.map(function(el) {
101
-                return ({
102
-                    "type": "delete",
103
-                    "id": el.id
104
-                });
105
-            });
100
+		var msgs = selected_els.map(function (el) {
101
+			return ({
102
+				"type": "delete",
103
+				"id": el.id
104
+			});
105
+		});
106
 		var data = {
106
 		var data = {
107
 			_children: msgs
107
 			_children: msgs
108
 		}
108
 		}
116
 			|| (selected_els.length == 0)) return;
116
 			|| (selected_els.length == 0)) return;
117
 		var msgs = [];
117
 		var msgs = [];
118
 		var newids = [];
118
 		var newids = [];
119
-		for (var i=0; i<selected_els.length; i++) {
119
+		for (var i = 0; i < selected_els.length; i++) {
120
 			var id = selected_els[i].id;
120
 			var id = selected_els[i].id;
121
 			msgs[i] = {
121
 			msgs[i] = {
122
 				type: "copy",
122
 				type: "copy",
125
 			};
125
 			};
126
 			newids[i] = id;
126
 			newids[i] = id;
127
 		}
127
 		}
128
-		Tools.drawAndSend({_children: msgs});
129
-		selected_els = newids.map(function(id) {
130
-                return Tools.svg.getElementById(id);
131
-            });
128
+		Tools.drawAndSend({ _children: msgs });
129
+		selected_els = newids.map(function (id) {
130
+			return Tools.svg.getElementById(id);
131
+		});
132
 	}
132
 	}
133
 
133
 
134
 	function createSelectorRect() {
134
 	function createSelectorRect() {
148
 		return shape;
148
 		return shape;
149
 	}
149
 	}
150
 
150
 
151
-	function createButton(name, icon , width, height, drawCallback, clickCallback) {
151
+	function createButton(name, icon, width, height, drawCallback, clickCallback) {
152
 		var shape = Tools.createSVGElement("image", {
152
 		var shape = Tools.createSVGElement("image", {
153
 			id: name + "Icon",
153
 			id: name + "Icon",
154
 			href: "tools/hand/" + icon + ".svg",
154
 			href: "tools/hand/" + icon + ".svg",
191
 		currentTransform = moveSelection;
191
 		currentTransform = moveSelection;
192
 		selected = { x: x, y: y };
192
 		selected = { x: x, y: y };
193
 		// Some of the selected elements could have been deleted
193
 		// Some of the selected elements could have been deleted
194
-		selected_els = selected_els.filter(function(el) {
195
-				return Tools.svg.getElementById(el.id) !== null;
196
-			});
197
-		transform_elements = selected_els.map(function(el) {
194
+		selected_els = selected_els.filter(function (el) {
195
+			return Tools.svg.getElementById(el.id) !== null;
196
+		});
197
+		transform_elements = selected_els.map(function (el) {
198
 			var tmatrix = get_transform_matrix(el);
198
 			var tmatrix = get_transform_matrix(el);
199
 			return {
199
 			return {
200
 				a: tmatrix.a, b: tmatrix.b, c: tmatrix.c,
200
 				a: tmatrix.a, b: tmatrix.b, c: tmatrix.c,
216
 			w: bbox.a[0],
216
 			w: bbox.a[0],
217
 			h: bbox.b[1],
217
 			h: bbox.b[1],
218
 		};
218
 		};
219
-		transform_elements = selected_els.map(function(el) {
219
+		transform_elements = selected_els.map(function (el) {
220
 			var tmatrix = get_transform_matrix(el);
220
 			var tmatrix = get_transform_matrix(el);
221
 			return {
221
 			return {
222
 				a: tmatrix.a, b: tmatrix.b, c: tmatrix.c,
222
 				a: tmatrix.a, b: tmatrix.b, c: tmatrix.c,
251
 		var selectionTBBox = selectionRect.transformedBBox();
251
 		var selectionTBBox = selectionRect.transformedBBox();
252
 		var elements = Tools.drawingArea.children;
252
 		var elements = Tools.drawingArea.children;
253
 		var selected = [];
253
 		var selected = [];
254
-		for (var i=0; i < elements.length; i++) {
254
+		for (var i = 0; i < elements.length; i++) {
255
 			if (transformedBBoxIntersects(selectionTBBox, elements[i].transformedBBox()))
255
 			if (transformedBBoxIntersects(selectionTBBox, elements[i].transformedBBox()))
256
 				selected.push(Tools.drawingArea.children[i]);
256
 				selected.push(Tools.drawingArea.children[i]);
257
 		}
257
 		}
261
 	function moveSelection(x, y) {
261
 	function moveSelection(x, y) {
262
 		var dx = x - selected.x;
262
 		var dx = x - selected.x;
263
 		var dy = y - selected.y;
263
 		var dy = y - selected.y;
264
-		var msgs = selected_els.map(function(el, i) {
264
+		var msgs = selected_els.map(function (el, i) {
265
 			var oldTransform = transform_elements[i];
265
 			var oldTransform = transform_elements[i];
266
 			return {
266
 			return {
267
 				type: "update",
267
 				type: "update",
292
 	}
292
 	}
293
 
293
 
294
 	function scaleSelection(x, y) {
294
 	function scaleSelection(x, y) {
295
-		var rx = (x - selected.x)/(selected.w);
296
-		var ry = (y - selected.y)/(selected.h);
297
-		var msgs = selected_els.map(function(el, i) {
295
+		var rx = (x - selected.x) / (selected.w);
296
+		var ry = (y - selected.y) / (selected.h);
297
+		var msgs = selected_els.map(function (el, i) {
298
 			var oldTransform = transform_elements[i];
298
 			var oldTransform = transform_elements[i];
299
 			var x = el.transformedBBox().r[0];
299
 			var x = el.transformedBBox().r[0];
300
 			var y = el.transformedBBox().r[1];
300
 			var y = el.transformedBBox().r[1];
392
 					var newElement = Tools.svg.getElementById(data.id).cloneNode(true);
392
 					var newElement = Tools.svg.getElementById(data.id).cloneNode(true);
393
 					newElement.id = data.newid;
393
 					newElement.id = data.newid;
394
 					Tools.drawingArea.appendChild(newElement);
394
 					Tools.drawingArea.appendChild(newElement);
395
-				    break;
395
+					break;
396
 				case "delete":
396
 				case "delete":
397
 					data.tool = "Eraser";
397
 					data.tool = "Eraser";
398
 					messageForTool(data);
398
 					messageForTool(data);
406
 	function clickSelector(x, y, evt) {
406
 	function clickSelector(x, y, evt) {
407
 		selectionRect = selectionRect || createSelectorRect();
407
 		selectionRect = selectionRect || createSelectorRect();
408
 		var button = null;
408
 		var button = null;
409
-		for (var i=0; i<selectionButtons.length; i++) {
409
+		for (var i = 0; i < selectionButtons.length; i++) {
410
 			if (selectionButtons[i].contains(evt.target)) {
410
 			if (selectionButtons[i].contains(evt.target)) {
411
 				button = selectionButtons[i];
411
 				button = selectionButtons[i];
412
 			}
412
 			}

Ładowanie…
Anuluj
Zapisz