yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to rte embed stuff following Shannons comments

Browse Source
This commit is contained in:
Tim Geyssens
2013-09-16 10:05:33 +02:00
parent b6d00cca63
commit ecbaa94ab5
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js
View File

@@ -1,4 +1,4 @@
angular.module("umbraco").controller("Umbraco.Dialogs.EmbedController", function ($scope, $http) {
angular.module("umbraco").controller("Umbraco.Dialogs.RteEmbedController", function ($scope, $http) {
$scope.url = "";
$scope.width = 500;
$scope.height = 300;
@@ -14,7 +14,7 @@
$scope.success = false;
$http({ method: 'POST', url: '/umbraco/UmbracoApi/Embed/Embed', params: { url: $scope.url, width: $scope.width, height: $scope.height } })
$http({ method: 'POST', url: '/umbraco/UmbracoApi/RteEmbed/Embed', params: { url: $scope.url, width: $scope.width, height: $scope.height } })
.success(function(data) {
$scope.preview = data.Markup;
$scope.success = true;

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html
View File

@@ -1,4 +1,4 @@
<div class="umb-panel" ng-controller="Umbraco.Dialogs.EmbedController">
<div class="umb-panel" ng-controller="Umbraco.Dialogs.RteEmbedController">
<div class="umb-panel-header">

5
src/Umbraco.Web/Editors/EmbedController.cs → src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
View File

@@ -6,19 +6,20 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Xml;
using Umbraco.Core.Configuration;
using Umbraco.Web.Editors;
using Umbraco.Web.Mvc;
using Umbraco.Web.WebApi.Filters;
using Constants = Umbraco.Core.Constants;
using Umbraco.Core.Media;
using System.IO;
namespace Umbraco.Web.Editors
namespace Umbraco.Web.PropertyEditors
{
/// <summary>
/// A controller used for the embed dialog
/// </summary>
[PluginController("UmbracoApi")]
public class EmbedController : UmbracoAuthorizedJsonController
public class RteEmbedController : UmbracoAuthorizedJsonController
{
public Result Embed(string url, int width, int height)
{

2
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -304,7 +304,7 @@
<Compile Include="Editors\DashboardController.cs" />
<Compile Include="Editors\DataTypeController.cs" />
<Compile Include="Editors\DataTypeValidateAttribute.cs" />
<Compile Include="Editors\EmbedController.cs" />
<Compile Include="PropertyEditors\RteEmbedController.cs" />
<Compile Include="Editors\EntityController.cs" />
<Compile Include="Editors\MediaPostValidateAttribute.cs" />
<Compile Include="Editors\MemberController.cs" />