skopix 2.0.67 → 2.0.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/web/app/index.html +12 -3
package/package.json
CHANGED
package/web/app/index.html
CHANGED
|
@@ -5870,9 +5870,18 @@ function openMergeSteps() {
|
|
|
5870
5870
|
// Override the confirm button
|
|
5871
5871
|
const actions = document.querySelector('.confirm-actions');
|
|
5872
5872
|
if (actions) {
|
|
5873
|
-
|
|
5874
|
-
|
|
5875
|
-
|
|
5873
|
+
const mergeBtn = document.createElement('button');
|
|
5874
|
+
mergeBtn.className = 'btn btn-primary';
|
|
5875
|
+
mergeBtn.textContent = 'Merge';
|
|
5876
|
+
mergeBtn.dataset.mergeIds = JSON.stringify(ids);
|
|
5877
|
+
mergeBtn.addEventListener('click', () => confirmMergeSteps(JSON.parse(mergeBtn.dataset.mergeIds)));
|
|
5878
|
+
actions.innerHTML = '';
|
|
5879
|
+
const cancelBtn = document.createElement('button');
|
|
5880
|
+
cancelBtn.className = 'btn btn-ghost';
|
|
5881
|
+
cancelBtn.textContent = 'Cancel';
|
|
5882
|
+
cancelBtn.addEventListener('click', closeConfirm);
|
|
5883
|
+
actions.appendChild(cancelBtn);
|
|
5884
|
+
actions.appendChild(mergeBtn);
|
|
5876
5885
|
}
|
|
5877
5886
|
document.getElementById('confirm-overlay').classList.add('open');
|
|
5878
5887
|
}
|