Merge pull request #2361 from bjarnef/dev-v7-U4-10791

U4-10791 - Fix collapsed columns listview settings

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js

@@ -77,14 +77,14 @@ function includePropsPreValsController($rootScope, $scope, localizationService,
 
     // Return a helper with preserved width of cells
     var fixHelper = function (e, ui) {
-        var h = ui.clone();
-
-        h.children().each(function () {
-            $(this).width($(this).width());            
+        ui.children().each(function () {
+            $(this).width($(this).width());
         });
-        h.css("background-color", "lightgray");
 
-        return h;
+        var row = ui.clone();
+        row.css("background-color", "lightgray");
+
+        return row;
     };
 
     $scope.sortableOptions = {
@@ -96,6 +96,10 @@ function includePropsPreValsController($rootScope, $scope, localizationService,
         cursor: 'move',
         items: '> tr',
         tolerance: 'pointer',
+        forcePlaceholderSize: true,
+        start: function(e, ui){
+            ui.placeholder.height(ui.item.height());
+        },
         update: function (e, ui) {
             
             // Get the new and old index for the moved element (using the text as the identifier)

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html

@@ -20,7 +20,7 @@
                     <td style="width:100px;"></td>
                 </tr>
             </thead>
-            <tbody ui-sortable="sortableOptions">
+            <tbody ui-sortable="sortableOptions" ng-model="model.value">
                 <tr ng-repeat="val in model.value">
                     <td>
                         <i class="icon icon-navigation handle"></i>