From 66b38105ca954c722231f2d87040421a72326d21 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jviottidc@gmail.com>
Date: Wed, 13 Apr 2016 15:37:05 -0400
Subject: [PATCH] Require ui.router and ui.bootstrap using NPM style (#321)

Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
---
 lib/browser/app.js                                      | 4 +---
 lib/browser/components/drive-selector/drive-selector.js | 4 +---
 lib/browser/pages/finish/finish.js                      | 4 +---
 lib/browser/pages/settings/settings.js                  | 4 +---
 lib/browser/utils/if-state/if-state.js                  | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/browser/app.js b/lib/browser/app.js
index dd70ede2..5ff89f99 100644
--- a/lib/browser/app.js
+++ b/lib/browser/app.js
@@ -25,10 +25,8 @@ const _ = require('lodash');
 const electron = require('electron');
 const dialog = electron.remote.require('./src/dialog');
 
-require('angular-ui-router');
-
 const app = angular.module('Etcher', [
-  'ui.router',
+  require('angular-ui-router'),
 
   // Etcher modules
   require('./browser/modules/drive-scanner'),
diff --git a/lib/browser/components/drive-selector/drive-selector.js b/lib/browser/components/drive-selector/drive-selector.js
index f2246652..3c8112a4 100644
--- a/lib/browser/components/drive-selector/drive-selector.js
+++ b/lib/browser/components/drive-selector/drive-selector.js
@@ -21,11 +21,9 @@
  */
 
 const angular = require('angular');
-require('angular-ui-bootstrap');
-
 const MODULE_NAME = 'Etcher.Components.DriveSelector';
 const DriveSelector = angular.module(MODULE_NAME, [
-  'ui.bootstrap',
+  require('angular-ui-bootstrap'),
   require('../../../browser/modules/drive-scanner'),
   require('../../../browser/models/selection-state')
 ]);
diff --git a/lib/browser/pages/finish/finish.js b/lib/browser/pages/finish/finish.js
index 5cf58638..d03ffcc0 100644
--- a/lib/browser/pages/finish/finish.js
+++ b/lib/browser/pages/finish/finish.js
@@ -27,11 +27,9 @@
  */
 
 const angular = require('angular');
-require('angular-ui-router');
-
 const MODULE_NAME = 'Etcher.Pages.Finish';
 const FinishPage = angular.module(MODULE_NAME, [
-  'ui.router',
+  require('angular-ui-router'),
   require('../../modules/image-writer'),
   require('../../modules/analytics'),
   require('../../models/selection-state'),
diff --git a/lib/browser/pages/settings/settings.js b/lib/browser/pages/settings/settings.js
index cf6255db..6dfd8252 100644
--- a/lib/browser/pages/settings/settings.js
+++ b/lib/browser/pages/settings/settings.js
@@ -21,11 +21,9 @@
  */
 
 const angular = require('angular');
-require('angular-ui-router');
-
 const MODULE_NAME = 'Etcher.Pages.Settings';
 const SettingsPage = angular.module(MODULE_NAME, [
-  'ui.router',
+  require('angular-ui-router'),
   require('../../models/settings')
 ]);
 
diff --git a/lib/browser/utils/if-state/if-state.js b/lib/browser/utils/if-state/if-state.js
index 01a3930c..788458c3 100644
--- a/lib/browser/utils/if-state/if-state.js
+++ b/lib/browser/utils/if-state/if-state.js
@@ -25,11 +25,9 @@
  */
 
 const angular = require('angular');
-require('angular-ui-router');
-
 const MODULE_NAME = 'Etcher.Utils.IfState';
 const IfState = angular.module(MODULE_NAME, [
-  'ui.router'
+  require('angular-ui-router')
 ]);
 
 IfState.directive('showIfState', require('./directives/show-if-state'));