Merge branch 'dev' of github.com:microweber/microweber into dev

microweber · Apr 28, 2022 · f015e36 · f015e36
2 parents f0d1fee + 5de5b36
commit f015e36
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/userfiles/modules/microweber/api/liveedit/drag.js b/userfiles/modules/microweber/api/liveedit/drag.js
@@ -941,8 +941,14 @@ mw.drag = {
         });
     },
 
-    grammarlyFix:function(html){
-        var data = mw.tools.parseHtml(html).body;
+    animationsClearFix:function(body){
+        mw.$('[class*="animate__"]').each(function () {
+            mw.tools.classNamespaceDelete(this, 'animate__');
+        });
+        return body;
+    },
+    grammarlyFix:function(data){
+
         mw.$("grammarly-btn", data).remove();
         mw.$("grammarly-card", data).remove();
         mw.$("g.gr_", data).each(function(){
@@ -955,13 +961,16 @@ mw.drag = {
         mw.$("grammarly-inline-cards", data).remove();
         mw.$("grammarly-popups", data).remove();
         mw.$("grammarly-extension", data).remove();
-        return data.innerHTML;
+        return data;
     },
     saving: false,
     coreSave: function(data) {
         if (!data) return false;
         $.each(data, function(){
-            this.html = mw.drag.grammarlyFix(this.html)
+            var body = mw.tools.parseHtml(this.html).body;
+            mw.drag.grammarlyFix(body);
+            mw.drag.animationsClearFix(body);
+            this.html = body.innerHTML;
         });
         mw.drag.saving = true;
 
@@ -1134,12 +1143,12 @@ mw.drag = {
         })
 
         var options = {
-            group: 'page-animations',
+            group: 'template',
             key: 'animations-global',
             value: JSON.stringify(animations)
         };
         mw.options.saveOption(options, function(){
-            mw.clear_cache()
+
         });
 
 
@@ -1168,7 +1177,7 @@ mw.drag = {
                     doc.write(xhr.responseText);
                     doc.close();
                     var save_content_error_iframe_reloads = 0;
-                    var doc = document.getElementById('save_content_error_iframe').contentWindow.document;
+                    doc = document.getElementById('save_content_error_iframe').contentWindow.document;
 
                     mw.$("#save_content_error_iframe").load(function(){
                         // cloudflare captcha

diff --git a/userfiles/modules/microweber/toolbar/editor_tools/rte_css_editor/index.php b/userfiles/modules/microweber/toolbar/editor_tools/rte_css_editor/index.php
@@ -353,8 +353,8 @@ interface: 'shadow',
                 }
             });
 
-            $(this).after(select)
-            $('input',this).on('input', function(){
+            $(this).after(select);
+            $('input', this).on('input', function(){
                 var $el = $(this);
                 var parent = $el.parent()
                  var val = $el.val().trim();
@@ -991,7 +991,7 @@ interface: 'shadow',
         })
 
     </script>
-    <div data-mwcomponent="accordion" class="mw-ui-box mw-accordion">
+    <div data-mwcomponent="accordion" class="mw-ui-box mw-accordion" data-options="openFirst: false">
 
 
 
@@ -1675,7 +1675,7 @@ class="mw-field mw-field-flat unit"
                                     content: [
                                         {
                                             tag: 'label',
-                                            props: { innerHTML: 'Motion'},
+                                            props: { innerHTML: mw.lang('Motion')},
                                         },
                                         {
 
@@ -1710,7 +1710,7 @@ class="mw-field mw-field-flat unit"
                                     content: [
                                         {
                                             tag: 'label',
-                                            props: { innerHTML: 'Speed'},
+                                            props: { innerHTML: mw.lang('Speed')},
                                         },
                                         {
                                             props: {
@@ -1721,7 +1721,7 @@ className: 'mw-field mw-field-flat unit',
                                             },
                                             content: {
                                                 tag: 'input',
-                                                props: { type: 'text', placeholder: 'Speed in seconds ' },
+                                                props: { type: 'text', placeholder: mw.lang('Speed in seconds') },
                                             }
                                         }
 
@@ -1756,7 +1756,7 @@ className: 'mw-field mw-field-flat unit',
                                             content: [
                                                 {
                                                     tag: 'label',
-                                                    props: { innerHTML: 'Trigger'},
+                                                    props: { innerHTML: mw.lang('Trigger')},
                                                 },
                                                 {
                                                     props: {
@@ -1767,9 +1767,9 @@ className: 'mw-field mw-field-flat',
                                                             tag: 'select',
                                                             props: {  },
                                                             content: [
-                                                                { tag: 'option', props: { value: 'onAppear', innerHTML: 'When Appear'}},
-                                                                { tag: 'option', props: { value: 'onHover', innerHTML: 'When mouse is over'}},
-                                                                { tag: 'option', props: { value: 'onClick', innerHTML: 'When element is clicked'}},
+                                                                { tag: 'option', props: { value: 'onAppear', innerHTML: mw.lang('When element appears on screen')}},
+                                                                { tag: 'option', props: { value: 'onHover', innerHTML: mw.lang('When mouse is over')}},
+                                                                { tag: 'option', props: { value: 'onClick', innerHTML: mw.lang('When element is clicked')}},
                                                             ]
                                                         },
                                                     ]
@@ -1779,7 +1779,7 @@ className: 'mw-field mw-field-flat',
                                         {
                                             tag: 'small',
                                             props: {
-                                                innerHTML: 'Available when you are not "edit mode"',
+                                                innerHTML: mw.lang('Available when you are not editing'),
                                                 className: 'form-text text-muted'
                                             }
                                         }