Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #530 from mailpoet/fix_safari_es6_bug

Browse Source 
removed ES6 syntax from non converted JS file - fixes #529 (Safari bug)
This commit is contained in:
Tautvidas Sipavičius
2016-06-22 14:29:57 +03:00
committed by GitHub
parent 36c32db2d1 fd12bd557e
commit 9652f75028
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/src/date.js
View File

@ -68,7 +68,7 @@ define('date',
}); });
}, },
convertFormat: function(format) { convertFormat: function(format) {
const format_mappings = { var format_mappings = {
date: { date: {
D: 'ddd', D: 'ddd',
l: 'dddd', l: 'dddd',
@ -124,9 +124,9 @@ define('date',
if (!format || format.length <= 0) return format; if (!format || format.length <= 0) return format;
const replacements = format_mappings['date']; var replacements = format_mappings['date'];
let outputFormat = ''; var outputFormat = '';
Object.keys(replacements).forEach(function(key) { Object.keys(replacements).forEach(function(key) {
if (format.indexOf(key) !== -1) { if (format.indexOf(key) !== -1) {

6
views/index.html
View File

@ -2,5 +2,9 @@
<% block content %> <% block content %>
<h1><%= 'Welcome!' %></h1> <h1><%= 'Welcome!' %></h1>
<p><%= __(' %sSetup%s MailPoet and start sending.') | format('<a href="/wp-admin/admin.php?page=mailpoet-settings">', '</a>') | raw %></p> <p><%= __(' %sSetup%s MailPoet and start sending.')
| format('<a href="%s">', '</a>')
| format(admin_url('admin.php?page=mailpoet-settings'))
| raw
%></p>
<% endblock %> <% endblock %>