diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 19:29:41 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 19:29:41 +0500 |
commit | 5f2aa88a083f92d263e8f2a57253595071c4b904 (patch) | |
tree | cff481ab565b20289169c0effa49f657063f7af8 /web/react/utils | |
parent | ac8706b9f742ce2935e6e9785ecd7ae7358fef0f (diff) | |
parent | 54265271fa16c624570ff89a26ae8596cf0fafc7 (diff) | |
download | chat-5f2aa88a083f92d263e8f2a57253595071c4b904.tar.gz chat-5f2aa88a083f92d263e8f2a57253595071c4b904.tar.bz2 chat-5f2aa88a083f92d263e8f2a57253595071c4b904.zip |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1762
Diffstat (limited to 'web/react/utils')
-rw-r--r-- | web/react/utils/client.jsx | 4 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 1c31dc5ed..b8eda0075 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -341,13 +341,13 @@ module.exports.updateTeamDisplayName = function(data, success, error) { module.exports.track('api', 'api_teams_update_name'); }; -module.exports.signupTeam = function(email, display_name, success, error) { +module.exports.signupTeam = function(email, success, error) { $.ajax({ url: "/api/v1/teams/signup", dataType: 'json', contentType: 'application/json', type: 'POST', - data: JSON.stringify({email: email, display_name: display_name}), + data: JSON.stringify({email: email}), success: success, error: function(xhr, status, err) { e = handleError("singupTeam", xhr, status, err); diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index fbf1e0d4f..8a4d92b85 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -22,8 +22,6 @@ module.exports.cleanUpUrlable = function(input) { return cleaned; }; - - module.exports.isTestDomain = function() { if ((/^localhost/).test(window.location.hostname)) @@ -841,3 +839,12 @@ module.exports.getDisplayName = function(user) { } } }; + +//IE10 does not set window.location.origin automatically so this must be called instead when using it +module.exports.getWindowLocationOrigin = function() { + var windowLocationOrigin = window.location.origin; + if (!windowLocationOrigin) { + windowLocationOrigin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: ''); + } + return windowLocationOrigin; +}; |