diff --git a/packages/rocketchat-mapview/client/mapview.coffee b/packages/rocketchat-mapview/client/mapview.coffee deleted file mode 100644 index d7d68179000e6..0000000000000 --- a/packages/rocketchat-mapview/client/mapview.coffee +++ /dev/null @@ -1,26 +0,0 @@ -### -# MapView is a named function that will replace geolocation in messages with a Google Static Map -# @param {Object} message - The message object -### - -class MapView - constructor: (message) -> - - # get MapView settings - mv_googlekey = RocketChat.settings.get 'MapView_GMapsAPIKey' - - if message.location - - # GeoJSON is reversed - ie. [lng, lat] - longitude = message.location.coordinates[0] - latitude = message.location.coordinates[1] - - # confirm we have an api key set, and generate the html required for the mapview - if mv_googlekey?.length - message.html = '' - else - message.html = ''+TAPi18n.__('Shared_Location')+'' - - return message - -RocketChat.callbacks.add 'renderMessage', MapView, RocketChat.callbacks.priority.HIGH diff --git a/packages/rocketchat-mapview/client/mapview.js b/packages/rocketchat-mapview/client/mapview.js new file mode 100644 index 0000000000000..fefce23a83878 --- /dev/null +++ b/packages/rocketchat-mapview/client/mapview.js @@ -0,0 +1,27 @@ +/* + * MapView is a named function that will replace geolocation in messages with a Google Static Map + * @param {Object} message - The message object + */ + +function MapView(message) { + + // get MapView settings + const mv_googlekey = RocketChat.settings.get('MapView_GMapsAPIKey'); + + if (message.location) { + + // GeoJSON is reversed - ie. [lng, lat] + const [longitude, latitude] = message.location.coordinates; + + // confirm we have an api key set, and generate the html required for the mapview + if (mv_googlekey && mv_googlekey.length) { + message.html = ``; + } else { + message.html = `${ TAPi18n.__('Shared_Location') }`; + } + } + + return message; +} + +RocketChat.callbacks.add('renderMessage', MapView, RocketChat.callbacks.priority.HIGH); diff --git a/packages/rocketchat-mapview/package.js b/packages/rocketchat-mapview/package.js index d91c587ee18f9..df453059cc5a0 100644 --- a/packages/rocketchat-mapview/package.js +++ b/packages/rocketchat-mapview/package.js @@ -7,12 +7,11 @@ Package.describe({ Package.onUse(function(api) { api.use([ 'ecmascript', - 'coffeescript', 'rocketchat:lib' ]); - api.addFiles('server/settings.coffee', 'server'); + api.addFiles('server/settings.js', 'server'); - api.addFiles('client/mapview.coffee', 'client'); + api.addFiles('client/mapview.js', 'client'); }); diff --git a/packages/rocketchat-mapview/server/settings.coffee b/packages/rocketchat-mapview/server/settings.coffee deleted file mode 100644 index eb7803afa27a4..0000000000000 --- a/packages/rocketchat-mapview/server/settings.coffee +++ /dev/null @@ -1,3 +0,0 @@ -Meteor.startup -> - RocketChat.settings.add 'MapView_Enabled', false, {type: 'boolean', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_Enabled', i18nDescription: 'MapView_Enabled_Description'} - RocketChat.settings.add 'MapView_GMapsAPIKey', '', {type: 'string', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_GMapsAPIKey', i18nDescription: 'MapView_GMapsAPIKey_Description'} \ No newline at end of file diff --git a/packages/rocketchat-mapview/server/settings.js b/packages/rocketchat-mapview/server/settings.js new file mode 100644 index 0000000000000..7b8c40521b87f --- /dev/null +++ b/packages/rocketchat-mapview/server/settings.js @@ -0,0 +1,4 @@ +Meteor.startup(function() { + RocketChat.settings.add('MapView_Enabled', false, {type: 'boolean', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_Enabled', i18nDescription: 'MapView_Enabled_Description'}); + return RocketChat.settings.add('MapView_GMapsAPIKey', '', {type: 'string', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_GMapsAPIKey', i18nDescription: 'MapView_GMapsAPIKey_Description'}); +});