ripple 0.2.84 → 0.2.85
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/compiler/utils.js +0 -12
package/package.json
CHANGED
package/src/compiler/utils.js
CHANGED
|
@@ -379,7 +379,6 @@ export function is_component_level_function(context) {
|
|
|
379
379
|
}
|
|
380
380
|
|
|
381
381
|
export function is_ripple_track_call(callee, context) {
|
|
382
|
-
<<<<<<< Updated upstream
|
|
383
382
|
return (
|
|
384
383
|
(callee.type === 'Identifier' && (callee.name === 'track' || callee.name === 'trackSplit')) ||
|
|
385
384
|
(callee.type === 'MemberExpression' &&
|
|
@@ -389,17 +388,6 @@ export function is_ripple_track_call(callee, context) {
|
|
|
389
388
|
!callee.computed &&
|
|
390
389
|
is_ripple_import(callee, context))
|
|
391
390
|
);
|
|
392
|
-
=======
|
|
393
|
-
return (
|
|
394
|
-
(callee.type === 'Identifier' && callee.name === 'track') ||
|
|
395
|
-
(callee.type === 'MemberExpression' &&
|
|
396
|
-
callee.object.type === 'Identifier' &&
|
|
397
|
-
callee.property.type === 'Identifier' &&
|
|
398
|
-
callee.property.name === 'track' &&
|
|
399
|
-
!callee.computed &&
|
|
400
|
-
is_ripple_import(callee, context))
|
|
401
|
-
);
|
|
402
|
-
>>>>>>> Stashed changes
|
|
403
391
|
}
|
|
404
392
|
|
|
405
393
|
export function is_inside_call_expression(context) {
|