Make a HACK to prevent circular dependencies with [$tgConfirm, $translate] 🙈 🙀

stable
David Barragán Merino 2015-04-20 16:36:43 +02:00
parent 32199d160f
commit 3767d68507
1 changed files with 20 additions and 16 deletions

View File

@ -199,23 +199,23 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
$httpProvider.interceptors.push('authHttpIntercept') $httpProvider.interceptors.push('authHttpIntercept')
# If there is an error in the version throw a notify error # If there is an error in the version throw a notify error.
versionCheckHttpIntercept = ($q, $confirm, $translate) -> # IMPROVEiMENT: Move this version error handler to USs, issues and tasks repository
versionErrorMsg = $translate.instant("ERROR.VERSION_ERROR") versionCheckHttpIntercept = ($q) ->
httpResponseError = (response) -> httpResponseError = (response) ->
if response.status == 400 && response.data.version if response.status == 400 && response.data.version
# HACK: to prevent circular dependencies with [$tgConfirm, $translate]
$injector = angular.element("body").injector()
$injector.invoke(["$tgConfirm", "$translate", ($confirm, $translate) =>
versionErrorMsg = $translate.instant("ERROR.VERSION_ERROR")
$confirm.notify("error", versionErrorMsg, null, 10000) $confirm.notify("error", versionErrorMsg, null, 10000)
])
return $q.reject(response) return $q.reject(response)
return $q.reject(response) return {responseError: httpResponseError}
return { $provide.factory("versionCheckHttpIntercept", ["$q", versionCheckHttpIntercept])
responseError: httpResponseError
}
$provide.factory("versionCheckHttpIntercept", ["$q", "$tgConfirm", "$translate", versionCheckHttpIntercept])
$httpProvider.interceptors.push('versionCheckHttpIntercept') $httpProvider.interceptors.push('versionCheckHttpIntercept')
@ -231,12 +231,16 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
$compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false) $compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false)
$translateProvider.useStaticFilesLoader({ $translateProvider
.useStaticFilesLoader({
prefix: '/locales/locale-', prefix: '/locales/locale-',
suffix: '.json' suffix: '.json'
}) })
.preferredLanguage(window.taigaConfig.defaultLanguage || 'en')
if not window.taigaConfig.debugInfo
$translateProvider.fallbackLanguage([window.taigaConfig.defaultLanguage || 'en'])
$translateProvider.preferredLanguage(window.taigaConfig.defaultLanguage || 'en')
init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) -> init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->
$log.debug("Initialize application") $log.debug("Initialize application")