summaryrefslogtreecommitdiff
path: root/chimere/static
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/static')
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js3
-rw-r--r--chimere/static/chimere/js/textareas.js12
-rw-r--r--chimere/static/chimere/js/textareas_admin.js10
3 files changed, 15 insertions, 10 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 85c1142..c07fee7 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -1878,7 +1878,8 @@ function transformCoordToLonLat(coord) {
//fin lib ios
cleanRoute: function(){
- settings.layerVectors.removeAllFeatures();
+ if (typeof settings.editionSource != 'undefined')
+ settings.editionSource.clear();
},
// add json layer
addJSON: function(json_url){
diff --git a/chimere/static/chimere/js/textareas.js b/chimere/static/chimere/js/textareas.js
index 22b68c8..4d2a74f 100644
--- a/chimere/static/chimere/js/textareas.js
+++ b/chimere/static/chimere/js/textareas.js
@@ -20,11 +20,13 @@ if (!window.tinymce_init){
window.tinymce_init = true;
tinyMCE.init({
mode : "textareas",
- theme : "advanced",
+ theme: 'modern',
editor_selector : "mceEditor",
relative_urls : false,
- theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link",
- theme_advanced_buttons2 : "",
- theme_advanced_buttons3 : ""
- })
+ toolbar_items_size: 'small',
+ menubar: '',
+ toolbar1: 'bold italic,underline | bullist,numlist',
+ toolbar2: "",
+ toolbar3: ""
+ });
};
diff --git a/chimere/static/chimere/js/textareas_admin.js b/chimere/static/chimere/js/textareas_admin.js
index 7acec97..1dae2aa 100644
--- a/chimere/static/chimere/js/textareas_admin.js
+++ b/chimere/static/chimere/js/textareas_admin.js
@@ -20,11 +20,13 @@ if (!window.tinymce_init){
window.tinymce_init = true;
tinyMCE.init({
mode : "textareas",
- theme : "advanced",
+ theme: 'modern',
editor_selector : "mceEditor",
relative_urls : false,
- theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link,image",
- theme_advanced_buttons2 : "",
- theme_advanced_buttons3 : ""
+ toolbar_items_size: 'small',
+ menubar: '',
+ toolbar1: 'bold italic,underline | bullist,numlist | link,image',
+ toolbar2: "",
+ toolbar3: ""
});
};