fomantic-ui 2.10.0-beta.4 → 2.10.0-beta.6

package/src/definitions/modules/search.js

@@ -461,10 +461,6 @@
                             settings.fullTextSearch = parameters.searchFullText;
                             module.error(settings.error.oldSearchSyntax, element);
                         }
-                        if (settings.ignoreDiacritics && !String.prototype.normalize) {
-                            settings.ignoreDiacritics = false;
-                            module.error(error.noNormalize, element);
-                        }
                     },
                     inputEvent: function () {
                         var
@@ -1140,7 +1136,7 @@
                             });
                         }
                         if (isFunction(template)) {
-                            html = template(response, fields, settings.preserveHTML);
+                            html = template(response, settings);
                         } else {
                             module.error(error.noTemplate, false);
                         }
@@ -1433,7 +1429,6 @@
             serverError: 'There was an issue querying the server.',
             maxResults: 'Results must be an array to use maxResults setting',
             method: 'The method you called is not defined.',
-            noNormalize: '"ignoreDiacritics" setting will be ignored. Browser does not support String().normalize(). You may consider including <https://cdn.jsdelivr.net/npm/unorm@1.4.1/lib/unorm.min.js> as a polyfill.',
         },
 
         metadata: {
@@ -1476,23 +1471,23 @@
         },
 
         templates: {
-            escape: function (string, preserveHTML) {
-                if (preserveHTML) {
+            escape: function (string, settings) {
+                if (settings !== undefined && settings.preserveHTML) {
                     return string;
                 }
                 var
-                    badChars     = /["'<>`]/g,
-                    shouldEscape = /["&'<>`]/,
+                    badChars     = /["'<>]/g,
+                    shouldEscape = /["&'<>]/,
                     escape       = {
                         '<': '&lt;',
                         '>': '&gt;',
                         '"': '&quot;',
-                        "'": '&#x27;',
-                        '`': '&#x60;',
+                        "'": '&apos;',
                     },
                     escapedChar  = function (chr) {
                         return escape[chr];
-                    };
+                    }
+                ;
                 if (shouldEscape.test(string)) {
                     string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
                     string = string.replace(badChars, escapedChar);
@@ -1519,10 +1514,11 @@
 
                 return html;
             },
-            category: function (response, fields, preserveHTML) {
+            category: function (response, settings) {
                 var
                     html = '',
-                    escape = $.fn.search.settings.templates.escape
+                    fields = settings.fields,
+                    escape = settings.templates.escape
                 ;
                 if (response[fields.categoryResults] !== undefined) {
                     // each category
@@ -1531,7 +1527,7 @@
                             html += '<div class="category">';
 
                             if (category[fields.categoryName] !== undefined) {
-                                html += '<div class="name">' + escape(category[fields.categoryName], preserveHTML) + '</div>';
+                                html += '<div class="name">' + escape(category[fields.categoryName], settings) + '</div>';
                             }
 
                             // each item inside category
@@ -1543,18 +1539,18 @@
                                 if (result[fields.image] !== undefined) {
                                     html += ''
                                         + '<div class="image">'
-                                        + ' <img src="' + result[fields.image].replace(/"/g, '') + (result[fields.alt] ? '" alt="' + result[fields.alt].replace(/"/g, '') : '') + '">'
+                                        + ' <img src="' + result[fields.image].replace(/"/g, '') + '"' + (result[fields.alt] ? ' alt="' + result[fields.alt].replace(/"/g, '') + '"' : '') + '>'
                                         + '</div>';
                                 }
                                 html += '<div class="content">';
                                 if (result[fields.price] !== undefined) {
-                                    html += '<div class="price">' + escape(result[fields.price], preserveHTML) + '</div>';
+                                    html += '<div class="price">' + escape(result[fields.price], settings) + '</div>';
                                 }
                                 if (result[fields.title] !== undefined) {
-                                    html += '<div class="title">' + escape(result[fields.title], preserveHTML) + '</div>';
+                                    html += '<div class="title">' + escape(result[fields.title], settings) + '</div>';
                                 }
                                 if (result[fields.description] !== undefined) {
-                                    html += '<div class="description">' + escape(result[fields.description], preserveHTML) + '</div>';
+                                    html += '<div class="description">' + escape(result[fields.description], settings) + '</div>';
                                 }
                                 html += ''
                                     + '</div>';
@@ -1569,11 +1565,11 @@
                         html += fields.actionURL === false
                             ? ''
                                 + '<div class="action">'
-                                + escape(response[fields.action][fields.actionText], preserveHTML)
+                                + escape(response[fields.action][fields.actionText], settings)
                                 + '</div>'
                             : ''
                                 + '<a href="' + response[fields.action][fields.actionURL].replace(/"/g, '') + '" class="action">'
-                                + escape(response[fields.action][fields.actionText], preserveHTML)
+                                + escape(response[fields.action][fields.actionText], settings)
                                 + '</a>';
                     }
 
@@ -1582,10 +1578,11 @@
 
                 return false;
             },
-            standard: function (response, fields, preserveHTML) {
+            standard: function (response, settings) {
                 var
                     html = '',
-                    escape = $.fn.search.settings.templates.escape
+                    fields = settings.fields,
+                    escape = settings.templates.escape
                 ;
                 if (response[fields.results] !== undefined) {
                     // each result
@@ -1596,18 +1593,18 @@
                         if (result[fields.image] !== undefined) {
                             html += ''
                                 + '<div class="image">'
-                                + ' <img src="' + result[fields.image].replace(/"/g, '') + (result[fields.alt] ? '" alt="' + result[fields.alt].replace(/"/g, '') : '') + '">'
+                                + ' <img src="' + result[fields.image].replace(/"/g, '') + '"' + (result[fields.alt] ? ' alt="' + result[fields.alt].replace(/"/g, '') + '"' : '') + '>'
                                 + '</div>';
                         }
                         html += '<div class="content">';
                         if (result[fields.price] !== undefined) {
-                            html += '<div class="price">' + escape(result[fields.price], preserveHTML) + '</div>';
+                            html += '<div class="price">' + escape(result[fields.price], settings) + '</div>';
                         }
                         if (result[fields.title] !== undefined) {
-                            html += '<div class="title">' + escape(result[fields.title], preserveHTML) + '</div>';
+                            html += '<div class="title">' + escape(result[fields.title], settings) + '</div>';
                         }
                         if (result[fields.description] !== undefined) {
-                            html += '<div class="description">' + escape(result[fields.description], preserveHTML) + '</div>';
+                            html += '<div class="description">' + escape(result[fields.description], settings) + '</div>';
                         }
                         html += ''
                             + '</div>';
@@ -1617,11 +1614,11 @@
                         html += fields.actionURL === false
                             ? ''
                                 + '<div class="action">'
-                                + escape(response[fields.action][fields.actionText], preserveHTML)
+                                + escape(response[fields.action][fields.actionText], settings)
                                 + '</div>'
                             : ''
                                 + '<a href="' + response[fields.action][fields.actionURL].replace(/"/g, '') + '" class="action">'
-                                + escape(response[fields.action][fields.actionText], preserveHTML)
+                                + escape(response[fields.action][fields.actionText], settings)
                                 + '</a>';
                     }
 

package/src/definitions/modules/toast.js

@@ -192,7 +192,7 @@
                                 $content.append($('<div/>', {
                                     class: className.title,
                                     id: titleId,
-                                    html: module.helpers.escape(settings.title, settings.preserveHTML),
+                                    html: module.helpers.escape(settings.title, settings),
                                 }));
                             }
                             var descId = '_' + module.get.id() + 'desc';
@@ -200,7 +200,7 @@
                             $content.append($('<div/>', {
                                 class: className.message,
                                 id: descId,
-                                html: module.helpers.escape(settings.message, settings.preserveHTML),
+                                html: module.helpers.escape(settings.message, settings),
                             }));
 
                             $toast
@@ -232,10 +232,10 @@
                                 $toast.find(selector.image).attr('src', settings.showImage).attr('alt', settings.alt || '');
                             }
                             if (settings.title !== '') {
-                                $toast.find(selector.title).html(module.helpers.escape(settings.title, settings.preserveHTML));
+                                $toast.find(selector.title).html(module.helpers.escape(settings.title, settings));
                             }
                             if (settings.message !== '') {
-                                $toast.find(selector.message).html(module.helpers.escape(settings.message, settings.preserveHTML));
+                                $toast.find(selector.message).html(module.helpers.escape(settings.message, settings));
                             }
                         }
                         if ($toast.hasClass(className.compact)) {
@@ -260,10 +260,10 @@
                                 var
                                     icon = el[fields.icon]
                                         ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '')
-                                            + ' class="' + module.helpers.deQuote(el[fields.icon]) + ' icon"></i>'
+                                            + ' class="' + module.helpers.escape(el[fields.icon]) + ' icon"></i>'
                                         : '',
-                                    text = module.helpers.escape(el[fields.text] || '', settings.preserveHTML),
-                                    cls = module.helpers.deQuote(el[fields.class] || ''),
+                                    text = module.helpers.escape(el[fields.text] || '', settings),
+                                    cls = module.helpers.escape(el[fields.class] || ''),
                                     click = el[fields.click] && isFunction(el[fields.click])
                                         ? el[fields.click]
                                         : function () {}
@@ -592,22 +592,18 @@
 
                         return result;
                     },
-                    deQuote: function (string) {
-                        return String(string).replace(/"/g, '');
-                    },
-                    escape: function (string, preserveHTML) {
-                        if (preserveHTML) {
+                    escape: function (string, settings) {
+                        if (settings !== undefined && settings.preserveHTML) {
                             return string;
                         }
                         var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
+                            badChars     = /["'<>]/g,
+                            shouldEscape = /["&'<>]/,
                             escape       = {
                                 '<': '&lt;',
                                 '>': '&gt;',
                                 '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
+                                "'": '&apos;',
                             },
                             escapedChar  = function (chr) {
                                 return escape[chr];
@@ -615,8 +611,7 @@
                         ;
                         if (shouldEscape.test(string)) {
                             string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
-
-                            return string.replace(badChars, escapedChar);
+                            string = string.replace(badChars, escapedChar);
                         }
 
                         return string;

package/tasks/config/defaults.js

@@ -19,7 +19,6 @@ module.exports = {
     // file paths
     files: {
         config: 'semantic.json',
-        site: 'src/site',
         theme: 'src/theme.config',
     },
 

package/tasks/config/project/install.js

@@ -255,7 +255,6 @@ module.exports = {
         config: 'semantic.json',
         overridesImport: 'src/overrides.less',
         lessImport: 'src/semantic.less',
-        site: 'src/site',
         themeConfig: 'src/theme.config',
         themeImport: 'src/theme.less',
     },
@@ -750,20 +749,18 @@ module.exports = {
         },
 
         /* Copy Install Folders */
-        wrench: {
+        copy: {
 
             // overwrite existing files update and install (default theme / definition)
             overwrite: {
-                forceDelete: true,
-                excludeHiddenUnix: true,
-                preserveFiles: false,
+                overwrite: true,
+                preserveTimestamps: true,
             },
 
             // only create files that don't exist (site theme update)
             merge: {
-                forceDelete: false,
-                excludeHiddenUnix: true,
-                preserveFiles: true,
+                overwrite: false,
+                preserveTimestamps: true,
             },
 
         },

package/tasks/install.js

@@ -27,7 +27,6 @@ const
     rename         = require('gulp-rename'),
     replace        = require('gulp-replace'),
     requireDotFile = require('require-dot-file'),
-    wrench         = require('wrench-sui'),
 
     // install config
     install        = require('./config/project/install'),
@@ -105,14 +104,14 @@ module.exports = function (callback) {
                 console.log('Updating Fomantic UI from ' + currentConfig.version + ' to ' + release.version);
 
                 console.info('Updating ui definitions...');
-                wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.overwrite);
+                fs.copySync(source.definitions, updatePaths.definition, settings.copy.overwrite);
 
                 console.info('Updating default theme...');
-                wrench.copyDirSyncRecursive(source.themes, updatePaths.theme, settings.wrench.merge);
-                wrench.copyDirSyncRecursive(source.defaultTheme, updatePaths.defaultTheme, settings.wrench.overwrite);
+                fs.copySync(source.themes, updatePaths.theme, settings.copy.merge);
+                fs.copySync(source.defaultTheme, updatePaths.defaultTheme, settings.copy.overwrite);
 
                 console.info('Updating tasks...');
-                wrench.copyDirSyncRecursive(source.tasks, updatePaths.tasks, settings.wrench.overwrite);
+                fs.copySync(source.tasks, updatePaths.tasks, settings.copy.overwrite);
 
                 console.info('Updating gulpfile.js');
                 gulp.src(source.userGulpFile)
@@ -132,7 +131,7 @@ module.exports = function (callback) {
                     .pipe(gulp.dest(updatePaths.overridesImport))
                 ;
                 console.info('Adding new site theme files...');
-                wrench.copyDirSyncRecursive(source.site, updatePaths.site, settings.wrench.merge);
+                fs.copySync(source.site, updatePaths.site, settings.copy.merge);
 
                 console.info('Updating version...');
 
@@ -295,14 +294,14 @@ module.exports = function (callback) {
             console.log('Installing to \u001B[92m' + answers.semanticRoot + '\u001B[0m');
 
             console.info('Copying UI definitions');
-            wrench.copyDirSyncRecursive(source.definitions, installPaths.definition, settings.wrench.overwrite);
+            fs.copySync(source.definitions, installPaths.definition, settings.copy.overwrite);
 
             console.info('Copying UI themes');
-            wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.merge);
-            wrench.copyDirSyncRecursive(source.defaultTheme, installPaths.defaultTheme, settings.wrench.overwrite);
+            fs.copySync(source.themes, installPaths.theme, settings.copy.merge);
+            fs.copySync(source.defaultTheme, installPaths.defaultTheme, settings.copy.overwrite);
 
             console.info('Copying gulp tasks');
-            wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.overwrite);
+            fs.copySync(source.tasks, installPaths.tasks, settings.copy.overwrite);
 
             // copy theme import
             console.info('Adding theme files');
@@ -337,7 +336,7 @@ module.exports = function (callback) {
         } else {
             console.info('Creating site theme folder', installPaths.site);
         }
-        wrench.copyDirSyncRecursive(source.site, installPaths.site, settings.wrench.merge);
+        fs.copySync(source.site, installPaths.site, settings.copy.merge);
 
         /* --------------
            Theme Config

package/types/fomantic-ui-dropdown.d.ts

@@ -500,6 +500,12 @@ declare namespace FomanticUI {
 
         // endregion
 
+        // region Template Settings
+
+        templates: Dropdown.TemplateSettings;
+
+        // endregion
+
         // region Callbacks
 
         /**
@@ -647,6 +653,7 @@ declare namespace FomanticUI {
     }
 
     namespace Dropdown {
+        type TemplateSettings = Partial<Pick<Settings.Templates, keyof Settings.Templates>>;
         type TransitionSettings = Partial<Pick<Settings.Transition, keyof Settings.Transition>>;
         type SelectorSettings = Partial<Pick<Settings.Selectors, keyof Settings.Selectors>>;
         type ClassNameSettings = Partial<Pick<Settings.ClassNames, keyof Settings.ClassNames>>;
@@ -658,6 +665,43 @@ declare namespace FomanticUI {
         type ErrorSettings = Partial<Pick<Settings.Errors, keyof Settings.Errors>>;
 
         namespace Settings {
+            interface Templates {
+                /**
+                 * @default function(string, settings)
+                 */
+                escape: (string: string, settings?: DropdownSettings) => string;
+
+                /**
+                 * generates dropdown from select values
+                 * @default function(message, type, header)
+                 */
+                dropdown: (select: {placeholder?: string, values: {[key: string]: string}}, settings: DropdownSettings) => string;
+
+                /**
+                 * generates just menu from select
+                 * @default function(response, settings)
+                 */
+                menu: (values: {[key: string]: string}, settings: DropdownSettings) => string;
+
+                /**
+                 * generates label for multiselect
+                 * @default function(response, settings)
+                 */
+                label: (value: string, text: string, settings: DropdownSettings) => string;
+
+                /**
+                 * generates messages like "No results"
+                 * @default function(response, settings)
+                 */
+                message: (message: string) => string;
+
+                /**
+                 * generates user addition to the selection menu
+                 * @default function(response, settings)
+                 */
+                addition: (choice: string) => string;
+            }
+
             interface Transition {
 
                 /**

package/types/fomantic-ui-embed.d.ts

@@ -314,7 +314,7 @@ declare namespace FomanticUI {
                 /**
                  * @default function
                  */
-                deQuote(string: string, encode: boolean): string;
+                escape(string: string): string;
 
                 /**
                  * @default function

package/types/fomantic-ui-search.d.ts

@@ -394,9 +394,9 @@ declare namespace FomanticUI {
         namespace Settings {
             interface Templates {
                 /**
-                 * @default function(string, preserveHTML)
+                 * @default function(string, settings)
                  */
-                escape: (string: string, preserveHTML?: boolean) => string;
+                escape: (string: string, settings?: SearchSettings) => string;
 
                 /**
                  * @default function(message, type, header)
@@ -404,14 +404,14 @@ declare namespace FomanticUI {
                 message: (message: string, type?: string, header?: string) => string;
 
                 /**
-                 * @default function(response, fields, preserveHTML)
+                 * @default function(response, settings)
                  */
-                category: (response: unknown, fields: {[key: string]: string}, preserveHTML?: boolean) => string;
+                category: (response: unknown, settings: SearchSettings) => string;
 
                 /**
-                 * @default function(response, fields, preserveHTML)
+                 * @default function(response, settings)
                  */
-                standard: (response: unknown, fields: {[key: string]: string}, preserveHTML?: boolean) => string;
+                standard: (response: unknown, settings: SearchSettings) => string;
             }
 
             interface Selectors {