CKEditorの設定更新。

diff --git a/scripts/m3/ckconfig.js b/scripts/m3/ckconfig.js
index ca15132..1e058c7 100644 (file)
--- a/scripts/m3/ckconfig.js
+++ b/scripts/m3/ckconfig.js
@@ -180,6 +180,13 @@ CKEDITOR.editorConfig = function(config){
                        { name: 'links', items: [ 'M3Link', 'M3Unlink', 'M3Anchor' ] },
                        { name: 'styles', items: [ 'Styles', 'Format' ] }
                ];
+               
+               // APIキーを設定
+               if (typeof(M3_GOOGLEMAPS_KEY) !== "undefined"){
+                       config.googlemapsPlugin = {
+                               apiKey: M3_GOOGLEMAPS_KEY
+                       };
+               }
        } else {
                config.toolbar_Full = [
                        { name: 'tools', items: [ 'Maximize', 'ShowBlocks', 'Source' ] },

diff --git a/widgets/admin_main/include/template/test_ckeditor.tmpl.html b/widgets/admin_main/include/template/test_ckeditor.tmpl.html
index 7ed2b6f..df1c33a 100644 (file)
--- a/widgets/admin_main/include/template/test_ckeditor.tmpl.html
+++ b/widgets/admin_main/include/template/test_ckeditor.tmpl.html
@@ -32,7 +32,8 @@ $(function(){
        // WYSIWYGエディター作成
 //     m3SetWysiwygEditor('editor', 500/* 高さ */);
        var config = {};
-       config['customConfig'] = M3_ROOT_URL + '/scripts/m3/ckconfig_test.js';
+//     config['customConfig'] = M3_ROOT_URL + '/scripts/m3/ckconfig_test.js';
+       config['customConfig'] = M3_ROOT_URL + '/scripts/m3/ckconfig.js';
        config['toolbar'] = 'Full';
        var editor = CKEDITOR.replace('editor', config);