From 65fb5ab2a5ce642401e40a1326027638ccdf394b Mon Sep 17 00:00:00 2001 From: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed, 6 Jan 2016 11:15:36 -0800 Subject: [PATCH] [API] Move angular dependency inward --- main.js | 8 +++----- platform/framework/src/Main.js | 13 +++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/main.js b/main.js index e5b6f24519..5133122006 100644 --- a/main.js +++ b/main.js @@ -39,10 +39,8 @@ requirejs.config({ define([ './platform/framework/src/Main', - 'legacyRegistry', - "angular", - "angular-route" -], function (Main, legacyRegistry, angular) { + 'legacyRegistry' +], function (Main, legacyRegistry) { 'use strict'; - new Main(angular).run(legacyRegistry); + new Main().run(legacyRegistry); }); \ No newline at end of file diff --git a/platform/framework/src/Main.js b/platform/framework/src/Main.js index c5a1968308..caf66b7b6a 100644 --- a/platform/framework/src/Main.js +++ b/platform/framework/src/Main.js @@ -41,24 +41,25 @@ define( [ 'require', '../lib/es6-promise-2.0.0.min', - './FrameworkLayer' + './FrameworkLayer', + 'angular', + 'angular-route' ], function ( require, es6promise, - FrameworkLayer + FrameworkLayer, + angular ) { "use strict"; - function Main(angular) { - this.angular = angular; + function Main() { } Main.prototype.run = function () { // Get a reference to Angular's injector, so we can get $http and $log // services, which are useful to the framework layer. - var angular = this.angular, - injector = angular.injector(['ng']); + var injector = angular.injector(['ng']); // Look up log level from query string function logLevel() {