Merge pull request johnny#75 from abixalmon/master

johnny · johnny · commit 271cd2c74243 · 2014-03-09T21:08:52.000+01:00
If clicked on select element, ignore
diff --git a/source/js/jquery-sortable.js b/source/js/jquery-sortable.js
@@ -101,7 +101,7 @@
     // Called on mousedown. If falsy value is returned, the dragging will not start.
     // If clicked on input element, ignore
     onMousedown: function ($item, _super, event) {
-      if (event.target.nodeName != 'INPUT') {
+      if (event.target.nodeName != 'INPUT' && event.target.nodeName != 'SELECT') {
         event.preventDefault()
         return true
       }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`// Called on mousedown. If falsy value is returned, the dragging will not start.`
`102`	`102`	`// If clicked on input element, ignore`
`103`	`103`	`onMousedown: function ($item, _super, event) {`
`104`		`- if (event.target.nodeName != 'INPUT') {`
	`104`	`+ if (event.target.nodeName != 'INPUT' && event.target.nodeName != 'SELECT') {`
`105`	`105`	`event.preventDefault()`
`106`	`106`	`return true`
`107`	`107`	`}`