Merge remote-tracking branch 'origin/master' into smith

waxlamp · waxlamp · commit 52f53ce3b505 · 2021-08-16T11:45:36.000-04:00
diff --git a/draftlogs/5878_fix.md b/draftlogs/5878_fix.md
@@ -0,0 +1,2 @@
+ - Fix invalid call to `lib.promiseError` in lib.syncOrAsync  [[#5878](https://github.com/plotly/plotly.js/pull/5878)], 
+   with thanks to @jklimke for the contribution!
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -455,8 +455,7 @@ lib.syncOrAsync = function(sequence, arg, finalStep) {
         ret = fni(arg);
 
         if(ret && ret.then) {
-            return ret.then(continueAsync)
-                .then(undefined, lib.promiseError);
+            return ret.then(continueAsync);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+ - Fix invalid call to `lib.promiseError` in lib.syncOrAsync [[#5878](https://github.com/plotly/plotly.js/pull/5878)],
	`2`	`+ with thanks to @jklimke for the contribution!`
Original file line number	Diff line number	Diff line change
`@@ -455,8 +455,7 @@ lib.syncOrAsync = function(sequence, arg, finalStep) {`
`455`	`455`	`ret = fni(arg);`
`456`	`456`
`457`	`457`	`if(ret && ret.then) {`
`458`		`- return ret.then(continueAsync)`
`459`		`- .then(undefined, lib.promiseError);`
	`458`	`+ return ret.then(continueAsync);`
`460`	`459`	`}`
`461`	`460`	`}`
`462`	`461`