use defaults function

nglviewer · Oct 5, 2016 · dfe3c64 · dfe3c64
1 parent f6a021a
commit dfe3c64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/component/shape-component.js b/src/component/shape-component.js
@@ -5,6 +5,7 @@
  */
 
 
+import { defaults } from "../utils.js";
 import Component from "./component.js";
 
 
@@ -19,7 +20,7 @@ import Component from "./component.js";
 function ShapeComponent( stage, shape, params ){
 
     var p = params || {};
-    p.name = p.name !== undefined ? p.name : shape.name;
+    p.name = defaults( p.name, shape.name );
 
     Component.call( this, stage, p );
 

diff --git a/src/component/structure-component.js b/src/component/structure-component.js
@@ -5,6 +5,7 @@
  */
 
 
+import { defaults } from "../utils.js";
 import Component from "./component.js";
 import TrajectoryComponent from "./trajectory-component.js";
 import { makeTrajectory } from "../trajectory/trajectory-utils.js";
@@ -33,7 +34,7 @@ import { superpose } from "../align/align-utils.js";
 function StructureComponent( stage, structure, params ){
 
     var p = params || {};
-    p.name = p.name !== undefined ? p.name : structure.name;
+    p.name = defaults( p.name, structure.name );
 
     Component.call( this, stage, p );
 
@@ -239,7 +240,7 @@ StructureComponent.prototype = Object.assign( Object.create(
 
     centerView: function( zoom, sele ){
 
-        zoom = zoom !== undefined ? zoom : true;
+        zoom = defaults( zoom, true );
 
         var center = this.getCenter( sele );