github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:55:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feedback (see commit description for details)

Browse Source 
* fill blank space when no theme is selected
* animate row's height in themes/components list when selecting, and hide children list
* show warning when you move to a different page and have unsaved changes
* refactor `adminCustomizeThemes.show` controller
* allow collapsing/expanding children lists
* fix a bug when adding components to a theme (changed the way it works slightly)
* a bunch of other minor things
This commit is contained in:
OsamaSayegh
2018-09-06 21:56:00 +03:00
committed by Sam
parent a4f057a589
commit ca28548762
15 changed files with 372 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/assets/javascripts/admin/components/themes-list.js.es6
View File

@ -1,7 +1,7 @@
import { THEMES, COMPONENTS } from "admin/models/theme";
import { default as computed } from "ember-addons/ember-computed-decorators";
const NUM_ENTRIES = 8;
const MAX_LIST_HEIGHT = 700;
export default Ember.Component.extend({
THEMES: THEMES,
@ -63,15 +63,24 @@ export default Ember.Component.extend({
},
didRender() {
let height = -1;
this.$(".themes-list-item")
.slice(0, NUM_ENTRIES)
.each(function() {
height += $(this).outerHeight();
});
if (height >= 485 && height <= 800) {
this.$(".themes-list-container").css("max-height", `${height}px`);
this._super(...arguments);
// hide scrollbar
const $container = this.$(".themes-list-container");
const containerNode = $container[0];
if (containerNode) {
const width = containerNode.offsetWidth - containerNode.clientWidth;
$container.css("width", `calc(100% + ${width}px)`);
}
let height = -1;
Array.from(this.$(".themes-list-item")).forEach(node => {
const nodeHeight = $(node).outerHeight();
if (height + nodeHeight <= MAX_LIST_HEIGHT) {
height += nodeHeight;
}
});
$container.css("max-height", `${height}px`);
},
actions: {
@ -79,6 +88,11 @@ export default Ember.Component.extend({
if (newTab !== this.get("currentTab")) {
this.set("currentTab", newTab);
}
},
navigateToTheme(theme) {
Em.getOwner(this)
.lookup("router:main")
.transitionTo("adminCustomizeThemes.show", theme);
}
}
});