Merge pull request #486 from sp-kilobug/sp-kilobug-patch-5

fix flex containers in row mode

Sortable.js

@@ -36,6 +36,7 @@
 
 		lastEl,
 		lastCSS,
+		lastParentCSS,
 
 		oldIndex,
 		newIndex,
@@ -611,13 +612,15 @@
 					if (lastEl !== target) {
 						lastEl = target;
 						lastCSS = _css(target);
+						lastParentCSS = _css(target.parentNode);
 					}
 
 
 					var targetRect = target.getBoundingClientRect(),
 						width = targetRect.right - targetRect.left,
 						height = targetRect.bottom - targetRect.top,
-						floating = /left|right|inline/.test(lastCSS.cssFloat + lastCSS.display),
+						floating = /left|right|inline/.test(lastCSS.cssFloat + lastCSS.display)
+							|| (lastParentCSS.display == 'flex' && lastParentCSS['flex-direction'].indexOf('row') === 0),
 						isWide = (target.offsetWidth > dragEl.offsetWidth),
 						isLong = (target.offsetHeight > dragEl.offsetHeight),
 						halfway = (floating ? (evt.clientX - targetRect.left) / width : (evt.clientY - targetRect.top) / height) > 0.5,
@@ -760,7 +763,7 @@
 						this.save();
 					}
 				}
-				
+
 				// Nulling
 				rootEl =
 				dragEl =
@@ -1185,7 +1188,7 @@
 	Sortable.create = function (el, options) {
 		return new Sortable(el, options);
 	};
-	
+
 
 	// Export
 	Sortable.version = '1.2.2';