File tree Expand file tree Collapse file tree 3 files changed +34
-2
lines changed
app/code/Magento/Checkout/view/frontend/web/js
internal/Magento/Framework/View/Element/UiComponent/DataProvider Expand file tree Collapse file tree 3 files changed +34
-2
lines changed Original file line number Diff line number Diff line change @@ -86,6 +86,14 @@ define([
86
86
events [ 'keyup ' + this . options . item . qty ] = function ( event ) {
87
87
self . _showItemButton ( $ ( event . target ) ) ;
88
88
} ;
89
+
90
+ /**
91
+ * @param {jQuery.Event } event
92
+ */
93
+ events [ 'change ' + this . options . item . qty ] = function ( event ) {
94
+ self . _showItemButton ( $ ( event . target ) ) ;
95
+ } ;
96
+
89
97
events [ 'click ' + this . options . item . button ] = function ( event ) {
90
98
event . stopPropagation ( ) ;
91
99
self . _updateItemQty ( $ ( event . currentTarget ) ) ;
Original file line number Diff line number Diff line change @@ -62,6 +62,16 @@ function ($column) use ($alias) {
62
62
return $ columns ;
63
63
}
64
64
65
+ /**
66
+ * Escape against value
67
+ * @param string $value
68
+ * @return string
69
+ */
70
+ private function escapeAgainstValue ($ value )
71
+ {
72
+ return preg_replace ('/([+\-><\(\)~*\"@]+)/ ' , ' ' , $ value );
73
+ }
74
+
65
75
/**
66
76
* Apply fulltext filters
67
77
*
@@ -86,7 +96,7 @@ public function apply(Collection $collection, Filter $filter)
86
96
$ collection ->getSelect ()
87
97
->where (
88
98
'MATCH( ' . implode (', ' , $ columns ) . ') AGAINST(?) ' ,
89
- $ filter ->getValue ()
99
+ $ this -> escapeAgainstValue ( $ filter ->getValue () )
90
100
);
91
101
}
92
102
}
Original file line number Diff line number Diff line change @@ -27,14 +27,28 @@ define([
27
27
return ! ! _ . findWhere ( callbacks , callback ) ;
28
28
}
29
29
30
+ /**
31
+ * Checks if provided module is rejected during load.
32
+ *
33
+ * @param {Object } module - Module to be checked.
34
+ * @return {Boolean }
35
+ */
36
+ function isRejected ( module ) {
37
+ return registry [ module . id ] && registry [ module . id ] . error ;
38
+ }
39
+
30
40
/**
31
41
* Checks if provided module has unresolved dependencies.
32
42
*
33
43
* @param {Object } module - Module to be checked.
34
44
* @returns {Boolean }
35
45
*/
36
46
function isPending ( module ) {
37
- return ! ! module . depCount ;
47
+ if ( ! module . depCount ) {
48
+ return false ;
49
+ }
50
+
51
+ return module . depCount > _ . filter ( module . depMaps , isRejected ) . length ;
38
52
}
39
53
40
54
/**
You can’t perform that action at this time.
0 commit comments