Removing deprecated dependency on AJS.contextPath() #347

tomasbjerre · Oct 3, 2019 · d9e2479 · d9e2479
1 parent 1797236
commit d9e2479
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
 ### No issue
+  Removing deprecated dependency on AJS.contextPath()
+
+  [1ed35c86b06ea32](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/1ed35c86b06ea32) Tomas Bjerre *2019-10-03 14:19:07*
+
+  Correcting custom keystore
+
+Using custom keystore even if "Accept Any Certificate" is disabled.
+
+  [17972362e075e99](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/17972362e075e99) Tomas Bjerre *2019-10-03 14:09:30*
+
   doc
 
   [0965b48f845c45b](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/0965b48f845c45b) Tomas Bjerre *2019-10-01 14:37:09*

diff --git a/src/main/resources/admin.js b/src/main/resources/admin.js
@@ -1,15 +1,16 @@
 define('plugin/prnfb/admin', [
  'jquery',
  '@atlassian/aui',
- 'plugin/prnfb/utils'
-], function($, AJS, utils) {
- var settingsAdminUrlPostUrl = AJS.contextPath() + "/rest/prnfb-admin/1.0/settings";
+ 'plugin/prnfb/utils',
+ 'wrm/context-path'
+], function($, AJS, utils, contextPath) {
+ var settingsAdminUrlPostUrl = contextPath + "/rest/prnfb-admin/1.0/settings";
  var settingsAdminUrl = settingsAdminUrlPostUrl;
 
- var notificationsAdminUrlPostUrl = AJS.contextPath() + "/rest/prnfb-admin/1.0/settings/notifications";
+ var notificationsAdminUrlPostUrl = contextPath + "/rest/prnfb-admin/1.0/settings/notifications";
  var notificationsAdminUrl = notificationsAdminUrlPostUrl;
 
- var buttonsAdminUrlPostUrl = AJS.contextPath() + "/rest/prnfb-admin/1.0/settings/buttons";
+ var buttonsAdminUrlPostUrl = contextPath + "/rest/prnfb-admin/1.0/settings/buttons";
  var buttonsAdminUrl = buttonsAdminUrlPostUrl;
 
  var projectKey;

diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
@@ -33,6 +33,7 @@
 
  <web-resource name="Admin Web Resources" key="resources">
   <dependency>com.atlassian.auiplugin:ajs</dependency>
+  <dependency>com.atlassian.plugins.atlassian-plugins-webresource-plugin:context-path</dependency>
   <resource type="download" name="3rdparty.js" location="3rdparty.js" />
   <resource type="download" name="utils.js" location="utils.js" />
   <resource type="download" name="admin.js" location="admin.js" />
@@ -67,6 +68,7 @@
   <resource type="download" name="pr-triggerbutton.js" location="/pr-triggerbutton.js" />
   <dependency>com.atlassian.bitbucket.bitbucket-web-plugin:global</dependency>
   <dependency>com.atlassian.auiplugin:ajs</dependency>
+  <dependency>com.atlassian.plugins.atlassian-plugins-webresource-plugin:context-path</dependency>
   <context>bitbucket.page.pullRequest.view</context>
  </web-resource>
 </atlassian-plugin>
diff --git a/src/main/resources/pr-triggerbutton.js b/src/main/resources/pr-triggerbutton.js
@@ -3,9 +3,10 @@ define('plugin/prnfb/pr-triggerbutton', [
  '@atlassian/aui',
  'bitbucket/util/state',
  'underscore',
- 'plugin/prnfb/3rdparty'
-], function($, AJS, pageState, _, thirdParty) {
- var buttonsAdminUrl = AJS.contextPath() + "/rest/prnfb-admin/1.0/settings/buttons";
+ 'plugin/prnfb/3rdparty',
+ 'wrm/context-path'
+], function($, AJS, pageState, _, thirdParty, contextPath) {
+ var buttonsAdminUrl = contextPath + "/rest/prnfb-admin/1.0/settings/buttons";
 
  var waiting = '<span class="aui-icon aui-icon-wait aui-icon-small">Wait</span>';
  var $buttonArea = $('#pull-request-header-more').find('.aui-button').first().closest('ul');

diff --git a/src/main/resources/utils.js b/src/main/resources/utils.js
@@ -1,7 +1,8 @@
 define('plugin/prnfb/utils', [
  'jquery',
- 'plugin/prnfb/3rdparty'
-], function($, trdparty) {
+ 'plugin/prnfb/3rdparty',
+ 'wrm/context-path'
+], function($, trdparty, contextPath) {
 
  function postForm(url, formSelector, whenDone) {
   $('.statusresponse').empty();
@@ -59,7 +60,7 @@ define('plugin/prnfb/utils', [
  }
 
  function getProjects(whenDone) {
-  var projectsUrl = AJS.contextPath() + "/rest/api/1.0/projects?limit=999999";
+  var projectsUrl = contextPath + "/rest/api/1.0/projects?limit=999999";
   $.getJSON(projectsUrl, function(data) {
    whenDone(data);
   });
@@ -90,7 +91,7 @@ define('plugin/prnfb/utils', [
    whenDone();
    return;
   }
-  var reposUrl = AJS.contextPath() + "/rest/api/1.0/projects/" + projectKey + "/repos?limit=999999";
+  var reposUrl = contextPath + "/rest/api/1.0/projects/" + projectKey + "/repos?limit=999999";
   $.getJSON(reposUrl, function(data) {
    whenDone(data);
   });