diff --git a/bitbucket-slack-server-integration-plugin/pom.xml b/bitbucket-slack-server-integration-plugin/pom.xml index 0dcdcd69..a289d462 100644 --- a/bitbucket-slack-server-integration-plugin/pom.xml +++ b/bitbucket-slack-server-integration-plugin/pom.xml @@ -42,7 +42,7 @@ 0.9 3.0.0 1.11 - 1.1.14 + 1.1.13 ${project.groupId}.${project.artifactId} diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml index 72f8be47..7ab63d01 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml @@ -10,7 +10,7 @@ com.atlassian.jira.plugins jira-slack-server-integration-plugin atlassian-plugin - 3.0.11-SNAPSHOT + 3.0.10-SNAPSHOT Slack for Jira Data Center This is the Slack plugin for Jira Data Center diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/js/banner/update-slack-link-banner.js b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/js/banner/update-slack-link-banner.js index 10e50d9c..6c296f28 100644 --- a/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/js/banner/update-slack-link-banner.js +++ b/jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/js/banner/update-slack-link-banner.js @@ -52,10 +52,10 @@ require([ } function isInIssueView() { - return $('#issue-content').length; + return $('#issue-content').length > 0; } function isSlackPanelVisible() { - return $("#slack-issue-panel").length; + return $("#slack-issue-panel").length > 0; } }); }); diff --git a/pom.xml b/pom.xml index 0944f629..8146e571 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.5.39 3.2.0 - 1.1.14 + 1.1.13 diff --git a/slack-server-integration-common/src/main/resources/token/token-status.js b/slack-server-integration-common/src/main/resources/token/token-status.js index a3fd861e..305bfd49 100644 --- a/slack-server-integration-common/src/main/resources/token/token-status.js +++ b/slack-server-integration-common/src/main/resources/token/token-status.js @@ -11,7 +11,7 @@ require([ var flag = null; $(function () { - // skip if user is already in configuration view or edit pages or in issue view without active slack integration + // skip if user is already in configuration view or edit pages or in issue view and slack panel isn't shown if (contains(window.location.pathname, CONFIGURE_PAGE_URL) || contains(window.location.pathname, OAUTH_SESSIONS_PAGE_URL) || (isInIssueView() && !isSlackPanelVisible())) { @@ -66,10 +66,10 @@ require([ } function isInIssueView() { - return $('#issue-content').length; + return $('#issue-content').length > 0; } function isSlackPanelVisible() { - return $("#slack-issue-panel").length; + return $("#slack-issue-panel").length > 0; } function contains(str, substr) {