diff --git a/AssemblyInfoShare/SharedAssemblyInfo.cs b/AssemblyInfoShare/SharedAssemblyInfo.cs index 4928ccbec..551fbbf60 100644 Binary files a/AssemblyInfoShare/SharedAssemblyInfo.cs and b/AssemblyInfoShare/SharedAssemblyInfo.cs differ diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Helpers/BlogHelper.cs b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Helpers/BlogHelper.cs new file mode 100644 index 000000000..c8f0795c1 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Helpers/BlogHelper.cs @@ -0,0 +1,27 @@ +using System; +using Telerik.Sitefinity.Frontend.Blogs.Mvc.Models.Blog; +using Telerik.Sitefinity.Frontend.Mvc.Models; + +namespace Telerik.Sitefinity.Frontend.Blogs.Mvc.Helpers +{ + public static class BlogHelper + { + public static string GetDetailPageUrl(ItemViewModel item, Guid detailsPageId, BlogDetailLocationMode blogDetailLocationMode) + { + try + { + return DetailLocationHyperLinkHelper.GetDetailPageUrl(item, detailsPageId, blogDetailLocationMode); + } + catch (ArgumentException ex) + { + // When the default page is delete, the blog should be rendered as a normal blog without default page. + if (ex.Message.Contains("Invalid details page")) + { + return null; + } + + throw; + } + } + } +} diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/DesignerView.Simple.cshtml index f996ab74b..267f69b08 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/DesignerView.Simple.cshtml @@ -45,7 +45,7 @@ @@ -53,7 +53,7 @@ @@ -72,7 +72,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + "")) @@ -84,7 +84,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/List.BlogList.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/List.BlogList.cshtml index a10a8bb76..dc22f218a 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/List.BlogList.cshtml +++ b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/List.BlogList.cshtml @@ -4,6 +4,7 @@ @using Telerik.Sitefinity.Frontend.Blogs.Mvc.Helpers; @using Telerik.Sitefinity.Frontend.Blogs.Mvc.Models.Blog; @using Telerik.Sitefinity.Frontend.Mvc.Helpers; +@using Telerik.Sitefinity.Frontend.Mvc.Models; @using Telerik.Sitefinity.Modules.Pages;
@@ -14,7 +15,7 @@ @foreach (var item in Model.Items) { - var detailPageUrl = DetailLocationHyperLinkHelper.GetDetailPageUrl(item, ViewBag.DetailsPageId, ViewBag.DetailPageMode); + var detailPageUrl = BlogHelper.GetDetailPageUrl(item, (Guid)ViewBag.DetailsPageId, (BlogDetailLocationMode)ViewBag.DetailPageMode);

  • @if (!string.IsNullOrEmpty(detailPageUrl)) diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/DesignerView.Simple.cshtml index 3a2b278be..324216d0f 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/DesignerView.Simple.cshtml @@ -102,7 +102,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + ""))

    • @@ -114,7 +114,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj b/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj index f3d2d8f52..33cb8a00b 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj +++ b/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj @@ -51,10 +51,8 @@ True False - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False @@ -66,11 +64,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -131,6 +129,7 @@ + @@ -169,31 +168,31 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Blogs/packages.config b/Telerik.Sitefinity.Frontend.Blogs/packages.config index 0ce30d7f2..3cd2c60e3 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/packages.config +++ b/Telerik.Sitefinity.Frontend.Blogs/packages.config @@ -3,18 +3,19 @@ + - + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj b/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj index de107ecfb..473a72128 100644 --- a/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj +++ b/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj @@ -51,10 +51,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll False - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False @@ -65,11 +63,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -152,31 +150,31 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Card/packages.config b/Telerik.Sitefinity.Frontend.Card/packages.config index 0ce30d7f2..3cd2c60e3 100644 --- a/Telerik.Sitefinity.Frontend.Card/packages.config +++ b/Telerik.Sitefinity.Frontend.Card/packages.config @@ -3,18 +3,19 @@ + - + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js b/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js index 577293489..05a076253 100644 --- a/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js +++ b/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js @@ -1,2 +1,2 @@ -!function(o){"use strict";function t(e,t,n,s){this.rootUrl=e&&"/"!==e[e.length-1]?e+"/":e,this.createCommentUrl=t&&"/"!==t[t.length-1]?t+"/":t,this.isUserAuthenticatedUrl=n&&"/"!==n[n.length-1]?n+"/":n,this.hasUserAlreadyReviewedUrl=s&&"/"!==s[s.length-1]?s+"/":s}function s(e,t,n){this.settings=t||{},this.resources=n||{},this.wrapper=e,this.commentsTakenSoFar=0,this.maxCommentsToShow=0,this.allCommentsCount=0,this.lastCommentDate=0,this.commentsSortedDescending=t.commentsInitiallySortedDescending}function e(){o('[data-sf-role="comments-wrapper"]').each(function(){var e=o(this),t=JSON.parse(e.find('[data-sf-role="comments-settings"]').val()),n=JSON.parse(e.find('[data-sf-role="comments-resources"]').val());new s(e,t,n).initialize()})}s.prototype={isUserAuthenticated:!(t.prototype={getRandomNumber:function(){return Math.random().toString().substr(2)+(new Date).getTime()},makeAjax:function(e,t,n){var s={type:t||"GET",url:e,contentType:"application/json",accepts:{text:"application/json"},cache:!1};return n&&(s.data=n),o.ajax(s)},getCommentsCount:function(s,e){var t=this.rootUrl+"comments/count?ThreadKey="+s;return e&&(t+="&Status="+e),this.makeAjax(t).then(function(e){var t=0;if(e&&e.Items)for(var n=0;n]*>/gi," ");n.length').html(n.substr(0,this.settings.commentsTextMaxLength))),e.append(o("").hide().html(t)),e.append(o('').text(this.settings.useReviews?this.resources.readFullReview:this.resources.readFullComment)))}},htmlEncode:function(e){return o("
    ").text(e).html()},createCommentMarkup:function(e){var t=this.getSingleCommentTemplate().clone(!0);if(t.find('[data-sf-role="list-rating-wrapper"]').show(),t.find('[data-sf-role="comment-avatar"]').attr("src",e.ProfilePictureThumbnailUrl).attr("alt",e.Name),t.find('[data-sf-role="comment-name"]').text(e.Name),t.find('[data-sf-role="comment-date"]').text(this.getDateFromSfString(e.DateCreated).toDateString()),this.attachCommentMessage(t.find('[data-sf-role="comment-message"]'),e.Message),this.settings.useReviews){var n=t.find('[data-sf-role="rating-of-resource"]'),s=t.find('[data-sf-role="list-rating-container"]').mvcRating({readOnly:!0,value:e.Rating,template:o('[data-sf-role="rating-template"]')});if(t.find('[data-sf-role="list-rating-value"]').text(e.Rating),0i.maxCommentsToShow&&(n.children().slice(-1*(i.commentsTakenSoFar-i.maxCommentsToShow)).remove(),i.commentsTakenSoFar=i.maxCommentsToShow)):n.append(t)})}},renderCommentsCount:function(){var e=this.settings.useReviews?this.resources.reviewSingular:this.resources.commentSingular,t=this.settings.useReviews?this.resources.reviewPlural:this.resources.commentsPlural,n=1Math.max(this.commentsTakenSoFar,this.settings.commentsPerPage)?"inline-block":"none"),this.getElementByDataSfRole("comments-count-list-wrapper").toggle(0!==this.allCommentsCount),this.getElementByDataSfRole("comments-count-anchor").hide()},loadComments:function(e,t,n){var s=this;if(!s.isLoadinglist)return s.isLoadingList=!0,s.listLoadingIndicator().show(),s.restApi.getComments(s.settings.commentsThreadKey,e,t,s.commentsSortedDescending,n).then(function(e){return e&&e.Items&&e.Items.length&&(s.commentsTakenSoFar+=e.Items.length,s.renderCommentsCount(),s.renderComments(e.Items,s.commentsContainer(),n&&s.commentsSortedDescending)),e}).always(function(){s.listLoadingIndicator().hide(),s.isLoadingList=!1})},refreshLastCommentDate:function(e){if(e&&e.Items&&e.Items.length){var t=this.commentsSortedDescending?e.Items[0]:e.Items[e.Items.length-1];this.lastCommentDate=this.getDateString(t.DateCreated,1)}},setAllCommentsCount:function(e,t,n){this.allCommentsCount=e,this.renderCommentsCount(),n||o(document).trigger("sf-comments-count-received",{key:this.settings.commentsThreadKey,count:this.allCommentsCount,rating:t})},refreshComments:function(t,e,n){var s=t.commentsSortedDescending?t.settings.commentsPerPage:t.maxCommentsToShow-t.commentsTakenSoFar;!t.commentsSortedDescending&&s<=0&&e?t.setAllCommentsCount(t.allCommentsCount+1):t.loadComments(0,s,t.lastCommentDate).then(function(e){t.refreshLastCommentDate(e),e&&e.TotalCount&&t.setAllCommentsCount(t.allCommentsCount+e.TotalCount,n)})},sortComments:function(e){var t=this;t.commentsSortedDescending!==e&&(t.commentsSortedDescending=e,t.commentsContainer().html(""),t.commentsTakenSoFar=0,t.loadComments(0,t.settings.commentsPerPage).then(function(){t.renderCommentsCount()}))},toggleSubscription:function(){var n=this;n.restApi.toggleSubscription(n.settings.commentsThreadKey,n.isSubscribedToNewComments).then(function(e){n.isSubscribedToNewComments=!n.isSubscribedToNewComments,n.commentsSubscribeButtonText().text(n.isSubscribedToNewComments?n.resources.unsubscribeLink:n.resources.subscribeLink);var t=n.settings.useReviews?n.resources.successfullySubscribedToNewReviews:n.resources.successfullySubscribedToNewComments;n.commentsSubscribeText().text(n.isSubscribedToNewComments?t:n.resources.successfullyUnsubscribedFromNewComments)})},buildNewCommentFromForm:function(){var e=this,t={Message:e.htmlEncode(e.newCommentMessage().val()),ThreadKey:e.settings.commentsThreadKey};return e.settings.useReviews&&(t.Rating=this.newCommentRatingContainer.getValue()),e.isUserAuthenticated||(t.Name=e.newCommentName().val(),t.Email=e.newCommentEmail().val(),e.settings.requiresCaptcha&&(t.Captcha={Answer:e.captchaInput().val(),Key:e.captchaData.key})),t.Thread=e.settings.commentsThread||{},t.Thread.Group=t.Thread.Group||{},t.Thread.Group.Key=t.Thread.Group.Key||t.Thread.groupKey,t},cleanNewCommentForm:function(){this.newCommentMessage().val(""),this.newCommentName().val(""),this.newCommentEmail().val(""),this.newCommentRatingContainer&&this.newCommentRatingContainer.setValue(0)},endSubmitNewComment:function(){!this.isUserAuthenticated&&this.settings.requiresCaptcha&&this.captchaRefresh(),this.submitLoadingIndicator().hide(),this.newCommentSubmitButton().show()},createCommentSuccess:function(e){if(this.cleanNewCommentForm(),this.settings.requiresApproval)this.newCommentPendingApprovalMessage().show();else if(!this.settings.commentsAutoRefresh){var t=this.settings.useReviews&&e?e.Rating:null;this.refreshComments(this,!0,t)}if(this.settings.useReviews){this.newCommentForm().hide(),this.newCommentFormButton().hide(),this.hasUserReviewed=!0;var n=this.settings.requiresApproval?this.newCommentPendingApprovalMessage().text():this.resources.thankYouReviewSubmited;this.newReviewFormReplacement().text(n).show()}},createCommentFail:function(e){if(e&&e.responseText){var t=JSON.parse(e.responseText).ResponseStatus.Message;this.newCommentSubmitButton().before(this.getErrorMessage(t,this.newCommentSubmitButton()))}},submitNewComment:function(){var t=this;t.submitLoadingIndicator().show(),t.newCommentSubmitButton().hide();var n=t.buildNewCommentFromForm(),e=JSON.parse(JSON.stringify(n));e.Message=e.Message.trim(),t.validateComment(e).then(function(e){e?(n.Message=n.Message.replace(new RegExp("\\n","g"),"
    "),t.restApi.createComment(n).then(function(e){t.createCommentSuccess(e)},function(e){t.createCommentFail(e)}).always(function(){t.endSubmitNewComment()})):t.endSubmitNewComment()})},captchaRefresh:function(){var t=this,n=o.Deferred();t.captchaImage().attr("src",""),t.captchaInput().hide(),t.restApi.getCaptcha().then(function(e){e&&(t.captchaImage().attr("src","data:image/png;base64,"+e.Image),t.captchaData.key=e.Key,t.captchaInput().val(""),t.captchaInput().show()),n.resolve(!0)})},setupCaptcha:function(){!this.isUserAuthenticated&&this.settings.requiresCaptcha&&(this.captchaData={key:null},this.captchaRefresh(),this.captchaContainer().show())},initializeProperties:function(){this.restApi=new t(this.settings.rootUrl,this.settings.createCommentUrl,this.settings.isUserAuthenticatedUrl,this.settings.hasUserAlreadyReviewedUrl),this.isLoadingList=!1,this.isSubscribedToNewComments=!1,this.maxCommentsToShow=this.settings.commentsPerPage;var e=this.newCommentRating();e&&e.length&&(this.newCommentRatingContainer=e.mvcRating({template:o('[data-sf-role="rating-template"]')})),this.newCommentRequiresAuthentication().hide(),this.newCommentPendingApprovalMessage().hide(),this.settings.useReviews&&this.newReviewFormReplacement().hide(),this.commentsSortedDescending?this.commentsSortNewButton().addClass(this.isSelectedSortButtonCssClass):this.commentsSortOldButton().addClass(this.isSelectedSortButtonCssClass)},initializeUserStatus:function(){var t=this;t.restApi.getIsUserAuthenticated().then(function(e){e&&(e.IsAuthenticated?(t.isUserAuthenticated=!0,t.initializeSubscription()):(t.commentsSubscribeText().hide(),t.commentsSubscribeButton().hide(),t.settings.requiresAuthentication&&(t.newCommentForm().hide(),t.newCommentRequiresAuthentication().show())),t.settings.useReviews&&t.initializeHasUserAlreadyReviewed()),o.proxy(t.setupCaptcha(),t)})},initializeSubscription:function(){var s=this;s.settings.commentsThreadKey&&s.restApi.getSubscriptionStatus(s.settings.commentsThreadKey).then(function(e){if(e){s.isSubscribedToNewComments=e.IsSubscribed;var t=s.settings.useReviews?s.resources.subscribeToNewReviews:s.resources.subscribeToNewComments,n=s.settings.useReviews?s.resources.youAreSubscribedToNewReviews:s.resources.youAreSubscribedToNewComments;s.commentsSubscribeButtonText().text(s.isSubscribedToNewComments?s.resources.unsubscribeLink:t),s.commentsSubscribeText().text(s.isSubscribedToNewComments?n:""),s.commentsSubscribeButton().click(function(){return s.toggleSubscription(),!1})}})},initializeComments:function(){var t=this;t.settings.commentsThreadKey&&(t.restApi.getCommentsCount(t.settings.commentsThreadKey).then(function(e){t.setAllCommentsCount(e,null,!0)}),t.loadComments(0,t.settings.commentsPerPage).then(function(e){t.refreshLastCommentDate(e)}),t.settings.commentsAutoRefresh&&setInterval(function(){t.refreshComments(t)},t.settings.commentsRefreshInterval))},initializeHasUserAlreadyReviewed:function(){var t=this;t.restApi.getHasUserAlreadyReviewed(t.settings.commentsThreadKey).then(function(e){e&&e.AuthorAlreadyReviewed&&(t.newCommentForm().hide(),t.newCommentFormButton().hide(),t.newReviewFormReplacement().show(),t.newCommentRequiresAuthentication().hide(),t.hasUserReviewed=!0)})},initializeHandlers:function(){var e=this;e.commentsLoadMoreButton().click(function(){return e.maxCommentsToShow+=e.settings.commentsPerPage,e.loadComments(e.commentsTakenSoFar,e.settings.commentsPerPage),!1}),e.commentsContainer().on("click",'[data-sf-role="comments-read-full-comment-button"]',function(e){if(e&&e.target)return o(e.target).hide().siblings().show(),o(e.target).siblings('[data-sf-role="comments-read-substr-comment-header"]').hide(),!1}),e.commentsSortNewButton().click(function(){return e.sortComments(!0),e.commentsSortNewButton().addClass(e.isSelectedSortButtonCssClass),e.commentsSortOldButton().removeClass(e.isSelectedSortButtonCssClass),!1}),e.commentsSortOldButton().click(function(){return e.sortComments(!1),e.commentsSortOldButton().addClass(e.isSelectedSortButtonCssClass),e.commentsSortNewButton().removeClass(e.isSelectedSortButtonCssClass),!1}),e.newCommentFormButton().click(function(){return o("html, body").animate({scrollTop:e.newCommentForm().offset().top},1e3),!1}),e.newCommentSubmitButton().click(function(){return e.settings.isDesignMode||(e.errorMessage().hide(),e.getElementByDataSfRole("error-message").find("span").text(""),e.getElementByDataSfRole("error-message").hide(),e.submitNewComment()),!1}),e.captchaRefreshLink().click(function(){return e.captchaRefresh(),!1}),e.newCommentMessage().focus(function(){e.isUserAuthenticated||e.commentsNewLoggedOutView().show()})},initialize:function(){this.initializeProperties(),this.initializeUserStatus(),this.initializeComments(),this.initializeHandlers()}},window.personalizationManager?window.personalizationManager.addPersonalizedContentLoaded(function(){new e}):o(function(){new e})}(jQuery); +!function(o){"use strict";function t(e,t,n,s){this.rootUrl=e&&"/"!==e[e.length-1]?e+"/":e,this.createCommentUrl=t&&"/"!==t[t.length-1]?t+"/":t,this.isUserAuthenticatedUrl=n&&"/"!==n[n.length-1]?n+"/":n,this.hasUserAlreadyReviewedUrl=s&&"/"!==s[s.length-1]?s+"/":s}function s(e,t,n){this.settings=t||{},this.resources=n||{},this.wrapper=e,this.commentsTakenSoFar=0,this.maxCommentsToShow=0,this.allCommentsCount=0,this.lastCommentDate=0,this.commentsSortedDescending=t.commentsInitiallySortedDescending}function e(){o('[data-sf-role="comments-wrapper"]').each(function(){var e=o(this),t=JSON.parse(e.find('[data-sf-role="comments-settings"]').val()),n=JSON.parse(e.find('[data-sf-role="comments-resources"]').val());new s(e,t,n).initialize()})}s.prototype={isUserAuthenticated:!(t.prototype={getRandomNumber:function(){return Math.random().toString().substr(2)+(new Date).getTime()},makeAjax:function(e,t,n){var s={type:t||"GET",url:e,contentType:"application/json",accepts:{text:"application/json"},cache:!1};return n&&(s.data=n),o.ajax(s)},getCommentsCount:function(s,e){var t=this.rootUrl+"comments/count?ThreadKey="+s;return e&&(t+="&Status="+e),this.makeAjax(t).then(function(e){var t=0;if(e&&e.Items)for(var n=0;n]*>/gi," ");n.length').html(n.substr(0,this.settings.commentsTextMaxLength))),e.append(o("").hide().html(t)),e.append(o('    ').text(this.settings.useReviews?this.resources.readFullReview:this.resources.readFullComment)))}},htmlEncode:function(e){return o("
    ").text(e).html()},createCommentMarkup:function(e){var t=this.getSingleCommentTemplate().clone(!0);if(t.find('[data-sf-role="list-rating-wrapper"]').show(),t.find('[data-sf-role="comment-avatar"]').attr("src",e.ProfilePictureThumbnailUrl).attr("alt",e.Name),t.find('[data-sf-role="comment-name"]').text(e.Name),t.find('[data-sf-role="comment-date"]').text(this.getDateFromSfString(e.DateCreated).toDateString()),this.attachCommentMessage(t.find('[data-sf-role="comment-message"]'),e.Message),this.settings.useReviews){var n=t.find('[data-sf-role="rating-of-resource"]'),s=t.find('[data-sf-role="list-rating-container"]').mvcRating({readOnly:!0,value:e.Rating,template:o('[data-sf-role="rating-template"]')});if(t.find('[data-sf-role="list-rating-value"]').text(e.Rating),0i.maxCommentsToShow&&(n.children().slice(-1*(i.commentsTakenSoFar-i.maxCommentsToShow)).remove(),i.commentsTakenSoFar=i.maxCommentsToShow)):n.append(t)})}},renderCommentsCount:function(){var e=this.settings.useReviews?this.resources.reviewSingular:this.resources.commentSingular,t=this.settings.useReviews?this.resources.reviewPlural:this.resources.commentsPlural,n=1Math.max(this.commentsTakenSoFar,this.settings.commentsPerPage)?"inline-block":"none"),this.getElementByDataSfRole("comments-count-list-wrapper").toggle(0!==this.allCommentsCount),this.getElementByDataSfRole("comments-count-anchor").hide()},loadComments:function(e,t,n){var s=this;if(!s.isLoadinglist)return s.isLoadingList=!0,s.listLoadingIndicator().show(),s.restApi.getComments(s.settings.commentsThreadKey,e,t,s.commentsSortedDescending,n).then(function(e){return e&&e.Items&&e.Items.length&&(s.commentsTakenSoFar+=e.Items.length,s.renderCommentsCount(),s.renderComments(e.Items,s.commentsContainer(),n&&s.commentsSortedDescending)),e}).always(function(){s.listLoadingIndicator().hide(),s.isLoadingList=!1})},refreshLastCommentDate:function(e){if(e&&e.Items&&e.Items.length){var t=this.commentsSortedDescending?e.Items[0]:e.Items[e.Items.length-1];this.lastCommentDate=this.getDateString(t.DateCreated,1)}},setAllCommentsCount:function(e,t,n){this.allCommentsCount=e,this.renderCommentsCount(),n||o(document).trigger("sf-comments-count-received",{key:this.settings.commentsThreadKey,count:this.allCommentsCount,rating:t})},refreshComments:function(t,e,n){var s=t.commentsSortedDescending?t.settings.commentsPerPage:t.maxCommentsToShow-t.commentsTakenSoFar;!t.commentsSortedDescending&&s<=0&&e?t.setAllCommentsCount(t.allCommentsCount+1):t.loadComments(0,s,t.lastCommentDate).then(function(e){t.refreshLastCommentDate(e),e&&e.TotalCount&&t.setAllCommentsCount(t.allCommentsCount+e.TotalCount,n)})},sortComments:function(e){var t=this;t.commentsSortedDescending!==e&&(t.commentsSortedDescending=e,t.commentsContainer().html(""),t.commentsTakenSoFar=0,t.loadComments(0,t.settings.commentsPerPage).then(function(){t.renderCommentsCount()}))},toggleSubscription:function(){var n=this;n.restApi.toggleSubscription(n.settings.commentsThreadKey,n.isSubscribedToNewComments).then(function(e){n.isSubscribedToNewComments=!n.isSubscribedToNewComments,n.commentsSubscribeButtonText().text(n.isSubscribedToNewComments?n.resources.unsubscribeLink:n.resources.subscribeLink);var t=n.settings.useReviews?n.resources.successfullySubscribedToNewReviews:n.resources.successfullySubscribedToNewComments;n.commentsSubscribeText().text(n.isSubscribedToNewComments?t:n.resources.successfullyUnsubscribedFromNewComments)})},buildNewCommentFromForm:function(){var e=this,t={Message:e.htmlEncode(e.newCommentMessage().val()),ThreadKey:e.settings.commentsThreadKey};return e.settings.useReviews&&(t.Rating=this.newCommentRatingContainer.getValue()),e.isUserAuthenticated||(t.Name=e.newCommentName().val(),t.Email=e.newCommentEmail().val(),e.settings.requiresCaptcha&&(t.Captcha={Answer:e.captchaInput().val(),Key:e.captchaData.key})),t.Thread=e.settings.commentsThread||{},t.Thread.Group=t.Thread.Group||{},t.Thread.Group.Key=t.Thread.Group.Key||t.Thread.groupKey,t},cleanNewCommentForm:function(){this.newCommentMessage().val(""),this.newCommentName().val(""),this.newCommentEmail().val(""),this.newCommentRatingContainer&&this.newCommentRatingContainer.setValue(0)},endSubmitNewComment:function(){!this.isUserAuthenticated&&this.settings.requiresCaptcha&&this.captchaRefresh(),this.submitLoadingIndicator().hide(),this.newCommentSubmitButton().show()},createCommentSuccess:function(e){if(this.cleanNewCommentForm(),this.settings.requiresApproval)this.newCommentPendingApprovalMessage().show();else if(!this.settings.commentsAutoRefresh){var t=this.settings.useReviews&&e?e.Rating:null;this.refreshComments(this,!0,t)}if(this.settings.useReviews){this.newCommentForm().hide(),this.newCommentFormButton().hide(),this.hasUserReviewed=!0;var n=this.settings.requiresApproval?this.newCommentPendingApprovalMessage().text():this.resources.thankYouReviewSubmited;this.newReviewFormReplacement().text(n).show()}},createCommentFail:function(e){if(e&&e.responseText){var t=JSON.parse(e.responseText).ResponseStatus.Message;this.newCommentSubmitButton().before(this.getErrorMessage(t,this.newCommentSubmitButton()))}},submitNewComment:function(){var t=this;t.submitLoadingIndicator().show(),t.newCommentSubmitButton().hide();var n=t.buildNewCommentFromForm(),e=JSON.parse(JSON.stringify(n));e.Message=e.Message.trim(),t.validateComment(e).then(function(e){e?(n.Message=n.Message.replace(new RegExp("\\n","g"),"
    "),t.restApi.createComment(n).then(function(e){t.createCommentSuccess(e)},function(e){t.createCommentFail(e)}).always(function(){t.endSubmitNewComment()})):t.endSubmitNewComment()})},captchaRefresh:function(){var t=this,n=o.Deferred();t.captchaImage().attr("src",""),t.captchaInput().hide(),t.restApi.getCaptcha().then(function(e){e&&(t.captchaImage().attr("src","data:image/png;base64,"+e.Image),t.captchaData.key=e.Key,t.captchaInput().val(""),t.captchaInput().show()),n.resolve(!0)})},setupCaptcha:function(){!this.isUserAuthenticated&&this.settings.requiresCaptcha&&(this.captchaData={key:null},this.captchaRefresh(),this.captchaContainer().show())},initializeProperties:function(){this.restApi=new t(this.settings.rootUrl,this.settings.createCommentUrl,this.settings.isUserAuthenticatedUrl,this.settings.hasUserAlreadyReviewedUrl),this.isLoadingList=!1,this.isSubscribedToNewComments=!1,this.maxCommentsToShow=this.settings.commentsPerPage;var e=this.newCommentRating();e&&e.length&&(this.newCommentRatingContainer=e.mvcRating({template:o('[data-sf-role="rating-template"]')})),this.newCommentRequiresAuthentication().hide(),this.newCommentPendingApprovalMessage().hide(),this.settings.useReviews&&this.newReviewFormReplacement().hide(),this.commentsSortedDescending?this.commentsSortNewButton().addClass(this.isSelectedSortButtonCssClass):this.commentsSortOldButton().addClass(this.isSelectedSortButtonCssClass)},initializeUserStatus:function(){var t=this;t.restApi.getIsUserAuthenticated().then(function(e){e&&(e.IsAuthenticated?(t.isUserAuthenticated=!0,t.initializeSubscription()):(t.commentsSubscribeText().hide(),t.commentsSubscribeButton().hide(),t.settings.requiresAuthentication&&(t.newCommentForm().hide(),t.newCommentRequiresAuthentication().show())),t.settings.useReviews&&t.initializeHasUserAlreadyReviewed()),o.proxy(t.setupCaptcha(),t)})},initializeSubscription:function(){var s=this;s.settings.commentsThreadKey&&s.restApi.getSubscriptionStatus(s.settings.commentsThreadKey).then(function(e){if(e){s.isSubscribedToNewComments=e.IsSubscribed;var t=s.settings.useReviews?s.resources.subscribeToNewReviews:s.resources.subscribeToNewComments,n=s.settings.useReviews?s.resources.youAreSubscribedToNewReviews:s.resources.youAreSubscribedToNewComments;s.commentsSubscribeButtonText().text(s.isSubscribedToNewComments?s.resources.unsubscribeLink:t),s.commentsSubscribeText().text(s.isSubscribedToNewComments?n:""),s.commentsSubscribeButton().click(function(){return s.toggleSubscription(),!1})}})},initializeComments:function(){var t=this;t.settings.commentsThreadKey&&(t.restApi.getCommentsCount(t.settings.commentsThreadKey).then(function(e){t.setAllCommentsCount(e,null,!0)}),t.loadComments(0,t.settings.commentsPerPage).then(function(e){t.refreshLastCommentDate(e)}),t.settings.commentsAutoRefresh&&setInterval(function(){t.refreshComments(t)},t.settings.commentsRefreshInterval))},initializeHasUserAlreadyReviewed:function(){var t=this;t.restApi.getHasUserAlreadyReviewed(t.settings.commentsThreadKey).then(function(e){e&&e.AuthorAlreadyReviewed&&(t.newCommentForm().hide(),t.newCommentFormButton().hide(),t.newReviewFormReplacement().show(),t.newCommentRequiresAuthentication().hide(),t.hasUserReviewed=!0)})},initializeHandlers:function(){var e=this;e.commentsLoadMoreButton().click(function(){return e.maxCommentsToShow+=e.settings.commentsPerPage,e.loadComments(e.commentsTakenSoFar,e.settings.commentsPerPage),!1}),e.commentsContainer().on("click",'[data-sf-role="comments-read-full-comment-button"]',function(e){if(e&&e.target)return o(e.target).hide().siblings().show(),o(e.target).siblings('[data-sf-role="comments-read-substr-comment-header"]').hide(),!1}),e.commentsSortNewButton().click(function(){return e.sortComments(!0),e.commentsSortNewButton().addClass(e.isSelectedSortButtonCssClass),e.commentsSortOldButton().removeClass(e.isSelectedSortButtonCssClass),!1}),e.commentsSortOldButton().click(function(){return e.sortComments(!1),e.commentsSortOldButton().addClass(e.isSelectedSortButtonCssClass),e.commentsSortNewButton().removeClass(e.isSelectedSortButtonCssClass),!1}),e.newCommentFormButton().click(function(){return o("html, body").animate({scrollTop:e.newCommentForm().offset().top},1e3),!1}),e.newCommentSubmitButton().click(function(){return e.settings.isDesignMode||(e.errorMessage().hide(),e.getElementByDataSfRole("error-message").find("span").text(""),e.getElementByDataSfRole("error-message").hide(),e.submitNewComment()),!1}),e.captchaRefreshLink().click(function(){return e.captchaRefresh(),!1}),e.newCommentMessage().focus(function(){e.isUserAuthenticated||e.commentsNewLoggedOutView().show()})},initialize:function(){this.initializeProperties(),this.initializeUserStatus(),this.initializeComments(),this.initializeHandlers()}},window.personalizationManager?window.personalizationManager.addPersonalizedContentLoaded(function(){new e}):o(function(){new e})}(jQuery); //# sourceMappingURL=comments-list.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js.map b/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js.map index 795b0a9a2..7411abcd3 100644 --- a/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js.map +++ b/Telerik.Sitefinity.Frontend.Comments/Mvc/Scripts/comments-list.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["comments-list.js"],"names":["$","RestApi","rootUrl","createCommentUrl","isUserAuthenticatedUrl","hasUserAlreadyReviewedUrl","this","length","CommentsListWidget","wrapper","settings","resources","commentsTakenSoFar","maxCommentsToShow","allCommentsCount","lastCommentDate","commentsSortedDescending","commentsInitiallySortedDescending","Initialization","each","element","JSON","parse","find","val","initialize","prototype","isUserAuthenticated","getRandomNumber","Math","random","toString","substr","Date","getTime","makeAjax","url","type","data","options","contentType","accepts","text","cache","ajax","getCommentsCount","threadKey","status","getCommentsCountUrl","then","response","count","Items","i","Key","Count","getComments","skip","take","sortDescending","newerThan","language","getCommentsUrl","encodeURIComponent","createComment","comment","stringify","getSubscriptionStatus","subscriptionStatusUrl","toggleSubscription","unsubscribe","toggleSubscriptionUrl","getCaptcha","getCaptchaUrl","getIsUserAuthenticated","userAuthenticatedUrl","getHasUserAlreadyReviewed","userAlreadyReviewedUrl","hasUserReviewed","isSelectedSortButtonCssClass","getOrInitializeProperty","property","sfRole","getElementByDataSfRole","getSingleCommentTemplate","singleCommentTemplate","html","first","commentsContainer","commentsTotalCount","commentsHeader","commentsLoadMoreButton","commentsNewLoggedOutView","newCommentForm","newCommentPendingApprovalMessage","newCommentFormButton","newCommentSubmitButton","newCommentMessage","newCommentRating","newCommentName","newCommentEmail","newCommentRequiresAuthentication","commentsSortNewButton","commentsSortOldButton","captchaContainer","captchaImage","captchaInput","captchaRefreshLink","errorMessage","listLoadingIndicator","submitLoadingIndicator","commentsSubscribeText","commentsSubscribeButton","commentsSubscribeButtonText","newReviewFormReplacement","getSfStringFromDate","date","getDateFromSfString","sfDateString","parseInt","replace","getDateString","secondsOffset","setMinutes","getMinutes","getTimezoneOffset","setSeconds","getSeconds","toISOString","isValidEmail","email","test","getErrorMessage","error","container","errorMessageEl","attr","next","clone","show","validateComment","self","deferred","Deferred","isValid","errorAriaAttr","Message","after","messageIsRequired","Name","nameIsRequired","Email","invalidEmailFormat","useReviews","Rating","ratingIsRequired","resolve","promise","attachCommentMessage","message","rawText","commentsTextMaxLength","append","hide","readFullReview","readFullComment","htmlEncode","str","createCommentMarkup","newComment","ProfilePictureThumbnailUrl","DateCreated","toDateString","ofResourceLabel","ratingSettings","mvcRating","readOnly","value","template","ofLabel","toLocaleLowerCase","maxValue","renderComments","comments","doPrepend","forEach","prepend","children","slice","remove","renderCommentsCount","singularText","reviewSingular","commentSingular","pluralText","reviewPlural","commentsPlural","multipleText","toggle","css","max","commentsPerPage","loadComments","isLoadinglist","isLoadingList","restApi","commentsThreadKey","always","refreshLastCommentDate","itemToTake","setAllCommentsCount","rating","supressEvent","document","trigger","key","refreshComments","isNewCommentPosted","commentsToTake","TotalCount","sortComments","useDescending","isSubscribedToNewComments","unsubscribeLink","subscribeLink","successfullySubscribedtext","successfullySubscribedToNewReviews","successfullySubscribedToNewComments","successfullyUnsubscribedFromNewComments","buildNewCommentFromForm","ThreadKey","newCommentRatingContainer","getValue","requiresCaptcha","Captcha","Answer","captchaData","Thread","commentsThread","Group","groupKey","cleanNewCommentForm","setValue","endSubmitNewComment","captchaRefresh","createCommentSuccess","requiresApproval","commentsAutoRefresh","textToShow","thankYouReviewSubmited","createCommentFail","jqXHR","responseText","errorTxt","ResponseStatus","before","submitNewComment","commentWithTrimmedMessage","trim","RegExp","Image","setupCaptcha","initializeProperties","rContainer","addClass","initializeUserStatus","IsAuthenticated","initializeSubscription","requiresAuthentication","initializeHasUserAlreadyReviewed","proxy","IsSubscribed","subscribeText","subscribeToNewReviews","subscribeToNewComments","youAreSubscribedText","youAreSubscribedToNewReviews","youAreSubscribedToNewComments","click","initializeComments","setInterval","commentsRefreshInterval","AuthorAlreadyReviewed","initializeHandlers","on","e","target","siblings","removeClass","animate","scrollTop","offset","top","isDesignMode","focus","window","personalizationManager","addPersonalizedContentLoaded","jQuery"],"mappings":"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","file":"comments-list.min.js"} \ No newline at end of file +{"version":3,"sources":["comments-list.js"],"names":["$","RestApi","rootUrl","createCommentUrl","isUserAuthenticatedUrl","hasUserAlreadyReviewedUrl","this","length","CommentsListWidget","wrapper","settings","resources","commentsTakenSoFar","maxCommentsToShow","allCommentsCount","lastCommentDate","commentsSortedDescending","commentsInitiallySortedDescending","Initialization","each","element","JSON","parse","find","val","initialize","prototype","isUserAuthenticated","getRandomNumber","Math","random","toString","substr","Date","getTime","makeAjax","url","type","data","options","contentType","accepts","text","cache","ajax","getCommentsCount","threadKey","status","getCommentsCountUrl","then","response","count","Items","i","Key","Count","getComments","skip","take","sortDescending","newerThan","language","getCommentsUrl","encodeURIComponent","createComment","comment","stringify","getSubscriptionStatus","subscriptionStatusUrl","toggleSubscription","unsubscribe","toggleSubscriptionUrl","getCaptcha","getCaptchaUrl","getIsUserAuthenticated","userAuthenticatedUrl","getHasUserAlreadyReviewed","userAlreadyReviewedUrl","hasUserReviewed","isSelectedSortButtonCssClass","getOrInitializeProperty","property","sfRole","getElementByDataSfRole","getSingleCommentTemplate","singleCommentTemplate","html","first","commentsContainer","commentsTotalCount","commentsHeader","commentsLoadMoreButton","commentsNewLoggedOutView","newCommentForm","newCommentPendingApprovalMessage","newCommentFormButton","newCommentSubmitButton","newCommentMessage","newCommentRating","newCommentName","newCommentEmail","newCommentRequiresAuthentication","commentsSortNewButton","commentsSortOldButton","captchaContainer","captchaImage","captchaInput","captchaRefreshLink","errorMessage","listLoadingIndicator","submitLoadingIndicator","commentsSubscribeText","commentsSubscribeButton","commentsSubscribeButtonText","newReviewFormReplacement","getSfStringFromDate","date","getDateFromSfString","sfDateString","parseInt","replace","getDateString","secondsOffset","alwaysUseUtc","setMinutes","getMinutes","getTimezoneOffset","setSeconds","getSeconds","toISOString","isValidEmail","email","test","getErrorMessage","error","container","errorMessageEl","attr","next","clone","show","validateComment","self","deferred","Deferred","isValid","errorAriaAttr","Message","after","messageIsRequired","Name","nameIsRequired","Email","invalidEmailFormat","useReviews","Rating","ratingIsRequired","resolve","promise","attachCommentMessage","message","rawText","commentsTextMaxLength","append","hide","readFullReview","readFullComment","htmlEncode","str","createCommentMarkup","newComment","ProfilePictureThumbnailUrl","DateCreated","toDateString","ofResourceLabel","ratingSettings","mvcRating","readOnly","value","template","ofLabel","toLocaleLowerCase","maxValue","renderComments","comments","doPrepend","forEach","prepend","children","slice","remove","renderCommentsCount","singularText","reviewSingular","commentSingular","pluralText","reviewPlural","commentsPlural","multipleText","toggle","css","max","commentsPerPage","loadComments","isLoadinglist","isLoadingList","restApi","commentsThreadKey","always","refreshLastCommentDate","itemToTake","setAllCommentsCount","rating","supressEvent","document","trigger","key","refreshComments","isNewCommentPosted","commentsToTake","TotalCount","sortComments","useDescending","isSubscribedToNewComments","unsubscribeLink","subscribeLink","successfullySubscribedtext","successfullySubscribedToNewReviews","successfullySubscribedToNewComments","successfullyUnsubscribedFromNewComments","buildNewCommentFromForm","ThreadKey","newCommentRatingContainer","getValue","requiresCaptcha","Captcha","Answer","captchaData","Thread","commentsThread","Group","groupKey","cleanNewCommentForm","setValue","endSubmitNewComment","captchaRefresh","createCommentSuccess","requiresApproval","commentsAutoRefresh","textToShow","thankYouReviewSubmited","createCommentFail","jqXHR","responseText","errorTxt","ResponseStatus","before","submitNewComment","commentWithTrimmedMessage","trim","RegExp","Image","setupCaptcha","initializeProperties","rContainer","addClass","initializeUserStatus","IsAuthenticated","initializeSubscription","requiresAuthentication","initializeHasUserAlreadyReviewed","proxy","IsSubscribed","subscribeText","subscribeToNewReviews","subscribeToNewComments","youAreSubscribedText","youAreSubscribedToNewReviews","youAreSubscribedToNewComments","click","initializeComments","setInterval","commentsRefreshInterval","AuthorAlreadyReviewed","initializeHandlers","on","e","target","siblings","removeClass","animate","scrollTop","offset","top","isDesignMode","focus","window","personalizationManager","addPersonalizedContentLoaded","jQuery"],"mappings":"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","file":"comments-list.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj b/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj index b84f0c30c..ea64ee5fe 100644 --- a/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj +++ b/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj @@ -51,10 +51,8 @@ True False - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False @@ -166,31 +164,31 @@ - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Services.Comments.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Services.Comments.dll True - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Comments/packages.config b/Telerik.Sitefinity.Frontend.Comments/packages.config index b0fe8f886..1a74d6a7e 100644 --- a/Telerik.Sitefinity.Frontend.Comments/packages.config +++ b/Telerik.Sitefinity.Frontend.Comments/packages.config @@ -4,13 +4,13 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj b/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj index 9a32c5c7f..5d0c56bbb 100644 --- a/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj +++ b/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj @@ -53,10 +53,8 @@ True False - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False @@ -152,31 +150,31 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.ContentBlock/packages.config b/Telerik.Sitefinity.Frontend.ContentBlock/packages.config index f01421a2c..d50291526 100644 --- a/Telerik.Sitefinity.Frontend.ContentBlock/packages.config +++ b/Telerik.Sitefinity.Frontend.ContentBlock/packages.config @@ -4,13 +4,13 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Models/DynamicContentModel.cs b/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Models/DynamicContentModel.cs index 1ce8947e3..275bad07a 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Models/DynamicContentModel.cs +++ b/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Models/DynamicContentModel.cs @@ -48,7 +48,8 @@ public override IList GetKeysOfDependentObjects(ContentListV var result = new List(2); var manager = this.GetManager(); string applicationName = manager != null && manager.Provider != null ? manager.Provider.ApplicationName : string.Empty; - result.Add(new CacheDependencyKey { Key = string.Concat(Telerik.Sitefinity.GenericContent.Model.ContentLifecycleStatus.Live.ToString(), applicationName, this.ContentType.FullName), Type = typeof(Telerik.Sitefinity.DynamicModules.Model.DynamicContent) }); + + result.AddRange(OutputCacheDependencyHelper.GetPublishedContentCacheDependencyKeys(this.ContentType, applicationName)); result.Add(new CacheDependencyKey() { Key = this.ContentType.FullName, Type = typeof(DynamicModule) }); this.AddCommonDependencies(result, this.ContentType); @@ -68,7 +69,7 @@ public override IList GetKeysOfDependentObjects(ContentDetai var result = new List(2); if (viewModel.Item != null && viewModel.Item.Fields.Id != Guid.Empty) { - result.Add(new CacheDependencyKey { Key = viewModel.Item.Fields.Id.ToString().ToUpperInvariant(), Type = typeof(Telerik.Sitefinity.DynamicModules.Model.DynamicContent) }); + result.AddRange(OutputCacheDependencyHelper.GetPublishedContentCacheDependencyKeys(this.ContentType, viewModel.Item.Fields.Id)); result.Add(new CacheDependencyKey() { Key = this.ContentType.FullName, Type = typeof(DynamicModule) }); } diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/DynamicContent/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/DynamicContent/DesignerView.Simple.cshtml index cac84af20..a9ebe73c6 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/DynamicContent/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/DynamicContent/DesignerView.Simple.cshtml @@ -171,7 +171,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + ""))
    @@ -183,7 +183,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + ""))
    diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/MvcWidgetInstaller.cs b/Telerik.Sitefinity.Frontend.DynamicContent/MvcWidgetInstaller.cs index 5edab8865..19045cb5e 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/MvcWidgetInstaller.cs +++ b/Telerik.Sitefinity.Frontend.DynamicContent/MvcWidgetInstaller.cs @@ -66,23 +66,23 @@ private static void RegisterTemplates(Telerik.Sitefinity.DynamicModules.Builder. { templateGenerator.InstallMasterTemplate(dynamicModule, dynamicModuleType); templateGenerator.InstallDetailTemplate(dynamicModule, dynamicModuleType); - }, + }, transactionName); } private static void RegisterToolboxItem(Telerik.Sitefinity.DynamicModules.Builder.Model.DynamicModule dynamicModule, DynamicModuleType moduleType) { - MvcWidgetInstaller.UnregisterToolboxItem(moduleType.GetFullTypeName()); var configurationManager = ConfigManager.GetManager(); var toolboxesConfig = configurationManager.GetSection(); - + var toolboxItemName = GetToolboxItemName(moduleType.GetFullTypeName()); + var section = MvcWidgetInstaller.GetModuleToolboxSection(dynamicModule, toolboxesConfig); - if (section == null) + if (section == null || section.Tools.Any(e => e.Name == toolboxItemName)) return; var toolboxItem = new ToolboxItem(section.Tools) { - Name = moduleType.GetFullTypeName() + "_MVC", + Name = toolboxItemName, Ordinal = 0.5f, Title = PluralsResolver.Instance.ToPlural(moduleType.DisplayName), Description = string.Empty, @@ -90,8 +90,8 @@ private static void RegisterToolboxItem(Telerik.Sitefinity.DynamicModules.Builde ControlType = typeof(MvcWidgetProxy).AssemblyQualifiedName, ControllerType = typeof(DynamicContentController).FullName, CssClass = "sfNewsViewIcn sfMvcIcn", - Parameters = new NameValueCollection() - { + Parameters = new NameValueCollection() + { { "WidgetName", moduleType.TypeName }, { "ControllerName", typeof(DynamicContentController).FullName } } @@ -111,7 +111,7 @@ private static void RegisterToolboxItem(Telerik.Sitefinity.DynamicModules.Builde private static ToolboxSection GetModuleToolboxSection(DynamicModule dynamicModule, ToolboxesConfig toolboxesConfig) { var pageControls = toolboxesConfig.Toolboxes["PageControls"]; - var moduleSectionName = string.Concat(DynamicModuleType.defaultNamespace, ".", MvcWidgetInstaller.moduleNameValidationRegex.Replace(dynamicModule.Name, string.Empty)); + var moduleSectionName = string.Concat(DynamicModuleType.defaultNamespace, ".", MvcWidgetInstaller.moduleNameValidationRegex.Replace(dynamicModule.Name, string.Empty)); ToolboxSection section = pageControls.Sections.Where(e => e.Name == moduleSectionName).FirstOrDefault(); if (section == null) @@ -150,12 +150,12 @@ private static void UnregisterToolboxItem(string contentTypeName) var toolboxesConfig = configurationManager.GetSection(); var pageControls = toolboxesConfig.Toolboxes["PageControls"]; var moduleSectionName = contentTypeName.Substring(0, contentTypeName.LastIndexOf('.')); - + var section = pageControls.Sections.Where(e => e.Name == moduleSectionName).FirstOrDefault(); if (section != null) { var itemToDelete = section.Tools.FirstOrDefault(e => e.Name == MvcWidgetInstaller.GetToolboxItemName(contentTypeName)); - + if (itemToDelete != null) { section.Tools.Remove(itemToDelete); @@ -232,7 +232,7 @@ private static void DynamicModuleTypeDeletingEventHandler(IDynamicModuleTypeDele var transactionName = MvcWidgetInstaller.GetTransactionName(@event.Item); MvcWidgetInstaller.TemplateGaneratorAction( - templateGenerator => templateGenerator.UnregisterTemplates(@event.Item.GetFullTypeName()), + templateGenerator => templateGenerator.UnregisterTemplates(@event.Item.GetFullTypeName()), transactionName); MvcWidgetInstaller.UnregisterToolboxItem(@event.Item.GetFullTypeName()); diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj b/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj index 49d554a64..bba67c156 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj +++ b/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj @@ -61,11 +61,11 @@ False     - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -211,35 +211,35 @@ - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/WidgetTemplates/Fields/Scripts/address-field.min.js b/Telerik.Sitefinity.Frontend.DynamicContent/WidgetTemplates/Fields/Scripts/address-field.min.js index 853395bb6..3ae64c06a 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/WidgetTemplates/Fields/Scripts/address-field.min.js +++ b/Telerik.Sitefinity.Frontend.DynamicContent/WidgetTemplates/Fields/Scripts/address-field.min.js @@ -1,2 +1,2 @@ -!function(r){r(document).ready(function(){function o(a,t,i){var o=this,e={minZoom:2,zoom:i,maxZoom:16,panControl:!1};a.gmap(e).bind("init",function(e,n){t?function(e,n,a){a&&function(e,n){e.gmap("option","zoom",n)}(e,a),e.gmap("clear","markers"),function(e){e.gmap("get","map").getStreetView().setVisible(!1)}(e);e.gmap("addMarker",{position:n,draggable:!1,bounds:!1});e.gmap("get","map").setOptions({center:n})}(a,t,i):o._enabled&&o._setCurrentLocation()})}r(".viewMapLnk").bind("click",function(e){var n=r(e.currentTarget).siblings(".addressMapWrp");n.toggle(),n.is(":visible")&&function(e){e.gmap("refresh");var n=e.gmap("get","markers");if(0 + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/SubscribeFormController.cs b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/SubscribeFormController.cs index 6e1cb908b..9a7f29aca 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/SubscribeFormController.cs +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/SubscribeFormController.cs @@ -196,9 +196,9 @@ public ActionResult Subscribe(SubscribeFormViewModel viewModel) { var validator = ObjectFactory.Resolve(); var redirectUrl = viewModel.RedirectPageUrl; - if (this.Model.SuccessfullySubmittedForm == SuccessfullySubmittedForm.OpenSpecificPage && !string.IsNullOrEmpty(viewModel.RedirectPageUrl) && validator.IsValid(redirectUrl)) + if (this.Model.SuccessfullySubmittedForm == SuccessfullySubmittedForm.OpenSpecificPage && !string.IsNullOrEmpty(redirectUrl) && validator.IsValid(redirectUrl)) { - return this.Redirect(viewModel.RedirectPageUrl); + return this.Redirect(redirectUrl); } this.ModelState.Clear(); diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/UnsubscribeFormController.cs b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/UnsubscribeFormController.cs index 6063abe42..eed9ec853 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/UnsubscribeFormController.cs +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Controllers/UnsubscribeFormController.cs @@ -200,9 +200,9 @@ public ActionResult Unsubscribe(UnsubscribeFormViewModel viewModel) { var redirectUrl = viewModel.RedirectPageUrl; var validator = ObjectFactory.Resolve(); - if (this.Model.SuccessfullySubmittedForm == SuccessfullySubmittedForm.OpenSpecificPage && !string.IsNullOrEmpty(viewModel.RedirectPageUrl) && validator.IsValid(redirectUrl)) + if (this.Model.SuccessfullySubmittedForm == SuccessfullySubmittedForm.OpenSpecificPage && !string.IsNullOrEmpty(redirectUrl) && validator.IsValid(redirectUrl)) { - return this.Redirect(viewModel.RedirectPageUrl); + return this.Redirect(redirectUrl); } this.ModelState.Clear(); diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/SubscribeForm/SubscribeFormViewModel.cs b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/SubscribeForm/SubscribeFormViewModel.cs index bb7c88c93..c3dfda455 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/SubscribeForm/SubscribeFormViewModel.cs +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/SubscribeForm/SubscribeFormViewModel.cs @@ -7,7 +7,7 @@ namespace Telerik.Sitefinity.Frontend.EmailCampaigns.Mvc.Models /// /// This class represents the view model of the subscribe form item. /// - [Bind(Exclude = "CssClass, RedirectPageUrl")] + [Bind(Include = "FirstName, LastName, Email")] public class SubscribeFormViewModel { /// diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/UnsubscribeForm/UnsubscribeFormViewModel.cs b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/UnsubscribeForm/UnsubscribeFormViewModel.cs index b9d89ca7f..fb3397a1b 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/UnsubscribeForm/UnsubscribeFormViewModel.cs +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Models/UnsubscribeForm/UnsubscribeFormViewModel.cs @@ -6,7 +6,7 @@ namespace Telerik.Sitefinity.Frontend.EmailCampaigns.Mvc.Models.UnsubscribeForm /// /// This class represents the view model of Unsubscribe widget. /// - [Bind(Exclude = "Message, WidgetTitle, WidgetDescription, RedirectPageUrl, CssClass")] + [Bind(Include = "Email")] public class UnsubscribeFormViewModel { /// diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj b/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj index 6052b2019..73b04063f 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj @@ -69,11 +69,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -173,27 +173,27 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config b/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config index 6b75e10d1..ce23c5a40 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config @@ -4,17 +4,18 @@ + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Events/Mvc/Controllers/EventSchedulerController.cs b/Telerik.Sitefinity.Frontend.Events/Mvc/Controllers/EventSchedulerController.cs index e2a1d273e..f498d298d 100644 --- a/Telerik.Sitefinity.Frontend.Events/Mvc/Controllers/EventSchedulerController.cs +++ b/Telerik.Sitefinity.Frontend.Events/Mvc/Controllers/EventSchedulerController.cs @@ -204,7 +204,7 @@ public ActionResult GetEvents(EventsFilter filter) Guard.ArgumentNotNull(filter, "filter"); - var eventSchedulerModel = EventSchedulerHelper.LoadModel(filter.Id, filter.UICulture, filter.CurrentPageId); + var eventSchedulerModel = ControllerHelper.LoadControllerModel(filter.Id, filter.UICulture, filter.CurrentPageId) as IEventSchedulerModel; if (eventSchedulerModel != null) { json.Data = eventSchedulerModel.GetEvents(filter); @@ -229,7 +229,7 @@ public ActionResult GetCalendars(EventsFilter filter) Guard.ArgumentNotNull(filter, "filter"); - var eventSchedulerModel = EventSchedulerHelper.LoadModel(filter.Id, filter.UICulture, filter.CurrentPageId); + var eventSchedulerModel = ControllerHelper.LoadControllerModel(filter.Id, filter.UICulture, filter.CurrentPageId) as IEventSchedulerModel; if (eventSchedulerModel != null) { json.Data = eventSchedulerModel.GetCalendars(filter); @@ -270,7 +270,7 @@ protected virtual void InitializeListViewBag(string redirectPageUrl) if (this.HttpContext != null && this.HttpContext.Items.Contains("versionpreview") && this.HttpContext.Items["versionpreview"].ToString().ToLowerInvariant() == "true") { - this.ViewBag.WidgetId = EventSchedulerHelper.GetWidgetId(this); + this.ViewBag.WidgetId = ControllerHelper.GetWidgetId(this); } else { diff --git a/Telerik.Sitefinity.Frontend.Events/Mvc/Helpers/EventSchedulerHelper.cs b/Telerik.Sitefinity.Frontend.Events/Mvc/Helpers/EventSchedulerHelper.cs index 2d69d2cc5..dd0882428 100644 --- a/Telerik.Sitefinity.Frontend.Events/Mvc/Helpers/EventSchedulerHelper.cs +++ b/Telerik.Sitefinity.Frontend.Events/Mvc/Helpers/EventSchedulerHelper.cs @@ -1,21 +1,5 @@ using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Web; -using System.Web.Mvc; -using System.Web.Routing; -using Telerik.Sitefinity.Frontend.Events.Mvc.Controllers; -using Telerik.Sitefinity.Frontend.Events.Mvc.Models.EventScheduler; -using Telerik.Sitefinity.Modules.Pages; -using Telerik.Sitefinity.Modules.Pages.Web.Services; -using Telerik.Sitefinity.Mvc.Proxy; -using Telerik.Sitefinity.Pages.Model; -using Telerik.Sitefinity.Security.Claims; using Telerik.Sitefinity.Services; -using Telerik.Sitefinity.Web; namespace Telerik.Sitefinity.Frontend.Events.Mvc.Helpers { @@ -24,169 +8,6 @@ namespace Telerik.Sitefinity.Frontend.Events.Mvc.Helpers /// internal class EventSchedulerHelper { - public static IEventSchedulerModel LoadModel(Guid widgetId, CultureInfo culture, Guid pageId = new Guid()) - { - var pageManager = PageManager.GetManager(); - ObjectData objectData = null; - if (pageId != Guid.Empty) - objectData = EventSchedulerHelper.GetOverridingControlForPage(widgetId, pageId); - - if (objectData == null) - objectData = pageManager.GetControls().SingleOrDefault(p => p.Id == widgetId); - - if (objectData is PageDraftControl && ClaimsManager.IsBackendUser() == false) - return null; - - IEventSchedulerModel model = null; - - if (objectData != null) - { - var mvcProxy = pageManager.LoadControl(objectData, culture) as MvcControllerProxy; - - if (mvcProxy != null) - { - var schedullerController = mvcProxy.Controller as EventSchedulerController; - if (schedullerController != null) - model = schedullerController.Model; - } - } - - return model; - } - - /// - /// Get controller widget id - /// - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCopPlus.StyleCopPlusRules", "SP2101:MethodMustNotContainMoreLinesThan")] - public static Guid GetWidgetId(Controller controller) - { - var pageManager = PageManager.GetManager(); - var viewBagControlId = controller.ViewData[ControllerKey]; - if (viewBagControlId == null) - return Guid.Empty; - - string controlId = (string)viewBagControlId; - - // templates - if (controller.HttpContext.Items[IsTemplate] != null && (bool)controller.HttpContext.Items[IsTemplate] == true) - { - // check if action is after save or cancel in template - if (controller.HttpContext.Items[FormControlId] != null) - return (Guid)controller.HttpContext.Items[FormControlId]; - - var templateId = GetTemplateIdKey(controller.ControllerContext.HttpContext); - var versionId = GetVersionNumberKey(controller.ControllerContext.HttpContext); - - if (templateId != null && versionId != null) - { - var template = pageManager.GetTemplate(new Guid(templateId)); - if (template != null) - { - var versionManager = Telerik.Sitefinity.Versioning.VersionManager.GetManager(); - TemplateDraft draft = new TemplateDraft(); - versionManager.GetSpecificVersionByChangeId(draft, new Guid(versionId)); - - var control = GetControl(draft.Controls, controlId); - if (control != null) - return control.OriginalControlId; - } - } - - // check if loaded in template - var templateData = controller.HttpContext.Items[TemplateDraftProxy] as Telerik.Sitefinity.Modules.Pages.TemplateDraftProxy; - if (templateData != null) - { - var template = pageManager.GetTemplate(templateData.ParentItemId); - if (template != null) - { - if (SystemManager.IsDesignMode || SystemManager.IsPreviewMode) - { - var control = GetControl(template.Drafts.FirstOrDefault(p => p.IsTempDraft).Controls, controlId); - if (control != null) - return control.Id; - } - else - { - var control = GetControl(template.Controls, controlId); - if (control != null) - return control.Id; - } - } - } - } - else - { - // pages - var pageId = SiteMapBase.GetCurrentNode().PageId; - var page = pageManager.GetPageData(pageId); - - if (page.Template != null) - { - var templateControl = GetControl(page.Template.Controls, controlId); - if (templateControl != null) - return templateControl.Id; - } - - if (SystemManager.IsDesignMode || SystemManager.IsPreviewMode) - { - var pageDraft = page.Drafts.FirstOrDefault(p => p.IsTempDraft); - - // Draft, if page is created page template is null, only draft is avalaible - if (page.Template == null && pageDraft.TemplateId != Guid.Empty) - { - var template = pageManager.GetTemplate(pageDraft.TemplateId); - if (template != null) - { - var templateControl = GetControl(template.Controls, controlId); - if (templateControl != null) - return templateControl.Id; - } - } - - var control = GetControl(pageDraft.Controls, controlId); - if (control != null) - return control.Id; - } - else - { - var control = GetControl(page.Controls, controlId); - if (control != null) - return control.Id; - } - } - - return Guid.Empty; - } - - private static ControlData GetOverridingControlForPage(Guid controlId, Guid pageId) - { - var pageManager = PageManager.GetManager(); - ControlData overridingControl = pageManager.GetControls().Where(c => c.Page.Id == pageId && (c.Id == controlId || c.BaseControlId == controlId)).FirstOrDefault(); - - if (overridingControl == null) - overridingControl = pageManager.GetControls().Where(c => c.Page.Id == pageId && (c.Id == controlId || c.BaseControlId == controlId)).FirstOrDefault(); - - if (overridingControl == null) - { - var pageDraft = pageManager.GetDrafts().Where(a => a.Id == pageId).FirstOrDefault(); - if (pageDraft != null) - { - var iter = pageManager.GetTemplates().Where(c => c.Id == pageDraft.TemplateId).FirstOrDefault(); - - while (iter != null) - { - overridingControl = pageManager.GetControls().Where(c => c.Page.Id == iter.Id && (c.Id == controlId || c.BaseControlId == controlId)).FirstOrDefault(); - if (overridingControl != null) - break; - iter = iter.ParentTemplate; - } - } - } - - return overridingControl; - } - public static bool IsRtl() { var currentCulture = SystemManager.CurrentContext.AppSettings.CurrentCulture; @@ -194,42 +15,6 @@ public static bool IsRtl() return isRtl; } - private static ControlData GetControl(IEnumerable controls, string controlId) - { - return controls.FirstOrDefault(p => p.Properties.FirstOrDefault(t => t.Name == "ID" && controlId.EndsWith(t.Value)) != null); - } - - private static string GetTemplateIdKey(HttpContextBase context) - { - var requestContext = context.Items[RouteHandler.RequestContextKey] as RequestContext ?? context.Request.RequestContext; - if (requestContext.RouteData.Values.ContainsKey("itemId")) - { - return requestContext.RouteData.Values["itemId"] as string; - } - else - { - return null; - } - } - - private static string GetVersionNumberKey(HttpContextBase context) - { - var requestContext = context.Items[RouteHandler.RequestContextKey] as RequestContext ?? context.Request.RequestContext; - var keys = requestContext.RouteData.Values["Params"] as string[]; - if (requestContext.RouteData.Values.ContainsKey("VersionNumber")) - { - return requestContext.RouteData.Values["VersionNumber"] as string; - } - else - { - return null; - } - } - private static string[] rtlLanguages = { "ar", "he", "fa", "ku", "ur", "dv", "ps", "ha", "ks", "yi" }; - private const string TemplateDraftProxy = "TemplateDraftProxy"; - private const string IsTemplate = "IsTemplate"; - private const string FormControlId = "FormControlId"; - private const string ControllerKey = "sf_cntrl_id"; } } \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Events/Mvc/Scripts/Event/designerview-simple.js b/Telerik.Sitefinity.Frontend.Events/Mvc/Scripts/Event/designerview-simple.js index e7945522c..c06cee815 100644 --- a/Telerik.Sitefinity.Frontend.Events/Mvc/Scripts/Event/designerview-simple.js +++ b/Telerik.Sitefinity.Frontend.Events/Mvc/Scripts/Event/designerview-simple.js @@ -149,7 +149,6 @@ $scope.properties.ContentViewDisplayMode.PropertyValue = 'Automatic'; } - $scope.properties.SortExpression.PropertyValue = $scope.selectedSortOption; }); }) .finally(function () { diff --git a/Telerik.Sitefinity.Frontend.Events/Mvc/Views/Event/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Events/Mvc/Views/Event/DesignerView.Simple.cshtml index 20319933a..ab9de6504 100644 --- a/Telerik.Sitefinity.Frontend.Events/Mvc/Views/Event/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Events/Mvc/Views/Event/DesignerView.Simple.cshtml @@ -95,7 +95,7 @@ @Html.Resource("UsePaging")
    @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + "")) @@ -105,7 +105,7 @@ @Html.Resource("UseLimit")
    @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj b/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj index b3ac2f8a1..6f638e26c 100644 --- a/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj +++ b/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj @@ -49,10 +49,8 @@ True False - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll @@ -65,11 +63,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -188,39 +186,39 @@ - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.RecurrentRules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.RecurrentRules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Events/packages.config b/Telerik.Sitefinity.Frontend.Events/packages.config index f128ca31b..1be13ae61 100644 --- a/Telerik.Sitefinity.Frontend.Events/packages.config +++ b/Telerik.Sitefinity.Frontend.Events/packages.config @@ -3,19 +3,20 @@ + - + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Controllers/FormController.cs b/Telerik.Sitefinity.Frontend.Forms/Mvc/Controllers/FormController.cs index e15b28ff7..8f2e292af 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Controllers/FormController.cs +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Controllers/FormController.cs @@ -1,8 +1,10 @@ using System; using System.ComponentModel; +using System.Globalization; using System.Web.Mvc; using Telerik.Sitefinity.Frontend.Forms.Mvc.Models; using Telerik.Sitefinity.Frontend.Forms.Mvc.StringResources; +using Telerik.Sitefinity.Frontend.Mvc.Helpers; using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers; using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes; using Telerik.Sitefinity.Frontend.Resources; @@ -57,6 +59,8 @@ public ActionResult Index() var viewModel = this.Model.GetViewModel(); if (viewModel != null) { + this.InitializeViewBag(); + if (SystemManager.CurrentHttpContext != null) this.AddCacheDependencies(this.Model.GetKeysOfDependentObjects(viewModel)); @@ -133,22 +137,38 @@ public ActionResult Index(FormCollection collection) [StandaloneResponseFilter] public JsonResult AjaxSubmit(FormCollection collection) { - var result = this.Model.TrySubmitForm(collection, this.Request.Files, this.Request.UserHostAddress); - if (result != SubmitStatus.Success && this.Model.RaiseBeforeFormActionEvent()) + if (collection == null) + { + throw new ArgumentNullException("collection"); + } + + var widgetIdIdString = collection[WidgetId]; + Guid widgetId; + + if (string.IsNullOrWhiteSpace(widgetIdIdString) || !Guid.TryParse(widgetIdIdString, out widgetId)) { - return this.Json(new { success = false, error = this.Model.GetSubmitMessage(result) }); + widgetId = Guid.Empty; + } + + var formModel = ControllerHelper.LoadControllerModel(widgetId, CultureInfo.CurrentUICulture) as IFormModel; + formModel = formModel ?? this.Model; + + var result = formModel.TrySubmitForm(collection, this.Request.Files, this.Request.UserHostAddress); + if (result != SubmitStatus.Success && formModel.RaiseBeforeFormActionEvent()) + { + return this.Json(new { success = false, error = formModel.GetSubmitMessage(result) }); } else { var redirectPageUrl = string.Empty; - if (this.Model.NeedsRedirect) + if (formModel.NeedsRedirect) { - redirectPageUrl = this.Model.GetRedirectPageUrl(); + redirectPageUrl = formModel.GetRedirectPageUrl(); } if (string.IsNullOrWhiteSpace(redirectPageUrl)) { - return this.Json(new { success = true, message = this.Model.GetSubmitMessage(result) }); + return this.Json(new { success = true, message = formModel.GetSubmitMessage(result) }); } else { @@ -205,6 +225,21 @@ private IFormModel InitializeModel() return ControllerModelFactory.GetModel(this.GetType()); } + private void InitializeViewBag() + { + if (this.Model.UseAjaxSubmit) + { + if (this.HttpContext != null && this.HttpContext.Items.Contains(VersionPreview) && this.HttpContext.Items[VersionPreview].ToString().ToUpperInvariant() == "TRUE") + { + this.ViewBag.WidgetId = ControllerHelper.GetWidgetId(this); + } + else + { + this.ViewBag.WidgetId = this.ViewData[ControlDataId]; + } + } + } + private string GetViewPath(Guid formId) { var currentPackage = new PackageManager().GetCurrentPackage(); @@ -228,6 +263,9 @@ private string GetViewPath(Guid formId) internal const string TemplateNamePrefix = "Form."; internal const string SubmitResultTemplateName = "SubmitResultView"; private const string WidgetName = "Form_MVC"; + private const string WidgetId = "WidgetId"; + private const string ControlDataId = "controlDataId"; + private const string VersionPreview = "versionpreview"; #endregion } diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/Captcha/CaptchaModel.cs b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/Captcha/CaptchaModel.cs index 5d06c021e..2e3d998c3 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/Captcha/CaptchaModel.cs +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/Captcha/CaptchaModel.cs @@ -5,7 +5,7 @@ using Telerik.Sitefinity.Frontend.Forms.Mvc.StringResources; using Telerik.Sitefinity.Localization; using Telerik.Sitefinity.Services; -using Telerik.Sitefinity.Services.Comments.DTO; +using Telerik.Sitefinity.Services.Captcha.DTO; using Telerik.Sitefinity.Web; using Telerik.Sitefinity.Web.UI.Validation.Definitions; @@ -130,7 +130,7 @@ public override bool IsValid(object value) private bool ValidateCaptcha(string key, string answer) { - var commentWebServiceType = Type.GetType("Telerik.Sitefinity.Services.Comments.CommentWebService, Telerik.Sitefinity"); + var commentWebServiceType = Type.GetType("Telerik.Sitefinity.Services.Captcha.CaptchaWebService, Telerik.Sitefinity"); var commentWebServiceInstance = Activator.CreateInstance(commentWebServiceType); var validateMethodInfo = commentWebServiceType.GetMethod("Validate", BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(string), typeof(string) }, null); @@ -167,11 +167,9 @@ private bool ValidateCaptchas(string keys, string answers) } private ValidatorDefinition validatorDefinition; - private const string CaptchaGetService = "RestApi/comments-api/"; + private const string CaptchaGetService = "RestApi/captcha/"; private const string CaptchaAnswerFormKey = "captcha-a"; - private const string CaptchaCorrectAnswerFormKey = "captcha-ca"; - private const string CaptchaInitializationVectorFormKey = "captcha-iv"; private const string CaptchaKeyFormKey = "captcha-k"; private bool enableAudioCode = true; } diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/FormElementModel.cs b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/FormElementModel.cs index 99f3a7075..f39115455 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/FormElementModel.cs +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/FormElementModel.cs @@ -102,6 +102,7 @@ protected virtual ValidatorDefinition BuildValidatorDefinition(ValidatorDefiniti validatorDefinition.RegularExpressionViolationMessage = this.BuildErrorMessage(definition.RegularExpressionViolationMessage, fieldTitle); validatorDefinition.MinLength = definition.MinLength; validatorDefinition.MaxLength = definition.MaxLength; + validatorDefinition.Required = definition.Required; return validatorDefinition; } diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/HiddenField/HiddenFieldModel.cs b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/HiddenField/HiddenFieldModel.cs index 890070ae4..f4f187ba8 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/HiddenField/HiddenFieldModel.cs +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/Fields/HiddenField/HiddenFieldModel.cs @@ -1,4 +1,5 @@ -using System; +using Telerik.Sitefinity.Frontend.Forms.Mvc.StringResources; +using Telerik.Sitefinity.Localization; using Telerik.Sitefinity.Metadata.Model; using Telerik.Sitefinity.Modules.Forms.Web.UI.Fields; @@ -13,6 +14,10 @@ public class HiddenFieldModel : FormFieldModel, IHiddenFieldModel public override IMetaField GetMetaField(IFormFieldControl formFieldControl) { var metaField = base.GetMetaField(formFieldControl); + + if (string.IsNullOrEmpty(metaField.Title)) + metaField.Title = Res.Get().Untitled; + return metaField; } diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/FormModel.cs b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/FormModel.cs index 9ddd898f4..d5bfdfbe7 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/FormModel.cs +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Models/FormModel.cs @@ -811,7 +811,7 @@ public virtual IList GetKeysOfDependentObjects(FormViewModel var result = new List(1); if (viewModel != null && !string.IsNullOrWhiteSpace(viewModel.FormId)) { - result.Add(new CacheDependencyKey { Key = viewModel.FormId, Type = contentResolvedType }); + result.AddRange(OutputCacheDependencyHelper.GetPublishedContentCacheDependencyKeys(contentResolvedType, viewModel.FormId)); } return result; @@ -1045,11 +1045,14 @@ private void InvalidateCaptchas() if (this.captchaController.Model.GetViewModel(this.captchaController.Model.Value) is CaptchaViewModel captchaViewModel) { var key = HttpContext.Current.Request[captchaViewModel.CaptchaKeyFormKey]; - var keys = key.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - ITemporaryStorage tempStorage = ObjectFactory.Resolve(); - foreach (var item in keys) + if (!string.IsNullOrEmpty(key)) { - tempStorage.Remove(item); + var keys = key.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + ITemporaryStorage tempStorage = ObjectFactory.Resolve(); + foreach (var item in keys) + { + tempStorage.Remove(item); + } } } } diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Captcha/captcha.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Captcha/captcha.js index 4760e5c7f..3e292e374 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Captcha/captcha.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Captcha/captcha.js @@ -28,12 +28,12 @@ }, getCaptcha: function () { - var getCaptchaUrl = this.rootUrl + 'captcha'; + var getCaptchaUrl = this.rootUrl; return this.makeAjax(getCaptchaUrl); }, validateCaptcha: function (data) { - var validateCaptchaUrl = this.rootUrl + 'captcha'; + var validateCaptchaUrl = this.rootUrl; return this.makeAjax(validateCaptchaUrl, 'POST', data); } }; diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.js index 92650e02f..d9b76c3db 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.js @@ -137,12 +137,12 @@ }, getCaptcha: function () { - var getCaptchaUrl = this.rootUrl + 'captcha'; + var getCaptchaUrl = this.rootUrl; return this.makeAjax(getCaptchaUrl); }, validateCaptcha: function (data) { - var validateCaptchaUrl = this.rootUrl + 'captcha'; + var validateCaptchaUrl = this.rootUrl; return this.makeAjax(validateCaptchaUrl, 'POST', data); } }; diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.min.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.min.js index b7c66566c..e64c9b7de 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.min.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/Form/form.all.min.js @@ -1,2 +1,2 @@ -!function(y){void 0!==window.FormData&&y(function(){y('[data-sf-role="form-container"]:has([data-sf-role="ajax-submit-url"])').each(function(t,e){var d=y(e),u=d.find('[data-sf-role="loading-img"]'),p=d.find('[data-sf-role="fields-container"]'),h=d.find('[data-sf-role="success-message"]'),g=d.find('[data-sf-role="error-message"]'),v=d.find('input[data-sf-role="redirect-url"]').val(),m=d.find('input[data-sf-role="ajax-submit-url"]').val();d.find('button[type="submit"],input[type="submit"]').click(function(){var s=d.closest("form"),l=s.children();0"),f=d.parent()),f.one("submit",function(){for(var t=d.find("input"),e=!0,a=0;aa){o.show(),i=!0,r[n].focus();continue}}o.hide()}return!i}(t.data.container,1024*t.data.config.MinFileSizeInMb*1024,1024*t.data.config.MaxFileSizeInMb*1024);return e&&a&&i}function a(t){var e=l(t),a=JSON.parse(function(t){var e=document.createElement("a");return e.innerHTML=t,e.textContent}(e.attr("data-sf-config"))),i=e.find('[data-sf-role="file-field-inputs"]'),r=e.find('[data-sf-role="file-input-template"]').html(),n=e.closest("form");o(r,i,a),a.AllowMultipleFiles&&l(e).find('[data-sf-role="add-input"]').click(function(){o(r,i,a)}),e.find('input[type="file"]').data("sfvalidator",function(){return s({data:{config:a,container:i}})}),n.submit({config:a,container:i},s)}l(function(){var t=l('[data-sf-role="file-field-container"]');if(t&&!(t.length<1))for(var e=0;e'),d=o.parent()),d.one("submit",function(t){if(t.preventDefault(),0 - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll @@ -63,11 +61,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -123,14 +121,14 @@ ..\packages\Telerik.DataAccess.Core.2018.0.1127.1\lib\net40\Telerik.OpenAccess.Runtime.dll - - ..\packages\Telerik.Web.UI.2019.3.917.45\lib\net45\Telerik.Web.Design.dll + + ..\packages\Telerik.Web.UI.2020.1.114.45\lib\net45\Telerik.Web.Design.dll - - ..\packages\Telerik.Web.UI.2019.3.917.45\lib\net45\Telerik.Web.UI.dll + + ..\packages\Telerik.Web.UI.2020.1.114.45\lib\net45\Telerik.Web.UI.dll - - ..\packages\Telerik.Web.UI.2019.3.917.45\lib\net45\Telerik.Web.UI.Skins.dll + + ..\packages\Telerik.Web.UI.2020.1.114.45\lib\net45\Telerik.Web.UI.Skins.dll @@ -364,31 +362,31 @@ - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Forms/packages.config b/Telerik.Sitefinity.Frontend.Forms/packages.config index e3b1e44c4..c0995d4a8 100644 --- a/Telerik.Sitefinity.Frontend.Forms/packages.config +++ b/Telerik.Sitefinity.Frontend.Forms/packages.config @@ -3,19 +3,20 @@ + - + - + - + - - - - - + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormViewModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormViewModel.cs index a746add7b..2cdfaf438 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormViewModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormViewModel.cs @@ -11,7 +11,7 @@ namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginForm /// /// This class represents login form view model for the . /// - [Bind(Exclude = "CssClass, ServiceUrl, MembershipProvider, RedirectUrlAfterLogin, RegisterPageUrl, Realm, ShowRegistrationLink, ShowForgotPasswordLink, ShowRememberMe")] + [Bind(Include = "UserName, Password, RememberMe, ExternalProviders, LoginError")] public class LoginFormViewModel { ///     diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/ResetPasswordInputModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/ResetPasswordInputModel.cs index 472118f24..d8b2dc1d4 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/ResetPasswordInputModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/ResetPasswordInputModel.cs @@ -7,6 +7,7 @@ namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginForm /// /// This class represents reset password input model for the . /// + [Bind(Include = "NewPassword, RepeatNewPassword, ResetPasswordAnswer, SecurityToken")] public class ResetPasswordInputModel { /// diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEditViewModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEditViewModel.cs index 99cc3827d..ed70de46a 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEditViewModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEditViewModel.cs @@ -12,7 +12,7 @@ namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Profile /// /// This class represents view model for Profile widget. /// - [Bind(Exclude = "SelectedUserProfiles, User, CanEdit, CssClass, ShowProfileChangedMsg, DisplayName, UserName, AvatarImageUrl, DefaultAvatarUrl")] + [Bind(Include = "Profile, OldPassword, NewPassword, RepeatPassword, Email, DeletePicture, ExternalProviderName, UploadedImage")] public class ProfileEditViewModel { /// @@ -31,7 +31,7 @@ public ProfileEditViewModel(IDictionary profile) { this.Profile = profile; } - + /// /// Gets the selected user profiles. /// @@ -47,7 +47,7 @@ public ProfileEditViewModel(IDictionary profile) /// The profile. /// public IDictionary Profile { get; set; } - + /// /// Gets or sets the old password. /// diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEmailEditViewModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEmailEditViewModel.cs index 0a9361dc6..07969e850 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEmailEditViewModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Profile/ProfileEmailEditViewModel.cs @@ -3,7 +3,7 @@ namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Profile { - [Bind(Exclude = "ShowProfileChangedMsg")] + [Bind(Include = "Password, UserId, Email")] public class ProfileEmailEditViewModel { /// diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs index 968f49c88..1129c184a 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs @@ -453,7 +453,7 @@ protected virtual RoleManager GetRoleManager(string providerName) /// protected virtual void RaiseRegistrationEvent() { - var eventData = new UserRegistered(); // no event data is used by the DEC handler + var eventData = new UserRegistered(); // no event data is used by the Sitefinity Insight handler EventHub.Raise(eventData); } diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs index 24a2d9f9c..1b6d51d2c 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs @@ -9,7 +9,7 @@ namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Registration /// /// This class represents view model for the . /// - [Bind(Exclude = "CssClass, LoginPageUrl, MembershipProviderName, SuccessfulRegistrationPageUrl, ConfirmationPageId, EmailAddressShouldBeTheUsername")] + [Bind(Include = "RequiresQuestionAndAnswer, Password, Question, Answer, ReTypePassword, Email, Profile, ExternalProviders")] public class RegistrationViewModel { /// diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.js b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.js deleted file mode 100644 index 7594061ec..000000000 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.js +++ /dev/null @@ -1,5 +0,0 @@ -(function ($) { - $("#RememberMe").bind("click", function () { - $("#sf_persistent").val($(this).val()); - }); -}(jQuery)); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.min.js b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.min.js deleted file mode 100644 index 7033a1e54..000000000 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.min.js +++ /dev/null @@ -1,2 +0,0 @@ -!function(e){e("#RememberMe").bind("click",function(){e("#sf_persistent").val(e(this).val())})}(jQuery); -//# sourceMappingURL=login-form.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.min.js.map b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.min.js.map deleted file mode 100644 index 6b0c08bb8..000000000 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginForm/login-form.min.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["login-form.js"],"names":["$","bind","val","this","jQuery"],"mappings":"CAAC,SAAUA,GACPA,EAAE,eAAeC,KAAK,QAAS,WAC3BD,EAAE,kBAAkBE,IAAIF,EAAEG,MAAMD,SAFxC,CAIEE","file":"login-form.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.js b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.js index 32719df64..8840d6d4c 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.js +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.js @@ -1,35 +1,51 @@ -(function ($) { - $(function () { - $('[data-sf-role="login-status-button"]').on('click', function () { - - if ($('[data-sf-role="sf-allow-windows-sts-login"]').val().toLowerCase() === 'true') { - location.href = '?stsLogin=true'; - } else { - location.href = $('[data-sf-role="sf-login-redirect-url"]').val() || '#'; - } - return false; - }); +(function () { + document.addEventListener('DOMContentLoaded', function () { + var loginoutBtn = document.querySelector('[data-sf-role="login-status-button"]'); + if (loginoutBtn) { + loginoutBtn.addEventListener("click", function () { + if (document.querySelector('[data-sf-role="sf-allow-windows-sts-login"]').value.toLowerCase() === 'true') { + location.href = '?stsLogin=true'; + } else { + location.href = document.querySelector('[data-sf-role="sf-login-redirect-url"]').value || '#'; + } + return false; + }); + } - if ($('[data-sf-role="sf-is-design-mode-value"]').val().toLowerCase() !== 'true') { - $.ajax({ - url: $('[data-sf-role="sf-status-json-endpoint-url"]').val(), - cache: false, - success: function (statusViewModel) { + if (document.querySelector('[data-sf-role="sf-is-design-mode-value"]').value.toLowerCase() !== 'true') { + var xhr = new XMLHttpRequest(); + xhr.open('GET', document.querySelector('[data-sf-role="sf-status-json-endpoint-url"]').value); + xhr.onload = function () { + if (xhr.status === 200) { + var statusViewModel = JSON.parse(xhr.responseText); if (statusViewModel && statusViewModel.IsLoggedIn) { - var loggedInView = $('[data-sf-role="sf-logged-in-view"]'); - loggedInView.find('[data-sf-role="sf-logged-in-avatar"]').attr('src', statusViewModel.AvatarImageUrl).attr('alt', statusViewModel.DisplayName); - loggedInView.find('[data-sf-role="sf-logged-in-name"]').html(statusViewModel.DisplayName); - loggedInView.find('[data-sf-role="sf-logged-in-email"]').html(statusViewModel.Email); - loggedInView.show(); + var loggedInView = document.querySelector('[data-sf-role="sf-logged-in-view"]'); + var avatar = loggedInView.querySelector('[data-sf-role="sf-logged-in-avatar"]'); + if (avatar) { + avatar.setAttribute('src', statusViewModel.AvatarImageUrl); + avatar.setAttribute('alt', statusViewModel.DisplayName); + } + + loggedInView.querySelector('[data-sf-role="sf-logged-in-name"]').innerHTML = statusViewModel.DisplayName; + var emailContainer = loggedInView.querySelector('[data-sf-role="sf-logged-in-email"]'); + if (emailContainer) { + emailContainer.innerHTML = statusViewModel.Email; + } + + loggedInView.style.display = "block"; } else { - $('[data-sf-role="sf-logged-out-view"]').show(); + document.querySelector('[data-sf-role="sf-logged-out-view"]').style.display = "block"; } } - }); + }; + xhr.setRequestHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); + xhr.setRequestHeader('Pragma', 'no-cache'); + xhr.setRequestHeader('Expires', '0'); + xhr.send(); } else { - $('[data-sf-role="sf-logged-out-view"]').show(); + document.querySelector('[data-sf-role="sf-logged-out-view"]').style.display = "block"; } }); -}(jQuery)); \ No newline at end of file +}()); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js index c0656d866..8839bec4c 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js @@ -1,2 +1,2 @@ -!function(o){o(function(){o('[data-sf-role="login-status-button"]').on("click",function(){return"true"===o('[data-sf-role="sf-allow-windows-sts-login"]').val().toLowerCase()?location.href="?stsLogin=true":location.href=o('[data-sf-role="sf-login-redirect-url"]').val()||"#",!1}),"true"!==o('[data-sf-role="sf-is-design-mode-value"]').val().toLowerCase()?o.ajax({url:o('[data-sf-role="sf-status-json-endpoint-url"]').val(),cache:!1,success:function(a){if(a&&a.IsLoggedIn){var e=o('[data-sf-role="sf-logged-in-view"]');e.find('[data-sf-role="sf-logged-in-avatar"]').attr("src",a.AvatarImageUrl).attr("alt",a.DisplayName),e.find('[data-sf-role="sf-logged-in-name"]').html(a.DisplayName),e.find('[data-sf-role="sf-logged-in-email"]').html(a.Email),e.show()}else o('[data-sf-role="sf-logged-out-view"]').show()}}):o('[data-sf-role="sf-logged-out-view"]').show()})}(jQuery); +document.addEventListener("DOMContentLoaded",function(){var e=document.querySelector('[data-sf-role="login-status-button"]');if(e&&e.addEventListener("click",function(){return"true"===document.querySelector('[data-sf-role="sf-allow-windows-sts-login"]').value.toLowerCase()?location.href="?stsLogin=true":location.href=document.querySelector('[data-sf-role="sf-login-redirect-url"]').value||"#",!1}),"true"!==document.querySelector('[data-sf-role="sf-is-design-mode-value"]').value.toLowerCase()){var r=new XMLHttpRequest;r.open("GET",document.querySelector('[data-sf-role="sf-status-json-endpoint-url"]').value),r.onload=function(){if(200===r.status){var e=JSON.parse(r.responseText);if(e&&e.IsLoggedIn){var t=document.querySelector('[data-sf-role="sf-logged-in-view"]'),o=t.querySelector('[data-sf-role="sf-logged-in-avatar"]');o&&(o.setAttribute("src",e.AvatarImageUrl),o.setAttribute("alt",e.DisplayName)),t.querySelector('[data-sf-role="sf-logged-in-name"]').innerHTML=e.DisplayName;var a=t.querySelector('[data-sf-role="sf-logged-in-email"]');a&&(a.innerHTML=e.Email),t.style.display="block"}else document.querySelector('[data-sf-role="sf-logged-out-view"]').style.display="block"}},r.setRequestHeader("Cache-Control","no-cache, no-store, must-revalidate"),r.setRequestHeader("Pragma","no-cache"),r.setRequestHeader("Expires","0"),r.send()}else document.querySelector('[data-sf-role="sf-logged-out-view"]').style.display="block"}); //# sourceMappingURL=login-status.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js.map b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js.map index 78c0daf5e..fe859125d 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js.map +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/LoginStatus/login-status.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["login-status.js"],"names":["$","on","val","toLowerCase","location","href","ajax","url","cache","success","statusViewModel","IsLoggedIn","loggedInView","find","attr","AvatarImageUrl","DisplayName","html","Email","show","jQuery"],"mappings":"CAAC,SAAUA,GACPA,EAAE,WACEA,EAAE,wCAAwCC,GAAG,QAAS,WAOlD,MAL6E,SAAzED,EAAE,+CAA+CE,MAAMC,cACvDC,SAASC,KAAO,iBAEhBD,SAASC,KAAOL,EAAE,0CAA0CE,OAAS,KAElE,IAG+D,SAAtEF,EAAE,4CAA4CE,MAAMC,cACpDH,EAAEM,KAAK,CACHC,IAAKP,EAAE,gDAAgDE,MACvDM,OAAO,EACPC,QAAS,SAAUC,GACf,GAAIA,GAAmBA,EAAgBC,WAAY,CAC/C,IAAIC,EAAeZ,EAAE,sCACrBY,EAAaC,KAAK,wCAAwCC,KAAK,MAAOJ,EAAgBK,gBAAgBD,KAAK,MAAOJ,EAAgBM,aAClIJ,EAAaC,KAAK,sCAAsCI,KAAKP,EAAgBM,aAC7EJ,EAAaC,KAAK,uCAAuCI,KAAKP,EAAgBQ,OAC9EN,EAAaO,YAGbnB,EAAE,uCAAuCmB,UAMrDnB,EAAE,uCAAuCmB,SA/BrD,CAkCEC","file":"login-status.min.js"} \ No newline at end of file +{"version":3,"sources":["login-status.js"],"names":["document","addEventListener","loginoutBtn","querySelector","value","toLowerCase","location","href","xhr","XMLHttpRequest","open","onload","status","statusViewModel","JSON","parse","responseText","IsLoggedIn","loggedInView","avatar","setAttribute","AvatarImageUrl","DisplayName","innerHTML","emailContainer","Email","style","display","setRequestHeader","send"],"mappings":"AACIA,SAASC,iBAAiB,mBAAoB,WAC1C,IAAIC,EAAcF,SAASG,cAAc,wCAYzC,GAXID,GACAA,EAAYD,iBAAiB,QAAS,WAMlC,MALkG,SAA9FD,SAASG,cAAc,+CAA+CC,MAAMC,cAC5EC,SAASC,KAAO,iBAEhBD,SAASC,KAAOP,SAASG,cAAc,0CAA0CC,OAAS,KAEvF,IAIgF,SAA3FJ,SAASG,cAAc,4CAA4CC,MAAMC,cAA0B,CACnG,IAAIG,EAAM,IAAIC,eACdD,EAAIE,KAAK,MAAOV,SAASG,cAAc,gDAAgDC,OACvFI,EAAIG,OAAS,WACT,GAAmB,MAAfH,EAAII,OAAgB,CACpB,IAAIC,EAAkBC,KAAKC,MAAMP,EAAIQ,cACrC,GAAIH,GAAmBA,EAAgBI,WAAY,CAC/C,IAAIC,EAAelB,SAASG,cAAc,sCACtCgB,EAASD,EAAaf,cAAc,wCACpCgB,IACAA,EAAOC,aAAa,MAAOP,EAAgBQ,gBAC3CF,EAAOC,aAAa,MAAOP,EAAgBS,cAG/CJ,EAAaf,cAAc,sCAAsCoB,UAAYV,EAAgBS,YAC7F,IAAIE,EAAiBN,EAAaf,cAAc,uCAC5CqB,IACAA,EAAeD,UAAYV,EAAgBY,OAG/CP,EAAaQ,MAAMC,QAAU,aAG7B3B,SAASG,cAAc,uCAAuCuB,MAAMC,QAAU,UAI1FnB,EAAIoB,iBAAiB,gBAAiB,uCACtCpB,EAAIoB,iBAAiB,SAAU,YAC/BpB,EAAIoB,iBAAiB,UAAW,KAChCpB,EAAIqB,YAGJ7B,SAASG,cAAc,uCAAuCuB,MAAMC,QAAU","file":"login-status.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.js b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.js index 5b445eda6..643f126ff 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.js +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.js @@ -1,11 +1,21 @@ -(function ($) { +(function () { + document.addEventListener('DOMContentLoaded', function () { + var sendAgainLinks = document.querySelectorAll("[data-sf-role='sendAgainLink']"); + sendAgainLinks.forEach(function (sendAgainLink) { + sendAgainLink.addEventListener('click', function () { + var request = new XMLHttpRequest(); + request.onreadystatechange = function () { + if (request.readyState === XMLHttpRequest.DONE && request.status === 200) { + if (JSON.parse(request.response)) { + document.querySelector("[data-sf-role='confirmationResendInfo']").style.display = 'block'; + } + } + }; - var url = $("[data-sf-role='sf-resend-confirmation-endpoint-url']").val(); - $("[data-sf-role='sendAgainLink']").bind("click", function (e) { - $.get(url, function (data) { - if (JSON.parse(data)) { - $("[data-sf-role='confirmationResendInfo']").show(); - } - }); + var url = document.querySelector("[data-sf-role='sf-resend-confirmation-endpoint-url']").value; + request.open('GET', url); + request.send(); + }); + }); }); -}(jQuery)); \ No newline at end of file +}()); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js index 89730d25e..a8230d3df 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js @@ -1,2 +1,2 @@ -!function(o){var a=o("[data-sf-role='sf-resend-confirmation-endpoint-url']").val();o("[data-sf-role='sendAgainLink']").bind("click",function(n){o.get(a,function(n){JSON.parse(n)&&o("[data-sf-role='confirmationResendInfo']").show()})})}(jQuery); +document.addEventListener("DOMContentLoaded",function(){document.querySelectorAll("[data-sf-role='sendAgainLink']").forEach(function(e){e.addEventListener("click",function(){var e=new XMLHttpRequest;e.onreadystatechange=function(){e.readyState===XMLHttpRequest.DONE&&200===e.status&&JSON.parse(e.response)&&(document.querySelector("[data-sf-role='confirmationResendInfo']").style.display="block")};var n=document.querySelector("[data-sf-role='sf-resend-confirmation-endpoint-url']").value;e.open("GET",n),e.send()})})}); //# sourceMappingURL=registration-form.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js.map b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js.map index e15f0b5d0..c8c39730d 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js.map +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Scripts/Registration/registration-form.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["registration-form.js"],"names":["$","url","val","bind","e","get","data","JSON","parse","show","jQuery"],"mappings":"CAAC,SAAUA,GAEP,IAAIC,EAAMD,EAAE,wDAAwDE,MACpEF,EAAE,kCAAkCG,KAAK,QAAS,SAAUC,GACxDJ,EAAEK,IAAIJ,EAAK,SAAUK,GACbC,KAAKC,MAAMF,IACXN,EAAE,2CAA2CS,WAN7D,CAUEC","file":"registration-form.min.js"} \ No newline at end of file +{"version":3,"sources":["registration-form.js"],"names":["document","addEventListener","querySelectorAll","forEach","sendAgainLink","request","XMLHttpRequest","onreadystatechange","readyState","DONE","status","JSON","parse","response","querySelector","style","display","url","value","open","send"],"mappings":"AACIA,SAASC,iBAAiB,mBAAoB,WACrBD,SAASE,iBAAiB,kCAC5BC,QAAQ,SAAUC,GAC7BA,EAAcH,iBAAiB,QAAS,WACpC,IAAII,EAAU,IAAIC,eAClBD,EAAQE,mBAAqB,WACrBF,EAAQG,aAAeF,eAAeG,MAA2B,MAAnBJ,EAAQK,QAClDC,KAAKC,MAAMP,EAAQQ,YACnBb,SAASc,cAAc,2CAA2CC,MAAMC,QAAU,UAK9F,IAAIC,EAAMjB,SAASc,cAAc,wDAAwDI,MACzFb,EAAQc,KAAK,MAAOF,GACpBZ,EAAQe","file":"registration-form.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml index 97fb2ff7d..b162d610d 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml @@ -82,5 +82,3 @@ -@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginForm/login-form.js"), "bottom", false) - diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginButton.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginButton.cshtml index bc9470b1a..3bef43adc 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginButton.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginButton.cshtml @@ -1,11 +1,8 @@ @model Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginStatus.LoginStatusViewModel @using Telerik.Sitefinity.Frontend.Mvc.Helpers; -@using Telerik.Sitefinity.Modules.Pages; @using Telerik.Sitefinity.Mvc.Proxy; -@Html.Script(ScriptRef.JQuery, "top", false) - @{ var SignOutUrl = string.Concat(Url.Action("SignOut"),string.Format("?{0}={1}", MvcControllerProxy.ControllerKey, ViewData[MvcControllerProxy.ControllerKey])); } @@ -21,7 +18,7 @@ var SignOutUrl = string.Concat(Url.Action("SignOut"),string.Format("?{0}={1}", M @@ -33,4 +30,4 @@ var SignOutUrl = string.Concat(Url.Action("SignOut"),string.Format("?{0}={1}", M -@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginStatus/login-status.js"), "bottom", false) \ No newline at end of file +@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginStatus/login-status.js"), "bottom", throwException: false, tryUseScriptManager: false) \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginName.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginName.cshtml index 98c85434e..3968bcc5c 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginName.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginStatus/LoginStatus.LoginName.cshtml @@ -1,11 +1,8 @@ @model Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginStatus.LoginStatusViewModel @using Telerik.Sitefinity.Frontend.Mvc.Helpers; -@using Telerik.Sitefinity.Modules.Pages; @using Telerik.Sitefinity.Mvc.Proxy; -@Html.Script(ScriptRef.JQuery, "top", false) - @{ var SignOutUrl = string.Concat(Url.Action("SignOut"),string.Format("?{0}={1}", MvcControllerProxy.ControllerKey, ViewData[MvcControllerProxy.ControllerKey])); } @@ -28,4 +25,4 @@ var SignOutUrl = string.Concat(Url.Action("SignOut"),string.Format("?{0}={1}", M -@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginStatus/login-status.js"), "bottom", false) \ No newline at end of file +@Html.Script(Url.WidgetContent("Mvc/Scripts/LoginStatus/login-status.js"), "bottom", throwException: false, tryUseScriptManager: false) \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml index 1fdc05da7..f4b359187 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml @@ -16,121 +16,120 @@ HtmlHelper.UnobtrusiveJavaScriptEnabled = true; } -
    - @if ((Request.QueryStringGet("ShowActivationMsg") == "true") || - (ViewBag.ShowActivationMsg is bool && ViewBag.ShowActivationMsg)) - { -

    - @Html.Resource("VisitYourEmail") -

    - -

    @string.Format(Html.Resource("ActivationLinkHasBeenSent"), Model.Email)

    - @Html.Resource("SendAgain") +
    + @if ((Request.QueryStringGet("ShowActivationMsg") == "true") || + (ViewBag.ShowActivationMsg is bool && ViewBag.ShowActivationMsg)) + { +

    + @Html.Resource("VisitYourEmail") +

    -
    - @string.Format(Html.Resource("ActivationLinkHasBeenSentAgain"), Model.Email) +

    @string.Format(Html.Resource("ActivationLinkHasBeenSent"), Model.Email)

    @Html.Resource("SendAgain") -
    - - } - else if ((Request.QueryStringGet("ShowSuccessfulRegistrationMsg") == "true") || - (ViewBag.ShowSuccessfulRegistrationMsg is bool && ViewBag.ShowSuccessfulRegistrationMsg)) - { -

    @Html.Resource("ThankYou")

    -

    @Html.Resource("DefaultSuccessfulRegistrationMessage")

    +
    + @string.Format(Html.Resource("ActivationLinkHasBeenSentAgain"), Model.Email) + @Html.Resource("SendAgain") +
    - } - else - { - using (Html.BeginFormSitefinity(true)) + + @Html.Script(Url.WidgetContent("Mvc/Scripts/Registration/registration-form.js"), "bottom", throwException: false) + } + else if ((Request.QueryStringGet("ShowSuccessfulRegistrationMsg") == "true") || + (ViewBag.ShowSuccessfulRegistrationMsg is bool && ViewBag.ShowSuccessfulRegistrationMsg)) { - @Html.ValidationSummary(true); +

    @Html.Resource("ThankYou")

    +

    @Html.Resource("DefaultSuccessfulRegistrationMessage")

    -

    @Html.Resource("Registration")

    + } + else + { + using (Html.BeginFormSitefinity(true)) + { + @Html.ValidationSummary(true); - @ViewBag.Error +

    @Html.Resource("Registration")

    + + @ViewBag.Error + + @Html.HiddenFor(m => m.RequiresQuestionAndAnswer) - @Html.HiddenFor(m => m.RequiresQuestionAndAnswer) - -
    - -
    -
    - -
    -
    - - @Html.ValidationMessageFor(m => m.Email) -
    -
    - - @Html.ValidationMessageFor(m => m.Password) -
    -
    - - @Html.ValidationMessageFor(m => m.ReTypePassword) -
    - if (Model.RequiresQuestionAndAnswer) - {
    - @Html.ValidationMessageFor(m => m.Question)
    - @Html.ValidationMessageFor(m => m.Answer) -
    - } -
    - @if (SystemManager.IsDesignMode && !SystemManager.IsPreviewMode) - { - - } - else - { - - } -
    - - if (Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0) - { -

    @Html.Resource("ConnectWith")

    - - foreach (var provider in Model.ExternalProviders) +
    +
    + + @Html.ValidationMessageFor(m => m.Email) +
    +
    + + @Html.ValidationMessageFor(m => m.Password) +
    +
    + + @Html.ValidationMessageFor(m => m.ReTypePassword) +
    + if (Model.RequiresQuestionAndAnswer) {
    - @Html.ActionLink(provider.Key, "LoginExternalProvider", new { model = provider.Key }, new { @class = provider.Value }) + + @Html.ValidationMessageFor(m => m.Question) +
    +
    + + @Html.ValidationMessageFor(m => m.Answer)
    } - } +
    + @if (SystemManager.IsDesignMode && !SystemManager.IsPreviewMode) + { + + } + else + { + + } +
    - - } - } -
    -@Html.Script(Url.WidgetContent("Mvc/Scripts/Registration/registration-form.js"), "bottom", false) + if (Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0) + { +

    @Html.Resource("ConnectWith")

    + foreach (var provider in Model.ExternalProviders) + { +
    + @Html.ActionLink(provider.Key, "LoginExternalProvider", new { model = provider.Key }, new { @class = provider.Value }) +
    + } + } + + + } + } + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/UsersList/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/UsersList/DesignerView.Simple.cshtml index 9289fee16..a471ad5a3 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/UsersList/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/UsersList/DesignerView.Simple.cshtml @@ -71,7 +71,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + "")) @@ -83,7 +83,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj b/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj index e67be463d..dfbb7b3b9 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj +++ b/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj @@ -72,11 +72,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -233,7 +233,6 @@ PublicKey.snk - @@ -251,9 +250,6 @@ - - - @@ -274,36 +270,35 @@ - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True - diff --git a/Telerik.Sitefinity.Frontend.Identity/packages.config b/Telerik.Sitefinity.Frontend.Identity/packages.config index d3ca19886..3c3024b24 100644 --- a/Telerik.Sitefinity.Frontend.Identity/packages.config +++ b/Telerik.Sitefinity.Frontend.Identity/packages.config @@ -3,20 +3,21 @@ + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj b/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj index b15aef74d..5528d748f 100644 --- a/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj +++ b/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj @@ -149,27 +149,27 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config b/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config index 8de194791..c0443ebf2 100644 --- a/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config +++ b/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config @@ -8,8 +8,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Lists/Mvc/Models/ListsModel.cs b/Telerik.Sitefinity.Frontend.Lists/Mvc/Models/ListsModel.cs index 39735d3cb..d8e8257d4 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Mvc/Models/ListsModel.cs +++ b/Telerik.Sitefinity.Frontend.Lists/Mvc/Models/ListsModel.cs @@ -10,6 +10,7 @@ using Telerik.Sitefinity.Model; using Telerik.Sitefinity.Modules.Lists; using Telerik.Sitefinity.Taxonomies.Model; +using Telerik.Sitefinity.Web.OutputCache; namespace Telerik.Sitefinity.Frontend.Lists.Mvc.Models { @@ -205,8 +206,8 @@ public override IList GetKeysOfDependentObjects(ContentListV var result = base.GetKeysOfDependentObjects(viewModel); var manager = this.GetManager(); string applicationName = manager != null && manager.Provider != null ? manager.Provider.ApplicationName : string.Empty; - - result.Add(new CacheDependencyKey { Key = string.Concat(ContentLifecycleStatus.Live.ToString(), applicationName), Type = typeof(ListItem) }); + foreach (var key in OutputCacheDependencyHelper.GetPublishedContentCacheDependencyKeys(typeof(ListItem), applicationName)) + result.Add(key); return result; } diff --git a/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.js b/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.js index 31abfc176..1d82073b0 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.js +++ b/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.js @@ -1,83 +1,136 @@ -(function ($) { - $(function () { - $(document).on('click', '[data-sf-role=toggleLink]', function () { - var link = $(this); +(function () { - expandElement(link); + /* Polyfills */ - var wrapper = link.closest('[data-sf-role=lists]'); + if (window.NodeList && !NodeList.prototype.forEach) { + NodeList.prototype.forEach = Array.prototype.forEach; + } - var linkCount = wrapper.find('[data-sf-role=toggleLink]').length; - var expandedLinkCount = wrapper.find('[data-sf-role=toggleLink].expanded').length; + if (!Element.prototype.matches) { + Element.prototype.matches = Element.prototype.msMatchesSelector || + Element.prototype.webkitMatchesSelector; + } - if (linkCount === expandedLinkCount) { - hideExpandAllLink(wrapper); - } - else { - hideCollapseAllLink(wrapper); - } + if (!Element.prototype.closest) { + Element.prototype.closest = function (s) { + var el = this; + + do { + if (el.matches(s)) return el; + el = el.parentElement || el.parentNode; + } while (el !== null && el.nodeType === 1); + return null; + }; + } + + /* Polyfills end */ + + document.addEventListener('DOMContentLoaded', function () { + document.querySelectorAll('[data-sf-role=toggleLink]').forEach(function (x) { + x.addEventListener('click', function () { + var link = this; + + expandElement(link); + + var wrapper = link.closest('[data-sf-role=lists]'); + + var linkCount = wrapper.querySelectorAll('[data-sf-role=toggleLink]').length; + var expandedLinkCount = wrapper.querySelectorAll('[data-sf-role=toggleLink].expanded').length; + + if (linkCount === expandedLinkCount) { + hideExpandAllLink(wrapper); + } + else { + hideCollapseAllLink(wrapper); + } + }); }); - $(document).on('click', '[data-sf-role=expandAll]', function () { - var wrapper = $(this).closest('[data-sf-role=lists]'); - wrapper.find('[data-sf-role=expandAll]').css('display', 'none'); - wrapper.find('[data-sf-role=collapseAll]').css('display', 'block'); - var links = wrapper.find('[data-sf-role=toggleLink]'); - links.addClass('expanded'); - links.next('div').css('display', 'block'); + document.querySelectorAll('[data-sf-role=expandAll]').forEach(function (x) { + x.addEventListener('click', function () { + var wrapper = this.closest('[data-sf-role=lists]'); + wrapper.querySelector('[data-sf-role=expandAll]').style.display = 'none'; + wrapper.querySelector('[data-sf-role=collapseAll]').style.display = 'block'; + var links = wrapper.querySelectorAll('[data-sf-role=toggleLink]'); + links.forEach(function (link) { + link.classList.add('expanded'); + + var nextSiblingDiv = link.nextElementSibling; + if (nextSiblingDiv.tagName.toLowerCase() === 'div') { + nextSiblingDiv.style.display = 'block'; + } + }); + }); }); - $(document).on('click', '[data-sf-role=collapseAll]', function () { - var wrapper = $(this).closest('[data-sf-role=lists]'); - wrapper.find('[data-sf-role=expandAll]').css('display', 'block'); - wrapper.find('[data-sf-role=collapseAll]').css('display', 'none'); - var links = wrapper.find('[data-sf-role=toggleLink]'); - links.removeClass('expanded'); - links.next('div').css('display', 'none'); + document.querySelectorAll('[data-sf-role=collapseAll]').forEach(function (x) { + x.addEventListener('click', function () { + var wrapper = this.closest('[data-sf-role=lists]'); + wrapper.querySelector('[data-sf-role=expandAll]').style.display = 'block'; + wrapper.querySelector('[data-sf-role=collapseAll]').style.display = 'none'; + var links = wrapper.querySelectorAll('[data-sf-role=toggleLink]'); + links.forEach(function (link) { + link.classList.remove('expanded'); + + var nextSiblingDiv = link.nextElementSibling; + if (nextSiblingDiv.tagName.toLowerCase() === 'div') { + nextSiblingDiv.style.display = 'none'; + } + }); + }); }); + }); - function expandElement(link) { - if (link.hasClass('expanded')) { - link.removeClass('expanded'); - } else { - link.addClass('expanded'); - var itemTitle = link.text().trim(); - sendSentence(itemTitle); - } - - var content = link.next(); - if (content.css('display') === 'none') - content.css('display', 'block'); - else - content.css('display', 'none'); + function expandElement(link) { + if (link.classList.contains('expanded')) { + link.classList.remove('expanded'); + } else { + link.classList.add('expanded'); + var itemTitle = link.innerText.trim(); + sendSentence(itemTitle); } - function hideExpandAllLink(wrapper) { - wrapper.find('[data-sf-role=expandAll]').css('display', 'none'); - wrapper.find('[data-sf-role=collapseAll]').css('display', 'block'); + var content = link.nextElementSibling; + if (content.style.display === 'none') { + content.style.display = 'block'; + } else { + content.style.display = 'none'; } + } - function hideCollapseAllLink(wrapper) { - wrapper.find('[data-sf-role=expandAll]').css('display', 'block'); - wrapper.find('[data-sf-role=collapseAll]').css('display', 'none'); - } + function hideExpandAllLink(wrapper) { + wrapper.querySelectorAll('[data-sf-role=expandAll]').forEach(function (node) { + node.style.display = 'none'; + }); + wrapper.querySelectorAll('[data-sf-role=collapseAll]').forEach(function (node) { + node.style.display = 'block'; + }); + } - function sendSentence(itemTitle) { - if (window.DataIntelligenceSubmitScript) { - DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({ - predicate: "Expand list", - object: itemTitle, - objectMetadata: [{ - 'K': 'PageTitle', - 'V': document.title - }, - { - 'K': 'PageUrl', - 'V': location.href - } - ] - }); - } + function hideCollapseAllLink(wrapper) { + wrapper.querySelectorAll('[data-sf-role=expandAll]').forEach(function (node) { + node.style.display = 'block'; + }); + wrapper.querySelectorAll('[data-sf-role=collapseAll]').forEach(function (node) { + node.style.display = 'none'; + }); + } + + function sendSentence(itemTitle) { + if (window.DataIntelligenceSubmitScript) { + DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({ + predicate: "Expand list", + object: itemTitle, + objectMetadata: [{ + 'K': 'PageTitle', + 'V': document.title + }, + { + 'K': 'PageUrl', + 'V': location.href + } + ] + }); } - }); -}(jQuery)); \ No newline at end of file + } +}()); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js b/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js index e3850c2a1..eb2791a00 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js +++ b/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js @@ -1,2 +1,2 @@ -!function(a){a(function(){a(document).on("click","[data-sf-role=toggleLink]",function(){var l=a(this);!function(l){if(l.hasClass("expanded"))l.removeClass("expanded");else{l.addClass("expanded"),function(l){window.DataIntelligenceSubmitScript&&DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({predicate:"Expand list",object:l,objectMetadata:[{K:"PageTitle",V:document.title},{K:"PageUrl",V:location.href}]})}(l.text().trim())}var e=l.next();"none"===e.css("display")?e.css("display","block"):e.css("display","none")}(l);var e=l.closest("[data-sf-role=lists]");e.find("[data-sf-role=toggleLink]").length===e.find("[data-sf-role=toggleLink].expanded").length?function(l){l.find("[data-sf-role=expandAll]").css("display","none"),l.find("[data-sf-role=collapseAll]").css("display","block")}(e):function(l){l.find("[data-sf-role=expandAll]").css("display","block"),l.find("[data-sf-role=collapseAll]").css("display","none")}(e)}),a(document).on("click","[data-sf-role=expandAll]",function(){var l=a(this).closest("[data-sf-role=lists]");l.find("[data-sf-role=expandAll]").css("display","none"),l.find("[data-sf-role=collapseAll]").css("display","block");var e=l.find("[data-sf-role=toggleLink]");e.addClass("expanded"),e.next("div").css("display","block")}),a(document).on("click","[data-sf-role=collapseAll]",function(){var l=a(this).closest("[data-sf-role=lists]");l.find("[data-sf-role=expandAll]").css("display","block"),l.find("[data-sf-role=collapseAll]").css("display","none");var e=l.find("[data-sf-role=toggleLink]");e.removeClass("expanded"),e.next("div").css("display","none")})})}(jQuery); +window.NodeList&&!NodeList.prototype.forEach&&(NodeList.prototype.forEach=Array.prototype.forEach),Element.prototype.matches||(Element.prototype.matches=Element.prototype.msMatchesSelector||Element.prototype.webkitMatchesSelector),Element.prototype.closest||(Element.prototype.closest=function(e){var t=this;do{if(t.matches(e))return t;t=t.parentElement||t.parentNode}while(null!==t&&1===t.nodeType);return null}),document.addEventListener("DOMContentLoaded",function(){document.querySelectorAll("[data-sf-role=toggleLink]").forEach(function(e){e.addEventListener("click",function(){!function(e){if(e.classList.contains("expanded"))e.classList.remove("expanded");else{e.classList.add("expanded"),function(e){window.DataIntelligenceSubmitScript&&DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({predicate:"Expand list",object:e,objectMetadata:[{K:"PageTitle",V:document.title},{K:"PageUrl",V:location.href}]})}(e.innerText.trim())}var t=e.nextElementSibling;"none"===t.style.display?t.style.display="block":t.style.display="none"}(this);var e,t,l=this.closest("[data-sf-role=lists]");l.querySelectorAll("[data-sf-role=toggleLink]").length===l.querySelectorAll("[data-sf-role=toggleLink].expanded").length?((t=l).querySelectorAll("[data-sf-role=expandAll]").forEach(function(e){e.style.display="none"}),t.querySelectorAll("[data-sf-role=collapseAll]").forEach(function(e){e.style.display="block"})):((e=l).querySelectorAll("[data-sf-role=expandAll]").forEach(function(e){e.style.display="block"}),e.querySelectorAll("[data-sf-role=collapseAll]").forEach(function(e){e.style.display="none"}))})}),document.querySelectorAll("[data-sf-role=expandAll]").forEach(function(e){e.addEventListener("click",function(){var e=this.closest("[data-sf-role=lists]");e.querySelector("[data-sf-role=expandAll]").style.display="none",e.querySelector("[data-sf-role=collapseAll]").style.display="block",e.querySelectorAll("[data-sf-role=toggleLink]").forEach(function(e){e.classList.add("expanded");var t=e.nextElementSibling;"div"===t.tagName.toLowerCase()&&(t.style.display="block")})})}),document.querySelectorAll("[data-sf-role=collapseAll]").forEach(function(e){e.addEventListener("click",function(){var e=this.closest("[data-sf-role=lists]");e.querySelector("[data-sf-role=expandAll]").style.display="block",e.querySelector("[data-sf-role=collapseAll]").style.display="none",e.querySelectorAll("[data-sf-role=toggleLink]").forEach(function(e){e.classList.remove("expanded");var t=e.nextElementSibling;"div"===t.tagName.toLowerCase()&&(t.style.display="none")})})})}); //# sourceMappingURL=lists.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js.map b/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js.map index 1602a6409..6c3cebc48 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js.map +++ b/Telerik.Sitefinity.Frontend.Lists/Mvc/Scripts/Lists/lists.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["lists.js"],"names":["$","document","on","link","this","hasClass","removeClass","addClass","itemTitle","text","trim","window","DataIntelligenceSubmitScript","_client","sentenceClient","writeSentence","predicate","object","objectMetadata","K","V","title","location","href","sendSentence","content","next","css","expandElement","wrapper","closest","find","length","hideExpandAllLink","hideCollapseAllLink","links","jQuery"],"mappings":"CAAC,SAAUA,GACPA,EAAE,WACEA,EAAEC,UAAUC,GAAG,QAAS,4BAA6B,WACjD,IAAIC,EAAOH,EAAEI,OAmCjB,SAAuBD,GACnB,GAAIA,EAAKE,SAAS,YACdF,EAAKG,YAAY,gBACd,CACHH,EAAKI,SAAS,YACd,IAAIC,EAAYL,EAAKM,OAAOC,QAqBpC,SAAsBF,GACdG,OAAOC,8BACPA,6BAA6BC,QAAQC,eAAeC,cAAc,CAC9DC,UAAW,cACXC,OAAQT,EACRU,eAAgB,CAAC,CACbC,EAAK,YACLC,EAAKnB,SAASoB,OAElB,CACIF,EAAK,UACLC,EAAKE,SAASC,SA/BtBC,CAAahB,GAGjB,IAAIiB,EAAUtB,EAAKuB,OACY,SAA3BD,EAAQE,IAAI,WACZF,EAAQE,IAAI,UAAW,SAEvBF,EAAQE,IAAI,UAAW,QA9C3BC,CAAczB,GAEd,IAAI0B,EAAU1B,EAAK2B,QAAQ,wBAEXD,EAAQE,KAAK,6BAA6BC,SAClCH,EAAQE,KAAK,sCAAsCC,OA4C/E,SAA2BH,GACvBA,EAAQE,KAAK,4BAA4BJ,IAAI,UAAW,QACxDE,EAAQE,KAAK,8BAA8BJ,IAAI,UAAW,SA3CtDM,CAAkBJ,GA8C1B,SAA6BA,GACzBA,EAAQE,KAAK,4BAA4BJ,IAAI,UAAW,SACxDE,EAAQE,KAAK,8BAA8BJ,IAAI,UAAW,QA7CtDO,CAAoBL,KAI5B7B,EAAEC,UAAUC,GAAG,QAAS,2BAA4B,WAChD,IAAI2B,EAAU7B,EAAEI,MAAM0B,QAAQ,wBAC9BD,EAAQE,KAAK,4BAA4BJ,IAAI,UAAW,QACxDE,EAAQE,KAAK,8BAA8BJ,IAAI,UAAW,SAC1D,IAAIQ,EAAQN,EAAQE,KAAK,6BACzBI,EAAM5B,SAAS,YACf4B,EAAMT,KAAK,OAAOC,IAAI,UAAW,WAGrC3B,EAAEC,UAAUC,GAAG,QAAS,6BAA8B,WAClD,IAAI2B,EAAU7B,EAAEI,MAAM0B,QAAQ,wBAC9BD,EAAQE,KAAK,4BAA4BJ,IAAI,UAAW,SACxDE,EAAQE,KAAK,8BAA8BJ,IAAI,UAAW,QAC1D,IAAIQ,EAAQN,EAAQE,KAAK,6BACzBI,EAAM7B,YAAY,YAClB6B,EAAMT,KAAK,OAAOC,IAAI,UAAW,YAnC7C,CAkFES","file":"lists.min.js"} \ No newline at end of file +{"version":3,"sources":["lists.js"],"names":["window","NodeList","prototype","forEach","Array","Element","matches","msMatchesSelector","webkitMatchesSelector","closest","s","el","this","parentElement","parentNode","nodeType","document","addEventListener","querySelectorAll","x","link","classList","contains","remove","add","itemTitle","DataIntelligenceSubmitScript","_client","sentenceClient","writeSentence","predicate","object","objectMetadata","K","V","title","location","href","sendSentence","innerText","trim","content","nextElementSibling","style","display","expandElement","wrapper","length","node","querySelector","nextSiblingDiv","tagName","toLowerCase"],"mappings":"AAIQA,OAAOC,WAAaA,SAASC,UAAUC,UACvCF,SAASC,UAAUC,QAAUC,MAAMF,UAAUC,SAG5CE,QAAQH,UAAUI,UACnBD,QAAQH,UAAUI,QAAUD,QAAQH,UAAUK,mBAC1CF,QAAQH,UAAUM,uBAGrBH,QAAQH,UAAUO,UACnBJ,QAAQH,UAAUO,QAAU,SAAUC,GAClC,IAAIC,EAAKC,KAET,EAAG,CACC,GAAID,EAAGL,QAAQI,GAAI,OAAOC,EAC1BA,EAAKA,EAAGE,eAAiBF,EAAGG,iBAChB,OAAPH,GAA+B,IAAhBA,EAAGI,UAC3B,OAAO,OAMfC,SAASC,iBAAiB,mBAAoB,WAC1CD,SAASE,iBAAiB,6BAA6Bf,QAAQ,SAAUgB,GACrEA,EAAEF,iBAAiB,QAAS,YAsDpC,SAAuBG,GACnB,GAAIA,EAAKC,UAAUC,SAAS,YACxBF,EAAKC,UAAUE,OAAO,gBACnB,CACHH,EAAKC,UAAUG,IAAI,YA+B3B,SAAsBC,GACdzB,OAAO0B,8BACPA,6BAA6BC,QAAQC,eAAeC,cAAc,CAC9DC,UAAW,cACXC,OAAQN,EACRO,eAAgB,CAAC,CACbC,EAAK,YACLC,EAAKlB,SAASmB,OAElB,CACIF,EAAK,UACLC,EAAKE,SAASC,SAxCtBC,CADgBlB,EAAKmB,UAAUC,QAInC,IAAIC,EAAUrB,EAAKsB,mBACW,SAA1BD,EAAQE,MAAMC,QACdH,EAAQE,MAAMC,QAAU,QAExBH,EAAQE,MAAMC,QAAU,OAhEpBC,CAFWjC,MAIX,IA2EiBkC,EATFA,EAlEXA,EAJOlC,KAIQH,QAAQ,wBAEXqC,EAAQ5B,iBAAiB,6BAA6B6B,SAC9CD,EAAQ5B,iBAAiB,sCAAsC6B,SA+DxED,EA5DOA,GA6DtB5B,iBAAiB,4BAA4Bf,QAAQ,SAAU6C,GACnEA,EAAKL,MAAMC,QAAU,SAEzBE,EAAQ5B,iBAAiB,8BAA8Bf,QAAQ,SAAU6C,GACrEA,EAAKL,MAAMC,QAAU,aAIAE,EAlEOA,GAmExB5B,iBAAiB,4BAA4Bf,QAAQ,SAAU6C,GACnEA,EAAKL,MAAMC,QAAU,UAEzBE,EAAQ5B,iBAAiB,8BAA8Bf,QAAQ,SAAU6C,GACrEA,EAAKL,MAAMC,QAAU,cAlEzB5B,SAASE,iBAAiB,4BAA4Bf,QAAQ,SAAUgB,GACpEA,EAAEF,iBAAiB,QAAS,WACxB,IAAI6B,EAAUlC,KAAKH,QAAQ,wBAC3BqC,EAAQG,cAAc,4BAA4BN,MAAMC,QAAU,OAClEE,EAAQG,cAAc,8BAA8BN,MAAMC,QAAU,QACxDE,EAAQ5B,iBAAiB,6BAC/Bf,QAAQ,SAAUiB,GACpBA,EAAKC,UAAUG,IAAI,YAEnB,IAAI0B,EAAiB9B,EAAKsB,mBACmB,QAAzCQ,EAAeC,QAAQC,gBACvBF,EAAeP,MAAMC,QAAU,eAM/C5B,SAASE,iBAAiB,8BAA8Bf,QAAQ,SAAUgB,GACtEA,EAAEF,iBAAiB,QAAS,WACxB,IAAI6B,EAAUlC,KAAKH,QAAQ,wBAC3BqC,EAAQG,cAAc,4BAA4BN,MAAMC,QAAU,QAClEE,EAAQG,cAAc,8BAA8BN,MAAMC,QAAU,OACxDE,EAAQ5B,iBAAiB,6BAC/Bf,QAAQ,SAAUiB,GACpBA,EAAKC,UAAUE,OAAO,YAEtB,IAAI2B,EAAiB9B,EAAKsB,mBACmB,QAAzCQ,EAAeC,QAAQC,gBACvBF,EAAeP,MAAMC,QAAU","file":"lists.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Lists/Mvc/Views/Lists/List.ExpandableList.cshtml b/Telerik.Sitefinity.Frontend.Lists/Mvc/Views/Lists/List.ExpandableList.cshtml index 790f6d308..8f4ad4f18 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Mvc/Views/Lists/List.ExpandableList.cshtml +++ b/Telerik.Sitefinity.Frontend.Lists/Mvc/Views/Lists/List.ExpandableList.cshtml @@ -4,8 +4,6 @@ @using Telerik.Sitefinity.Modules.Pages; @using Telerik.Sitefinity.Frontend.Lists.Mvc.Models; -@Html.Script(ScriptRef.JQuery, "top", false) -
    @foreach (var item in Model.Items) diff --git a/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj b/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj index 934c6ea7d..9854ced66 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj +++ b/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj @@ -61,11 +61,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -157,31 +157,31 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Lists/packages.config b/Telerik.Sitefinity.Frontend.Lists/packages.config index 43746f8dc..a2de743ca 100644 --- a/Telerik.Sitefinity.Frontend.Lists/packages.config +++ b/Telerik.Sitefinity.Frontend.Lists/packages.config @@ -3,17 +3,18 @@ + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs b/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs index c92bd3379..2dc5071e9 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs @@ -175,14 +175,13 @@ private string GetLinkedUrl(SfImage image) var node = pageManager.GetPageNode(this.LinkedPageId); if (node != null) { - var provider = SiteMapBase.GetCurrentProvider(); - var siteMapNode = provider.FindSiteMapNodeFromKey(node.Id.ToString()); - linkedUrl = UrlPath.ResolveUrl(siteMapNode.Url, true); + var relativeUrl = node.GetFullUrl(CultureInfo.CurrentUICulture, false); + linkedUrl = UrlPath.ResolveUrl(relativeUrl, false); } } else if (this.UseAsLink && this.LinkedPageId == Guid.Empty) { - linkedUrl = image.ResolveMediaUrl(true); + linkedUrl = image.ResolveMediaUrl(false); } return linkedUrl; diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.js b/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.js index ead3d8504..37332d1f0 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.js +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.js @@ -1,8 +1,8 @@ -(function ($) { - $(function () { - $('[data-sf-role=playVideo]').on('play', function () { - var video = $(this); - var videoSrc = video.attr('src'); +(function () { + document.addEventListener('DOMContentLoaded', function () { + document.querySelector('[data-sf-role=playVideo]').addEventListener('play', function (e) { + var video = e.currentTarget; + var videoSrc = video.getAttribute('src'); sendSentence(videoSrc); }); @@ -24,4 +24,4 @@ } } }); -}(jQuery)); \ No newline at end of file +}()); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js b/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js index 2fdf68d6a..312e0e096 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js @@ -1,2 +1,2 @@ -!function(t){t(function(){t("[data-sf-role=playVideo]").on("play",function(){!function(t){window.DataIntelligenceSubmitScript&&DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({predicate:"Play video",object:t,objectMetadata:[{K:"PageTitle",V:document.title},{K:"PageUrl",V:location.href}]})}(t(this).attr("src"))})})}(jQuery); +document.addEventListener("DOMContentLoaded",function(){document.querySelector("[data-sf-role=playVideo]").addEventListener("play",function(e){var t,n=e.currentTarget.getAttribute("src");t=n,window.DataIntelligenceSubmitScript&&DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({predicate:"Play video",object:t,objectMetadata:[{K:"PageTitle",V:document.title},{K:"PageUrl",V:location.href}]})})}); //# sourceMappingURL=video.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js.map b/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js.map index 197f79d11..79a0b96c9 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js.map +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Scripts/Video/video.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["video.js"],"names":["$","on","itemSrc","window","DataIntelligenceSubmitScript","_client","sentenceClient","writeSentence","predicate","object","objectMetadata","K","V","document","title","location","href","sendSentence","this","attr","jQuery"],"mappings":"CAAC,SAAUA,GACPA,EAAE,WACEA,EAAE,4BAA4BC,GAAG,OAAQ,YAMzC,SAAsBC,GACdC,OAAOC,8BACPA,6BAA6BC,QAAQC,eAAeC,cAAc,CAC9DC,UAAW,aACXC,OAAQP,EACRQ,eAAgB,CAAC,CACbC,EAAK,YACLC,EAAKC,SAASC,OAElB,CACIH,EAAK,UACLC,EAAKG,SAASC,SAd1BC,CAFYjB,EAAEkB,MACOC,KAAK,YAJtC,CA0BEC","file":"video.min.js"} \ No newline at end of file +{"version":3,"sources":["video.js"],"names":["document","addEventListener","querySelector","e","itemSrc","videoSrc","currentTarget","getAttribute","window","DataIntelligenceSubmitScript","_client","sentenceClient","writeSentence","predicate","object","objectMetadata","K","V","title","location","href"],"mappings":"AACIA,SAASC,iBAAiB,mBAAoB,WAC1CD,SAASE,cAAc,4BAA4BD,iBAAiB,OAAQ,SAAUE,GAClF,IAKkBC,EAJdC,EADQF,EAAEG,cACOC,aAAa,OAIhBH,EAHLC,EAITG,OAAOC,8BACPA,6BAA6BC,QAAQC,eAAeC,cAAc,CAC9DC,UAAW,aACXC,OAAQV,EACRW,eAAgB,CAAC,CACbC,EAAK,YACLC,EAAKjB,SAASkB,OAElB,CACIF,EAAK,UACLC,EAAKE,SAASC","file":"video.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/DocumentsList/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/DocumentsList/DesignerView.Simple.cshtml index cb344cbdc..9a8c63dd2 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/DocumentsList/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/DocumentsList/DesignerView.Simple.cshtml @@ -84,7 +84,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + ""))
    @@ -96,7 +96,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/ImageGallery/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/ImageGallery/DesignerView.Simple.cshtml index fc7e1e581..14f0e5521 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/ImageGallery/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/ImageGallery/DesignerView.Simple.cshtml @@ -81,7 +81,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + "")) @@ -93,7 +93,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/Video/Video.Default.cshtml b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/Video/Video.Default.cshtml index 1c18417ef..07193e2db 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/Video/Video.Default.cshtml +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/Video/Video.Default.cshtml @@ -1,9 +1,6 @@ @model Telerik.Sitefinity.Frontend.Media.Mvc.Models.Video.VideoViewModel @using Telerik.Sitefinity.Frontend.Mvc.Helpers; -@using Telerik.Sitefinity.Modules.Pages; - -@Html.Script(ScriptRef.JQuery, "head", false) @{ var videoUrl = Model.Item.Fields.MediaUrl; diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/VideoGallery/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/VideoGallery/DesignerView.Simple.cshtml index d5a08efa1..bdec09309 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/VideoGallery/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/VideoGallery/DesignerView.Simple.cshtml @@ -82,7 +82,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + "")) @@ -94,7 +94,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + "")) diff --git a/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj b/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj index b3c5d6fa6..634e4d797 100644 --- a/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj +++ b/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj @@ -61,11 +61,11 @@ False     - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -240,31 +240,31 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Media/packages.config b/Telerik.Sitefinity.Frontend.Media/packages.config index 43746f8dc..a2de743ca 100644 --- a/Telerik.Sitefinity.Frontend.Media/packages.config +++ b/Telerik.Sitefinity.Frontend.Media/packages.config @@ -3,17 +3,18 @@ + - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Controllers/NavigationController.cs b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Controllers/NavigationController.cs index 0a13941b0..2a7ad51f4 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Controllers/NavigationController.cs +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Controllers/NavigationController.cs @@ -21,8 +21,8 @@ namespace Telerik.Sitefinity.Frontend.Navigation.Mvc.Controllers /// This class represents the controller of Navigation widget. ///     [ControllerToolboxItem( - Name = NavigationController.WidgetName, - Title = nameof(NavigationResources.NavigationControlTitle), + Name = NavigationController.WidgetName, + Title = nameof(NavigationResources.NavigationControlTitle), Description = nameof(NavigationResources.NavigationControlDescription), ResourceClassId = nameof(NavigationResources), SectionName = ToolboxesConfig.NavigationControlsSectionName, @@ -83,7 +83,6 @@ public PageSelectionMode SelectionMode { this.selectionMode = value; this.Model.SelectionMode = value; - this.Model.InitializeNavigationWidgetSettings(); } } @@ -104,7 +103,6 @@ public bool ShowParentPage { this.showParentPage = value; this.Model.ShowParentPage = value; - this.Model.InitializeNavigationWidgetSettings(); } } @@ -122,7 +120,6 @@ public virtual int? LevelsToInclude { this.levelsToInclude = value; this.Model.LevelsToInclude = value; - this.Model.InitializeNavigationWidgetSettings(); } } @@ -161,7 +158,6 @@ public Guid SelectedPageId { this.selectedPageId = value; this.Model.SelectedPageId = value; - this.Model.InitializeNavigationWidgetSettings(); } } @@ -183,7 +179,6 @@ public string SerializedSelectedPages this.serializedSelectedPages = value; var selectedPages = JsonSerializer.DeserializeFromString(value); this.Model.SelectedPages = selectedPages; - this.Model.InitializeNavigationWidgetSettings(); } } @@ -212,7 +207,6 @@ public bool OpenExternalPageInNewTab { this.openExternalPageInNewTab = value; this.Model.OpenExternalPageInNewTab = value; - this.Model.InitializeNavigationWidgetSettings(); } } @@ -250,6 +244,13 @@ public NavigationOutputCacheVariationSettings OutputCache /// public ActionResult Index() { + if (this.OutputCache.VaryByAuthenticationStatus || this.OutputCache.VaryByUserRoles) + { + PageRouteHandler.RegisterCustomOutputCacheVariation(new NavigationOutputCacheVariation(this.OutputCache)); + } + + var fullTemplateName = this.templateNamePrefix + this.TemplateName; + this.Model.InitializeNavigationWidgetSettings(); if (SystemManager.CurrentHttpContext != null) { var cacheDependentNavigationModel = this.Model as IHasCacheDependency; @@ -257,14 +258,8 @@ public ActionResult Index() { this.AddCacheDependencies(cacheDependentNavigationModel.GetCacheDependencyObjects()); } - } - - if (this.OutputCache.VaryByAuthenticationStatus || this.OutputCache.VaryByUserRoles) - { - PageRouteHandler.RegisterCustomOutputCacheVariation(new NavigationOutputCacheVariation(this.OutputCache)); } - - var fullTemplateName = this.templateNamePrefix + this.TemplateName; + return this.View(fullTemplateName, this.Model); } diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs index 8a34e5922..bbea1a777 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs @@ -42,11 +42,11 @@ public NavigationModel() /// The CSS class. /// if set to true [open external page in new tab]. public NavigationModel( - PageSelectionMode selectionMode, + PageSelectionMode selectionMode, Guid selectedPageId, SelectedPageModel[] selectedPages, - int? levelsToInclude, - bool showParentPage, + int? levelsToInclude, + bool showParentPage, string cssClass, bool openExternalPageInNewTab) { @@ -57,8 +57,6 @@ public NavigationModel( this.selectedPageId = selectedPageId; this.selectedPages = selectedPages; this.OpenExternalPageInNewTab = openExternalPageInNewTab; - - this.InitializeNavigationWidgetSettings(); } #endregion @@ -234,7 +232,7 @@ public virtual IList GetCacheDependencyObjects() var multilingualKey = nodeId; if (AppSettings.CurrentSettings.Multilingual) multilingualKey += Thread.CurrentThread.CurrentUICulture; - + cacheDependencyNotifiedObjects.Add(new CacheDependencyKey() { Type = CacheDependencyPageNodeStateChangeType, Key = multilingualKey }); cacheDependencyNotifiedObjects.Add(new CacheDependencyKey() { Type = CacheDependencyPageNodeObjectType, Key = multilingualKey }); } @@ -250,18 +248,26 @@ public virtual IList GetCacheDependencyObjects() public void InitializeNavigationWidgetSettings() { this.Nodes.Clear(); + this.viewModelNodeIds.Clear(); SiteMapProvider siteMapProvider = this.GetProvider(); switch (this.SelectionMode) { case PageSelectionMode.TopLevelPages: - this.AddChildNodes(siteMapProvider.RootNode, false); + if (siteMapProvider.RootNode != null) + { + this.AddChildNodes(siteMapProvider.RootNode, false); + } + break; case PageSelectionMode.SelectedPageChildren: if (!Guid.Equals(this.selectedPageId, Guid.Empty)) { var siteMapNodeFromKey = siteMapProvider.FindSiteMapNodeFromKey(this.selectedPageId.ToString("D")); - this.AddChildNodes(siteMapNodeFromKey, this.ShowParentPage); + if (siteMapNodeFromKey != null) + { + this.AddChildNodes(siteMapNodeFromKey, this.ShowParentPage); + } } break; @@ -476,7 +482,7 @@ protected virtual NodeViewModel InstantiateNodeViewModel(string url, string targ { return new NodeViewModel(null, url, target, false, false); } - + private void SubscribeCacheDependency(List objects) { if (!SystemManager.CurrentHttpContext.Items.Contains(PageCacheDependencyKeys.PageNodes)) @@ -561,7 +567,7 @@ private bool HasSelectedChild(SiteMapNode node) private Guid selectedPageId; private SelectedPageModel[] selectedPages; - + #endregion } } \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.js b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.js index 84c6dac67..5a55179e7 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.js +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.js @@ -1,4 +1,5 @@ function openLink(culture) { - var url = $('[data-sf-role="' + culture + '"]').val(); + var url = document.querySelector('[data-sf-role="' + culture + '"]').value; + window.location = url; } \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js index 63d14ffbd..d2d547f41 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js @@ -1,2 +1,2 @@ -function openLink(n){var o=$('[data-sf-role="'+n+'"]').val();window.location=o} +function openLink(o){var e=document.querySelector('[data-sf-role="'+o+'"]').value;window.location=e} //# sourceMappingURL=language-selector.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js.map b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js.map index 7b7b54a12..a4278718a 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js.map +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/LanguageSelector/language-selector.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["language-selector.js"],"names":["openLink","culture","url","$","val","window","location"],"mappings":"AAAA,SAASA,SAASC,GACd,IAAIC,EAAMC,EAAE,kBAAoBF,EAAU,MAAMG,MAChDC,OAAOC,SAAWJ","file":"language-selector.min.js"} \ No newline at end of file +{"version":3,"sources":["language-selector.js"],"names":["openLink","culture","url","document","querySelector","value","window","location"],"mappings":"AAAA,SAASA,SAASC,GACd,IAAIC,EAAMC,SAASC,cAAc,kBAAoBH,EAAU,MAAMI,MAErEC,OAAOC,SAAWL","file":"language-selector.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.js b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.js index 723b9a423..2d23ad841 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.js +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.js @@ -1,7 +1,19 @@ -jQuery(document).ready(function () { - jQuery('.nav-select').change(function () { - var val = jQuery(this).find('option:selected').val(); - window.location.replace(val); - }); -}); +(function () { + /* Polyfills */ + + if (window.NodeList && !NodeList.prototype.forEach) { + NodeList.prototype.forEach = Array.prototype.forEach; + } + document.addEventListener('DOMContentLoaded', function () { + document.querySelectorAll('.nav-select').forEach(function (x) { + x.addEventListener('change', function (e) { + var checkedOption = e.currentTarget.querySelector('option:checked'); + if (checkedOption) { + var val = checkedOption.value; + window.location.replace(val); + } + }); + }); + }); +}()); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js index 04fbc5703..2db3267b2 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js @@ -1,2 +1,2 @@ -jQuery(document).ready(function(){jQuery(".nav-select").change(function(){var e=jQuery(this).find("option:selected").val();window.location.replace(e)})}); +window.NodeList&&!NodeList.prototype.forEach&&(NodeList.prototype.forEach=Array.prototype.forEach),document.addEventListener("DOMContentLoaded",function(){document.querySelectorAll(".nav-select").forEach(function(e){e.addEventListener("change",function(e){var o=e.currentTarget.querySelector("option:checked");if(o){var t=o.value;window.location.replace(t)}})})}); //# sourceMappingURL=Navigation.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js.map b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js.map index e99f3c97c..1ca2143f3 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js.map +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Scripts/Navigation.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["Navigation.js"],"names":["jQuery","document","ready","change","val","this","find","window","location","replace"],"mappings":"AAAAA,OAAOC,UAAUC,MAAM,WACnBF,OAAO,eAAeG,OAAO,WACzB,IAAIC,EAAMJ,OAAOK,MAAMC,KAAK,mBAAmBF,MAC/CG,OAAOC,SAASC,QAAQL","file":"Navigation.min.js"} \ No newline at end of file +{"version":3,"sources":["Navigation.js"],"names":["window","NodeList","prototype","forEach","Array","document","addEventListener","querySelectorAll","x","e","checkedOption","currentTarget","querySelector","val","value","location","replace"],"mappings":"AAGQA,OAAOC,WAAaA,SAASC,UAAUC,UACvCF,SAASC,UAAUC,QAAUC,MAAMF,UAAUC,SAGjDE,SAASC,iBAAiB,mBAAoB,WAC1CD,SAASE,iBAAiB,eAAeJ,QAAQ,SAAUK,GACvDA,EAAEF,iBAAiB,SAAU,SAAUG,GACnC,IAAIC,EAAgBD,EAAEE,cAAcC,cAAc,kBAClD,GAAIF,EAAe,CACf,IAAIG,EAAMH,EAAcI,MACxBd,OAAOe,SAASC,QAAQH","file":"Navigation.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Views/LanguageSelector/LanguageSelector.DropDownMenu.cshtml b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Views/LanguageSelector/LanguageSelector.DropDownMenu.cshtml index 5309856af..7da3d03ae 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Views/LanguageSelector/LanguageSelector.DropDownMenu.cshtml +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Views/LanguageSelector/LanguageSelector.DropDownMenu.cshtml @@ -4,8 +4,6 @@ @using Telerik.Sitefinity.Services; @using Telerik.Sitefinity.Modules.Pages; -@Html.Script(ScriptRef.JQuery, "top", false) -
    diff --git a/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj b/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj index 48623dc73..6a6f3859e 100644 --- a/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj +++ b/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj @@ -63,23 +63,23 @@ False - ..\packages\ServiceStack.5.7.0\lib\net45\ServiceStack.dll + ..\packages\ServiceStack.5.8.0\lib\net45\ServiceStack.dll - ..\packages\ServiceStack.Client.5.7.0\lib\net45\ServiceStack.Client.dll + ..\packages\ServiceStack.Client.5.8.0\lib\net45\ServiceStack.Client.dll - ..\packages\ServiceStack.Common.5.7.0\lib\net45\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.5.8.0\lib\net45\ServiceStack.Common.dll - ..\packages\ServiceStack.Interfaces.5.7.0\lib\net45\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Interfaces.5.8.0\lib\net45\ServiceStack.Interfaces.dll - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll ..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll @@ -175,31 +175,31 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.News/packages.config b/Telerik.Sitefinity.Frontend.News/packages.config index 72e24f3fa..beef6f512 100644 --- a/Telerik.Sitefinity.Frontend.News/packages.config +++ b/Telerik.Sitefinity.Frontend.News/packages.config @@ -3,23 +3,24 @@ + - - - - - + + + + + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj b/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj index 1501472a0..1d16a9484 100644 --- a/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj +++ b/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj @@ -129,27 +129,27 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Publishing/packages.config b/Telerik.Sitefinity.Frontend.Publishing/packages.config index 8de194791..c0443ebf2 100644 --- a/Telerik.Sitefinity.Frontend.Publishing/packages.config +++ b/Telerik.Sitefinity.Frontend.Publishing/packages.config @@ -8,8 +8,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Models/SearchResultsModel.cs b/Telerik.Sitefinity.Frontend.Search/Mvc/Models/SearchResultsModel.cs index 032d223b8..d5519e546 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Models/SearchResultsModel.cs +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Models/SearchResultsModel.cs @@ -170,7 +170,9 @@ public virtual void PopulateResults(string searchQuery, string indexCatalogue, i var filteredResultsText = Res.Get().SearchResultsStatusMessageShort; this.ResultText = string.Format(filteredResultsText, HttpUtility.HtmlEncode(queryTest)); - this.Results = new ResultModel(result.ToList(), totalCount); + var culture = string.IsNullOrEmpty(language) ? CultureInfo.CurrentUICulture.Name : language; + using (new CultureRegion(culture)) + this.Results = new ResultModel(result.ToList(), totalCount); } /// diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.js b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.js index 19db0e63b..e428906b9 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.js +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.js @@ -12,6 +12,7 @@ minSuggestionLength: searchBoxIdField.siblings('[data-sf-role="minSuggestionLength"]').first().val(), suggestionFields: searchBoxIdField.siblings('[data-sf-role="suggestionFields"]').first().val(), language: searchBoxIdField.siblings('[data-sf-role="language"]').first().val(), + siteId: searchBoxIdField.siblings('[data-sf-role="siteId"]').first().val(), suggestionsRoute: searchBoxIdField.siblings('[data-sf-role="suggestionsRoute"]').first().val(), searchTextBoxSelector: searchBoxIdField.val(), searchButtonSelector: searchBoxIdField.siblings('[data-sf-role="searchButtonId"]').first().val() @@ -91,6 +92,7 @@ request.SuggestionFields = serverData.suggestionFields; request.Text = searchText; request.Language = serverData.language; + request.SiteId = serverData.siteId; $.ajax({ type: "GET", diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js index f3f03b5bd..fc685ddf6 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js @@ -1,2 +1,2 @@ -!function(l){l(document).ready(function(){for(var e=l('[data-sf-role="searchTextBoxId"]'),t=0;t=o.minSuggestionLength&&(t.IndexName=o.indexCatalogue,t.SuggestionFields=o.suggestionFields,t.Text=a,t.Language=o.language,l.ajax({type:"GET",url:o.suggestionsRoute,dataType:"json",data:t,success:s}))}});try{n.autocomplete({source:[],messages:{noResults:"",results:function(){}},select:function(e,t){n.val(t.item.value),i(e)}}).autocomplete("widget").addClass("sf-autocomplete")}catch(e){}}function s(e,t){var a=e.Suggestions;n.autocomplete("option","source",a),n.autocomplete("search",n.val().trim())}function i(e){(e=e||window.event).stopPropagation?e.stopPropagation():e.cancelBubble=!0,e.preventDefault?e.preventDefault():e.returnValue=!1;var t=n.val();t&&t.trim()&&o.indexCatalogue&&(window.DataIntelligenceSubmitScript&&DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({predicate:"Search for",object:n.val(),objectMetadata:[{K:"PageUrl",V:location.href}]}),window.location=function(){var e=n.val().trim(),t=(-1==o.resultsUrl.indexOf("?")?"?":"&")+"indexCatalogue="+encodeURIComponent(o.indexCatalogue),a="&searchQuery="+encodeURIComponent(e),s="&wordsMode="+o.wordsMode;return o.resultsUrl+t+a+s}())}}})}(jQuery); +!function(i){i(document).ready(function(){for(var e=i('[data-sf-role="searchTextBoxId"]'),t=0;t=n.minSuggestionLength&&(t.IndexName=n.indexCatalogue,t.SuggestionFields=n.suggestionFields,t.Text=s,t.Language=n.language,t.SiteId=n.siteId,i.ajax({type:"GET",url:n.suggestionsRoute,dataType:"json",data:t,success:a}))}});try{l.autocomplete({source:[],messages:{noResults:"",results:function(){}},select:function(e,t){l.val(t.item.value),o(e)}}).autocomplete("widget").addClass("sf-autocomplete")}catch(e){}}function a(e,t){var s=e.Suggestions;l.autocomplete("option","source",s),l.autocomplete("search",l.val().trim())}function o(e){(e=e||window.event).stopPropagation?e.stopPropagation():e.cancelBubble=!0,e.preventDefault?e.preventDefault():e.returnValue=!1;var t,s,a,o,i=l.val();i&&i.trim()&&n.indexCatalogue&&(window.DataIntelligenceSubmitScript&&DataIntelligenceSubmitScript._client.sentenceClient.writeSentence({predicate:"Search for",object:l.val(),objectMetadata:[{K:"PageUrl",V:location.href}]}),window.location=(t=l.val().trim(),s=(-1==n.resultsUrl.indexOf("?")?"?":"&")+"indexCatalogue="+encodeURIComponent(n.indexCatalogue),a="&searchQuery="+encodeURIComponent(t),o="&wordsMode="+n.wordsMode,n.resultsUrl+s+a+o))}}})}(jQuery); //# sourceMappingURL=Search-box.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js.map b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js.map index de8ad1804..bb6081ff3 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js.map +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchBox/Search-box.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["Search-box.js"],"names":["$","document","ready","searchBoxIdFields","i","length","searchBoxIdField","featherSearchBoxWidget","resultsUrl","siblings","first","val","indexCatalogue","wordsMode","disableSuggestions","parseJSON","minSuggestionLength","suggestionFields","language","suggestionsRoute","searchTextBoxSelector","searchButtonSelector","serverData","searchTextBox","click","navigateToResults","keypress","e","window","event","keyCode","charCode","keyup","request","searchText","trim","IndexName","SuggestionFields","Text","Language","ajax","type","url","dataType","data","success","suggestionsSuccessHandler","autocomplete","source","messages","noResults","results","select","ui","item","value","addClass","result","args","dataSource","Suggestions","stopPropagation","cancelBubble","preventDefault","returnValue","query","DataIntelligenceSubmitScript","_client","sentenceClient","writeSentence","predicate","object","objectMetadata","K","V","location","href","catalogueParam","indexOf","encodeURIComponent","searchQueryParam","wordsModeParam","getLocation","jQuery"],"mappings":"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","file":"Search-box.min.js"} \ No newline at end of file +{"version":3,"file":"Search-box.min.js","sources":["Search-box.js"],"names":["$","document","ready","searchBoxIdFields","i","length","searchBoxIdField","featherSearchBoxWidget","resultsUrl","siblings","first","val","indexCatalogue","wordsMode","disableSuggestions","parseJSON","minSuggestionLength","suggestionFields","language","siteId","suggestionsRoute","searchTextBoxSelector","searchButtonSelector","serverData","searchTextBox","click","navigateToResults","keypress","e","window","event","keyCode","charCode","keyup","request","searchText","trim","IndexName","SuggestionFields","Text","Language","SiteId","ajax","type","url","dataType","data","success","suggestionsSuccessHandler","autocomplete","source","messages","noResults","results","select","ui","item","value","addClass","result","args","dataSource","Suggestions","stopPropagation","cancelBubble","preventDefault","returnValue","query","catalogueParam","searchQueryParam","wordsModeParam","DataIntelligenceSubmitScript","_client","sentenceClient","writeSentence","predicate","object","objectMetadata","K","V","location","href","indexOf","encodeURIComponent","jQuery"],"mappings":"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"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.js b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.js index f3390ff10..d4812ddc2 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.js +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.js @@ -1,26 +1,35 @@ -(function($){ - $(document).ready(function () { +(function () { + /* Polyfills */ + if (window.NodeList && !NodeList.prototype.forEach) { + NodeList.prototype.forEach = Array.prototype.forEach; + } + + /* Polyfills end */ + + document.addEventListener('DOMContentLoaded', function () { //Dropdownlist Selectedchange event - $(".userSortDropdown").change(function (value) { - var selectedValue = $(value.currentTarget).val(); - var url = getResultsUrl(selectedValue); - window.location.search = url; + document.querySelectorAll(".userSortDropdown").forEach(function (result) { + result.addEventListener('change', function () { + var selectedValue = result.value; + var url = getResultsUrl(selectedValue); + window.location.search = url; + }); }); // Returns url with all needed parameters function getResultsUrl(orderBy, language) { - var orderByFieldValue = $('[data-sf-role="searchResOrderBy"]').val(); - var orderByValue = orderBy || orderByFieldValue; - var languageFieldValue = $('[data-sf-role="searchResLanguage"]').val(); - var languageValue = language || languageFieldValue; + var orderByField = document.querySelector('[data-sf-role="searchResOrderBy"]'); + orderByValue = orderBy || orderByField.value; + var languageField = document.querySelector('[data-sf-role="searchResLanguage"]'); + var languageValue = language || languageField.value; var orderByParam = orderByValue ? '&orderBy=' + orderByValue : ''; var languageParam = languageValue ? '&language=' + languageValue : ''; - var indexCatalogueParam = $('[data-sf-role="searchResIndexCatalogue"]').val(); - var searchQueryParam = $('[data-sf-role="searchResQuery"]').val(); - var wordsModeParam = $('[data-sf-role="searchResWordsMode"]').val(); + var indexCatalogueParam = document.querySelector('[data-sf-role="searchResIndexCatalogue"]').value; + var searchQueryParam = document.querySelector('[data-sf-role="searchResQuery"]').value; + var wordsModeParam = document.querySelector('[data-sf-role="searchResWordsMode"]').value; return '?indexCatalogue=' + indexCatalogueParam + '&' + 'searchQuery=' + searchQueryParam + '&' + 'wordsMode=' + wordsModeParam + @@ -28,4 +37,4 @@ languageParam; } }); -}(jQuery)); \ No newline at end of file +}()); \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js index eba8f345f..d2b634bc3 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js @@ -1,2 +1,2 @@ -!function(f){f(document).ready(function(){f(".userSortDropdown").change(function(a){var e=function(a,e){var r=f('[data-sf-role="searchResOrderBy"]').val(),o=a||r,s=f('[data-sf-role="searchResLanguage"]').val(),n=e||s,d=o?"&orderBy="+o:"",t=n?"&language="+n:"",c=f('[data-sf-role="searchResIndexCatalogue"]').val(),l=f('[data-sf-role="searchResQuery"]').val(),u=f('[data-sf-role="searchResWordsMode"]').val();return"?indexCatalogue="+c+"&searchQuery="+l+"&wordsMode="+u+d+t}(f(a.currentTarget).val());window.location.search=e})})}(jQuery); +window.NodeList&&!NodeList.prototype.forEach&&(NodeList.prototype.forEach=Array.prototype.forEach),document.addEventListener("DOMContentLoaded",function(){document.querySelectorAll(".userSortDropdown").forEach(function(r){r.addEventListener("change",function(){var e=function(e,r){var o=document.querySelector('[data-sf-role="searchResOrderBy"]');orderByValue=e||o.value;var a=document.querySelector('[data-sf-role="searchResLanguage"]'),t=r||a.value,d=orderByValue?"&orderBy="+orderByValue:"",u=t?"&language="+t:"",n=document.querySelector('[data-sf-role="searchResIndexCatalogue"]').value,c=document.querySelector('[data-sf-role="searchResQuery"]').value,l=document.querySelector('[data-sf-role="searchResWordsMode"]').value;return"?indexCatalogue="+n+"&searchQuery="+c+"&wordsMode="+l+d+u}(r.value);window.location.search=e})})}); //# sourceMappingURL=Search-results.min.js.map \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js.map b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js.map index fef1cf8bb..69bcef055 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js.map +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Scripts/SearchResults/Search-results.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["Search-results.js"],"names":["$","document","ready","change","value","url","orderBy","language","orderByFieldValue","val","orderByValue","languageFieldValue","languageValue","orderByParam","languageParam","indexCatalogueParam","searchQueryParam","wordsModeParam","getResultsUrl","currentTarget","window","location","search","jQuery"],"mappings":"CAAC,SAASA,GACNA,EAAEC,UAAUC,MAAM,WAGdF,EAAE,qBAAqBG,OAAO,SAAUC,GACpC,IACIC,EAKR,SAAuBC,EAASC,GAC5B,IAAIC,EAAoBR,EAAE,qCAAqCS,MAC3DC,EAAeJ,GAAWE,EAC1BG,EAAqBX,EAAE,sCAAsCS,MAC7DG,EAAgBL,GAAYI,EAE5BE,EAAeH,EAAe,YAAcA,EAAe,GAC3DI,EAAgBF,EAAgB,aAAeA,EAAgB,GAE/DG,EAAsBf,EAAE,4CAA4CS,MACpEO,EAAmBhB,EAAE,mCAAmCS,MACxDQ,EAAiBjB,EAAE,uCAAuCS,MAC9D,MAAO,mBAAqBM,EAAsB,gBAC7BC,EAAmB,cACrBC,EACfJ,EACAC,EArBMI,CADUlB,EAAEI,EAAMe,eAAeV,OAE3CW,OAAOC,SAASC,OAASjB,MAPrC,CA8BEkB","file":"Search-results.min.js"} \ No newline at end of file +{"version":3,"sources":["Search-results.js"],"names":["window","NodeList","prototype","forEach","Array","document","addEventListener","querySelectorAll","result","url","orderBy","language","orderByField","querySelector","orderByValue","value","languageField","languageValue","orderByParam","languageParam","indexCatalogueParam","searchQueryParam","wordsModeParam","getResultsUrl","location","search"],"mappings":"AAGQA,OAAOC,WAAaA,SAASC,UAAUC,UACvCF,SAASC,UAAUC,QAAUC,MAAMF,UAAUC,SAKjDE,SAASC,iBAAiB,mBAAoB,WAE1CD,SAASE,iBAAiB,qBAAqBJ,QAAQ,SAAUK,GAC7DA,EAAOF,iBAAiB,SAAU,WAC9B,IACIG,EAMZ,SAAuBC,EAASC,GAC5B,IAAIC,EAAeP,SAASQ,cAAc,qCAC1CC,aAAeJ,GAAWE,EAAaG,MACvC,IAAIC,EAAgBX,SAASQ,cAAc,sCACvCI,EAAgBN,GAAYK,EAAcD,MAE1CG,EAAeJ,aAAe,YAAcA,aAAe,GAC3DK,EAAgBF,EAAgB,aAAeA,EAAgB,GAE/DG,EAAsBf,SAASQ,cAAc,4CAA4CE,MACzFM,EAAmBhB,SAASQ,cAAc,mCAAmCE,MAC7EO,EAAiBjB,SAASQ,cAAc,uCAAuCE,MACnF,MAAO,mBAAqBK,EAAsB,gBAC7BC,EAAmB,cACrBC,EACfJ,EACAC,EAtBUI,CADUf,EAAOO,OAE3Bf,OAAOwB,SAASC,OAAShB","file":"Search-results.min.js"} \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchBox/SearchBox.cshtml b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchBox/SearchBox.cshtml index 9c7a44ce2..630162d1a 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchBox/SearchBox.cshtml +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchBox/SearchBox.cshtml @@ -1,33 +1,29 @@ @model Telerik.Sitefinity.Frontend.Search.Mvc.Models.ISearchBoxModel - @using Telerik.Sitefinity.Services; @using Telerik.Sitefinity.Modules.Pages; @using Telerik.Sitefinity.Frontend.Mvc.Helpers; - @* Styling needed for search autocomplete popup positioning. If removed from template, make sure to inlcude the css from the file or functionally similar styling in your resrouce package manually. *@ @Html.StyleSheet(Url.WidgetContent("assets/dist/css/sf-search-box.min.css"), "head", false) - @{ var searchTextBoxId = Guid.NewGuid(); var searchButtonId = Guid.NewGuid(); - } - +} @(!String.IsNullOrEmpty(Model.CssClass) ? - Html.Raw(String.Format("
    ", HttpUtility.HtmlAttributeEncode(Model.CssClass))) : - Html.Raw("
    ")) - - - - - - - - - - - - - + Html.Raw(String.Format("
    ", HttpUtility.HtmlAttributeEncode(Model.CssClass))) : + Html.Raw("
    ")) + + + + + + + + + + + + +
    @* Avoid conflicts because the designer is loading kendo too. *@ @@ -36,5 +32,4 @@ @Html.Script(ScriptRef.JQuery, "top", false) @Html.Script(ScriptRef.JQueryUI, "top", false) } - @Html.Script(Url.WidgetContent("Mvc/Scripts/SearchBox/Search-box.js"), "bottom", false) diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/DesignerView.Simple.cshtml index d424c5576..c37ab6a1e 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/DesignerView.Simple.cshtml @@ -9,7 +9,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(), - "")) + ""))
    @@ -21,7 +21,7 @@ @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(), - "")) + ""))
    diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/SearchResults.cshtml b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/SearchResults.cshtml index 166f160bd..0bb9fed5f 100644 --- a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/SearchResults.cshtml +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/SearchResults/SearchResults.cshtml @@ -8,11 +8,6 @@ @using Telerik.Sitefinity.Services; @using Telerik.Sitefinity.Web -@if (!SystemManager.IsDesignMode) -{ - @Html.Script(ScriptRef.JQuery, "top", false) -} -
    @if (@Model.Results.TotalCount > 0) @@ -162,4 +157,4 @@
    -@Html.Script(Url.WidgetContent("Mvc/Scripts/SearchResults/Search-results.js"), "bottom", false) \ No newline at end of file +@Html.Script(Url.WidgetContent("Mvc/Scripts/SearchResults/Search-results.js"), "bottom", throwException: false) \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj b/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj index 446b55360..f3d0f2e4f 100644 --- a/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj +++ b/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj @@ -158,35 +158,35 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.ServicesImpl.12.2.7200\lib\net472\Telerik.Sitefinity.Search.Impl.dll + ..\packages\Telerik.Sitefinity.ServicesImpl.13.0.7300\lib\net472\Telerik.Sitefinity.Search.Impl.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Search.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Search.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Search/packages.config b/Telerik.Sitefinity.Frontend.Search/packages.config index a6f6f28ef..a62722659 100644 --- a/Telerik.Sitefinity.Frontend.Search/packages.config +++ b/Telerik.Sitefinity.Frontend.Search/packages.config @@ -8,9 +8,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj b/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj index 148ee7747..233a7f44b 100644 --- a/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj +++ b/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj @@ -61,11 +61,11 @@ False - ..\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.5.8.0\lib\net45\ServiceStack.Text.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -167,27 +167,27 @@ - ..\packages\Telerik.Sitefinity.Content.12.2.7200\lib\net472\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.0.7300\lib\net472\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.12.2.7200\lib\net472\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.12.2.7200\lib\net472\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.0.7300\lib\net472\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Taxonomies/packages.config b/Telerik.Sitefinity.Frontend.Taxonomies/packages.config index 43746f8dc..a2de743ca 100644 --- a/Telerik.Sitefinity.Frontend.Taxonomies/packages.config +++ b/Telerik.Sitefinity.Frontend.Taxonomies/packages.config @@ -3,17 +3,18 @@ + - + - + - - - - + + + + \ No newline at end of file diff --git a/package.json b/package.json index ea65485c1..f8608f23f 100644 --- a/package.json +++ b/package.json @@ -11,12 +11,12 @@ }, "homepage": "https://github.com/Sitefinity/feather", "devDependencies": { - "grunt": "~0.4.5", + "grunt": "0.4.5", "grunt-contrib-connect": "^0.9.0", "grunt-contrib-jasmine": "^1.0.3", "grunt-contrib-jshint": "^0.10.0", "grunt-html2js": "^0.2.9", - "grunt-contrib-uglify": "^4.0.1", + "grunt-contrib-uglify": "4.0.1", "grunt-template-jasmine-istanbul": "^0.4.0", "jasmine-core": "^2.1.3", "karma": "^0.13.22",