Merge branch 'develop'

melisplatform · May 24, 2021 · d5fa1e7 · d5fa1e7
2 parents af48000 + fa43de6
commit d5fa1e7
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 83 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -298,5 +298,19 @@
                 // 'my_cache_key' => 60,
             ]
         ],
+        'melisfront_memory_cache' => [ 
+            'active' => true, // activate or deactivate Melis Cache for this conf
+            'adapter' => [
+                'name'    => 'Memory',
+                'options' => ['ttl' => 0, 'namespace' => 'melisfront'],
+            ],
+            'plugins' => [
+                'exception_handler' => ['throw_exceptions' => false],
+            ],
+            'ttls' => [
+                // add a specific ttl for a specific cache key (found via regexp]
+                // 'my_cache_key' => 60,
+            ]
+        ],
     ]
 ];
diff --git a/public/plugins/js/plugin.melistagHTML.init.js b/public/plugins/js/plugin.melistagHTML.init.js
@@ -1,43 +1,47 @@
-function melistagHTML_init(idPlugin){
-    // declaring parameters variable for old / cross browser compatability
-    if(typeof idPlugin === "undefined") idPlugin = null;
-
-	var tinyMceOption = {templates: '/melis/MelisCms/PageEdition/getTinyTemplates?idPage=' + melisActivePageId};
-
-	if(idPlugin != null){
-		tinyMceOption.setup = 'melistagHTML_savePlugin';
+function melistagHTML_init(idPlugin) {
+	// declaring parameters variable for old / cross browser compatability
+	if (typeof idPlugin === "undefined") idPlugin = null;
+
+	var tinyMceOption = {
+		templates:
+			"/melis/MelisCms/PageEdition/getTinyTemplates?idPage=" +
+			melisActivePageId,
+	};
+
+	if (idPlugin != null) {
+		tinyMceOption.setup = "melistagHTML_savePlugin";
 	}
-	
-	var idPlugin = idPlugin !== null ?  "#"+idPlugin : "div.html-editable";
-	
+
+	var idPlugin = idPlugin !== null ? "#" + idPlugin : "div.html-editable";
+
 	// Editor the will use for Pages
 	melisTinyMCE.createTinyMCE("html", idPlugin, tinyMceOption);
 }
 
-function melistagHTML_savePlugin(editor){
-	editor.on("init",function(ed) {
-		$("#"+editor.id).trigger("blur");
-    });
+function melistagHTML_savePlugin(editor) {
+	editor.on("init", function(ed) {
+		$("#" + editor.id).trigger("blur");
+	});
 }
 
 // run this function when you click out of the tinymce
 $("body").on("blur", "div.html-editable", function() {
 	// get all data-attributes from the clicked
 	var currentdata = $(this).data();
-	
+
 	// get the content of the active tinyMCE editor.
-	var content = tinyMCE.activeEditor.getContent({format : 'html'});
-	
+	var content = tinyMCE.activeEditor.getContent({ format: "html" });
+
 	var data = {
 		melisPluginName: currentdata.plugin,
 		melisPluginTag: currentdata.melisTag,
-		melisPluginId : currentdata.tagId,
+		melisPluginId: currentdata.tagId,
 		tagType: currentdata.tagType,
-		tagId : currentdata.tagId,
-		tagValue : content,
+		tagId: currentdata.tagId,
+		tagValue: content,
 	};
-    melisPluginEdition.calcFrameHeight();
+	melisPluginEdition.calcFrameHeight();
 	melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
-melistagHTML_init();
+melistagHTML_init();
diff --git a/public/plugins/js/plugin.melistagMEDIA.init.js b/public/plugins/js/plugin.melistagMEDIA.init.js
@@ -1,45 +1,47 @@
-function melistagMEDIA_init(idPlugin){
-    // declaring parameters variable for old / cross browser compatability
-    if(typeof idPlugin === "undefined") idPlugin = null;
-
-	var tinyMceOption = new Array;
-
-	if(idPlugin != null){
-		tinyMceOption = {setup: 'melistagMEDIA_savePlugin'};
+function melistagMEDIA_init(idPlugin) {
+	// declaring parameters variable for old / cross browser compatability
+	if (typeof idPlugin === "undefined") idPlugin = null;
+
+	var tinyMceOption = {
+		templates:
+			"/melis/MelisCms/PageEdition/getTinyTemplates?idPage=" +
+			melisActivePageId,
+	};
+
+	if (idPlugin != null) {
+		tinyMceOption.setup = "melistagMEDIA_savePlugin";
 	}
-	
-	var idPlugin = idPlugin !== null ?  "#"+idPlugin : "div.media-editable";
+
+	var idPlugin = idPlugin !== null ? "#" + idPlugin : "div.media-editable";
 
 	// Editor the will use for Pages
 	melisTinyMCE.createTinyMCE("media", idPlugin, tinyMceOption);
 }
 
-function melistagMEDIA_savePlugin(editor){
-	editor.on("init",function(ed) {
-		$("#"+editor.id).trigger("blur");
-    });
+function melistagMEDIA_savePlugin(editor) {
+	editor.on("init", function(ed) {
+		$("#" + editor.id).trigger("blur");
+	});
 }
 
 // run this function when you click out of the tinymce
-$("body").on("blur", "div.media-editable", function(){
-
+$("body").on("blur", "div.media-editable", function() {
 	// get all data-attributes from the clicked
 	var currentdata = $(this).data();
-	
+
 	// get the content of the active tinyMCE editor.
-	var content = tinyMCE.activeEditor.getContent({format : 'html'});
-	
+	var content = tinyMCE.activeEditor.getContent({ format: "html" });
+
 	var data = {
 		melisPluginName: currentdata.plugin,
 		melisPluginTag: currentdata.melisTag,
-		melisPluginId : currentdata.tagId,
+		melisPluginId: currentdata.tagId,
 		tagType: currentdata.tagType,
-		tagId : currentdata.tagId,
-		tagValue : content,
-    };
-    melisPluginEdition.calcFrameHeight();
-    melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
+		tagId: currentdata.tagId,
+		tagValue: content,
+	};
+	melisPluginEdition.calcFrameHeight();
+	melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
-
 melistagMEDIA_init();
diff --git a/public/plugins/js/plugin.melistagTEXTAREA.init.js b/public/plugins/js/plugin.melistagTEXTAREA.init.js
@@ -1,44 +1,47 @@
-function melistagTEXTAREA_init(idPlugin){
-    // declaring parameters variable for old / cross browser compatability
-    if(typeof idPlugin === "undefined") idPlugin = null;
-
-	var tinyMceOption = new Array;
-
-	if(idPlugin != null){
-		tinyMceOption = {setup: 'melistagTEXTAREA_savePlugin'};
+function melistagTEXTAREA_init(idPlugin) {
+	// declaring parameters variable for old / cross browser compatability
+	if (typeof idPlugin === "undefined") idPlugin = null;
+
+	var tinyMceOption = {
+		templates:
+			"/melis/MelisCms/PageEdition/getTinyTemplates?idPage=" +
+			melisActivePageId,
+	};
+
+	if (idPlugin != null) {
+		tinyMceOption.setup = "melistagTEXTAREA_savePlugin";
 	}
-	
-	var idPlugin = idPlugin !== null ?  "#"+idPlugin : "div.textarea-editable";
+
+	var idPlugin = idPlugin !== null ? "#" + idPlugin : "div.textarea-editable";
 
 	// Editor the will use for Pages
 	melisTinyMCE.createTinyMCE("textarea", idPlugin, tinyMceOption);
 }
 
-function melistagTEXTAREA_savePlugin(editor){
-	editor.on("init",function(ed) {
-		$("#"+editor.id).trigger("blur");
-    });
+function melistagTEXTAREA_savePlugin(editor) {
+	editor.on("init", function(ed) {
+		$("#" + editor.id).trigger("blur");
+	});
 }
 
 // run this function when you click out of the tinymce
-$("body").on("blur", "div.textarea-editable", function(){
-
+$("body").on("blur", "div.textarea-editable", function() {
 	// get all data-attributes from the clicked
 	var currentdata = $(this).data();
-	
+
 	// get the content of the active tinyMCE editor.
-	var content = tinyMCE.activeEditor.getContent({format : 'html'});
-	
+	var content = tinyMCE.activeEditor.getContent({ format: "html" });
+
 	var data = {
 		melisPluginName: currentdata.plugin,
 		melisPluginTag: currentdata.melisTag,
-		melisPluginId : currentdata.tagId,
+		melisPluginId: currentdata.tagId,
 		tagType: currentdata.tagType,
-		tagId : currentdata.tagId,
-		tagValue : content,
-    };
-    melisPluginEdition.calcFrameHeight();
-    melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
+		tagId: currentdata.tagId,
+		tagValue: content,
+	};
+	melisPluginEdition.calcFrameHeight();
+	melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
-melistagTEXTAREA_init();
+melistagTEXTAREA_init();
diff --git a/src/Listener/MelisFrontSiteConfigListener.php b/src/Listener/MelisFrontSiteConfigListener.php
@@ -38,19 +38,26 @@ public function onLoadModulesPost(ModuleEvent $e)
             if ($uri1 != 'melis')
             {
                 $pageId = null;
-                // get page id
-                if ($tabUri[1] == 'id')
-                    $pageId = $tabUri[2];
-                else if (isset($tabUri[3]) && $tabUri[3] == 'id')
-                    $pageId = $tabUri[4];
+                //get page id
+                preg_match('/(\/id\/)(\D*)(\d+)/i', $uri, $matches);
+
+                if (empty($matches))
+                    return;
+
+                if(empty($matches[3])){
+                    $pageIdInfo = explode('/', $matches[0]);
+                    $pageId = $pageIdInfo[2];
+                }else {
+                    $pageId = $matches[3];
+                }
 
                 //get the config listener
                 $configListener = $e->getConfigListener();
                 //get the merged config
                 $config         = $configListener->getMergedConfig(false);
 
                 /**
-                 * get domain
+                 * get domainA
                  */
                 $domain = $_SERVER['SERVER_NAME'];
                 /**

diff --git a/src/Service/MelisTranslationService.php b/src/Service/MelisTranslationService.php
@@ -23,6 +23,13 @@ class MelisTranslationService extends MelisGeneralService
      */
     public function getTranslationsByLocale($locale = "en_EN")
     {
+        // Retrieve cache version if front mode to avoid multiple calls
+        $cacheKey = 'getTranslationsByLocale_' . $locale;
+        $cacheConfig = 'melisfront_memory_cache';
+        $melisEngineCacheSystem = $this->getServiceManager()->get('MelisEngineCacheSystem');
+        $results = $melisEngineCacheSystem->getCacheByKey($cacheKey, $cacheConfig, true);
+        if (!is_null($results))
+            return $results;
 
         $moduleSvc = $this->getServiceManager()->get('MelisAssetManagerModulesService');
         // Event parameters prepare
@@ -78,11 +85,16 @@ public function getTranslationsByLocale($locale = "en_EN")
                 }
             }
         }
+
         // results
         $arrayParameters['results'] = $transMessages;
+
         // send event
         $arrayParameters = $this->sendEvent('melis_translation_get_trans_by_locale_end', $arrayParameters);
 
+        // Save cache key
+        $melisEngineCacheSystem->setCacheByKey($cacheKey, $cacheConfig, $arrayParameters['results'], true);
+
         return $arrayParameters['results'];
 
     }

diff --git a/view/layout/layoutMelis.phtml b/view/layout/layoutMelis.phtml
@@ -13,7 +13,12 @@ foreach ($this->assets['css']as $css)
 ?>
 
     <script type="text/javascript" src="/MelisCore/js/library/tinymce/tinymce.min.js"></script>
-    <script type="text/javascript" src="/melis/MelisCore/Language/getTranslations"></script>
+    <!-- <script type="text/javascript" src="/melis/MelisCore/Language/getTranslations"></script> -->
+    <script>
+        var melisLangId = window.parent.melisLangId;
+        var melisDateFormat = window.parent.melisDateFormat;
+        var translations = window.parent.translations;
+    </script>
     <script type="text/javascript">
         var jQueryChecker = null;
         var melisActivePageId = <?php echo $this->idPage ?>;
@@ -27,7 +32,7 @@ foreach ($this->assets['css']as $css)
         ?>
         // default js
         var scriptMap =[
-            "/MelisCore/js/tinyMCE/tinymce_cleaner.js",
+            // "/MelisCore/js/tinyMCE/tinymce_cleaner.js",
             "/MelisCore/js/tinyMCE/melis_tinymce.js",
             "/MelisCms/js/tools/findpage.tool.js",
             "/MelisCms/js/plugins/plugins.edition.js",