diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-17 17:11:50 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-17 17:11:50 +0200 |
| commit | 6d4b5f23c8e9b066bd9de375430d78adaad4f431 (patch) | |
| tree | a99ef6cf6506e29406b0bb106f6c0d16ebb9ad22 /chimere/static | |
| parent | c40c7f5621c9083cc274e3735b3c2e0000e8db38 (diff) | |
| download | Chimère-6d4b5f23c8e9b066bd9de375430d78adaad4f431.tar.bz2 Chimère-6d4b5f23c8e9b066bd9de375430d78adaad4f431.zip | |
Manage new version of tinyMCE
Diffstat (limited to 'chimere/static')
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 3 | ||||
| -rw-r--r-- | chimere/static/chimere/js/textareas.js | 12 | ||||
| -rw-r--r-- | chimere/static/chimere/js/textareas_admin.js | 10 |
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: "" }); }; |