one more update

slavaleleka · Feb 15, 2021 · b77c78c · b77c78c
1 parent 47f37d7
commit b77c78c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 26 deletions.
diff --git a/dist/extended-css.cjs.js b/dist/extended-css.cjs.js
@@ -1,4 +1,4 @@
-/*! extended-css - v1.3.9 - Fri Feb 12 2021
+/*! extended-css - v1.3.10 - Mon Feb 15 2021
 * https://github.com/AdguardTeam/ExtendedCss
 * Copyright (c) 2021 AdGuard. Licensed LGPL-3.0
 */
@@ -719,11 +719,16 @@ var cssUtils = function () {
    */
 
   var normalize = function normalize(cssText) {
-    cssText = cssText.replace(reAttrFallback, evaluateMatch);
-    cssText = cssText.replace(reMatchesCss, addQuotes);
-    cssText = cssText.replace(reContains, addQuotes);
-    cssText = cssText.replace(reScope, SCOPE_REPLACER);
-    return cssText;
+    // cssText = cssText.replace(reAttrFallback, evaluateMatch);
+    // cssText = cssText.replace(reMatchesCss, addQuotes);
+    // cssText = cssText.replace(reContains, addQuotes);
+    // cssText = cssText.replace(reScope, SCOPE_REPLACER);
+    // return cssText;
+    var normalizedCssText = cssText.replace(reAttrFallback, evaluateMatch);
+    normalizedCssText = normalizedCssText.replace(reMatchesCss, addQuotes);
+    normalizedCssText = normalizedCssText.replace(reContains, addQuotes);
+    normalizedCssText = normalizedCssText.replace(reScope, SCOPE_REPLACER);
+    return normalizedCssText;
   };
 
   var isSimpleSelectorValid = function isSimpleSelectorValid(selector) {

diff --git a/dist/extended-css.esm.js b/dist/extended-css.esm.js
@@ -1,4 +1,4 @@
-/*! extended-css - v1.3.9 - Fri Feb 12 2021
+/*! extended-css - v1.3.10 - Mon Feb 15 2021
 * https://github.com/AdguardTeam/ExtendedCss
 * Copyright (c) 2021 AdGuard. Licensed LGPL-3.0
 */
@@ -717,11 +717,16 @@ var cssUtils = function () {
    */
 
   var normalize = function normalize(cssText) {
-    cssText = cssText.replace(reAttrFallback, evaluateMatch);
-    cssText = cssText.replace(reMatchesCss, addQuotes);
-    cssText = cssText.replace(reContains, addQuotes);
-    cssText = cssText.replace(reScope, SCOPE_REPLACER);
-    return cssText;
+    // cssText = cssText.replace(reAttrFallback, evaluateMatch);
+    // cssText = cssText.replace(reMatchesCss, addQuotes);
+    // cssText = cssText.replace(reContains, addQuotes);
+    // cssText = cssText.replace(reScope, SCOPE_REPLACER);
+    // return cssText;
+    var normalizedCssText = cssText.replace(reAttrFallback, evaluateMatch);
+    normalizedCssText = normalizedCssText.replace(reMatchesCss, addQuotes);
+    normalizedCssText = normalizedCssText.replace(reContains, addQuotes);
+    normalizedCssText = normalizedCssText.replace(reScope, SCOPE_REPLACER);
+    return normalizedCssText;
   };
 
   var isSimpleSelectorValid = function isSimpleSelectorValid(selector) {

diff --git a/dist/extended-css.js b/dist/extended-css.js
@@ -1,4 +1,4 @@
-/*! extended-css - v1.3.9 - Fri Feb 12 2021
+/*! extended-css - v1.3.10 - Mon Feb 15 2021
 * https://github.com/AdguardTeam/ExtendedCss
 * Copyright (c) 2021 AdGuard. Licensed LGPL-3.0
 */
@@ -720,11 +720,16 @@ var ExtendedCss = (function () {
      */
 
     var normalize = function normalize(cssText) {
-      cssText = cssText.replace(reAttrFallback, evaluateMatch);
-      cssText = cssText.replace(reMatchesCss, addQuotes);
-      cssText = cssText.replace(reContains, addQuotes);
-      cssText = cssText.replace(reScope, SCOPE_REPLACER);
-      return cssText;
+      // cssText = cssText.replace(reAttrFallback, evaluateMatch);
+      // cssText = cssText.replace(reMatchesCss, addQuotes);
+      // cssText = cssText.replace(reContains, addQuotes);
+      // cssText = cssText.replace(reScope, SCOPE_REPLACER);
+      // return cssText;
+      var normalizedCssText = cssText.replace(reAttrFallback, evaluateMatch);
+      normalizedCssText = normalizedCssText.replace(reMatchesCss, addQuotes);
+      normalizedCssText = normalizedCssText.replace(reContains, addQuotes);
+      normalizedCssText = normalizedCssText.replace(reScope, SCOPE_REPLACER);
+      return normalizedCssText;
     };
 
     var isSimpleSelectorValid = function isSimpleSelectorValid(selector) {

diff --git a/dist/extended-css.min.js b/dist/extended-css.min.js
diff --git a/lib/css-utils.js b/lib/css-utils.js
@@ -71,11 +71,18 @@ const cssUtils = (() => {
      * @return {string}
      */
     const normalize = function (cssText) {
-        cssText = cssText.replace(reAttrFallback, evaluateMatch);
-        cssText = cssText.replace(reMatchesCss, addQuotes);
-        cssText = cssText.replace(reContains, addQuotes);
-        cssText = cssText.replace(reScope, SCOPE_REPLACER);
-        return cssText;
+
+        // cssText = cssText.replace(reAttrFallback, evaluateMatch);
+        // cssText = cssText.replace(reMatchesCss, addQuotes);
+        // cssText = cssText.replace(reContains, addQuotes);
+        // cssText = cssText.replace(reScope, SCOPE_REPLACER);
+        // return cssText;
+
+        let normalizedCssText = cssText.replace(reAttrFallback, evaluateMatch);
+        normalizedCssText = normalizedCssText.replace(reMatchesCss, addQuotes);
+        normalizedCssText = normalizedCssText.replace(reContains, addQuotes);
+        normalizedCssText = normalizedCssText.replace(reScope, SCOPE_REPLACER);
+        return normalizedCssText;
     };
 
     const isSimpleSelectorValid = function (selector) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "extended-css",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "description": "Module for applying CSS styles with extended selection properties.",
   "main": "dist/extended-css.cjs.js",
   "module": "dist/extended-css.esm.js",