From ef6e6c90eff1d307c93228b99e5f1cb8ae905bfa Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Wed, 10 Feb 2016 22:46:35 -0300 Subject: [PATCH] [Ivan Diaz] - #8 - Code clean ups [skip ci] --- gulp/tasks/browserify.js | 4 ++-- src/app/index.js | 3 +-- src/lib-app/fixtures-loader.js | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gulp/tasks/browserify.js b/gulp/tasks/browserify.js index c63e19fa..949f0761 100644 --- a/gulp/tasks/browserify.js +++ b/gulp/tasks/browserify.js @@ -24,8 +24,8 @@ function buildScript(file, watch) { entries: [config.sourceDir + 'app/' + file], debug: !global.isProd, insertGlobalVars: { - fixturesEnabled: function() { - return (util.env.api) ? "'enabled'" : "'disabled'"; + noFixtures: function() { + return (util.env['api']) ? "'enabled'" : "'disabled'"; } }, cache: {}, diff --git a/src/app/index.js b/src/app/index.js index a9ee8057..7a01f3da 100644 --- a/src/app/index.js +++ b/src/app/index.js @@ -9,8 +9,7 @@ if ( process.env.NODE_ENV !== 'production' ) { window.React = React; } -//TODO: This should be optional via gulp like: "gulp dev --no-fixtures" -if (fixturesEnabled === 'disabled') { +if (noFixtures === 'disabled') { require('lib-app/fixtures-loader'); } diff --git a/src/lib-app/fixtures-loader.js b/src/lib-app/fixtures-loader.js index 3d07f8b7..4f2ae3bd 100644 --- a/src/lib-app/fixtures-loader.js +++ b/src/lib-app/fixtures-loader.js @@ -21,7 +21,6 @@ let fixtures = (function () { fixtures.add(require('data/fixtures/user-fixtures')); _.each(fixtures.getAll(), function (fixture) { - //ADD FIXTURE TO MOCKJAX mockjax({ contentType: 'application/json', url: 'http://localhost:3000/api/' + fixture.path,