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

wip for trying tinymce5 (will revert and come back to this later)

Browse Source
This commit is contained in:
Shannon
2018-10-12 09:47:16 +02:00
parent bf9bd4b1f5
commit 8b6ede49b4
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
View File

@@ -23,7 +23,7 @@ angular.module("umbraco.directives")
//queue file loading
if (typeof (tinymce) === "undefined") {
promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", scope));
promises.push(assetsService.loadJs("lib/tinymce5/tinymce.min.js", scope));
}
var toolbar = ["code", "styleselect", "bold", "italic", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "link", "umbmediapicker", "umbembeddialog"];

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

@@ -187,9 +187,9 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
//create a baseline Config to exten upon
var config = {
selector: "#" + args.htmlId,
theme: args.theme ? args.theme : "inlite",
inline: true,
plugins: plugins,
theme: "silver",//args.theme ? args.theme : "inlite",
//inline: true,
//plugins: plugins,
valid_elements: tinyMceConfig.validElements,
invalid_elements: tinyMceConfig.inValidElements,
extended_valid_elements: extendedValidElements,
@@ -199,13 +199,14 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
autoresize_bottom_margin: 0,
content_css: styles.stylesheets,
style_formats: styles.styleFormats,
language: getLanguage(),
//language: getLanguage(),
//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
insert_toolbar: toolbars.insertToolbar,
selection_toolbar: toolbars.selectionToolbar,
//insert_toolbar: toolbars.insertToolbar,
//selection_toolbar: toolbars.selectionToolbar,
body_class: 'umb-rte',
//see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
View File

@@ -65,7 +65,7 @@ angular.module("umbraco")
//queue file loading
if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
promises.push(assetsService.loadJs("lib/tinymce5/tinymce.min.js", $scope));
}
//stores a reference to the editor