From 45b173c0db911f115226187b8b461687f93a21d7 Mon Sep 17 00:00:00 2001 From: arknu Date: Sun, 27 Jul 2014 01:25:39 +0200 Subject: [PATCH 1/3] U4-4729: Make max image dimension in RTE configurable --- .../src/common/services/tinymce.service.js | 20 ++++++++++--------- .../propertyeditors/rte/rte.controller.js | 1 + .../rte/rte.prevalues.controller.js | 3 +++ .../propertyeditors/rte/rte.prevalues.html | 4 ++++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 04b9770ed7..13d7135ec8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -40,7 +40,8 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro var cfg = {}; cfg.toolbar = ["code", "bold", "italic", "styleselect","alignleft", "aligncenter", "alignright", "bullist","numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"]; cfg.stylesheets = []; - cfg.dimensions = {height: 500}; + cfg.dimensions = { height: 500 }; + cfg.maxImageSize = 500; return cfg; }, @@ -120,17 +121,18 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro var imgElm = editor.dom.get('__mcenew'); var size = editor.dom.getSize(imgElm); - var newSize = imageHelper.scaleToMaxSize(500, size.w, size.h); + if (editor.settings.maxImageSize && editor.settings.maxImageSize != 0) { + var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h); - var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;"; - editor.dom.setAttrib(imgElm, 'style', s); - editor.dom.setAttrib(imgElm, 'id', null); + var s = "width: " + newSize.width + "px; height:" + newSize.height + "px;"; + editor.dom.setAttrib(imgElm, 'style', s); + editor.dom.setAttrib(imgElm, 'id', null); - if(img.url){ - var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height; - editor.dom.setAttrib(imgElm, 'data-mce-src', src); + if (img.url) { + var src = img.url + "?width=" + newSize.width + "&height=" + newSize.height; + editor.dom.setAttrib(imgElm, 'data-mce-src', src); + } } - }, 500); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index a990351826..939282f11f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -80,6 +80,7 @@ angular.module("umbraco") statusbar: false, height: editorConfig.dimensions.height, width: editorConfig.dimensions.width, + maxImageSize: editorConfig.maxImageSize, toolbar: toolbar, content_css: stylesheets.join(','), relative_urls: false, diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js index 212a350ced..566fff2553 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js @@ -16,6 +16,9 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController", if (!$scope.model.value.toolbar) { $scope.model.value.toolbar = []; } + if (!$scope.model.value.maxImageSize && $scope.model.value.maxImageSize != 0) { + $scope.model.value.maxImageSize = cfg.maxImageSize; + } tinyMceService.configuration().then(function(config){ $scope.tinyMceConfig = config; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html index 8989bea69b..df5e259637 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html @@ -29,4 +29,8 @@ × Pixels + + + + \ No newline at end of file From 49c26f4a5e453152671c8b18289236d131701a15 Mon Sep 17 00:00:00 2001 From: arknu Date: Sun, 27 Jul 2014 12:46:52 +0200 Subject: [PATCH 2/3] Followup: make sure that defualt value is applied in RTE --- .../src/views/propertyeditors/rte/rte.controller.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 939282f11f..64f4ee5960 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -30,6 +30,9 @@ angular.module("umbraco") var stylesheets = []; var styleFormats = []; var await = []; + if (!editorConfig.maxImageSize) { + editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize; + } //queue file loading if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded From cad946905c7b2944921115450b1ee3620f577ec9 Mon Sep 17 00:00:00 2001 From: arknu Date: Sun, 27 Jul 2014 13:06:02 +0200 Subject: [PATCH 3/3] Bugfix: 0 value was ignored --- .../src/views/propertyeditors/rte/rte.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 64f4ee5960..99327dd2ea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -30,7 +30,7 @@ angular.module("umbraco") var stylesheets = []; var styleFormats = []; var await = []; - if (!editorConfig.maxImageSize) { + if (!editorConfig.maxImageSize && editorConfig.maxImageSize != 0) { editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize; }