Merge pull request #59 from ProWorksCorporation/release/13.2.6

Release/13.2.6
ProWorksCorporation · Sep 25, 2024 · 94d00d9 · 94d00d9
2 parents 405d453 + 5768f72
commit 94d00d9
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 6 deletions.
diff --git a/src/TinyMCE.Umbraco.Premium/Composers/TinyMceComposer.cs b/src/TinyMCE.Umbraco.Premium/Composers/TinyMceComposer.cs
@@ -42,7 +42,11 @@ public void Compose(IUmbracoBuilder builder)
 				{
 					dynamic obj = ConfigurationBinder.BindToExpandoObject(child);
 					dynamic customConfigObj = ((IDictionary<string, object>)obj.TinyMceConfig.customConfig).First().Value;
-					var valueAsText = System.Text.Json.JsonSerializer.Serialize(customConfigObj);
+					string valueAsText = System.Text.Json.JsonSerializer.Serialize(customConfigObj);
+					if(customConfigObj is string)
+					{	// Added this because the Serialize call above encodes double-quotes in strings
+						valueAsText = customConfigObj;
+                    }
 					customConfigKeys.Add(child.Key, valueAsText);
 				}
 

diff --git a/src/TinyMCE.Umbraco.Premium/TinyMCE.Umbraco.Premium.csproj b/src/TinyMCE.Umbraco.Premium/TinyMCE.Umbraco.Premium.csproj
@@ -10,7 +10,7 @@
     <PackageId>tinymce.umbraco.premium</PackageId>
     <Product>TinyMCE.Umbraco.Premium</Product>
     <Title>TinyMCE.Umbraco.Premium</Title>
-    <Version>13.2.5</Version>
+    <Version>13.2.6</Version>
     <Description>This is an Umbraco CMS package that enables access to the paid features in the TinyMCE-based Rich Text Editor (RTE) in version 12+ with a license. It also adds a new TinyMCE Premium property editor with additional settings, providing a more targeted configuration setup for RTE Data Types in Umbraco. Finally, it allows for additional settings that support JSON directly in the configuration for .NET (appsettings.config).</Description>
     <PackageTags>umbraco plugin package tinymce umbraco-marketplace</PackageTags>
     <Authors>jasonproworks</Authors>

diff --git a/...yMCE.Umbraco.Premium/wwwroot/App_Plugins/TinyMCE.Umbraco.Premium/premuim.rte.component.js b/...yMCE.Umbraco.Premium/wwwroot/App_Plugins/TinyMCE.Umbraco.Premium/premuim.rte.component.js
@@ -287,6 +287,11 @@
                         // add the "media" plugin per TinyMCE docs
                         standardConfig.plugins = _.union(standardConfig.plugins, ["media"]);
                     }
+
+                    if (standardConfig.hasOwnProperty("advtemplate_list")) {
+                        // add the "media" plugin per TinyMCE docs
+                        standardConfig.advtemplate_templates = null;
+                    }
                     ///////////////////
 
                     ////////////////////////////////

diff --git a/src/Umbraco.Cms.Demo/App_Plugins/TinyMCE.Premium.Overrides/tinymce.custom.config.js b/src/Umbraco.Cms.Demo/App_Plugins/TinyMCE.Premium.Overrides/tinymce.custom.config.js
@@ -32,7 +32,30 @@
                 // but you could additionally include anything else you deem useful.
                 success(filteredUsers);
 
-            }
+            }//,
+            //advtemplate_list: () => new Promise((resolve, reject) => {
+            //    setTimeout(() => {
+            //        console.log("promise worked");
+            //        resolve([{
+            //            id: '1',
+            //            title: 'Resolving tickets (promise)'
+            //        },
+            //        {
+            //            id: '2',
+            //            title: 'Quick replies (promise)',
+            //            items: [{
+            //                id: '3',
+            //                title: 'Message received (promise)',
+            //            },
+            //            {
+            //                id: '4',
+            //                title: 'Progress update (promise)',
+            //            }
+            //            ]
+            //        }
+            //        ]);
+            //    }, 300);
+            //})
         };
     }
 

diff --git a/src/Umbraco.Cms.Demo/Umbraco.Cms.Demo.csproj b/src/Umbraco.Cms.Demo/Umbraco.Cms.Demo.csproj
@@ -9,7 +9,7 @@
     <PackageId>umbraco.cms.demo</PackageId>
     <Product>Umbraco.Cms.Demo</Product>
     <Title>TinyMCE.Umbraco.Premium Umbraco.Cms.Demo</Title>
-    <Version>13.2.2</Version>
+    <Version>13.2.6</Version>
     <Description></Description>
     <PackageTags></PackageTags>
     <Authors>ProWorks Corporation</Authors>

diff --git a/src/Umbraco.Cms.Demo/appsettings.json b/src/Umbraco.Cms.Demo/appsettings.json
@@ -69,6 +69,65 @@
             }
           ]
         }
+      ],
+      "mergetags_prefix": "%%",
+      "mergetags_suffix": "%%",
+      "mergetags_list": [
+        {
+          "title": "Customer",
+          "menu": [
+            {
+              "value": "Customer.Name.First",
+              "title": "Customer First Name"
+            },
+            {
+              "value": "Customer.Name.Last",
+              "title": "Customer Last Name"
+            },
+            {
+              "value": "Customer.Title",
+              "title": "Customer Title"
+            }
+          ]
+        },
+        {
+          "title": "Vendor",
+          "menu": [
+            {
+              "value": "Vendor.Name",
+              "title": "Vendor Name"
+            },
+            {
+              "value": "Vendor.Contact.Name.First",
+              "title": "Vendor Contact: First Name"
+            },
+            {
+              "value": "Vendor.Contact.Name.Last",
+              "title": "Vendor Contact: Last Name"
+            }
+          ]
+        },
+        {
+          "title": "Company",
+          "menu": [
+            {
+              "value": "Company.Employee.Name",
+              "title": "Your Name"
+            },
+            {
+              "value": "Company.Employee.Position",
+              "title": "Employee Position"
+            },
+            {
+              "value": "Company.Employee.Contact",
+              "title": "Employee Contact Information"
+            },
+            {
+              "value": "Company.Name",
+              "title": "Company Name"
+            }
+          ]
+        }
       ]
     }
   }

diff --git a/src/Umbraco.Cms.Demo/uSync/v9/DataTypes/TinyMcePremium.config b/src/Umbraco.Cms.Demo/uSync/v9/DataTypes/TinyMcePremium.config
@@ -47,6 +47,7 @@
       "searchreplace",
       "wordcount",
       "a11ycheck",
+      "mergetags",
       "tableofcontents",
       "inserttemplate",
       "aishortcuts aidialog",
@@ -88,12 +89,12 @@
       "mediaembed",
       "linkchecker",
       "powerpaste",
-      "autocorrect"
+      "autocorrect",
+      "mergetags"
     ],
     "pluginsToExclude": [
       "a11ychecker",
       "formatpainter",
-      "mergetags",
       "tableofcontents",
       "ai"
     ],