fomantic-ui 2.9.0-beta.300 → 2.9.0-beta.303

package/.all-contributorsrc

@@ -80,7 +80,10 @@
         "example",
         "ideas",
         "infra",
-        "review"
+        "review",
+        "a11y",
+        "security",
+        "maintenance"
       ]
     },
     {
@@ -618,6 +621,25 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "xamey",
+      "name": "xamey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34269296?v=4",
+      "profile": "https://github.com/xamey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Inselhopper",
+      "name": "Ingrid Bluoss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5477907?v=4",
+      "profile": "http://www.ingrid-bluoss.de",
+      "contributions": [
+        "code",
+        "a11y"
+      ]
     }
   ],
   "contributorsPerLine": 4,

package/CONTRIBUTORS.md

@@ -10,7 +10,7 @@ This is a list of all project contributors powered by [All Contributors](https:/
     <td align="center"><a href="https://github.com/hammy2899"><img src="https://avatars2.githubusercontent.com/u/11588822?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sean</b></sub></a><br /><a href="#question-hammy2899" title="Answering Questions">💬</a> <a href="https://github.com/fomantic/Fomantic-UI/issues?q=author%3Ahammy2899" title="Bug reports">🐛</a> <a href="#blog-hammy2899" title="Blogposts">📝</a> <a href="#business-hammy2899" title="Business development">💼</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=hammy2899" title="Code">💻</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=hammy2899" title="Documentation">📖</a> <a href="#design-hammy2899" title="Design">🎨</a> <a href="#example-hammy2899" title="Examples">💡</a> <a href="#ideas-hammy2899" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-hammy2899" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-hammy2899" title="Maintenance">🚧</a> <a href="#platform-hammy2899" title="Packaging/porting to new platform">📦</a> <a href="#projectManagement-hammy2899" title="Project Management">📆</a> <a href="https://github.com/fomantic/Fomantic-UI/pulls?q=is%3Apr+reviewed-by%3Ahammy2899" title="Reviewed Pull Requests">👀</a> <a href="#security-hammy2899" title="Security">🛡️</a> <a href="#tool-hammy2899" title="Tools">🔧</a> <a href="#tutorial-hammy2899" title="Tutorials">✅</a> <a href="#talk-hammy2899" title="Talks">📢</a></td>
     <td align="center"><a href="https://github.com/prudho"><img src="https://avatars0.githubusercontent.com/u/7557689?v=4?s=60" width="60px;" alt=""/><br /><sub><b>prudho</b></sub></a><br /><a href="#question-prudho" title="Answering Questions">💬</a> <a href="https://github.com/fomantic/Fomantic-UI/issues?q=author%3Aprudho" title="Bug reports">🐛</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=prudho" title="Code">💻</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=prudho" title="Documentation">📖</a> <a href="#example-prudho" title="Examples">💡</a> <a href="#ideas-prudho" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-prudho" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/fomantic/Fomantic-UI/pulls?q=is%3Apr+reviewed-by%3Aprudho" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/ColinFrick"><img src="https://avatars1.githubusercontent.com/u/5517677?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Colin Frick</b></sub></a><br /><a href="#question-ColinFrick" title="Answering Questions">💬</a> <a href="https://github.com/fomantic/Fomantic-UI/issues?q=author%3AColinFrick" title="Bug reports">🐛</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=ColinFrick" title="Code">💻</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=ColinFrick" title="Documentation">📖</a> <a href="#example-ColinFrick" title="Examples">💡</a> <a href="#ideas-ColinFrick" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-ColinFrick" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/fomantic/Fomantic-UI/pulls?q=is%3Apr+reviewed-by%3AColinFrick" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://rasterbuster.lubber.de"><img src="https://avatars1.githubusercontent.com/u/18379884?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Marco 'Lubber' Wienkoop</b></sub></a><br /><a href="#question-lubber-de" title="Answering Questions">💬</a> <a href="https://github.com/fomantic/Fomantic-UI/issues?q=author%3Alubber-de" title="Bug reports">🐛</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=lubber-de" title="Code">💻</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=lubber-de" title="Documentation">📖</a> <a href="#example-lubber-de" title="Examples">💡</a> <a href="#ideas-lubber-de" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-lubber-de" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/fomantic/Fomantic-UI/pulls?q=is%3Apr+reviewed-by%3Alubber-de" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://rasterbuster.lubber.de"><img src="https://avatars1.githubusercontent.com/u/18379884?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Marco 'Lubber' Wienkoop</b></sub></a><br /><a href="#question-lubber-de" title="Answering Questions">💬</a> <a href="https://github.com/fomantic/Fomantic-UI/issues?q=author%3Alubber-de" title="Bug reports">🐛</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=lubber-de" title="Code">💻</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=lubber-de" title="Documentation">📖</a> <a href="#example-lubber-de" title="Examples">💡</a> <a href="#ideas-lubber-de" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-lubber-de" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/fomantic/Fomantic-UI/pulls?q=is%3Apr+reviewed-by%3Alubber-de" title="Reviewed Pull Requests">👀</a> <a href="#a11y-lubber-de" title="Accessibility">️️️️♿️</a> <a href="#security-lubber-de" title="Security">🛡️</a> <a href="#maintenance-lubber-de" title="Maintenance">🚧</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://www.exoego.net/"><img src="https://avatars2.githubusercontent.com/u/127635?v=4?s=60" width="60px;" alt=""/><br /><sub><b>TATSUNO Yasuhiro</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/issues?q=author%3Aexoego" title="Bug reports">🐛</a> <a href="#blog-exoego" title="Blogposts">📝</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=exoego" title="Code">💻</a> <a href="https://github.com/fomantic/Fomantic-UI/commits?author=exoego" title="Documentation">📖</a> <a href="https://github.com/fomantic/Fomantic-UI/pulls?q=is%3Apr+reviewed-by%3Aexoego" title="Reviewed Pull Requests">👀</a></td>
@@ -99,6 +99,8 @@ This is a list of all project contributors powered by [All Contributors](https:/
   <tr>
     <td align="center"><a href="https://naveensrinivasan.dev"><img src="https://avatars.githubusercontent.com/u/172697?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Naveen</b></sub></a><br /><a href="#security-naveensrinivasan" title="Security">🛡️</a></td>
     <td align="center"><a href="https://www.mvorisek.com/"><img src="https://avatars.githubusercontent.com/u/2228672?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Michael Voříšek</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=mvorisek" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/xamey"><img src="https://avatars.githubusercontent.com/u/34269296?v=4?s=60" width="60px;" alt=""/><br /><sub><b>xamey</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=xamey" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.ingrid-bluoss.de"><img src="https://avatars.githubusercontent.com/u/5477907?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Ingrid Bluoss</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=Inselhopper" title="Code">💻</a> <a href="#a11y-Inselhopper" title="Accessibility">️️️️♿️</a></td>
   </tr>
 </table>
 

package/dist/components/accordion.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Accordion
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Accordion
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/accordion.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Accordion
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Accordion
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/accordion.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Accordion
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Accordion
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/accordion.min.js

@@ -1,5 +1,5 @@
 /*
- * # Fomantic UI - 2.9.0-beta.300+9bf5e5c
+ * # Fomantic UI - 2.9.0-beta.303+76dc367
  * https://github.com/fomantic/Fomantic-UI
  * http://fomantic-ui.com/
  *

package/dist/components/ad.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Ad
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Ad
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/ad.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Ad
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Ad
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/api.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - API
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - API
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/api.min.js

@@ -1,5 +1,5 @@
 /*
- * # Fomantic UI - 2.9.0-beta.300+9bf5e5c
+ * # Fomantic UI - 2.9.0-beta.303+76dc367
  * https://github.com/fomantic/Fomantic-UI
  * http://fomantic-ui.com/
  *

package/dist/components/breadcrumb.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Breadcrumb
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Breadcrumb
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/breadcrumb.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Breadcrumb
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Breadcrumb
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/button.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Button
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Button
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/button.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Button
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Button
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/calendar.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Calendar
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Calendar
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/calendar.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Calendar
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Calendar
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/calendar.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Calendar
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Calendar
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/calendar.min.js

@@ -1,5 +1,5 @@
 /*
- * # Fomantic UI - 2.9.0-beta.300+9bf5e5c
+ * # Fomantic UI - 2.9.0-beta.303+76dc367
  * https://github.com/fomantic/Fomantic-UI
  * http://fomantic-ui.com/
  *

package/dist/components/card.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Card
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Card
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/card.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Card
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Card
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/checkbox.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Checkbox
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Checkbox
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/checkbox.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Checkbox
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Checkbox
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/checkbox.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Checkbox
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Checkbox
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/checkbox.min.js

@@ -1,5 +1,5 @@
 /*
- * # Fomantic UI - 2.9.0-beta.300+9bf5e5c
+ * # Fomantic UI - 2.9.0-beta.303+76dc367
  * https://github.com/fomantic/Fomantic-UI
  * http://fomantic-ui.com/
  *

package/dist/components/comment.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Comment
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Comment
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/comment.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Comment
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Comment
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/container.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Container
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Container
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/container.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Container
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Container
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/dimmer.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Dimmer
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Dimmer
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/dimmer.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Dimmer
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Dimmer
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/dimmer.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Dimmer
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Dimmer
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/dimmer.min.js

@@ -1,5 +1,5 @@
 /*
- * # Fomantic UI - 2.9.0-beta.300+9bf5e5c
+ * # Fomantic UI - 2.9.0-beta.303+76dc367
  * https://github.com/fomantic/Fomantic-UI
  * http://fomantic-ui.com/
  *

package/dist/components/divider.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Divider
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Divider
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/divider.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Divider
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Divider
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/dropdown.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Dropdown
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Dropdown
  * http://github.com/fomantic/Fomantic-UI/
  *
  *

package/dist/components/dropdown.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Dropdown
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Dropdown
  * http://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -111,6 +111,7 @@ $.fn.dropdown = function(parameters) {
               module.error(error.noNormalize, element);
             }
 
+            module.create.id();
             module.setup.layout();
 
             if(settings.values) {
@@ -124,7 +125,6 @@ $.fn.dropdown = function(parameters) {
             module.save.defaults();
             module.restore.selected();
 
-            module.create.id();
             module.bind.events();
 
             module.observeChanges();
@@ -366,11 +366,20 @@ $.fn.dropdown = function(parameters) {
             }
             if( module.is.search() && !module.has.search() ) {
               module.verbose('Adding search input');
+              var
+                  labelNode = $module.prev('label')
+              ;
               $search = $('<input />')
                 .addClass(className.search)
                 .prop('autocomplete', module.is.chrome() ? 'fomantic-search' : 'off')
-                .insertBefore($text)
               ;
+              if (labelNode.length) {
+                if (!labelNode.attr('id')) {
+                  labelNode.attr('id', module.get.id() + '_formLabel');
+                }
+                $search.attr('aria-labelledby', labelNode.attr('id'));
+              }
+              $search.insertBefore($text);
             }
             if( module.is.multiple() && module.is.searchSelection() && !module.has.sizer()) {
               module.create.sizer();
@@ -1153,7 +1162,7 @@ $.fn.dropdown = function(parameters) {
               if(module.is.multiple()) {
                 module.remove.activeLabel();
               }
-              if(!focused && !module.is.active() && (settings.showOnFocus || (event.type !== 'focus' && event.type !== 'focusin'))) {
+              if(!focused && !module.is.active() && (settings.showOnFocus || (event.type !== 'focus' && event.type !== 'focusin')) && event.type !== 'touchstart') {
                 focused = true;
                 module.search();
               }
@@ -4248,7 +4257,8 @@ $.fn.dropdown.settings.templates = {
     var
       placeholder = select.placeholder || false,
       html        = '',
-      escape = $.fn.dropdown.settings.templates.escape
+      escape = $.fn.dropdown.settings.templates.escape,
+      deQuote = $.fn.dropdown.settings.templates.deQuote
     ;
     html +=  '<i class="dropdown icon"></i>';
     if(placeholder) {
@@ -4257,7 +4267,7 @@ $.fn.dropdown.settings.templates = {
     else {
       html += '<div class="text"></div>';
     }
-    html += '<div class="'+className.menu+'">';
+    html += '<div class="'+deQuote(className.menu)+'">';
     html += $.fn.dropdown.settings.templates.menu(select, fields, preserveHTML,className);
     html += '</div>';
     return html;
@@ -4295,27 +4305,27 @@ $.fn.dropdown.settings.templates = {
             : '',
           hasDescription = (escape(option[fields.description] || '', preserveHTML) != '')
         ;
-        html += '<div class="'+ maybeActionable + maybeDisabled + maybeDescriptionVertical + (option[fields.class] ? deQuote(option[fields.class]) : className.item)+'" data-value="' + deQuote(option[fields.value],true) + '"' + maybeText + '>';
+        html += '<div class="'+ deQuote(maybeActionable + maybeDisabled + maybeDescriptionVertical + (option[fields.class] ? option[fields.class] : className.item))+'" data-value="' + deQuote(option[fields.value],true) + '"' + maybeText + '>';
         if (isMenu) {
           html += '<i class="'+ (itemType.indexOf('left') !== -1 ? 'left' : '') + ' dropdown icon"></i>';
         }
         if(option[fields.image]) {
-          html += '<img class="'+(option[fields.imageClass] ? deQuote(option[fields.imageClass]) : className.image)+'" src="' + deQuote(option[fields.image]) + '">';
+          html += '<img class="'+deQuote(option[fields.imageClass] ? option[fields.imageClass] : className.image)+'" src="' + deQuote(option[fields.image]) + '">';
         }
         if(option[fields.icon]) {
-          html += '<i class="'+deQuote(option[fields.icon])+' '+(option[fields.iconClass] ? deQuote(option[fields.iconClass]) : className.icon)+'"></i>';
+          html += '<i class="'+deQuote(option[fields.icon]+' '+(option[fields.iconClass] ? option[fields.iconClass] : className.icon))+'"></i>';
         }
         if(hasDescription){
-          html += '<span class="'+ className.description +'">'+ escape(option[fields.description] || '', preserveHTML) + '</span>';
-          html += (!isMenu) ? '<span class="'+ className.text + '">' : '';
+          html += '<span class="'+ deQuote(className.description) +'">'+ escape(option[fields.description] || '', preserveHTML) + '</span>';
+          html += (!isMenu) ? '<span class="'+ deQuote(className.text) + '">' : '';
         }
         if (isMenu) {
-          html += '<span class="' + className.text + '">';
+          html += '<span class="' + deQuote(className.text) + '">';
         }
         html +=   escape(option[fields.name] || '', preserveHTML);
         if (isMenu) {
           html += '</span>';
-          html += '<div class="' + itemType + '">';
+          html += '<div class="' + deQuote(itemType) + '">';
           html += $.fn.dropdown.settings.templates.menu(option, fields, preserveHTML, className);
           html += '</div>';
         } else if(hasDescription){
@@ -4324,18 +4334,18 @@ $.fn.dropdown.settings.templates = {
         html += '</div>';
       } else if (itemType === 'header') {
         var groupName = escape(option[fields.name] || '', preserveHTML),
-            groupIcon = option[fields.icon] ? deQuote(option[fields.icon]) : className.groupIcon
+            groupIcon = deQuote(option[fields.icon] ? option[fields.icon] : className.groupIcon)
         ;
         if(groupName !== '' || groupIcon !== '') {
-          html += '<div class="' + (option[fields.class] ? deQuote(option[fields.class]) : className.header) + '">';
+          html += '<div class="' + deQuote(option[fields.class] ? option[fields.class] : className.header) + '">';
           if (groupIcon !== '') {
-            html += '<i class="' + groupIcon + ' ' + (option[fields.iconClass] ? deQuote(option[fields.iconClass]) : className.icon) + '"></i>';
+            html += '<i class="' + deQuote(groupIcon + ' ' + (option[fields.iconClass] ? option[fields.iconClass] : className.icon)) + '"></i>';
           }
           html += groupName;
           html += '</div>';
         }
         if(option[fields.divider]){
-          html += '<div class="'+className.divider+'"></div>';
+          html += '<div class="'+deQuote(className.divider)+'"></div>';
         }
       }
     });
@@ -4345,8 +4355,10 @@ $.fn.dropdown.settings.templates = {
   // generates label for multiselect
   label: function(value, text, preserveHTML, className) {
     var
-        escape = $.fn.dropdown.settings.templates.escape;
-    return escape(text,preserveHTML) + '<i class="'+className.delete+' icon"></i>';
+        escape = $.fn.dropdown.settings.templates.escape,
+        deQuote = $.fn.dropdown.settings.templates.deQuote
+    ;
+    return escape(text,preserveHTML) + '<i class="'+deQuote(className.delete)+' icon"></i>';
   },
 
 

package/dist/components/dropdown.min.css

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.9.0-beta.300+9bf5e5c - Dropdown
+ * # Fomantic-UI 2.9.0-beta.303+76dc367 - Dropdown
  * http://github.com/fomantic/Fomantic-UI/
  *
  *