code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/scripts/update-guild-leaderboards.js b/src/scripts/update-guild-leaderboards.js @@ -37,6 +37,11 @@ async function main(){
.map(a => a.uuid);
for(const key of keys){
+ const options = constants.leaderboard(key);
+
+ if(options.mappedBy != 'uuid')
+ continue;
+
const scores = [];
const memberScores = await Promise.all(
@@ -56,6 +61,9 @@ async function main(){
scores.push(score);
}
+ if(key == 'lb_bank')
+ console.log(scores.join(", "));
+
if(scores.length < 75)
continue;
| 8 |
diff --git a/src/js/components/TextInput/stories/typescript/CustomSuggestions.tsx b/src/js/components/TextInput/stories/typescript/CustomSuggestions.tsx @@ -74,10 +74,31 @@ const folks = [
},
];
+const formatSuggestions = (suggestedFolks, value) =>
+ suggestedFolks
+ .filter(({ name }) => name.toLowerCase().indexOf(value.toLowerCase()) >= 0)
+ .map(({ name, imageUrl }, index, list) => ({
+ label: (
+ <Box
+ direction="row"
+ align="center"
+ gap="small"
+ border={index < list.length - 1 ? 'bottom' : undefined}
+ pad="small"
+ >
+ <Image width="48px" src={imageUrl} style={{ borderRadius: '100%' }} />
+ <Text>
+ <strong>{name}</strong>
+ </Text>
+ </Box>
+ ),
+ value: name,
+ }));
+
export const CustomSuggestions = () => {
const [value, setValue] = useState('');
const [suggestionOpen, setSuggestionOpen] = useState(false);
- const [suggestedFolks, setSuggestedFolks] = useState([]);
+ const [suggestions, setSuggestions] = useState([]);
const boxRef = useRef();
const onChange = useCallback(event => {
@@ -85,10 +106,12 @@ export const CustomSuggestions = () => {
setValue(newValue);
if (!newValue.trim()) {
- setSuggestedFolks([]);
+ setSuggestions([]);
} else {
// simulate an async call to the backend
- setTimeout(() => setSuggestedFolks(folks), 300);
+ setTimeout(() => {
+ setSuggestions(formatSuggestions(folks, newValue));
+ }, 300);
}
}, []);
@@ -97,38 +120,15 @@ export const CustomSuggestions = () => {
[],
);
- const onSuggestionsOpen = useCallback(() => setSuggestionOpen(true), []);
- const onSuggestionsClose = useCallback(() => setSuggestionOpen(false), []);
+ const onSuggestionsOpen = useCallback(() => {
+ setSuggestions(formatSuggestions(folks, value));
+ setSuggestionOpen(true);
+ }, [value]);
- const suggestions = useMemo(
- () =>
- suggestedFolks
- .filter(
- ({ name }) => name.toLowerCase().indexOf(value.toLowerCase()) >= 0,
- )
- .map(({ name, imageUrl }, index, list) => ({
- label: (
- <Box
- direction="row"
- align="center"
- gap="small"
- border={index < list.length - 1 ? 'bottom' : undefined}
- pad="small"
- >
- <Image
- width="48px"
- src={imageUrl}
- style={{ borderRadius: '100%' }}
- />
- <Text>
- <strong>{name}</strong>
- </Text>
- </Box>
- ),
- value: name,
- })),
- [suggestedFolks, value],
- );
+ const onSuggestionsClose = useCallback(() => {
+ setSuggestions([]);
+ setSuggestionOpen(false);
+ }, []);
return (
<Grommet full theme={myCustomTheme}>
| 7 |
diff --git a/src/core/operations/CRC8Checksum.mjs b/src/core/operations/CRC8Checksum.mjs */
import Operation from "../Operation";
-import OperationError from "../errors/OperationError";
/**
* CRC-8 Checksum operation
@@ -25,19 +24,36 @@ class CRC8Checksum extends Operation {
this.inputType = "ArrayBuffer";
this.outputType = "string";
this.args = [
- /* Example arguments. See the project wiki for full details.
{
- name: "First arg",
- type: "string",
- value: "Don't Panic"
- },
- {
- name: "Second arg",
- type: "number",
- value: 42
+ "name": "Algorithm",
+ "type": "option",
+ "value": [
+ "CRC-8"
+ ]
+ }
+ ]
}
+
+ calculateCRC8(algorithmName, polynomial, initializationValue, refIn, refOut, xorOut, check) {
+ let initializationValue = this.reverseBits();
+
+ return crc;
+ }
+
+ /**
+ * For an 8 bit initialization value reverse the bits.
+ *
+ * @param input
*/
- ];
+ reverseBits(input) {
+ let reflectedBits = input.toString(2).split('');
+ for (let i = 0; i < hashSize / 2; i++) {
+ let x = reflectedBits[i];
+ reflectedBits[i] = reflectedBits[hashSize - i - 1];
+ reflectedBits[hashSize - i - 1] = x;
+ }
+
+ return parseInt(reflectedBits.join(''));
}
/**
@@ -46,11 +62,21 @@ class CRC8Checksum extends Operation {
* @returns {string}
*/
run(input, args) {
- // const [firstArg, secondArg] = args;
+ const algorithm = args[0];
+
+ if (algorithm === "CRC-8") {
+ return this.calculateCRC8(algorithm, 0x7, 0x0, false, false, 0x0, 0xF4)
+ }
- throw new OperationError("Test");
+ return "";
}
}
+const hashSize = 8;
+
+// const CRC8AlgoParameters = {
+// 'CRC8'
+// }
+
export default CRC8Checksum;
| 0 |
diff --git a/shaders.js b/shaders.js @@ -674,6 +674,173 @@ const buildMaterial = new THREE.ShaderMaterial({
// polygonOffsetUnits: 1,
});
+const damageMaterial = new THREE.ShaderMaterial({
+ uniforms: {
+ uTime: {
+ type: 'f',
+ value: 0,
+ needsUpdate: true,
+ },
+ },
+ vertexShader: `\
+ precision highp float;
+ precision highp int;
+
+ uniform vec4 uSelectRange;
+
+ // attribute vec3 barycentric;
+ attribute float ao;
+ attribute float skyLight;
+ attribute float torchLight;
+
+ varying vec3 vViewPosition;
+ varying vec2 vUv;
+ varying vec3 vBarycentric;
+ varying float vAo;
+ varying float vSkyLight;
+ varying float vTorchLight;
+ varying vec3 vSelectColor;
+ varying vec2 vWorldUv;
+ varying vec3 vPos;
+ varying vec3 vNormal;
+
+ void main() {
+ vec4 mvPosition = modelViewMatrix * vec4(position, 1.0);
+ gl_Position = projectionMatrix * mvPosition;
+
+ vViewPosition = -mvPosition.xyz;
+ vUv = uv;
+ // vBarycentric = barycentric;
+ float vid = float(gl_VertexID);
+ if (mod(vid, 3.) < 0.5) {
+ vBarycentric = vec3(1., 0., 0.);
+ } else if (mod(vid, 3.) < 1.5) {
+ vBarycentric = vec3(0., 1., 0.);
+ } else {
+ vBarycentric = vec3(0., 0., 1.);
+ }
+ vAo = ao/27.0;
+ vSkyLight = skyLight/8.0;
+ vTorchLight = torchLight/8.0;
+
+ vSelectColor = vec3(0.);
+ if (
+ position.x >= uSelectRange.x &&
+ position.z >= uSelectRange.y &&
+ position.x < uSelectRange.z &&
+ position.z < uSelectRange.w
+ ) {
+ vSelectColor = vec3(${new THREE.Color(0x4fc3f7).toArray().join(', ')});
+ }
+
+ vec3 vert_tang;
+ vec3 vert_bitang;
+ if (abs(normal.y) < 0.05) {
+ if (abs(normal.x) > 0.95) {
+ vert_bitang = vec3(0., 1., 0.);
+ vert_tang = normalize(cross(vert_bitang, normal));
+ vWorldUv = vec2(dot(position, vert_tang), dot(position, vert_bitang));
+ } else {
+ vert_bitang = vec3(0., 1., 0.);
+ vert_tang = normalize(cross(vert_bitang, normal));
+ vWorldUv = vec2(dot(position, vert_tang), dot(position, vert_bitang));
+ }
+ } else {
+ vert_tang = vec3(1., 0., 0.);
+ vert_bitang = normalize(cross(vert_tang, normal));
+ vWorldUv = vec2(dot(position, vert_tang), dot(position, vert_bitang));
+ }
+ vWorldUv /= 4.0;
+ vec3 vert_norm = normal;
+
+ vec3 t = normalize(normalMatrix * vert_tang);
+ vec3 b = normalize(normalMatrix * vert_bitang);
+ vec3 n = normalize(normalMatrix * vert_norm);
+ mat3 tbn = transpose(mat3(t, b, n));
+
+ vPos = position;
+ vNormal = normal;
+ }
+ `,
+ fragmentShader: `\
+ precision highp float;
+ precision highp int;
+
+ #define PI 3.1415926535897932384626433832795
+
+ uniform float sunIntensity;
+ uniform sampler2D tex;
+ uniform float uTime;
+ uniform vec3 sunDirection;
+ float parallaxScale = 0.3;
+ float parallaxMinLayers = 50.;
+ float parallaxMaxLayers = 50.;
+
+ varying vec3 vViewPosition;
+ varying vec2 vUv;
+ varying vec3 vBarycentric;
+ varying float vAo;
+ varying float vSkyLight;
+ varying float vTorchLight;
+ varying vec3 vSelectColor;
+ varying vec2 vWorldUv;
+ varying vec3 vPos;
+ varying vec3 vNormal;
+
+ float edgeFactor(vec2 uv) {
+ float divisor = 0.5;
+ float power = 0.5;
+ return min(
+ pow(abs(uv.x - round(uv.x/divisor)*divisor), power),
+ pow(abs(uv.y - round(uv.y/divisor)*divisor), power)
+ ) > 0.1 ? 0.0 : 1.0;
+ /* return 1. - pow(abs(uv.x - round(uv.x/divisor)*divisor), power) *
+ pow(abs(uv.y - round(uv.y/divisor)*divisor), power); */
+ }
+
+ vec3 getTriPlanarBlend(vec3 _wNorm){
+ // in wNorm is the world-space normal of the fragment
+ vec3 blending = abs( _wNorm );
+ // blending = normalize(max(blending, 0.00001)); // Force weights to sum to 1.0
+ // float b = (blending.x + blending.y + blending.z);
+ // blending /= vec3(b, b, b);
+ // return min(min(blending.x, blending.y), blending.z);
+ blending = normalize(blending);
+ return blending;
+ }
+
+ void main() {
+ // vec3 diffuseColor1 = vec3(${new THREE.Color(0x1976d2).toArray().join(', ')});
+ vec3 diffuseColor2 = vec3(${new THREE.Color(0xef5350).toArray().join(', ')});
+ float normalRepeat = 1.0;
+
+ vec3 blending = getTriPlanarBlend(vNormal);
+ float xaxis = edgeFactor(vPos.yz * normalRepeat);
+ float yaxis = edgeFactor(vPos.xz * normalRepeat);
+ float zaxis = edgeFactor(vPos.xy * normalRepeat);
+ float f = xaxis * blending.x + yaxis * blending.y + zaxis * blending.z;
+
+ // vec2 worldUv = vWorldUv;
+ // worldUv = mod(worldUv, 1.0);
+ // float f = edgeFactor();
+ // float f = max(normalTex.x, normalTex.y, normalTex.z);
+
+ if (abs(length(vViewPosition) - uTime * 20.) < 0.1) {
+ f = 1.0;
+ }
+
+ float d = gl_FragCoord.z/gl_FragCoord.w;
+ vec3 c = diffuseColor2; // mix(diffuseColor1, diffuseColor2, abs(vPos.y/10.));
+ float f2 = 1. + d/10.0;
+ gl_FragColor = vec4(c, 0.5 + max(f, 0.3) * f2 * 0.5);
+ }
+ `,
+ transparent: true,
+ polygonOffset: true,
+ polygonOffsetFactor: -1,
+ // polygonOffsetUnits: 1,
+});
+
const portalMaterial = new THREE.ShaderMaterial({
uniforms: {
uColor: {
@@ -1266,6 +1433,7 @@ export {
THING_SHADER,
makeDrawMaterial, */
buildMaterial,
+ damageMaterial,
portalMaterial,
arrowGeometry,
arrowMaterial,
| 0 |
diff --git a/protocols/indexer/contracts/Indexer.sol b/protocols/indexer/contracts/Indexer.sol @@ -41,8 +41,7 @@ contract Indexer is IIndexer, Ownable {
mapping (address => uint256) public blacklist;
// The whitelist contract for checking whether a peer is whitelisted
- IWhitelist whitelist;
- bool hasWhitelist;
+ address whitelist;
/**
* @notice Contract Constructor
@@ -60,10 +59,7 @@ contract Indexer is IIndexer, Ownable {
stakeMinimum = _stakeMinimum;
emit SetStakeMinimum(_stakeMinimum);
- if (_whitelist != address(0)) {
- hasWhitelist = true;
- whitelist = IWhitelist(_whitelist);
- }
+ whitelist = _whitelist;
}
/**
@@ -167,8 +163,8 @@ contract Indexer is IIndexer, Ownable {
) public {
// Ensure the locator is whitelisted, if relevant
- if (hasWhitelist) {
- require(whitelist.isWhitelisted(_locator),
+ if (whitelist != address(0)) {
+ require(IWhitelist(whitelist).isWhitelisted(_locator),
"LOCATOR_NOT_WHITELISTED");
}
| 2 |
diff --git a/docs/README.md b/docs/README.md ## Product introduction
-1. [Site Kit goals and features](./Product-Introduction-Site-Kit-goals-and-features.md) (TODO)
-2. [The modules of Site Kit](./Product-Introduction-The-modules-of-Site-Kit.md) (TODO)
-3. [How Site Kit is integrated in WordPress](./Product-Introduction-How-Site-Kit-is-integrated-in-WordPress.md) (TODO)
-4. [Site connection and user authentication](./Product-Introduction-Site-connection-and-user-authentication.md) (TODO)
-5. [The Site Kit authentication service](./Product-Introduction-The-Site-Kit-authentication-service.md) (TODO)
+1. [Site Kit goals and features](./Site-Kit-goals-and-features.md) (TODO)
+2. [The modules of Site Kit](./The-modules-of-Site-Kit.md) (TODO)
+3. [How Site Kit is integrated in WordPress](./How-Site-Kit-is-integrated-in-WordPress.md) (TODO)
+4. [Site connection and user authentication](./Site-connection-and-user-authentication.md) (TODO)
+5. [The Site Kit authentication service](./The-Site-Kit-authentication-service.md) (TODO)
## Development setup
-1. [Setting up a local development environment](./Development-setup-Setting-up-a-local-development-environment.md) (TODO)
-2. [Using the Site Kit tester plugin](./Development-setup-Using-the-Site-Kit-tester-plugin.md) (TODO)
-3. [Developing against the authentication service staging version](./Development-setup-Developing-against-the-authentication-service-staging-version.md) (TODO)
-4. [Working against real data](./Development-setup-Working-against-real-data.md) (TODO)
+1. [Setting up a local development environment](./Setting-up-a-local-development-environment.md) (TODO)
+2. [Using the Site Kit tester plugin](./Using-the-Site-Kit-tester-plugin.md) (TODO)
+3. [Developing against the authentication service staging version](./Developing-against-the-authentication-service-staging-version.md) (TODO)
+4. [Working against real data](./Working-against-real-data.md) (TODO)
## Architecture
-1. [Data flow in Site Kit](./Architecture-Data-flow-in-Site-Kit.md) (TODO)
-2. [Database usage in Site Kit](./Architecture-Database-usage-in-Site-Kit.md) (TODO)
-3. [Site Kit core vs Site Kit modules](./Architecture-Site-Kit-core-vs-Site-Kit-modules.md) (TODO)
-4. [Usage of feature flags](./Architecture-Usage-of-feature-flags.md) (TODO)
-5. [JavaScript asset management](./Architecture-JavaScript-asset-management.md) (TODO)
-6. [Data store architecture](./Architecture-Data-store-architecture.md) (TODO)
-7. [React component requirements](./Architecture-React-component-requirements.md) (TODO)
-8. [The different types of test coverage](./Architecture-The-different-types-of-test-coverage.md) (TODO)
-9. [Registering and implementing modules](./Architecture-Registering-and-implementing-modules.md) (TODO)
-10. [Registering and implementing widgets](./Architecture-Registering-and-implementing-widgets.md) (TODO)
+1. [Data flow in Site Kit](./Data-flow-in-Site-Kit.md) (TODO)
+2. [Database usage in Site Kit](./Database-usage-in-Site-Kit.md) (TODO)
+3. [Site Kit core vs Site Kit modules](./Site-Kit-core-vs-Site-Kit-modules.md) (TODO)
+4. [Usage of feature flags](./Usage-of-feature-flags.md) (TODO)
+5. [JavaScript asset management](./JavaScript-asset-management.md) (TODO)
+6. [Data store architecture](./Data-store-architecture.md) (TODO)
+7. [React component requirements](./React-component-requirements.md) (TODO)
+8. [The different types of test coverage](./The-different-types-of-test-coverage.md) (TODO)
+9. [Registering and implementing modules](./Registering-and-implementing-modules.md) (TODO)
+10. [Registering and implementing widgets](./Registering-and-implementing-widgets.md) (TODO)
## Development best practices
-1. [Writing Storybook stories](./Development-best-practices-Writing-Storybook-stories.md) (TODO)
-2. [Writing PHPUnit tests](./Development-best-practices-Writing-PHPUnit-tests.md) (TODO)
-3. [Writing Jest tests](./Development-best-practices-Writing-Jest-tests.md) (TODO)
+1. [Writing Storybook stories](./Writing-Storybook-stories.md) (TODO)
+2. [Writing PHPUnit tests](./Writing-PHPUnit-tests.md) (TODO)
+3. [Writing Jest tests](./Writing-Jest-tests.md) (TODO)
| 2 |
diff --git a/src/components/common/view/WavesBackground.native.js b/src/components/common/view/WavesBackground.native.js -import React, { Fragment } from 'react'
+import React, { Fragment, useMemo } from 'react'
import { StyleSheet, View } from 'react-native'
import WavesSVG from '../../../assets/wave50.svg'
export default ({ children }) => {
+ const aspectRatio = useMemo(() => {
+ // getting width and height of svg
+ const [, , width, height] = WavesSVG().props.viewBox.split(' ')
+
+ // calculate aspect ratio for svg wrapper
+ return Number(width) / Number(height)
+ }, [])
+
return (
<Fragment>
<View style={styles.wavesBackground}>
+ <View style={[styles.wavesWrapper, { aspectRatio }]}>
<WavesSVG />
</View>
+ </View>
{children}
</Fragment>
)
@@ -15,10 +25,11 @@ export default ({ children }) => {
const styles = StyleSheet.create({
wavesBackground: {
- position: 'absolute',
- bottom: 0,
- width: '310%',
- height: '110%',
+ ...StyleSheet.absoluteFillObject,
opacity: 0.2,
},
+ wavesWrapper: {
+ width: '100%',
+ height: '100%',
+ },
})
| 0 |
diff --git a/Dockerfile b/Dockerfile @@ -14,8 +14,6 @@ COPY docker/webpagereplay/LICENSE /webpagereplay/
RUN sudo apt-get update && sudo apt-get install libnss3-tools \
net-tools \
- # temporary fix for https://github.com/lovell/sharp/issues/1882
- libvips-dev \
iproute2 -y && \
mkdir -p $HOME/.pki/nssdb && \
certutil -d $HOME/.pki/nssdb -N
| 13 |
diff --git a/docs/src/pages/vue-components/menu.md b/docs/src/pages/vue-components/menu.md @@ -8,7 +8,7 @@ components:
- menu/MenuPositioning
---
-The QMenu component is a convenient way to show menus. Goes very well with [QList](/vue-components/lists-and-list-items) as dropdown content, but it's by no means limited to it.
+The QMenu component is a convenient way to show menus. Goes very well with [QList](/vue-components/list-and-list-items) as dropdown content, but it's by no means limited to it.
## Installation
<doc-installation components="QMenu" directives="ClosePopup" />
| 1 |
diff --git a/index.js b/index.js @@ -20,11 +20,13 @@ const unfurl = require('./lib/unfurl');
module.exports = (robot) => {
robot.on('issues.opened', issueOpened);
- robot.on('issues.labeled', matchMetaDataStatetoIssueMessage);
- robot.on('issues.unlabeled', matchMetaDataStatetoIssueMessage);
- robot.on('issues.assigned', matchMetaDataStatetoIssueMessage);
- robot.on('issues.unassigned', matchMetaDataStatetoIssueMessage);
- robot.on('issue_comment', matchMetaDataStatetoIssueMessage);
+ robot.on([
+ 'issues.labeled',
+ 'issues.unlabeled',
+ 'issues.assigned',
+ 'issues.unassigned',
+ 'issue_comment',
+ ], matchMetaDataStatetoIssueMessage);
robot.on('issues.closed', issueClosed);
| 7 |
diff --git a/src/trumbowyg.js b/src/trumbowyg.js @@ -1208,16 +1208,17 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
t.$ed.find('p:empty').remove();
}
- if (!keepRange) {
+ /*if (!keepRange) {
t.restoreRange();
- }
+ }*/
t.syncTextarea();
}
},
- semanticTag: function (oldTag, copyAttributes) {
- var newTag;
+ semanticTag: function (oldTag, copyAttributes, revert) {
+ var newTag, t = this;
+ var tmpTag = oldTag;
if (this.o.semantic != null && typeof this.o.semantic === 'object' && this.o.semantic.hasOwnProperty(oldTag)) {
newTag = this.o.semantic[oldTag];
@@ -1227,19 +1228,34 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
return;
}
+ if(revert) {
+ oldTag = newTag;
+ newTag = tmpTag;
+ }
+
$(oldTag, this.$ed).each(function () {
+ var resetRange = false;
var $oldTag = $(this);
if($oldTag.contents().length === 0) {
return false;
}
- $oldTag.wrap('<' + newTag + '/>');
+ if(t.range.startContainer.parentNode && t.range.startContainer.parentNode === this) {
+ resetRange = true;
+ }
+ var $newTag = $('<' + newTag + '/>');
+ $newTag.insertBefore($oldTag);
if (copyAttributes) {
$.each($oldTag.prop('attributes'), function () {
- $oldTag.parent().attr(this.name, this.value);
+ $newTag.attr(this.name, this.value);
});
}
- $oldTag.contents().unwrap();
+ $newTag.html($oldTag.html());
+ $oldTag.remove();
+ if(resetRange === true) {
+ t.range.selectNodeContents($newTag.get(0));
+ t.range.collapse(false);
+ }
});
},
@@ -1434,6 +1450,10 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
t.$ed.focus();
}
+ if(cmd === 'strikethrough' && t.o.semantic) {
+ t.semanticTag('strike', t.o.semanticKeepAttributes, true); // browsers cannot undo e.g. <del> as they expect <strike>
+ }
+
try {
t.doc.execCommand('styleWithCSS', false, forceCss || false);
} catch (c) {
| 11 |
diff --git a/lib/group/getLogo.js b/lib/group/getLogo.js @@ -10,13 +10,13 @@ exports.required = ['group']
// Define
function getLogo (group) {
var httpOpt = {
- url: '//www.roblox.com/groups/group.aspx?gid=' + group
+ url: '//api.roblox.com/groups/' + group
}
return http(httpOpt)
- .then(function (body) {
- var $ = parser.load(body)
- var logo = $('#ctl00_cphRoblox_GroupDescriptionEmblem').find('img').attr('src')
- if (!logo) throw new Error('Not found')
+ .then(function (group) {
+ group = JSON.parse(group);
+ if (!group) throw new Error('Not found')
+ var logo = group.EmblemUrl;
return logo
})
}
| 4 |
diff --git a/src/components/Ammo.jsx b/src/components/Ammo.jsx @@ -16,6 +16,7 @@ const styles = {
};
const MAX_DAMAGE = 200;
+const MAX_PENETRATION = 70;
const formattedData = rawData.data.map((ammoData) => {
const returnData = {
@@ -27,6 +28,11 @@ const formattedData = rawData.data.map((ammoData) => {
returnData.damage = MAX_DAMAGE;
}
+ if(ammoData.penetration > MAX_PENETRATION){
+ returnData.name = `${ammoData.name} (${ammoData.penetration})`;
+ returnData.penetration = MAX_PENETRATION;
+ }
+
return returnData;
})
.sort((a, b) => {
| 9 |
diff --git a/app.js b/app.js @@ -16,6 +16,16 @@ if (!semver.satisfies(nodejsVersion, '>=6.9.0')) {
process.exit(1);
}
+// See https://github.com/CartoDB/support/issues/984
+// CartoCSS properties text-wrap-width/text-wrap-character not working
+// This function should be called as soon as possible.
+function setICUEnvVariable() {
+ if (process.env['ICU_DATA'] === undefined) {
+ process.env['ICU_DATA'] = __dirname + '/node_modules/mapnik/lib/binding/node-v48-linux-x64/share/mapnik/icu';
+ }
+}
+setICUEnvVariable();
+
var argv = require('yargs')
.usage('Usage: $0 <environment> [options]')
.help('h')
| 12 |
diff --git a/articles/client-auth/v2/mobile-desktop.md b/articles/client-auth/v2/mobile-desktop.md @@ -188,15 +188,7 @@ https://${account.namespace}/authorize?
redirect_uri=${account.namespace}/mobile
```
-Request Parameters:
-
-* `audience`: The unique identifier of the target API. Use the __Identifier__ value in [API Settings](${manage_url}/#/apis). If you don't see this page in the Dashboard, enable the __Enable APIs Section__ toggle at [Account Settings > Advanced](${manage_url}/#/account/advanced).
-* `scope`: The [scopes](/scopes) for which you want to request authorization. Each scope must be separated from the others using a whitespace character. You can request any of the [standard OIDC scopes](https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims) for users (such as `profile` and `email`), custom claims conforming to a namespaced format (see note below on Arbitrary Claims), and any scopes supported by the target API. Include (at the very least) `openid`.
-* `response_type`: The credential type you want Auth0 to return (code or token). For authentication using PKCE, this value must be set to `code`.
-* `client_id`: Your Client's ID. You can find this value in your [Client's Settings](${manage_url}/#/clients/${account.clientId}/settings).
-* `redirect_uri`: The URL to which Auth0 will redirect the browser after user authorization. This URL must be specified as a valid callback URL in your [Client's Settings](${manage_url}/#/clients/${account.clientId}/settings).
-* `code_challenge`: the generated challenge associated with the `code_verifier`.
-* `code_challenge_method`: the method used to generate the challenge. The PKCE spec defines two methods (`S256` and `plain`), but Auth0 only supports `S256`.
+Please see [this page](/api-auth/tutorials/authorization-code-grant-pkce#3-get-the-user-s-authorization) for detailed information on the User Authorization request parameters.
::: panel-info Arbitrary Claims
To improve Client application compatibility, Auth0 returns profile information using an [OIDC-defined structured claim format](https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims). This means that arbitrary claims to ID or access tokens must conform to a namespaced format to avoid collisions with standard OIDC claims. For example, if your namespace is `https://foo.com/` and you want to add an arbitrary claim named `myclaim`, you would name the claim `https://foo.com/myclaim`, not `myclaim`.
@@ -244,13 +236,7 @@ Using the authorization code obtained in step 2, you can obtain the ID token by
}
```
-Request Parameters:
-
-* `grant_type`: Set this field to `authorization_code`
-* `client_id`: Your application's Client ID
-* `code_verifier`: The cryptographically random key used to generate the `code_challenge` passed to the `/authorize` endpoint
-* `code`: The authorization code received from the initial `authorize` call
-* `redirect_uri`: the `redirect_uri` passed to `/authorize` (these two values must match exactly)
+Please refer to [this page](/api-auth/tutorials/authorization-code-grant-pkce#4-exchange-the-authorization-code-for-an-access-token) for additional details on the ID Token request parameters.
If all goes well, you'll receive an HTTP 200 response with the following payload:
| 2 |
diff --git a/util.js b/util.js @@ -3,6 +3,7 @@ import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUti
// import atlaspack from './atlaspack.js';
import { getAddressFromMnemonic } from './blockchain.js';
import {playersMapName, tokensHost, storageHost, accountsHost, loginEndpoint, audioTimeoutTime} from './constants.js';
+import { getRenderer } from './renderer.js';
const localVector = new THREE.Vector3();
const localVector2 = new THREE.Vector3();
@@ -1177,3 +1178,16 @@ export const splitLinesToWidth = (() => {
return lines;
};
})();
+
+export function uploadGeometry(g) {
+ const renderer = getRenderer();
+ const gl = renderer.getContext();
+
+ for (const name in g.attributes) {
+ const attribute = g.attributes[name];
+ renderer.attributes.update(attribute, gl.ARRAY_BUFFER);
+ }
+ if (g.index) {
+ renderer.attributes.update(g.index, gl.ELEMENT_ARRAY_BUFFER);
+ }
+}
\ No newline at end of file
| 0 |
diff --git a/backup.js b/backup.js @@ -79,7 +79,9 @@ function bangleUpload() {
.then(() => file.async("string"))
.then(data => {
console.log("decoded", path);
- if (path.startsWith(BACKUP_STORAGEFILE_DIR)) {
+ if (data.length==0) { // https://github.com/espruino/BangleApps/issues/1593
+ console.log("Can't restore files of length 0, ignoring "+path);
+ } else if (path.startsWith(BACKUP_STORAGEFILE_DIR)) {
path = path.substr(BACKUP_STORAGEFILE_DIR.length+1);
cmds += AppInfo.getStorageFileUploadCommands(path, data)+"\n";
} else if (!path.includes("/")) {
| 8 |
diff --git a/scoper.inc.php b/scoper.inc.php @@ -13,10 +13,6 @@ use Isolated\Symfony\Component\Finder\Finder;
// Google API services to include classes for.
$google_services = implode(
'|',
- array_map(
- function( $service ) {
- return preg_quote( $service, '#' );
- },
array(
'Analytics',
'AnalyticsReporting',
@@ -27,7 +23,6 @@ $google_services = implode(
'TagManager',
'Webmasters',
)
- )
);
return array(
| 2 |
diff --git a/client/index.html b/client/index.html while (left < right && columnBlank(imageData, width, left, top, bottom))++left;
while (right - 1 > left && columnBlank(imageData, width, right - 1, top, bottom))--right;
+ try {
var trimmed = ctx.getImageData(left, top, right - left, bottom - top);
var copy = canvas.ownerDocument.createElement("canvas");
var copyCtx = copy.getContext("2d");
copyCtx.putImageData(trimmed, 0, 0);
return copy;
+ } catch (e) {
+ console.warn("Failed to trim image data", e);
+
+ return canvas;
+ }
};
})();
| 9 |
diff --git a/packages/gatsby-cli/src/init-starter.js b/packages/gatsby-cli/src/init-starter.js @@ -82,7 +82,7 @@ const clone = async (hostInfo: any, rootPath: string) => {
url = hostInfo.ssh({ noCommittish: true })
// Otherwise default to normal git syntax.
} else {
- url = hostInfo.git({ noCommittish: true })
+ url = hostInfo.https({ noCommittish: true, noGitPlus: true })
}
const branch = hostInfo.committish ? `-b ${hostInfo.committish}` : ``
| 4 |
diff --git a/iris/loaders/create-loader.js b/iris/loaders/create-loader.js @@ -13,12 +13,19 @@ type CreateLoaderOptionalOptions = {|
cacheExpiryTime?: number,
|};
-const TWO_HUNDRED_AND_FIFTY_MEGABYTE = 2.5e8;
+const ONE_GIGABYTE = 1e9;
+const SEVEN_HUNDRED_AND_FIFTY_MEGABYTE = 7.5e8;
-let caches: Map<Function, LRU<string, mixed>> = new Map();
+// We allow all caches together to maximally use 1gig of memory
+// and each individual cache can maximally use 750mb of memory
+let caches: LRU<Function, LRU<string, mixed>> = new LRU({
+ max: ONE_GIGABYTE,
+ length: item => (item && item.length) || 1,
+});
// Proactively evict old data every 30s instead of only when .get is called
const interval = setInterval(() => {
+ caches.prune();
caches.forEach(cache => cache.prune());
}, 30000);
@@ -38,7 +45,7 @@ const createLoader = (
cacheExpiryTime = cacheExpiryTime || 5000;
// Either create the cache or get the existing one
const newCache = new LRU({
- max: TWO_HUNDRED_AND_FIFTY_MEGABYTE,
+ max: SEVEN_HUNDRED_AND_FIFTY_MEGABYTE,
maxAge: cacheExpiryTime,
length: item => {
try {
@@ -49,12 +56,11 @@ const createLoader = (
},
});
- // NOTE(@mxstbr): That || newCache part will never be hit
- // but for some reason Flow complains otherwise
- let cache =
- caches.get(batchFn) ||
- caches.set(batchFn, newCache).get(batchFn) ||
- newCache;
+ let cache = caches.get(batchFn);
+ if (!cache) {
+ caches.set(batchFn, newCache);
+ cache = caches.get(batchFn);
+ }
return new DataLoader((keys: Array<Key>) => {
let uncachedKeys = [];
| 4 |
diff --git a/packages/lib/src/settings/options/index.js b/packages/lib/src/settings/options/index.js @@ -109,6 +109,7 @@ export default {
itemClick,
behaviourParams_item_clickAction,
imageMargin,
+ [optionsMap.layoutParams.structure.itemSpacing]: imageMargin,
hoveringBehaviour,
enableInfiniteScroll,
[optionsMap.behaviourParams.gallery.vertical.loadMore.enable]:
@@ -136,11 +137,15 @@ export default {
imageInfoType,
groupSize,
collageDensity,
+ [optionsMap.layoutParams.groups.density]: collageDensity,
gridStyle,
+ [optionsMap.layoutParams.structure.responsiveMode]: gridStyle,
hasThumbnails,
groupTypes,
thumbnailSize,
+ [optionsMap.layoutParams.thumbnails.size]: thumbnailSize,
galleryThumbnailsAlignment,
+ [optionsMap.layoutParams.thumbnails.alignment]: galleryThumbnailsAlignment,
isRTL,
scrollSnap,
itemBorderWidth,
@@ -156,9 +161,11 @@ export default {
scatter,
rotatingScatter,
thumbnailSpacings,
+ [optionsMap.layoutParams.thumbnails.spacing]: thumbnailSpacings,
slideshowLoop,
arrowsPadding,
arrowsSize,
+ [optionsMap.layoutParams.navigationArrows.size]: arrowsSize,
slideshowInfoSize,
textBoxHeight,
calculateTextBoxWidthMode,
@@ -176,6 +183,7 @@ export default {
itemEnableShadow,
videoLoop,
showArrows,
+ [optionsMap.layoutParams.navigationArrows.enable]: showArrows,
enableScroll,
imagePlacementAnimation,
gallerySizeType,
| 4 |
diff --git a/templates/indicators/add_indicator_modal.html b/templates/indicators/add_indicator_modal.html .addClass('has-error');
}
});
+
+ // show the modal if project modal is set to true
+ const url = new URL(window.location.href);
+ if (url.searchParams.get('quick-modal')) {
+ $('#addIndicatorModal').modal('show');
+ }
});
- $(() => {
- $('#createNewIndicator').click(() => {
+ var saveIndicator = (buttonId) => {
+ $(`#${buttonId}`).click(() => {
const formValue = $('#addIndicatorForm').serializeArray();
const indicator = {};
.select('val', '')
.trigger('change');
+ const urlWithoutQueryString = window.location.href.split('?')[0];
+ if (buttonId === 'createNewIndicatorAndNew') {
+ window.location.replace(`${urlWithoutQueryString}?quick-modal=true`);
+ } else {
setTimeout(() => {
- window.location.reload();
+ window.location.replace(urlWithoutQueryString);
}, 2000);
+ }
},
error: function (xhr, status, error) {
toastr.error(error, 'Failed');
});
}
});
+ }
+
+ $(() => {
+ saveIndicator('createNewIndicator');
+ saveIndicator('createNewIndicatorAndNew');
});
</script>
<!-- Modal for captring data -->
-<div
- class="modal fade"
- tabindex="-1"
- role="dialog"
- id="addIndicatorModal"
- aria-labelledby="addIndicatorModal"
->
+<div class="modal fade" tabindex="-1" role="dialog" id="addIndicatorModal" aria-labelledby="addIndicatorModal">
<div class="modal-dialog modal-md" role="form">
<div class="modal-content">
<form id="addIndicatorForm">
<div class="modal-body">
<div class="form-group" id="div_indicator_name">
<label class="control-label" for="indicatorName">Indicator Name*</label>
- <input
- type="text"
- class="form-control"
- name="indicator_name"
- id="indicatorName"
- autocomplete="off"
- placeholder="Indicator Name"
- />
- <span id="nameHelpBlock" class="help-block hikaya-hide"
- >Name is required</span
- >
+ <input type="text" class="form-control" name="indicator_name" id="indicatorName"
+ autocomplete="off" placeholder="Indicator Name" />
+ <span id="nameHelpBlock" class="help-block hikaya-hide">Name is required</span>
</div>
<div class="form-group" id="div_indicator_program">
<label for="indicatorWorkflowLevel1" class="control-label">
- {{ user.activity_user.organization.level_1_label }}*</label
- >
- <select
- name="workflowlevel1"
- id="indicatorWorkflowLevel1"
- class="form-control"
- >
+ {{ user.activity_user.organization.level_1_label }}*</label>
+ <select name="workflowlevel1" id="indicatorWorkflowLevel1" class="form-control">
<option value=""></option>
{% for program in get_programs %} {% if program.name %}
<option value="{{ program.id }}">{{ program.name }}</option>
{% endif %} {% endfor %}
</select>
- <span id="programHelpBlock" class="help-block hikaya-hide"
- >{{ user.activity_user.level_1_label }} is required</span
- >
+ <span id="programHelpBlock"
+ class="help-block hikaya-hide">{{ user.activity_user.level_1_label }} is required</span>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-close" data-dismiss="modal">
Close
</button>
+ <button id="createNewIndicatorAndNew" type="button" class="btn btn-outline-success">
+ Save & New
+ </button>
+
<button id="createNewIndicator" type="button" class="btn btn-success">
Save
</button>
| 0 |
diff --git a/scenes/shadows.scn b/scenes/shadows.scn }
}
},
+ {
+ "type": "application/quest",
+ "content": {
+ "name": "Reaver slay",
+ "description": "Destroy all reavers in the area",
+ "condition": "clearMobs",
+ "drops": [
+ {
+ "name": "Silk",
+ "quantity": 20,
+ "start_url": "../metaverse_modules/silk/"
+ }
+ ]
+ }
+ },
{
"position": [
0,
| 0 |
diff --git a/app/shared/containers/Welcome/Key.js b/app/shared/containers/Welcome/Key.js @@ -101,8 +101,9 @@ class WelcomeKeyContainer extends Component<Props> {
// Set this wallet as the used wallet
useWallet(connection.chainId, settings.account, authorization);
// Initialize the wallet setting
- setSetting('walletInit', true);
+ setSetting('authorization', authorization);
setSetting('chainId', connection.chainId);
+ setSetting('walletInit', true);
// Move on to the voter
history.push('/voter');
break;
@@ -110,6 +111,7 @@ class WelcomeKeyContainer extends Component<Props> {
default: {
// Validate against account
validateKey(key, settings).then((authorization) => {
+ setSetting('authorization', authorization);
setWalletMode('hot');
setTemporaryKey(key, authorization);
if (onStageSelect) {
| 12 |
diff --git a/packages/base-shell/cra-template-base/template.json b/packages/base-shell/cra-template-base/template.json "react": "16.x",
"react-dom": "16.x",
"react-intl": "4.x",
- "react-redux": "7.x",
"react-router-dom": "5.x",
- "redux": "4.x",
- "redux-logger": "3.x",
- "redux-persist": "6.x",
- "redux-thunk": "2.x",
"base-shell": "1.x"
}
}
| 2 |
diff --git a/src/lib/wallet/GoodWallet.js b/src/lib/wallet/GoodWallet.js @@ -289,7 +289,7 @@ export class GoodWallet {
const events = await contract.getPastEvents('allEvents', { fromBlock, toBlock })
const res1 = filterFunc(events, { event })
const res = filterFunc(res1, { returnValues: { ...filterPred } })
- log.debug({ res, events, res1, fromBlock: fromBlock.toString(), toBlock: toBlock && toBlock.toString() })
+ log.trace({ res, events, res1, fromBlock: fromBlock.toString(), toBlock: toBlock && toBlock.toString() })
return res
}
| 0 |
diff --git a/definitions/npm/@storybook/addon-actions_v3.x.x/flow_v0.25.x-/addon-actions_v3.x.x.js b/definitions/npm/@storybook/addon-actions_v3.x.x/flow_v0.25.x-/addon-actions_v3.x.x.js declare module '@storybook/addon-actions' {
- declare type Action = (name: string) => Function;
+ declare type Action = (name: string) => (...args: Array<any>) => void;
declare type DecorateFn = (args: Array<any>) => Array<any>;
declare module.exports: {
| 7 |
diff --git a/src/pages/docs/release-notes.hbs b/src/pages/docs/release-notes.hbs @@ -13,6 +13,13 @@ title: Spark Releases
</div>
<div class="drizzle-o-ContentGrouping">
<ul class="drizzle-b-List drizzle-b-List--spacing-m">
+ <li>
+ <a class="drizzle-b-Link" href="https://github.com/sparkdesignsystem/spark-design-system/releases/tag/december-4-2018">
+ December 4, 2018
+ </a>
+ <p>This release fixed a couple of minor bugs, added an exports file, the new Dropdown component, and the revised
+ Masthead component.</p>
+ </li>
<li>
<a class="drizzle-b-Link" href="https://github.com/sparkdesignsystem/spark-design-system/releases/tag/november-19-2018">
November 19, 2018
| 3 |
diff --git a/src/patterns/components/footer/react/info/footer.hbs b/src/patterns/components/footer/react/info/footer.hbs This object should have a key of heading
(to be used as the global section heading) and an items array of
objects. The items array objects should have keys of mediaType, src,
- mediaHref, altText, mediaAddClasses, analyticsString and description.
+ mediaHref, altText, mediaAddClasses, linkElement, analyticsString and description.
+ The value for linkElment can be 'a' for anchor or it can
+ be a React router Link.
These will be used to construct the global items.
The key of mediaType should be 'image', 'svg' or 'SprkIcon'
depending on what media is desired for each global item. The key
This array should contain objects with keys of heading and links.
The heading will be used as the heading for the column. The links value
should be an array of objects with the keys of href and text for each link.
- Each link item can also have an optional key of analyticsString. The value
- will be used for the data-analytics attribute on the link.
+ Each link can have a value for linkElement which can be 'a' for anchor or it can
+ be a React router Link. Each link item can also have an optional key of analyticsString.
+ The value will be used for the data-analytics attribute on the link.
</td>
</tr>
This object should have a key of heading
(to be used as the connect section heading) and an icons array of
objects. The icons array objects should have keys of href, name,
- analyticsString, and screenReaderText.
+ analyticsString, linkElment, and screenReaderText.
+ The value for linkElment can be 'a' for anchor or it can
+ be a React router Link.
These will be used to construct the images.
The key of screenReaderText is a string used to
display information of what the icon
This object should have a key of heading
(to be used as the award section heading) and an images array of
objects. The images array objects should have keys of href, src,
- altText, and addClasses. These will be used to construct the images.
+ altText, linkElement, and addClasses.
+ The value for linkElment can be 'a' for anchor or it can
+ be a React router Link.
+ These will be used to construct the images.
</td>
</tr>
<td>array</td>
<td>
This array should contain objects with keys of name, href,
- addClasses, and screenReaderText. The values from each key will be
+ addClasses, linkElement, and screenReaderText. The values from each key will be
used to display a SprkIcon. The key of addClasses is optional and is
a way to add addtional override classes to the icon. The key of
screenReaderText is a string used to display information of what the icon
is to screen readers.
+ The value for linkElment can be 'a' for anchor or it can
+ be a React router Link.
Each object inside the array will be a new icon.
</td>
</tr>
| 3 |
diff --git a/pkg/endpoints/cluster.go b/pkg/endpoints/cluster.go @@ -35,7 +35,7 @@ func (r Resource) getAllNamespaces(request *restful.Request, response *restful.R
}
func (r Resource) getAllServiceAccounts(request *restful.Request, response *restful.Response) {
- requestNamespace := request.PathParameter("namespace")
+ requestNamespace := utils.GetNamespace(request)
serviceAccounts, err := r.K8sClient.CoreV1().ServiceAccounts(requestNamespace).List(metav1.ListOptions{})
logging.Log.Debugf("In getAllServiceAccounts")
| 1 |
diff --git a/src/lib/loader/NodeJs.js b/src/lib/loader/NodeJs.js prefer-destructuring,
vars-on-top,
*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
const path = require('path');
const fs = require('fs');
const manifest = require('fbp-manifest');
@@ -53,7 +44,7 @@ var registerCustomLoaders = function (loader, componentLoaders, callback) {
const registerModules = function (loader, modules, callback) {
const compatible = modules.filter((m) => ['noflo', 'noflo-nodejs'].includes(m.runtime));
const componentLoaders = [];
- for (const m of Array.from(compatible)) {
+ for (const m of compatible) {
if (m.icon) { loader.setLibraryIcon(m.name, m.icon); }
if (m.noflo != null ? m.noflo.loader : undefined) {
@@ -61,7 +52,7 @@ const registerModules = function (loader, modules, callback) {
componentLoaders.push(loaderPath);
}
- for (const c of Array.from(m.components)) {
+ for (const c of m.components) {
loader.registerComponent(m.name, c.name, path.resolve(loader.baseDir, c.path));
}
}
| 2 |
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml @@ -3,6 +3,7 @@ on: pull_request
permissions:
contents: write
+ pull-requests: write
jobs:
dependabot:
@@ -18,6 +19,7 @@ jobs:
if: |
(contains(steps.metadata.outputs.dependency-names, 'github.com/stripe/stripe-go/v72') ||
contains(steps.metadata.outputs.dependency-names, 'Stripe.net') ||
+ contains(steps.metadata.outputs.dependency-names, 'com.stripe:stripe-java') ||
contains(steps.metadata.outputs.dependency-names, 'stripe/stripe-php') ||
contains(steps.metadata.outputs.dependency-names, 'stripe')) &&
steps.metadata.outputs.update-type == 'version-update:semver-minor'
| 0 |
diff --git a/package-lock.json b/package-lock.json "integrity": "sha512-zmEFV8WBRsW+mPQumO1/4b34QNALBVReaiHJOkxhUsdo/AvYM62c+SKSuLi2aZ42t3ocK6OI0uwUXRvrIbREZw==",
"dev": true,
"dependencies": {
+ "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents",
"chokidar": "^3.4.0",
"commander": "^4.0.1",
"convert-source-map": "^1.1.0",
"dependencies": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
+ "fsevents": "~2.3.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
"dependencies": {
"anymatch": "^1.3.0",
"async-each": "^1.0.0",
+ "fsevents": "^1.0.0",
"glob-parent": "^2.0.0",
"inherits": "^2.0.1",
"is-binary-path": "^1.0.0",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
"dependencies": {
+ "@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
"get-stream": "^5.1.0",
"yauzl": "^2.10.0"
"anymatch": "^2.0.0",
"async-each": "^1.0.1",
"braces": "^2.3.2",
+ "fsevents": "^1.2.7",
"glob-parent": "^3.1.0",
"inherits": "^2.0.3",
"is-binary-path": "^1.0.0",
| 13 |
diff --git a/src/plugins/Informer.js b/src/plugins/Informer.js @@ -57,6 +57,7 @@ module.exports = class Informer extends Plugin {
aria-hidden={isHidden}>
<p role="alert">
{message}
+ {' '}
{details && <span style={{ color: this.opts.typeColors[type].bg }}
data-balloon={details}
data-balloon-pos="up"
| 0 |
diff --git a/packages/app/src/components/SubscribeButton.tsx b/packages/app/src/components/SubscribeButton.tsx @@ -36,21 +36,21 @@ const SubscribeButton: FC<Props> = (props: Props) => {
);
}
- let isSubscribing;
+ let isSubscribed;
switch (subscriptionData.status) {
case true:
- isSubscribing = true;
+ isSubscribed = true;
break;
case false:
- isSubscribing = false;
+ isSubscribed = false;
break;
default:
- isSubscribing = null;
+ isSubscribed = null;
}
- const buttonClass = `${isSubscribing ? 'active' : ''} ${appContainer.isGuestUser ? 'disabled' : ''}`;
- const iconClass = isSubscribing || isSubscribing == null ? 'fa fa-eye' : 'fa fa-eye-slash';
+ const buttonClass = `${isSubscribed ? 'active' : ''} ${appContainer.isGuestUser ? 'disabled' : ''}`;
+ const iconClass = isSubscribed || isSubscribed == null ? 'fa fa-eye' : 'fa fa-eye-slash';
const handleClick = async() => {
if (appContainer.isGuestUser) {
@@ -58,7 +58,7 @@ const SubscribeButton: FC<Props> = (props: Props) => {
}
try {
- const res = await appContainer.apiv3Put('page/subscribe', { pageId, status: !isSubscribing });
+ const res = await appContainer.apiv3Put('page/subscribe', { pageId, status: !isSubscribed });
if (res) {
mutate();
}
| 10 |
diff --git a/src/tagui b/src/tagui #!/bin/bash
# SCRIPT FOR RUNNING TA.GUI FRAMEWORK ~ TEBEL.ORG #
+# set local path to casperjs and environment path to phantomjs
+CASPERJS_EXECUTABLE="/usr/local/bin/casperjs"
+export PHANTOMJS_EXECUTABLE="/usr/local/bin/phantomjs"
+
# check firefox parameter to run on visible firefox browser through slimerjs
if [ "$2" = "firefox" ]; then set -- "$1" "--engine=slimerjs" "${@:3}"; fi
if [ "$3" = "firefox" ]; then set -- "${@:1:2}" "--engine=slimerjs" "${@:4}"; fi
@@ -66,8 +70,8 @@ do export tagui_data_set=$tagui_data_set
php -q tagui_parse.php "$1" | tee -a "$1".log
if [ -s "$1".log ] && [ "$tagui_data_set" -eq 1 ]
then echo "ERROR - automation aborted due to above" | tee -a "$1".log; break
-elif [ "$tagui_test_mode" == false ]; then casperjs $params | tee -a "$1".log
-else export tagui_test_mode=true; casperjs test $params --xunit="$1".xml | tee -a "$1".log; fi; done
+elif [ "$tagui_test_mode" == false ]; then $CASPERJS_EXECUTABLE $params | tee -a "$1".log
+else export tagui_test_mode=true; $CASPERJS_EXECUTABLE test $params --xunit="$1".xml | tee -a "$1".log; fi; done
# check report option to generate html automation log
if [ -s "$1".log ] && [ "$tagui_html_report" == true ]; then php -q tagui_report.php "$1"; fi
| 12 |
diff --git a/README.md b/README.md @@ -19,7 +19,7 @@ The Auth0 Deploy CLI is a tool that helps you manage your Auth0 tenant configura
- [Configuring the Deploy CLI](docs/configuring-the-deploy-cli.md)
- [Keyword Replacement](docs/keyword-replacement.md)
- [Incorporating Into Multi-environment Workflows](docs/multi-environment-workflow.md)
-- [Excluding from Management Purview](docs/excluding-from-management.md)
+- [Excluding resources from management](docs/excluding-from-management.md)
- [Available Resource Formats](#)
- [Terraform Provider](#)
- [How to Contribute](#)
| 10 |
diff --git a/templates/examples/extensions/py_lambda_hooks/CanvasHook/CanvasHook.py b/templates/examples/extensions/py_lambda_hooks/CanvasHook/CanvasHook.py @@ -17,7 +17,7 @@ import canvasapi
from canvasapi import Canvas
-MATCHING_TOLERANCE_SCORE = 70
+MATCHING_TOLERANCE_SCORE = 70 #used for matching accuracy with fuzzy match
#----------------------------------------------------------------------
# function: get_secret
@@ -101,7 +101,6 @@ def query_enrollments_for_student(canvas, student_user_name, userinput):
course_name.append(course.name)
result = {"CourseNames": course_name}
-
return result
@@ -207,7 +206,6 @@ def query_announcements_for_student(canvas, student_user_name, userinput):
course_announcements += '</ul>'
result = {"Announcements": course_announcements}
-
return result
#----------------------------------------------------------------------
@@ -220,7 +218,6 @@ def query_grades_for_student(canvas, student_user_name, userinput):
if user:
course_list = []
- #courses = user.get_enrollments(include='current_points', search_by='course')
courses = user.get_courses(enrollment_status='active')
for course in courses:
@@ -345,7 +342,7 @@ def handler(event, context):
# Determine what the query is.
if query == 'CourseAssignments':
- # Retrieve the due dates for this student.
+ # Retrieve the assignments for this student.
result = query_course_assignments_for_student(canvas, student_user_name, userinput)
if result['CourseAssignments']:
return_message = result['CourseAssignments']
@@ -353,13 +350,13 @@ def handler(event, context):
else:
event['res']['session']['appContext']['altMessages']['markdown'] = "There are no upcoming assignments for this course."
elif query == 'CanvasMenu':
- # provide a menu to choose from (announcements, enrollments, grades)
+ # provide a menu to choose from (announcements, enrollments, syllabus, assignments, grades)
choicelist = [{'text':'Announcements','value':"tell me about my announcements"}, {'text':'Course Enrollments','value':"tell me about my enrollments"}, {'text':'Course Syllabus','value':"tell me about my syllabus"}, {'text':'Assignments','value':"tell me about my assignments"}, {'text':'Grades','value':"tell me about my grades"}]
genericAttachments = {'version': '1','contentType': 'application/vnd.amazonaws.card.generic','genericAttachments':[{"title":"response buttons","buttons":choicelist}]}
event['res']['session']['appContext']['responseCard'] = genericAttachments
event['res']['session']['appContext']['altMessages']['markdown'] = "Hello {}, please select one of the options below:".format(student_name)
elif query == 'CourseEnrollments':
- # Retrieve the enrollments for this student.
+ # Retrieve the course options for this student.
result = query_enrollments_for_student(canvas, student_user_name, userinput)
return_courses = result['CourseNames']
if return_courses:
@@ -372,11 +369,11 @@ def handler(event, context):
else:
event['res']['session']['appContext']['altMessages']['markdown'] = "You are not currently enrolled in any courses"
elif query == 'SyllabusForCourse':
- # Retrieve the enrollments for this student.
+ # Retrieve the course syllabus for this student.
result = query_syllabus_for_student(canvas, student_user_name, userinput)
event['res']['session']['appContext']['altMessages']['markdown'] = result['CourseSyllabus']
elif query == 'ChoicesForStudent':
- # Retrieve the enrollments for this student.
+ # Retrieve the course options for this student.
result = query_choices_for_student(canvas, student_user_name, userinput)
returned_course = result['Choice']
genericattachment = ['assignments','syllabus','grades']
@@ -394,7 +391,7 @@ def handler(event, context):
else:
event['res']['session']['appContext']['altMessages']['markdown'] = "You don't have any announcements at this moment."
elif query == 'GradesForStudent':
- # Retrieve the announcements for this student.
+ # Retrieve the course grades for this student.
result = query_grades_for_student(canvas, student_user_name, userinput)
return_message = result['Grades']
event['res']['session']['appContext']['altMessages']['markdown'] = return_message
| 3 |
diff --git a/src/services/app.js b/src/services/app.js @@ -1524,6 +1524,7 @@ export async function addVolume(
volume_name: body.volume_name,
volume_type: body.volume_type,
volume_path: body.volume_path,
+ mode: body.mode,
volume_capacity: new Number(body.volume_capacity),
file_content: body.volume_type == 'config-file' ? body.file_content : ''
}
@@ -1547,6 +1548,7 @@ export async function editorVolume(
{
method: 'put',
data: {
+ mode: body.mode,
new_volume_path: body.new_volume_path,
new_file_content: body.new_file_content
}
| 1 |
diff --git a/src/widgets/CalendarWidget.js b/src/widgets/CalendarWidget.js @@ -123,9 +123,12 @@ export default class CalendarWidget extends InputWidget {
this.setInputMask(this.calendar._input, convertFormatToMask(this.settings.format));
// Make sure we commit the value after a blur event occurs.
- this.addEventListener(this.calendar._input, 'blur', () =>
- this.calendar.setDate(this.calendar._input.value, true, this.settings.altFormat)
- );
+ this.addEventListener(this.calendar._input, 'blur', () => this.setDate());
+ this.addEventListener(this.calendar._input, 'keyup', () => {
+ if (this.calendar.parseDate(this.calendar._input.value)) {
+ this.setDate();
+ }
+ });
}
}
@@ -276,6 +279,10 @@ export default class CalendarWidget extends InputWidget {
return formatDate(value, format, this.timezone);
}
+ setDate() {
+ this.calendar.setDate(this.calendar._input.value, true, this.settings.altFormat);
+ }
+
validationValue(value) {
if (typeof value === 'string') {
return new Date(value);
| 7 |
diff --git a/docs/specs/arrange-by-tags.yaml b/docs/specs/arrange-by-tags.yaml @@ -84,6 +84,22 @@ paths:
responses:
'200':
description: successful operation
+ /path-in-first-and-third-tag:
+ get:
+ summary: Path belongs to First and Third Tag
+ tags:
+ - The First Tag
+ - Last Tag
+ responses:
+ '200':
+ description: successful operation
+ /no-tag/path:
+ get:
+ summary: This path do not have any tag
+ responses:
+ '200':
+ description: successful operation
+
tags:
- name: The First Tag
- name: And Second Tag
| 7 |
diff --git a/src/plugins/grid.js b/src/plugins/grid.js @@ -61,7 +61,7 @@ grid.prototype.willDrawChart = function(e) {
ticks = layout.yticks;
ctx.save();
// draw grids for the different y axes
- ticks.forEach(function (tick) {
+ ticks.forEach(tick => {
if (!tick.has_tick) return;
var axis = tick.axis;
if (drawGrid[axis]) {
@@ -81,7 +81,7 @@ grid.prototype.willDrawChart = function(e) {
ctx.restore();
}
- }.bind(this));
+ });
ctx.restore();
}
@@ -96,7 +96,7 @@ grid.prototype.willDrawChart = function(e) {
}
ctx.strokeStyle = g.getOptionForAxis('gridLineColor', 'x');
ctx.lineWidth = g.getOptionForAxis('gridLineWidth', 'x');
- ticks.forEach(function (tick) {
+ ticks.forEach(tick => {
if (!tick.has_tick) return;
x = halfUp(area.x + tick.pos * area.w);
y = halfDown(area.y + area.h);
@@ -104,7 +104,7 @@ grid.prototype.willDrawChart = function(e) {
ctx.moveTo(x, y);
ctx.lineTo(x, area.y);
ctx.stroke();
- }.bind(this));
+ });
if (stroking) {
if (ctx.setLineDash) ctx.setLineDash([]);
}
| 13 |
diff --git a/src/App.vue b/src/App.vue @@ -45,7 +45,7 @@ export default {
.ec-doc {
// Reset
- font-family: "Helvetica Neue", "Segoe UI", Tahoma, Arial, "Hiragino Sans GB", STHeiti, "Microsoft Yahei", "WenQuanYi Micro Hei", sans-serif;
+ font-family: "Source Sans Pro", "Helvetica Neue", "Segoe UI", Arial, "PingFang SC", STHeiti, "Microsoft Yahei", sans-serif;
ul, ol {
margin: 0;
@@ -56,6 +56,17 @@ export default {
.el-aside {
border-right: 1px solid #ddd;
+
+ position: relative;
+
+ .doc-nav {
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ overflow-y: scroll;
+ }
}
.el-main {
| 7 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/task/Task.js b/public/javascripts/SVLabel/src/SVLabel/task/Task.js @@ -152,7 +152,16 @@ function Task (geojson, tutorialTask, currentLat, currentLng, startPointReversed
this._getSubsetOfCoordinates = function(fromLat, fromLng, toLat, toLng) {
var startPoint = turf.point([fromLng, fromLat]);
var endPoint = turf.point([toLng, toLat]);
- return turf.cleanCoords(turf.lineSlice(startPoint, endPoint, _geojson.features[0])).geometry.coordinates;
+ var slicedLine = turf.lineSlice(startPoint, endPoint, _geojson.features[0]);
+
+ var coordinates = slicedLine.geometry.coordinates;
+ // If the linestring just has two identical points, `turf.cleanCoords` doesn't work, so just return a point.
+ if (coordinates.length === 2 && coordinates[0] === coordinates[1]) {
+ console.log('fixing');
+ return [coordinates[0]];
+ } else {
+ return turf.cleanCoords(slicedLine).geometry.coordinates
+ }
};
this._getSegmentsToAPoint = function (lat, lng) {
| 1 |
diff --git a/src/server/create-bundle-renderer.js b/src/server/create-bundle-renderer.js @@ -37,7 +37,11 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
let basedir = rendererOptions && rendererOptions.basedir
// load bundle if given filepath
- if (typeof bundle === 'string' && bundle.charAt(0) === '/') {
+ if (
+ typeof bundle === 'string' &&
+ /\.js(on)?$/.test(bundle) &&
+ path.isAbsolute(bundle)
+ ) {
if (fs.existsSync(bundle)) {
basedir = basedir || path.dirname(bundle)
bundle = fs.readFileSync(bundle, 'utf-8')
| 7 |
diff --git a/docker-compose.yml b/docker-compose.yml @@ -60,7 +60,7 @@ services:
volumes:
- ./tmp/serverless-integration-test-aws-groovy-gradle:/app
aws-scala-sbt:
- image: hseeberger/scala-sbt
+ image: hseeberger/scala-sbt:8u181_2.12.8_1.2.8
volumes:
- ./tmp/serverless-integration-test-aws-scala-sbt:/app
aws-csharp:
| 7 |
diff --git a/assets/js/modules/analytics/components/settings/SettingsForm.js b/assets/js/modules/analytics/components/settings/SettingsForm.js @@ -51,8 +51,6 @@ function SettingsForm() {
};
} );
- global.console.log( gtmAnalyticsPropertyID, gtmAnalyticsPropertyIDPermission );
-
let gtmTagNotice;
if ( isValidPropertyID( gtmAnalyticsPropertyID ) && gtmAnalyticsPropertyIDPermission ) {
gtmTagNotice = <ExistingGTMPropertyNotice />;
| 2 |
diff --git a/sirepo/job_supervisor.py b/sirepo/job_supervisor.py @@ -423,9 +423,8 @@ class _ComputeJob(PKDict):
@classmethod
def __db_load(cls, compute_jid):
- d = pkcollections.json_load_any(
- cls.__db_file(compute_jid),
- )
+ f = cls.__db_file(compute_jid)
+ d = pkcollections.json_load_any(f)
for k in [
'alert',
'cancelledAfterSecs',
@@ -439,6 +438,7 @@ class _ComputeJob(PKDict):
h.setdefault(k, None)
d.pksetdefault(
computeModel=lambda: sirepo.sim_data.split_jid(compute_jid).compute_model,
+ dbUpdateTime=lambda: f.mtime(),
)
return d
| 12 |
diff --git a/src/utils/wallet.js b/src/utils/wallet.js @@ -751,12 +751,7 @@ class Wallet {
async setupRecoveryMessage(accountId, method, securityCode, fundingContract, fundingKey) {
// temp account was set during create account
const tempAccount = getTempAccount()
- let securityCodeResult
- if (tempAccount && tempAccount.accountId) {
- securityCodeResult = await this.validateSecurityCodeForTempAccount(accountId, method, securityCode);
- } else {
- securityCodeResult = await this.validateSecurityCode(accountId, method, securityCode);
- }
+ let securityCodeResult = await this.validateSecurityCodeForTempAccount(accountId, method, securityCode);
if (!securityCodeResult || securityCodeResult.length === 0) {
console.log('INVALID CODE', securityCodeResult)
return
| 1 |
diff --git a/src/components/Form.js b/src/components/Form.js @@ -32,13 +32,13 @@ export default class extends Component {
const {options, src, form} = this.props;
if (src) {
- this.createPromise = new Form(this.element, src, options).then(formio => {
+ this.createPromise = new Form(this.element, src, options).render().then(formio => {
this.formio = formio;
this.formio.src = src;
});
}
if (form) {
- this.createPromise = new Form(this.element, form, options).then(formio => {
+ this.createPromise = new Form(this.element, form, options).render().then(formio => {
this.formio = formio;
this.formio.form = form;
});
@@ -77,14 +77,14 @@ export default class extends Component {
const {options, src, form, submission} = this.props;
if (src !== nextProps.src) {
- this.createPromise = new Form(this.element, nextProps.src, options).then(formio => {
+ this.createPromise = new Form(this.element, nextProps.src, options).render().then(formio => {
this.formio = formio;
this.formio.src = nextProps.src;
});
this.initializeFormio();
}
if (form !== nextProps.form) {
- this.createPromise = new Form(this.element, nextProps.form, options).then(formio => {
+ this.createPromise = new Form(this.element, nextProps.form, options).render().then(formio => {
this.formio = formio;
this.formio.form = form;
});
| 1 |
diff --git a/src/client/Wrapper.js b/src/client/Wrapper.js @@ -35,7 +35,6 @@ import Topnav from './components/Navigation/Topnav';
import Transfer from './wallet/Transfer';
import PowerUpOrDown from './wallet/PowerUpOrDown';
import BBackTop from './components/BBackTop';
-import EmergencyNotificationPopup from './notifications/EmergencyNotificationPopup';
@withRouter
@connect(
@@ -227,7 +226,6 @@ export default class Wrapper extends React.PureComponent {
</Layout.Header>
<div className="content">
{renderRoutes(this.props.route.routes)}
- <EmergencyNotificationPopup />
<Redirect />
<Transfer />
<PowerUpOrDown />
| 2 |
diff --git a/src/components/list/list.less b/src/components/list/list.less }
}
&:last-child, &:last-child li:last-child {
- .item-inner {
+ > .item-inner,
+ > .item-content > .item-inner,
+ > .item-link > .item-content > .item-inner {
.hairline-remove(bottom);
}
}
| 1 |
diff --git a/src/components/dashboard/Dashboard.js b/src/components/dashboard/Dashboard.js @@ -204,12 +204,14 @@ const Dashboard = props => {
//subscribeToFeed calls this method on mount effect without dependencies because currently we dont want it re-subscribe
//so we use a global variable
if (!didRender) {
+ log.debug('waiting for feed animation')
+
// a time to perform feed load animation till the end
await delay(2000)
didRender = true
}
const res = (await feedPromise) || []
- log.debug('getFeedPage result:', { res })
+ log.debug('getFeedPage getFormattedEvents result:', { res })
res.length > 0 && !didRender && store.set('feedLoadAnimShown')(true)
res.length > 0 && setFeeds(res)
} else {
| 0 |
diff --git a/src/docs/plugins/serverless.md b/src/docs/plugins/serverless.md @@ -259,7 +259,9 @@ permalink:
#### Dynamic Slugs and Serverless Global Data
-Perhaps most interestingly, this works with dynamic URLs too. This will work with any syntax supported by the [`url-pattern` package](https://www.npmjs.com/package/url-pattern).
+Perhaps most interestingly, this works with dynamic URLs too. This will work with any syntax supported by the [`path-to-regexp` package](https://www.npmjs.com/package/path-to-regexp).
+
+{% callout "info", "md" %}Astute users of the 1.0 canary prereleases will note that starting in canary 45, this package changed from [`url-pattern`](https://www.npmjs.com/package/url-pattern) to `path-to-regexp`. [Read more at Issue 1988](https://github.com/11ty/eleventy/issues/1988).{% endcallout %}
```yaml
---
| 3 |
diff --git a/test/utilsSpec.js b/test/utilsSpec.js @@ -177,11 +177,6 @@ describe("objectToCode", function () {
describe("buildSqlModule", function () {
- // For some reasons these tests have a problem on Travis CI under Node.js 0.12,
- // while locally they all work just fine. It is a Travis CI issue.
-
- if (process.version.indexOf("v0.12.") === -1) {
-
it("must succeed for a valid configurator", function () {
var code1 = utils.buildSqlModule({dir: './test/sql'});
var code2 = utils.buildSqlModule({dir: './test/sql', output: path.join(__dirname, '../generated.js')});
@@ -242,7 +237,6 @@ describe("buildSqlModule", function () {
}).toThrow();
});
});
- }
});
describe('isDev', function () {
| 1 |
diff --git a/doc/api-reference.md b/doc/api-reference.md @@ -81,11 +81,11 @@ Edit the current input string, replacing the characters between `startIdx` and `
<b><pre class="api">m.match(optStartRule?: string) → MatchResult</pre></b>
-Like <a href="Grammar.match">Grammar's `match` method</a>, but operates incrementally.
+Like [Grammar's `match` method](#Grammar.match), but operates incrementally.
<b><pre class="api">m.trace(optStartRule?: string) → Trace</pre></b>
-Like <a href="#Grammar.trace">Grammar's `trace` method</a>, but operates incrementally.
+Like [Grammar's `trace` method](#Grammar.trace), but operates incrementally.
MatchResult objects
-------------------
| 1 |
diff --git a/packages/cx/src/widgets/overlay/Window.js b/packages/cx/src/widgets/overlay/Window.js @@ -48,13 +48,16 @@ export class Window extends Overlay {
}
exploreCleanup(context, instance) {
+ super.exploreCleanup(context, instance);
+
let {helpers} = instance;
- if (helpers) {
- if (helpers.header)
- helpers.header.unregisterContentPlaceholder();
- if (helpers.footer)
- helpers.footer.unregisterContentPlaceholder();
- }
+ let unregisterHeader = helpers.header && helpers.header.unregisterContentPlaceholder;
+ if (unregisterHeader)
+ unregisterHeader();
+
+ let unregisterFooter = helpers.footer && helpers.footer.unregisterContentPlaceholder;
+ if (unregisterFooter)
+ unregisterFooter();
}
renderHeader(context, instance, key) {
| 1 |
diff --git a/app/controllers/carto/api/paged_searcher.rb b/app/controllers/carto/api/paged_searcher.rb @@ -16,13 +16,14 @@ module Carto
total: total_count,
count: result.count,
result: result,
- _links: {}
+ _links: {
+ first: { href: yield(page: 1, per_page: per_page, order: order) },
+ last: { href: yield(page: last_page, per_page: per_page, order: order) }
+ }
}
- metadata[:_links][:first] = { href: yield(page: 1, per_page: per_page, order: order) }
metadata[:_links][:prev] = { href: yield(page: page - 1, per_page: per_page, order: order) } if page > 1
metadata[:_links][:next] = { href: yield(page: page + 1, per_page: per_page, order: order) } if last_page > page
- metadata[:_links][:last] = { href: yield(page: last_page, per_page: per_page, order: order) }
metadata
end
end
| 5 |
diff --git a/tests/osgDB/ReaderParser.js b/tests/osgDB/ReaderParser.js @@ -4,7 +4,7 @@ var mockup = require( 'tests/mockup/mockup' );
var ReaderParser = require( 'osgDB/readerParser' );
var Texture = require( 'osg/Texture' );
var Input = require( 'osgDB/Input' );
-var PrimitiveSet = require( 'osg/primitiveSet' );
+var primitiveSet = require( 'osg/primitiveSet' );
module.exports = function () {
@@ -200,7 +200,7 @@ module.exports = function () {
assert.isOk( result.getStateSet() !== undefined, 'check geometry StateSet' );
assert.isOk( result.getStateSet().getUserData() !== undefined, 'check StateSet userdata' );
assert.isOk( result.getPrimitiveSetList().length === 1, 'check primitives' );
- assert.isOk( result.getPrimitiveSetList()[ 0 ].getMode() === PrimitiveSet.TRIANGLES, 'check triangles primitive' );
+ assert.isOk( result.getPrimitiveSetList()[ 0 ].getMode() === primitiveSet.TRIANGLES, 'check triangles primitive' );
assert.isOk( result.getPrimitiveSetList()[ 0 ].getFirst() === 0, 'check triangles first index' );
assert.isOk( result.getPrimitiveSetList()[ 0 ].getIndices().getElements().length === 36, 'check triangles indices' );
assert.isOk( result.getPrimitiveSetList()[ 0 ].getIndices().getElements().length === result.getPrimitiveSetList()[ 0 ].getCount(), 'check triangles count' );
@@ -930,7 +930,7 @@ module.exports = function () {
return result;
} ).then( function ( geom ) {
var result = geom.getPrimitiveSetList()[ 0 ];
- assert.isOk( result.getMode() === PrimitiveSet.TRIANGLES, 'check DrawArray triangles' );
+ assert.isOk( result.getMode() === primitiveSet.TRIANGLES, 'check DrawArray triangles' );
assert.isOk( result.getCount() === 3540, 'check triangles count' );
assert.isOk( result.getFirst() === 10, 'check triangles first' );
done();
@@ -954,7 +954,7 @@ module.exports = function () {
( new Input() ).setJSON( tree2 ).readObject().then( function ( result ) {
return result.getPrimitiveSetList()[ 0 ];
} ).then( function ( result ) {
- assert.isOk( result.getMode() === PrimitiveSet.TRIANGLES, 'check DrawArray triangles' );
+ assert.isOk( result.getMode() === primitiveSet.TRIANGLES, 'check DrawArray triangles' );
assert.isOk( result.getCount() === 0, 'check triangles count' );
assert.isOk( result.getFirst() === 0, 'check triangles first' );
done();
@@ -980,7 +980,7 @@ module.exports = function () {
( new Input() ).setJSON( tree ).readObject().then( function ( result ) {
return result.getPrimitiveSetList()[ 0 ];
} ).then( function ( result ) {
- assert.isOk( result.getMode() === PrimitiveSet.TRIANGLES, 'check DrawArrayLengths triangles' );
+ assert.isOk( result.getMode() === primitiveSet.TRIANGLES, 'check DrawArrayLengths triangles' );
assert.isOk( result.getArrayLengths()[ 0 ] === 3, 'check array lenght' );
assert.isOk( result.getFirst() === 10, 'check triangles first' );
done();
| 10 |
diff --git a/src/components/molecules/page-header/index.js b/src/components/molecules/page-header/index.js @@ -12,15 +12,14 @@ import Actions from './actions'
const StyledPageHeader = styled.div`
margin-bottom: ${spacing.large};
+ ${StyledHeading[1]} {
+ margin: 0;
+ }
`
const TitleGroup = styled.div`
display: flex;
align-items: center;
-
- ${StyledHeading[1]} {
- margin: 0;
- }
`
const StyledLogo = styled.span`
| 5 |
diff --git a/README.md b/README.md @@ -69,7 +69,7 @@ Create a super user:
python manage.py createsuperuser
```
-You will use this super user to login as administrator in your local kamu application.
+You will use this super user to login as administrator in your local Kamu application.
Seed the database with initial dump data:
@@ -86,11 +86,10 @@ npm start
Now just go to [http://localhost:8000](http://localhost:8000) in your browser :)
-**For setup local with authenticate with Okta Preview:**
-Use the "OKTA_METADATA_URL='url-of-okta-saml'" concatenating with the python's commands:
+**For local setup with Okta authentication:**
+Use the `OKTA_METADATA_URL` environment variable, concatenating it with the usual commands. Examples:
```shell
- Examples:
OKTA_METADATA_URL='url-of-okta-saml' npm start
OKTA_METADATA_URL='url-of-okta-saml' python manage.py migrate
```
@@ -102,13 +101,14 @@ Another way is to export the var and then execute the commands:
npm start
python manage.py migrate
```
-In case of need authenticate without Okta preview again, execute:
+
+If you wish to disable Okta authentication again, execute:
```shell
unset OKTA_METADATA_URL
```
-## Executing using docker for local development
+## Executing using Docker for local development
We support Docker =), just go to your favorite console and type:
```
| 7 |
diff --git a/src/core/lib/Ip.mjs b/src/core/lib/Ip.mjs @@ -396,3 +396,13 @@ export function _genIpv6Mask(cidr) {
* @private
*/
const _LARGE_RANGE_ERROR = "The specified range contains more than 65,536 addresses. Running this query could crash your browser. If you want to run it, select the \"Allow large queries\" option. You are advised to turn off \"Auto Bake\" whilst editing large ranges.";
+/**
+* @constant
+* @default
+*/
+export const IPV4_REGEX = /^\s*((?:\d{1,3}\.){3}\d{1,3})\s*$/;
+/**
+* @constant
+* @default
+*/
+export const IPV6_REGEX = /^\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*$/i;
| 3 |
diff --git a/src/pages/home/sidebar/ChatSwitcherView.js b/src/pages/home/sidebar/ChatSwitcherView.js @@ -240,7 +240,7 @@ class ChatSwitcherView extends React.Component {
handleKeyPress(e) {
let newFocusedIndex;
- switch (e.key) {
+ switch (e.nativeEvent.key) {
case 'Enter':
// Pass the option to the selectRow method which
// will fire the correct callback for the option type.
| 4 |
diff --git a/src/components/general/character/Emotions.jsx b/src/components/general/character/Emotions.jsx @@ -14,6 +14,28 @@ const emotions = [
'surprise',
];
+export const setFacePoseValue = (emotion, value) => {
+ const localPlayer = metaversefile.useLocalPlayer();
+
+ const facePoseActionIndex = localPlayer.findActionIndex( a => a.type === 'facepose' && a.emotion === emotion );
+ if ( facePoseActionIndex !== -1 ) {
+
+ localPlayer.removeActionIndex( facePoseActionIndex );
+
+ }
+
+ if ( value > 0 ) {
+
+ const newAction = {
+ type: 'facepose',
+ emotion,
+ value,
+ };
+ localPlayer.addAction(newAction);
+
+ }
+};
+
export const Emotions = ({
parentOpened,
}) => {
| 0 |
diff --git a/packages/@netlify-build/src/build/main.js b/packages/@netlify-build/src/build/main.js @@ -111,44 +111,9 @@ module.exports = async function build(inputOptions = {}) {
const originalConsoleLog = console.log
console.log = netlifyLogs.patch(redactedKeys)
- const {
- build: { command: configCommand, lifecycle: configLifecycle }
- } = netlifyConfig
- /* Get active build instructions */
- const instructions = LIFECYCLE.flatMap(hook => {
- return [
- // Support for old command. Add build.command to execution
- configCommand && hook === 'build'
- ? {
- name: `config.build.command`,
- hook: 'build',
- pluginConfig: {},
- async method() {
- await execCommand(configCommand, 'build.command', redactedKeys)
- },
- override: {}
- }
- : undefined,
- // Merge in config lifecycle events first
- configLifecycle && configLifecycle[hook]
- ? {
- name: `config.build.lifecycle.${hook}`,
- hook,
- pluginConfig: {},
- async method() {
- const commands = Array.isArray(configLifecycle[hook])
- ? configLifecycle[hook]
- : configLifecycle[hook].split('\n')
- // TODO pass in env vars if not available
- // TODO return stdout?
- await pMapSeries(commands, command => execCommand(command, `build.lifecycle.${hook}`, redactedKeys))
- },
- override: {}
- }
- : undefined,
- ...(lifeCycleHooks[hook] ? lifeCycleHooks[hook] : [])
- ].filter(Boolean)
- })
+ const instructions = LIFECYCLE.flatMap(hook =>
+ getHookInstructions({ hook, lifeCycleHooks, netlifyConfig, redactedKeys })
+ )
const buildInstructions = instructions.filter(instruction => {
return instruction.hook !== 'onError'
@@ -233,6 +198,49 @@ const getBaseDir = function(netlifyConfigPath) {
return path.dirname(netlifyConfigPath)
}
+// Get instructions for a specific hook
+const getHookInstructions = function({
+ hook,
+ lifeCycleHooks,
+ netlifyConfig: {
+ build: { command: configCommand, lifecycle: configLifecycle }
+ },
+ redactedKeys
+}) {
+ return [
+ // Support for old command. Add build.command to execution
+ configCommand && hook === 'build'
+ ? {
+ name: `config.build.command`,
+ hook: 'build',
+ pluginConfig: {},
+ async method() {
+ await execCommand(configCommand, 'build.command', redactedKeys)
+ },
+ override: {}
+ }
+ : undefined,
+ // Merge in config lifecycle events first
+ configLifecycle && configLifecycle[hook]
+ ? {
+ name: `config.build.lifecycle.${hook}`,
+ hook,
+ pluginConfig: {},
+ async method() {
+ const commands = Array.isArray(configLifecycle[hook])
+ ? configLifecycle[hook]
+ : configLifecycle[hook].split('\n')
+ // TODO pass in env vars if not available
+ // TODO return stdout?
+ await pMapSeries(commands, command => execCommand(command, `build.lifecycle.${hook}`, redactedKeys))
+ },
+ override: {}
+ }
+ : undefined,
+ ...(lifeCycleHooks[hook] ? lifeCycleHooks[hook] : [])
+ ].filter(Boolean)
+}
+
async function execCommand(cmd, name, secrets) {
console.log(chalk.yellowBright(`Running command "${cmd}"`))
const subprocess = execa(`${cmd}`, { shell: true })
| 5 |
diff --git a/src/components/ImageWithAspect.js b/src/components/ImageWithAspect.js @@ -3,18 +3,22 @@ import React, { Component } from "react";
import { Image, View } from "react-native";
type Props = {
- ratio: Number,
- source: Image.Props.source
+ ratio: number,
+ source: Image.propTypes.source
};
-class ImageWithAspect extends Component<Props> {
+type State = {
+ height: number
+};
+
+class ImageWithAspect extends Component<Props, State> {
constructor() {
super();
this.state = {
height: 0
};
}
- handleLayout = event => {
+ handleLayout = (event: { nativeEvent: { layout: { width: number } } }) => {
this.setState({
height: event.nativeEvent.layout.width / this.props.ratio
});
| 1 |
diff --git a/package.json b/package.json },
"devDependencies": {
"del": "3.0.0",
- "electron-packager": "14.0.6",
+ "electron-packager": "15.2.0",
"eslint": "6.4.0",
"event-stream": "3.3.4",
"git-rev": "0.2.1",
| 3 |
diff --git a/docs/views/examples/pass-data/index.html b/docs/views/examples/pass-data/index.html <pre class="app-code" tabindex="0"><code>{% raw %}
{{ govukCheckboxes({
+ idPrefix: "vehicle-features",
name: "vehicle-features",
fieldset: {
legend: {
{
value: "Heated seats",
text: "Heated seats",
- id: "vehicle-features-heated-seats",
checked: checked("vehicle-features", "Heated seats")
},
{
value: "GPS",
text: "GPS",
- id: "vehicle-features-gps",
checked: checked("vehicle-features", "GPS")
},
{
value: "Radio",
text: "Radio",
- id: "vehicle-features-radio",
checked: checked("vehicle-features", "Radio")
}
]
<pre class="app-code" tabindex="0"><code>{% raw %}
{{ govukCheckboxes({
+ idPrefix: "vehicle-features",
name: "vehicle1[vehicle-features]",
fieldset: {
legend: {
{
value: "Heated seats",
text: "Heated seats",
- id: "vehicle1-vehicle-features-heated-seats",
checked: checked("['vehicle1']['vehicle-features']", "Heated seats")
},
{
value: "GPS",
text: "GPS",
- id: "vehicle1-vehicle-features-gps",
checked: checked("['vehicle1']['vehicle-features']", "GPS")
},
{
value: "Radio",
text: "Radio",
- id: "vehicle1-vehicle-features-radio",
checked: checked("['vehicle1']['vehicle-features']", "Radio")
}
]
| 4 |
diff --git a/src/views/docs/08-translations.html b/src/views/docs/08-translations.html @@ -9,4 +9,4 @@ permalink: docs/08-translations.html
{{{t 'docs.translations.content' markdown=true}}}
-<p><a href="/files/swiss_web_guidelines_official_translations.xlsx" class="icon icon--before icon--doc" aria-hidden="true">{{ t 'docs.translations.download-link' }}</a></p>
+<p><a href="../../files/swiss_web_guidelines_official_translations.xlsx" class="icon icon--before icon--doc" aria-hidden="true">{{ t 'docs.translations.download-link' }}</a></p>
| 1 |
diff --git a/assets/js/components/Root/index.js b/assets/js/components/Root/index.js @@ -30,7 +30,6 @@ import FeaturesProvider from '../FeaturesProvider';
import { enabledFeatures } from '../../features';
import PermissionsModal from '../PermissionsModal';
import RestoreSnapshots from '../RestoreSnapshots';
-import CollectModuleData from '../data/collect-module-data';
import { FeatureToursDesktop } from '../FeatureToursDesktop';
import { useFeature } from '../../hooks/useFeature';
import CurrentSurveyPortal from '../surveys/CurrentSurveyPortal';
@@ -39,9 +38,6 @@ export default function Root( {
children,
registry,
viewContext = null,
- // TODO: Remove legacy dataAPI prop support once phased out.
- dataAPIContext,
- dataAPIModuleArgs,
} ) {
const userFeedbackEnabled = useFeature( 'userFeedback' );
@@ -57,10 +53,6 @@ export default function Root( {
@see https://github.com/google/site-kit-wp/issues/3003
*/ }
{ viewContext && <FeatureToursDesktop viewContext={ viewContext } /> }
- { dataAPIContext && (
- // Legacy dataAPI support.
- <CollectModuleData context={ dataAPIContext } args={ dataAPIModuleArgs } />
- ) }
{ userFeedbackEnabled && <CurrentSurveyPortal /> }
</RestoreSnapshots>
| 2 |
diff --git a/client/src/containers/AssetDisplay/view.jsx b/client/src/containers/AssetDisplay/view.jsx @@ -2,6 +2,7 @@ import React from 'react';
import Row from '@components/Row';
import ProgressBar from '@components/ProgressBar';
import { LOCAL_CHECK, UNAVAILABLE, ERROR, AVAILABLE } from '../../constants/asset_display_states';
+import createCanonicalLink from '../../../../utils/createCanonicalLink';
class AvailableContent extends React.Component {
render () {
@@ -44,10 +45,15 @@ class AssetDisplay extends React.Component {
this.props.onFileRequest(name, claimId);
}
render () {
- const { status, error, asset: { name, claimData: { claimId, contentType, fileExt, thumbnail, outpoint } } } = this.props;
+ const { status, error, asset } = this.props;
+ const { name, claimData: { claimId, contentType, thumbnail, outpoint } } = asset;
// the outpoint is added to force the browser to re-download the asset after an update
// issue: https://github.com/lbryio/spee.ch/issues/607
- const sourceUrl = `/${claimId}/${name}.${fileExt}?${outpoint}`;
+ let fileExt;
+ if (typeof contentType === 'string') {
+ fileExt = contentType.split('/')[1] || 'jpg';
+ }
+ const sourceUrl = `${createCanonicalLink({ asset: asset.claimData })}.${fileExt}?${outpoint}`;
return (
<div className={'asset-display'}>
{(status === LOCAL_CHECK) &&
| 4 |
diff --git a/docs/source/sample_policies.rst b/docs/source/sample_policies.rst @@ -35,13 +35,15 @@ send them a message explaining why.
.. code-block:: python
- params = {"username": action.initiator.metagovuser.external_username}
+ username = action.initiator.metagovuser.external_username
+ params = {"username": username}
user_cred = 0
try:
result = metagov.perform_action("sourcecred.user-cred", params)
user_cred = result["value"]
except Exception as e:
# exception probably means they aren't found in sourcecred.. make this better
+ debug(f"User {username} not found in SourceCred")
user_cred = -1
action.data.set("cred", user_cred)
@@ -203,6 +205,9 @@ to decide whether to accept or reject the proposal. If rejected, delete the topi
result = metagov.get_process()
+ # send debug log of intermediate results. visible in PolicyKit app at /logs.,
+ debug("Loomio result: " + str(result))
+
if result.status == "completed":
agrees = result.outcome["votes"]["agree"]
disagrees = result.outcome["votes"]["disagree"]
| 0 |
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/interactiveText.html b/modules/xerte/parent_templates/Nottingham/models_html5/interactiveText.html } else if (intType == "show2") {
$instructions.html('<p>' + (x_currentPageXML.getAttribute("showMeTxt") != undefined ? x_currentPageXML.getAttribute("showMeTxt") : "Click the arrow buttons to learn more.") + '</p>');
$("#btnHolder")
- .html('<button id="nextBtn"></button><button id="prevBtn"></button>')
+ .html('<button id="prevBtn"></button><button id="nextBtn"></button>')
.insertAfter($("#passage"));
var btnTxt = [
| 1 |
diff --git a/assets/js/modules/analytics/datastore/accounts.js b/assets/js/modules/analytics/datastore/accounts.js @@ -210,23 +210,12 @@ export const resolvers = {
if ( ! existingAccounts ) {
yield tagActions.waitForExistingTag();
const existingTag = registry.select( STORE_NAME ).getExistingTag();
- const { response, error } = yield actions.fetchAccountsPropertiesProfiles( {
+ const { response } = yield actions.fetchAccountsPropertiesProfiles( {
existingPropertyID: existingTag,
} );
if ( response ) {
( { matchedProperty } = response );
- } else if ( error ) {
- /**
- * Not the best check here, but this message comes from the Google API.
- * err.data.reason is also 'insufficientPermissions' but that isn't as clear,
- * and may not be "no accounts".
- *
- * @see {@link https://github.com/google/site-kit-wp/issues/1368}
- */
- if ( error.message && error.message === 'User does not have any Google Analytics account.' ) {
- yield actions.receiveAccounts( [] );
- }
}
}
| 2 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/fileupload/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/fileupload/template.vue @@ -66,7 +66,7 @@ export default {
},
onDropFile(ev){
ev.stopPropagation()
- this.isDragging = ''
+ this.isDragging = false
this.uploadFile(ev.dataTransfer.files)
},
stopPropagation(ev){
| 12 |
diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml @@ -21,6 +21,8 @@ jobs:
image: mysql:5.7
env:
MYSQL_DATABASE: wordpress
+ MYSQL_ROOT_PASSWORD: password
+ MYSQL_PASSWORD: password
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
| 12 |
diff --git a/test/scripts/box/box.js b/test/scripts/box/box.js @@ -126,7 +126,7 @@ describe('Box', () => {
}).finally(() => fs.rmdir(box.base));
});
- it('process() - mtime changed', () => {
+ it('process() - update (mtime changed and hash changed)', () => {
const box = newBox('test');
const name = 'a.txt';
const path = pathFn.join(box.base, name);
@@ -139,7 +139,8 @@ describe('Box', () => {
fs.writeFile(path, 'a'),
box.Cache.insert({
_id: cacheId,
- modified: 0
+ modified: 0,
+ hash: util.hash('b').toString('hex')
})
]).then(() => box.process()).then(() => {
const file = processor.args[0][0];
@@ -148,7 +149,7 @@ describe('Box', () => {
}).finally(() => fs.rmdir(box.base));
});
- it('process() - hash changed', () => {
+ it('process() - skip (mtime changed but hash matched)', () => {
const box = newBox('test');
const name = 'a.txt';
const path = pathFn.join(box.base, name);
@@ -158,15 +159,38 @@ describe('Box', () => {
box.addProcessor(processor);
return fs.writeFile(path, 'a').then(() => fs.stat(path)).then(stats => box.Cache.insert({
- _id: cacheId
+ _id: cacheId,
+ modified: 0,
+ hash: util.hash('a').toString('hex')
})).then(() => box.process()).then(() => {
const file = processor.args[0][0];
- file.type.should.eql('update');
+ file.type.should.eql('skip');
+ file.path.should.eql(name);
+ }).finally(() => fs.rmdir(box.base));
+
+ });
+
+ it('process() - skip (hash changed but mtime matched)', () => {
+ const box = newBox('test');
+ const name = 'a.txt';
+ const path = pathFn.join(box.base, name);
+ const cacheId = 'test/' + name;
+
+ const processor = sinon.spy();
+ box.addProcessor(processor);
+
+ return fs.writeFile(path, 'a').then(() => fs.stat(path)).then(stats => box.Cache.insert({
+ _id: cacheId,
+ modified: stats.mtime,
+ hash: util.hash('b').toString('hex')
+ })).then(() => box.process()).then(() => {
+ const file = processor.args[0][0];
+ file.type.should.eql('skip');
file.path.should.eql(name);
}).finally(() => fs.rmdir(box.base));
});
- it('process() - skip', () => {
+ it('process() - skip (mtime matched and hash matched)', () => {
const box = newBox('test');
const name = 'a.txt';
const path = pathFn.join(box.base, name);
| 1 |
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- test-name: ['boostPayment', 'botCreation', 'chatPayment', 'cleanup', 'clearAllChats', 'clearAllContacts', 'contacts', 'images', 'latestTest', 'lsats', 'paidMeet', 'paidTribeImages', 'queryRoutes', 'self', 'sphinxPeople', 'streamPayment', 'tribe', 'tribe3Escrow', 'tribe3Messages', 'tribe3Private', 'tribe3Profile', 'tribeEdit', 'tribeImages', 'messageLength', 'transportToken', 'pinnedMsg', 'hmac', 'socketIO']
+ test-name: ['boostPayment', 'botCreation', 'chatPayment', 'cleanup', 'clearAllChats', 'clearAllContacts', 'contacts', 'images', 'latestTest', 'lsats', 'paidMeet', 'paidTribeImages', 'queryRoutes', 'self', 'sphinxPeople', 'streamPayment', 'tribe', 'tribe3Escrow', 'tribe3Messages', 'tribe3Private', 'tribe3Profile', 'tribeEdit', 'tribeImages', 'messageLength', 'transportToken', 'pinnedMsg', 'hmac', 'socketIO', 'tribeMember']
steps:
- name: Enable docker.host.internal for Ubuntu
run: |
| 0 |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs:
- name: Set version in ENV
if: ${{ success() }}
- run: echo "::set-env name=VERSION::$(npm run print-version --silent)"
+ run: echo "VERSION=$(npm run print-version --silent)" >> $GITHUB_ENV
- uses: 8398a7/action-slack@v3
name: QA Slack notification
if: ${{ success() }}
| 4 |
diff --git a/src/client/components/display/BarGraph.jsx b/src/client/components/display/BarGraph.jsx @@ -105,7 +105,16 @@ const BarGraph = ({ dataPoints }) => {
let urls, times, BGs, borders;
if (dataPoints.length) {
//extract arrays from data point properties to be used in chart data/options that take separate arrays
- urls = dataPoints.map((point) => point.url.slice(point.url.length - 20, point.url.length));
+ urls = dataPoints.map(({ url }) => {
+ // regex to get just the main domain
+ if (url.charAt(0).toLowerCase() === "h") {
+ const domain = url.replace('http://','').replace('https://','').split(/[/?#]/)[0];
+ // if url is lengthy, just return the domain and the end of the uri string
+ return `${domain} ${(url.length > domain.length + 8) ? `- ..${url.slice(url.length - 8, url.length)}` : ""}`
+ }
+ // if grpc, just return the server IP
+ return url
+ });
times = dataPoints.map((point) => point.timeReceived - point.timeSent);
BGs = dataPoints.map((point) => "rgba(" + point.color + ", 0.2)");
borders = dataPoints.map((point) => "rgba(" + point.color + ", 1)");
| 9 |
diff --git a/tests/matching/matching-playground.js b/tests/matching/matching-playground.js @@ -142,7 +142,7 @@ Numbas.queueScript('go',['jme','localisation','knockout'],function() {
},
{
description: "Complex number in argument-modulus form",
- pattern: "m_exactly(($n`? `: 1)*e^(((`*/ `+-$n)`*;x)*i))",
+ pattern: "m_exactly(($n`? `: 1);modulus*e^(((`*/ `+-$n)`*;argument)*i))",
expression: "2e^(pi*i/2)"
},
{
| 7 |
diff --git a/layouts/partials/components/header.html b/layouts/partials/components/header.html <nav class="section-nav">
<div class="section-nav-inner flex align-center justify-space-between">
<div class="section-nav-primary flex align-center">
- {{ if not .IsHome }}
- <a href="/" class="section-logo decoration-none">
- {{ else }}
- <span href="/" class="section-logo decoration-none">
- {{ end }}
+ <a href="https://www.section.io/" class="section-logo decoration-none">
<svg width="117" height="40" aria-label="Section Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<path id="logoc" d="M0 39.174h116.87V.437H0z"/>
</g>
</g>
</svg>
- {{ if not .IsHome }}
</a>
- {{ else }}
- </span>
- {{ end }}
<div style="position: relative;" class="section-nav-primary-uncollapsed">
<ul class="section-nav-main list-flex">
| 1 |
diff --git a/docs-website/pages/plugins-cocoascript.md b/docs-website/pages/plugins-cocoascript.md ---
title: CocoaScript
section: plugins
-chapter: Internal API
+chapter: Concepts
permalink: /plugins/cocoascript
# Previous developer documentation
@@ -73,7 +73,7 @@ let asset = AVAsset.assetWithURL_(url)
console.log(asset)
```
-## Next Steps
+## Related resources
Read more about how to use CocoaScript and macOS frameworks.
| 5 |
diff --git a/articles/hooks/extensibility-points/pre-user-registration.md b/articles/hooks/extensibility-points/pre-user-registration.md @@ -5,9 +5,7 @@ beta: true
# Extensibility Point: Pre-User Registration
-For [Database Connections](/connections/database), the `pre-user-registration` extensibility point allows you to:
-
-* Add custom `app_metadata` or `user_metadata` to a newly-created user.
+For [Database Connections](/connections/database), the `pre-user-registration` extensibility point allows you to add custom `app_metadata` or `user_metadata` to a newly-created user.
This allows you to implement scenarios including (but not limited to):
| 2 |
diff --git a/src/app.js b/src/app.js @@ -71,7 +71,7 @@ module.exports = app;
// Mongo Connection + Server Start
(async () => {
try {
- const client = await MongoClient.connect(url, { poolSize: 20 });
+ const client = await MongoClient.connect(url, { poolSize: 20, useNewUrlParser: true });
global.db = client.db('spacex-api');
| 11 |
diff --git a/accessibility-checker-engine/src/v4/util/CSSUtil.ts b/accessibility-checker-engine/src/v4/util/CSSUtil.ts type PseudoClass = ":hover" | ":active" | ":focus" | ":focus-visible" | ":focus-within";
export function selectorMatchesElem(element, selector) {
+ try {
if (selector.trim() === "") return false;
if (typeof element.matches === 'function') {
return element.matches(selector);
@@ -35,6 +36,10 @@ export function selectorMatchesElem(element, selector) {
}
return i < matches.length;
+ } catch (err) {
+ // Bad selector? Doesn't match then...
+ return false;
+ }
}
/**
| 3 |
diff --git a/src/Serverless.js b/src/Serverless.js @@ -106,11 +106,6 @@ class Serverless {
}
async render() {
- // TODO is this necessary?
- if (this.dir.startsWith("/var/task/")) {
- process.chdir(this.dir);
- }
-
let inputDir = path.join(this.dir, this.options.inputDir);
let configPath = path.join(this.dir, this.configFilename);
let { pathParams, inputPath } = this.matchUrlPattern(this.path);
| 2 |
diff --git a/entry_types/scrolled/package/src/contentElements/inlineBeforeAfter/BeforeAfter.module.css b/entry_types/scrolled/package/src/contentElements/inlineBeforeAfter/BeforeAfter.module.css }
@keyframes BeforeImageLeftRightShake {
- 10%, 90% {
+ 10%, 100% {
clip: rect(auto, calc(var(--initial-rect-width) + var(--frame1px)), auto, auto);
}
}
@keyframes AfterImageLeftRightShake {
- 10%, 90% {
+ 10%, 100% {
clip: rect(auto, auto, auto, calc(var(--initial-rect-width) + var(--frame1px)));
}
}
@keyframes SliderLeftRightShake {
- 10%, 90% {
+ 10%, 100% {
transform: translate3d(-20%, 0, 0);
}
| 14 |
diff --git a/src/encoded/schemas/single_cell_rna_series.json b/src/encoded/schemas/single_cell_rna_series.json "related_datasets.replicates.library.treatments.treatment_term_name": {
"title": "Library treatment"
},
- "month_released": {
- "title": "Month released"
- },
"lab.title": {
"title": "Lab"
},
| 2 |
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb @@ -10,7 +10,7 @@ class HomeController < ApplicationController
pipeline_info = output.pipeline_runs.first ? output.pipeline_runs.first.pipeline_output : nil
job_stats = output.pipeline_outputs.first ? output.pipeline_outputs.first.job_stats : nil
pipeline_run = output.pipeline_runs.first ? output.pipeline_runs.first : nil
- summary_stats = get_summary_stats(job_stats)
+ summary_stats = job_stats ? get_summary_stats(job_stats) : nil
output_data[:pipeline_info] = pipeline_info
output_data[:pipeline_run] = pipeline_run
| 9 |
diff --git a/javascript/package.json b/javascript/package.json {
"name": "stimulus_reflex",
- "version": "1.1.0",
+ "version": "1.0.2",
"main": "./stimulus_reflex.js",
"scripts": {
"prettier-check": "yarn run prettier --check ./stimulus_reflex.js"
| 12 |
diff --git a/gears/carto_gears_api/lib/carto_gears_api/logger.rb b/gears/carto_gears_api/lib/carto_gears_api/logger.rb @@ -42,9 +42,14 @@ module CartoGearsApi
private
def log(level, exception: nil, message: nil, user: nil, **additional_data)
- gear_message = "{#{@gear}}: #{message}" if message
- additional = additional_data.merge(gear: @gear)
- CartoDB::Logger.log(level, exception: exception, message: gear_message, user: user, **additional)
+ Rails.logger.send(
+ :level,
+ exception: { class: exception&.class&.name, message: exception&.message, backtrace_hint: exception&.backtrace&.take(5) },
+ gear: gear,
+ message: message,
+ current_user: user,
+ **additional_data
+ )
end
end
end
| 2 |
diff --git a/index.js b/index.js @@ -122,7 +122,7 @@ const defaults = {
{ long: 'sBTC', short: 'iBTC' },
{ long: 'sETH', short: 'iETH' },
],
- MAX_DEBT: w3utils.toWei('30000000'), // 30 million sUSD
+ MAX_DEBT: w3utils.toWei('40000000'), // 40 million sUSD
BASE_BORROW_RATE: Math.round((0.005 * 1e18) / 31556926).toString(), // 31556926 is CollateralManager seconds per year
BASE_SHORT_RATE: Math.round((0.005 * 1e18) / 31556926).toString(),
},
| 3 |
diff --git a/client/package.json b/client/package.json "dependencies": {
"minimal-request": "2.2.0",
"nice-cache": "0.0.5",
- "oc-template-handlebars": "2.0.0",
- "oc-template-jade": "2.0.0",
+ "oc-template-handlebars": "3.0.0",
+ "oc-template-jade": "3.0.0",
"stringformat": "0.0.5"
},
"engines": {
| 3 |
diff --git a/game.js b/game.js @@ -743,14 +743,14 @@ const _gameUpdate = (timestamp, timeDiff) => {
};
_updateMouseDomEquipmentHover();
- const _handleTeleport = () => {
+ /* const _handleTeleport = () => {
if (localPlayer.avatar) {
teleportMeshes[1].update(localPlayer.avatar.inputs.leftGamepad.position, localPlayer.avatar.inputs.leftGamepad.quaternion, ioManager.currentTeleport, (p, q) => physx.physxWorker.raycastPhysics(physx.physics, p, q), (position, quaternion) => {
localPlayer.teleportTo(position, quaternion);
});
}
};
- _handleTeleport();
+ _handleTeleport(); */
const _handleClosestObject = () => {
const apps = world.appManager.apps;
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.3.0
- Added: `ignoreFontFamilies: []` to `font-family-no-missing-generic-family-keyword` ([#4656](https://github.com/stylelint/stylelint/pull/4656)).
- Fixed: `function-calc-no-invalid` false positives for SCSS and Less variables ([#4659](https://github.com/stylelint/stylelint/pull/4659)).
| 6 |
diff --git a/lib/plugins/input/heroku.js b/lib/plugins/input/heroku.js @@ -26,6 +26,9 @@ function extractJson (line, source) {
function InputHeroku (config, eventEmitter) {
this.config = config
this.eventEmitter = eventEmitter
+ if (config.useIndexFromUrlPath === undefined) {
+ config.useIndexFromUrlPath = true
+ }
this.tokenBlackList = new TokenBlacklist(eventEmitter)
this.config.port = this.config.heroku || config.port
if (config.workers) {
| 12 |
diff --git a/package.json b/package.json "name": "@11ty/eleventy",
"version": "0.10.0-beta.1",
"description": "Transform a directory of templates into HTML.",
+ "publishConfig": {
+ "access": "public"
+ },
"main": "src/Eleventy.js",
"license": "MIT",
"engines": {
"node": ">=8"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/11ty"
+ },
"keywords": [
"static-site-generator",
"static-site",
| 0 |
diff --git a/factory-ai-vision/EdgeSolution/modules/WebModule/ui_v2/src/components/LiveViewContainer/LiveViewScene.tsx b/factory-ai-vision/EdgeSolution/modules/WebModule/ui_v2/src/components/LiveViewContainer/LiveViewScene.tsx @@ -334,8 +334,6 @@ const Polygon = ({ id, polygon, visible, removeBox, creatingState, handleChange,
cache={[{ drawBorder: true }]}
ref={groupRef}
>
- {/** A bigger region for mouseEnter event */}
- <Line x={polygon[0].x} y={polygon[0].y - 50} points={borderPoints} closed scale={{ x: 1.2, y: 1.2 }} />
<Line
x={polygon[0].x}
y={polygon[0].y}
@@ -343,6 +341,7 @@ const Polygon = ({ id, polygon, visible, removeBox, creatingState, handleChange,
closed
stroke={COLOR}
strokeWidth={2 / scale}
+ hitStrokeWidth={50 / scale}
/>
{polygon.map((e, i) => (
<Circle
@@ -354,6 +353,7 @@ const Polygon = ({ id, polygon, visible, removeBox, creatingState, handleChange,
radius={radius}
fill={COLOR}
onDragMove={onDragMove(i)}
+ hitStrokeWidth={50 / scale}
/>
))}
<Path
@@ -435,8 +435,6 @@ const Box: React.FC<BoxProps> = ({ box, onBoxChange, visible, boundary, removeBo
cache={[{ drawBorder: true }]}
ref={groupRef}
>
- {/** A bigger region for mouseEnter event */}
- <Line x={x1} y={y1 - 80} points={[0, -80, 0, y2 - y1, x2 - x1, y2 - y1, x2 - x1, -80]} closed />
<Line
x={x1}
y={y1}
@@ -444,6 +442,7 @@ const Box: React.FC<BoxProps> = ({ box, onBoxChange, visible, boundary, removeBo
closed
stroke={COLOR}
strokeWidth={2 / scale}
+ hitStrokeWidth={50 / scale}
/>
<Circle draggable name="leftTop" x={x1} y={y1} radius={radius} fill={COLOR} onDragMove={handleDrag} />
<Circle draggable name="rightTop" x={x2} y={y1} radius={radius} fill={COLOR} onDragMove={handleDrag} />
| 14 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.