LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix redirection URLs in JavaScript

pull/91/head
Francis Lachapelle 2014-08-11 10:10:25 -04:00
parent 54103124e8
commit af5489bf57
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/WebServerResources/js/Common/SOGoAuthentication.js
View File

@ -79,10 +79,14 @@
} else {
newAddress = baseAddress;
}
if (/theme=mobile/.test(window.location.search)) {
return baseAddress + '/Contacts' + '?theme=mobile';
newAddress = baseAddress + '/Contacts' + '?theme=mobile';
}
return newAddress.replace(/(Calendar|Mail)/, 'Contacts');
else {
newAddress = baseAddress + '/Contacts';
}
return newAddress;
};

2
UI/WebServerResources/js/ContactsUI.js
View File

@ -9,7 +9,7 @@
angular.module('SOGo.Contacts', ['ngSanitize', 'ui.router', 'mm.foundation', 'mm.foundation.offcanvas', 'SOGo.Common'])
.constant('sgSettings', {
'baseURL': '/SOGo/so/francis/Contacts'
'baseURL': ApplicationBaseURL
})
.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {

2
UI/WebServerResources/js/mobile/ContactsUI.js
View File

@ -9,7 +9,7 @@
angular.module('SOGo.Contacts', ['ionic', 'SOGo.Common', 'SOGo.Contacts'])
.constant('sgSettings', {
'baseURL': '/SOGo/so/francis/Contacts'
'baseURL': ApplicationBaseURL
})
.run(function($ionicPlatform) {

8
UI/WebServerResources/js/mobile/SOGoRootPage.js
View File

@ -7,7 +7,7 @@
angular.module('SOGo.RootPage', ['SOGo.Authentication', 'SOGo.UIMobile', 'ionic'])
.constant('sgSettings', {
'baseURL': '/SOGo/so/francis/'
'baseURL': ApplicationBaseURL
})
.run(function($ionicPlatform) {
@ -48,9 +48,9 @@
$urlRouterProvider.otherwise('/app/login');
})
.controller('AppCtrl', function($scope) {
$scope.ApplicationBaseURL = ApplicationBaseURL;
})
.controller('AppCtrl', ['$scope', 'sgSettings', function(Settings, $scope) {
$scope.ApplicationBaseURL = Settings.baseURL;
}])
.controller('LoginCtrl', ['$scope', 'Authentication', 'sgDialog', function($scope, Authentication, Dialog) {
$scope.creds = { 'username': null, 'password': null };