Skip to content

Commit

Permalink
Resolve or disable misc eslint errors
Browse files Browse the repository at this point in the history
Test plan:
    - All existing tests pass

flag=none

Refs DE-1426

Change-Id: Ib1af29de39b9a642d16330ddbb252f1fe2d686ea
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/303526
Reviewed-by: Christopher Soto <[email protected]>
Reviewed-by: Ed Schiebel <[email protected]>
Tested-by: Service Cloud Jenkins <[email protected]>
QA-Review: Aaron Shafovaloff <[email protected]>
Product-Review: Cameron Ray <[email protected]>
  • Loading branch information
aaronshaf committed Oct 19, 2022
1 parent 496fb1d commit 1a1a43e
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 127 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,33 @@ const listTypes = {
'unordered-default': {
listType: 'UL',
icon: 'list-bull-default',
text: formatMessage('default bulleted unordered list')
text: formatMessage('default bulleted unordered list'),
},
circle: {
listType: 'UL',
icon: 'list-bull-circle',
text: formatMessage('circle unordered list')
text: formatMessage('circle unordered list'),
},
square: {
listType: 'UL',
icon: 'list-bull-square',
text: formatMessage('square unordered list')
text: formatMessage('square unordered list'),
},
'ordered-default': {
listType: 'OL',
icon: 'list-num-default',
text: formatMessage('default numerical ordered list')
text: formatMessage('default numerical ordered list'),
},
'upper-alpha': {
listType: 'OL',
icon: 'list-num-upper-alpha',
text: formatMessage('uppercase alphabetic ordered list')
text: formatMessage('uppercase alphabetic ordered list'),
},
'upper-roman': {
listType: 'OL',
icon: 'list-num-upper-roman',
text: formatMessage('uppercase Roman numeral ordered list')
}
text: formatMessage('uppercase Roman numeral ordered list'),
},
}

function selectedListType(listTypes, editor) {
Expand Down Expand Up @@ -89,7 +89,7 @@ export default function register(editor) {
type: 'choiceitem',
value: listType,
icon,
text
text,
}
})
callback(items)
Expand All @@ -98,7 +98,7 @@ export default function register(editor) {
onAction: () => {
const selected = listTypes[selectedListType(Object.keys(listTypes), editor)]
const cmd =
selected && selected.listType == 'OL' ? 'InsertOrderedList' : 'InsertUnorderedList'
selected && selected.listType === 'OL' ? 'InsertOrderedList' : 'InsertUnorderedList'
editor.execCommand(cmd)
},

Expand Down Expand Up @@ -136,6 +136,6 @@ export default function register(editor) {
nodeChangeHandler({parents: editor.dom.getParents(editor.selection.getNode(), 'ol,ul')})
editor.on('NodeChange', nodeChangeHandler)
return () => editor.off('NodeChange', nodeChangeHandler)
}
},
})
}
2 changes: 1 addition & 1 deletion ui/features/course_paces/react/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const App: React.FC<ResponsiveComponentProps> = ({
handleDrawerToggle={() => setTrayOpen(!trayOpen)}
responsiveSize={responsiveSize}
/>
{!coursePace.id && coursePace.context_type == 'Course' ? (
{!coursePace.id && coursePace.context_type === 'Course' ? (
<CoursePaceEmpty responsiveSize={responsiveSize} />
) : (
<PacePicker />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ export const CoursePaceEmpty: React.FC<DispatchProps & PassedProps> = ({
return (
<View>
<Flex
wrap={responsiveSize == 'large' ? undefined : 'wrap'}
wrap={responsiveSize === 'large' ? undefined : 'wrap'}
alignItems="end"
justifyItems={responsiveSize == 'large' ? 'start' : 'center'}
justifyItems={responsiveSize === 'large' ? 'start' : 'center'}
margin="0 0 medium 0"
>
<FlexItem padding="medium 0 0 0" width="100%" maxWidth="362px" shouldShrink={true}>
<View
as="div"
textAlign={responsiveSize == 'large' ? 'start' : 'center'}
textAlign={responsiveSize === 'large' ? 'start' : 'center'}
className="course-paces-panda"
padding="0 0 medium 0"
>
Expand All @@ -81,7 +81,7 @@ export const CoursePaceEmpty: React.FC<DispatchProps & PassedProps> = ({
</Flex>
</FlexItem>

{responsiveSize == 'large' ? (
{responsiveSize === 'large' ? (
<FlexItem margin="0 large small large">
<IconArrowEndSolid size="small" />
</FlexItem>
Expand All @@ -90,7 +90,7 @@ export const CoursePaceEmpty: React.FC<DispatchProps & PassedProps> = ({
<FlexItem padding="medium 0 0 0" width="100%" maxWidth="362px" shouldShrink={true}>
<View
as="div"
textAlign={responsiveSize == 'large' ? 'start' : 'center'}
textAlign={responsiveSize === 'large' ? 'start' : 'center'}
padding="0 0 medium 0"
>
<img src={PandaUsingPaces} alt="" />
Expand All @@ -116,7 +116,7 @@ export const CoursePaceEmpty: React.FC<DispatchProps & PassedProps> = ({
color="primary"
margin="small 0"
size="large"
display={responsiveSize == 'large' ? 'inline-block' : 'block'}
display={responsiveSize === 'large' ? 'inline-block' : 'block'}
onClick={() => {
setSelectedPaceContext('Course', window.ENV.COURSE_ID)
}}
Expand Down
14 changes: 7 additions & 7 deletions ui/features/course_paces/react/components/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ export const Header: React.FC<HeaderProps> = (props: HeaderProps) => {

const getDurationLabel = planDays => {
if (!planDays) return false
let weeks,
durations = []
let weeks
const durations = []
if (planDays > 7) {
weeks = Math.floor(planDays / 7)
durations.push(I18n.t({one: '1 Week', other: '%{count} Weeks'}, {count: weeks}))
Expand Down Expand Up @@ -138,11 +138,11 @@ export const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
<View as="div" margin="small 0" borderRadius="medium" borderWidth="small" padding="medium">
<Flex
justifyItems="space-between"
direction={props.responsiveSize == 'large' ? 'row' : 'column'}
direction={props.responsiveSize === 'large' ? 'row' : 'column'}
>
<FlexItem>
<Flex justifyItems={props.responsiveSize == 'large' ? 'start' : 'center'}>
{props.responsiveSize == 'large' ? (
<Flex justifyItems={props.responsiveSize === 'large' ? 'start' : 'center'}>
{props.responsiveSize === 'large' ? (
<FlexItem padding="0 medium 0 0">
<IconCoursesLine size="small" />
</FlexItem>
Expand Down Expand Up @@ -179,15 +179,15 @@ export const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
<FlexItem
fontSize="0.875rem"
textAlign="center"
margin={props.responsiveSize == 'large' ? '0' : 'small 0 0'}
margin={props.responsiveSize === 'large' ? '0' : 'small 0 0'}
>
<Link
isWithinText={false}
onClick={() => {
props.setSelectedPaceContext('Course', window.ENV.COURSE_ID)
}}
>
{!props.coursePace.id && props.coursePace.context_type == 'Course'
{!props.coursePace.id && props.coursePace.context_type === 'Course'
? I18n.t('Create Default Pace')
: I18n.t('Edit Default Pace')}
</Link>
Expand Down
Loading

0 comments on commit 1a1a43e

Please sign in to comment.