Browse Source

try to improve TinyMCE block handling

pull/593/head
Zach Prezkuta 9 years ago
parent
commit
6668d22d37
  1. 6
      js/main.js
  2. 6
      view/contact_head.tpl
  3. 6
      view/event_head.tpl
  4. 6
      view/jot-header.tpl
  5. 6
      view/msg-header.tpl
  6. 6
      view/profed_head.tpl
  7. 6
      view/smarty3/contact_head.tpl
  8. 6
      view/smarty3/event_head.tpl
  9. 6
      view/smarty3/jot-header.tpl
  10. 6
      view/smarty3/msg-header.tpl
  11. 6
      view/smarty3/profed_head.tpl
  12. 6
      view/smarty3/wallmsg-header.tpl
  13. 6
      view/theme/dispy/jot-header.tpl
  14. 6
      view/theme/dispy/smarty3/jot-header.tpl
  15. 6
      view/theme/frost-mobile/js/main.js
  16. 2
      view/theme/frost-mobile/js/main.min.js
  17. 12
      view/theme/frost-mobile/js/theme.js
  18. 2
      view/theme/frost-mobile/js/theme.min.js
  19. 6
      view/theme/frost/js/main.js
  20. 2
      view/theme/frost/js/main.min.js
  21. 36
      view/theme/frost/js/theme.js
  22. 2
      view/theme/frost/js/theme.min.js
  23. 6
      view/theme/smoothly/jot-header.tpl
  24. 6
      view/theme/smoothly/smarty3/jot-header.tpl
  25. 6
      view/theme/testbubble/jot-header.tpl
  26. 6
      view/theme/testbubble/smarty3/jot-header.tpl
  27. 6
      view/wallmsg-header.tpl

6
js/main.js

@ -670,9 +670,9 @@ function setupFieldRichtext(){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/contact_head.tpl

@ -17,9 +17,9 @@ tinyMCE.init({
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: "$baseurl/view/custom_tinymce.css"

6
view/event_head.tpl

@ -94,9 +94,9 @@
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {

6
view/jot-header.tpl

@ -38,9 +38,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/msg-header.tpl

@ -21,9 +21,9 @@ if(plaintext != 'none') {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
//Character count

6
view/profed_head.tpl

@ -20,9 +20,9 @@ tinyMCE.init({
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {

6
view/smarty3/contact_head.tpl

@ -22,9 +22,9 @@ tinyMCE.init({
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: "{{$baseurl}}/view/custom_tinymce.css"

6
view/smarty3/event_head.tpl

@ -99,9 +99,9 @@
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {

6
view/smarty3/jot-header.tpl

@ -43,9 +43,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/smarty3/msg-header.tpl

@ -26,9 +26,9 @@ if(plaintext != 'none') {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
//Character count

6
view/smarty3/profed_head.tpl

@ -25,9 +25,9 @@ tinyMCE.init({
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {

6
view/smarty3/wallmsg-header.tpl

@ -26,9 +26,9 @@ if(plaintext != 'none') {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
//Character count

6
view/theme/dispy/jot-header.tpl

@ -36,9 +36,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/theme/dispy/smarty3/jot-header.tpl

@ -41,9 +41,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/theme/frost-mobile/js/main.js

@ -690,9 +690,9 @@ function setupFieldRichtext(){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,

2
view/theme/frost-mobile/js/main.min.js
File diff suppressed because it is too large
View File

12
view/theme/frost-mobile/js/theme.js

@ -330,9 +330,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
@ -432,9 +432,9 @@ function wallInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count

2
view/theme/frost-mobile/js/theme.min.js
File diff suppressed because it is too large
View File

6
view/theme/frost/js/main.js

@ -682,9 +682,9 @@ function setupFieldRichtext(){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,

2
view/theme/frost/js/main.min.js
File diff suppressed because it is too large
View File

36
view/theme/frost/js/theme.js

@ -647,9 +647,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: window.baseURL + "/view/custom_tinymce.css",
theme_advanced_path : false,
@ -742,9 +742,9 @@ function msgInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count
@ -783,9 +783,9 @@ function profInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: baseurl + "/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
@ -813,9 +813,9 @@ function eventInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: baseurl + "/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
@ -843,9 +843,9 @@ function contactInitEditor () {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
content_css: baseurl + "/view/custom_tinymce.css"
@ -872,9 +872,9 @@ function wallInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count

2
view/theme/frost/js/theme.min.js
File diff suppressed because it is too large
View File

6
view/theme/smoothly/jot-header.tpl

@ -53,9 +53,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/theme/smoothly/smarty3/jot-header.tpl

@ -58,9 +58,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/theme/testbubble/jot-header.tpl

@ -53,9 +53,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/theme/testbubble/smarty3/jot-header.tpl

@ -58,9 +58,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,

6
view/wallmsg-header.tpl

@ -21,9 +21,9 @@ if(plaintext != 'none') {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
//Character count

Loading…
Cancel
Save