Skip to content

Commit 294246b

Browse files
committed
Editor: Materials browser code clean up.
1 parent 3b9016b commit 294246b

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

editor/js/Sidebar.Project.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,25 +171,26 @@ Sidebar.Project = function ( editor ) {
171171

172172
createRenderer( config.getKey( 'project/renderer' ), config.getKey( 'project/renderer/antialias' ), config.getKey( 'project/renderer/shadows' ) );
173173

174-
var materialbrowserpanel = new UI.Panel();
174+
// Materials
175+
176+
var materials = new UI.Panel();
175177

176178
var headerRow = new UI.Row();
177179
headerRow.add( new UI.Text( strings.getKey( 'sidebar/project/materials' ) ) );
178180

179-
materialbrowserpanel.add( headerRow );
181+
materials.add( headerRow );
180182

181183
var listbox = new UI.Listbox();
182184
signals.materialAdded.add( function () {
183185

184-
var materials = Object.values( editor.materials );
185-
listbox.setItems( materials );
186+
listbox.setItems( Object.values( editor.materials ) );
186187

187188
} );
188-
materialbrowserpanel.add( listbox );
189+
materials.add( listbox );
189190

190191
var buttonsRow = new UI.Row();
191192
buttonsRow.setPadding( '10px 0px' );
192-
materialbrowserpanel.add( buttonsRow );
193+
materials.add( buttonsRow );
193194

194195
/*
195196
var addButton = new UI.Button().setLabel( 'Add' ).setMarginRight( '5px' );
@@ -202,13 +203,13 @@ Sidebar.Project = function ( editor ) {
202203
*/
203204

204205
var assignMaterial = new UI.Button().setLabel( 'Assign' ).setMargin( '0px 5px' );
205-
assignMaterial.onClick( function ( ) {
206+
assignMaterial.onClick( function () {
206207

207-
if ( typeof editor.selected !== 'undefined' ) {
208+
if ( editor.selected !== null ) {
208209

209-
var material = editor.getMaterialById( parseInt( listbox.getValue( ) ) );
210+
var material = editor.getMaterialById( parseInt( listbox.getValue() ) );
210211

211-
if ( typeof material !== 'undefined' ) {
212+
if ( material !== undefined ) {
212213

213214
editor.execute( new SetMaterialCommand( editor, editor.selected, material ) );
214215

@@ -219,7 +220,7 @@ Sidebar.Project = function ( editor ) {
219220
} );
220221
buttonsRow.add( assignMaterial );
221222

222-
container.add( materialbrowserpanel );
223+
container.add( materials );
223224

224225
return container;
225226

0 commit comments

Comments
 (0)