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

Merge pull request #6216 from umbraco/v8/feature/2346AB-Enable-RTE-Paste

Browse Source 
AB 2440 - Enable Paste & Drag n Drop of images into RTE editors
This commit is contained in:
Bjarke Berg
2019-09-03 08:45:38 +02:00
committed by GitHub
parent 157c0a2479 30e4eda0d2
commit 121a7e38ca
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -233,17 +233,22 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
//this would be for a theme other than inlite //this would be for a theme other than inlite
toolbar: args.toolbar.join(" "), toolbar: args.toolbar.join(" "),
//these are for the inlite theme to work //these are for the inlite theme to work
insert_toolbar: toolbars.insertToolbar, insert_toolbar: toolbars.insertToolbar,
selection_toolbar: toolbars.selectionToolbar, selection_toolbar: toolbars.selectionToolbar,
body_class: 'umb-rte', body_class: 'umb-rte',
//see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster, cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster,
//this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone //this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone
//stylesheet to load in for this with only these styles (the color is @pinkLight) //stylesheet to load in for this with only these styles (the color is @pinkLight)
content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}" content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}",
// This allows images to be pasted in & stored as Base64 until they get uploaded to server
paste_data_images: true
}; };
if (tinyMceConfig.customConfig) { if (tinyMceConfig.customConfig) {