diff --git a/README.md b/README.md
index 0dc7379..588d2fa 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ A browser extension that enhance all Merge Requests lists on any instance of Git
- Ticket ID is automatically detected in source branch name or Merge Request title
- Base Jira URL is configured in extension preferences
- The ticket ID or an icon can be displayed as the link label (configured in extension preferences)
- - WIP toggle button (can be enabled/disabled in the extension preferences)
+ - Draft toggle button (can be enabled/disabled in the extension preferences)
- Show an indicator when there's unresolved discussions left on Merge Requests
- Can be enabled/disabled in the extension preferences
- Note the **All discussions must be resolved** option must be enabled for this feature to be working as expected. This option is enabled per project and is located in **Settings > General > Merge Requests > Merge checks**
diff --git a/html/options.html b/html/options.html
index 4a9c33f..5a7f7ee 100644
--- a/html/options.html
+++ b/html/options.html
@@ -53,10 +53,10 @@
-
+
-
+
@@ -76,6 +76,7 @@
+
diff --git a/js/background.js b/js/background.js
new file mode 100644
index 0000000..671792e
--- /dev/null
+++ b/js/background.js
@@ -0,0 +1,37 @@
+(function(globals) {
+ 'use strict';
+
+ class BackgroundScript {
+ /**
+ * The background script of the extension.
+ */
+ constructor() {
+ if ('chrome' in globals && globals.chrome) { // Firefox and Edge uses `browser`, Chrome and Opera uses `chrome`
+ globals.browser = globals.chrome;
+ }
+
+ if (!('browser' in globals) || !globals.browser) {
+ console.error('Unsupported browser');
+ }
+
+ this.listenToExtensionUpdates();
+ }
+
+ /**
+ * Attach a callback to the `onInstalled` runtime event, which handles stuff related to extension updates.
+ */
+ listenToExtensionUpdates() {
+ let self = this;
+
+ globals.browser.runtime.onInstalled.addListener(function(details) {
+ if (!('reason' in details) || details.reason != 'update') {
+ return;
+ }
+
+ // TODO enable_button_to_toggle_wip_status => enable_button_to_toggle_draft_status
+ });
+ }
+ }
+
+ let bs = new BackgroundScript();
+}(this));
\ No newline at end of file
diff --git a/js/common.js b/js/common.js
new file mode 100644
index 0000000..87b9c25
--- /dev/null
+++ b/js/common.js
@@ -0,0 +1,123 @@
+(function(globals) {
+ 'use strict';
+
+ globals.Gmrle = globals.Gmrle || {};
+
+ // This function has been stolen from https://github.com/locutusjs/locutus/blob/master/src/php/info/version_compare.js
+ globals.Gmrle.versionCompare = function(v1, v2, operator) {
+ // discuss at: https://locutus.io/php/version_compare/
+ // original by: Philippe Jausions (https://pear.php.net/user/jausions)
+ // original by: Aidan Lister (https://aidanlister.com/)
+ // reimplemented by: Kankrelune (https://www.webfaktory.info/)
+ // improved by: Brett Zamir (https://brett-zamir.me)
+ // improved by: Scott Baker
+ // improved by: Theriault (https://github.com/Theriault)
+ // example 1: version_compare('8.2.5rc', '8.2.5a')
+ // returns 1: 1
+ // example 2: version_compare('8.2.50', '8.2.52', '<')
+ // returns 2: true
+ // example 3: version_compare('5.3.0-dev', '5.3.0')
+ // returns 3: -1
+ // example 4: version_compare('4.1.0.52','4.01.0.51')
+ // returns 4: 1
+
+ // Important: compare must be initialized at 0.
+ let i
+ let x
+ let compare = 0
+
+ // vm maps textual PHP versions to negatives so they're less than 0.
+ // PHP currently defines these as CASE-SENSITIVE. It is important to
+ // leave these as negatives so that they can come before numerical versions
+ // and as if no letters were there to begin with.
+ // (1alpha is < 1 and < 1.1 but > 1dev1)
+ // If a non-numerical value can't be mapped to this table, it receives
+ // -7 as its value.
+ const vm = {
+ dev: -6,
+ alpha: -5,
+ a: -5,
+ beta: -4,
+ b: -4,
+ RC: -3,
+ rc: -3,
+ '#': -2,
+ p: 1,
+ pl: 1
+ }
+
+ // This function will be called to prepare each version argument.
+ // It replaces every _, -, and + with a dot.
+ // It surrounds any nonsequence of numbers/dots with dots.
+ // It replaces sequences of dots with a single dot.
+ // version_compare('4..0', '4.0') === 0
+ // Important: A string of 0 length needs to be converted into a value
+ // even less than an unexisting value in vm (-7), hence [-8].
+ // It's also important to not strip spaces because of this.
+ // version_compare('', ' ') === 1
+ const _prepVersion = function (v) {
+ v = ('' + v).replace(/[_\-+]/g, '.')
+ v = v.replace(/([^.\d]+)/g, '.$1.').replace(/\.{2,}/g, '.')
+ return (!v.length ? [-8] : v.split('.'))
+ }
+ // This converts a version component to a number.
+ // Empty component becomes 0.
+ // Non-numerical component becomes a negative number.
+ // Numerical component becomes itself as an integer.
+ const _numVersion = function (v) {
+ return !v ? 0 : (isNaN(v) ? vm[v] || -7 : parseInt(v, 10))
+ }
+
+ v1 = _prepVersion(v1)
+ v2 = _prepVersion(v2)
+ x = Math.max(v1.length, v2.length)
+
+ for (i = 0; i < x; i++) {
+ if (v1[i] === v2[i]) {
+ continue
+ }
+ v1[i] = _numVersion(v1[i])
+ v2[i] = _numVersion(v2[i])
+ if (v1[i] < v2[i]) {
+ compare = -1
+ break
+ } else if (v1[i] > v2[i]) {
+ compare = 1
+ break
+ }
+ }
+
+ if (!operator) {
+ return compare
+ }
+
+ // Important: operator is CASE-SENSITIVE.
+ // "No operator" seems to be treated as "<."
+ // Any other values seem to make the function return null.
+ switch (operator) {
+ case '>':
+ case 'gt':
+ return (compare > 0)
+ case '>=':
+ case 'ge':
+ return (compare >= 0)
+ case '<=':
+ case 'le':
+ return (compare <= 0)
+ case '===':
+ case '=':
+ case 'eq':
+ return (compare === 0)
+ case '<>':
+ case '!==':
+ case 'ne':
+ return (compare !== 0)
+ case '':
+ case '<':
+ case 'lt':
+ return (compare < 0)
+ default:
+ return null
+ }
+ };
+}(this));
\ No newline at end of file
diff --git a/js/content.js b/js/content.js
index d5d29fe..938064f 100644
--- a/js/content.js
+++ b/js/content.js
@@ -250,8 +250,8 @@
self.attachClickEventToCopyMergeRequestInfoButtons();
}
- if (self.userAuthenticated && self.preferences.enable_button_to_toggle_wip_status) {
- self.attachClickEventToToggleWipStatusButtons();
+ if (self.userAuthenticated && self.preferences.enable_button_to_toggle_draft_status) {
+ self.attachClickEventToToggleDraftStatusButtons();
}
});
}
@@ -316,16 +316,16 @@
this.setDataAttributesToMergeRequestNode(mergeRequestNode, mergeRequest);
// -----------------------------------------------
- // Toggle WIP status button
+ // Toggle Draft status button
- if (this.userAuthenticated && this.preferences.enable_button_to_toggle_wip_status) {
- let toggleWipStatusButton = '