Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 15:23:44 -05:00
commit 9429a0b1d1

View file

@ -9,8 +9,16 @@ module.run [
] ]
module.config [ module.config [
'$locationProvider', '$stateProvider', '$dialogProvider', 'AngularyticsProvider' '$locationProvider', '$stateProvider', '$dialogProvider', 'AngularyticsProvider', '$httpProvider'
(location, state, $dialogProvider, analytics) -> (location, state, $dialogProvider, analytics, $httpProvider) ->
$httpProvider.interceptors.push [
->
request: (config) ->
return config if !(/^\/?templates\//.test config.url)
config.url += '?' + Math.ceil(Math.random() * 1000000)
return config
]
analytics.setEventHandlers ['Google'] analytics.setEventHandlers ['Google']