mirror of
https://github.com/Grasscutters/mitmproxy.git
synced 2024-11-22 07:08:10 +00:00
refactoring
This commit is contained in:
parent
9a86750e9d
commit
d4b18eae81
@ -6,9 +6,7 @@ UploadContentButton.propTypes = {
|
||||
}
|
||||
|
||||
export default function UploadContentButton({ uploadContent }) {
|
||||
|
||||
let fileInput;
|
||||
|
||||
|
||||
return (
|
||||
<FileChooser
|
||||
icon="fa-upload"
|
||||
|
@ -1,7 +1,7 @@
|
||||
import React, { Component, PropTypes } from 'react'
|
||||
import classnames from 'classnames'
|
||||
|
||||
export function Divider () { return <hr className="divider"/>}
|
||||
export const Divider = () => <hr className="divider"/>
|
||||
|
||||
export default class Dropdown extends Component {
|
||||
|
||||
|
@ -152,6 +152,5 @@ export function setContent(content){
|
||||
}
|
||||
|
||||
export function stopEdit(flow, modifiedFlow) {
|
||||
let diff = getDiff(flow, modifiedFlow)
|
||||
return flowsActions.update(flow, diff)
|
||||
return flowsActions.update(flow, getDiff(flow, modifiedFlow))
|
||||
}
|
||||
|
@ -107,14 +107,15 @@ fetchApi.put = (url, json, options) => fetchApi(
|
||||
...options
|
||||
}
|
||||
)
|
||||
|
||||
// deep comparison of two json objects (dicts). arrays are handeled as a single value.
|
||||
// return: json object including only the changed keys value pairs.
|
||||
export function getDiff(obj1, obj2) {
|
||||
let result = {...obj2};
|
||||
for(let key in obj1) {
|
||||
if(_.isEqual(obj2[key], obj1[key]))
|
||||
result[key] = undefined
|
||||
else if(!(Array.isArray(obj2[key]) && Array.isArray(obj1[key])) &&
|
||||
typeof obj2[key] == 'object' && typeof obj1[key] == 'object')
|
||||
else if(Object.prototype.toString.call(obj2[key]) === '[object Object]' &&
|
||||
Object.prototype.toString.call(obj1[key]) === '[object Object]' )
|
||||
result[key] = getDiff(obj1[key], obj2[key])
|
||||
}
|
||||
return result
|
||||
|
Loading…
Reference in New Issue
Block a user