Skip to content

Commit 14fdb86

Browse files
committed
Fix various small mistakes
1 parent 35af0b6 commit 14fdb86

File tree

6 files changed

+6
-2
lines changed

6 files changed

+6
-2
lines changed

js/src/_base/Three.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ var ThreeModel = widgets.WidgetModel.extend({
2929
this.initPromise = this.createThreeObjectAsync().bind(this).then(function() {
3030

3131
// pull in props created by three
32-
// TODO: need to ensure changes are saved before syncing to three obj
3332
this.syncToModel();
3433

3534
// sync the rest from the server to the model
@@ -308,6 +307,7 @@ var ThreeModel = widgets.WidgetModel.extend({
308307

309308
_.each(this.property_converters, function(converterName, propName) {
310309
assigner = this[this.property_assigners[propName]] || this.assignDirect;
310+
assigner = assigner.bind(this);
311311
if (!converterName) {
312312
assigner(this.obj, propName, this.get(propName));
313313
return;

js/src/controls/FlyControls.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ var FlyControlsModel = FlyControlsAutogen.FlyControlsModel.extend({
5353
},
5454
'pushFromThree'
5555
);
56+
controlling.save_changes();
5657
},
5758

5859
});

js/src/controls/OrbitControls.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ var OrbitControlsModel = OrbitControlsAutogen.OrbitControlsModel.extend({
3636
},
3737
'pushFromThree'
3838
);
39+
controlling.save_changes();
3940
},
4041

4142
});

js/src/controls/TrackballControls.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ var TrackballControlsModel = TrackballControlsAutogen.TrackballControlsModel.ext
3333
},
3434
'pushFromThree'
3535
);
36+
controlling.save_changes();
3637
},
3738

3839
});

js/src/objects/CloneArray.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ var CloneArrayModel = CloneArrayAutogen.extend({
120120
syncToThreeObj: function() {
121121

122122
this._needs_rebuild = false;
123-
CloneArrayAutogen.prototype.createPropertiesArrays.call(this);
123+
CloneArrayAutogen.prototype.syncToThreeObj.call(this);
124124
if (this._needs_rebuild) {
125125
this.obj.build();
126126
}

js/src/textures/TextTexture.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var TextTextureModel = TextTextureBase.extend({
2424
this.obj.image = canvas;
2525
this.obj.needsUpdate = true;
2626
this.set({ version: this.obj.version }, 'pushFromThree');
27+
this.save_changes();
2728
},
2829

2930
buildCanvas: function() {

0 commit comments

Comments
 (0)