Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into release_sync
Browse files Browse the repository at this point in the history
  • Loading branch information
glo71317 committed Feb 21, 2022
2 parents 095d90e + bc0e45f commit 4bb8c84
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ define([
// eslint-disable-next-line no-unused-vars
var timerId;

// eslint-disable-next-line no-unused-vars
timerId = setTimeout(function () {
clearTimeout(timerId);
this.messages.removeAll();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ define([

/* Switch to the model tab if the series tab is hidden */
if (relatedImages.series[record.id].length === 0 && relatedImages.model[record.id].length > 0) {
// eslint-disable-next-line jquery-no-click-event-shorthand
// eslint-disable-next-line jquery-no-input-event-shorthand
$('#adobe-stock-tabs').data().mageTabs.select(1);
}
}.bind(this));
Expand Down

0 comments on commit 4bb8c84

Please sign in to comment.