commit bd2f316e2e75b288570fc40e9f3d3e8fbfaf3108
parent 481f253265f2b1accd2e7d24db4c6e312e1c2c0d
Author: markseu <mark2011@mayberg.se>
Date: Tue, 15 Nov 2022 22:32:51 +0100
Updated edit extension for emoji/icon
Diffstat:
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/system/extensions/edit-stack.svg b/system/extensions/edit-stack.svg
@@ -36,9 +36,9 @@
<g class="stack" id="table"><svg viewBox="0 0 16 16"><path fill="currentColor" d="M0 1v14h16v-14zM7.5 3v5h-6.5v-5zM8.5 8v-5h6.5v5zM1 9h6.5v5h-6.5zM8.5 14v-5h6.5v5z"></path></svg></g>
-<g class="stack" id="emojiawesome"><svg viewBox="0 0 16 16"><path fill="currentColor" d="M10.006 6c0-0.498 0.487-1.005 0.988-1.005 0.493 0 1.005 0.516 1.005 1.005s-0.521 0.998-1.005 0.988c-0.501-0.010-0.988-0.507-0.988-0.988zM8 16c4.418 0 8-3.582 8-8s-3.582-8-8-8c-4.418 0-8 3.582-8 8s3.582 8 8 8zM8 1.5c3.59 0 6.5 2.91 6.5 6.5s-2.91 6.5-6.5 6.5c-3.59 0-6.5-2.91-6.5-6.5s2.91-6.5 6.5-6.5zM12.5 8.966c-0.445 2.035-1.893 3.534-4.5 3.534s-3.987-1.433-4.5-3.536c4.022-0.028 4.969-0.013 9 0.002zM4 6c0-0.583 0.499-1 1-1 0.493 0 1 0.511 1 1s-0.516 1.009-1 1c-0.501-0.010-1-0.417-1-1z"></path></svg></g>
+<g class="stack" id="emoji"><svg viewBox="0 0 16 16"><path fill="currentColor" d="M10.006 6c0-0.498 0.487-1.005 0.988-1.005 0.493 0 1.005 0.516 1.005 1.005s-0.521 0.998-1.005 0.988c-0.501-0.010-0.988-0.507-0.988-0.988zM8 16c4.418 0 8-3.582 8-8s-3.582-8-8-8c-4.418 0-8 3.582-8 8s3.582 8 8 8zM8 1.5c3.59 0 6.5 2.91 6.5 6.5s-2.91 6.5-6.5 6.5c-3.59 0-6.5-2.91-6.5-6.5s2.91-6.5 6.5-6.5zM12.5 8.966c-0.445 2.035-1.893 3.534-4.5 3.534s-3.987-1.433-4.5-3.536c4.022-0.028 4.969-0.013 9 0.002zM4 6c0-0.583 0.499-1 1-1 0.493 0 1 0.511 1 1s-0.516 1.009-1 1c-0.501-0.010-1-0.417-1-1z"></path></svg></g>
-<g class="stack" id="fontawesome"><svg viewBox="0 0 16 16"><path fill="currentColor" d="M16 6.204l-5.528-0.803-2.472-5.009-2.472 5.009-5.528 0.803 4 3.899-0.944 5.505 4.944-2.599 4.944 2.599-0.944-5.505 4-3.899z"></path></svg></g>
+<g class="stack" id="icon"><svg viewBox="0 0 16 16"><path fill="currentColor" d="M16 6.204l-5.528-0.803-2.472-5.009-2.472 5.009-5.528 0.803 4 3.899-0.944 5.505 4.944-2.599 4.944 2.599-0.944-5.505 4-3.899z"></path></svg></g>
<g class="stack" id="status"><svg viewBox="0 0 16 16"><path fill="currentColor" d="M3.985 0.985l-1.984 0.016v13.999l1.984-0.016v-5.669c0.597-0.403 1.323-0.677 2.64-0.677 1.046 0 1.972 0.238 2.625 0.445v0c0.622 0.271 1.495 0.677 2.625 0.677s1.613-0.336 2.125-0.739v-6.999c-0.512 0.404-0.995 0.739-2.125 0.739s-2.047-0.439-2.625-0.677c-0.641-0.195-1.579-0.445-2.625-0.445-1.318 0-2.043 0.273-2.64 0.677z"></path></svg></g>
diff --git a/system/extensions/edit.css b/system/extensions/edit.css
@@ -423,26 +423,26 @@
font-size: 0.9em;
line-height: 1.8;
}
-#yellow-popup-emojiawesome {
+#yellow-popup-emoji {
padding: 10px;
width: 14em;
}
-#yellow-popup-emojiawesome a {
+#yellow-popup-emoji a {
padding: 0.2em;
}
-#yellow-popup-emojiawesome .yellow-dropdown li {
+#yellow-popup-emoji .yellow-dropdown li {
display: inline-block;
}
-#yellow-popup-fontawesome {
+#yellow-popup-icon {
padding: 10px;
width: 13em;
}
-#yellow-popup-fontawesome a {
+#yellow-popup-icon a {
padding: 0.18em 0.3em;
min-width: 1em;
text-align: center;
}
-#yellow-popup-fontawesome .yellow-dropdown li {
+#yellow-popup-icon .yellow-dropdown li {
display: inline-block;
}
@@ -556,13 +556,13 @@
-webkit-mask: url("edit-stack.svg#table");
mask: url("edit-stack.svg#table");
}
-.yellow-icon-emojiawesome {
- -webkit-mask: url("edit-stack.svg#emojiawesome");
- mask: url("edit-stack.svg#emojiawesome");
+.yellow-icon-emoji {
+ -webkit-mask: url("edit-stack.svg#emoji");
+ mask: url("edit-stack.svg#emoji");
}
-.yellow-icon-fontawesome {
- -webkit-mask: url("edit-stack.svg#fontawesome");
- mask: url("edit-stack.svg#fontawesome");
+.yellow-icon-icon {
+ -webkit-mask: url("edit-stack.svg#icon");
+ mask: url("edit-stack.svg#icon");
}
.yellow-icon-status {
-webkit-mask: url("edit-stack.svg#status");
diff --git a/system/extensions/edit.js b/system/extensions/edit.js
@@ -740,10 +740,10 @@ yellow.edit = {
"<li><a href=\"#\" id=\"yellow-popup-list-tl\" data-action=\"toolbar\" data-status=\"tl\">"+this.getText("ToolbarTl")+"</a></li>"+
"</ul>";
break;
- case "yellow-popup-emojiawesome":
+ case "yellow-popup-emoji":
var rawDataEmojis = "";
- if (yellow.system.emojiawesomeToolbarButtons && yellow.system.emojiawesomeToolbarButtons!="none") {
- var tokens = yellow.system.emojiawesomeToolbarButtons.split(" ");
+ if (yellow.system.emojiToolbarButtons && yellow.system.emojiToolbarButtons!="none") {
+ var tokens = yellow.system.emojiToolbarButtons.split(" ");
for (var i=0; i<tokens.length; i++) {
var token = tokens[i].replace(/[\:]/g,"");
var className = token.replace("+1", "plus1").replace("-1", "minus1").replace(/_/g, "-");
@@ -752,10 +752,10 @@ yellow.edit = {
}
elementDiv.innerHTML = "<ul class=\"yellow-dropdown yellow-dropdown-menu\">"+rawDataEmojis+"</ul>";
break;
- case "yellow-popup-fontawesome":
+ case "yellow-popup-icon":
var rawDataIcons = "";
- if (yellow.system.fontawesomeToolbarButtons && yellow.system.fontawesomeToolbarButtons!="none") {
- var tokens = yellow.system.fontawesomeToolbarButtons.split(" ");
+ if (yellow.system.iconToolbarButtons && yellow.system.iconToolbarButtons!="none") {
+ var tokens = yellow.system.iconToolbarButtons.split(" ");
for (var i=0; i<tokens.length; i++) {
var token = tokens[i].replace(/[\:]/g,"");
rawDataIcons += "<li><a href=\"#\" id=\"yellow-popup-list-"+yellow.toolbox.encodeHtml(token)+"\" data-action=\"toolbar\" data-status=\"text\" data-arguments=\":"+yellow.toolbox.encodeHtml(token)+":\"><i class=\"fa "+yellow.toolbox.encodeHtml(token)+"\"></i></a></li>";
@@ -1024,7 +1024,7 @@ yellow.edit = {
// Check if element is expandable
isExpandable: function(name) {
- return (name=="format" || name=="heading" || name=="list" || name=="emojiawesome" || name=="fontawesome");
+ return (name=="format" || name=="heading" || name=="list" || name=="emoji" || name=="icon");
},
// Check if extension exists
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -2,7 +2,7 @@
// Edit extension, https://github.com/annaesvensson/yellow-edit
class YellowEdit {
- const VERSION = "0.8.69";
+ const VERSION = "0.8.70";
public $yellow; // access to API
public $response; // web response
public $merge; // text merge
@@ -1256,8 +1256,8 @@ class YellowEditResponse {
$data["editKeyboardShortcuts"] = $this->yellow->system->get("editKeyboardShortcuts");
$data["editToolbarButtons"] = $this->getToolbarButtons();
$data["editStatusValues"] = $this->getStatusValues();
- $data["emojiawesomeToolbarButtons"] = $this->yellow->system->get("emojiawesomeToolbarButtons");
- $data["fontawesomeToolbarButtons"] = $this->yellow->system->get("fontawesomeToolbarButtons");
+ $data["emojiToolbarButtons"] = $this->yellow->system->get("emojiToolbarButtons");
+ $data["iconToolbarButtons"] = $this->yellow->system->get("iconToolbarButtons");
if ($this->isUserAccess("configure")) {
$data["sitename"] = $this->yellow->system->get("sitename");
$data["author"] = $this->yellow->system->get("author");
@@ -1316,8 +1316,8 @@ class YellowEditResponse {
$toolbarButtons = $this->yellow->system->get("editToolbarButtons");
if ($toolbarButtons=="auto") {
$toolbarButtons = "format, bold, italic, strikethrough, code, separator, list, link, file";
- if ($this->yellow->extension->isExisting("emojiawesome")) $toolbarButtons .= ", emojiawesome";
- if ($this->yellow->extension->isExisting("fontawesome")) $toolbarButtons .= ", fontawesome";
+ if ($this->yellow->extension->isExisting("emoji")) $toolbarButtons .= ", emoji";
+ if ($this->yellow->extension->isExisting("icon")) $toolbarButtons .= ", icon";
$toolbarButtons .= ", status, preview";
}
return $toolbarButtons;
diff --git a/system/extensions/install-language.bin b/system/extensions/install-language.bin
Binary files differ.
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -27,11 +27,11 @@ system/layouts/navigation.html: navigation.html, create, update, careful
system/layouts/pagination.html: pagination.html, create, update, careful
Extension: Edit
-Version: 0.8.69
+Version: 0.8.70
Description: Edit your website in a web browser.
DocumentationUrl: https://github.com/annaesvensson/yellow-edit
DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/main/downloads/edit.zip
-Published: 2022-11-10 14:21:05
+Published: 2022-11-15 22:04:16
Developer: Anna Svensson
Tag: feature
system/extensions/edit.php: edit.php, create, update
