Commit dd98675

committed

nullcheck

1 parent 2c842ba commit dd98675Copy full SHA for dd98675

File tree

3 files changed

+16

-17

lines changed

client/src
- NoteComponents
  - NoteItem.js
  - media
    - media.js
- Pages
  - NotesPage.js

3 files changed

+16

-17

lines changed

`‎client/src/NoteComponents/NoteItem.js`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ function NoteItem({ note }) {`
`38`	`38`	`return (`
`39`	`39`	`<div className="p-1" >`
`40`	`40`	`<div className="card" style={{ backgroundColor: bgColor }} >`
`41`		`-`
`42`	`41`	`{/*Изображение заметки/}`
`43`	`42`	`{Array.isArray(mediaList) ? (mediaList.map((imgId) => {`
`44`	`43`	`const media = getMediaById(imgId)`

`‎client/src/NoteComponents/media/media.js`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ function Media({ setNoteMedia, mediaList = [], style, className, disabled, noteI`
`99`	`99`	`<Modal {...modalProps.bind()} >`
`100`	`100`	<div style={{ minHeight: `${sizeData.current ? sizeData.current.parentElement.clientHeight : 100}px` }} className="p-1 d-flex flex-wrap align-content-between align-items-center justify-content-center">
`101`	`101`
`102`		`- <div className="form-group container d-flex flex-row flex-wrap align-items-start mb-0">`
	`102`	`+ <div className="form-group container d-flex flex-row flex-wrap align-items-start justify-content-around mb-0">`
`103`	`103`	`{Array.isArray(mediaList) && mediaList.length ? (mediaList.map((imgId, index) => {`
`104`	`104`	`const media = getMediaById(imgId)`
`105`	`105`	`const src = typeof media === "object" && media && media.data`

`‎client/src/Pages/NotesPage.js`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ function NotesPage() {`
`104`	`104`	`*/`
`105`	`105`	`function removeMedia(id) {`
`106`	`106`	`const index = getMediaIndexById(id)`
	`107`	`+ if (index === null) return 0`
`107`	`108`	`const toDelete = mediaArr.splice(index, 1)[0]`
`108`		`-`
`109`	`109`	`setMediaArr([...mediaArr])`
`110`	`110`	`toDelete && loadMediaToServer({ id: toDelete.id }, "delete")`
`111`	`111`	`}`
`@@ -231,6 +231,7 @@ function NotesPage() {`
`231`	`231`	`*/`
`232`	`232`	`function changeNoteColor(id, color) {`
`233`	`233`	`const index = getNoteIndexById(id)`
	`234`	`+ if (index === null) return 0`
`234`	`235`	`notesArr[index].color = color`
`235`	`236`	`setNotesArr([...notesArr])`
`236`	`237`	`loadNotesToServer(notesArr[index], "set")`
`@@ -244,12 +245,11 @@ function NotesPage() {`
`244`	`245`	`*/`
`245`	`246`	`function editNoteContent(id, name, text) {`
`246`	`247`	`const index = getNoteIndexById(id)`
`247`		`- if (index !== null) {`
`248`		`- let note = new Note(notesArr[index])`
`249`		`- note.name = name`
`250`		`- note.text = text`
`251`		`- notesArr[index] = note`
`252`		`- }`
	`248`	`+ if (index === null) return 0`
	`249`	`+ let note = new Note(notesArr[index])`
	`250`	`+ note.name = name`
	`251`	`+ note.text = text`
	`252`	`+ notesArr[index] = note`
`253`	`253`	`setNotesArr([...notesArr])`
`254`	`254`	`loadNotesToServer(notesArr[index], "set")`
`255`	`255`	`}`
`@@ -261,6 +261,7 @@ function NotesPage() {`
`261`	`261`	`*/`
`262`	`262`	`function editNoteMedia(id, media = []) {`
`263`	`263`	`const index = getNoteIndexById(id)`
	`264`	`+ if (index === null) return 0`
`264`	`265`	`notesArr[index].media = media`
`265`	`266`	`setNotesArr([...notesArr])`
`266`	`267`	`loadNotesToServer(notesArr[index], "set")`
`@@ -273,14 +274,13 @@ function NotesPage() {`
`273`	`274`	`*/`
`274`	`275`	`function editNoteOrder(id, orderOperationFlag) {`
`275`	`276`	`const index = getNoteIndexById(id)`
`276`		`- if (index !== null) {`
`277`		`- notesArr[index].order += orderOperationFlag ? 1 : -1`
`278`		`- let fixedArr = fixOrders(notesArr)`
`279`		`- setNotesArr(fixedArr)`
`280`		`- fixedArr.forEach((note) => {`
`281`		`- loadNotesToServer(note, "set")`
`282`		`- })`
`283`		`- }`
	`277`	`+ if (index === null) return 0`
	`278`	`+ notesArr[index].order += orderOperationFlag ? 1 : -1`
	`279`	`+ let fixedArr = fixOrders(notesArr)`
	`280`	`+ setNotesArr(fixedArr)`
	`281`	`+ fixedArr.forEach((note) => {`
	`282`	`+ loadNotesToServer(note, "set")`
	`283`	`+ })`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`///////////`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit dd98675

File tree

3 files changed

3 files changed

`‎client/src/NoteComponents/NoteItem.js`

`‎client/src/NoteComponents/media/media.js`

`‎client/src/Pages/NotesPage.js`

0 commit comments