Issue atlassian-labs#305: revert version changes for slack common mod…

…ule; prevent ambiguities in JS
annapieper · Dec 11, 2023 · fe8520d · fe8520d
1 parent 511e769
commit fe8520d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/bitbucket-slack-server-integration-plugin/pom.xml b/bitbucket-slack-server-integration-plugin/pom.xml
@@ -42,7 +42,7 @@
         <atlassian-json-api.version>0.9</atlassian-json-api.version>
         <atlassian-concurrent.version>3.0.0</atlassian-concurrent.version>
         <commons-codec.version>1.11</commons-codec.version>
-        <slack.common.version>1.1.14</slack.common.version>
+        <slack.common.version>1.1.13</slack.common.version>
 
         <!-- product properties -->
         <plugin.key>${project.groupId}.${project.artifactId}</plugin.key>

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
@@ -10,7 +10,7 @@
     <groupId>com.atlassian.jira.plugins</groupId>
     <artifactId>jira-slack-server-integration-plugin</artifactId>
     <packaging>atlassian-plugin</packaging>
-    <version>3.0.11-SNAPSHOT</version>
+    <version>3.0.10-SNAPSHOT</version>
 
     <name>Slack for Jira Data Center</name>
     <description>This is the Slack plugin for Jira Data Center</description>

diff --git a/...-slack-server-integration-plugin/src/main/resources/js/banner/update-slack-link-banner.js b/...-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
@@ -79,7 +79,7 @@
         <webresource.version>3.5.39</webresource.version>
         <atlassian-cache.version>3.2.0</atlassian-cache.version>
 
-        <slack.common.version>1.1.14</slack.common.version>
+        <slack.common.version>1.1.13</slack.common.version>
     </properties>
 
     <build>

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
@@ -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) {