Skip to content

Commit 2b58eea

Browse files
committed
Remove old diffs when a new diff is created
1 parent 27c30c7 commit 2b58eea

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@jupyterlab/services": "^7.0.0",
6464
"@jupyterlab/ui-components": "^4.0.0",
6565
"@lumino/widgets": "^2.0.0",
66-
"jupyterlab-cell-input-footer": "^0.2.0",
66+
"jupyterlab-cell-input-footer": "^0.3.0",
6767
"nbdime": "^7.0.1"
6868
},
6969
"devDependencies": {

src/command.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,24 @@ export function showCellDiff(data: ShowDiff.ICommandArgs, cellFooterTracker: ICe
4040

4141
let mergeView: MergeView;
4242
mergeView = new MergeView({ remote: diff });
43+
//
44+
mergeView.addClass("jp-cell-diff");
45+
// Add the classes below to pick up the styling from nbdime.
4346
mergeView.addClass("nbdime-root");
4447
mergeView.addClass("jp-Notebook-diff");
4548
mergeView.hide();
4649

4750
let footer = cellFooterTracker.getFooter(data.cell_id);
51+
// Try removing any old widget that exists.
52+
try { footer?.removeWidget("jp-cell-diff") } catch {}
53+
4854
footer?.addWidget(mergeView);
4955

5056
if (footer?.isHidden) {
5157
footer.show();
5258
footer.update();
5359
}
54-
footer?.addItemOnLeft(
60+
footer?.addToolbarItemOnLeft(
5561
'compare',
5662
new ToolbarButton({
5763
// icon: wandIcon,

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3727,7 +3727,7 @@ __metadata:
37273727
eslint: ^8.36.0
37283728
eslint-config-prettier: ^8.8.0
37293729
eslint-plugin-prettier: ^5.0.0
3730-
jupyterlab-cell-input-footer: ^0.2.0
3730+
jupyterlab-cell-input-footer: ^0.3.0
37313731
mkdirp: ^1.0.3
37323732
nbdime: ^7.0.1
37333733
npm-run-all2: ^7.0.1
@@ -3745,13 +3745,13 @@ __metadata:
37453745
languageName: unknown
37463746
linkType: soft
37473747

3748-
"jupyterlab-cell-input-footer@npm:^0.2.0":
3749-
version: 0.2.0
3750-
resolution: "jupyterlab-cell-input-footer@npm:0.2.0"
3748+
"jupyterlab-cell-input-footer@npm:^0.3.0":
3749+
version: 0.3.0
3750+
resolution: "jupyterlab-cell-input-footer@npm:0.3.0"
37513751
dependencies:
37523752
"@jupyterlab/services": ^7.0.0
37533753
"@lumino/coreutils": ^2.1.2
3754-
checksum: b298f6ba525668ce18c25c1e1bd5c1f515d2c76f9611092b88e1ae2769e2966784455c4d7e80f10061a8482d8c938264af15436faf0234bada101fa0a42d62ef
3754+
checksum: 88e8a420022a9228a09271f7b7e5ddc15f2bab9f9cf4e11541364a4060d8907ebdee2174efe0ecbbbdfa56d649fda25380e7a0f9d6dbe4d3486b3c0ab2e55a4c
37553755
languageName: node
37563756
linkType: hard
37573757

0 commit comments

Comments
 (0)