From 43f95c52a0896f97b14b4c9504965029166073a0 Mon Sep 17 00:00:00 2001 From: alecmerdler Date: Wed, 25 Jan 2017 16:11:19 -0800 Subject: [PATCH] retrieve if needed --- grunt/Gruntfile.js | 2 +- static/js/quay.config.ts | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/grunt/Gruntfile.js b/grunt/Gruntfile.js index d56d0fb51..29ead6454 100644 --- a/grunt/Gruntfile.js +++ b/grunt/Gruntfile.js @@ -27,8 +27,8 @@ module.exports = function(grunt) { build: { src: [ '../static/lib/**/*.js', - '../static/js/**/*.js', '../static/build/*.js', + '../static/js/**/*.js', '../static/dist/template-cache.js', '!../static/js/**/*.spec.js' ], diff --git a/static/js/quay.config.ts b/static/js/quay.config.ts index 9143c31e7..fc7fc7293 100644 --- a/static/js/quay.config.ts +++ b/static/js/quay.config.ts @@ -3,29 +3,29 @@ import * as Raven from 'raven-js'; quayConfig.$inject = [ '$provide', + '$injector', 'INJECTED_CONFIG', 'cfpLoadingBarProvider', '$tooltipProvider', '$compileProvider', 'RestangularProvider', - '$analyticsProvider', ]; export function quayConfig( - $provide, - INJECTED_CONFIG, - cfpLoadingBarProvider, - $tooltipProvider, - $compileProvider, - RestangularProvider, - $analyticsProvider) { + $provide: ng.auto.IProvideService, + $injector: ng.auto.IInjectorService, + INJECTED_CONFIG: any, + cfpLoadingBarProvider: any, + $tooltipProvider: any, + $compileProvider: ng.ICompileProvider, + RestangularProvider: any) { cfpLoadingBarProvider.includeSpinner = false; // decorate the tooltip getter - var tooltipFactory = $tooltipProvider.$get[$tooltipProvider.$get.length - 1]; + var tooltipFactory: any = $tooltipProvider.$get[$tooltipProvider.$get.length - 1]; $tooltipProvider.$get[$tooltipProvider.$get.length - 1] = function($window: ng.IWindowService) { if ('ontouchstart' in $window) { - var existing = tooltipFactory.apply(this, arguments); + var existing: any = tooltipFactory.apply(this, arguments); return function(element) { // Note: We only disable bs-tooltip's themselves. $tooltip is used for other things // (such as the datepicker), so we need to be specific when canceling it. @@ -53,6 +53,7 @@ export function quayConfig( // Configure analytics. if (INJECTED_CONFIG && INJECTED_CONFIG.MIXPANEL_KEY) { + let $analyticsProvider: any = $injector.get('$analyticsProvider'); $analyticsProvider.virtualPageviews(true); }