abcjs 6.1.3 → 6.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/write/selection.js

@@ -41,7 +41,7 @@ function getCoord(ev) {
 		yOffset = svg.viewBox.baseVal.y
 	}
 
-	var svgClicked = ev.target.tagName === "svg";
+	var svgClicked = ev.target && ev.target.tagName === "svg";
 	var x;
 	var y;
 	if (svgClicked) {
@@ -93,7 +93,7 @@ function keyboardSelection(ev) {
 			handled = true;
 			this.dragTarget = this.selectables[index];
 			this.dragIndex = index;
-			if (this.dragTarget.isDraggable) {
+			if (this.dragTarget && this.dragTarget.isDraggable) {
 				if (this.dragging && this.dragTarget.isDraggable)
 					this.dragTarget.absEl.highlight(undefined, this.dragColor);
 				this.dragYStep--;
@@ -105,7 +105,7 @@ function keyboardSelection(ev) {
 			this.dragTarget = this.selectables[index];
 			this.dragIndex = index;
 			this.dragMechanism = "keyboard";
-			if (this.dragTarget.isDraggable) {
+			if (this.dragTarget && this.dragTarget.isDraggable) {
 				if (this.dragging && this.dragTarget.isDraggable)
 					this.dragTarget.absEl.highlight(undefined, this.dragColor);
 				this.dragYStep++;
@@ -200,11 +200,15 @@ function getTarget(target) {
 
 	var found = target.getAttribute("selectable");
 	while (!found) {
-		target = target.parentElement;
-		if (target.tagName === "svg")
+		if (!target.parentElement)
 			found = true;
-		else
-			found = target.getAttribute("selectable");
+		else {	
+			target = target.parentElement;
+			if (target.tagName === "svg")
+				found = true;
+			else
+				found = target.getAttribute("selectable");
+		}
 	}
 	return target;
 }
@@ -234,6 +238,8 @@ function getMousePosition(self, ev) {
 }
 
 function attachMissingTouchEventAttributes(touchEv) {
+	if (!touchEv || !touchEv.target || !touchEv.touches || touchEv.touches.length < 1)
+		return
 	var rect = touchEv.target.getBoundingClientRect();
 	var offsetX = touchEv.touches[0].pageX - rect.left;
 	var offsetY = touchEv.touches[0].pageY - rect.top;
@@ -250,13 +256,14 @@ function mouseDown(ev) {
 	var _ev = ev;
 	if (ev.type === 'touchstart') {
 		attachMissingTouchEventAttributes(ev);
-		_ev = ev.touches[0];
+		if (ev.touches.length > 0)
+			_ev = ev.touches[0];
 	}
 
 	var positioning = getMousePosition(this, _ev);
 
 	// Only start dragging if the user clicked close enough to an element and clicked with the main mouse button.
-	if (positioning.clickedOn >= 0 && (ev.type === 'touchstart' || ev.button === 0)) {
+	if (positioning.clickedOn >= 0 && (ev.type === 'touchstart' || ev.button === 0) && this.selectables[positioning.clickedOn]) {
 		this.dragTarget = this.selectables[positioning.clickedOn];
 		this.dragIndex = positioning.clickedOn;
 		this.dragMechanism = "mouse";
@@ -272,12 +279,13 @@ function mouseMove(ev) {
 	var _ev = ev;
 	if (ev.type === 'touchmove') {
 		attachMissingTouchEventAttributes(ev);
-		_ev = ev.touches[0];
+		if (ev.touches.length > 0)
+			_ev = ev.touches[0];
 	}
 	this.lastTouchMove = ev;
 	// "this" is the EngraverController because of the bind(this) when setting the event listener.
 
-	if (!this.dragTarget || !this.dragging || !this.dragTarget.isDraggable || this.dragMechanism !== 'mouse')
+	if (!this.dragTarget || !this.dragging || !this.dragTarget.isDraggable || this.dragMechanism !== 'mouse' || !this.dragMouseStart)
 		return;
 
 	var positioning = getMousePosition(this, _ev);
@@ -292,9 +300,10 @@ function mouseMove(ev) {
 function mouseUp(ev) {
 	// "this" is the EngraverController because of the bind(this) when setting the event listener.
 	var _ev = ev;
-	if (ev.type === 'touchend') {
+	if (ev.type === 'touchend' && this.lastTouchMove) {
 		attachMissingTouchEventAttributes(this.lastTouchMove);
-		_ev = this.lastTouchMove.touches[0];
+		if (this.lastTouchMove.touches.length > 0)
+			_ev = this.lastTouchMove.touches[0];
 	}
 
 	if (!this.dragTarget)
@@ -348,10 +357,10 @@ function notifySelect(target, dragStep, dragMax, dragIndex, ev) {
 	if (target.staffPos)
 		analysis.staffPos = target.staffPos;
 	var closest = ev.target;
-	while (!closest.dataset.name && closest.tagName.toLowerCase() !== 'svg')
+	while (closest && !closest.dataset.name && closest.tagName.toLowerCase() !== 'svg')
 		closest = closest.parentNode;
 	var parent = ev.target;
-	while (!parent.dataset.index && parent.tagName.toLowerCase() !== 'svg')
+	while (parent && !parent.dataset.index && parent.tagName.toLowerCase() !== 'svg')
 		parent = parent.parentNode;
 	analysis.name = parent.dataset.name;
 	analysis.clickedName = closest.dataset.name;

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.1.3';
+var version = '6.1.5';
 
 module.exports = version;