fomantic-ui 2.10.0-beta.5 → 2.10.0-beta.7

package/src/definitions/modules/toast.js

@@ -192,7 +192,7 @@
                                 $content.append($('<div/>', {
                                     class: className.title,
                                     id: titleId,
-                                    html: module.helpers.escape(settings.title),
+                                    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),
+                                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));
+                                $toast.find(selector.title).html(module.helpers.escape(settings.title, settings));
                             }
                             if (settings.message !== '') {
-                                $toast.find(selector.message).html(module.helpers.escape(settings.message));
+                                $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] || ''),
-                                    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,34 +592,21 @@
 
                         return result;
                     },
-                    deQuote: function (string) {
-                        return String(string).replace(/"/g, '');
-                    },
-                    escape: function (string) {
-                        if (settings.preserveHTML) {
+                    escape: function (string, settings) {
+                        if (settings !== undefined && settings.preserveHTML) {
                             return string;
                         }
-                        var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
-                            escape       = {
-                                '<': '&lt;',
-                                '>': '&gt;',
-                                '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
-                            },
-                            escapedChar  = function (chr) {
-                                return escape[chr];
-                            }
-                        ;
-                        if (shouldEscape.test(string)) {
-                            string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
 
-                            return string.replace(badChars, escapedChar);
-                        }
+                        const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                        const escape = {
+                            '"': '&quot;',
+                            '&': '&amp;',
+                            "'": '&apos;',
+                            '<': '&lt;',
+                            '>': '&gt;',
+                        };
 
-                        return string;
+                        return string.replace(badChars, (chr) => escape[chr]);
                     },
                 },
 

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

@@ -666,15 +666,10 @@ declare namespace FomanticUI {
 
         namespace Settings {
             interface Templates {
-                /**
-                 * @default function(string, encode)
-                 */
-                deQuote: (string: string, encode?: boolean) => string;
-
                 /**
                  * @default function(string, settings)
                  */
-                escape: (string: string, settings: DropdownSettings) => string;
+                escape: (string: string, settings?: DropdownSettings) => string;
 
                 /**
                  * generates dropdown from select values

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

@@ -396,7 +396,7 @@ declare namespace FomanticUI {
                 /**
                  * @default function(string, settings)
                  */
-                escape: (string: string, settings: SearchSettings) => string;
+                escape: (string: string, settings?: SearchSettings) => string;
 
                 /**
                  * @default function(message, type, header)