From af256e754de06de2baa67bcc719df9273a722ddb Mon Sep 17 00:00:00 2001 From: AndyButland Date: Wed, 1 Oct 2014 11:28:00 +0200 Subject: [PATCH] Moved preview step for RTE embed dialog to a button press --- .../views/common/dialogs/rteembed.controller.js | 15 +++++++++------ .../src/views/common/dialogs/rteembed.html | 3 ++- 2 files changed, 11 insertions(+), 7 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 abbf475a27..f2052ccc65 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 @@ -12,9 +12,9 @@ var origWidth = 500; var origHeight = 300; - $scope.showPreview = function(){ + $scope.showPreview = function() { - if ($scope.form.url != "") { + if ($scope.form.url) { $scope.form.show = true; $scope.form.preview = "
"; $scope.form.info = ""; @@ -28,7 +28,7 @@ switch (data.Status) { case 0: //not supported - $scope.form.info = "Not Supported"; + $scope.form.info = "Not supported"; break; case 1: //error @@ -41,13 +41,16 @@ break; } }) - .error(function() { + .error(function () { + $scope.form.supportsDimensions = false; $scope.form.preview = ""; $scope.form.info = "Computer says no"; }); - + } else { + $scope.form.supportsDimensions = false; + $scope.form.preview = ""; + $scope.form.info = "Please enter a URL"; } - }; $scope.changeSize = function (type) { 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 57efd660e0..62b0340769 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 @@ -3,7 +3,8 @@