Updated component to version 2.4.1

Semantic-Pusher-Robot · Semantic-Pusher-Robot · commit 0f1bdca182b4 · 2018-10-13T15:59:32.000-07:00
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,7 @@
+### Version 2.4.1 - Oct 13, 2018
+
+- **Dropdown** - `clearable` dropdown now works with dropdown that arent `on:click`, like `hover` or `manual` triggers. [#6594](https://github.com/Semantic-Org/Semantic-UI/issues/6594)
+
 ### Version 2.4.0 - Sep 17, 2018
 
 - **Dropdown** - Added `clearable` dropdowns. When `clearable: true` is specified an (X) will appear to clear dropdown selection [#2072](https://github.com/Semantic-Org/Semantic-UI/issues/2072)
diff --git a/bower.json b/bower.json
@@ -6,24 +6,8 @@
     "name": "Jack Lukic",
     "web": "http://www.jacklukic.com"
   },
-  "ignore": [
-    "docs",
-    "node",
-    "server",
-    "spec",
-    "src",
-    "test"
-  ],
-  "keywords": [
-    "semantic",
-    "ui",
-    "css3",
-    "framework"
-  ],
-  "license": [
-    "http://semantic-ui.mit-license.org/"
-  ],
-  "main": [
-    "dropdown.css"
-  ]
+  "ignore": ["docs", "node", "server", "spec", "src", "test"],
+  "keywords": ["semantic", "ui", "css3", "framework"],
+  "license": ["http://semantic-ui.mit-license.org/"],
+  "main": ["dropdown.css"]
 }
diff --git a/composer.json b/composer.json
@@ -8,12 +8,7 @@
     "web": "http://www.jacklukic.com",
     "role": "Creator"
   }],
-  "keywords": [
-    "semantic",
-    "ui",
-    "css",
-    "framework"
-  ],
+  "keywords": ["semantic", "ui", "css", "framework"],
   "license": "MIT",
-  "version": "2.4.0"
+  "version": "2.4.1"
 }
diff --git a/dropdown.js b/dropdown.js
@@ -1,5 +1,5 @@
 /*!
- * # Semantic UI 2.4.0 - Dropdown
+ * # Semantic UI 2.4.1 - Dropdown
  * http://github.com/semantic-org/semantic-ui/
  *
  *
@@ -605,7 +605,6 @@ $.fn.dropdown = function(parameters) {
             else {
               if(settings.on == 'click') {
                 $module
-                  .on('click' + eventNamespace, selector.icon, module.event.icon.click)
                   .on('click' + eventNamespace, module.event.test.toggle)
                 ;
               }
@@ -621,6 +620,7 @@ $.fn.dropdown = function(parameters) {
                 ;
               }
               $module
+                .on('click' + eventNamespace, selector.icon, module.event.icon.click)
                 .on('mousedown' + eventNamespace, module.event.mousedown)
                 .on('mouseup'   + eventNamespace, module.event.mouseup)
                 .on('focus'     + eventNamespace, module.event.focus)
@@ -1022,7 +1022,7 @@ $.fn.dropdown = function(parameters) {
               if($icon.hasClass(className.clear)) {
                 module.clear();
               }
-              else {
+              else if (module.can.click()) {
                 module.toggle();
               }
             }
diff --git a/dropdown.min.js b/dropdown.min.js
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 /*!
- * # Semantic UI 2.4.0 - Dropdown
+ * # Semantic UI 2.4.1 - Dropdown
  * http://github.com/semantic-org/semantic-ui/
  *
  *
@@ -606,7 +606,6 @@ module.exports = function(parameters) {
             else {
               if(settings.on == 'click') {
                 $module
-                  .on('click' + eventNamespace, selector.icon, module.event.icon.click)
                   .on('click' + eventNamespace, module.event.test.toggle)
                 ;
               }
@@ -622,6 +621,7 @@ module.exports = function(parameters) {
                 ;
               }
               $module
+                .on('click' + eventNamespace, selector.icon, module.event.icon.click)
                 .on('mousedown' + eventNamespace, module.event.mousedown)
                 .on('mouseup'   + eventNamespace, module.event.mouseup)
                 .on('focus'     + eventNamespace, module.event.focus)
@@ -1023,7 +1023,7 @@ module.exports = function(parameters) {
               if($icon.hasClass(className.clear)) {
                 module.clear();
               }
-              else {
+              else if (module.can.click()) {
                 module.toggle();
               }
             }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "semantic-ui-dropdown",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "title": "Semantic UI - Dropdown",
   "description": "Single component release of dropdown",
   "homepage": "http://www.semantic-ui.com",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*!`
`2`		`- * # Semantic UI 2.4.0 - Dropdown`
	`2`	`+ * # Semantic UI 2.4.1 - Dropdown`
`3`	`3`	`* http://github.com/semantic-org/semantic-ui/`
`4`	`4`	`*`
`5`	`5`	`*`
`@@ -605,7 +605,6 @@ $.fn.dropdown = function(parameters) {`
`605`	`605`	`else {`
`606`	`606`	`if(settings.on == 'click') {`
`607`	`607`	`$module`
`608`		`- .on('click' + eventNamespace, selector.icon, module.event.icon.click)`
`609`	`608`	`.on('click' + eventNamespace, module.event.test.toggle)`
`610`	`609`	`;`
`611`	`610`	`}`
`@@ -621,6 +620,7 @@ $.fn.dropdown = function(parameters) {`
`621`	`620`	`;`
`622`	`621`	`}`
`623`	`622`	`$module`
	`623`	`+ .on('click' + eventNamespace, selector.icon, module.event.icon.click)`
`624`	`624`	`.on('mousedown' + eventNamespace, module.event.mousedown)`
`625`	`625`	`.on('mouseup' + eventNamespace, module.event.mouseup)`
`626`	`626`	`.on('focus' + eventNamespace, module.event.focus)`
`@@ -1022,7 +1022,7 @@ $.fn.dropdown = function(parameters) {`
`1022`	`1022`	`if($icon.hasClass(className.clear)) {`
`1023`	`1023`	`module.clear();`
`1024`	`1024`	`}`
`1025`		`- else {`
	`1025`	`+ else if (module.can.click()) {`
`1026`	`1026`	`module.toggle();`
`1027`	`1027`	`}`
`1028`	`1028`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "semantic-ui-dropdown",`
`3`		`- "version": "2.4.0",`
	`3`	`+ "version": "2.4.1",`
`4`	`4`	`"title": "Semantic UI - Dropdown",`
`5`	`5`	`"description": "Single component release of dropdown",`
`6`	`6`	`"homepage": "http://www.semantic-ui.com",`