mirror of
https://github.com/discourse/discourse.git
synced 2025-04-19 17:59:05 +08:00

* composer restyle, some input normalization * style adjustments: spacing, preview background, colors * small spacing adjustments, removing default iOS input appearance, fixing merge * small width adjustment * fixing mobile link modal for small devices * FIX: more resilient allowInitiatlValueMutation implementation * Build scrollMap only on scroll. * FIX: pick date and time was not reseting state * FIX: removes auto sizing and touchstart support for now * Revert "FIX: reflects discourse icons naming scheme s/d-icon-*/d-*" This reverts commit b5ed980235722ac5104e769a139bae1192710e52. * tweak icon-library generation * FIX: regression preventing to set number of hours before closing This commit also adds a full test suite for editing topic timer. * FIX: makes allowInitialValueMutation more restrictive * FIX: invite-list expects initial value mutation * fixing tag input spacing * minor input cleanup * bump onebox version * FIX: avoids test failing at some times of the day * FIX: various issues when editing category permissions This commit also adds multiple tests
541 lines
16 KiB
JavaScript
541 lines
16 KiB
JavaScript
import { on, observes } from "ember-addons/ember-computed-decorators";
|
|
import { findRawTemplate } from "discourse/lib/raw-templates";
|
|
import { emojiUrlFor } from "discourse/lib/text";
|
|
import KeyValueStore from "discourse/lib/key-value-store";
|
|
import { emojis } from "pretty-text/emoji/data";
|
|
import { extendedEmojiList, isSkinTonableEmoji } from "pretty-text/emoji";
|
|
|
|
const keyValueStore = new KeyValueStore("discourse_emojis_");
|
|
const EMOJI_USAGE = "emojiUsage";
|
|
const EMOJI_SELECTED_DIVERSITY = "emojiSelectedDiversity";
|
|
const PER_ROW = 11;
|
|
const customEmojis = _.map(_.keys(extendedEmojiList()), code => {
|
|
return { code, src: emojiUrlFor(code) };
|
|
});
|
|
|
|
export function resetCache() {
|
|
keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
|
|
keyValueStore.setObject({ key: EMOJI_SELECTED_DIVERSITY, value: 1 });
|
|
}
|
|
|
|
export default Ember.Component.extend({
|
|
automaticPositioning: true,
|
|
|
|
close() {
|
|
this._unbindEvents();
|
|
|
|
this.$picker
|
|
.css({width: "", left: "", bottom: "", display: "none"})
|
|
.empty();
|
|
|
|
this.$modal.removeClass("fadeIn");
|
|
|
|
clearTimeout(this._checkTimeout);
|
|
},
|
|
|
|
show() {
|
|
const template = findRawTemplate("emoji-picker")({customEmojis});
|
|
this.$picker.html(template);
|
|
|
|
this.$filter = this.$picker.find(".filter");
|
|
this.$results = this.$picker.find(".results");
|
|
this.$list = this.$picker.find(".list");
|
|
|
|
this.set("selectedDiversity", keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1);
|
|
this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
|
|
|
|
Ember.run.scheduleOnce("afterRender", this, function() {
|
|
this._bindEvents();
|
|
this._sectionLoadingCheck();
|
|
this._loadCategoriesEmojis();
|
|
this._positionPicker();
|
|
this._scrollTo();
|
|
this._updateSelectedDiversity();
|
|
});
|
|
},
|
|
|
|
@on("init")
|
|
_setInitialValues() {
|
|
this._checkTimeout = null;
|
|
this.scrollPosition = 0;
|
|
this.$visibleSections = [];
|
|
},
|
|
|
|
@on("willDestroyElement")
|
|
_unbindGlobalEvents() {
|
|
this.appEvents.off("emoji-picker:close");
|
|
},
|
|
|
|
@on("didInsertElement")
|
|
_setup() {
|
|
this.$picker = this.$(".emoji-picker");
|
|
this.$modal = this.$(".emoji-picker-modal");
|
|
|
|
this.appEvents.on("emoji-picker:close", () => this.set("active", false));
|
|
|
|
if (!keyValueStore.getObject(EMOJI_USAGE)) {
|
|
keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
|
|
} else if(_.isPlainObject(keyValueStore.getObject(EMOJI_USAGE))) {
|
|
// handle legacy format
|
|
keyValueStore.setObject({ key: EMOJI_USAGE, value: _.keys(keyValueStore.getObject(EMOJI_USAGE)) });
|
|
}
|
|
},
|
|
|
|
@on("didUpdateAttrs")
|
|
_setState() {
|
|
this.get("active") === true ? this.show() : this.close();
|
|
},
|
|
|
|
@observes("filter")
|
|
filterChanged() {
|
|
this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.get("filter")));
|
|
Ember.run.debounce(this, this._filterEmojisList, 250);
|
|
},
|
|
|
|
@observes("selectedDiversity")
|
|
selectedDiversityChanged() {
|
|
keyValueStore.setObject({key: EMOJI_SELECTED_DIVERSITY, value: this.get("selectedDiversity")});
|
|
|
|
$.each(this.$list.find(".emoji[data-loaded='1'].diversity"), (_, button) => {
|
|
$(button).css("background-image", "").removeAttr("data-loaded");
|
|
});
|
|
|
|
if(this.get("filter") !== "") {
|
|
$.each(this.$results.find(".emoji.diversity"), (_, button) => this._setButtonBackground(button, true) );
|
|
}
|
|
|
|
this._updateSelectedDiversity();
|
|
},
|
|
|
|
@observes("recentEmojis")
|
|
_recentEmojisChanged() {
|
|
const previousScrollTop = this.scrollPosition;
|
|
const $recentSection = this.$list.find(".section[data-section='recent']");
|
|
const $recentSectionGroup = $recentSection.find(".section-group");
|
|
const $recentCategory = this.$picker.find(".category-icon button[data-section='recent']").parent();
|
|
let persistScrollPosition = !$recentCategory.is(":visible") ? true : false;
|
|
|
|
// we set height to 0 to avoid it being taken into account for scroll position
|
|
if(_.isEmpty(this.get("recentEmojis"))) {
|
|
$recentCategory.hide();
|
|
$recentSection.css("height", 0).hide();
|
|
} else {
|
|
$recentCategory.show();
|
|
$recentSection.css("height", "auto").show();
|
|
}
|
|
|
|
const recentEmojis = _.map(this.get("recentEmojis"), code => {
|
|
return { code, src: emojiUrlFor(code) };
|
|
});
|
|
const template = findRawTemplate("emoji-picker-recent")({recentEmojis});
|
|
$recentSectionGroup.html(template);
|
|
|
|
if(persistScrollPosition) {
|
|
this.$list.scrollTop(previousScrollTop + $recentSection.outerHeight());
|
|
}
|
|
|
|
this._bindHover($recentSectionGroup);
|
|
},
|
|
|
|
_updateSelectedDiversity() {
|
|
const $diversityPicker = this.$picker.find(".diversity-picker");
|
|
|
|
$diversityPicker.find(".diversity-scale").removeClass("selected");
|
|
$diversityPicker
|
|
.find(`.diversity-scale[data-level="${this.get("selectedDiversity")}"]`)
|
|
.addClass("selected");
|
|
},
|
|
|
|
_sectionLoadingCheck() {
|
|
this._checkTimeout = setTimeout(() => { this._sectionLoadingCheck(); }, 500);
|
|
Ember.run.throttle(this, this._checkVisibleSection, 100);
|
|
},
|
|
|
|
_loadCategoriesEmojis() {
|
|
$.each(this.$picker.find(".categories-column button.emoji"), (_, button) => {
|
|
const $button = $(button);
|
|
const code = this._codeWithDiversity($button.data("tabicon"), false);
|
|
$button.css("background-image", `url("${emojiUrlFor(code)}")`);
|
|
});
|
|
},
|
|
|
|
_bindEvents() {
|
|
this._bindDiversityClick();
|
|
this._bindSectionsScroll();
|
|
this._bindEmojiClick(this.$list.find(".section-group"));
|
|
this._bindClearRecentEmojisGroup();
|
|
this._bindResizing();
|
|
this._bindCategoryClick();
|
|
this._bindModalClick();
|
|
this._bindFilterInput();
|
|
|
|
if(!this.site.isMobileDevice) {
|
|
this._bindHover();
|
|
}
|
|
},
|
|
|
|
_bindModalClick() {
|
|
this.$modal.on("click", () => this.set("active", false));
|
|
|
|
this.$(document).on("click.emoji-picker", (event) => {
|
|
const onPicker = $(event.target).parents(".emoji-picker").length === 1;
|
|
const onGrippie = event.target.className.indexOf("grippie") > -1;
|
|
if(!onPicker && !onGrippie) {
|
|
this.set("active", false);
|
|
return false;
|
|
}
|
|
});
|
|
},
|
|
|
|
@on("willDestroyElement")
|
|
_unbindEvents() {
|
|
this.$().off();
|
|
this.$(window).off("resize");
|
|
this.$modal.off("click");
|
|
$("#reply-control").off("div-resizing");
|
|
this.$(document).off("click.emoji-picker");
|
|
},
|
|
|
|
_filterEmojisList() {
|
|
if (this.get("filter") === "") {
|
|
this.$filter.find("input[name='filter']").val("");
|
|
this.$results.empty().hide();
|
|
this.$list.show();
|
|
} else {
|
|
const lowerCaseFilter = this.get("filter").toLowerCase();
|
|
const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
|
|
const filteredCodes = _.filter(filterableEmojis, code => {
|
|
return code.indexOf(lowerCaseFilter) > -1;
|
|
}).slice(0, 30);
|
|
this.$results.empty().html(
|
|
_.map(filteredCodes, (code) => {
|
|
const hasDiversity = isSkinTonableEmoji(code);
|
|
const diversity = hasDiversity ? "diversity" : "";
|
|
const scaledCode = this._codeWithDiversity(code, hasDiversity);
|
|
return `<button style="background-image: url('${emojiUrlFor(scaledCode)}')" type="button" class="emoji ${diversity}" tabindex="-1" title="${code}"></button>`;
|
|
})
|
|
).show();
|
|
this._bindHover(this.$results);
|
|
this._bindEmojiClick(this.$results);
|
|
this.$list.hide();
|
|
}
|
|
},
|
|
|
|
_bindFilterInput() {
|
|
const $input = this.$filter.find("input");
|
|
|
|
$input.on("input", (event) => {
|
|
this.set("filter", event.currentTarget.value);
|
|
});
|
|
|
|
this.$filter.find(".clear-filter").on("click", () => {
|
|
$input.val("").focus();
|
|
this.set("filter", "");
|
|
return false;
|
|
});
|
|
},
|
|
|
|
_bindCategoryClick() {
|
|
this.$picker.find(".category-icon").on("click", "button.emoji", (event) => {
|
|
this.set("filter", "");
|
|
this.$results.empty();
|
|
this.$list.show();
|
|
|
|
const section = $(event.currentTarget).data("section");
|
|
const $section = this.$list.find(`.section[data-section="${section}"]`);
|
|
const scrollTop = this.$list.scrollTop() + ($section.offset().top - this.$list.offset().top);
|
|
this._scrollTo(scrollTop);
|
|
return false;
|
|
});
|
|
},
|
|
|
|
_bindHover($hoverables) {
|
|
const replaceInfoContent = (html) => this.$picker.find(".footer .info").html(html || "");
|
|
|
|
($hoverables || this.$list.find(".section-group")).on({
|
|
mouseover: (event) => {
|
|
const code = this._codeForEmojiButton($(event.currentTarget));
|
|
const html = `<img src="${emojiUrlFor(code)}" class="emoji"> <span>:${code}:<span>`;
|
|
replaceInfoContent(html);
|
|
},
|
|
mouseleave: () => replaceInfoContent()
|
|
}, "button.emoji");
|
|
},
|
|
|
|
_bindResizing() {
|
|
this.$(window).on("resize", () => {
|
|
Ember.run.throttle(this, this._positionPicker, 16);
|
|
});
|
|
|
|
$("#reply-control").on("div-resizing", () => {
|
|
Ember.run.throttle(this, this._positionPicker, 16);
|
|
});
|
|
},
|
|
|
|
_bindClearRecentEmojisGroup() {
|
|
const $recent = this.$picker.find(".section[data-section='recent'] .clear-recent");
|
|
$recent.on("click", () => {
|
|
keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
|
|
this.set("recentEmojis", []);
|
|
this._scrollTo(0);
|
|
return false;
|
|
});
|
|
},
|
|
|
|
_bindEmojiClick($emojisContainer) {
|
|
const handler = (event) => {
|
|
const code = this._codeForEmojiButton($(event.currentTarget));
|
|
|
|
if($(event.currentTarget).parents(".section[data-section='recent']").length === 0) {
|
|
this._trackEmojiUsage(code);
|
|
}
|
|
|
|
this.sendAction("emojiSelected", code);
|
|
|
|
if(this.$modal.hasClass("fadeIn")) {
|
|
this.set("active", false);
|
|
}
|
|
|
|
return false;
|
|
};
|
|
|
|
if(this.site.isMobileDevice) {
|
|
const self = this;
|
|
|
|
$emojisContainer
|
|
.off("touchstart")
|
|
.on("touchstart", "button.emoji", (touchStartEvent) => {
|
|
const $this = $(touchStartEvent.currentTarget);
|
|
$this.on("touchend", (touchEndEvent) => {
|
|
handler.bind(self)(touchEndEvent);
|
|
$this.off("touchend");
|
|
});
|
|
$this.on("touchmove", () => $this.off("touchend") );
|
|
});
|
|
} else {
|
|
$emojisContainer.off("click").on("click", "button.emoji", e => handler.bind(this)(e) );
|
|
}
|
|
},
|
|
|
|
_bindSectionsScroll() {
|
|
this.$list.on("scroll", () => {
|
|
this.scrollPosition = this.$list.scrollTop();
|
|
Ember.run.throttle(this, this._checkVisibleSection, 150);
|
|
});
|
|
},
|
|
|
|
_checkVisibleSection() {
|
|
// make sure we stop loading if picker has been removed
|
|
if(!this.$picker) {
|
|
return;
|
|
}
|
|
|
|
const $sections = this.$list.find(".section");
|
|
const listHeight = this.$list.innerHeight();
|
|
let $selectedSection;
|
|
|
|
this.$visibleSections = _.filter($sections, section => {
|
|
const $section = $(section);
|
|
const sectionTop = $section.position().top;
|
|
return sectionTop + $section.height() > 0 && sectionTop < listHeight;
|
|
});
|
|
|
|
if (!_.isEmpty(this.get("recentEmojis")) && this.scrollPosition === 0) {
|
|
$selectedSection = $(_.first(this.$visibleSections));
|
|
} else {
|
|
$selectedSection = $(_.last(this.$visibleSections));
|
|
}
|
|
|
|
if($selectedSection) {
|
|
this.$picker.find(".category-icon").removeClass("current");
|
|
this.$picker.find(`.category-icon button[data-section='${$selectedSection.data("section")}']`)
|
|
.parent()
|
|
.addClass("current");
|
|
|
|
this._loadVisibleSections();
|
|
}
|
|
},
|
|
|
|
_loadVisibleSections() {
|
|
if(!this.$visibleSections) {
|
|
return;
|
|
}
|
|
|
|
const listHeight = this.$list.innerHeight();
|
|
this.$visibleSections.forEach(visibleSection => {
|
|
const $unloadedEmojis = $(visibleSection).find("button.emoji[data-loaded!='1']");
|
|
$.each($unloadedEmojis, (_, button) => {
|
|
const $button = $(button);
|
|
const buttonTop = $button.position().top;
|
|
const buttonHeight = $button.height();
|
|
|
|
if(buttonTop + buttonHeight > 0 && buttonTop - buttonHeight < listHeight) {
|
|
this._setButtonBackground($button);
|
|
}
|
|
});
|
|
});
|
|
},
|
|
|
|
_bindDiversityClick() {
|
|
const $diversityScales = this.$picker.find(".diversity-picker .diversity-scale");
|
|
$diversityScales.on("click", (event) => {
|
|
const $selectedDiversity = $(event.currentTarget);
|
|
this.set("selectedDiversity", parseInt($selectedDiversity.data("level")));
|
|
return false;
|
|
});
|
|
},
|
|
|
|
_isReplyControlExpanded() {
|
|
const verticalSpace = this.$(window).height() -
|
|
$(".d-header").height() -
|
|
$("#reply-control").height();
|
|
|
|
return verticalSpace < this.$picker.height() - 48;
|
|
},
|
|
|
|
_positionPicker(){
|
|
if(!this.get("active")) { return; }
|
|
|
|
let windowWidth = this.$(window).width();
|
|
|
|
const desktopModalePositioning = options => {
|
|
let attributes = {
|
|
width: Math.min(windowWidth, 400) - 12,
|
|
marginLeft: -(Math.min(windowWidth, 400)/2) + 6,
|
|
marginTop: -130,
|
|
left: "50%",
|
|
bottom: "",
|
|
top: "50%",
|
|
display: "flex"
|
|
};
|
|
|
|
this.$modal.addClass("fadeIn");
|
|
this.$picker.css(_.merge(attributes, options));
|
|
};
|
|
|
|
const mobilePositioning = options => {
|
|
let attributes = {
|
|
width: windowWidth - 12,
|
|
marginLeft: 5,
|
|
marginTop: -130,
|
|
left: 0,
|
|
bottom: "",
|
|
top: "50%",
|
|
display: "flex"
|
|
};
|
|
|
|
this.$modal.addClass("fadeIn");
|
|
this.$picker.css(_.merge(attributes, options));
|
|
};
|
|
|
|
const desktopPositioning = options => {
|
|
let attributes = {
|
|
width: windowWidth < 485 ? windowWidth - 12 : 400,
|
|
marginLeft: "",
|
|
marginTop: "",
|
|
right: "",
|
|
left: "",
|
|
bottom: 32,
|
|
top: "",
|
|
display:
|
|
"flex"
|
|
};
|
|
|
|
this.$modal.removeClass("fadeIn");
|
|
this.$picker.css(_.merge(attributes, options));
|
|
};
|
|
|
|
if(Ember.testing || this.get("automaticPositioning") === false) {
|
|
desktopPositioning();
|
|
return;
|
|
}
|
|
|
|
if(this.site.isMobileDevice) {
|
|
mobilePositioning();
|
|
} else {
|
|
if(this._isReplyControlExpanded()) {
|
|
let $editorWrapper = $(".d-editor-preview-wrapper");
|
|
if(($editorWrapper.is(":visible") && $editorWrapper.width() < 400) || windowWidth < 485) {
|
|
desktopModalePositioning();
|
|
} else {
|
|
if($editorWrapper.is(":visible")) {
|
|
let previewOffset = $(".d-editor-preview-wrapper").offset();
|
|
let replyControlOffset = $("#reply-control").offset();
|
|
let left = previewOffset.left - replyControlOffset.left;
|
|
desktopPositioning({left});
|
|
} else {
|
|
desktopPositioning({
|
|
right: ($("#reply-control").width() - $(".d-editor-container").width()) / 2
|
|
});
|
|
}
|
|
}
|
|
} else {
|
|
if(windowWidth < 485) {
|
|
desktopModalePositioning();
|
|
} else {
|
|
let previewInputOffset = $(".d-editor-input").offset();
|
|
let replyControlOffset = $("#reply-control").offset() || {left: 0};
|
|
let left = previewInputOffset.left;
|
|
desktopPositioning({left, bottom: $("#reply-control").height() - 45});
|
|
}
|
|
}
|
|
}
|
|
|
|
const infoMaxWidth = this.$picker.width() -
|
|
this.$picker.find(".categories-column").width() -
|
|
this.$picker.find(".diversity-picker").width() -
|
|
32;
|
|
this.$picker.find(".info").css("max-width", infoMaxWidth);
|
|
},
|
|
|
|
_codeWithDiversity(code, diversity) {
|
|
if(diversity && this.get("selectedDiversity") !== 1) {
|
|
return `${code}:t${this.get("selectedDiversity")}`;
|
|
} else {
|
|
return code;
|
|
}
|
|
},
|
|
|
|
_trackEmojiUsage(code) {
|
|
let recent = keyValueStore.getObject(EMOJI_USAGE) || [];
|
|
recent = recent.filter(r => r !== code);
|
|
recent.unshift(code);
|
|
recent.length = Math.min(recent.length, PER_ROW);
|
|
keyValueStore.setObject({ key: EMOJI_USAGE, value: recent });
|
|
this.set("recentEmojis", recent);
|
|
},
|
|
|
|
_scrollTo(y) {
|
|
const yPosition = _.isUndefined(y) ? this.scrollPosition : y;
|
|
|
|
this.$list.scrollTop(yPosition);
|
|
|
|
// if we don’t actually scroll we need to force it
|
|
if(yPosition === 0) {
|
|
this.$list.scroll();
|
|
}
|
|
},
|
|
|
|
_codeForEmojiButton($button) {
|
|
const title = $button.attr("title");
|
|
return this._codeWithDiversity(title, $button.hasClass("diversity"));
|
|
},
|
|
|
|
_setButtonBackground(button, diversity) {
|
|
const $button = $(button);
|
|
const code = this._codeWithDiversity(
|
|
$button.attr("title"),
|
|
diversity || $button.hasClass("diversity")
|
|
);
|
|
|
|
// force visual reloading if needed
|
|
if($button.css("background-image") !== "none") {
|
|
$button.css("background-image", "");
|
|
}
|
|
|
|
$button
|
|
.attr("data-loaded", 1)
|
|
.css("background-image", `url("${emojiUrlFor(code)}")`);
|
|
},
|
|
});
|