mirror of
https://github.com/friendica/friendica
synced 2024-11-14 04:22:55 +00:00
try to improve TinyMCE block handling
This commit is contained in:
parent
d39a2e8a9d
commit
6668d22d37
27 changed files with 91 additions and 91 deletions
|
@ -670,9 +670,9 @@ function setupFieldRichtext(){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: baseurl+"/view/custom_tinymce.css",
|
content_css: baseurl+"/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -17,9 +17,9 @@ tinyMCE.init({
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: "$baseurl/view/custom_tinymce.css"
|
content_css: "$baseurl/view/custom_tinymce.css"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -94,9 +94,9 @@
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
|
|
|
@ -38,9 +38,9 @@ function initEditor(cb){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -21,9 +21,9 @@ if(plaintext != 'none') {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
|
|
@ -20,9 +20,9 @@ tinyMCE.init({
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
|
|
|
@ -22,9 +22,9 @@ tinyMCE.init({
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css"
|
content_css: "{{$baseurl}}/view/custom_tinymce.css"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -99,9 +99,9 @@
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
|
|
|
@ -43,9 +43,9 @@ function initEditor(cb){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -26,9 +26,9 @@ if(plaintext != 'none') {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
|
|
@ -25,9 +25,9 @@ tinyMCE.init({
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
|
|
|
@ -26,9 +26,9 @@ if(plaintext != 'none') {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
|
|
@ -36,9 +36,9 @@ function initEditor(cb) {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -41,9 +41,9 @@ function initEditor(cb) {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -690,9 +690,9 @@ function setupFieldRichtext(){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: baseurl+"/view/custom_tinymce.css",
|
content_css: baseurl+"/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
2
view/theme/frost-mobile/js/main.min.js
vendored
2
view/theme/frost-mobile/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -330,9 +330,9 @@ function initEditor(cb){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
@ -432,9 +432,9 @@ function wallInitEditor() {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: baseurl + "/view/custom_tinymce.css",
|
content_css: baseurl + "/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
|
2
view/theme/frost-mobile/js/theme.min.js
vendored
2
view/theme/frost-mobile/js/theme.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -682,9 +682,9 @@ function setupFieldRichtext(){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: baseurl+"/view/custom_tinymce.css",
|
content_css: baseurl+"/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
2
view/theme/frost/js/main.min.js
vendored
2
view/theme/frost/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -647,9 +647,9 @@ function initEditor(cb){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: window.baseURL + "/view/custom_tinymce.css",
|
content_css: window.baseURL + "/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
@ -742,9 +742,9 @@ function msgInitEditor() {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: baseurl + "/view/custom_tinymce.css",
|
content_css: baseurl + "/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
@ -783,9 +783,9 @@ function profInitEditor() {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: baseurl + "/view/custom_tinymce.css",
|
content_css: baseurl + "/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
|
@ -813,9 +813,9 @@ function eventInitEditor() {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: baseurl + "/view/custom_tinymce.css",
|
content_css: baseurl + "/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
|
@ -843,9 +843,9 @@ function contactInitEditor () {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
content_css: baseurl + "/view/custom_tinymce.css"
|
content_css: baseurl + "/view/custom_tinymce.css"
|
||||||
|
|
||||||
|
|
||||||
|
@ -872,9 +872,9 @@ function wallInitEditor() {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: baseurl + "/view/custom_tinymce.css",
|
content_css: baseurl + "/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
|
2
view/theme/frost/js/theme.min.js
vendored
2
view/theme/frost/js/theme.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -53,9 +53,9 @@ function initEditor(cb){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -58,9 +58,9 @@ function initEditor(cb){
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -53,9 +53,9 @@ function initEditor(cb) {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -58,9 +58,9 @@ function initEditor(cb) {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
content_css: "{{$baseurl}}/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
|
|
|
@ -21,9 +21,9 @@ if(plaintext != 'none') {
|
||||||
entity_encoding : "raw",
|
entity_encoding : "raw",
|
||||||
add_unload_trigger : false,
|
add_unload_trigger : false,
|
||||||
remove_linebreaks : false,
|
remove_linebreaks : false,
|
||||||
force_p_newlines : false,
|
//force_p_newlines : false,
|
||||||
force_br_newlines : true,
|
//force_br_newlines : true,
|
||||||
forced_root_block : '',
|
forced_root_block : 'div',
|
||||||
convert_urls: false,
|
convert_urls: false,
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
//Character count
|
//Character count
|
||||||
|
|
Loading…
Reference in a new issue