Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Give the current theme to widgets and the integration manager #1669

Merged
rxl881 merged 3 commits into from
Dec 18, 2017
Merged

Give the current theme to widgets and the integration manager #1669

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94ef80c
Support sending the current theme to widgets
turt2live Dec 17, 2017
678d87e
Give the current theme to the integration manager
turt2live Dec 17, 2017
e5df0dc
$riot_theme -> $theme
turt2live Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ScalarAuthClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.
*/

import Promise from 'bluebird';
import SettingsStore from "./settings/SettingsStore";
const request = require('browser-request');

const SdkConfig = require('./SdkConfig');
Expand Down Expand Up @@ -109,6 +110,7 @@ class ScalarAuthClient {
let url = SdkConfig.get().integrations_ui_url;
url += "?scalar_token=" + encodeURIComponent(this.scalarToken);
url += "&room_id=" + encodeURIComponent(roomId);
url += "&theme=" + encodeURIComponent(SettingsStore.getValue("theme"));
if (id) {
url += '&integ_id=' + encodeURIComponent(id);
}
Expand Down
4 changes: 4 additions & 0 deletions src/components/views/rooms/AppsDrawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import ScalarAuthClient from '../../../ScalarAuthClient';
import ScalarMessaging from '../../../ScalarMessaging';
import { _t } from '../../../languageHandler';
import WidgetUtils from '../../../WidgetUtils';
import SettingsStore from "../../../settings/SettingsStore";

// The maximum number of widgets that can be added in a room
const MAX_WIDGETS = 2;
Expand Down Expand Up @@ -131,6 +132,9 @@ module.exports = React.createClass({
'$matrix_room_id': this.props.room.roomId,
'$matrix_display_name': user ? user.displayName : this.props.userId,
'$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',

// Namespaced for Riot
'$riot_theme': SettingsStore.getValue("theme"),
Copy link
Copy Markdown
Contributor

@rxl881 rxl881 Dec 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we please change '$riot_theme' to '$theme' -- See main thread comment.

Copy link
Copy Markdown
Member Author

@turt2live turt2live Dec 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The solution of namespacing themes makes a lot more sense. Should the variable instead be $matrix_theme or just change it to $theme?

Copy link
Copy Markdown
Member Author

@turt2live turt2live Dec 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After thinking about it for a bit, I decided not to because it's not related to matrix - it's related to the client only.

@rxl881 updated.

Copy link
Copy Markdown
Contributor

@rxl881 rxl881 Dec 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. Thanks!

};

app.id = appId;
Expand Down