Skip to content

Commit 9b6f7bf

Browse files
committed
Change automagic style sorting property to priority, so that sort can be used for registry ordering.
1 parent 3f4d055 commit 9b6f7bf

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

.core/.cli/commands/reactium/style/template/reactium-gulp.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ ReactiumGulp.Hook.registerSync('ddd-styles-partial', SassPartial => {
1616
SassPartial.register('{{id}}', {
1717
pattern: {{pattern}},
1818
exclude: false,
19-
order: ReactiumGulp.Enums.style.ORGANISMS,
19+
priority: ReactiumGulp.Enums.style.ORGANISMS,
2020
})
2121
});

.core/gulp.tasks.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -543,85 +543,85 @@ $assets: (
543543
SassPartial.register('mixins-dir', {
544544
pattern: /mixins\/_reactium-style/,
545545
exclude: false,
546-
order: ReactiumGulp.Enums.style.MIXINS,
546+
priority: ReactiumGulp.Enums.style.MIXINS,
547547
});
548548

549549
SassPartial.register('mixins-ddd', {
550550
pattern: /_reactium-style-mixins/,
551551
exclude: false,
552-
order: ReactiumGulp.Enums.style.MIXINS,
552+
priority: ReactiumGulp.Enums.style.MIXINS,
553553
});
554554

555555
SassPartial.register('variables-dir', {
556556
pattern: /variables\/_reactium-style/,
557557
exclude: false,
558-
order: ReactiumGulp.Enums.style.VARIABLES,
558+
priority: ReactiumGulp.Enums.style.VARIABLES,
559559
});
560560

561561
SassPartial.register('variables-ddd', {
562562
pattern: /_reactium-style-variables/,
563563
exclude: false,
564-
order: ReactiumGulp.Enums.style.VARIABLES,
564+
priority: ReactiumGulp.Enums.style.VARIABLES,
565565
});
566566

567567
SassPartial.register('base-dir', {
568568
pattern: /base\/_reactium-style/,
569569
exclude: false,
570-
order: ReactiumGulp.Enums.style.BASE,
570+
priority: ReactiumGulp.Enums.style.BASE,
571571
});
572572

573573
SassPartial.register('base-ddd', {
574574
pattern: /_reactium-style-base/,
575575
exclude: false,
576-
order: ReactiumGulp.Enums.style.BASE,
576+
priority: ReactiumGulp.Enums.style.BASE,
577577
});
578578

579579
SassPartial.register('atoms-dir', {
580580
pattern: /atoms\/_reactium-style/,
581581
exclude: false,
582-
order: ReactiumGulp.Enums.style.ATOMS,
582+
priority: ReactiumGulp.Enums.style.ATOMS,
583583
});
584584

585585
SassPartial.register('atoms-ddd', {
586586
pattern: /_reactium-style-atoms/,
587587
exclude: false,
588-
order: ReactiumGulp.Enums.style.ATOMS,
588+
priority: ReactiumGulp.Enums.style.ATOMS,
589589
});
590590

591591
SassPartial.register('molecules-dir', {
592592
pattern: /molecules\/_reactium-style/,
593593
exclude: false,
594-
order: ReactiumGulp.Enums.style.MOLECULES,
594+
priority: ReactiumGulp.Enums.style.MOLECULES,
595595
});
596596

597597
SassPartial.register('molecules-ddd', {
598598
pattern: /_reactium-style-molecules/,
599599
exclude: false,
600-
order: ReactiumGulp.Enums.style.MOLECULES,
600+
priority: ReactiumGulp.Enums.style.MOLECULES,
601601
});
602602

603603
SassPartial.register('organisms-dir', {
604604
pattern: /organisms\/_reactium-style/,
605605
exclude: false,
606-
order: ReactiumGulp.Enums.style.ORGANISMS,
606+
priority: ReactiumGulp.Enums.style.ORGANISMS,
607607
});
608608

609609
SassPartial.register('organisms-ddd', {
610610
pattern: /_reactium-style-organisms/,
611611
exclude: false,
612-
order: ReactiumGulp.Enums.style.ORGANISMS,
612+
priority: ReactiumGulp.Enums.style.ORGANISMS,
613613
});
614614

615615
SassPartial.register('overrides-dir', {
616616
pattern: /overrides\/_reactium-style/,
617617
exclude: false,
618-
order: ReactiumGulp.Enums.style.OVERRIDES,
618+
priority: ReactiumGulp.Enums.style.OVERRIDES,
619619
});
620620

621621
SassPartial.register('overrides-ddd', {
622622
pattern: /_reactium-style-overrides/,
623623
exclude: false,
624-
order: ReactiumGulp.Enums.style.OVERRIDES,
624+
priority: ReactiumGulp.Enums.style.OVERRIDES,
625625
});
626626
};
627627

@@ -658,19 +658,19 @@ $assets: (
658658
pattern.test(b),
659659
) || {};
660660

661-
const aOrder = op.get(
661+
const aPriority = op.get(
662662
aMatch,
663-
'order',
663+
'priority',
664664
ReactiumGulp.Enums.style.ORGANISMS,
665665
);
666-
const bOrder = op.get(
666+
const bPriority = op.get(
667667
bMatch,
668-
'order',
668+
'priority',
669669
ReactiumGulp.Enums.style.ORGANISMS,
670670
);
671671

672-
if (aOrder > bOrder) return 1;
673-
else if (bOrder > aOrder) return -1;
672+
if (aPriority > bPriority) return 1;
673+
else if (bPriority > aPriority) return -1;
674674
return 0;
675675
})
676676
.filter(partial => {

0 commit comments

Comments
 (0)