File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
app/code/Magento/Reports/view/adminhtml/templates
lib/internal/Magento/Framework/View/Template/Html Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -112,7 +112,7 @@ require([
112
112
period_date_from.adviceContainer = $('<?php echo $ block ->getSuffixId ('period_date_from_advice ' )?> ');
113
113
period_date_to.adviceContainer = $('<?php echo $ block ->getSuffixId ('period_date_to_advice ' )?> ');
114
114
115
- validateFilterDate = function() {
115
+ var validateFilterDate = function() {
116
116
if (period_date_from && period_date_to) {
117
117
var valid = true;
118
118
jQuery(period_date_from).add(period_date_to).each(function() {
Original file line number Diff line number Diff line change @@ -116,17 +116,17 @@ public function minify($file)
116
116
'#(?<!]]>)\s+</# ' ,
117
117
'</ ' ,
118
118
preg_replace (
119
- '#((?:<\?php\s+(?!echo)[^\?]*)\?>)\s+# ' ,
119
+ '#((?:<\?php\s+(?!echo|if|elseif|print )[^\?]*)\?>)\s+# ' ,
120
120
'$1 ' ,
121
121
preg_replace (
122
122
'#(?<! ' . implode ('| ' , $ this ->inlineHtmlTags ) . ')\> \<# ' ,
123
123
'>< ' ,
124
124
preg_replace (
125
- '#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script)\b))*+) '
126
- . '(?:<(?>textarea|pre|script)\b|\z))# ' ,
125
+ '#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script|style )\b))*+) '
126
+ . '(?:<(?>textarea|pre|script|style )\b|\z))# ' ,
127
127
' ' ,
128
128
preg_replace (
129
- '#(?<!:)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*# ' ,
129
+ '#(?<!:| \\\\ )//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*# ' ,
130
130
'' ,
131
131
preg_replace (
132
132
'#(?<!:)//[^\n\r]*(\s\?\>)# ' ,
You can’t perform that action at this time.
0 commit comments