From b469ed92ff68d549194583b8bb99fe3783f59062 Mon Sep 17 00:00:00 2001 From: Tim Geyssens Date: Wed, 18 Sep 2013 15:03:23 +0200 Subject: [PATCH] Also make sure the embed rte plugin only shows resize options if provider supports it --- .../common/dialogs/rteembed.controller.js | 28 ++++++++++++++++--- .../src/views/common/dialogs/rteembed.html | 13 +++++---- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js index 3f0995b79e..52806dfb99 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.controller.js @@ -5,23 +5,43 @@ $scope.constrain = true; $scope.preview = ""; $scope.success = false; - + $scope.info = ""; + $scope.supportsDimensions = false; + var origWidth = 500; var origHeight = 300; + $scope.showPreview = function(){ if ($scope.url != "") { $scope.preview = "
"; + $scope.info = ""; $scope.success = false; $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; + .success(function (data) { + + $scope.preview = ""; + + switch (data.Status) { + case 0: + //not supported + $scope.info = "Not Supported"; + break; + case 1: + //error + $scope.info = "Computer says no"; + break; + case 2: + $scope.preview = data.Markup; + $scope.supportsDimensions = data.SupportsDimensions; + break; + } }) .error(function() { $scope.preview = ""; + $scope.info = "Computer says no"; }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html index 71169adcc2..27470349c4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html @@ -14,12 +14,15 @@ + +
+ + x + + +
- - x - - - +