Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct issue where no selected theme would force incorrect selection

This commit is contained in:
Sam 2017-04-12 13:00:25 -04:00
parent bbecc65737
commit d0fa8cda76
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/theme-selector.js.es6
View File

@ -2,7 +2,7 @@ import { ajax } from 'discourse/lib/ajax';
import { refreshCSS } from 'discourse/initializers/live-development';
const keySelector = 'meta[name=discourse_theme_key]';
function currentThemeKey() {
export function currentThemeKey() {
let themeKey = null;
let elem = _.first($(keySelector));
if (elem) {

3
app/assets/javascripts/discourse/routes/preferences.js.es6
View File

@ -1,6 +1,7 @@
import RestrictedUserRoute from "discourse/routes/restricted-user";
import showModal from 'discourse/lib/show-modal';
import { popupAjaxError } from 'discourse/lib/ajax-error';
import { currentThemeKey } from 'discourse/lib/theme-selector';
export default RestrictedUserRoute.extend({
model() {
@ -12,7 +13,7 @@ export default RestrictedUserRoute.extend({
controller.setProperties({
model: user,
newNameInput: user.get('name'),
selectedTheme: $.cookie('preview_style')
selectedTheme: $.cookie('preview_style') || currentThemeKey()
});
},