Browse Source

Added: support custom Emoji categories #673

develop
pandao 6 years ago
parent
commit
c1a8672f89
  1. 6
      README.md
  2. 11
      editormd.amd.js
  3. 2
      editormd.amd.min.js
  4. 11
      editormd.js
  5. 2
      editormd.min.js
  6. 12
      examples/emoji.html
  7. 2
      lib/codemirror/modes.min.js
  8. 133
      plugins/emoji-dialog/emoji-dialog.js
  9. 11
      src/editormd.js

6
README.md

@ -205,6 +205,12 @@ Editor.md options and default values:
emoji : false, // :emoji: , Support Github emoji, Twitter Emoji (Twemoji);
// Support FontAwesome icon emoji :fa-xxx: > Using fontAwesome icon web fonts;
// Support Editor.md logo icon emoji :editormd-logo: :editormd-logo-1x: > 1~8x;
emojiCategories : [ // Custom Emoji categories
"github-emoji",
"twemoji",
"font-awesome",
"editormd-logo"
],
tex : false, // TeX(LaTeX), based on KaTeX
flowChart : false, // flowChart.js only support IE9+
sequenceDiagram : false, // sequenceDiagram.js only support IE9+

11
editormd.amd.js

@ -230,6 +230,13 @@
emoji : false, // :emoji: , Support Github emoji, Twitter Emoji (Twemoji);
// Support FontAwesome icon emoji :fa-xxx: > Using fontAwesome icon web fonts;
// Support Editor.md logo icon emoji :editormd-logo: :editormd-logo-1x: > 1~8x;
emojiCategories : [ // Custom Emoji categories
"github-emoji",
"twemoji",
"font-awesome",
"editormd-logo"
],
tex : false, // TeX(LaTeX), based on KaTeX
flowChart : false, // flowChart.js only support IE9+
sequenceDiagram : false, // sequenceDiagram.js only support IE9+
@ -436,6 +443,10 @@
settings.imageFormats = options.imageFormats;
}
if (options.emojiCategories) {
settings.emojiCategories = options.emojiCategories;
}
this.settings = settings;
id = (typeof id === "object") ? settings.id : id;

2
editormd.amd.min.js

File diff suppressed because one or more lines are too long

11
editormd.js

@ -160,6 +160,13 @@
emoji : false, // :emoji: , Support Github emoji, Twitter Emoji (Twemoji);
// Support FontAwesome icon emoji :fa-xxx: > Using fontAwesome icon web fonts;
// Support Editor.md logo icon emoji :editormd-logo: :editormd-logo-1x: > 1~8x;
emojiCategories : [ // Custom Emoji categories
"github-emoji",
"twemoji",
"font-awesome",
"editormd-logo"
],
tex : false, // TeX(LaTeX), based on KaTeX
flowChart : false, // flowChart.js only support IE9+
sequenceDiagram : false, // sequenceDiagram.js only support IE9+
@ -366,6 +373,10 @@
settings.imageFormats = options.imageFormats;
}
if (options.emojiCategories) {
settings.emojiCategories = options.emojiCategories;
}
this.settings = settings;
id = (typeof id === "object") ? settings.id : id;

2
editormd.min.js

File diff suppressed because one or more lines are too long

12
examples/emoji.html

@ -165,7 +165,7 @@ This is an H1 :editormd-logo-4x: @pandao
// You can custom Emoji's graphics files url path
editormd.emoji = {
path : "http://www.emoji-cheat-sheet.com/graphics/emojis/",
path : "https://www.webpagefx.com/tools/emoji-cheat-sheet/graphics/emojis/",
ext : ".png"
};
@ -178,12 +178,16 @@ This is an H1 :editormd-logo-4x: @pandao
testEditor = editormd("test-editormd", {
width : "90%",
height : 720,
toc : true,
toc : true,
emoji : true, // Support Github emoji, Twitter Emoji(Twemoji), fontAwesome, Editor.md logo emojis.
emoji : true, // Support Github emoji, Twitter Emoji(Twemoji), fontAwesome, Editor.md logo emojis.
// emojiCategories : ["github-emoji", "twemoji"], // Custom Emoji categories
// emojiCategories : ["twemoji"], // Custom Emoji categories
// emojiCategories : ["font-awesome"], // Custom Emoji categories
// emojiCategories : ["editormd-logo"], // Custom Emoji categories
taskList : true,
path : '../lib/'
path : '../lib/'
});
});
</script>

2
lib/codemirror/modes.min.js

File diff suppressed because one or more lines are too long

133
plugins/emoji-dialog/emoji-dialog.js

@ -70,10 +70,10 @@
var cm = this.cm;
var settings = _this.settings;
if (!settings.emoji)
{
if (!settings.emoji) {
alert("settings.emoji == false");
return ;
return false;
}
var path = settings.pluginPath + pluginName + "/";
@ -82,13 +82,21 @@
var selection = cm.getSelection();
var classPrefix = this.classPrefix;
$.extend(true, this.lang, langs[this.lang.name]);
$.extend(true, this.lang, langs[this.lang.name]);
this.setToolbar();
var lang = this.lang;
var dialogName = classPrefix + pluginName, dialog;
var dialogLang = lang.dialog.emoji;
var categoryNames = {
"github-emoji" : "Github emoji",
"twemoji" : "Twemoji",
"font-awesome" : "Font Awesome",
"editormd-logo" : "Editor.md logo"
};
var dialogContent = [
"<div class=\"" + classPrefix + "emoji-dialog-box\" style=\"width: 760px;height: 334px;margin-bottom: 8px;overflow: hidden;\">",
"<div class=\"" + classPrefix + "tab\"></div>",
@ -97,8 +105,7 @@
cm.focus();
if (editor.find("." + dialogName).length > 0)
{
if (editor.find("." + dialogName).length > 0) {
dialog = editor.find("." + dialogName);
selecteds = [];
@ -107,16 +114,15 @@
this.dialogShowMask(dialog);
this.dialogLockScreen();
dialog.show();
}
else
{
} else {
dialog = this.createDialog({
name : dialogName,
title : dialogLang.title,
title : dialogLang.title,
width : 800,
height : 475,
height : 480,
mask : settings.dialogShowMask,
drag : settings.dialogDraggable,
cached : true,
content : dialogContent,
lockScreen : settings.dialogLockScreen,
maskStyle : {
@ -128,31 +134,36 @@
cm.replaceSelection(selecteds.join(" "));
this.hide().lockScreen(false).hideMask();
this.remove();
return false;
}],
cancel : [lang.buttons.cancel, function() {
this.hide().lockScreen(false).hideMask();
this.remove();
return false;
}]
}
});
}
var category = ["Github emoji", "Twemoji", "Font awesome", "Editor.md logo"];
var tab = dialog.find("." + classPrefix + "tab");
var tab = dialog.find("." + classPrefix + "tab");
var tabTitles = [];
var emojiCategories = [];
if (settings.emojiCategories) {
$.each(settings.emojiCategories, function (key, value) {
emojiCategories.push(value);
if (tab.html() === "")
{
var head = "<ul class=\"" + classPrefix + "tab-head\">";
tabTitles.push(categoryNames[value]);
});
}
for (var i = 0; i<4; i++) {
if (tab.html() === "") {
var head = "<ul class=\"" + classPrefix + "tab-head\">";
var tabTotal = tabTitles.length;
for (var i = 0; i < tabTotal; i++) {
var active = (i === 0) ? " class=\"active\"" : "";
head += "<li" + active + "><a href=\"javascript:;\">" + category[i] + "</a></li>";
head += "<li" + active + "><a href=\"javascript:;\">" + tabTitles[i] + "</a></li>";
}
head += "</ul>";
@ -161,10 +172,10 @@
var container = "<div class=\"" + classPrefix + "tab-container\">";
for (var x = 0; x < 4; x++)
{
var display = (x === 0) ? "" : "display:none;";
container += "<div class=\"" + classPrefix + "tab-box\" style=\"height: 260px;overflow: hidden;overflow-y: auto;" + display + "\"></div>";
for (var x = 0; x < tabTotal; x++) {
var display = (x === 0) ? "" : "display:none;";
container += "<div class=\"" + classPrefix + "tab-box\" style=\"height: 320px;overflow: hidden;overflow-y: auto;" + display + "\"></div>";
}
container += "</div>";
@ -173,7 +184,6 @@
}
var tabBoxs = tab.find("." + classPrefix + "tab-box");
var emojiCategories = ["github-emoji", "twemoji", "font-awesome", logoPrefix];
var drawTable = function() {
var cname = emojiCategories[emojiTabIndex];
@ -181,7 +191,6 @@
var $tab = tabBoxs.eq(emojiTabIndex);
if ($tab.html() !== "") {
//console.log("break =>", cname);
return ;
}
@ -190,20 +199,16 @@
var pageTotal = Math.ceil(data.length / rowNumber);
var table = "<div class=\"" + classPrefix + "grid-table\">";
for (var i = 0; i < pageTotal; i++)
{
for (var i = 0; i < pageTotal; i++) {
var row = "<div class=\"" + classPrefix + "grid-table-row\">";
for (var x = 0; x < rowNumber; x++)
{
for (var x = 0; x < rowNumber; x++) {
var emoji = $.trim(data[(i * rowNumber) + x]);
if (typeof emoji !== "undefined" && emoji !== "")
{
if (typeof emoji !== "undefined" && emoji !== "") {
var img = "", icon = "";
if (type === "github-emoji")
{
if (type === "github-emoji") {
var src = (emoji === "+1") ? "plus1" : emoji;
src = (src === "black_large_square") ? "black_square" : src;
src = (src === "moon") ? "waxing_gibbous_moon" : src;
@ -211,32 +216,23 @@
src = exports.emoji.path + src + exports.emoji.ext;
img = "<img src=\"" + src + "\" width=\"24\" class=\"emoji\" title=\"&#58;" + emoji + "&#58;\" alt=\"&#58;" + emoji + "&#58;\" />";
row += "<a href=\"javascript:;\" value=\":" + emoji + ":\" title=\":" + emoji + ":\" class=\"" + classPrefix + "emoji-btn\">" + img + "</a>";
}
else if (type === "twemoji")
{
} else if (type === "twemoji") {
var twemojiSrc = exports.twemoji.path + emoji + exports.twemoji.ext;
img = "<img src=\"" + twemojiSrc + "\" width=\"24\" title=\"twemoji-" + emoji + "\" alt=\"twemoji-" + emoji + "\" class=\"emoji twemoji\" />";
row += "<a href=\"javascript:;\" value=\":tw-" + emoji + ":\" title=\":tw-" + emoji + ":\" class=\"" + classPrefix + "emoji-btn\">" + img + "</a>";
}
else if (type === "font-awesome")
{
} else if (type === "font-awesome") {
icon = "<i class=\"fa fa-" + emoji + " fa-emoji\" title=\"" + emoji + "\"></i>";
row += "<a href=\"javascript:;\" value=\":fa-" + emoji + ":\" title=\":fa-" + emoji + ":\" class=\"" + classPrefix + "emoji-btn\">" + icon + "</a>";
}
else if (type === "editormd-logo")
{
} else if (type === "editormd-logo") {
icon = "<i class=\"" + emoji + "\" title=\"Editor.md logo (" + emoji + ")\"></i>";
row += "<a href=\"javascript:;\" value=\":" + emoji + ":\" title=\":" + emoji + ":\" style=\"width:20%;\" class=\"" + classPrefix + "emoji-btn\">" + icon + "</a>";
}
}
else
{
} else {
row += "<a href=\"javascript:;\" value=\"\"></a>";
}
}
row += "</div>";
row += "</div>";
table += row;
}
@ -245,38 +241,31 @@
return table;
};
if (emojiTabIndex === 0)
{
for (var i = 0, len = $data.length; i < len; i++)
{
if (cname === "github-emoji") {
for (var i = 0, len = $data.length; i < len; i++) {
var h4Style = (i === 0) ? " style=\"margin: 0 0 10px;\"" : " style=\"margin: 10px 0;\"";
$tab.append("<h4" + h4Style + ">" + $data[i].category + "</h4>");
$tab.append(pagination($data[i].list, cname));
}
}
else
{
} else {
$tab.append(pagination($data, cname));
}
$tab.find("." + classPrefix + "emoji-btn").bind(exports.mouseOrTouch("click", "touchend"), function() {
$tab.find("." + classPrefix + "emoji-btn").bind("click", function() {
$(this).toggleClass("selected");
if ($(this).hasClass("selected"))
{
if ($(this).hasClass("selected")) {
selecteds.push($(this).attr("value"));
}
});
};
if (emojiData.length < 1)
{
if (emojiData.length < 1) {
if (typeof dialog.loading === "function") {
dialog.loading(true);
}
$.getJSON(path + "emoji.json?temp=" + Math.random(), function(json) {
if (typeof dialog.loading === "function") {
dialog.loading(false);
}
@ -285,13 +274,11 @@
emojiData[logoPrefix] = logos;
drawTable();
});
}
else
{
} else {
drawTable();
}
tab.find("li").bind(exports.mouseOrTouch("click", "touchend"), function() {
tab.find("li").bind("click", function() {
var $this = $(this);
emojiTabIndex = $this.index();
@ -300,16 +287,12 @@
drawTable();
});
};
};
// CommonJS/Node.js
if (typeof require === "function" && typeof exports === "object" && typeof module === "object")
{
if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
module.exports = factory;
}
else if (typeof define === "function") // AMD/CMD/Sea.js
{
} else if (typeof define === "function") { // AMD/CMD/Sea.js
if (define.amd) { // for Require.js
define(["editormd"], function(editormd) {
@ -322,9 +305,7 @@
factory(editormd);
});
}
}
else
{
} else {
factory(window.editormd);
}

11
src/editormd.js

@ -148,6 +148,13 @@
emoji : false, // :emoji: , Support Github emoji, Twitter Emoji (Twemoji);
// Support FontAwesome icon emoji :fa-xxx: > Using fontAwesome icon web fonts;
// Support Editor.md logo icon emoji :editormd-logo: :editormd-logo-1x: > 1~8x;
emojiCategories : [ // Custom Emoji categories
"github-emoji",
"twemoji",
"font-awesome",
"editormd-logo"
],
tex : false, // TeX(LaTeX), based on KaTeX
flowChart : false, // flowChart.js only support IE9+
sequenceDiagram : false, // sequenceDiagram.js only support IE9+
@ -354,6 +361,10 @@
settings.imageFormats = options.imageFormats;
}
if (options.emojiCategories) {
settings.emojiCategories = options.emojiCategories;
}
this.settings = settings;
id = (typeof id === "object") ? settings.id : id;

Loading…
Cancel
Save