diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js index bc8961da09..0bd27ec0b0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js @@ -385,7 +385,7 @@ angular.module('umbraco.services') * Opens a dialog to an embed dialog */ embedDialog: function (options) { - options.template = 'views/common/dialogs/embed.html'; + options.template = 'views/common/dialogs/rteembed.html'; options.show = true; return openDialog(options); }, diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js similarity index 83% rename from src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js rename to src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js index 870e10565c..a48d37f6cb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js @@ -6,7 +6,7 @@ $scope.preview = ""; $scope.success = false; - $scope.preview = function () { + $scope.preview = function(){ if ($scope.url != "") { @@ -14,7 +14,7 @@ $scope.success = false; - $http({ method: 'GET', url: '/umbraco/UmbracoApi/RteEmbed/Embed', params: { url: $scope.url, width: $scope.width, height: $scope.height } }) + $http({ method: 'GET', url: '/umbraco/UmbracoApi/RteEmbed/GetEmbed', params: { url: $scope.url, width: $scope.width, height: $scope.height } }) .success(function(data) { $scope.preview = data.Markup; $scope.success = true; @@ -27,7 +27,7 @@ }; - $scope.insert = function () { + $scope.insert = function(){ $scope.submit($scope.preview); }; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html similarity index 97% rename from src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html rename to src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html index 56899697e6..f70307942c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html @@ -1,6 +1,5 @@ 
-
@@ -9,7 +8,6 @@
-
@@ -17,14 +15,11 @@ - - x -
diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs index 802884a194..aa1c364c22 100644 --- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs +++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs @@ -22,8 +22,8 @@ namespace Umbraco.Web.PropertyEditors [PluginController("UmbracoApi")] public class RteEmbedController : UmbracoAuthorizedJsonController { - [HttpGet] - public Result Embed(string url, int width, int height) + + public Result GetEmbed(string url, int width, int height) { var result = new Result();