diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
| commit | 7e418714bce067172e527359f391943459b3bd48 (patch) | |
| tree | fb06d542eddb5ce8d63fce27bfe87f6c9c63adbb /web/react/utils/utils.jsx | |
| parent | 9828d84f01147ffb87b372d20681f91325ecfcf0 (diff) | |
| parent | 4e3896d7b1911b8c184dee3c650461f0d3c0acea (diff) | |
| download | chat-7e418714bce067172e527359f391943459b3bd48.tar.gz chat-7e418714bce067172e527359f391943459b3bd48.tar.bz2 chat-7e418714bce067172e527359f391943459b3bd48.zip | |
Merge pull request #687 from mattermost/PLT-93
PLT-93 Cleaning up client side configs
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index c2307f5e9..032cf4ff4 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -9,7 +9,6 @@ var ActionTypes = Constants.ActionTypes; var AsyncClient = require('./async_client.jsx'); var client = require('./client.jsx'); var Autolinker = require('autolinker'); -import {config} from '../utils/config.js'; export function isEmail(email) { var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/; @@ -295,12 +294,12 @@ function getYoutubeEmbed(link) { $('.post-list-holder-by-time').scrollTop($('.post-list-holder-by-time')[0].scrollHeight); } - if (config.GoogleDeveloperKey) { + if (global.window.config.GoogleDeveloperKey) { $.ajax({ async: true, url: 'https://www.googleapis.com/youtube/v3/videos', type: 'GET', - data: {part: 'snippet', id: youtubeId, key: config.GoogleDeveloperKey}, + data: {part: 'snippet', id: youtubeId, key: global.window.config.GoogleDeveloperKey}, success: success }); } |