requiredopts

CartoDB · Feb 16, 2017 · de5957e · de5957e
1 parent fa6ae96
commit de5957e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...avascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.js b/...avascripts/cartodb3/components/onboardings/layers/data-onboarding/data-onboarding-view.js
@@ -1,27 +1,26 @@
 var _ = require('underscore');
 var OnboardingView = require('../layer-onboarding-view');
 var template = require('./data-onboarding.tpl');
+var checkAndBuildOpts = require('../../../../helpers/required-opts');
+
+var REQUIRED_OPTS = [
+  'numberOfWidgets',
+  'hasTimeSeries',
+  'hasAnimatedTimeSeries'
+];
 
 module.exports = OnboardingView.extend({
 
   initialize: function (opts) {
+    checkAndBuildOpts(opts, REQUIRED_OPTS, this);
+
     OnboardingView.prototype.initialize.call(this, _.extend(opts, {
       template: template,
       numberOfSteps: 4,
       modifier: '--data'
     }));
-    if (opts.numberOfWidgets === void 0) {
-      throw new Error('numberOfWidgets is required');
-    }
-    if (opts.hasTimeSeries === void 0) {
-      throw new Error('hasTimeSeries is required');
-    }
-    if (opts.hasAnimatedTimeSeries === void 0) {
-      throw new Error('hasAnimatedTimeSeries is required');
-    }
-    this._hasTimeSeries = opts.hasTimeSeries;
-    this._hasAnimatedTimeSeries = opts.hasAnimatedTimeSeries;
-    this._hasSidebarWidgets = (opts.hasTimeSeries && opts.numberOfWidgets > 1) || (!opts.hasTimeSeries && opts.numberOfWidgets > 0);
+
+    this._hasSidebarWidgets = (this._hasTimeSeries && this._numberOfWidgets > 1) || (!this._hasTimeSeries && this._numberOfWidgets > 0);
   },
 
   render: function () {

diff --git a/lib/assets/core/javascripts/cartodb3/helpers/required-opts.js b/lib/assets/core/javascripts/cartodb3/helpers/required-opts.js
@@ -6,7 +6,7 @@ module.exports = function checkAndBuildRequiredOpts (actualOpts, requiredOpts, c
   }
 
   _.each(requiredOpts, function (item) {
-    if (actualOpts[item] === undefined) throw new Error(item + ' is required');
+    if (actualOpts[item] === void 0) throw new Error(item + ' is required');
     context['_' + item] = actualOpts[item];
   }, context);
 };