Skip to content

Commit c30a5f2

Browse files
committed
Update widget dependency
1 parent fa25bed commit c30a5f2

File tree

2 files changed

+14
-34
lines changed

2 files changed

+14
-34
lines changed

js/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@
2020
},
2121
"devDependencies": {
2222
"eslint": "^4.11.0",
23-
"fs-extra": "^4.0.1",
24-
"glob": "^7.0.6",
25-
"handlebars": "^4.0.5",
26-
"rimraf": "^2.4.1",
27-
"underscore": "^1.8.3",
28-
"webpack": "^3.6.0"
23+
"fs-extra": "^4.0.2",
24+
"glob": "^7.1.2",
25+
"handlebars": "^4.0.11",
26+
"rimraf": "^2.6.2",
27+
"webpack": "^3.8.1"
2928
},
3029
"dependencies": {
31-
"@jupyter-widgets/base": "^1.0.0",
32-
"bluebird": "^3.4.3",
30+
"@jupyter-widgets/base": "^1.1.4",
31+
"bluebird": "^3.5.1",
3332
"jupyter-dataserializers": "^1.0.0",
3433
"three": "^0.87.1",
3534
"underscore": "^1.8.3"

js/src/_base/utils.js

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -186,16 +186,6 @@ function lookAtSphere(camera, center, radius, setNearFar) {
186186
}
187187

188188

189-
190-
/**
191-
* Work around for notebook issue #2730.
192-
*/
193-
function commOpenWithBuffers(comm, content, callbacks, metadata, buffers) {
194-
return comm.kernel.send_shell_message(
195-
'comm_open', content, callbacks, metadata, buffers);
196-
}
197-
198-
199189
/**
200190
* Create a new model from the JS side.
201191
*
@@ -213,14 +203,7 @@ function createModel(constructor, widget_manager, obj) {
213203
var attributes = { };
214204
var widget_model = new constructor(attributes, modelOptions);
215205

216-
widget_model.once('comm:close', function() {
217-
delete widget_manager._models[id];
218-
});
219-
220-
widget_manager._models[id] = widget_model.initPromise.then(function() {
221-
// Create un-opened comm:
222-
return widget_manager._create_comm(widget_manager.comm_target_name, id);
223-
}).then(function(comm) {
206+
var modelPromise = widget_model.initPromise.then(function() {
224207
var split = widgets.remove_buffers(
225208
widget_model.serialize(widget_model.get_state(true)));
226209
var data = {
@@ -235,15 +218,12 @@ function createModel(constructor, widget_manager, obj) {
235218
buffer_paths: split.buffer_paths
236219
};
237220
var buffers = split.buffers;
238-
239-
var content = {
240-
'comm_id': id,
241-
'target_name': widget_manager.comm_target_name,
242-
'data': data
243-
};
244221
var metadata = {version: widgets.PROTOCOL_VERSION};
245222

246-
commOpenWithBuffers(comm, content, null, metadata, buffers);
223+
// Create un-opened comm:
224+
return widget_manager._create_comm(
225+
widget_manager.comm_target_name, id, data, metadata, buffers);
226+
}).then(function(comm) {
247227

248228
widget_model.comm = comm;
249229

@@ -255,8 +235,9 @@ function createModel(constructor, widget_manager, obj) {
255235

256236
return widget_model;
257237
});
238+
widget_manager.register_model(id, modelPromise);
258239

259-
return widget_manager._models[id];
240+
return modelPromise;
260241
}
261242

262243

0 commit comments

Comments
 (0)