code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/source/index/package.json b/source/index/package.json "devDependencies": {
"@airswap/order-utils": "0.3.3",
"@airswap/test-utils": "0.1.1",
- "@airswap/tokens": "0.1.2",
"bignumber.js": "^9.0.0",
"solidity-coverage": "^0.6.3",
"truffle": "^5.0.24"
| 2 |
diff --git a/src/containers/LeftPanel/Endpoint/Endpoint.jsx b/src/containers/LeftPanel/Endpoint/Endpoint.jsx @@ -48,10 +48,11 @@ const Endpoint = ({ endpoint, index, dispatchToEndpointTestCase }) => {
<div id={styles.filesFlexBox}>
<div id={styles.files}>
- <label htmlFor='endpointFile'>Server File Name</label>
+ <label htmlFor='endpointFile'>Import Server From</label>
<div id={styles.payloadFlexBox}>
<input
type='text'
+ placeholder='File Name'
id={styles.renderInputBox}
value={endpoint.serverFile}
onChange={handleChangeServerFileName}
@@ -103,7 +104,7 @@ const Endpoint = ({ endpoint, index, dispatchToEndpointTestCase }) => {
<input
type='text'
name='expectedResponse'
- placeholder="body.yourKey or status"
+ placeholder="body.key or status"
onChange={e => handleChangeEndpointFields(e, 'expectedResponse')} />
</div>
</div>
| 3 |
diff --git a/views/partials/assetInfo.handlebars b/views/partials/assetInfo.handlebars <div class="column column--2 column--med-10">
<span class="text">Channel:</span>
</div><div class="column column--8 column--med-10">
- <span class="text"><a href="/{{claimInfo.channelName}}:{{claimInfo.certificateId}}">{{claimInfo.channelName}}</a></span>
+ <span class="text"><a href="/{{claimInfo.channelName}}:{{claimInfo.channelClaimId}}">{{claimInfo.channelName}}</a></span>
</div>
</div>
{{/if}}
| 1 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -492,6 +492,16 @@ libraries:
- title: "Auth0 SDK for Web"
url: "/libraries/auth0js"
+ children:
+
+ - title: "Auth0.js v8"
+ url: "/libraries/auth0js"
+
+ - title: "Migration Guide v8"
+ url: "/libraries/auth0js/migration-guide"
+
+ - title: "Auth0.js v7"
+ url: "/libraries/auth0js/v7"
- title: "Auth0 SDK for iOS"
url: "/libraries/auth0-swift"
| 0 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -788,23 +788,6 @@ const _updateWeapons = timeDiff => {
popovers.update();
};
-const popoverWidth = 600;
-const popoverHeight = 200;
-const popoverTextMesh = (() => {
- const textMesh = makeTextMesh('This is your mirror.\nTake a look at yourself!', undefined, 0.5, 'center', 'middle');
- textMesh.position.z = 0.1;
- textMesh.scale.x = popoverHeight / popoverWidth;
- textMesh.color = 0xFFFFFF;
- return textMesh;
-})();
-const popoverTarget = new THREE.Object3D();
-popoverTarget.position.set(0, 2.5, -2);
-const popoverMesh = popovers.addPopover(popoverTextMesh, {
- width: popoverWidth,
- height: popoverHeight,
- target: popoverTarget,
-});
-
/* renderer.domElement.addEventListener('wheel', e => {
if (document.pointerLockElement) {
if (appManager.grabbedObjects[0]) {
| 2 |
diff --git a/src/components/templates/Articles/index.js b/src/components/templates/Articles/index.js -import { Container, Flex, Link } from 'components/atoms'
+import { Container, Flex, Link, Image } from 'components/atoms'
import { Tags, GlobalMdx } from 'components/molecules'
import { Footer, Navbar } from 'components/organisms'
import { graphql, withPrefix } from 'gatsby'
@@ -80,7 +80,7 @@ export default class Articles extends Component {
</Flex>
</Container>
<div className={styles.markdownContainer}>
- <img
+ <Image
className={styles.featuredImage}
src={post.frontmatter.featuredImage}
/>
| 14 |
diff --git a/src/components/dashboard/Dashboard.js b/src/components/dashboard/Dashboard.js @@ -4,6 +4,7 @@ import { StyleSheet, Text, View } from 'react-native'
import { normalize } from 'react-native-elements'
import { Portal } from 'react-native-paper'
import type { Store } from 'undux'
+import throttle from 'lodash/throttle'
import GDStore from '../../lib/undux/GDStore'
import { getInitialFeed, getNextFeed, PAGE_SIZE } from '../../lib/undux/utils/feed'
@@ -67,10 +68,12 @@ class Dashboard extends Component<DashboardProps, DashboardState> {
// userStorage.feed.get('byid').off()
}
- getFeeds() {
- log.info('getFeeds')
+ getFeeds = (() => {
+ const get = () => {
getInitialFeed(this.props.store)
}
+ return throttle(get, { leading: true })
+ })()
showEventModal = item => {
this.props.screenProps.navigateTo('Home', {
| 0 |
diff --git a/articles/connections/social/facebook.md b/articles/connections/social/facebook.md @@ -7,7 +7,6 @@ seo_alias: facebook
description: This page shows you how to connect your custom app to Facebook. Learn how Auth0 can easily help you adding Facebook Login to your app.
toc: true
---
-
# Connect your app to Facebook
To connect your Auth0 app to Facebook, you will need an **App ID** and **App Secret** from your Facebook app, then copy these keys into your Auth0 settings and enable the connection.
@@ -102,6 +101,20 @@ Click continue and if configured correctly, you will see the **It works!!!** pag
+## 7. Access Facebook API
+
+Once you successfully authenticate a user, Facebook includes an [access token](/tokens/access-token) in the user profile it returns to Auth0.
+
+You can then use this token to call their API.
+
+In order to get a Facebook access token, you have to retrieve the full user's profile, using the Auth0 Management API, and extrach the access token from the response. For detailed steps refer to [Call an Identity Provider API](/connections/calling-an-external-idp-api).
+
+Once you have the token you can call the API, following GitHub's documentation.
+
+::: note
+For more information on these tokens, refer to [Identity Provider Access Tokens](/tokens/idp).
+:::
+
## Additional Info
You can find additional information at Facebook docs: [Add Facebook Login to Your App or Website](https://developers.facebook.com/docs/facebook-login).
| 0 |
diff --git a/coralui-component-calendar/src/scripts/Calendar.js b/coralui-component-calendar/src/scripts/Calendar.js @@ -247,7 +247,7 @@ class Calendar extends FormFieldMixin(ComponentMixin(HTMLElement)) {
return this._startDay;
}
- if (typeof DateTime.Moment.localeData().firstDayOfWeek !== 'undefined') {
+ if (typeof DateTime.Moment.localeData(i18n.locale).firstDayOfWeek !== 'undefined') {
return DateTime.Moment.localeData(i18n.locale).firstDayOfWeek();
}
| 9 |
diff --git a/packages/app/src/components/Admin/ImportData/GrowiArchive/ImportForm.jsx b/packages/app/src/components/Admin/ImportData/GrowiArchive/ImportForm.jsx import React from 'react';
import PropTypes from 'prop-types';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
import AdminSocketIoContainer from '~/client/services/AdminSocketIoContainer';
import AppContainer from '~/client/services/AppContainer';
@@ -506,9 +506,15 @@ ImportForm.propTypes = {
onPostImport: PropTypes.func,
};
+const ImportFormWrapperFc = (props) => {
+ const { t } = useTranslation();
+
+ return <ImportForm t={t} {...props} />;
+};
+
/**
* Wrapper component for using unstated
*/
-const ImportFormWrapper = withUnstatedContainers(ImportForm, [AppContainer, AdminSocketIoContainer]);
+const ImportFormWrapper = withUnstatedContainers(ImportFormWrapperFc, [AppContainer, AdminSocketIoContainer]);
-export default withTranslation()(ImportFormWrapper);
+export default ImportFormWrapper;
| 14 |
diff --git a/packages/convertor/package.json b/packages/convertor/package.json "src"
],
"publishConfig": {
- "registry": "https://registry.npmjs.org"
+ "registry": "https://registry.npmjs.org",
+ "access": "public"
},
"repository": {
"type": "git",
| 12 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.33.0",
+ "version": "0.34.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/public/app/js/cbus-audio.js b/public/app/js/cbus-audio.js @@ -160,11 +160,11 @@ cbus.audio = {
},
setPlaybackRate: function(rate) {
- cbus.audio.element.playbackRate = rate ? rate : 1;
+ cbus.audio.element.playbackRate = rate ? clamp(rate, cbus.audio.PLAYBACK_RATE_MIN, cbus.audio.PLAYBACK_RATE_MAX) : 1;
if (cbus.audio.mprisPlayer) {
- cbus.audio.mprisPlayer.rate = rate;
+ cbus.audio.mprisPlayer.rate = cbus.audio.element.playbackRate;
}
- cbus.broadcast.send("playbackRateChanged", rate);
+ cbus.broadcast.send("playbackRateChanged", cbus.audio.element.playbackRate);
},
queue: [],
@@ -237,7 +237,7 @@ if (MPRISPlayer) {
});
cbus.audio.mprisPlayer.on("rate", (data) => {
if (cbus.audio.element) {
- cbus.audio.setPlaybackRate(clamp(data.rate, cbus.audio.PLAYBACK_RATE_MIN, cbus.audio.PLAYBACK_RATE_MAX));
+ cbus.audio.setPlaybackRate(data.rate);
}
});
| 7 |
diff --git a/civictechprojects/templates/new_index.html b/civictechprojects/templates/new_index.html <script>
window.fbAsyncInit = function() {
FB.init({
- appId : '401313064132303',
+ appId : '137258853647008',
cookie : true,
xfbml : true,
- version : 'v4.0',
+ version : 'v2.10',
});
FB.AppEvents.logPageView();
};
| 13 |
diff --git a/docs/source/docs/functions-and-directives.blade.md b/docs/source/docs/functions-and-directives.blade.md @@ -68,17 +68,6 @@ Note that `@@apply` **will not work** for mixing in hover or responsive variants
@@apply .inline-block;
}
}
-
-// Or if you're using Less or Sass:
-.btn {
- @@apply .block .bg-red;
- &:hover {
- @@apply .bg-blue;
- }
- @@screen md {
- @@apply .inline-block;
- }
-}
```
### `@@responsive`
| 2 |
diff --git a/_src/_assets/css/_pressLogos.scss b/_src/_assets/css/_pressLogos.scss width: 100px;
}
- img[alt*="Vox"] {
+ img[alt="Vox logo"] {
width: 50px;
}
- img[alt*="New York Times"] {
+ img[alt="New York Times logo"] {
width: 135px;
}
- img[alt*="Talking Points"] {
+ img[alt="Talking Points Memo logo"] {
width: 85px;
}
| 4 |
diff --git a/ui/src/components/field/QField.json b/ui/src/components/field/QField.json "type": "Boolean",
"desc": "Field's label is floating"
},
- "value": {
+ "modelValue": {
"type": "Any",
"desc": "Field's value",
"examples": [ 0.241, "Text" ]
| 1 |
diff --git a/token-metadata/0x4a527d8fc13C5203AB24BA0944F4Cb14658D1Db6/metadata.json b/token-metadata/0x4a527d8fc13C5203AB24BA0944F4Cb14658D1Db6/metadata.json "symbol": "MITX",
"address": "0x4a527d8fc13C5203AB24BA0944F4Cb14658D1Db6",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/client/src/pages/VerifyEmail.js b/client/src/pages/VerifyEmail.js @@ -90,24 +90,23 @@ const VerifyEmail = ({ forgotPasswordRequested, email }) => {
<VerifyEmailRightContainer>
<div className="text-center">
<VerifyDirectionsContainer>
- <h1 className="directions-header">
- {forgotPasswordRequested
- ? "Recover Password"
- : "Check your inbox"}
- </h1>
+ <h1 className="directions-header">Check your inbox</h1>
<p className="directions-text">
{forgotPasswordRequested ? (
<>
- An e-mail has been sent with further instructions. <br />
- Please check your inbox.
+ An e-mail has been sent to {email} with further instructions
+ on how to reset your password.
</>
) : (
<>
We just emailed a link to {email}. Click the link to confirm
- your account and complete your profile. If you don't see a
- message within a few minutes please check your spam folder.
+ your account and complete your profile.
</>
)}
+ <br />
+ <br />
+ If you don't see a message within a few minutes please check spam,
+ promotions or other incoming mail folders.
</p>
</VerifyDirectionsContainer>
</div>
| 7 |
diff --git a/types/index.d.ts b/types/index.d.ts @@ -2138,12 +2138,38 @@ declare module 'mongoose' {
export type SchemaDefinitionType<T> = T extends Document ? Omit<T, Exclude<keyof Document, '_id' | 'id' | '__v'>> : T;
+ // Helpers to simplify checks
+ type IfAny<IFTYPE, THENTYPE> = 0 extends (1 & IFTYPE) ? THENTYPE : IFTYPE;
+ type IfUnknown<IFTYPE, THENTYPE> = unknown extends IFTYPE ? THENTYPE : IFTYPE;
+
+ // tests for these two types are located in test/types/lean.test.ts
+ export type DocTypeFromUnion<T> = T extends (Document<infer T1, infer T2, infer T3> & infer U) ?
+ [U] extends [Document<T1, T2, T3> & infer U] ? IfUnknown<IfAny<U, false>, false> : false : false;
+
+ export type DocTypeFromGeneric<T> = T extends Document<infer IdType, infer TQueryHelpers, infer DocType> ?
+ IfUnknown<IfAny<DocType, false>, false> : false;
+
+ /**
+ * Helper to choose the best option between two type helpers
+ */
+ export type _pickObject<T1, T2, Fallback> = T1 extends false ? T2 extends false ? Fallback : T2 : T1;
+
+ /**
+ * There may be a better way to do this, but the goal is to return the DocType if it can be infered
+ * and if not to return a type which is easily identified as "not valid" so we fall back to
+ * "strip out known things added by extending Document"
+ * There are three basic ways to mix in Document -- "Document & T", "Document<ObjId, mixins, T>",
+ * and "T extends Document". In the last case there is no type without Document mixins, so we can only
+ * strip things out. In the other two cases we can infer the type, so we should
+ */
+ export type BaseDocumentType<T> = _pickObject<DocTypeFromUnion<T>, DocTypeFromGeneric<T>, false>;
+
/**
* Documents returned from queries with the lean option enabled.
* Plain old JavaScript object documents (POJO).
* @see https://mongoosejs.com/docs/tutorials/lean.html
*/
- export type LeanDocument<T> = T extends mongoose.HydratedDocument<infer DocType, infer MethodsOverrides, infer TVirtuals> ? _LeanDocument<DocType> :
+ export type LeanDocument<T> = BaseDocumentType<T> extends Document ? _LeanDocument<BaseDocumentType<T>> :
Omit<_LeanDocument<T>, Exclude<keyof Document, '_id' | 'id' | '__v'> | '$isSingleNested'>;
export type LeanDocumentOrArray<T> = 0 extends (1 & T) ? T :
| 7 |
diff --git a/client/src/pages/CreatePost.js b/client/src/pages/CreatePost.js @@ -25,7 +25,7 @@ const initialState = {
options: [],
selected: "",
},
- data: {
+ formData: {
title: "",
body: "",
tags: [],
@@ -45,7 +45,7 @@ const errorMsg = {
export default (props) => {
const [state, setState] = useState(initialState.state);
- const [data, setData] = useState(initialState.data);
+ const [formData, setFormData] = useState(initialState.formData);
const [errors, setErrors] = useState(initialState.errors);
const { modal, selected, options } = state;
@@ -67,21 +67,21 @@ export default (props) => {
});
};
- const handleData = (field) => (e) => {
- setData({ ...data, [field]: e.target.value });
- if (errors.includes(field) && data[field]) {
+ const handleFormData = (field) => (e) => {
+ setFormData({ ...formData, [field]: e.target.value });
+ if (errors.includes(field) && formData[field]) {
const newErrors = errors.filter((error) => error !== field);
setErrors(newErrors);
}
};
const addTag = (tag) => (e) => {
- const hasTag = data.tags.includes(tag);
+ const hasTag = formData.tags.includes(tag);
if (hasTag) {
- const tags = data.tags.filter((t) => t !== tag);
- setData({ ...data, tags });
+ const tags = formData.tags.filter((t) => t !== tag);
+ setFormData({ ...formData, tags });
} else {
- setData({ ...data, tags: [...data.tags, tag] });
+ setFormData({ ...formData, tags: [...formData.tags, tag] });
}
};
@@ -96,7 +96,7 @@ export default (props) => {
};
const renderError = (field) => {
- if (errors.includes(field) && (!data[field] || !data[field].length))
+ if (errors.includes(field) && (!formData[field] || !formData[field].length))
return errorMsg[field];
};
@@ -124,10 +124,10 @@ export default (props) => {
<RadioGroup
flex={true}
padding="1.3rem 0"
- onChange={handleData(selected)}
+ onChange={handleFormData(selected)}
options={options}
- value={data[selected]}
- defaultValue={data[selected]}
+ value={formData[selected]}
+ defaultValue={formData[selected]}
/>
}
onClose={closeModal}
@@ -137,14 +137,14 @@ export default (props) => {
<div className="buttons">
<DownArrowButton
handleClick={showModal(shareWith)}
- label={data.shareWith}
+ label={formData.shareWith}
color={theme.colors.royalBlue}
bgcolor="#fff"
long="true"
/>
<DownArrowButton
handleClick={showModal(expires)}
- label={data.expires}
+ label={formData.expires}
color={theme.colors.royalBlue}
bgcolor="#fff"
long="true"
@@ -152,9 +152,9 @@ export default (props) => {
</div>
<div className="inline">
<RadioGroup
- onChange={handleData("help")}
+ onChange={handleFormData("help")}
options={helpTypes.options}
- value={data.help}
+ value={formData.help}
padding="0"
/>
<span className="error-box">{renderError("help")}</span>
@@ -164,8 +164,8 @@ export default (props) => {
<div className="post-content">
<label>
<StyledInput
- onChange={handleData("title")}
- value={data.title}
+ onChange={handleFormData("title")}
+ value={formData.title}
placeholder="Title"
className="title"
/>
@@ -173,8 +173,8 @@ export default (props) => {
<span className="error-box">{renderError("title")}</span>
<label>
<StyledTextArea
- onChange={handleData("body")}
- value={data.body}
+ onChange={handleFormData("body")}
+ value={formData.body}
placeholder="Write a post."
rows={12}
/>
| 10 |
diff --git a/website/docs/packages/ldp.md b/website/docs/packages/ldp.md @@ -83,7 +83,7 @@ The following service actions are available:
### `ldp.resource.get`
* Get a resource by its URI
-* Accept triples, turtle or JSON-LD (see `@semApps/mime-types` package)
+* Accept triples, turtle or JSON-LD (see `@semapps/mime-types` package)
:::info
Action accessible through the API
@@ -106,7 +106,7 @@ Triples, Turtle or JSON-LD depending on Accept type.
### `ldp.resource.post`
* Create a resource
-* Content-type can be triples, turtle or JSON-LD (see `@semApps/mime-types` package)
+* Content-type can be triples, turtle or JSON-LD (see `@semapps/mime-types` package)
:::info
Action accessible through the API
@@ -129,7 +129,7 @@ POST <serveur>/<container>
### `ldp.resource.patch`
* Partial update of an existing resource. Only the provided predicates will be replaced.
-* Content-type can be triples, turtle or JSON-LD (see `@semApps/mime-types` package)
+* Content-type can be triples, turtle or JSON-LD (see `@semapps/mime-types` package)
:::info
Action accessible through the API
@@ -151,7 +151,7 @@ PATCH <serveur>/<container>/identifier
### `ldp.resource.put`
* Full update of an existing resource
* If some predicates existed but are not provided, they will be deleted.
-* Content-type can be triples, turtle or JSON-LD (see `@semApps/mime-types` package)
+* Content-type can be triples, turtle or JSON-LD (see `@semapps/mime-types` package)
:::info
Action accessible through the API
| 7 |
diff --git a/token-metadata/0xc719d010B63E5bbF2C0551872CD5316ED26AcD83/metadata.json b/token-metadata/0xc719d010B63E5bbF2C0551872CD5316ED26AcD83/metadata.json "symbol": "DIP",
"address": "0xc719d010B63E5bbF2C0551872CD5316ED26AcD83",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0xA9859874e1743A32409f75bB11549892138BBA1E/metadata.json b/token-metadata/0xA9859874e1743A32409f75bB11549892138BBA1E/metadata.json "symbol": "IETH",
"address": "0xA9859874e1743A32409f75bB11549892138BBA1E",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/pages/admin/events/edit.js b/src/pages/admin/events/edit.js @@ -28,7 +28,7 @@ export default class extends Component {
...updatedEvent
}
})
- if (!search.get('id')) {
+ if (!search.get('id') && this.state.event.id) {
search.set('id', this.state.event.id)
}
}
| 1 |
diff --git a/src/cn.js b/src/cn.js srv.listen(0, '127.0.0.1', () => {
const adr = srv.address();
const hp = `${adr.address}:${adr.port}`;
+ let cwd = untildify(x.cwd || process.cwd());
+ if (!x.cwd && (cwd === '/' || cwd === path.dirname(process.execPath))) {
+ cwd = home;
+ }
log(`listening for connections from spawned interpreter on ${hp}`);
log(`spawning interpreter ${JSON.stringify(x.exe)}`);
let args = ['+s', '-q', '-nokbd'];
if (x.args) args.push(...x.args.replace(/\n$/gm, '').split('\n'));
try {
child = cp.spawn(x.exe, args, {
- ...(!!x.cwd && { cwd: untildify(x.cwd) }),
+ cwd,
stdio,
detached: true,
env: {
| 12 |
diff --git a/config/redirects.js b/config/redirects.js @@ -6694,12 +6694,6 @@ const redirects = [
],
to: '/secure/multi-factor-authentication/configure-cisco-duo-for-mfa',
},
- {
- from: [
- '/mfa/webauthn-as-mfa',
- ],
- to: '/secure/multi-factor-authentication/webauthn-as-mfa',
- },
{
from: [
'/mfa/fido-authentication-with-webauthn',
| 2 |
diff --git a/components/hero.js b/components/hero.js @@ -2,6 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import ExploreSearch from './explorer/explore-search'
+import OpenLicenceRibbon from './open-licence-ribbon'
const Hero = ({title, tagline, noscript}) => (
<div className='hero'>
@@ -10,6 +11,7 @@ const Hero = ({title, tagline, noscript}) => (
<h1 className='hero__white-background'>{title}</h1>
<p className='hero__white-background'>{tagline}</p>
<ExploreSearch />
+ <OpenLicenceRibbon />
</div>
<style jsx>{`
.hero {
| 0 |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml @@ -19,9 +19,6 @@ jobs:
- uses: actions/setup-node@master
with:
node-version: 17
- registry-url: https://npm.pkg.github.com/
- scope: '@engine262'
- always-auth: true # required if using yarn
- run: git submodule update --init --recursive
# Run tests and whatnot
| 2 |
diff --git a/util.js b/util.js @@ -999,3 +999,13 @@ export const handleUpload = async item => {
world.appManager.addTrackedApp(u, position, quaternion, oneVector); */
return u;
};
+
+export const loadImage = u => new Promise((resolve, reject) => {
+ const img = new Image();
+ img.onload = () => {
+ resolve(img);
+ };
+ img.onerror = reject;
+ img.crossOrigin = 'Anonymous';
+ img.src = u;
+});
\ No newline at end of file
| 0 |
diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js @@ -1675,10 +1675,7 @@ export default class JingleSessionPC extends JingleSession {
const workFunction = finishCallback => {
const removeSsrcInfo = this.peerconnection.getRemoteSourceInfoByParticipant(id);
- if (!removeSsrcInfo.length) {
- logger.debug(`No remote SSRCs for participant: ${id} found.`);
- finishCallback();
- }
+ if (removeSsrcInfo.length) {
const oldLocalSdp = new SDP(this.peerconnection.localDescription.sdp);
const newRemoteSdp = this._processRemoteRemoveSource(removeSsrcInfo);
@@ -1691,6 +1688,9 @@ export default class JingleSessionPC extends JingleSession {
finishCallback();
})
.catch(err => finishCallback(err));
+ } else {
+ finishCallback();
+ }
};
return new Promise((resolve, reject) => {
| 1 |
diff --git a/css/style.css b/css/style.css @@ -38,6 +38,22 @@ table.dataTable {
flex: auto;
}
+/* wrap toolbar controls */
+.leaflet-top.leaflet-left {
+ bottom: 0;
+ margin-bottom: 10px;
+
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ flex-wrap: wrap;
+}
+
+/* bottom underneath top controls when overlapping */
+.leaflet-bottom {
+ z-index: 999;
+}
+
.navbar {
/* align with leaflet-control */
padding: .5rem 10px;
| 7 |
diff --git a/src/components/AuthCompany/index.js b/src/components/AuthCompany/index.js @@ -43,7 +43,6 @@ const { Option } = Select;
export default class Index extends PureComponent {
constructor(post) {
super(post);
- this.iframe = null;
this.state = {
currStep: this.props.currStep || 0,
loading: false,
@@ -163,17 +162,7 @@ export default class Index extends PureComponent {
}
});
};
- handleSendIframe = () => {
- const { enterprise_alias, enterprise_id, real_name } = this.state;
- this.iframe.onload = () => {
- setTimeout(() => {
- this.iframe.contentWindow.postMessage(
- { enterprise_alias, enterprise_id, real_name },
- '*'
- );
- }, 2000);
- };
- };
+
handleIsCloudAppStoreUrl = url => {
const { dispatch } = this.props;
axios
@@ -186,7 +175,6 @@ export default class Index extends PureComponent {
loading: false,
alertText: false
});
- this.handleSendIframe();
} else {
this.handleNoCloudAppStoreUrl();
}
@@ -321,7 +309,10 @@ export default class Index extends PureComponent {
marketList,
marketUrl,
alertText,
- activeKeyStore
+ activeKeyStore,
+ enterprise_alias,
+ enterprise_id,
+ real_name
} = this.state;
const { getFieldDecorator } = form;
@@ -393,8 +384,8 @@ export default class Index extends PureComponent {
style={{ marginBottom: '16px' }}
/>
<iframe
- ref={node => (this.iframe = node)}
- src={`${marketUrl}/certification/login`}
+ // src={`${marketUrl}/certification/login`}
+ src={`http://0.0.0.0:8090/certification/login?enterprise_alias=${enterprise_alias}&enterprise_id=${enterprise_id}&real_name=${real_name}`}
style={{
width: '100%',
height: '400px'
| 1 |
diff --git a/public/javascripts/TimestampLocalization.js b/public/javascripts/TimestampLocalization.js -// requires moment.js
-
-// on window load, run the changeTimestamps function.
+//changes timestamps from UTC to local time. Updates any data order variables for tables.
$(window).load(function () {
- changeTimestamps();
- //if any html changes, call the changeTimestamps function.
- var observer = new MutationObserver(changeTimestamps);
-
- observer.observe(document, {
- attributes: true,
- childList: true,
- subtree: true,
- characterData: true
- });
-});
-
-//changes anything with the class timestamp from UTC to local time.
-function changeTimestamps(){
$(".timestamp").each(function(){
if($(this).hasClass('local')){
return;
}
$(this).addClass('local');
- var timestampText = this.textContent + " UTC";
- var localDate = moment(new Date(timestampText));
+ var timestampText = this.textContent;
+
+ //add sorting attribute, if it's part of a table it will be sorted by this instead of the nicely formatted timestamp.
+ $(this).attr("data-order", timestampText);
+
+ var localDate = moment(new Date(timestampText + " UTC"));
var format = 'MMMM Do YYYY, h:mm:ss'
if($(this).hasClass('date')){
@@ -35,4 +23,4 @@ function changeTimestamps(){
this.textContent = localDate.format(format);
}
});
-}
\ No newline at end of file
+});
\ No newline at end of file
| 14 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/util/UtilitiesSidewalk.js b/public/javascripts/SVLabel/src/SVLabel/util/UtilitiesSidewalk.js @@ -288,7 +288,7 @@ function UtilitiesMisc (JSON) {
keyNumber: 83,
keyChar: 'S'
},
- labelTags: ['uneven surface', 'unleveled surface', 'cracks', 'narrow']
+ labelTags: ['bumpy', 'unleveled surface', 'cracks', 'narrow', 'hole']
},
Void: {
id: 'Void',
| 3 |
diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js @@ -53,7 +53,7 @@ const defaultProps = {
const ArchivedReportFooter = (props) => {
const archiveReason = lodashGet(props.reportClosedAction, 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
- const policyName = lodashGet(props.policies, `policy_${props.report.policyID}.name`);
+ const policyName = lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`);
let displayName = lodashGet(props.personalDetails, `${props.report.ownerEmail}.displayName`, props.report.ownerEmail);
let oldDisplayName;
| 4 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -5,6 +5,7 @@ metaversfile can load many file types, including javascript.
*/
import * as THREE from 'three';
+import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
import {Text} from 'troika-three-text';
import React from 'react';
import * as ReactThreeFiber from '@react-three/fiber';
@@ -1179,6 +1180,9 @@ export default () => {
useGeometries() {
return geometries;
},
+ useGeometryUtils() {
+ return BufferGeometryUtils;
+ },
useInstancing() {
return instancing;
},
| 0 |
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS # These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
-* @samajammin @ryancreatescopy @jjmstark @GeorgeTrotter @wackerow
+* @samajammin @jjmstark @GeorgeTrotter @wackerow @corwintines @pettinarip
# Owners of specific files
/src/data/eth2-bounty-hunters.csv @lsankar4033 @djrtwo @JustinDrake
| 14 |
diff --git a/assets/js/modules/analytics/components/settings/SettingsView.js b/assets/js/modules/analytics/components/settings/SettingsView.js @@ -144,13 +144,7 @@ export default function SettingsView() {
{ __( 'View', 'google-site-kit' ) }
</h5>
<p className="googlesitekit-settings-module__meta-item-data">
- <DisplaySetting value={ profileID } />
- </p>
- </div>
- <div className="googlesitekit-settings-module__meta-item">
- <h5 className="googlesitekit-settings-module__meta-item-type">
-
- </h5>
+ <DisplaySetting value={ profileID } />{ ' ' }
<Link
href={ editViewSettingsURL }
external
@@ -166,6 +160,7 @@ export default function SettingsView() {
}
) }
</Link>
+ </p>
</div>
</div>
{ isGA4Enabled &&
@@ -212,13 +207,7 @@ export default function SettingsView() {
) }
</h5>
<p className="googlesitekit-settings-module__meta-item-data">
- <DisplaySetting value={ ga4MeasurementID } />
- </p>
- </div>
- <div className="googlesitekit-settings-module__meta-item">
- <h5 className="googlesitekit-settings-module__meta-item-type">
-
- </h5>
+ <DisplaySetting value={ ga4MeasurementID } />{ ' ' }
<Link
href={ editViewSettingsGA4URL }
external
@@ -234,6 +223,7 @@ export default function SettingsView() {
}
) }
</Link>
+ </p>
</div>
</div>
) }
| 5 |
diff --git a/buildspec.yml b/buildspec.yml @@ -9,7 +9,7 @@ phases:
- npm install forever -g
- git submodule init
- git submodule update
- - npm install -y
+ - npm install -y --verbose
pre_build:
commands:
- REPOSITORY_URI=907263135169.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/ecrrepository-app-$AWS_DEFAULT_REGION
| 0 |
diff --git a/assets/js/modules/tagmanager/setup.js b/assets/js/modules/tagmanager/setup.js @@ -235,25 +235,26 @@ class TagmanagerSetup extends Component {
const {
selectedAccount,
selectedContainer,
+ usageContext,
} = this.state;
const { finishSetup } = this.props;
+ const containerKey = usageContext === 'amp' ? 'ampContainerID' : 'containerID';
try {
- const optionData = {
+ const dataParams = {
accountID: selectedAccount,
- containerID: selectedContainer,
+ [ containerKey ]: selectedContainer,
+ usageContext,
};
- const responseData = await data.set( TYPE_MODULES, 'tagmanager', 'settings', optionData );
+ const savedSettings = await data.set( TYPE_MODULES, 'tagmanager', 'settings', dataParams );
+
if ( finishSetup ) {
finishSetup();
}
- googlesitekit.modules.tagmanager.settings = {
- accountID: responseData.accountId, // Capitalization rule exception: `accountId` is a property of an API returned value.
- containerID: responseData.containerId, // Capitalization rule exception: `containerId` is a property of an API returned value.
- };
+ googlesitekit.modules.tagmanager.settings = savedSettings;
if ( this._isMounted ) {
this.setState( {
| 3 |
diff --git a/packages/yoroi-extension/app/containers/wallet/NFTDetailPageRevamp.js b/packages/yoroi-extension/app/containers/wallet/NFTDetailPageRevamp.js @@ -64,7 +64,13 @@ class NFTDetailPageRevamp extends Component<AllProps> {
id: getTokenIdentifierIfExists(token.info) ?? '-',
amount: genFormatTokenAmount(getTokenInfo)(token.entry),
// $FlowFixMe[prop-missing]
- nftMetadata: token.info.Metadata.assetMintMetadata?.[0]['721'][policyId][name],
+ nftMetadata: token.info.Metadata.assetMintMetadata
+ && token.info.Metadata.assetMintMetadata.length > 0
+ && token.info.Metadata.assetMintMetadata[0]['721']
+ && token.info.Metadata.assetMintMetadata[0]['721'][policyId]
+ && token.info.Metadata.assetMintMetadata[0]['721'][policyId][name]
+ ? token.info.Metadata.assetMintMetadata[0]['721'][policyId][name]
+ : undefined,
};
})
.map(item => ({
| 9 |
diff --git a/articles/design/creating-invite-only-applications.md b/articles/design/creating-invite-only-applications.md @@ -46,7 +46,7 @@ Since this application needs to access the [Management API](/api/v2), you'll nee
* Use the **down arrow** to open up the scopes selection area. Select the following scopes: `read:users`, `update:users`, `delete:users`, `create:users`, and `create:user_tickets`.
* Click **Update**.
-
+
### Import Users
| 1 |
diff --git a/minimap.js b/minimap.js @@ -22,7 +22,6 @@ const localMatrix = new THREE.Matrix4();
const cameraHeight = 50;
// XXX TODO:
-// add center reticle
// add compass border circle
// add compass north
// render at mose once per frame
@@ -31,13 +30,15 @@ const cameraHeight = 50;
const vertexShader = `\
varying vec2 vUv;
+ varying vec3 vPosition;
void main() {
vUv = uv;
+ vPosition = position;
gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
}
`;
-const fragmentShader = `\
+const floorFragmentShader = `\
// uniform float iTime;
// uniform int iFrame;
uniform sampler2D uTex;
@@ -47,14 +48,35 @@ const fragmentShader = `\
vec4 c = texture2D(uTex, fragCoord);
fragColor = c;
fragColor.a = 1.;
- // fragColor.bg = vUv;
- // fragColor.rgb = vec3(1., 0., 0.);
}
void main() {
mainImage(gl_FragColor, vUv);
}
`;
+const reticleFragmentShader = `\
+ // uniform float iTime;
+ // uniform int iFrame;
+ uniform sampler2D uTex;
+ varying vec2 vUv;
+ varying vec3 vPosition;
+
+ #define PI 3.1415926535897932384626433832795
+
+ void main() {
+ float angle = (PI/4. + atan(vPosition.x, -vPosition.z)) / (PI/2.);
+ float l = length(vPosition);
+ // angle *= length(vPosition);
+ // angle = min(angle, 1. - angle);
+ float angleDistanceToEdge = min(angle, 1. - angle);
+ angleDistanceToEdge *= l;
+ gl_FragColor.a = 1.;
+ gl_FragColor.r = angle;
+ if (angleDistanceToEdge <= 0.04 || l >= 0.95) {
+ gl_FragColor.rgb = vec3(1.);
+ }
+ }
+`;
const _makeMapRenderTarget = (w, h) => new THREE.WebGLRenderTarget(w, h, {
minFilter: THREE.LinearFilter,
@@ -68,7 +90,7 @@ const _makeScene = (renderTarget, worldWidth, worldHeight) => {
const scene = new THREE.Scene();
// full screen quad mesh
- const mesh = new THREE.Mesh(
+ const floorMesh = new THREE.Mesh(
new THREE.PlaneBufferGeometry(worldWidth, worldHeight)
.applyMatrix4(new THREE.Matrix4().makeRotationX(-Math.PI / 2)),
new THREE.ShaderMaterial({
@@ -79,13 +101,35 @@ const _makeScene = (renderTarget, worldWidth, worldHeight) => {
},
},
vertexShader,
- fragmentShader,
+ fragmentShader: floorFragmentShader,
depthTest: false,
}),
);
- mesh.frustumCulled = false;
- scene.mesh = mesh;
- scene.add(mesh);
+ floorMesh.frustumCulled = false;
+ scene.add(floorMesh);
+ scene.floorMesh = floorMesh;
+
+ const reticleWidth = worldWidth/6;
+ // const reticleHeight = worldHeight/10;
+ const reticleMesh = new THREE.Mesh(
+ new THREE.CircleGeometry(1, 4, Math.PI/2/2, Math.PI/2)
+ // .applyMatrix4(new THREE.Matrix4().makeTranslation(0, reticleWidth/2, 0))
+ .applyMatrix4(new THREE.Matrix4().makeRotationX(-Math.PI / 2)),
+ new THREE.ShaderMaterial({
+ uniforms: {
+ uTex: {
+ value: renderTarget.texture,
+ needsUpdate: true,
+ },
+ },
+ vertexShader,
+ fragmentShader: reticleFragmentShader,
+ })
+ );
+ reticleMesh.scale.setScalar(reticleWidth);
+ reticleMesh.frustumCulled = false;
+ scene.add(reticleMesh);
+ scene.reticleMesh = reticleMesh;
return scene;
};
@@ -199,8 +243,8 @@ class MiniMap {
}
}
- this.scene.mesh.position.set(baseX * this.worldWidthD3, 0, baseY * this.worldHeightD3);
- this.scene.mesh.updateMatrixWorld();
+ this.scene.floorMesh.position.set(baseX * this.worldWidthD3, 0, baseY * this.worldHeightD3);
+ this.scene.floorMesh.updateMatrixWorld();
this.lastBase.set(baseX, baseY);
this.lastWorldEpoch = this.worldEpoch;
@@ -209,6 +253,10 @@ class MiniMap {
_updateTiles();
const _renderMiniMap = () => {
+ this.scene.reticleMesh.position.set(localPlayer.position.x, cameraHeight - 1, localPlayer.position.z);
+ this.scene.reticleMesh.quaternion.copy(localPlayer.quaternion);
+ this.scene.reticleMesh.updateMatrixWorld();
+
renderer.setRenderTarget(oldRenderTarget);
renderer.setViewport(0, 0, this.width, this.height);
renderer.clear();
| 0 |
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-toggle/sprk-toggle.component.spec.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-toggle/sprk-toggle.component.spec.ts @@ -49,7 +49,7 @@ describe('SparkToggleComponent', () => {
).toEqual('sprk-c-Icon sprk-u-mrs sprk-c-Icon--toggle sprk-c-Icon--open');
});
- it('should add icon classes to icon when toggle is opened and then closed', () => {
+ it('should add icon classes to icon when the toggle is opened and then closed', () => {
component.title = 'placeholder';
element.querySelector('a').click();
element.querySelector('a').click();
| 3 |
diff --git a/guide/english/developer-tools/puppet/index.md b/guide/english/developer-tools/puppet/index.md @@ -5,9 +5,9 @@ title: Puppet
Puppet is a configuration management tool that allows you to automate the configuration and management of your infrastructure. This helps you save time by automating repetitive tasks and ensuring your systems are kept in a desired state.
-Puppet is just designed to manage the configuration of Unix-like and Microsoft Windows systems declaratively.
+Puppet is designed to manage the configuration of Unix-like and Microsoft Windows systems *declaratively*.
-Puppet comes in two varieties, Puppet Enterprise and open source Puppet. The supported platforms include most Linux distributions, various UNIX platforms, and Windows.
+Puppet comes in two varieties: Puppet Enterprise and open source Puppet. The supported platforms include most Linux distributions, various UNIX platforms, and Windows.
Puppet was developed by [Puppet Labs](https://puppet.com/company).
| 14 |
diff --git a/src/components/utils/ObjectUtils.js b/src/components/utils/ObjectUtils.js export default class ObjectUtils {
static equals(obj1, obj2, field) {
- if(field)
+ if(field && obj1 && typeof obj1 === 'object' && obj2 && typeof obj2 === 'object')
return (this.resolveFieldData(obj1, field) === this.resolveFieldData(obj2, field));
else
return this.deepEquals(obj1, obj2);
| 7 |
diff --git a/src/js/controllers/buy-bitcoin/amount.controller.js b/src/js/controllers/buy-bitcoin/amount.controller.js $ionicHistory,
$log,
moonPayService,
- onGoingService,
+ ongoingProcess,
popupService,
profileService,
$scope
return;
}
- onGoingService.set('buyingBch', true);
+ ongoingProcess.set('buyingBch', true);
// TODO: Create transaction
var transaction = {};
moonPayService.createTransaction(transaction).then(
function onCreateTransactionSuccess(newTransaction) {
- onGoingService.set('buyingBch', false);
+ ongoingProcess.set('buyingBch', false);
// TODO: Redirect to success screen
},
function onCreateTransactionError(err) {
- onGoingService.set('buyingBch', false);
+ ongoingProcess.set('buyingBch', false);
title = gettextCatalog.getString('Purchase Failed');
message = err.message || gettextCatalog.getString('Failed to create transaction.');
| 1 |
diff --git a/docs/source/spacing.md b/docs/source/spacing.md @@ -5,6 +5,14 @@ title: "Spacing"
# Spacing
+<div class="subnav">
+ <a class="subnav-link" href="#usage">Usage</a>
+ <a class="subnav-link" href="#customizing">Customizing</a>
+ <a class="subnav-link" href="#responsive">Responsive</a>
+</div>
+
+<h2 id="usage">Using</h2>
+
The syntax below is combined to create a system for padding and margins. For example, `.pt-2` would add padding to the top of the element to the value of `0.5rem` and `.mx-0` would make the horizontal margin zero.
<div class="flex flex-top mt-8 text-sm">
@@ -35,21 +43,60 @@ The syntax below is combined to create a system for padding and margins. For exa
</div>
</div>
-## Responsive
+<h2 id="customizing">Customizing the spacing scale</h2>
-The spacing utitlies can also be used with <a href="/responsive">responsive</a> prefixes:
+You can customize the margin and padding utilities using the `@sizing-scale` variable. Please note that the entire scale must be redefined. It's not possible to add a new value to the existing scale.
-```html
-<!-- Using the utilities in HTML: -->
+```less
+// The default sizing scale
+@sizing-scale:
+ '1' 0.25rem,
+ '2' 0.5rem,
+ '3' 0.75rem,
+ '4' 1rem,
+ '6' 1.5rem,
+ '8' 2rem,
+ '12' 3rem,
+ '16' 4rem,
+;
+```
+
+By default the `@sizing-scale` is automatically applied to the margin, negative margin (pull) and padding scales. However, it's possible to customize each scale individually using the `@margin-scale`, `@pull-scale` and `@padding-scale` variables.
+
+```less
+// Override the margin scale
+@margin-scale:
+ '1' 0.25rem,
+ '2' 0.5rem,
+ // ...
+;
+
+// Override the pull scale
+@pull-scale:
+ '1' 0.25rem,
+ '2' 0.5rem,
+ // ...
+;
+
+// Override the padding scale
+@padding-scale:
+ '1' 0.25rem,
+ '2' 0.5rem,
+ // ...
+;
+```
+<h2 id="responsive">Responsive spacing utilities</h2>
+
+The spacing utilities can also be used with <a href="/responsive">responsive</a> prefixes:
+
+```html
<div class="p-1 sm:p-2 md:p-3 lg:p-4"></div>
<div class="m-1 sm:m-2 md:m-3 lg:m-4"></div>
<div class="pull-1 sm:pull-2 md:pull-3 lg:pull-4"></div>
```
```less
-// Using the utilities in Less:
-
div {
.screen(lg, {
.mt-6;
| 7 |
diff --git a/bot/src/discord_commands/quiz.js b/bot/src/discord_commands/quiz.js @@ -1526,7 +1526,7 @@ module.exports = {
const commandTokens = cleanSuffixFontArgsParsed.split(' ').filter(x => x);
if (commandTokens[0] === 'search') {
- return doSearch(msg, monochrome, commandTokens[1]);
+ return doSearch(msg, monochrome, commandTokens.slice(1).join(' '));
}
let { remainingTokens: remainingTokens1, gameModes } = consumeGameModeTokens(commandTokens, msg.extension);
| 11 |
diff --git a/src/algorithms/utils/jestExtensions.ts b/src/algorithms/utils/jestExtensions.ts @@ -3,7 +3,7 @@ import * as fs from 'fs'
import { MatcherState } from 'expect'
const { utils } = require('jest-snapshot')
-/* Interface derived from https://github.com/facebook/jest/blob/4a59daa8715bde6a1b085ff7f4140f3a337045aa/packages/jest-snapshot/src/State.ts#L54
+/* This interface is made to match https://github.com/facebook/jest/blob/4a59daa8715bde6a1b085ff7f4140f3a337045aa/packages/jest-snapshot/src/State.ts#L54
*/
interface SnapshotState {
_counters: Map<string, number>
@@ -18,7 +18,7 @@ interface SnapshotState {
matched: number
}
-/* Context derived from https://github.com/facebook/jest/blob/4a59daa8715bde6a1b085ff7f4140f3a337045aa/packages/jest-snapshot/src/types.ts#L11
+/* This interface is made to match https://github.com/facebook/jest/blob/4a59daa8715bde6a1b085ff7f4140f3a337045aa/packages/jest-snapshot/src/types.ts#L11
*/
interface Context extends MatcherState {
snapshotState: SnapshotState
@@ -40,7 +40,7 @@ function getExpectedSnapshot(state: SnapshotState, key: string) {
const data = state._snapshotData[key]
if (!data) {
- return []
+ return undefined
}
try {
@@ -50,14 +50,14 @@ function getExpectedSnapshot(state: SnapshotState, key: string) {
}
}
-function toBeCloseToArraySnapshot(this: Context, received: number[]) {
- const { testName, state, count, key } = extractContext(this)
-
- /* If this isn't done, Jest reports the test as 'obsolete' and prompts for deletion. */
- state.markSnapshotsAsCheckedForTest(testName)
-
- const expected = getExpectedSnapshot(state, key)
- const tolerance = 10 ** -2 / 2
+function compare(
+ expected: number[],
+ received: number[],
+ tolerance: number,
+): { pass: boolean; diffs?: { want: number; got: number; diff: number }[] } {
+ if (expected === undefined) {
+ return { pass: false }
+ }
const diffs = received.map((_, idx) => {
const want = expected[idx]
@@ -67,10 +67,27 @@ function toBeCloseToArraySnapshot(this: Context, received: number[]) {
})
const pass = diffs.filter(({ diff }) => diff >= tolerance).length === 0
+
+ return { pass, diffs }
+}
+
+function toBeCloseToArraySnapshot(this: Context, received: number[]) {
+ const { testName, state, count, key } = extractContext(this)
+
+ /* If this isn't done, Jest reports the test as 'obsolete' and prompts for deletion. */
+ state.markSnapshotsAsCheckedForTest(testName)
+
+ const expected = getExpectedSnapshot(state, key)
+
const hasSnapshot = expected !== undefined
- const snapshotIsPersisted = fs.existsSync(state._snapshotPath)
+
+ const tolerance = 10 ** -2 / 2
+ const { pass, diffs } = compare(expected, received, tolerance)
+
const receivedSerialized = JSON.stringify(received, null, 2)
+ const snapshotIsPersisted = fs.existsSync(state._snapshotPath)
+
if (pass) {
/* Test passed, now update the snapshot state with the serialize snapshot.
* Technically this is only necessary if no snapshot was saved before. */
| 12 |
diff --git a/.gitmodules b/.gitmodules path = thronesdb-json-data
url = https://github.com/Alsciende/thronesdb-json-data.git
-[submodule "card-data"]
- path = card-data
- url = https://github.com/gryffon/card-data.git
\ No newline at end of file
| 13 |
diff --git a/src/reducers/ledger/index.js b/src/reducers/ledger/index.js @@ -55,14 +55,16 @@ const ledgerActions = handleActions({
: {}
}
},
- [addLedgerAccountId]: (state, { error, ready, meta }) => {
+ [addLedgerAccountId]: (state, { error, ready, meta, payload }) => {
return {
...state,
signInWithLedgerStatus: 'confirm-accounts',
signInWithLedger: {
...state.signInWithLedger,
[meta.accountId]: {
- status: error ? 'error' : (ready ? 'success' : 'confirm')
+ status: error
+ ? payload.type === 'RequiresFullAccess' ? 'error' : 'rejected'
+ : (ready ? 'success' : 'confirm')
}
}
}
| 9 |
diff --git a/src/config/supportedRuntimes.js b/src/config/supportedRuntimes.js @@ -25,9 +25,10 @@ export const supportedNodejs = new Set([
// deprecated, but still working
'nodejs4.3',
'nodejs6.10',
- // supported
'nodejs8.10',
+ // supported
'nodejs10.x',
+ 'nodejs12.x',
])
// PROVIDED
| 0 |
diff --git a/src/plots/cartesian/axis_autotype.js b/src/plots/cartesian/axis_autotype.js @@ -15,7 +15,10 @@ var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;
module.exports = function autoType(array, calendar, opts) {
+ if(Lib.isArrayOrTypedArray(array) && !array.length) return '-';
if(!opts.noMultiCategory && multiCategory(array)) return 'multicategory';
+
+ if(Lib.isArrayOrTypedArray(array[0])) return '-';
if(moreDates(array, calendar)) return 'date';
var convertNumeric = opts.autotypenumbers !== 'strict'; // compare against strict, just in case autotypenumbers was not provided in opts
@@ -49,7 +52,6 @@ function linearOK(a, convertNumeric) {
// as with categories, consider DISTINCT values only.
function moreDates(a, calendar) {
var len = a.length;
- if(!len) return false;
var inc = getIncrement(len);
var dats = 0;
@@ -79,7 +81,6 @@ function getIncrement(len) {
// require twice as many DISTINCT categories as distinct numbers
function category(a, convertNumeric) {
var len = a.length;
- if(!len) return false;
var inc = getIncrement(len);
var nums = 0;
| 0 |
diff --git a/src/lib/substituteTailwindUtilitiesAtRules.js b/src/lib/substituteTailwindUtilitiesAtRules.js -import _ from 'lodash'
import postcss from 'postcss'
import applyClassPrefix from '../util/applyClassPrefix'
import generateModules from '../util/generateModules'
@@ -16,7 +15,7 @@ export default function(config) {
const utilities = generateModules(utilityModules, unwrappedConfig.modules, unwrappedConfig)
- if (_.get(unwrappedConfig, 'options.important', false)) {
+ if (unwrappedConfig.options.important) {
utilities.walkDecls(decl => (decl.important = true))
}
@@ -24,7 +23,7 @@ export default function(config) {
nodes: [...container(unwrappedConfig), ...utilities.nodes],
})
- applyClassPrefix(tailwindClasses, _.get(unwrappedConfig, 'options.prefix', ''))
+ applyClassPrefix(tailwindClasses, unwrappedConfig.options.prefix)
atRule.before(tailwindClasses)
atRule.remove()
| 2 |
diff --git a/token-metadata/0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e/metadata.json b/token-metadata/0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e/metadata.json "symbol": "YFI",
"address": "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/views/main.scala.html b/app/views/main.scala.html <script src='@routes.Assets.at("javascripts/lib/leaflet-omnivore.min.js")'></script>
<script src='@routes.Assets.at("javascripts/lib/js.cookie.js")'></script>
<script type="text/javascript"
- src="https://maps.googleapis.com/maps/api/js?v=3.31&key=AIzaSyB0ToxwyHzvubTo9gm0zbtECWuEe3yYo8M&libraries=geometry">
+ src="https://maps.googleapis.com/maps/api/js?v=quarterly&key=AIzaSyB0ToxwyHzvubTo9gm0zbtECWuEe3yYo8M&libraries=geometry">
</script>
<link href='@routes.Assets.at("stylesheets/fonts.css")' rel="stylesheet"/>
<link href='@routes.Assets.at("stylesheets/mapbox.css")' rel='stylesheet' />
| 3 |
diff --git a/geoq/settings.py b/geoq/settings.py @@ -37,7 +37,7 @@ DATABASES = {
# The following settings are not used with sqlite3:
'USER': 'geoq',
'PASSWORD': 'geoq',
- 'HOST': '127.0.0.1', # Empty for local through domain sockets or '127.0.0.1' for local through TCP.
+ 'HOST': 'db', # Empty for local through domain sockets or '127.0.0.1' for local through TCP.
'PORT': '5432', # Set to empty string for default.
}
}
@@ -80,7 +80,7 @@ MEDIA_URL = '/images/'
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/var/www/example.com/static/"
STATIC_URL_FOLDER = '' # Can be set to something like 'geoq-test/' if the app is not run at root level
-STATIC_ROOT = '{0}{1}'.format('/home/omorrissey/www/static/', STATIC_URL_FOLDER)
+STATIC_ROOT = '{0}{1}'.format('/var/www/static/', STATIC_URL_FOLDER)
# URL prefix for static files.
# Example: "http://example.com/static/", "http://static.example.com/"
| 13 |
diff --git a/runtime.js b/runtime.js @@ -945,6 +945,23 @@ const _loadIframe = async (file, opts) => {
return object2;
};
+const _loadAudio = async (file, opts) => {
+ let srcUrl = file.url || URL.createObjectURL(file);
+
+ const audio = document.createElement('audio');
+ audio.src = srcUrl;
+ audio.loop = true;
+
+ const object = new THREE.Object3D();
+ object.run = () => {
+ audio.play();
+ };
+ object.destroy = () => {
+ audio.pause();
+ };
+ return object;
+};
+
const _loadGeo = async (file, opts) => {
const object = geometryTool.makeShapeMesh();
return object;
@@ -989,7 +1006,7 @@ runtime.loadFile = async (file, opts) => {
return await _loadGeo(file, opts);
}
case 'mp3': {
- throw new Error('audio not implemented');
+ return await _loadAudio(file, opts);
}
case 'video': {
throw new Error('video not implemented');
| 0 |
diff --git a/core/server/data/importer/import-manager.js b/core/server/data/importer/import-manager.js @@ -7,7 +7,7 @@ const glob = require('glob');
const uuid = require('uuid');
const {extract} = require('@tryghost/zip');
const {pipeline, sequence} = require('@tryghost/promise');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const logging = require('@tryghost/logging');
const errors = require('@tryghost/errors');
const ImageHandler = require('./handlers/image');
@@ -23,6 +23,18 @@ const ROOT_OR_SINGLE_DIR = 1;
const ALL_DIRS = 2;
let defaults;
+const messages = {
+ couldNotCleanUpFile: {
+ error: 'Import could not clean up file ',
+ context: 'Your site will continue to work as expected'
+ },
+ unsupportedRoonExport: 'Your zip file looks like an old format Roon export, please re-export your Roon blog and try again.',
+ noContentToImport: 'Zip did not include any content to import.',
+ invalidZipStructure: 'Invalid zip file structure.',
+ invalidZipFileBaseDirectory: 'Invalid zip file: base directory read failed',
+ zipContainsMultipleDataFormats: 'Zip file contains multiple data formats. Please split up and import separately.'
+};
+
defaults = {
extensions: ['.zip'],
contentTypes: ['application/zip', 'application/x-zip-compressed'],
@@ -113,8 +125,8 @@ class ImportManager {
if (err) {
logging.error(new errors.GhostError({
err: err,
- context: i18n.t('errors.data.importer.index.couldNotCleanUpFile.error'),
- help: i18n.t('errors.data.importer.index.couldNotCleanUpFile.context')
+ context: tpl(messages.couldNotCleanUpFile.error),
+ help: tpl(messages.couldNotCleanUpFile.context)
}));
}
@@ -155,7 +167,7 @@ class ImportManager {
// This is a temporary extra message for the old format roon export which doesn't work with Ghost
if (oldRoonMatches.length > 0) {
- throw new errors.UnsupportedMediaTypeError({message: i18n.t('errors.data.importer.index.unsupportedRoonExport')});
+ throw new errors.UnsupportedMediaTypeError({message: tpl(messages.unsupportedRoonExport)});
}
// If this folder contains importable files or a content or images directory
@@ -164,10 +176,10 @@ class ImportManager {
}
if (extMatchesAll.length < 1) {
- throw new errors.UnsupportedMediaTypeError({message: i18n.t('errors.data.importer.index.noContentToImport')});
+ throw new errors.UnsupportedMediaTypeError({message: tpl(messages.noContentToImport)});
}
- throw new errors.UnsupportedMediaTypeError({message: i18n.t('errors.data.importer.index.invalidZipStructure')});
+ throw new errors.UnsupportedMediaTypeError({message: tpl(messages.invalidZipStructure)});
}
/**
@@ -219,7 +231,7 @@ class ImportManager {
this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory}
);
if (extMatchesAll.length < 1 || extMatchesAll[0].split('/') < 1) {
- throw new errors.ValidationError({message: i18n.t('errors.data.importer.index.invalidZipFileBaseDirectory')});
+ throw new errors.ValidationError({message: tpl(messages.invalidZipFileBaseDirectory)});
}
return extMatchesAll[0].split('/')[0];
@@ -249,7 +261,7 @@ class ImportManager {
if (Object.prototype.hasOwnProperty.call(importData, handler.type)) {
// This limitation is here to reduce the complexity of the importer for now
return Promise.reject(new errors.UnsupportedMediaTypeError({
- message: i18n.t('errors.data.importer.index.zipContainsMultipleDataFormats')
+ message: tpl(messages.zipContainsMultipleDataFormats)
}));
}
@@ -266,7 +278,7 @@ class ImportManager {
if (ops.length === 0) {
return Promise.reject(new errors.UnsupportedMediaTypeError({
- message: i18n.t('errors.data.importer.index.noContentToImport')
+ message: tpl(messages.noContentToImport)
}));
}
| 14 |
diff --git a/src/utils/innerSliderUtils.js b/src/utils/innerSliderUtils.js @@ -316,7 +316,7 @@ export const keyHandler = (e, accessibility, rtl) => {
};
export const swipeStart = (e, swipe, draggable) => {
- e.target.tagName === "IMG" && e.preventDefault();
+ e.target.tagName === "IMG";
if (!swipe || (!draggable && e.type.indexOf("mouse") !== -1)) return "";
return {
dragging: true,
@@ -352,7 +352,6 @@ export const swipeMove = (e, spec) => {
listWidth
} = spec;
if (scrolling) return;
- if (animating) return e.preventDefault();
if (vertical && swipeToSlide && verticalSwiping) e.preventDefault();
let swipeLeft,
state = {};
@@ -421,7 +420,6 @@ export const swipeMove = (e, spec) => {
}
if (touchObject.swipeLength > 10) {
state["swiping"] = true;
- e.preventDefault();
}
return state;
};
| 2 |
diff --git a/src/styles/styles.js b/src/styles/styles.js @@ -342,7 +342,7 @@ const styles = {
button: {
backgroundColor: themeColors.buttonDefaultBG,
- borderRadius: variables.componentBorderRadiusNormal,
+ borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeLarge,
justifyContent: 'center',
...spacing.ph3,
@@ -361,12 +361,11 @@ const styles = {
},
buttonSmall: {
- borderRadius: variables.componentBorderRadiusNormal,
+ borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeSmall,
paddingTop: 6,
- paddingRight: 10,
+ paddingHorizontal: 14,
paddingBottom: 6,
- paddingLeft: 10,
backgroundColor: themeColors.buttonDefaultBG,
},
| 4 |
diff --git a/blocks/datatypes.js b/blocks/datatypes.js @@ -41,8 +41,6 @@ Blockly.Blocks['defined_datatype_typed'] = {
this.constructId_ = ctrId;
this.itemCount_ = 2;
this.disableTransfer_ = true;
- /** @type {!Object<!string, string|null>} */
- this.lastTypeCtor_ = {'CTR0': null, 'CTR1': null};
},
typeExprReplaced() {
@@ -54,8 +52,20 @@ Blockly.Blocks['defined_datatype_typed'] = {
},
getTypeCtorDef: function(fieldName) {
- return fieldName in this.lastTypeCtor_ ?
- this.lastTypeCtor_[fieldName] : null;
+ if (!fieldName.startsWith('CTR')) {
+ return undefined;
+ }
+ var n = parseInt(fieldName.substring(3));
+ if (isNaN(n) || this.itemCount_ <= n) {
+ return undefined;
+ }
+ var inputName = 'CTR_INP' + n;
+ var block = this.getInputTargetBlock(inputName);
+ if (!block) {
+ return null;
+ }
+ var typeCtor = block.getTypeCtor();
+ return typeCtor;
},
getTypeScheme(fieldName) {
@@ -67,24 +77,6 @@ Blockly.Blocks['defined_datatype_typed'] = {
}
}
return null;
- },
-
- infer: function(ctx) {
- for (var x = 0; x < this.itemCount_; x++) {
- var inputName = 'CTR_INP' + x;
- var block = this.getInputTargetBlock(inputName);
- if (!block) {
- this.lastTypeCtor_['CTR' + x] = null;
- continue;
- }
- var outType = block.outputConnection &&
- block.outputConnection.typeExpr;
- goog.asserts.assert(!!outType);
- outType.unify(new Blockly.TypeExpr.TYPE_CONSTRUCTOR);
-
- var typeCtor = block.getTypeCtor();
- this.lastTypeCtor_['CTR' + x] = typeCtor;
- }
}
};
| 1 |
diff --git a/docs/docker.md b/docs/docker.md @@ -6,16 +6,20 @@ In your docker installation's configuration, increase the amount of active memor
## Build Parsr
-Inside the root directory of the project, launch:
+At the root of the project, launch:
-`docker-compose build`
+ ```
+ docker-compose build
+ ```
This will build Parsr, along with its dependencies.
## Run Parsr
-- In the root of the repository, execute:
+In the root of the repository, launch:
-`docker-compose up`
+ ```
+ docker-compose up
+ ```
Note: A docker volume will be created at first launch so that the data will be kept at containers restart.
| 3 |
diff --git a/ui/util/remark-lbry.js b/ui/util/remark-lbry.js @@ -7,9 +7,9 @@ export const punctuationMarks = [',', '.', '!', '?', ':', ';', '-', ']', ')', '}
const mentionToken = '@';
// const mentionTokenCode = 64; // @
-const mentionRegex = /@[^\s()"]*/gm;
const invalidRegex = /[-_.+=?!@#$%^&*:;,{}<>\w/\\]/;
+const mentionRegex = /@[^\s()"-_.+=?!@$%^&*;,{}<>/\\]*/gm;
function handlePunctuation(value) {
const modifierIndex =
| 7 |
diff --git a/lib/shared/addon/components/cru-private-registry/component.js b/lib/shared/addon/components/cru-private-registry/component.js @@ -38,8 +38,8 @@ export default Component.extend({
},
actions: {
- addRegistry() {
- this.addRegistry(set(this, 'privateRegistry', this.newPrivateRegistry()));
+ addRegistry(isDefault = true) {
+ this.addRegistry(set(this, 'privateRegistry', this.newPrivateRegistry('privateRegistry', isDefault)));
},
removeRegistry(registry) {
| 12 |
diff --git a/magda-int-test/src/test/scala/au/csiro/data61/magda/api/DataSetSearchSpec.scala b/magda-int-test/src/test/scala/au/csiro/data61/magda/api/DataSetSearchSpec.scala @@ -669,7 +669,7 @@ class DataSetSearchSpec extends BaseSearchApiSpec with RegistryConverters {
}
}
- it("inexact") {
+ ignore("inexact") {
def dataSetToQuery(dataSet: DataSet): Gen[Query] = {
val formats = dataSet.distributions
.map(_.format.map(Specified.apply).flatMap(x => x)).flatten
@@ -768,7 +768,7 @@ class DataSetSearchSpec extends BaseSearchApiSpec with RegistryConverters {
}
}
- it("inexact") {
+ ignore("inexact") {
def dataSetToQuery(dataSet: DataSet): Gen[Query] = {
val publisher = dataSet.publisher.flatMap(_.name)
| 8 |
diff --git a/token-metadata/0x0D8775F648430679A709E98d2b0Cb6250d2887EF/metadata.json b/token-metadata/0x0D8775F648430679A709E98d2b0Cb6250d2887EF/metadata.json "symbol": "BAT",
"address": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/index.js b/src/index.js @@ -436,6 +436,10 @@ class Offline {
debugLog(funName, 'runtime', serviceRuntime);
this.serverlessLog(`Routes for ${funName}:`);
+ if (!fun.events) {
+ fun.events = [];
+ }
+
// Add proxy for lamda invoke
fun.events.push({
http: {
| 1 |
diff --git a/.eslintrc.json b/.eslintrc.json "no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
- "no-implicit-coercion": "error",
+ "no-implicit-coercion": [
+ "error",
+ {
+ "allow": ["!!"]
+ }
+ ],
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-inline-comments": "off",
| 11 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -12,9 +12,20 @@ Please add your entries in this format:
In the current stage we aim to release a new version at least every month.
-### next
+## 2.1.0
-Will be planned after 2.0 is announced and settled.
+- @uppy/aws-s3: fix 'send' XMLHttpRequest (#3130 / @jhen0409)
+- @uppy/aws-s3, @uppy/thumbnail-generator, @uppy/xhr-upload: fix `i18n` (#3142 / @jhen0409 / @aduh95)
+- @uppy/react: fix `DashboardModal`'s `target` type (#3110 / @Murderlon)
+- @uppy/xhr-upload: add types for methods (#3154 / @BePo65)
+- @uppy/core: improve accuracy/compatibility of success/error callback types (#3141 / @Hawxy)
+- @uppy/vue: add Vue FileInput component (#3125 / @valentinoli)
+
+## 2.0.2
+
+- @uppy/aws-s3-multipart: fix route ordering and query parameters (#3132 / @rossng)
+- @uppy/core: add types overload for `off` method (#3137 / @Hawxy)
+- @uppy/golden-retriever: handle promise rejections (#3131 / @Murderlon)
## 2.0.1
@@ -22,7 +33,7 @@ Released: 2021-09-25
- Update peerDependencies to ^2.0.0 in all uppy packages @arturi (b39824819)
-## 2.0
+## 2.0.0
Released: 2021-09-24
| 0 |
diff --git a/runtime/helpers.js b/runtime/helpers.js @@ -74,11 +74,9 @@ export function _url(context, route) {
// let dir = context.path.replace(/[^\/]+$/, '')
let dir = context.path
// traverse through parents if needed
- const traverse = path.match(/\.\.\//g)
- if (traverse)
- for (let i = 1; i <= traverse.length; i++) {
- dir = dir.replace(/\/[^\/]+\/?$/, '')
- }
+ const traverse = path.match(/\.\.\//g) || []
+ traverse.forEach(() => { dir = dir.replace(/\/[^\/]+\/?$/, '') })
+
// strip leading periods and slashes
path = path.replace(/^[\.\/]+/, '')
| 7 |
diff --git a/index.html b/index.html "value": emoji_picto + " " + data['features'][i]['properties']['label'],
"poi_type": result_type,
"zoom_level": zoom_level,
+ "bbox": data['features'][i]['bbox'],
"lat": data['features'][i]['geometry']['coordinates'][0],
"lon": data['features'][i]['geometry']['coordinates'][1]
})
},
minLength: 3,
select: function(event, ui) {
+ if (ui.item.bbox) {
+ map.fitBounds(ui.item.bbox, {
+ padding: {
+ top: 10,
+ bottom: 25,
+ left: 15,
+ right: 5
+ }
+ });
+ } else {
map.flyTo({
center: [ui.item.lat, ui.item.lon],
zoom: ui.item.zoom_level
})
}
+ }
});
| 4 |
diff --git a/src/content/en/tools/chrome-devtools/css/reference.md b/src/content/en/tools/chrome-devtools/css/reference.md @@ -183,7 +183,7 @@ tutorial.
To view a page in print mode:
-1. Open the [Command Menu](/web/tools/chrome-devtools/ui#command-menu).
+1. Open the [Command Menu](/web/tools/chrome-devtools/command-menu).
1. Start typing `Rendering` and select `Show Rendering`.
1. For the **Emulate CSS Media** dropdown, select **print**.
| 1 |
diff --git a/packages/@uppy/react/src/Dashboard.d.ts b/packages/@uppy/react/src/Dashboard.d.ts @@ -10,6 +10,7 @@ export interface DashboardProps {
uppy: Uppy;
inline?: boolean;
plugins?: Array<string>;
+ trigger?: string;
width?: number;
height?: number;
showProgressDetails?: boolean;
| 0 |
diff --git a/docs/sphinx_greenlight_build.md b/docs/sphinx_greenlight_build.md @@ -100,3 +100,12 @@ index 8255a2b5..07879e40 100644
Finally, while still standing in the `config` directory, run
`npm run prod`
+
+### When the master updates either `package.json` or `package-lock.json`
+
+1. Stash the local changes
+2. `git pull` on master to grab the latest changes
+3. `git stash pop`
+4. Manually resolve the conflicts
+5. `git add` the two files
+6. `npm install` on the root sphinx-relay directory
| 0 |
diff --git a/main/permissionManager.js b/main/permissionManager.js @@ -84,7 +84,15 @@ function pagePermissionRequestHandler (webContents, permission, callback, detail
return
}
- const requestOrigin = new URL(details.requestingUrl).hostname
+ let requestOrigin
+ try {
+ requestOrigin = new URL(details.requestingUrl).hostname
+ } catch (e) {
+ // invalid URL
+ console.warn(e, details.requestingUrl)
+ callback(false)
+ return
+ }
/*
Geolocation requires a Google API key (https://www.electronjs.org/docs/api/environment-variables#google_api_key), so it is disabled.
@@ -160,7 +168,16 @@ function pagePermissionCheckHandler (webContents, permission, requestingOrigin,
return true
}
- return isPermissionGrantedForOrigin(new URL(requestingOrigin).hostname, permission, details)
+ let requestHostname
+ try {
+ requestHostname = new URL(requestingOrigin).hostname
+ } catch (e) {
+ // invalid URL
+ console.warn(e, requestingOrigin)
+ return false
+ }
+
+ return isPermissionGrantedForOrigin(requestHostname, permission, details)
}
app.once('ready', function () {
| 8 |
diff --git a/server/app/scanpy_engine/scanpy_engine.py b/server/app/scanpy_engine/scanpy_engine.py @@ -350,34 +350,37 @@ class ScanpyEngine(CXGDriver):
)
@requires_data
- def _validate_label_data(self):
+ def _validate_label_data(self, labels=None):
"""
labels is None if disabled, empty if enabled by no data
"""
- if self.labels is None or self.labels.empty:
+ if labels is None:
+ labels = self.labels
+
+ if labels is None or labels.empty:
return
# all lables must have a name, which must be unique and not used in obs column names
- if not self.labels.columns.is_unique:
+ if not labels.columns.is_unique:
raise KeyError(f"All column names specified in {self.config['label_file']} must be unique.")
# the label index must be unique, and must have same values the anndata obs index
- if not self.labels.index.is_unique:
+ if not labels.index.is_unique:
raise KeyError(f"All row index values specified in the label file "
f"`{self.config['label_file']}` must be unique.")
- if not self.labels.index.equals(self.original_obs_index):
+ if not labels.index.equals(self.original_obs_index):
raise KeyError("Label file row index does not match H5AD file index. "
"Please ensure that column zero (0) in the label file contain the same "
"index values as the H5AD file.")
- duplicate_columns = list(set(self.labels.columns) & set(self.data.obs.columns))
+ duplicate_columns = list(set(labels.columns) & set(self.data.obs.columns))
if len(duplicate_columns) > 0:
raise KeyError(f"Labels file may not contain column names which overlap "
f"with h5ad obs columns {duplicate_columns}")
# labels must have same count as obs annotations
- if self.labels.shape[0] != self.data.obs.shape[0]:
+ if labels.shape[0] != self.data.obs.shape[0]:
raise ValueError("Labels file must have same number of rows as h5ad file.")
@staticmethod
@@ -467,8 +470,9 @@ class ScanpyEngine(CXGDriver):
raise ValueError("Only OBS dimension access is supported")
new_label_df = decode_matrix_fbs(fbs)
+ if not new_label_df.empty:
new_label_df.index = self.original_obs_index
- self._validate_label_data() # paranoia
+ self._validate_label_data(labels=new_label_df) # paranoia
# if any of the new column labels overlap with our existing labels, raise error
duplicate_columns = list(set(new_label_df.columns) & set(self.data.obs.columns))
@@ -477,7 +481,7 @@ class ScanpyEngine(CXGDriver):
f"with h5ad obs columns {duplicate_columns}")
# update our internal state and save it. Multi-threading often enabled,
- # so treat this as a critical section critical section.
+ # so treat this as a critical section.
with self.label_lock:
self.labels = new_label_df
write_labels(fname, self.labels)
| 11 |
diff --git a/CHANGES.md b/CHANGES.md # Change Log
+### 1.83 - 2021-07-01
+
+##### Additions :tada:
+
+- Added `ShadowMap.fadingEnabled` to control whether shadows fade out when the light source is close to the horizon. [#9565](https://github.com/CesiumGS/cesium/pull/9565)
+
### 1.82 - 2021-06-01
##### Additions :tada:
- Added `FeatureDetection.supportsBigInt64Array`, `FeatureDetection.supportsBigUint64Array` and `FeatureDetection.supportsBigInt`.
-- Added `ShadowMap.fadingEnabled` to control whether shadows fade out when the light source is close to the horizon. [#9565](https://github.com/CesiumGS/cesium/pull/9565)
-
##### Fixes :wrench:
- Fixed `processTerrain` in `decodeGoogleEarthEnterprisePacket` to handle a newer terrain packet format that includes water surface meshes after terrain meshes. [#9519](https://github.com/CesiumGS/cesium/pull/9519)
| 3 |
diff --git a/src/apps.json b/src/apps.json "env": "^bitbucket$",
"icon": "Atlassian Bitbucket.svg",
"implies": "Python",
- "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9+]\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1</span>",
+ "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9]+\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1",
"meta": {
"application-name": "Bitbucket"
},
| 1 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/onboarding/OnboardingStates.js b/public/javascripts/SVLabel/src/SVLabel/onboarding/OnboardingStates.js @@ -263,7 +263,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
"maxHeading": headingRanges["stage-2"][1]
}],
"message": {
- "message": 'Now, <span class="bold">click on the curb ramp</span> to label it.',
+ "message": 'Now, <span class="bold">click the curb ramp</span> beneath the flashing yellow arrow to label it.',
"position": "top-right",
"parameters": null
},
@@ -681,7 +681,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
"maxHeading": headingRanges["stage-3"][1]
}],
"message": {
- "message": 'Now, <span class="bold">click on the curb ramp</span> to label it.',
+ "message": 'Now, <span class="bold">click the curb ramp</span> beneath the flashing yellow arrow to label it.',
"position": "top-right",
"parameters": null
},
@@ -851,7 +851,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
"maxHeading": headingRanges["stage-3"][1]
}],
"message": {
- "message": 'Now, <span class="bold">click on the curb ramp</span> to label it.',
+ "message": 'Now, <span class="bold">click the curb ramp</span> beneath the flashing yellow arrow to label it.',
"position": "top-right",
"parameters": null
},
@@ -1115,7 +1115,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
"maxHeading": headingRanges["stage-4"][1]
}],
"message": {
- "message": 'To label the curb ramp <span class="bold">click beneath the flashing yellow arrow</span>.',
+ "message": '<span class="bold">Click the curb ramp</span> beneath the flashing yellow arrow to label it.',
"position": "top-right",
"parameters": null
},
@@ -1285,7 +1285,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
}
],
- okButtonText: "Yep, I see the missing curb ramps!",
+ okButtonText: "Yes! I see the missing curb ramps.",
"transition": function () {
var completedRate = 30 / numStates;
statusModel.setMissionCompletionRate(completedRate);
@@ -1397,6 +1397,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
return "instruction-3";
}
},
+ /*
"instruction-3": {
"properties": {
"action": "Instruction",
@@ -1421,8 +1422,8 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
tracker.push('Onboarding_Transition', {onboardingTransition: "instruction-3"});
return "instruction-4";
}
- },
- "instruction-4": {
+ },*/
+ "instruction-3": {
"properties": {
"action": "Instruction",
"blinks": ["jump"],
@@ -1444,7 +1445,7 @@ function OnboardingStates (compass, mapService, statusModel, tracker) {
var completedRate = 35 / numStates;
statusModel.setMissionCompletionRate(completedRate);
statusModel.setProgressBar(completedRate);
- tracker.push('Onboarding_Transition', {onboardingTransition: "instruction-4"});
+ tracker.push('Onboarding_Transition', {onboardingTransition: "instruction-3"});
return "outro";
}
},
| 3 |
diff --git a/packages/react-router/docs/api/location.md b/packages/react-router/docs/api/location.md @@ -6,7 +6,7 @@ even where it was. It looks like this:
```js
{
key: 'ac3df4', // not with HashHistory!
- pathname: '/somewhere'
+ pathname: '/somewhere',
search: '?some=search-string',
hash: '#howdy',
state: {
| 0 |
diff --git a/token-metadata/0x6Ee0f7BB50a54AB5253dA0667B0Dc2ee526C30a8/metadata.json b/token-metadata/0x6Ee0f7BB50a54AB5253dA0667B0Dc2ee526C30a8/metadata.json "symbol": "ABUSD",
"address": "0x6Ee0f7BB50a54AB5253dA0667B0Dc2ee526C30a8",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/withInNativeApp.js b/lib/withInNativeApp.js @@ -18,7 +18,10 @@ runInNativeAppBrowser(() => {
let message
try {
message = JSON.parse(event.data)
- } catch (error) {
+ } catch (error) {}
+ // handle null and undefined
+ // - remember that typeof null === 'object'
+ if (!message) {
message = {}
}
| 7 |
diff --git a/gulpfile.js b/gulpfile.js @@ -314,16 +314,22 @@ function formattingCheck(allItems) {
let data = item.data;
let pack = item.pack;
+
+
if(!data || !data.data || !data.type) {
- return; // Malformed data - outside the scope of the formatting check
+ continue; // Malformed data or journal entry - outside the scope of the formatting check
}
- // We only check formatting of aliens & equipment for now
+ // We only check formatting of aliens, vehicles & equipment for now
if (data.type === "npc") {
formattingCheckAlien(data,pack, item.file)
}
else if (data.type === "equipment") {
formattingCheckEquipment(data, pack, item.file)
}
+ else if (data.type === "vehicle") {
+ formattingCheckVehicle(data, pack, item.file);
+ }
+
}
}
@@ -386,6 +392,65 @@ function formattingCheckEquipment(data, pack, file) {
if (!isSourceValid(source)) {
addWarningForPack(`${file}: Improperly formatted source field "${source}".`, pack);
}
+
+ // Validate price
+ let price = data.data.price;
+ if (!price || price <= 0) {
+ addWarningForPack(`${file}: Improperly formatted armor price field "${armorType}".`, pack);
+ }
+
+ // Validate level
+ let level = data.data.level;
+ if (!level || level <= 0) {
+ addWarningForPack(`${file}: Improperly formatted armor level field "${armorType}".`, pack);
+ }
+
+ // If armor
+ let armor = data.data.armor
+ if (armor) {
+ // Validate armor type
+ let armorType = data.data.armor.type
+
+ if (armorType != "light" && armorType != "power" && armorType != "heavy" && armorType != "shield") {
+ addWarningForPack(`${file}: Improperly formatted armor type field "${armorType}".`, pack);
+ }
+ }
+
+}
+
+function formattingCheckVehicle(data, pack, file) {
+
+ // Validate name
+ if (!data.name || data.name.endsWith(' ') || data.name.startsWith(' ')) {
+ addWarningForPack(`${file}: Name is not well formatted "${data.name}".`, pack);
+ }
+
+ // Validate image
+ if (data.img && !data.img.startsWith("systems") && !data.img.startsWith("icons")) {
+ addWarningForPack(`${file}: Image is pointing to invalid location "${data.name}".`, pack);
+ }
+
+ // Validate source
+ let source = data.data.details.source;
+ if (!source) {
+ addWarningForPack(`${file}: Missing source field.`, pack);
+ return;
+ }
+ if (!isSourceValid(source)) {
+ addWarningForPack(`${file}: Improperly formatted source field "${source}".`, pack);
+ }
+
+ // Validate price
+ let price = data.data.details.price;
+ if (!price || price <= 0) {
+ addWarningForPack(`${file}: Improperly formatted vehicle price field "${armorType}".`, pack);
+ }
+
+ // Validate level
+ let level = data.data.details.level;
+ if (!level || level <= 0) {
+ addWarningForPack(`${file}: Improperly formatted vehicle level field "${armorType}".`, pack);
+ }
}
// Checks a source string for conformance to string format outlined in CONTRIBUTING.md
| 0 |
diff --git a/packages/inertia/src/inertia.js b/packages/inertia/src/inertia.js @@ -31,7 +31,7 @@ export default {
this.fireEvent('navigate', { detail: { page: initialPage } })
- window.addEventListener('popstate', this.restoreState.bind(this))
+ window.addEventListener('popstate', this.handlePopstateEvent.bind(this))
document.addEventListener('scroll', debounce(this.handleScrollEvent.bind(this), 100), true)
},
@@ -265,7 +265,7 @@ export default {
}, '', page.url)
},
- restoreState(event) {
+ handlePopstateEvent(event) {
if (event.state && event.state.component) {
const page = this.transformProps(event.state)
let visitId = this.createVisitId()
| 10 |
diff --git a/articles/tutorials/building-multi-tenant-saas-applications-with-azure-active-directory.md b/articles/tutorials/building-multi-tenant-saas-applications-with-azure-active-directory.md @@ -209,31 +209,37 @@ We're using the Lock for signing in users, but for enterprise connections like A
Before showing the Lock we're adding a button to allow login with Azure AD connection.
-> Note: Lock v10 does not support adding custom buttons yet, so this must be done using [Lock v9](https://auth0.com/docs/libraries/lock/v9).
-
```js
+import Auth0Lock from 'auth0-lock';
+import Auth0js from 'auth0-js';
+
+const YOUR_AUTH0_CONNECTION_AZURE_AD_NAME = 'fabrikamcorp-waad'
+
lock.once('signin ready', function() {
- var link = $('<a class="a0-zocial a0-waad" href="#">'
- + '<span>Login with Azure AD</span></a>');
- link.on('click', function () {
- lock.getClient().login({
- connection: 'fabrikamcorporation.onmicrosoft.com'
+ var buttonList = $('#auth0-lock-container-' + lock.id).find('.auth0-lock-social-buttons-container');
+
+ //Azure AD custom button
+ buttonList.append(
+ $('<button type="button" data-provider="windows">')
+ .addClass('auth0-lock-social-button auth0-lock-social-big-button')
+ .append('<div class="auth0-lock-social-button-icon">')
+ .append('<div class="auth0-lock-social-button-text">Log in with Azure AD</div>')
+ .on('click', function() {
+ var webAuth = new Auth0js.WebAuth({domain, clientID});
+
+ webAuth.authorize({
+ connection: YOUR_AUTH0_CONNECTION_AZURE_AD_NAME,
+ responseType: 'code',
// repeat any needed custom auth params here, such as
// state, responseType and callbackURL.
- // Only domain and clientID are carried over from
- // Lock instance.
// , responseType: 'code'
- // , callbackURL: ...
+ // , redirectUri: ...
// , ...
});
- });
-
- var iconList = $(this.$container).find('.a0-iconlist');
- iconList.append(link);
+ })
+ );
});
lock.show({
- connections: ['google-oauth2', 'facebook', 'windowslive'],
- socialBigButtons: true,
callbackURL: window.location.origin + '/signin-auth0'
});
```
| 3 |
diff --git a/tools/subgraph/subgraph.template.yaml b/tools/subgraph/subgraph.template.yaml @@ -23,7 +23,7 @@ dataSources:
- Swap
abis:
- name: SwapContract
- file: ../build/contracts/Swap.json
+ file: ../deployer/build/contracts/Swap.json
eventHandlers:
- event: AuthorizeSender(indexed address,indexed address)
handler: handleAuthorizeSender
@@ -60,7 +60,7 @@ dataSources:
- Unstake
abis:
- name: Indexer
- file: ../build/contracts/Indexer.json
+ file: ../deployer/build/contracts/Indexer.json
eventHandlers:
- event: AddTokenToBlacklist(address)
handler: handleAddTokenToBlacklist
@@ -90,7 +90,7 @@ dataSources:
- CreateDelegate
abis:
- name: DelegateFactory
- file: ../build/contracts/DelegateFactory.json
+ file: ../deployer/build/contracts/DelegateFactory.json
eventHandlers:
- event: CreateDelegate(indexed address,address,address,indexed address,address)
handler: handleCreateDelegate
@@ -110,7 +110,7 @@ templates:
- Index
abis:
- name: Index
- file: ../build/contracts/Index.json
+ file: ../deployer/build/contracts/Index.json
eventHandlers:
- event: SetLocator(indexed address,uint256,indexed bytes32)
handler: handleSetLocator
@@ -130,7 +130,7 @@ templates:
- Delegate
abis:
- name: Delegate
- file: ../build/contracts/Delegate.json
+ file: ../deployer/build/contracts/Delegate.json
eventHandlers:
- event: SetRule(indexed address,indexed address,indexed address,uint256,uint256,uint256)
handler: handleSetRule
| 3 |
diff --git a/src/common/blockchain/interface-blockchain/transactions/pending/Transactions-Pending-Queue.js b/src/common/blockchain/interface-blockchain/transactions/pending/Transactions-Pending-Queue.js @@ -319,7 +319,7 @@ class TransactionsPendingQueue {
propagateMissingNonce(addressBuffer,nonce){
let found = this.transactionsProtocol.transactionsDownloadingManager.findMissingNonce(addressBuffer,nonce);
- if(!found) return;
+ if(found) return;
this.transactionsProtocol.propagateNewMissingNonce(addressBuffer,nonce);
this.transactionsProtocol.transactionsDownloadingManager.addMissingNonceList(addressBuffer,nonce);
| 13 |
diff --git a/src/fonts/ploticon.js b/src/fonts/ploticon.js @@ -169,14 +169,24 @@ module.exports = {
'<svg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 132 132\'>',
'<defs>',
' <style>',
- ' .cls-1 {fill: #3f4f75;}',
- ' .cls-2 {fill: #80cfbe;}',
- ' .cls-3 {fill: #fff;}',
+ ' .cls-1{fill:#8c99cd;}',
+ ' .cls-2{fill:url(#linear-gradient);}',
+ ' .cls-3{fill:#777;}',
' </style>',
+ ' <linearGradient id=\'linear-gradient\' x1=\'20.32\' y1=\'42.71\' x2=\'115.98\' y2=\'42.71\' gradientTransform=\'translate(-1.21 -2.82)\' gradientUnits=\'userSpaceOnUse\'>',
+ ' <stop offset=\'0\' stop-color=\'#ff2c6d\'/>',
+ ' <stop offset=\'0.4\' stop-color=\'#cd74a6\'/>',
+ ' <stop offset=\'1\' stop-color=\'#7fe4ff\'/>',
+ ' </linearGradient>',
'</defs>',
' <title>plotly-logomark</title>',
' <g id=\'symbol\'>',
- ' <rect class=\'cls-1\' width=\'132\' height=\'132\' rx=\'6\' ry=\'6\'/>',
+ ' <circle class=\'cls-1\' cx=\'78\' cy=\'54\' r=\'6\'/>',
+ ' <circle class=\'cls-1\' cx=\'102\' cy=\'30\' r=\'6\'/>',
+ ' <circle class=\'cls-1\' cx=\'78\' cy=\'30\' r=\'6\'/>',
+ ' <circle class=\'cls-1\' cx=\'54\' cy=\'30\' r=\'6\'/>',
+ ' <circle class=\'cls-1\' cx=\'30\' cy=\'30\' r=\'6\'/>',
+ ' <circle class=\'cls-1\' cx=\'30\' cy=\'54\' r=\'6\'/>',
' <circle class=\'cls-2\' cx=\'78\' cy=\'54\' r=\'6\'/>',
' <circle class=\'cls-2\' cx=\'102\' cy=\'30\' r=\'6\'/>',
' <circle class=\'cls-2\' cx=\'78\' cy=\'30\' r=\'6\'/>',
| 14 |
diff --git a/packages/@uppy/drag-drop/package.json b/packages/@uppy/drag-drop/package.json },
"dependencies": {
"@uppy/utils": "^0.25.5",
- "drag-drop": "^2.14.0"
+ "drag-drop": "^2.14.0",
+ "preact": "^8.2.9"
},
"peerDependencies": {
"@uppy/core": "^0.25.5"
| 0 |
diff --git a/src/components/FormEdit.js b/src/components/FormEdit.js @@ -25,6 +25,7 @@ export default class extends Component {
name: '',
path: '',
display: 'form',
+ type: 'form',
components: [],
},
};
@@ -115,7 +116,24 @@ export default class extends Component {
</div>
</div>
</div>
- <div className="col-lg-3 col-md-4 col-sm-4">
+ <div className="col-lg-2 col-md-3 col-sm-3">
+ <div id="form-group-type" className="form-group">
+ <label htmlFor="form-type" className="control-label">Type</label>
+ <div className="input-group">
+ <select
+ className="form-control"
+ name="form-type"
+ id="form-type"
+ value={this.state.form.type}
+ onChange={event => this.handleChange('type', event)}
+ >
+ <option label="Form" value="form">Form</option>
+ <option label="Resource" value="resource">Resource</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div className="col-lg-2 col-md-4 col-sm-4">
<div id="form-group-path" className="form-group">
<label htmlFor="path" className="control-label field-required">Path</label>
<div className="input-group">
@@ -131,7 +149,7 @@ export default class extends Component {
</div>
</div>
</div>
- <div id="save-buttons" className="col-lg-3 col-md-5 col-sm-5 save-buttons pull-right">
+ <div id="save-buttons" className="col-lg-2 col-md-5 col-sm-5 save-buttons pull-right">
<div className="form-group pull-right">
<span className="btn btn-primary" onClick={() => this.saveForm()}>
{saveText}
| 0 |
diff --git a/README.md b/README.md # Pride in London App
[](https://circleci.com/gh/redbadger/pride-london-app)
+[](https://codeclimate.com/github/redbadger/pride-london-app/maintainability)
+[](https://codeclimate.com/github/redbadger/pride-london-app/test_coverage)
<!-- Generateed with markdown-toc (https://github.com/jonschlinkert/markdown-toc) -->
| 0 |
diff --git a/peer_reviewers/list-of-software-peer-reviewers.md b/peer_reviewers/list-of-software-peer-reviewers.md | Mungai Njoroge | [EngEd Author Page](https://www.section.io/engineering-education/authors/geoffrey-mungai/) | [GitHub Profile](https://github.com/geoffrey45) | - Backend Development(Flask, Django, Node.js) - Frontend Development(Angular, Vue) - Programming Languages (Python, JavaScript)|
| Nadiv Gold Edelstein | [EngEd Author Page](https://www.section.io/engineering-education/authors/nadiv-gold-edelstein/) | [GitHub Profile](https://github.com/nadivgold) | - example 1 - example 2 - example 3|
| Onesmus Mbaabu | [EngEd Author Page](https://www.section.io/engineering-education/authors/onesmus-mbaabu/) | [GitHub Profile](https://github.com/mbaabuones) | - Artificial Intelligence - Machine Learning - Data Science - Web Development (Front End)|
-| Paul Odhiambo | [EngEd Author Page](https://www.section.io/engineering-education/authors/odhiambo-paul/) | [GitHub Profile](https://github.com/paulodhiambo) | - Android development - Backend development( Spring Boot / Django / Nodejs ) - DevOps|
-| Peter Kayere | [EngEd Author Page](/https://www.section.io/engineering-education/authors/peter-kayere/) | [GitHub Profile](https://github.com/kayere)) | - Android development(Kotlin) - Node.Js - Javascript|
+| Paul Odhiambo | [EngEd Author Page](https://www.section.io/engineering-education/authors/odhiambo-paul/) | [GitHub Profile](https://github.com/paulodhiambo) | - Android development - Backend Development (Spring Boot/Django /Node.js ) - DevOps|
+| Peter Kayere | [EngEd Author Page](/https://www.section.io/engineering-education/authors/peter-kayere/) | [GitHub Profile](https://github.com/kayere)) | - Android Development (Kotlin) - Node.js - Javascript|
| Saiharsha Balasubramaniam | [EngEd Author Page](https://www.section.io/engineering-education/authors/saiharsha-balasubramaniam/) | [GitHub Profile](https://github.com/cyberShaw) | - JavaScript, Web Development - APIs - iOS |
| Sophia Raji | [EngEd Author Page](https://www.section.io/engineering-education/authors/sophia-raji/) | [GitHub Profile](https://github.com/sudosoph) | - example 1 - example 2 - example 3|
| Srishilesh P S | [EngEd Author Page](https://www.section.io/engineering-education/authors/srishilesh-p-s/) | [GitHub Profile](https://github.com/srishilesh) | - Machine Learning - Deep Learning - Blockchain - Data Science - Databases - DevOps - Full stack development - Programming Languages (Python, Java, C, JavaScript, Solidity) |
| 1 |
diff --git a/README.md b/README.md @@ -96,7 +96,7 @@ Testing
-------
We're using [zombie](https://github.com/assaf/zombie) as our headless browser for integration testing. It is a simulated environment (virtual DOM) so there's no need in WebDriver or a real browser to be present.
-First of all, you need to make sure you have a running copy of st2 to run tests against. We're using [custom docker-compose](https://github.com/enykeev/st2box/) deployment for our automated tests, but the [AIO](https://docs.stackstorm.com/install/index.html) deployment will work just as good (though will take more time to deploy).
+First of all, you need to make sure you have a running copy of st2 to run tests against. We're using [official docker images](stackstorm/st2-docker) for our automated tests, but the [AIO](https://docs.stackstorm.com/install/index.html) deployment will work just as good (though will take more time to deploy).
To let test runner know the details of your st2 installation, you need to set ST2_HOST, ST2_USERNAME and ST2_PASSWORD env variables, then call `gulp test`.
| 2 |
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/adaptiveContent.html b/modules/xerte/parent_templates/Nottingham/models_html5/adaptiveContent.html //$(printableItems).find(".panel").css("box-shadow", "none !important");
$("#adaptiveContent .panel").addClass("panel-print");
$("#adaptiveContent .panel").removeClass("panel");
- $(".panel-print").css("width", "1150px");
+ $(".panel-print").css("width", "794px");
+ $(".panel-print").css("height", "210px");
$(".summary-container").css("display", "block");
$(".graph-container").css("float", "unset");
$(".graph-container").css("width", "100%");
$("canvas").css("width", "100%");
$("canvas").css("height", "100%");
+ $("p").css("font-size", "16px");
+ $("ul").css("font-size", "16px");
let opt = {
filename: 'xerte-adaptive-content.pdf',
jsPDF: { unit: 'in', format: 'a4', orientation: 'portrait' }
};
- html2pdf().set(opt).from($("#adaptiveContent")[0]).save();
- // Wait 10 seconds before placing the class back. This should be refactored at some point.
- await new Promise(resolve => setTimeout(resolve, 10000));
+ html2pdf().set(opt).from($("#adaptiveContent")[0]).toPdf().get('pdf').then(function (pdf) {
$("#adaptiveContent .panel-print").addClass("panel");
$("#adaptiveContent .panel").removeClass("panel-print");
$(".panel").css("width", "100%");
+ $(".panel").css("height", "fit-content");
$(".summary-container").css("display", "flex");
$(".graph-container").css("float", "graph");
$(".graph-container").css("width", "45%");
$("canvas").css("width", "100%");
$("canvas").css("height", "100%");
+ $("p").css("font-size", "2.5vmin");
+ $("ul").css("font-size", "2.5vmin");
+ }).save();
+ // Wait 10 seconds before placing the class back. This should be refactored at some point.
+ //await new Promise(resolve => setTimeout(resolve, 10000));
});
$("#adaptiveContentMain").addClass("unlisted");
$("#introductionText").html(
| 7 |
diff --git a/contribs/gmf/src/controllers/AbstractAPIController.js b/contribs/gmf/src/controllers/AbstractAPIController.js @@ -24,13 +24,15 @@ import angular from 'angular';
import gmfControllersAbstractAppController, {AbstractAppController, getLocationIcon}
from 'gmf/controllers/AbstractAppController.js';
import ngeoMapResizemap from 'ngeo/map/resizemap.js';
-import * as olProj from 'ol/proj.js';
+import {get as getProjection} from 'ol/proj.js';
import olMap from 'ol/Map.js';
import olView from 'ol/View.js';
import olControlScaleLine from 'ol/control/ScaleLine.js';
import olControlZoom from 'ol/control/Zoom.js';
import olControlRotate from 'ol/control/Rotate.js';
-import * as olInteraction from 'ol/interaction.js';
+import {defaults as interactionsDefaults} from 'ol/interaction.js';
+import olInteractionDragPan from 'ol/interaction/DragPan.js';
+import {noModifierKeys} from 'ol/events/condition.js';
/**
* API application abstract controller.
@@ -47,7 +49,7 @@ export class AbstractAPIController extends AbstractAppController {
*/
constructor(config, $scope, $injector) {
const viewConfig = {
- projection: olProj.get(`EPSG:${config.srid || 2056}`)
+ projection: getProjection(`EPSG:${config.srid || 2056}`)
};
Object.assign(viewConfig, config.mapViewConfig || {});
@@ -55,7 +57,7 @@ export class AbstractAPIController extends AbstractAppController {
if (!scaleline) {
throw new Error('Missing scaleline');
}
- super(config, new olMap({
+ const map = new olMap({
pixelRatio: config.mapPixelRatio,
layers: [],
view: new olView(viewConfig),
@@ -73,11 +75,16 @@ export class AbstractAPIController extends AbstractAppController {
tipLabel: ''
})
],
- interactions: config.mapInteractions || olInteraction.defaults({
+ interactions: config.mapInteractions || interactionsDefaults({
pinchRotate: true,
altShiftDragRotate: true
})
- }), $scope, $injector);
+ });
+ map.addInteraction(new olInteractionDragPan({
+ condition: noModifierKeys
+ }));
+
+ super(config, map, $scope, $injector);
}
}
| 11 |
diff --git a/src/components/TableHeadCell.js b/src/components/TableHeadCell.js @@ -145,7 +145,7 @@ class TableHeadCell extends React.Component {
classes={{
tooltip: classes.tooltip,
popper: classes.mypopper
- }}
+ }}>
<div className={classes.sortAction}>
<div
className={classNames({
| 0 |
diff --git a/README.md b/README.md @@ -321,10 +321,11 @@ Third Party Libraries licenses :
1. **QPDF**: Apache [http://qpdf.sourceforge.net](http://qpdf.sourceforge.net/)
2. **ImageMagick**: Apache 2.0 [https://imagemagick.org/script/license.php](https://imagemagick.org/script/license.php)
3. **Pdf2json**: Apache 2.0 [https://github.com/modesty/pdf2json/blob/scratch/quadf-forms/license.txt](https://github.com/modesty/pdf2json/blob/scratch/quadf-forms/license.txt)
-4. **Tesseract**: Apache 2.0 [https://github.com/tesseract-ocr/tesseract](https://github.com/tesseract-ocr/tesseract)
-5. **Camelot**: MIT [https://github.com/camelot-dev/camelot](https://github.com/camelot-dev/camelot)
-6. **MuPDF** (Optional dependency): AGPL [https://mupdf.com/license.html](https://mupdf.com/license.html)
-7. **Pandoc** (Optional dependency): GPL [https://github.com/jgm/pandoc](https://github.com/jgm/pandoc)
+4. **Pdfminer**: MIT [https://github.com/euske/pdfminer/blob/master/LICENSE](https://github.com/euske/pdfminer/blob/master/LICENSE)
+5. **Tesseract**: Apache 2.0 [https://github.com/tesseract-ocr/tesseract](https://github.com/tesseract-ocr/tesseract)
+6. **Camelot**: MIT [https://github.com/camelot-dev/camelot](https://github.com/camelot-dev/camelot)
+7. **MuPDF** (Optional dependency): AGPL [https://mupdf.com/license.html](https://mupdf.com/license.html)
+8. **Pandoc** (Optional dependency): GPL [https://github.com/jgm/pandoc](https://github.com/jgm/pandoc)
## 7. License
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.