@gedit/editor-2d 0.1.107 → 0.1.108

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.
@@ -11,7 +11,7 @@ export declare namespace Editor2dCommands {
11
11
  const ZOOM_OUT: Command;
12
12
  }
13
13
  export declare class Editor2dContribution implements FrontendApplicationContribution, CommandContribution, TabBarToolbarContribution {
14
- private autoClosedUrls;
14
+ private autoCloseUrls;
15
15
  private lastOpenedUrls;
16
16
  appShell: ApplicationShell;
17
17
  protected readonly contextKeyService: Editor2dContextKeyService;
@@ -1 +1 @@
1
- {"version":3,"file":"editor2d-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/editor2d-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,+BAA+B,EAE/B,aAAa,EACd,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,yBAAiB,gBAAgB,CAAC;IAEzB,MAAM,UAAU,EAAE,OAKxB,CAAC;IACK,MAAM,OAAO,EAAE,OAKrB,CAAC;IACK,MAAM,QAAQ,EAAE,OAKtB,CAAC;CACH;AAED,qBACa,oBAAqB,YAAW,+BAA+B,EAAE,mBAAmB,EAAE,yBAAyB;IAC1H,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,cAAc,CAAgB;IACZ,QAAQ,EAAE,gBAAgB,CAAC;IAClB,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,yBAAyB,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAChE,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,mBAAmB,EAAE,sBAAsB,CAAC;IAErF,OAAO,IAAI,IAAI;IAOf,sBAAsB,IAAI,IAAI;IA2C9B,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAqBjD,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAuB3D,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,GAAG,OAAO;IAMpF,YAAY,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IA6BjE,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAMnD"}
1
+ {"version":3,"file":"editor2d-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/editor2d-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,+BAA+B,EAE/B,aAAa,EACd,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,yBAAiB,gBAAgB,CAAC;IAEzB,MAAM,UAAU,EAAE,OAKxB,CAAC;IACK,MAAM,OAAO,EAAE,OAKrB,CAAC;IACK,MAAM,QAAQ,EAAE,OAKtB,CAAC;CACH;AAED,qBACa,oBAAqB,YAAW,+BAA+B,EAAE,mBAAmB,EAAE,yBAAyB;IAC1H,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,cAAc,CAAgB;IACZ,QAAQ,EAAE,gBAAgB,CAAC;IAClB,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,yBAAyB,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAChE,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,mBAAmB,EAAE,sBAAsB,CAAC;IAErF,OAAO,IAAI,IAAI;IAWf,sBAAsB,IAAI,IAAI;IA2C9B,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAqBjD,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAuB3D,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,GAAG,OAAO;IAMpF,YAAY,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAiCjE,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAMnD"}
@@ -78,7 +78,7 @@ var Editor2dCommands;
78
78
  })(Editor2dCommands = exports.Editor2dCommands || (exports.Editor2dCommands = {}));
79
79
  var Editor2dContribution = /** @class */ (function () {
80
80
  function Editor2dContribution() {
81
- this.autoClosedUrls = [];
81
+ this.autoCloseUrls = [];
82
82
  this.lastOpenedUrls = [];
83
83
  }
84
84
  Editor2dContribution.prototype.onStart = function () {
@@ -87,6 +87,9 @@ var Editor2dContribution = /** @class */ (function () {
87
87
  this.modelProvider.onModelCreate(function (model) {
88
88
  model.onSelectionChanged((0, utils_1.debounce)(function () { return _this.autoOpenUrls(model === null || model === void 0 ? void 0 : model.selection.selectedNodes, model); }, 100));
89
89
  });
90
+ window.addEventListener('beforeunload', function () {
91
+ _this.lastOpenedUrls.forEach(function (c) { return _this.closeWidgetByUrl(c); });
92
+ });
90
93
  };
91
94
  Editor2dContribution.prototype.updateFocusContextKeys = function () {
92
95
  var _a, _b;
@@ -188,6 +191,7 @@ var Editor2dContribution = /** @class */ (function () {
188
191
  Editor2dContribution.prototype.autoOpenUrls = function (selectedNodes, model) {
189
192
  var _this = this;
190
193
  var newUrls = [];
194
+ var autoCloseUrls = [];
191
195
  var multiple = selectedNodes.length > 1;
192
196
  selectedNodes.forEach(function (node) {
193
197
  var register = _this.renderEngineService.getGameObjectIDERegister(model.document.engineName, node.displayType);
@@ -198,20 +202,23 @@ var Editor2dContribution = /** @class */ (function () {
198
202
  if (!newUrls.includes(url)) {
199
203
  newUrls.push(url);
200
204
  }
201
- if (d_1.autoClose && !_this.autoClosedUrls.includes(url)) {
202
- _this.autoClosedUrls.push(url);
205
+ if (d_1.autoClose && !autoCloseUrls.includes(url)) {
206
+ autoCloseUrls.push(url);
203
207
  }
204
208
  });
205
209
  }
206
210
  }
207
211
  });
208
- newUrls.forEach(function (url) { return _this.opennerService.open(new utils_1.URI(url)); });
209
- this.lastOpenedUrls.forEach(function (url) {
210
- if (!newUrls.includes(url) && _this.autoClosedUrls.includes(url)) {
211
- _this.autoClosedUrls = _this.autoClosedUrls.filter(function (s) { return s !== url; });
212
+ newUrls.forEach(function (url) {
213
+ var urlObj = new utils_1.URI(url).addQueryObject({ t: String(Date.now()) });
214
+ _this.opennerService.open(urlObj);
215
+ });
216
+ this.autoCloseUrls.forEach(function (url) {
217
+ if (!newUrls.includes(url)) {
212
218
  _this.closeWidgetByUrl(url);
213
219
  }
214
220
  });
221
+ this.autoCloseUrls = autoCloseUrls;
215
222
  this.lastOpenedUrls = newUrls;
216
223
  };
217
224
  Editor2dContribution.prototype.closeWidgetByUrl = function (url) {
@@ -1 +1 @@
1
- {"version":3,"file":"editor2d-contribution.js","sourceRoot":"","sources":["../../src/browser/editor2d-contribution.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA+C;AAC/C,0DAKwC;AACxC,wCAA6C;AAG7C,iCAAsD;AACtD,+EAA2E;AAC3E,qEAAkE;AAClE,sCAA6C;AAC7C,8DAAkE;AAElE,IAAiB,gBAAgB,CAoBhC;AApBD,WAAiB,gBAAgB;IAC/B,IAAM,iBAAiB,GAAG,UAAU,CAAC;IACxB,2BAAU,GAAY;QACjC,EAAE,EAAE,qBAAqB;QACzB,QAAQ,EAAE,iBAAiB;QAC3B,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,gDAAgD;KAC5D,CAAC;IACW,wBAAO,GAAY;QAC9B,EAAE,EAAE,iBAAiB;QACrB,QAAQ,EAAE,iBAAiB;QAC3B,SAAS,EAAE,4CAA4C;QACvD,KAAK,EAAE,IAAI;KACZ,CAAC;IACW,yBAAQ,GAAY;QAC/B,EAAE,EAAE,kBAAkB;QACtB,QAAQ,EAAE,iBAAiB;QAC3B,SAAS,EAAE,6CAA6C;QACxD,KAAK,EAAE,IAAI;KACZ,CAAC;AACJ,CAAC,EApBgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAoBhC;AAGD;IAAA;QACU,mBAAc,GAAa,EAAE,CAAC;QAC9B,mBAAc,GAAa,EAAE,CAAC;IA8IxC,CAAC;IAvIC,sCAAO,GAAP;QAAA,iBAKC;QAJC,iFAAiF;QACjF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,UAAA,KAAK;YACpC,KAAK,CAAC,kBAAkB,CAAC,IAAA,gBAAQ,EAAC,cAAM,OAAA,KAAI,CAAC,YAAY,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAC,aAA+B,EAAE,KAAK,CAAC,EAA1E,CAA0E,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5H,CAAC,CAAC,CAAC;IACL,CAAC;IAED,qDAAsB,GAAtB;;QACE,IAAM,aAAa,GAAG,MAAA,IAAI,CAAC,QAAQ,0CAAE,aAAkC,CAAC;QACxE,IAAM,YAAY,GAAG,MAAA,IAAI,CAAC,QAAQ,0CAAE,YAAiC,CAAC;QACtE,IAAI,OAAwB,CAAC;QAC7B,IAAI,UAA2B,CAAC;QAChC,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAC/B,IAAI,aAAa,EAAE;YACjB,IAAI,aAAa,CAAC,eAAe,EAAE;gBACjC,OAAO,GAAG,aAAa,CAAC,eAAe,EAAE,CAAC;aAC3C;iBAAM,IAAI,aAAa,CAAC,cAAc,EAAE;gBACvC,OAAO,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;aAC1C;SACF;QACD,IAAI,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC,cAAc,EAAE;YACjD,UAAU,GAAG,YAAY,CAAC,cAAc,EAAE,CAAC;SAC5C;QACD,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,EAAE;YAC9E,kBAAkB,GAAG,IAAI,CAAC;SAC3B;QACD,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,EAAE;YACvF,qBAAqB,GAAG,IAAI,CAAC;SAC9B;QACD,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,UAAA,KAAK;YAC7C,IAAI,OAAO,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAQ,CAAC,QAAQ,EAAE,EAAE;gBACxE,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;aAC1B;iBAAM;gBACL,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;aACzB;QACH,CAAC,CAAC,CAAC;QACH,QAAQ;QACR,IAAI,qBAAqB,EAAE;YACzB,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACtD;aAAM;YACL,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvD;QACD,OAAO;QACP,IAAI,kBAAkB,EAAE;YACtB,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACrD;aAAM;YACL,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACtD;IACH,CAAC;IACD,+CAAgB,GAAhB,UAAiB,QAAyB;QAA1C,iBAmBC;QAlBC,QAAQ,CAAC,eAAe,CAAC,gBAAgB,CAAC,UAAU,EAAE;YACpD,OAAO,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBACzC,KAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,EAHiB,CAGjB;YACF,SAAS,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;YACxD,SAAS,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;SACzD,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,EAAE;YACjD,OAAO,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;YACtD,SAAS,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;YACxD,SAAS,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;SACzD,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAClD,OAAO,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;YACtD,SAAS,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;YACxD,SAAS,EAAE,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,EAAnC,CAAmC;SACzD,CAAC,CAAC;IACL,CAAC;IAED,mDAAoB,GAApB,UAAqB,QAA+B;QAClD;;;;;cAKM;QACN;;;;;;;;;;;;;UAaE;IACJ,CAAC;IAES,yCAAU,GAApB,UAAqB,MAAc,EAAE,EAAqC;QACxE,IAAI,MAAM,IAAI,MAAM,YAAY,qBAAY,IAAK,MAAuB,CAAC,MAAM,YAAY,qBAAa,EAAE;YACxG,OAAO,EAAE,CAAE,MAAuB,CAAC,MAAuB,CAAC,CAAC;SAC7D;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,2CAAY,GAAZ,UAAa,aAA6B,EAAE,KAAoB;QAAhE,iBA2BC;QA1BC,IAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1C,aAAa,CAAC,OAAO,CAAC,UAAA,IAAI;YACxB,IAAM,QAAQ,GAAG,KAAI,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAChH,IAAI,QAAQ,CAAC,eAAe,EAAE;gBAC5B,IAAM,GAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,CAAC,GAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC1D,GAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAA,GAAG;wBAChB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;4BAC1B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;yBACnB;wBACD,IAAI,GAAC,CAAC,SAAS,IAAI,CAAC,KAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;4BACrD,KAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;yBAC/B;oBACH,CAAC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,KAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,WAAG,CAAC,GAAG,CAAC,CAAC,EAAtC,CAAsC,CAAC,CAAC;QAC/D,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAA,GAAG;YAC7B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC/D,KAAI,CAAC,cAAc,GAAG,KAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,GAAG,EAAT,CAAS,CAAC,CAAC;gBACjE,KAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;IAChC,CAAC;IAEK,+CAAgB,GAAtB,UAAuB,GAAW;;;;;4BACjB,qBAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,WAAG,CAAC,GAAG,CAAC,CAAC,EAAA;;wBAA1D,MAAM,GAAG,SAAiD;wBAChE,IAAI,MAAM,EAAE;4BACV,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;yBACtC;;;;;KACF;IA5IyB;QAAzB,IAAA,kBAAM,EAAC,0BAAgB,CAAC;kCAAW,0BAAgB;0DAAC;IAClB;QAAlC,IAAA,kBAAM,EAAC,wDAAyB,CAAC;kCAAuC,wDAAyB;mEAAC;IACpE;QAA9B,IAAA,kBAAM,EAAC,+CAAqB,CAAC;kCAAmC,+CAAqB;+DAAC;IAChE;QAAtB,IAAA,kBAAM,EAAC,uBAAa,CAAC;;gEAAwC;IAC9B;QAA/B,IAAA,kBAAM,EAAC,0CAAsB,CAAC;kCAA+B,0CAAsB;qEAAC;IAP1E,oBAAoB;QADhC,IAAA,sBAAU,GAAE;OACA,oBAAoB,CAgJhC;IAAD,2BAAC;CAAA,AAhJD,IAgJC;AAhJY,oDAAoB"}
1
+ {"version":3,"file":"editor2d-contribution.js","sourceRoot":"","sources":["../../src/browser/editor2d-contribution.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gedit/editor-2d",
3
- "version": "0.1.107",
3
+ "version": "0.1.108",
4
4
  "license": "MIT",
5
5
  "main": "lib/browser/index",
6
6
  "typings": "lib/browser/index.d.ts",
@@ -35,5 +35,5 @@
35
35
  "nyc": {
36
36
  "extends": "../../configs/nyc.json"
37
37
  },
38
- "gitHead": "0c11cd7884ae1c3ca2ad74115bbb095a36ba2156"
38
+ "gitHead": "5df29fce625754ad138a8e95f32988d9c90a8edf"
39
39
  }
@@ -38,7 +38,7 @@ export namespace Editor2dCommands {
38
38
 
39
39
  @injectable()
40
40
  export class Editor2dContribution implements FrontendApplicationContribution, CommandContribution, TabBarToolbarContribution {
41
- private autoClosedUrls: string[] = [];
41
+ private autoCloseUrls: string[] = [];
42
42
  private lastOpenedUrls: string[] = [];
43
43
  @inject(ApplicationShell) appShell: ApplicationShell;
44
44
  @inject(Editor2dContextKeyService) protected readonly contextKeyService: Editor2dContextKeyService;
@@ -51,6 +51,10 @@ export class Editor2dContribution implements FrontendApplicationContribution, Co
51
51
  this.modelProvider.onModelCreate(model => {
52
52
  model.onSelectionChanged(debounce(() => this.autoOpenUrls(model?.selection.selectedNodes as Editor2dNode[], model), 100));
53
53
  });
54
+ window.addEventListener('beforeunload', () => {
55
+ this.lastOpenedUrls.forEach(c => this.closeWidgetByUrl(c));
56
+ });
57
+
54
58
  }
55
59
 
56
60
  updateFocusContextKeys(): void {
@@ -148,6 +152,7 @@ export class Editor2dContribution implements FrontendApplicationContribution, Co
148
152
  }
149
153
  autoOpenUrls(selectedNodes: Editor2dNode[], model: Editor2dModel): void {
150
154
  const newUrls: string[] = [];
155
+ const autoCloseUrls: string[] = [];
151
156
  const multiple = selectedNodes.length > 1;
152
157
  selectedNodes.forEach(node => {
153
158
  const register = this.renderEngineService.getGameObjectIDERegister(model.document.engineName, node.displayType);
@@ -158,20 +163,23 @@ export class Editor2dContribution implements FrontendApplicationContribution, Co
158
163
  if (!newUrls.includes(url)) {
159
164
  newUrls.push(url);
160
165
  }
161
- if (d.autoClose && !this.autoClosedUrls.includes(url)) {
162
- this.autoClosedUrls.push(url);
166
+ if (d.autoClose && !autoCloseUrls.includes(url)) {
167
+ autoCloseUrls.push(url);
163
168
  }
164
169
  });
165
170
  }
166
171
  }
167
172
  });
168
- newUrls.forEach(url => this.opennerService.open(new URI(url)));
169
- this.lastOpenedUrls.forEach(url => {
170
- if (!newUrls.includes(url) && this.autoClosedUrls.includes(url)) {
171
- this.autoClosedUrls = this.autoClosedUrls.filter(s => s !== url);
173
+ newUrls.forEach(url => {
174
+ const urlObj = new URI(url).addQueryObject({ t: String(Date.now()) });
175
+ this.opennerService.open(urlObj);
176
+ });
177
+ this.autoCloseUrls.forEach(url => {
178
+ if (!newUrls.includes(url)) {
172
179
  this.closeWidgetByUrl(url);
173
180
  }
174
181
  });
182
+ this.autoCloseUrls = autoCloseUrls;
175
183
  this.lastOpenedUrls = newUrls;
176
184
  }
177
185