summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspider <spider@bitweaver.org>2015-06-02 16:21:32 -0400
committerspider <spider@bitweaver.org>2015-06-02 16:21:32 -0400
commitd6bce71fc65f8d2f3036f8801f2a201777595c43 (patch)
treed6f52f99206b94a1955a9549a752dceb1ed82014
parent03ad31d9ee3e43c7903e9aeef4105b149ad7077f (diff)
downloadckeditor-d6bce71fc65f8d2f3036f8801f2a201777595c43.tar.gz
ckeditor-d6bce71fc65f8d2f3036f8801f2a201777595c43.tar.bz2
ckeditor-d6bce71fc65f8d2f3036f8801f2a201777595c43.zip
add CKEDITOR.config.autoParagraph = false
-rw-r--r--ckconfig.bitweaver.js3
-rw-r--r--ckconfig.custom.js1
-rw-r--r--templates/footer_inc.tpl1
3 files changed, 4 insertions, 1 deletions
diff --git a/ckconfig.bitweaver.js b/ckconfig.bitweaver.js
index c3e0741..6b8b2d6 100644
--- a/ckconfig.bitweaver.js
+++ b/ckconfig.bitweaver.js
@@ -71,5 +71,6 @@ config.toolbar_Advanced = [
// Lock resize function to bitweaver window.
config.resize_minHeight = 300;
config.resize_dir = 'vertical';
-
+config.autoParagraph = false;
+ enterMode: CKEDITOR.ENTER_P,
}; // End CKEDITOR.editorConfig function
diff --git a/ckconfig.custom.js b/ckconfig.custom.js
index 6a1ab55..ef05eeb 100644
--- a/ckconfig.custom.js
+++ b/ckconfig.custom.js
@@ -73,5 +73,6 @@ CKEDITOR.editorConfig = function( config ) {
// Lock resize function to bitweaver window.
config.resize_minHeight = 300;
config.resize_dir = 'vertical';
+ config.autoParagraph = false;
}; // End CKEDITOR.editorConfig function
diff --git a/templates/footer_inc.tpl b/templates/footer_inc.tpl
index 145ea51..7b87755 100644
--- a/templates/footer_inc.tpl
+++ b/templates/footer_inc.tpl
@@ -81,6 +81,7 @@ function configCkEditor() {
{ name: 'links' }
{/literal}{/if}{literal}
];
+ CKEDITOR.config.autoParagraph = false;
}
{/literal}
</script>