lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Changing widget placement movement to also make use of MakeRoomForWidgetPosition(widgetPart)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2011-03-18 13:49:27 -07:00
parent 2663d1d9ba
commit c6f0974af4
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
View File

@@ -125,8 +125,8 @@ namespace Orchard.Widgets.Services {
.FirstOrDefault(widget => ParsePosition(widget) < currentPosition); .FirstOrDefault(widget => ParsePosition(widget) < currentPosition);
if (widgetBefore != null) { if (widgetBefore != null) {
SwitchWidgetPositions(widgetBefore, widgetPart); widgetPart.Position = widgetBefore.Position;
MakeRoomForWidgetPosition(widgetPart);
return true; return true;
} }
@@ -145,8 +145,8 @@ namespace Orchard.Widgets.Services {
.FirstOrDefault(widget => ParsePosition(widget) > currentPosition); .FirstOrDefault(widget => ParsePosition(widget) > currentPosition);
if (widgetAfter != null) { if (widgetAfter != null) {
SwitchWidgetPositions(widgetAfter, widgetPart); widgetAfter.Position = widgetPart.Position;
MakeRoomForWidgetPosition(widgetAfter);
return true; return true;
} }
@@ -160,7 +160,7 @@ namespace Orchard.Widgets.Services {
int targetPosition = ParsePosition(widgetPart); int targetPosition = ParsePosition(widgetPart);
IEnumerable<WidgetPart> widgetsToMove = GetWidgets() IEnumerable<WidgetPart> widgetsToMove = GetWidgets()
.Where(widget => widget.Zone == widgetPart.Zone && ParsePosition(widget) >= targetPosition) .Where(widget => widget.Zone == widgetPart.Zone && ParsePosition(widget) >= targetPosition && widget.Id != widgetPart.Id)
.OrderBy(widget => widget.Position, new UI.FlatPositionComparer()).ToList(); .OrderBy(widget => widget.Position, new UI.FlatPositionComparer()).ToList();
// no need to continue if there are no widgets that will conflict with this widget's position // no need to continue if there are no widgets that will conflict with this widget's position
@@ -178,11 +178,5 @@ namespace Orchard.Widgets.Services {
return 0; return 0;
return value; return value;
} }
private static void SwitchWidgetPositions(WidgetPart sourceWidget, WidgetPart targetWidget) {
string tempPosition = sourceWidget.Record.Position;
sourceWidget.Record.Position = targetWidget.Record.Position;
targetWidget.Record.Position = tempPosition;
}
} }
} }