From f708a24401095ca7b282bbac1df2d7b5f03738fb Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Mar 2015 17:36:53 +1100 Subject: [PATCH] fixes U4-6333, U4-6348 --- .../src/views/common/legacy.controller.js | 9 ++--- src/Umbraco.Web.UI/umbraco/endPreview.aspx | 36 +++++++++++-------- src/Umbraco.Web/Umbraco.Web.csproj | 3 -- .../umbraco/endPreview.aspx.cs | 27 -------------- 4 files changed, 27 insertions(+), 48 deletions(-) delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs diff --git a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js index 46114042b5..bf6bc287df 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js @@ -9,12 +9,13 @@ */ function LegacyController($scope, $routeParams, $element) { - var url = $routeParams.url; - var toClean = "*?(){}[];:%<>/\\|&'\""; + var url = decodeURIComponent($routeParams.url.toLowerCase().trimStart("javascript:")); + var toClean = "*(){}[];:<>\\|'\""; for (var i = 0; i < toClean.length; i++) { - url = url.replace(toClean[i], ""); + var reg = new RegExp("\\" + toClean[i], "g"); + url = url.replace(reg, ""); } - $scope.legacyPath = decodeURIComponent(url); + $scope.legacyPath = url; } angular.module("umbraco").controller('Umbraco.LegacyController', LegacyController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/endPreview.aspx b/src/Umbraco.Web.UI/umbraco/endPreview.aspx index 915838ca53..1759dae891 100644 --- a/src/Umbraco.Web.UI/umbraco/endPreview.aspx +++ b/src/Umbraco.Web.UI/umbraco/endPreview.aspx @@ -1,16 +1,24 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="endPreview.aspx.cs" Inherits="umbraco.presentation.endPreview" %> +<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %> - +5 \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 2d51186ce4..fd2a1561e1 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -934,9 +934,6 @@ ASPXCodeBehind - - ASPXCodeBehind - ASPXCodeBehind diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs deleted file mode 100644 index 526e6613c5..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/endPreview.aspx.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace umbraco.presentation -{ - public partial class endPreview : BasePages.UmbracoEnsuredPage - { - protected void Page_Load(object sender, EventArgs e) - { - preview.PreviewContent.ClearPreviewCookie(); - Response.Redirect(helper.Request("redir"), true); - } - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -}