OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-05-10 17:12:49 +00:00
parent 1f23809c99 2cde2a2a0a
commit 3f427a2603
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/FromWidgetPostMessageApi.js
View File

@ -137,12 +137,15 @@ export default class FromWidgetPostMessageApi {
}); });
} else if (action === 'm.sticker') { } else if (action === 'm.sticker') {
// console.warn('Got sticker message from widget', widgetId); // console.warn('Got sticker message from widget', widgetId);
dis.dispatch({action: 'm.sticker', data: event.data.widgetData, widgetId: event.data.widgetId}); // NOTE -- The widgetData field is deprecated (in favour of the 'data' field) and will be removed eventually
const data = event.data.data || event.data.widgetData;
dis.dispatch({action: 'm.sticker', data: data, widgetId: event.data.widgetId});
} else if (action === 'integration_manager_open') { } else if (action === 'integration_manager_open') {
// Close the stickerpicker // Close the stickerpicker
dis.dispatch({action: 'stickerpicker_close'}); dis.dispatch({action: 'stickerpicker_close'});
// Open the integration manager // Open the integration manager
const data = event.data.widgetData; // NOTE -- The widgetData field is deprecated (in favour of the 'data' field) and will be removed eventually
const data = event.data.data || event.data.widgetData;
const integType = (data && data.integType) ? data.integType : null; const integType = (data && data.integType) ? data.integType : null;
const integId = (data && data.integId) ? data.integId : null; const integId = (data && data.integId) ? data.integId : null;
IntegrationManager.open(integType, integId); IntegrationManager.open(integType, integId);