From d8665455e85883c7b3808a7a69ddedb2b349c1b5 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Mon, 22 Apr 2013 16:06:10 -0700
Subject: [PATCH] Fixing back button behavior in media library

--HG--
branch : 1.x
---
 .../Views/Content-ImageEditor.cshtml              |  8 +++++++-
 .../Views/Parts/Image.Editor.cshtml               | 15 ++++++++++++---
 .../Views/Parts/Media.Actions.cshtml              |  1 -
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Content-ImageEditor.cshtml b/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Content-ImageEditor.cshtml
index 4a63cf40f..65dbb9a4a 100644
--- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Content-ImageEditor.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Content-ImageEditor.cshtml
@@ -1,5 +1,6 @@
 @using Orchard.ContentManagement
 @using Orchard.MediaLibrary.Models
+@using Orchard.Utility.Extensions
 @model dynamic
 @{
     Script.Require("jQuery");
@@ -11,6 +12,11 @@
     ContentItem media = Model.MediaContentItem;
     var mediaPart = media.As<MediaPart>();
     var imagePart = media.As<ImagePart>();
+
+    var returnUrl = Request.QueryString["returnUrl"];
+    if (!Request.IsLocalUrl(returnUrl)) {
+        returnUrl = Url.Content("~/");
+    }
 }
 
 <input type="hidden" id="image-editor-url" value="@Url.Content(mediaPart.Resource)"/>
@@ -42,7 +48,7 @@
 </div>
 <fieldset id="buttons-manage">
     <button id="button-save">@T("Save")</button>
-    <a id="button-cancel" href="@Url.Action("Index", "Admin", new { area = "Orchard.MediaLibrary" })" class="button">@T("Close")</a>
+    <a id="button-cancel" href="@returnUrl" class="button">@T("Close")</a>
 </fieldset>
 
 <input type="hidden" id="upload-image-url" value="@Url.Action("Upload", "Admin", new { id = media.Id })"/>
diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Parts/Image.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Parts/Image.Editor.cshtml
index bbc6139f1..f5f696b71 100644
--- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Parts/Image.Editor.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Views/Parts/Image.Editor.cshtml
@@ -1,8 +1,17 @@
-@using Orchard.ContentManagement
-@using Orchard.MediaLibrary.Models
+@using Orchard.MediaLibrary.Models
 @{
     ImagePart imagePart = Model.ContentPart;
 }           
 
-@Html.ActionLink(T("Edit").Text, "Index", "Admin", new { id = imagePart.Id, area = "Orchard.ImageEditor" }, new {})
+@Html.ActionLink(T("Edit").Text, "Index", "Admin", new { id = imagePart.Id, area = "Orchard.ImageEditor" }, new { id="edit-image-link"})
 
+<script type="text/javascript">
+    //<![CDATA[
+    // update the returnUrl from javascript to get the main window's location
+    $('#edit-image-link').each(function() {
+        var self = $(this);
+        var returnUrl = self.attr('href') + '?returnUrl=' + encodeURIComponent(window.location);
+        self.attr('href', returnUrl);
+    });
+//]]>
+</script>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
index f78b3e32c..c410751bd 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
@@ -1,6 +1,5 @@
 @using Orchard.ContentManagement
 @using Orchard.Core.Contents;
-@using Orchard.Utility.Extensions
 @{
     ContentItem contentItem = Model.ContentItem;
 }