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

microweber · Jun 20, 2022 · dbd37dd · dbd37dd
2 parents d380c10 + 0993e0e
commit dbd37dd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/userfiles/modules/microweber/api/libs/cssjson/cssjson.js b/userfiles/modules/microweber/api/libs/cssjson/cssjson.js
@@ -180,14 +180,14 @@ var CSSJSON = new function () {
      */
     base.toCSS = function (node, depth, breaks) {
         var cssString = '';
-        if (typeof depth == 'undefined') {
+        if (typeof depth === 'undefined') {
             depth = 0;
         }
-        if (typeof breaks == 'undefined') {
+        if (typeof breaks === 'undefined') {
             breaks = false;
         }
         if (node.attributes) {
-            for (i in node.attributes) {
+            for (var i in node.attributes) {
                 var att = node.attributes[i];
                 if (att instanceof Array) {
                     for (var j = 0; j < att.length; j++) {
@@ -200,7 +200,8 @@ var CSSJSON = new function () {
         }
         if (node.children) {
             var first = true;
-            for (i in node.children) {
+            for (var i in node.children) {
+                console.log(node.children[i])
                 if (breaks && !first) {
                     cssString += '\n';
                 } else {

diff --git a/userfiles/modules/microweber/api/stylesheet.editor.js b/userfiles/modules/microweber/api/stylesheet.editor.js
@@ -42,6 +42,7 @@ mw.liveeditCSSEditor = function (config) {
 
 
     this._cssTemp = function (json) {
+
         var css = CSSJSON.toCSS(json);
         if(!mw.liveedit._cssTemp) {
             mw.liveedit._cssTemp = mw.tools.createStyle('#mw-liveedit-dynamic-temp-style', css, document.body);
@@ -51,9 +52,20 @@ mw.liveeditCSSEditor = function (config) {
         }
     };
 
+    var removeSheetRuleProperty = function (selector, property) {
+        var sheet = document.querySelector('link#mw-template-settings').sheet;
+        var i = 0, l = sheet.cssRules.length;
+        for ( ; i < l ; i++) {
+            if(sheet.cssRules[i].selectorText === selector) {
+                sheet.cssRules[i].style.removeProperty(property);
+            }
+        }
+    };
+
     this.changed = false;
     this._temp = {children: {}, attributes: {}};
     this.temp = function (node, prop, val) {
+        val = (val || '').trim();
         this.changed = true;
         if(node.length) {
             node = node[0];
@@ -65,7 +77,18 @@ mw.liveeditCSSEditor = function (config) {
         if (!this._temp.children[sel].attributes ) {
             this._temp.children[sel].attributes = {};
         }
+
+
         this._temp.children[sel].attributes[prop] = val;
+
+        if(val === '' || val === '!important') {
+            this._temp.children[sel].attributes[prop] = '';
+            // delete this._temp.children[sel].attributes[prop];
+            removeSheetRuleProperty (sel, prop);
+
+        }
+
+
         this._cssTemp(this._temp);
     };
 

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
@@ -396,7 +396,14 @@ interface: 'shadow',
 
 
 
+                var isbg = prev.prev().find('.mw-field-color-indicator-display');
+                if(isbg.length) {
+                    isbg.css('backgroundColor', val);
+                }
+
+
 
+                prev.val(val);
                 prev.find('input').val(val);
                 var n = parseFloat(val)
                 $('.mw-range.ui-slider', prev).slider('value', !isNaN(n) ? n : 0)