code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/package.json b/package.json },
"private": true,
"scripts": {
- "preinstall:node": "node --version | grep -q 8.6.0",
- "preinstall:npm": "npm --version | grep -q 5.4.2",
- "preinstall": "npm run preinstall:node && npm run preinstall:npm",
+ "preinstall": "node ./scripts/npm/check-versions.js",
"postinstall:native": "(cd ./native && npm install)",
"postinstall": "npm run postinstall:native && npm run bootstrap",
"bootstrap": "lerna bootstrap",
| 7 |
diff --git a/lib/slack/renderer/index.js b/lib/slack/renderer/index.js @@ -16,6 +16,10 @@ const constants = {
STATUS_FAILURE: '#cb2431',
BASE_ATTACHMENT_COLOR: '#24292f',
ATTACHMENT_FIELD_LIMIT: 2,
+ MAJOR_MESSAGES: {
+ 'pull_request.opened': true,
+ 'issues.opened': true,
+ },
};
class Status {
@@ -75,9 +79,9 @@ class Issue {
this.eventType = eventType;
this.unfurl = unfurl;
- this.major = {
- 'issues.opened': true,
- };
+ if (constants.MAJOR_MESSAGES[this.eventType] || this.unfurl) {
+ this.major = true;
+ }
}
getColor() {
return getHexColorbyState(this.issue.state);
@@ -95,22 +99,17 @@ class Issue {
const title = `#${this.issue.number} ${this.issue.title}`;
// eslint-disable-next-line camelcase
const title_link = this.issue.html_url;
- if (this.unfurl) {
- return {
- text,
- title,
- title_link,
- fallback: title,
- };
- }
const core = {
title,
title_link,
fallback: title,
};
- if (this.major[this.eventType]) {
+ if (this.major) {
core.text = text;
}
+ if (this.unfurl) {
+ return core;
+ }
const preText = action => `[${this.repository.full_name}] Issue ${action} by ${this.issue.user.login}`;
const actionre = /\w+\.(\w+)/g; // e.g. match 'opened' for 'issues.opened'
@@ -123,7 +122,7 @@ class Issue {
}
getFields() {
// projects should be a field as well, but seems to not be easily available via API?
- if (!this.major[this.eventType] && !this.unfurl) {
+ if (!this.major) {
return null;
}
const fields = [
@@ -205,9 +204,9 @@ class PullRequest {
this.unfurl = unfurl;
this.statuses = statuses;
- this.major = {
- 'pull_request.opened': true,
- };
+ if (constants.MAJOR_MESSAGES[this.eventType] || this.unfurl) {
+ this.major = true;
+ }
}
getColor() {
return getHexColorbyState(
@@ -228,27 +227,19 @@ class PullRequest {
const title = `#${this.pullRequest.number} ${this.pullRequest.title}`;
// eslint-disable-next-line camelcase
const title_link = this.pullRequest.html_url;
- if (this.unfurl) {
- return {
- text,
- title,
- title_link,
- fallback: title,
- };
- }
const core = {
title,
title_link,
fallback: title,
};
- if (this.major[this.eventType]) {
+ if (this.major) {
core.text = text;
}
return core;
}
getFields() {
// projects should be a field as well, but seems to not be easily available via API?
- if (!this.major[this.eventType] && !this.unfurl) {
+ if (!this.major) {
return null;
}
// reviewers should be in these fields, but no
@@ -321,7 +312,7 @@ class PullRequest {
return this.getMainAttachment();
}
- if (!this.major[this.eventType]) {
+ if (!this.major) {
return {
attachments: [
this.getMainAttachment(),
| 7 |
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js @@ -1353,46 +1353,6 @@ describe('Test geo interactions', function() {
.then(done, done.fail);
});
- it('should clear hover label when cursor slips off subplot', function(done) {
- var gd = createGraphDiv();
- var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));
-
- function _assert(msg, hoverLabelCnt) {
- expect(d3SelectAll('g.hovertext').size())
- .toBe(hoverLabelCnt, msg);
- }
-
- var px = 390;
- var py = 290;
- var cnt = 0;
-
- Plotly.newPlot(gd, fig).then(function() {
- gd.on('plotly_unhover', function() { cnt++; });
-
- mouseEvent('mousemove', px, py);
- _assert('base state', 1);
-
- return new Promise(function(resolve) {
- var interval = setInterval(function() {
- px += 2;
- mouseEvent('mousemove', px, py);
-
- if(px < 402) {
- _assert('- px ' + px, 1);
- expect(cnt).toBe(0, 'no plotly_unhover event so far');
- } else {
- _assert('- px ' + px, 0);
- expect(cnt).toBe(1, 'plotly_unhover event count');
-
- clearInterval(interval);
- resolve();
- }
- }, 100);
- });
- })
- .then(done, done.fail);
- });
-
it('should not confuse positions on either side of the globe', function(done) {
var gd = createGraphDiv();
var fig = Lib.extendDeep({}, require('@mocks/geo_orthographic.json'));
@@ -1421,66 +1381,6 @@ describe('Test geo interactions', function() {
.then(done, done.fail);
});
- it('should plot to scope defaults when user setting lead to NaN map bounds', function(done) {
- var gd = createGraphDiv();
-
- spyOn(Lib, 'warn');
-
- Plotly.newPlot(gd, [{
- type: 'scattergeo',
- lon: [0],
- lat: [0]
- }], {
- geo: {
- projection: {
- type: 'kavrayskiy7',
- rotation: {
- lat: 38.794799,
- lon: -81.622334,
- }
- },
- center: {
- lat: -81
- },
- lataxis: {
- range: [38.794799, 45.122292]
- },
- lonaxis: {
- range: [-82.904731, -81.622334]
- }
- },
- width: 700,
- heigth: 500
- })
- .then(function() {
- var geoLayout = gd._fullLayout.geo;
- var geo = geoLayout._subplot;
-
- expect(geoLayout.projection.rotation).toEqual({
- lon: 0, lat: 0, roll: 0,
- });
- expect(geoLayout.center).toEqual({
- lon: 0, lat: 0
- });
- expect(geoLayout.lonaxis.range).toEqual([-180, 180]);
- expect(geoLayout.lataxis.range).toEqual([-90, 90]);
-
- expect(geo.viewInitial).toEqual({
- 'fitbounds': false,
- 'projection.rotation.lon': 0,
- 'center.lon': 0,
- 'center.lat': 0,
- 'projection.scale': 1
- });
-
- expect(Lib.warn).toHaveBeenCalledTimes(1);
- expect(Lib.warn).toHaveBeenCalledWith(
- 'Invalid geo settings, relayout\'ing to default view.'
- );
- })
- .then(done, done.fail);
- });
-
it('should get hover right for choropleths involving landmasses that cross antimeridian', function(done) {
var gd = createGraphDiv();
| 2 |
diff --git a/ts-scripts/meta.json b/ts-scripts/meta.json "coinomat": "https://test.coinomat.com",
"datafeed": "https://marketdata.wavesplatform.com",
"support": "https://support.wavesplatform.com",
- "nodeList": "http://dev.pywaves.org/generators/",
+ "nodeList": "http://dev.pywaves.org/testnet/generators/",
"assets": {
"EUR": "2xnE3EdpqXtFgCP156qt1AbyjpqdZ5jGjWo3CwTawcux",
"USD": "HyFJ3rrq5m7FxdkWtQXkZrDat1F7LjVVGfpSkUuEXQHj",
| 1 |
diff --git a/token-metadata/0x57Ab1ec28D129707052df4dF418D58a2D46d5f51/metadata.json b/token-metadata/0x57Ab1ec28D129707052df4dF418D58a2D46d5f51/metadata.json "symbol": "SUSD",
"address": "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/global-admin/addon/components/multi-cluster-app/template.hbs b/lib/global-admin/addon/components/multi-cluster-app/template.hbs <label for="" class="acc-label">
{{t "newMultiClusterApp.targets.label"}}
</label>
- <div class="col span-12 text-small">
+ <div class="col span-12 text-small mb-20">
{{#each model.targets as |target|}}
- {{#badge-state
- classNames="mr-5 mb-5"
- model=target
- capitalizeText=false
- }}
{{#if target.project.id}}
{{#link-to-external
"apps-tab.detail"
target.projectId
target.appLink
}}
+ <i class="icon icon-circle {{target.stateColor}}"></i>
{{target.clusterName}}:{{target.projectName}}
{{#tooltip-element
type="tooltip-basic"
aria-describedby="tooltip-base"
tooltipFor="tooltipLink"
}}
- <i class="icon icon-circle {{target.stateColor}}"></i>
{{/tooltip-element}}
{{/link-to-external}}
{{else}}
+ <i class="icon icon-circle {{target.stateColor}}"></i>
{{target.projectId}}
{{#tooltip-element
type="tooltip-basic"
aria-describedby="tooltip-base"
tooltipFor="tooltipLink"
}}
- <i class="icon icon-circle {{target.stateColor}}"></i>
{{/tooltip-element}}
{{/if}}
- {{/badge-state}}
{{/each}}
</div>
</div>
| 2 |
diff --git a/src/templates/workshop.js b/src/templates/workshop.js @@ -237,7 +237,7 @@ export default ({ data }) => {
position={2}
/>
<BreadcrumbDivider />
- <Breadcrumb to={url} name={name} position={3} bold={false} />
+ <Breadcrumb to={slug} name={name} position={3} bold={false} />
</Breadcrumbs>
<Name f={6} mb={2} children={name} />
<Heading.h2 f={4} children={description} />
| 1 |
diff --git a/packages/cx/src/widgets/form/variables.scss b/packages/cx/src/widgets/form/variables.scss @@ -76,8 +76,6 @@ $cx-default-input-tool-size: 20px !default;
$cx-default-input-left-tool-size: $cx-default-input-tool-size !default;
// Left Icon
-@debug ($cx-default-box-padding, $cx-default-box-line-height, $cx-default-input-left-tool-size);
-
$cx-input-left-icon-state-style-map: (
default: (
font-size: $cx-default-icon-size,
| 2 |
diff --git a/src/components/play-mode/hotbar/Hotbar.jsx b/src/components/play-mode/hotbar/Hotbar.jsx @@ -8,10 +8,9 @@ import {world} from '../../../../world.js';
import {hotbarSize} from '../../../../constants.js';
import {jsonParse, handleDrop} from '../../../../util.js';
-export const Hotbar = () => {
-
const itemsNum = 8;
+export const Hotbar = () => {
const { state, setState } = useContext( AppContext );
const open = state.openedPanel === 'CharacterPanel';
@@ -31,10 +30,22 @@ export const Hotbar = () => {
app.activate();
})();
};
+ const onTopClick = e => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ setState({
+ openedPanel: 'CharacterPanel',
+ });
+ };
+ const onBottomClick = index => e => {
+
+ };
return (
<div
className={ classnames(styles.hotbar, open ? styles.open : null) }
+ onClick={onTopClick}
>
{
@@ -49,6 +60,7 @@ export const Hotbar = () => {
size={hotbarSize}
onDragOver={onDragOver(i)}
onDrop={onDrop(i)}
+ onClick={onBottomClick}
index={i}
key={i}
/>
| 0 |
diff --git a/package.json b/package.json {
+ "name": "threejs-fast-raycast",
+ "version": "0.0.1",
+ "description": "A BVH implementation to speed up raycasting against three.js meshes.",
"module": "src/index.js",
"main": "umd/index.js",
"scripts": {
},
"repository": {
"type": "git",
- "url": "git+https://github.com/gkjohnson/threejs-raycast-updates.git"
+ "url": "git+https://github.com/gkjohnson/threejs-fast-raycast.git"
},
"author": "Garrett Johnson <[email protected]>",
"license": "MIT",
"bugs": {
- "url": "https://github.com/gkjohnson/threejs-raycast-updates/issues"
+ "url": "https://github.com/gkjohnson/threejs-fast-raycast/issues"
},
- "homepage": "https://github.com/gkjohnson/threejs-raycast-updates#readme",
+ "homepage": "https://github.com/gkjohnson/threejs-fast-raycast#readme",
"peerDependencies": {
"three": "^0.91.0"
},
| 0 |
diff --git a/token-metadata/0xd03B6ae96CaE26b743A6207DceE7Cbe60a425c70/metadata.json b/token-metadata/0xd03B6ae96CaE26b743A6207DceE7Cbe60a425c70/metadata.json "symbol": "UNDB",
"address": "0xd03B6ae96CaE26b743A6207DceE7Cbe60a425c70",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/Form.js b/src/components/Form.js @@ -59,7 +59,6 @@ const defaultProps = {
formState: {
isLoading: false,
errors: null,
- errorFields: null,
},
draftValues: {},
enabledWhenOffline: false,
@@ -94,6 +93,17 @@ class Form extends React.Component {
return this.props.formState.error || (typeof latestErrorMessage === 'string' ? latestErrorMessage : '');
}
+ getFirstErroredInput() {
+ const hasStateErrors = !_.isEmpty(this.state.errors);
+ const hasErrorFields = !_.isEmpty(this.props.formState.errorFields);
+
+ if (!hasStateErrors && !hasErrorFields) {
+ return;
+ }
+
+ return _.first(_.keys(hasStateErrors ? this.state.erorrs : this.props.formState.errorFields));
+ }
+
submit() {
// Return early if the form is already submitting to avoid duplicate submission
if (this.props.formState.isLoading) {
@@ -193,12 +203,12 @@ class Form extends React.Component {
.reverse()
.map(key => errorFields[inputID][key])
.first()
- .value();
+ .value() || '';
return React.cloneElement(child, {
ref: node => this.inputRefs[inputID] = node,
value: this.state.inputValues[inputID],
- errorText: (this.state.errors[inputID] || fieldErrorMessage) || '',
+ errorText: this.state.errors[inputID] || fieldErrorMessage,
onBlur: () => {
this.setTouchedInput(inputID);
this.validate(this.state.inputValues);
@@ -237,12 +247,12 @@ class Form extends React.Component {
{this.props.isSubmitButtonVisible && (
<FormAlertWithSubmitButton
buttonText={this.props.submitButtonText}
- isAlertVisible={_.size(this.state.errors) > 0 || Boolean(this.getErrorMessage())}
+ isAlertVisible={_.size(this.state.errors) > 0 || Boolean(this.getErrorMessage()) || !_.isEmpty(this.props.formState.errorFields)}
isLoading={this.props.formState.isLoading}
message={_.isEmpty(this.props.formState.errorFields) ? this.getErrorMessage() : null}
onSubmit={this.submit}
onFixTheErrorsLinkPressed={() => {
- this.inputRefs[_.first(_.keys(this.state.errors))].focus();
+ this.inputRefs[this.getFirstErroredInput()].focus();
}}
containerStyles={[styles.mh0, styles.mt5]}
enabledWhenOffline={this.props.enabledWhenOffline}
| 11 |
diff --git a/doc/build.md b/doc/build.md @@ -266,7 +266,7 @@ After your app has become valid, you are ready to execute the first build. Just
* **SSH Private Key:** A SSH private key to access your repository. Only relevant for git repositories which are not hosted on GitHub.
* **Branch:** The git branch to build from. The default value is `master`. If you want to build from a feature branch, you may specify the branch here.
* **App Directory:** The directory within your repository that contains your Tabris.js app. The value must be relative to the repository root.
-* **iOS Signing Key:** iOS apps can not be deployed to a mobile device without being signed. If you want to build an iOS app you need an Apple Developer account and provide the certificate together with the provisioning profile. A very good tutorial on how to get these files can be found in the [Phonegap Build documentation](http://docs.build.phonegap.com/en_US/signing_signing-ios.md.html#iOS%20Signing).
+* **iOS Signing Key:** iOS apps can not be deployed to a mobile device without being signed. If you want to build an iOS app you need an Apple Developer account and provide the certificate together with the provisioning profile. A very good tutorial on how to get these files can be found in the [Phonegap Build documentation](http://docs.phonegap.com/phonegap-build/signing/ios/).
* **Android Signing Key:** Android apps need to be signed with a certificate only if you want to deploy them to Play Store. You can find a very good tutorial in the [Phonegap Build documentation](http://docs.phonegap.com/phonegap-build/signing/android/) as well.
* **Windows Architecure** Choose which CPU architecture you want to build your package for.
* **Environment Variables:** Key/Value pairs that will be stored and transferred encrypted to the build machines. They can be used within the config.xml or custom hooks. Use cases are adding plug-ins from private git repositories or handling access keys.
| 1 |
diff --git a/includes/Core/Util/Migration_1_8_1.php b/includes/Core/Util/Migration_1_8_1.php @@ -113,7 +113,7 @@ class Migration_1_8_1 {
// Only run routine if using the authentication service, otherwise it
// is irrelevant.
- if ( ! $this->authentication->get_oauth_client()->using_proxy() ) {
+ if ( ! $this->authentication->credentials()->using_proxy() ) {
return;
}
| 1 |
diff --git a/src/widgets/histogram/chart.js b/src/widgets/histogram/chart.js @@ -159,12 +159,18 @@ module.exports = cdb.core.View.extend({
var xLimit = className === 'right' ? this.chartWidth() : 0;
var xDiff = Math.abs(xLimit - xPos);
+ var transform = d3.transform(triangle.attr('transform'));
+
if (xDiff <= (TRIANGLE_SIDE / 2)) {
xDiff = className === 'right' ? TRIANGLE_SIDE - xDiff : xDiff;
triangle.attr('d', trianglePath(0, 0, TRIANGLE_SIDE, 0, xDiff, y3Factor * TRIANGLE_HEIGHT));
+ transform.translate[0] = className === 'left' ? 0 : Math.max(0, this.options.handleWidth - TRIANGLE_SIDE);
} else {
triangle.attr('d', trianglePath(0, 0, TRIANGLE_SIDE, 0, (TRIANGLE_SIDE / 2), y3Factor * TRIANGLE_HEIGHT));
+ transform.translate[0] = ((this.options.handleWidth / 2) - (TRIANGLE_SIDE / 2));
}
+
+ triangle.attr('transform', transform.toString());
},
_updateAxisTip: function (className) {
@@ -902,7 +908,7 @@ module.exports = cdb.core.View.extend({
handle.append('path')
.attr('class', 'CDB-Chart-axisTipRect CDB-Chart-axisTipTriangle')
- .attr('transform', 'translate(' + ((this.options.handleWidth / 2) - 4) + ', ' + yTriangle + ')')
+ .attr('transform', 'translate(' + ((this.options.handleWidth / 2) - (TRIANGLE_SIDE / 2)) + ', ' + yTriangle + ')')
.attr('d', trianglePath(0, 0, TRIANGLE_SIDE, 0, (TRIANGLE_SIDE / 2), triangleHeight))
.style('opacity', '0');
| 2 |
diff --git a/semcore/ui/generate.js b/semcore/ui/generate.js @@ -37,7 +37,6 @@ async function installComponents(packages) {
});
const node_modules = execSync('find ./node_modules/@semcore -name "node_modules" -type d', {
- stdio: 'inherit',
cwd: __dirname,
}).toString();
if (node_modules) throw new Error(`DUPLICATES FOUND ${node_modules}`);
@@ -202,7 +201,6 @@ async function generateChangelogs(startDate, endDate = new Date()) {
async function main(pkg) {
const info = JSON.parse(
execSync(`npm_config_registry=${REGISTRY_URL} yarn info ${pkg.name} --json`, {
- stdio: 'inherit',
cwd: __dirname,
}).toString(),
);
| 2 |
diff --git a/paywall/src/components/content/NewDemoContent.tsx b/paywall/src/components/content/NewDemoContent.tsx @@ -47,9 +47,12 @@ export default function NewDemoContent() {
)
const locks: string[] = url.searchParams.getAll('lock')
const names: string[] = url.searchParams.getAll('name')
+ const unlockUserAccounts: boolean =
+ url.searchParams.get('unlockUserAccounts') === 'true'
window.unlockProtocolConfig = {
persistentCheckout: false,
+ unlockUserAccounts,
icon:
'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMjAwIDI1NiI+CiAgPHBhdGggZD0iTTQ0OS45Mzk4OCwyMzAuMDUzNzFoNTMuMDRWMGgtNTMuMDRaTTIxNS4xMDIsMTUuOTc2MDdIMTU5LjUwNThWNzEuNTgzODZINzAuNjc5NjNWMTUuOTc2MDdIMTUuMDgzVjcxLjU4Mzg2SDBWOTguMDA0MTVIMTUuMDgzdjQxLjYyNTczYzAsNTIuMDgxNTUsNDUuMDUyMjQsOTQuNTc3NjQsMTAwLjMyOTEsOTQuNTc3NjQsNTQuOTU3LDAsOTkuNjg5OTQtNDIuNDk2MDksOTkuNjg5OTQtOTQuNTc3NjRWOTguMDA0MTVoMTQuOTY0VjcxLjU4Mzg2SDIxNS4xMDJaTTE1OS41MDU4LDEzOS42Mjk4OGMwLDI0LjYwMy0xOS40OTA3Miw0NC43MzI0Mi00NC4wOTM3NSw0NC43MzI0MmE0NC44NjM2Nyw0NC44NjM2NywwLDAsMS00NC43MzI0Mi00NC43MzI0MlY5OC4wMDQxNUgxNTkuNTA1OFpNMzQ4LjY1NjY4LDY3LjA5OTEyYy0xOS4xNzEzOSwwLTM3LjcwMzYyLDguNjI3LTQ4LjI0NzU2LDI0LjI4MzJIMjk5Ljc3bC0zLjE5NDgzLTE5LjgxMDA1aC00Ni42NDk5VjIzMC4wNTM3MWg1My4wNHYtODIuNDM2YzAtMTguMjEyNDEsMTQuMDU5MDgtMzIuOTEwMTYsMzAuOTkzNjUtMzIuOTEwMTYsMTcuNTczMjUsMCwzMS4zMTI1LDE0LjY5Nzc1LDMxLjMxMjUsMzIuMjcxNDh2ODMuMDc0NzFoNTMuMDR2LTg4LjE4N0M0MTguMzExNDYsOTkuNjg5OTQsMzkxLjQ3MjExLDY3LjA5OTEyLDM0OC42NTY2OCw2Ny4wOTkxMlptNjgwLjg3Njk1LDc3LjMyMzI0LDY1LjE4MTY0LTcyLjg1MDA5aC02NS41MDFsLTUxLjEyMyw1OS40MzA2NmgtLjk1OVYwaC01My4wNFYyMzAuMDUzNzFoNTMuMDRWMTU3Ljg0MjI5aC45NTlsNTIuNzIwNyw3Mi4yMTE0Mmg2Ni43NzkzWk02MTMuMjA4NDQsNjcuMDk5MTJjLTQ5LjUyNTQsMC05MC40MjM4MywzNy43MDMxMy05MC40MjM4Myw4My43MTM4N3M0MC44OTg0Myw4My4zOTQ1Myw5MC40MjM4Myw4My4zOTQ1Myw5MC40MjM4Mi0zNy4zODM3OSw5MC40MjM4Mi04My4zOTQ1M1M2NjIuNzMzODMsNjcuMDk5MTIsNjEzLjIwODQ0LDY3LjA5OTEyWm0wLDEyMC43NzgzMmMtMjAuMTI5ODksMC0zNy4wNjQ0Ni0xNi45MzQ1Ny0zNy4wNjQ0Ni0zNy4wNjQ0NXMxNi45MzQ1Ny0zNy4wNjQ0NSwzNy4wNjQ0Ni0zNy4wNjQ0NSwzNy4zODM3OCwxNi45MzQ1NywzNy4zODM3OCwzNy4wNjQ0NVM2MzMuMzM4MzIsMTg3Ljg3NzQ0LDYxMy4yMDg0NCwxODcuODc3NDRaTTgxNC44MTg3OSwxMTMuNDI5MmMxNS42NTYyNSwwLDI4LjQzNzUsOC45NDY3OCwzMy4yMzA0NywyMS40MDc3MWg1My45OThjLTUuNDMxNjQtMzcuMDY0LTQxLjUzNzExLTY3LjczNzc5LTg2LjI2OTUzLTY3LjczNzc5LTQ5Ljg0NTcsMC05MS4wNjM1LDM3LjcwMzEzLTkxLjA2MzUsODMuNzEzODdzNDEuMjE3OCw4My4zOTQ1Myw5MS4wNjM1LDgzLjM5NDUzYzQzLjc3MzQ0LDAsODEuMTU3MjMtMjkuMzk2LDg2LjI2OTUzLTY4LjA1NzYyaC01My45OThjLTUuNzUyLDEzLjEwMDEtMTcuNTc0MjIsMjEuNDA3NzItMzMuMjMwNDcsMjEuNDA3NzJBMzYuOTU1MSwzNi45NTUxLDAsMCwxLDc3OC4wNzQ2NSwxNTAuODEzQzc3OC4wNzQ2NSwxMzAuNjgzMTEsNzk0LjM2OTU3LDExMy40MjkyLDgxNC44MTg3OSwxMTMuNDI5MloiLz4KPC9zdmc+Cg==',
locks: locks.reduce(
| 11 |
diff --git a/framer/Color.coffee b/framer/Color.coffee @@ -303,10 +303,10 @@ class exports.Color extends BaseClass
colorA = new Color(colorA)
colorB = new Color(colorB)
- return false if colorA.r isnt colorB.r
- return false if colorA.g isnt colorB.g
- return false if colorA.b isnt colorB.b
- return false if colorA.a isnt colorB.a
+ return false if Math.round(colorA.r) isnt Math.round(colorB.r)
+ return false if Math.round(colorA.g) isnt Math.round(colorB.g)
+ return false if Math.round(colorA.b) isnt Math.round(colorB.b)
+ return false if Math.round(colorA.a) isnt Math.round(colorB.a)
return true
@rgbToHsl: (a, b, c) ->
| 7 |
diff --git a/scenes/treehouse.scn b/scenes/treehouse.scn "start_url": "https://webaverse.github.io/basiheart/",
"dynamic": true
},
- {
- "position": [
- 4,
- 0,
- -2
- ],
- "quaternion": [
- 0,
- 0,
- 0,
- 1
- ],
- "start_url": "https://webaverse.github.io/npc/"
- },
{
"position": [
-13,
| 2 |
diff --git a/src/core-tags/migrate/all-tags/control-flow-directives.js b/src/core-tags/migrate/all-tags/control-flow-directives.js @@ -15,7 +15,7 @@ module.exports = function migrate(el, context) {
if (
CONTROL_FLOW_ATTRIBUTES.includes(name) &&
(name === "else" || attr.argument) &&
- (el.tagName !== "else" || name !== "if") // <else if(x)> gets passed through
+ !(el.tagName === "else" && name === "if") // <else if(x)> gets passed through
) {
context.deprecate(
`The "${name}" attribute is deprecated. Please use the <${name}> tag instead. See: https://github.com/marko-js/marko/wiki/Deprecation:-control-flow-directive`
| 7 |
diff --git a/common/lib/client/realtimechannel.ts b/common/lib/client/realtimechannel.ts @@ -216,11 +216,12 @@ class RealtimeChannel extends Channel {
callback(new ErrorInfo('Maximum size of messages that can be published at once exceeded ( was ' + size + ' bytes; limit is ' + maxMessageSize + ' bytes)', 40009, 400));
return;
}
- this._publish(messages, callback);
+ this.__publish(messages, callback);
});
}
- _publish = (((messages: Array<Message>, callback: ErrCallback) => {
+ // Double underscore used to prevent type conflict with underlying Channel._publish method
+ __publish (messages: Array<Message>, callback: ErrCallback) {
Logger.logAction(Logger.LOG_MICRO, 'RealtimeChannel.publish()', 'message count = ' + messages.length);
const state = this.state;
switch(state) {
@@ -237,7 +238,7 @@ class RealtimeChannel extends Channel {
this.sendMessage(msg, callback);
break;
}
- }) as any);
+ };
onEvent(messages: Array<any>): void {
Logger.logAction(Logger.LOG_MICRO, 'RealtimeChannel.onEvent()', 'received message');
| 7 |
diff --git a/src/components/Editor/Editor.js b/src/components/Editor/Editor.js @@ -48,6 +48,7 @@ class Editor extends React.Component {
componentDidMount() {
this.input.addEventListener('input', throttle(e => this.renderMarkdown(e.target.value), 500));
+ this.input.addEventListener('paste', this.handlePastedImage);
}
setInput = (input) => {
@@ -84,6 +85,22 @@ class Editor extends React.Component {
// Editor methods
//
+ handlePastedImage = (e) => {
+ if (e.clipboardData && e.clipboardData.items) {
+ const items = e.clipboardData.items;
+ Array.from(items).forEach((item) => {
+ if (item.kind === 'file') {
+ const blob = item.getAsFile();
+ const reader = new FileReader();
+ reader.onload = (event) => {
+ console.log(event.target.result);
+ };
+ reader.readAsDataURL(blob);
+ }
+ });
+ }
+ };
+
insertAtCursor = (before, after, deltaStart = 0, deltaEnd = 0) => {
if (!this.input) return;
| 9 |
diff --git a/src/server/routes/apiv3/staffs.js b/src/server/routes/apiv3/staffs.js @@ -3,16 +3,22 @@ const express = require('express');
const axios = require('axios');
const router = express.Router();
+const { isAfter, addMonths } = require('date-fns');
const contributors = require('../../../client/js/components/StaffCredit/Contributor');
+let expiredAt;
+
module.exports = (crowi) => {
router.get('/', async(req, res) => {
+ const now = new Date();
+
const growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
if (growiCloudUri == null) {
- return res.json({});
+ return res.apiv3({ contributors });
}
+ if (expiredAt == null || isAfter(now, expiredAt)) {
const url = new URL('_api/staffCredit', growiCloudUri);
try {
const gcContributorsRes = await axios.get(url.toString());
@@ -20,11 +26,17 @@ module.exports = (crowi) => {
if (contributors[1].sectionName !== 'GROWI-cloud') {
contributors.splice(1, 0, gcContributorsRes.data);
}
- return res.apiv3({ contributors });
+ else {
+ contributors.splice(1, 1, gcContributorsRes.data);
+ }
+ // caching 'expiredAt' for 1 month
+ expiredAt = addMonths(now, 1);
}
catch (err) {
return res.apiv3Err(err, 500);
}
+ }
+ return res.apiv3({ contributors });
});
return router;
| 12 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -295,6 +295,13 @@ articles:
- title: "Anomaly Detection"
url: "/anomaly-detection"
+ children:
+
+ - title: "Overview"
+ url: "/anomaly-detection"
+
+ - title: "Breached Passwords"
+ url: "/anomaly-detection/breached-passwords"
- title: "Addons/Third-Party Applications"
url: "/addons"
| 0 |
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml @@ -14,14 +14,14 @@ jobs:
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- - name: Enable auto-merge for Stripe SDKs Dependabot PRs
- if: ${{contains(steps.metadata.outputs.dependency-names, 'github.com/stripe/stripe-go/v72') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+ - name: Enable auto-merge for Stripe SDKs
+ if: ${{contains(steps.metadata.outputs.dependency-names, ['github.com/stripe/stripe-go/v72', 'stripe/stripe-php']) && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- - name: Enable auto-merge Stripe.net
- if: ${{contains(steps.metadata.outputs.dependency-names, 'Stripe.net') && steps.metadata.outputs.update-type == 'version-update:semver-major'}}
+ - name: Enable auto-merge Stripe.net SDK
+ if: ${{contains(steps.metadata.outputs.dependency-names, 'Stripe.net') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
| 0 |
diff --git a/imports/i18n/accounts.js b/imports/i18n/accounts.js // Load all useraccounts translations at once
import { Tracker } from 'meteor/tracker';
-import { T9n } from 'meteor-accounts-t9n';
+import { T9n } from 'meteor/useraccounts:core';
import { TAPi18n } from './tap';
T9n.setTracker({ Tracker });
| 1 |
diff --git a/lib/project/results-view.js b/lib/project/results-view.js @@ -62,10 +62,10 @@ class ResultsView {
const resizeObserver = new ResizeObserver(this.invalidateItemHeights.bind(this));
resizeObserver.observe(this.element);
this.element.addEventListener('mousedown', this.handleClick.bind(this));
- this.element.addEventListener('focus', this.maintainPreviousScrollPosition.bind(this));
this.subscriptions = new CompositeDisposable(
atom.config.observe('editor.fontFamily', this.fontFamilyChanged.bind(this)),
+ atom.workspace.observeActivePaneItem(this.maintainPreviousScrollPosition.bind(this)),
this.model.onDidAddResult(this.didAddResult.bind(this)),
this.model.onDidSetResult(this.didSetResult.bind(this)),
this.model.onDidRemoveResult(this.didRemoveResult.bind(this)),
| 14 |
diff --git a/src/core/operations/Hash.js b/src/core/operations/Hash.js @@ -16,12 +16,18 @@ import Checksum from "./Checksum.js";
*/
const Hash = {
+ /** Generic hash function
+ *
+ * @param {string} name
+ * @param {string} input
+ * @returns {string}
+ */
runHash: function(name, input) {
- var hasher = CryptoApi.hasher(name);
+ let hasher = CryptoApi.hasher(name);
hasher.state.message = input;
hasher.state.length += input.length;
hasher.process();
- return hasher.finalize().stringify('hex');
+ return hasher.finalize().stringify("hex");
},
/**
| 1 |
diff --git a/index.js b/index.js @@ -29,6 +29,21 @@ const Hypixel = axios.create({
baseURL: 'https://api.hypixel.net/'
});
+let api_index = 0;
+let api_key = credentials.hypixel_api_key;
+
+if(!Array.isArray(api_key))
+ api_key = [api_key];
+
+function getApiKey(){
+ api_index++;
+
+ if(api_index >= api_key.length)
+ api_index = 0;
+
+ return api_key[api_index];
+}
+
async function uuidToUsername(uuid){
let output;
@@ -75,7 +90,7 @@ app.use(cookieParser());
app.use(express.static('public'));
app.get('/stats/:player/:profile?', async (req, res, next) => {
- let { data } = await Hypixel.get('player', { params: { key: credentials.hypixel_api_key, name: req.params.player } });
+ let { data } = await Hypixel.get('player', { params: { key: getApiKey(), name: req.params.player } });
if(data.player == null){
res
@@ -96,7 +111,7 @@ app.get('/stats/:player/:profile?', async (req, res, next) => {
let skyblock_profiles = {};
if(Object.keys(all_skyblock_profiles).length == 0){
- let default_profile = await Hypixel.get('skyblock/profile', { params: { key: credentials.hypixel_api_key, profile: data.player.uuid }});
+ let default_profile = await Hypixel.get('skyblock/profile', { params: { key: getApiKey(), profile: data.player.uuid }});
if(default_profile.data.profile == null){
res
@@ -125,7 +140,7 @@ app.get('/stats/:player/:profile?', async (req, res, next) => {
for(let profile in skyblock_profiles)
promises.push(
- Hypixel.get('skyblock/profile', { params: { key: credentials.hypixel_api_key, profile: profile } })
+ Hypixel.get('skyblock/profile', { params: { key: getApiKey(), profile: profile } })
);
let responses = await Promise.all(promises);
| 11 |
diff --git a/src/editor/components/Editor.js b/src/editor/components/Editor.js @@ -19,6 +19,8 @@ export default class Editor extends AbstractWriter {
this.editorSession.commandManager._updateCommandStates(this.editorSession)
DefaultDOMElement.getBrowserWindow().on('resize', this._showHideTOC, this)
+ DefaultDOMElement.getBrowserWindow().on('drop', this._supressDnD, this)
+ DefaultDOMElement.getBrowserWindow().on('dragover', this._supressDnD, this)
this.tocProvider.on('toc:updated', this._showHideTOC, this)
this._showHideTOC()
}
@@ -216,4 +218,10 @@ export default class Editor extends AbstractWriter {
return bodyContent.id
}
+ /*
+ Prevent app and browser from loading a dnd file
+ */
+ _supressDnD(e) {
+ e.preventDefault()
+ }
}
| 9 |
diff --git a/fabfile/flat.py b/fabfile/flat.py #!/usr/bin/env python
# _*_ coding:utf-8 _*_
import copy
-from cStringIO import StringIO
from fnmatch import fnmatch
-import gzip
import hashlib
import mimetypes
import os
@@ -12,8 +10,6 @@ from boto.s3.key import Key
import app_config
import utils
-GZIP_FILE_TYPES = ['.html', '.js', '.json', '.css', '.xml']
-
def deploy_file(src, dst, headers={}):
"""
@@ -45,31 +41,6 @@ def deploy_file(src, dst, headers={}):
file_headers['Content-Type'],
'charset=utf-8'])
- # Gzip file
- if os.path.splitext(src)[1].lower() in GZIP_FILE_TYPES:
- file_headers['Content-Encoding'] = 'gzip'
-
- with open(src, 'rb') as f_in:
- contents = f_in.read()
-
- output = StringIO()
- f_out = gzip.GzipFile(filename=dst, mode='wb', fileobj=output, mtime=0)
- f_out.write(contents)
- f_out.close()
-
- local_md5 = hashlib.md5()
- local_md5.update(output.getvalue())
- local_md5 = local_md5.hexdigest()
-
- if local_md5 == s3_md5:
- print 'Skipping %s (has not changed)' % src
- else:
- print 'Uploading %s --> %s (gzipped)' % (src, dst)
- k.set_contents_from_string(output.getvalue(),
- file_headers,
- policy=policy)
- # Non-gzip file
- else:
with open(src, 'rb') as f:
local_md5 = hashlib.md5()
local_md5.update(f.read())
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## Unreleased
+## 1.46.0
- Support a wider range of command names for identification of PID in parent PID namespace.
- - Report uncaught exceptions as incidents and via span/trace.
+ - Report uncaught exceptions as incidents and via span/trace (disabled by default).
## 1.45.0
- Record `https` client calls.
| 6 |
diff --git a/source/swap/contracts/Swap.sol b/source/swap/contracts/Swap.sol @@ -518,9 +518,7 @@ contract Swap is ISwap, Ownable {
* @param signer address Address of the signer for which to mark the nonce as used
* @param nonce uint256 Nonce to be marked as used
*/
- function _markNonceAsUsed(address signer, uint256 nonce)
- internal
- {
+ function _markNonceAsUsed(address signer, uint256 nonce) internal {
uint256 groupKey = nonce / 256;
uint256 indexInGroup = nonce % 256;
uint256 group = _nonceGroups[signer][groupKey];
@@ -535,7 +533,7 @@ contract Swap is ISwap, Ownable {
}
/**
- * @notice Calculates and transfers protocol fee and rebate
+ * @notice Calculates and transfers protocol fee
* @param order order
*/
function _transferProtocolFee(Order calldata order) internal {
| 3 |
diff --git a/assets/js/modules/analytics/components/dashboard/index.js b/assets/js/modules/analytics/components/dashboard/index.js * limitations under the License.
*/
-export { default as AdSenseDashboardWidgetTopPagesTableSmall } from './AdSenseDashboardWidgetTopPagesTableSmall';
export { default as AnalyticsAdSenseDashboardWidgetLayout } from './AnalyticsAdSenseDashboardWidgetLayout';
export { default as AnalyticsAdSenseDashboardWidgetTopPagesTable } from './AnalyticsAdSenseDashboardWidgetTopPagesTable';
export { default as AnalyticsDashboardWidget } from './AnalyticsDashboardWidget';
export { default as AnalyticsDashboardWidgetOverview } from './AnalyticsDashboardWidgetOverview';
export { default as AnalyticsDashboardWidgetPopularPagesTable } from './AnalyticsDashboardWidgetPopularPagesTable';
export { default as AnalyticsDashboardWidgetSiteStats } from './AnalyticsDashboardWidgetSiteStats';
-export { default as LegacyAnalyticsDashboardWidgetTopLevel } from './LegacyAnalyticsDashboardWidgetTopLevel';
export { default as AnalyticsDashboardWidgetTopPagesTable } from './AnalyticsDashboardWidgetTopPagesTable';
export { default as DashboardAllTrafficWidget } from './DashboardAllTrafficWidget';
export { default as DashboardBounceRateWidget } from './DashboardBounceRateWidget';
export { default as DashboardGoalsWidget } from './DashboardGoalsWidget';
export { default as DashboardUniqueVisitorsWidget } from './DashboardUniqueVisitorsWidget';
+export { default as LegacyAdSenseDashboardWidgetTopPagesTableSmall } from './LegacyAdSenseDashboardWidgetTopPagesTableSmall';
export { default as LegacyAnalyticsAllTraffic } from './LegacyAnalyticsAllTraffic';
export { default as LegacyAnalyticsAllTrafficDashboardWidgetTopAcquisitionSources } from './LegacyAnalyticsAllTrafficDashboardWidgetTopAcquisitionSources';
export { default as LegacyAnalyticsDashboardWidgetTopAcquisitionSources } from './LegacyAnalyticsDashboardWidgetTopAcquisitionSources';
+export { default as LegacyAnalyticsDashboardWidgetTopLevel } from './LegacyAnalyticsDashboardWidgetTopLevel';
export { default as LegacyDashboardAcquisitionPieChart } from './LegacyDashboardAcquisitionPieChart';
| 10 |
diff --git a/.travis.yml b/.travis.yml @@ -3,12 +3,9 @@ language: node_js
node_js:
- stable
-sudo: required
before_install:
- - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
- - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
- - sudo apt-get update -qq
- - sudo apt-get install -y -qq yarn
+ - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0
+ - export PATH="$HOME/.yarn/bin:$PATH"
cache:
yarn: false
| 3 |
diff --git a/token-metadata/0x6710c63432A2De02954fc0f851db07146a6c0312/metadata.json b/token-metadata/0x6710c63432A2De02954fc0f851db07146a6c0312/metadata.json "symbol": "MFG",
"address": "0x6710c63432A2De02954fc0f851db07146a6c0312",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/tutorials/generic-oauth2-connection-examples.md b/articles/tutorials/generic-oauth2-connection-examples.md @@ -152,20 +152,24 @@ After the call completes successfully, you will be able to login using these new
* Set the `Redirect URI` to [https://${account.namespace}/login/callback](https://${account.namespace}/login/callback).
* Copy `Client ID` and `Client Secret` to config file below
-```
+```har
{
- "name": "dribbble",
- "strategy": "oauth2",
- "options": {
- "client_id": "YOUR DRIBBLE CLIENT ID",
- "client_secret": "YOUT DRIBBBLE CLIENT SECRET",
- "authorizationURL": "https://dribbble.com/oauth/authorize",
- "tokenURL": "https://dribbble.com/oauth/token",
- "scope": ["public"],
- "scripts": {
- "fetchUserProfile": "function(accessToken, ctx, cb) { request.get('https://api.dribbble.com/v1/user', { headers: { 'Authorization': 'Bearer ' + accessToken } }, function(e, r, b) { if (e) return cb(e); if (r.statusCode !== 200 ) return cb(new Error('StatusCode: ' + r.statusCode)); var profile = JSON.parse(b); profile.user_id = profile.id; profile.picture = profile.avatar_url; cb(null, profile); });}"
- }
- }
+ "method": "POST",
+ "url": "https://YOURACCOUNT.auth0.com/api/v2/connections",
+ "httpVersion": "HTTP/1.1",
+ "cookies": [],
+ "headers": [{
+ "name": "Authorization",
+ "value": "Bearer ABCD"
+ }],
+ "queryString": [],
+ "postData": {
+ "mimeType": "application/json",
+ "text": "{ \"name\": \"dribbble\", \"strategy\": \"oauth2\", \"options\": { \"client_id\", \"YOUR_DRIBBLE_CLIENT_ID\", \"client_secret\": \"YOUR_DRIBBLE_CLIENT_SECRET\", \"authorizationURL\": \"https://dribbble.com/oauth/authorize\", \"tokenURL\": \"https://dribbble.com/oauth/token\", \"scope\": [\"public\"], \"scripts\": { \"fetchUserProfile\": \"function(accessToken, ctx, cb) { request.get('https://api.dribbble.com/v1/user', { headers: { 'Authorization': 'Bearer ' + accessToken } }, function(e, r, b) { if (e) return cb(e); if (r.statusCode !== 200 ) return cb(new Error('StatusCode: ' + r.statusCode)); var profile = JSON.parse(b); profile.user_id = profile.id; profile.picture = profile.avatar_url; cb(null, profile); });}"
+ },
+ "headersSize": -1,
+ "bodySize": -1,
+ "comment": ""
}
```
| 0 |
diff --git a/src/StandaloneSass.js b/src/StandaloneSass.js @@ -115,7 +115,7 @@ class StandaloneSass {
console.log("\n");
console.log(output);
- if (Mix.isUsing('notifications')) {
+ if (Config.notifications.onSuccess) {
notifier.notify({
title: 'Laravel Mix',
message: 'Sass Compilation Successful',
| 1 |
diff --git a/app/views/examples/translated/index.njk b/app/views/examples/translated/index.njk +{% set htmlLang = 'cy-GB' %}
+
{% from "accordion/macro.njk" import govukAccordion %}
{% from "back-link/macro.njk" import govukBackLink %}
{% from "breadcrumbs/macro.njk" import govukBreadcrumbs %}
| 12 |
diff --git a/src/commands/functions/update/index.js b/src/commands/functions/update/index.js @@ -2,11 +2,11 @@ const { Command, flags } = require('@oclif/command')
class SitesUpdateCommand extends Command {
async run() {
- this.log(`update a site`)
+ this.log(`update a function`)
}
}
-SitesUpdateCommand.description = `update a site
+SitesUpdateCommand.description = `update a function
...
Extra documentation goes here
`
| 3 |
diff --git a/api/models/KongNode.js b/api/models/KongNode.js @@ -117,27 +117,32 @@ var defaultModel = _.merge(_.cloneDeep(require('../base/Model')), {
cb()
},
seedData: defKongNodeSeedData.seedData.map(function (orig) {
+ var auth = (orig => {
+ switch (orig.type) {
+ case 'default':
+ return {}
+ case 'key_auth':
+ return {
+ "kong_api_key": orig.kong_api_key
+ }
+ case 'jwt':
return {
- "name": orig.name,
- "type": orig.type,
- "kong_admin_url": orig.kong_admin_url,
- "kong_api_key": orig.kong_api_key,
"jwt_algorithm": orig.jwt_algorithm,
"jwt_key": orig.jwt_key,
"jwt_secret": orig.jwt_secret,
- "kong_version": orig.kong_version,
+ }
+ default:
+ throw Error('Unimplemented')
+ }
+ });
+ return Object.assign({
+ "name": orig.name,
+ "type": orig.type,
+ "kong_admin_url": orig.kong_admin_url,
"health_checks": orig.health_checks,
"health_check_details": orig.health_check_details,
- "active": orig.active
- }
+ }, auth(orig))
})
- // seedData: [
- // {
- // "name": "default",
- // "kong_admin_url": "http://kong:8001",
- // "active": true
- // }
- // ]
});
| 7 |
diff --git a/packages/components/src/UnitInput/UnitInput.js b/packages/components/src/UnitInput/UnitInput.js @@ -20,17 +20,25 @@ const isNumber = (value) => !isNaN(Number(value)) && value !== null;
function PresetPlaceholder({ onChange, value }) {
const [isSelecting, setIsSelecting] = React.useState(false);
const [isFocused, setIsFocused] = React.useState(false);
+ const selectRef = React.useRef();
let unit;
const [parsedValue, parsedUnit] = baseParseUnit(value);
React.useEffect(() => {
- const handleOnSelectionEnd = () =>
- requestAnimationFrame(() => setIsSelecting(false));
+ const handleOnSelectionStart = (event) => {
+ if (event.target === selectRef.current) return;
+ setIsSelecting(true);
+ };
+ const handleOnSelectionEnd = () => setIsSelecting(false);
+
document.addEventListener('mouseup', handleOnSelectionEnd);
+ document.addEventListener('mousedown', handleOnSelectionStart);
+
return () => {
document.removeEventListener('mouseup', handleOnSelectionEnd);
+ document.removeEventListener('mousedown', handleOnSelectionStart);
};
}, []);
@@ -38,10 +46,6 @@ function PresetPlaceholder({ onChange, value }) {
unit = findUnitMatch({ value: parsedUnit });
}
- const handleOnMouseDown = React.useCallback((event) => {
- setIsSelecting(true);
- }, []);
-
const handleOnChangeSelect = (event) => {
const unit = event.target.value;
const [parsedValue] = baseParseUnit(value);
@@ -55,21 +59,24 @@ function PresetPlaceholder({ onChange, value }) {
return (
<View
css={[
+ textInputStyles.Input,
`
margin: 0 !important;
position: absolute;
top: 0;
left: 8px;
- width: 'auto',
+ width: auto;
`,
- textInputStyles.Input,
{ pointerEvents: isSelecting ? 'none' : 'initial' },
]}
- onMouseDown={handleOnMouseDown}
>
<View
as="span"
- css={[textInputStyles.inputFontSize, ui.opacity(0)]}
+ css={[
+ textInputStyles.inputFontSize,
+ ui.opacity(0),
+ { pointerEvents: 'none' },
+ ]}
>
{parsedValue}
</View>
@@ -109,6 +116,7 @@ function PresetPlaceholder({ onChange, value }) {
onClick={(e) => e.stopPropagation()}
onFocus={() => setIsFocused(true)}
onMouseDown={(e) => e.stopPropagation()}
+ ref={selectRef}
>
{UNITS.map((unit) => (
<option key={unit} value={unit}>
| 7 |
diff --git a/includes/loader.php b/includes/loader.php @@ -30,7 +30,7 @@ function autoload_classes() {
spl_autoload_register(
function ( $class ) use ( $class_map ) {
- if ( isset( $class_map[ $class ] ) && file_exists( $class_map[ $class ] ) ) {
+ if ( isset( $class_map[ $class ] ) ) {
require_once $class_map[ $class ];
return true;
@@ -52,11 +52,9 @@ function autoload_vendor_files() {
// Third-party files.
$files = require GOOGLESITEKIT_PLUGIN_DIR_PATH . 'third-party/vendor/autoload_files.php';
foreach ( $files as $file_identifier => $file ) {
- if ( file_exists( $file ) ) {
require_once $file;
}
}
-}
autoload_vendor_files();
// Initialize the plugin.
| 2 |
diff --git a/.eslintrc.js b/.eslintrc.js @@ -44,7 +44,7 @@ module.exports = {
"jsx-quotes": ["error", "prefer-double"],
"keyword-spacing": "error",
"key-spacing": ["error", {
- "beforeColon" : true,
+ "beforeColon": false,
"afterColon": true,
}],
"no-unused-vars": [
| 12 |
diff --git a/lib/processor.js b/lib/processor.js @@ -5,8 +5,8 @@ const uglify = require('uglify-es');
const getConfig = require('./config');
const config = getConfig();
-const MAX_LINE_COUNT_OF_SHORT_EXAMPLES = 10;
-const MIN_LINE_COUNT_OF_TALL_EXAMPLES = 14;
+const MAX_LINE_COUNT_OF_SHORT_JS_EXAMPLES = 10;
+const MIN_LINE_COUNT_OF_TALL_JS_EXAMPLES = 14;
/**
* A super simple preprocessor that converts < to <
@@ -88,10 +88,10 @@ function processInclude(type, tmpl, source) {
* @returns height - the value of the data-height property
*/
function getJSExampleHeightByLineCount(lineCount) {
- if(lineCount <= MAX_LINE_COUNT_OF_SHORT_EXAMPLES) {
+ if(lineCount <= MAX_LINE_COUNT_OF_SHORT_JS_EXAMPLES) {
return 'shorter';
}
- if(lineCount >= MIN_LINE_COUNT_OF_TALL_EXAMPLES) {
+ if(lineCount >= MIN_LINE_COUNT_OF_TALL_JS_EXAMPLES) {
return 'taller';
}
return '';
| 10 |
diff --git a/ui/src/components/EntityTable/EntityTableRow.jsx b/ui/src/components/EntityTable/EntityTableRow.jsx @@ -14,10 +14,8 @@ class EntityTableRow extends Component {
const { updateSelection, selection } = this.props;
const selectedIds = _.map(selection || [], 'id');
const isSelected = selectedIds.indexOf(entity.id) > -1;
- const highlights = !entity.highlight ? [] : entity.highlight;
-
const parsedHash = queryString.parse(location.hash);
-
+ const highlights = !entity.highlight ? [] : entity.highlight;
// Select the current row if the ID of the entity matches the ID of the
// current object being previewed. We do this so that if a link is shared
// the currently displayed preview will also have the row it corresponds to
@@ -28,7 +26,7 @@ class EntityTableRow extends Component {
return (
<React.Fragment>
<tr key={entity.id}
- className={c('EntityTableRow', 'nowrap', className, {'active': isActive}, 'prefix': isPrefix)}>
+ className={c('EntityTableRow', 'nowrap', className, {'active': isActive}, {'prefix': isPrefix})}>
{updateSelection && <td className="select">
<Checkbox checked={isSelected} onChange={() => updateSelection(entity)} />
</td>}
@@ -59,7 +57,7 @@ class EntityTableRow extends Component {
</td>
)}
</tr>
- {highlights.length &&
+ {!!highlights.length &&
<tr key={entity.id + '-hl'}
className={c('EntityTableRow', className, {'active': isActive})}>
<td colSpan="5" className="highlights">
| 9 |
diff --git a/server/game/CardSelector.js b/server/game/CardSelector.js @@ -8,7 +8,6 @@ const defaultProperties = {
numCards: 1,
cardCondition: () => true,
cardType: ['attachment', 'character', 'event', 'holding', 'stronghold', 'role', 'province'],
- gameAction: 'target',
multiSelect: false
};
| 2 |
diff --git a/articles/extensions/authorization-extension.md b/articles/extensions/authorization-extension.md @@ -262,3 +262,9 @@ The extension uses the internal Webtask storage capabilities, which are limited
- If you have 20 groups and 7000 users, where each user is member of 3 groups about 480 KB of data would be used.
Think you need more? [Contact support.](https://support.auth0.com)
+
+## Troubleshooting
+
+### An authentication results in a token that contains Groups but not Roles or Permissions
+
+If this happens, chances are you created roles & permissions for one application (client) but are authenticating with another. For example, you created all your roles/permissions against Website A but create another website client in Auth0 (Website B) and use its `client_id` and `client_secret` in your application. This can also occur if you click the **Try** button in the Auth0 Dashboard on a Connection that contains one of your users. This will execute an authentication flow using the Auth0 _global application_, which is not the same as the application you configured in the extension.
| 0 |
diff --git a/includes/Core/Util/Debug_Data.php b/includes/Core/Util/Debug_Data.php @@ -130,8 +130,19 @@ class Debug_Data {
'user_status' => $this->get_user_status_field(),
'active_modules' => $this->get_active_modules_field(),
);
+ $none = __( 'None', 'google-site-kit' );
- return array_merge( $fields, $this->get_module_fields() );
+ return array_map(
+ function ( $field ) use ( $none ) {
+ if ( empty( $field['value'] ) ) {
+ $field['value'] = $none;
+ $field['debug'] = 'none';
+ }
+
+ return $field;
+ },
+ array_merge( $fields, $this->get_module_fields() )
+ );
}
/**
| 14 |
diff --git a/test/login.test.js b/test/login.test.js @@ -25,7 +25,7 @@ test('private key is valid', t => {
test('public key is valid', t => {
t.true(Device.isValidPubKey(pubkey));
- t.is(pubkey, ecdsa.publicKeyCreate(priv).toString('base64'));
+ t.is(pubkey, Buffer.from(ecdsa.publicKeyCreate(priv, true)).toString('base64'));
});
test('message hash is correct', t => {
| 1 |
diff --git a/src/encoded/schemas/human_donor.json b/src/encoded/schemas/human_donor.json "linkTo": "HumanDonor"
}
},
- "children": {
- "title": "Children",
- "description": "Biological children of this donor.",
- "comment": "Do not submit. This is calculated from the parents field.",
- "type": "array",
- "default": [],
- "uniqueItems": true,
- "items": {
- "title": "Child",
- "description": "Biological child of this donor.",
- "comment": "For human biosamples, see human_donor.json for available identifiers.",
- "type": "string",
- "linkTo": "HumanDonor"
- }
- },
"siblings": {
"title": "Siblings",
"description": "Donors that have at least one parent in common with this donor.",
| 2 |
diff --git a/scripts/documentation/generate.js b/scripts/documentation/generate.js const fs = require("fs");
-const git = require("simple-git")();
-// const git = require("simple-git/promise")();
+const git = require("simple-git/promise")();
const pkg = require("../../package.json");
const moment = require("moment");
const rimraf = require("@alexbinary/rimraf");
@@ -24,8 +23,11 @@ const GA_CONFIG = {
domain: "https://djipco.github.io/webmidi"
};
-// Version broken down by major, minor and patch
-const version = pkg.version.split(".");
+// Major version
+const VERSION = pkg.version.split(".")[0];
+
+// Target folder to save the doc in
+const SAVE_PATH = `./api/v${VERSION}`;
// JSDoc configuration object to write as configuration file
const config = {
@@ -96,9 +98,6 @@ const config = {
};
-// Target folder to save the doc in
-const SAVE_PATH = `./api/v${version[0]}`;
-
// Prepare jsdoc command
const cmd = "./node_modules/.bin/jsdoc " +
`--configure ${CONF_PATH} ` +
@@ -123,21 +122,24 @@ async function execute() {
await rimraf(CONF_PATH);
// Get current branch
- let ORIGINAL_BRANCH = await git.branch({"--show-current": null});
+ let results = await git.branch();
+ const ORIGINAL_BRANCH = results.current;
- // Commit to gh-pages branch and push
+ // Switch to gh-pages and commit API documentation
console.info("\x1b[32m", `Switching from '${ORIGINAL_BRANCH}' to '${TARGET_BRANCH}'`, "\x1b[0m");
- let message = "Updated on: " + moment().format();
await git.checkout(TARGET_BRANCH);
await git.add([SAVE_PATH]);
+ let message = "Updated on: " + moment().format();
await git.commit(message, [SAVE_PATH]);
console.info("\x1b[32m", `Changes committed to ${TARGET_BRANCH} branch`, "\x1b[0m");
+
+ // Push changes
await git.push();
console.info("\x1b[32m", `Changes pushed to remote`, "\x1b[0m");
// Come back to original branch
console.info("\x1b[32m", `Switching back to '${ORIGINAL_BRANCH}' branch`, "\x1b[0m");
- await git.checkout("develop");
+ await git.checkout(ORIGINAL_BRANCH);
}
| 7 |
diff --git a/packages/app/src/components/Common/ImageCropModal.tsx b/packages/app/src/components/Common/ImageCropModal.tsx @@ -51,12 +51,11 @@ const ImageCropModal: FC<Props> = (props: Props) => {
if (imageRef) {
// Some SVG files may not have width and height properties, causing the render size to be 0x0
// Force imageRef to have width and height by create temporary image element then set the imageRef width with tempImage width
- // const tempImage = new Image();
- // tempImage.src = imageRef.src;
- // imageRef.width = tempImage.width;
- if (imageRef.width == null) { imageRef.width = 0 }
- if (imageRef.height == null) { imageRef.height = 0 }
-
+ // Set imageRef width & height by natural width / height if image has no dimension
+ if (imageRef.width === 0 || imageRef.height === 0) {
+ imageRef.width = imageRef.naturalWidth;
+ imageRef.height = imageRef.naturalHeight;
+ }
// Get size of Image, min value of width and height
const size = Math.min(imageRef.width, imageRef.height);
setCropOtions({
| 12 |
diff --git a/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js b/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js @@ -347,7 +347,7 @@ define([
}
var isUpdated = true;
- for (i = 0; i < length; i++) {
+ for (i = 0; i < items.length; i++) {
isUpdated = items[i].update(time) && isUpdated;
}
return isUpdated;
| 1 |
diff --git a/src/collections.ts b/src/collections.ts @@ -166,12 +166,12 @@ export class Collections<CollectionType extends UnknownRecord = UnknownRecord> {
* @method add
* @memberof Collections.prototype
* @param {string} collection collection name
- * @param {string} itemId entry id
+ * @param {string | null} itemId entry id, if null a random id will be assigned to the item
* @param {CollectionType} itemData ObjectStore data
* @return {Promise<CollectionEntry<CollectionType>>}
* @example collection.add("food", "cheese101", {"name": "cheese burger","toppings": "cheese"})
*/
- async add(collection: string, itemId: string, itemData: CollectionType) {
+ async add(collection: string, itemId: string | null, itemData: CollectionType) {
const response = await this.client.post<CollectionAPIResponse<CollectionType>>({
url: this.buildURL(collection),
body: {
| 1 |
diff --git a/lime/tools/platforms/TVOSPlatform.hx b/lime/tools/platforms/TVOSPlatform.hx @@ -232,8 +232,8 @@ class TVOSPlatform extends PlatformTarget {
context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat (project.config.getArrayString ("tvos.linker-flags"));
- if (project.config.exists("ios.non_encryption")) {
- context.NON_ENCRYPTION = project.config.getBool ("ios.non_encryption", false);
+ if (project.config.exists("tvos.non_encryption")) {
+ context.NON_ENCRYPTION = project.config.getBool ("tvos.non_encryption", false);
}
switch (project.window.orientation) {
| 14 |
diff --git a/js/livecoin.js b/js/livecoin.js @@ -418,7 +418,13 @@ module.exports = class livecoin extends Exchange {
let response = await this.fetch2 (path, api, method, params, headers, body);
if ('success' in response)
if (!response['success']) {
- let ex = this.safeInteger (response, 'exception');
+ let ex = undefined;
+ try {
+ // May return string instead of code
+ ex = this.safeInteger (response, 'exception');
+ } catch (e) {
+ ex = undefined;
+ }
if (ex == 1 || ex == 2) {
throw new ExchangeError (this.id + ' ' + this.json (response));
} else if (ex == 10 || ex == 11 || ex == 12 || ex == 20 || ex == 30 || ex == 101 || ex == 102) {
| 9 |
diff --git a/src/lib/gundb/UserStorageClass.js b/src/lib/gundb/UserStorageClass.js @@ -1146,6 +1146,10 @@ export class UserStorage {
async getProfile(): Promise<any> {
const encryptedProfile = await this.loadGunField(this.profile)
+ if (encryptedProfile === undefined) {
+ logger.error('getProfile: profile node undefined')
+ return {}
+ }
const fullProfile = this.getPrivateProfile(encryptedProfile)
return fullProfile
}
@@ -1166,6 +1170,10 @@ export class UserStorage {
async getPublicProfile(): Promise<any> {
const encryptedProfile = await this.loadGunField(this.profile)
+ if (encryptedProfile === undefined) {
+ logger.error('getPublicProfile: profile node undefined')
+ return {}
+ }
const fullProfile = this.getDisplayProfile(encryptedProfile)
return fullProfile
}
| 0 |
diff --git a/karma.conf.js b/karma.conf.js @@ -14,6 +14,11 @@ module.exports = (config) => {
"test/index.js": ["rollup"],
"test/**/*.spec.js": ["babel"]
},
+ client: {
+ mocha: {
+ timeout: 10000
+ }
+ },
rollupPreprocessor: {
format: "iife",
name: "VueGL",
| 12 |
diff --git a/packages/gatsby/cache-dir/production-app.js b/packages/gatsby/cache-dir/production-app.js @@ -8,6 +8,7 @@ import { Router, Route, withRouter, matchPath } from "react-router-dom"
import { ScrollContext } from "gatsby-react-router-scroll"
import domReady from "domready"
import history from "./history"
+window.___history = history
import emitter from "./emitter"
window.___emitter = emitter
import pages from "./pages.json"
@@ -101,9 +102,11 @@ apiRunnerAsync(`onClientEntry`).then(() => {
action: history.action,
})
+ let initialAttachDone = false
function attachToHistory(history) {
- if (!window.___history) {
+ if (!window.___history || initialAttachDone === false) {
window.___history = history
+ initialAttachDone = true
history.listen((location, action) => {
if (!maybeRedirect(location.pathname)) {
| 12 |
diff --git a/internal/webpack/configFactory.js b/internal/webpack/configFactory.js @@ -487,6 +487,8 @@ export default function webpackConfigFactory(buildOptions) {
mergeDeep(
{
test: /(\.scss|\.css)$/,
+ // Dont add css-modules to node_modules css files.
+ exclude: /node_modules.*\.css$/,
},
// For development clients we will defer all our css processing to the
// happypack plugin named "happypack-devclient-css".
@@ -527,6 +529,18 @@ export default function webpackConfigFactory(buildOptions) {
),
),
+ // Dont CSS modules on css files from node_modules folder
+ ifElse(isClient || isServer)({
+ test: /node_modules.*\.css$/,
+ use: ifOptimizeClient(ExtractTextPlugin.extract({
+ fallback: 'style-loader',
+ use: ['css-loader', 'postcss-loader'],
+ }), [
+ ...ifNode(['css-loader/locals'], ['style-loader', 'css-loader']),
+ 'postcss-loader',
+ ]),
+ }),
+
// ASSETS (Images/Fonts/etc)
// This is bound to our server/client bundles as we only expect to be
// serving the client bundle as a Single Page Application through the
| 11 |
diff --git a/web/kiri/index.html b/web/kiri/index.html <head lang="en">
<meta charset="UTF-8">
<meta name="author" content="Stewart Allen">
- <meta name="keywords" content="3d slicer,slicer,3d slicing,cnc,cam,toolpaths,toolpath generation,kiri,kirimoto,kiri:moto,gcode" />
+ <meta name="keywords" content="3d slicer,slicer,3d slicing,cnc,cam,toolpaths,toolpath generation,kiri,kirimoto,kiri:moto,gcode,cura,simplify 3d,prusaslicer,fdm,sla" />
<meta name="copyright" content="stewart allen [[email protected]]">
- <meta name="description" content="3d slice modeler, gcode and CNC toolpath generator">
- <meta property="og:description" content="Kiri:Moto is a unique multi-modal 3D slicer that runs entirely in browser and creates output for your favorite maker tools: 3D Printers, CNC Mills and Laser Cutters.">
- <meta property="og:title" content="Free 3D Tools for Makers">
+ <meta name="description" content="Browser-based 3D slicer, gcode and CNC toolpath generator">
+ <meta property="og:description" content="Kiri:Moto is a unique 3D slicer that runs entirely in browser and creates output for your favorite maker tools: 3D Printers, CNC Mills and Laser Cutters.">
+ <meta property="og:title" content="Browser-based 3D Slicer">
<meta property="og:type" content="website">
<meta property="og:url" content="https://grid.space/kiri/">
<meta property="og:image" content="https://static.grid.space/img/logo_km_og.png">
| 3 |
diff --git a/src/physics/collision.js b/src/physics/collision.js // initializa the quadtree
api.quadTree = new me.QuadTree(api.bounds, api.maxChildren, api.maxDepth);
- // reset the collision detection engine if a TMX level is loaded
+ // reset the collision detection engine if a new level is loaded
me.event.subscribe(me.event.LEVEL_LOADED, function () {
- // default bounds to game world
- api.bounds.copy(me.game.world);
+ // align default bounds to the game world bounds
+ api.bounds.copy(me.game.world.getBounds());
// reset the quadtree
api.quadTree.clear(api.bounds);
});
| 4 |
diff --git a/app/front.js b/app/front.js @@ -80,6 +80,8 @@ let onClose = function() {
$('.outerPlaceholder').html($math)
$mathToolbar.hide()
editorVisible = false
+ mathField.blur()
+ latexEditorFocus = false
$answer.get(0).focus()
}
$('.math .close').mousedown(e => {
@@ -133,6 +135,8 @@ function initSpecialCharacterSelector() {
const innerText = e.currentTarget.innerText
if($equationEditor.hasClass('mq-focused')) {
mathField.typedText(innerText)
+ } else if(latexEditorFocus) {
+ insertToTextAreaAtCursor(innerText)
} else {
window.document.execCommand('insertText', false, innerText);
}
| 1 |
diff --git a/tools/locCSVToLangFile.js b/tools/locCSVToLangFile.js @@ -4,7 +4,7 @@ const fs = require('fs');
const path = require('path');
const prettier = require('prettier');
-/* globals require, process */
+/* globals console, require, process */
const loadCSV = (pathToCsv) =>
fs
@@ -30,10 +30,17 @@ const locCSVToJson = () => {
csv.forEach((line) => {
const id = line[0];
+ if (id === "String ID") {
+ return;
+ }
const translation = line[2];
const target = lang[id];
+ if (!translation) {
+ return;
+ }
if (!target) {
- throw new Error(`${id} does not exist in target dictionary.`);
+ console.log(`${id} does not exist in target dictionary.`);
+ return;
}
target.translation = translation;
if (target.flags && target.flags.includes("fuzzy")) {
| 7 |
diff --git a/src/og/control/TouchNavigation.js b/src/og/control/TouchNavigation.js @@ -195,6 +195,27 @@ class TouchNavigation extends Control {
t1.x = e.sys.touches.item(1).clientX - e.sys.offsetLeft;
t1.y = e.sys.touches.item(1).clientY - e.sys.offsetTop;
+ // distance = Math.sqrt((t0.prev_x-t1.prev_x)**2+(t0.prev_y-t1.prev_y)**2) - Math.sqrt((t0.x-t1.x)**2 + (t0.y-t1.y)**2))
+ // distance < 0 --> zoomIn; distance > 0 --> zoomOut
+ var t0t1Distance = Math.abs(t0.prev_x - t1.prev_x) + Math.abs(t0.prev_y - t1.prev_y) - (Math.abs(t0.x - t1.x) + Math.abs(t0.y - t1.y))
+ var _move = 0
+ var _targetPoint = this.renderer.getCenter()
+ var d =
+ cam.eye.distance(
+ this.planet.getCartesianFromPixelTerrain(_targetPoint, true)
+ ) * 0.075;
+ if (t0t1Distance < 0) {
+ _move = 1
+ }
+ if (t0t1Distance > 0) {
+ _move = -1
+ }
+ if (_move !== 0) {
+ cam.eye.addA(cam.getForward().scale(_move * d));
+ cam.checkTerrainCollision();
+ cam.update();
+ }
+
if (
(t0.dY() > 0 && t1.dY() > 0) ||
(t0.dY() < 0 && t1.dY() < 0) ||
| 0 |
diff --git a/token-metadata/0x9D54F8f50424B3b40055cf1261924E4c5A34E562/metadata.json b/token-metadata/0x9D54F8f50424B3b40055cf1261924E4c5A34E562/metadata.json "symbol": "HILK",
"address": "0x9D54F8f50424B3b40055cf1261924E4c5A34E562",
"decimals": 16,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/iob/history.js b/lib/iob/history.js @@ -152,6 +152,13 @@ function calcTempTreatments (inputs) {
temp.duration = duration;
tempHistory.push(temp);
}
+ // Add a temp basal cancel event to ignore future temps and reduce predBG oscillation
+ var temp = {};
+ temp.rate = 0;
+ temp.started_at = new Date();
+ temp.date = temp.started_at.getTime();
+ temp.duration = 0;
+ tempHistory.push(temp);
}
// Check for overlapping events and adjust event lengths in case of overlap
| 8 |
diff --git a/src/components/ComponentPreview.js b/src/components/ComponentPreview.js @@ -13,6 +13,7 @@ const ComponentPreview = ({
maxHeight,
maxWidth,
allowScrolling,
+ title,
}) => {
const iframeURL = `https://html.sparkdesignsystem.com/iframe.html?id=${componentType}-${componentName}`;
@@ -26,7 +27,7 @@ const ComponentPreview = ({
maxWidth,
}}
scrolling={allowScrolling}
- title="Component Preview"
+ title={title}
className="docs-c-ComponentPreview sprk-o-Box"
src={iframeURL}
loading="lazy"
@@ -56,11 +57,13 @@ ComponentPreview.propTypes = {
maxWidth: PropTypes.string,
minHeight: PropTypes.string,
allowScrolling: PropTypes.bool,
+ title: PropTypes.string,
};
ComponentPreview.defaultProps = {
componentType: 'components',
allowScrolling: false,
+ title: 'Component Preview',
};
export default ComponentPreview;
| 11 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,20 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.31.1] -- 2017-10-16
+
+### Fixed
+- Fix IE and Edge SVG `toImage` support [#2068]
+- Return empty set during selections of `visible: false` traces [#2081]
+- Fix scroll glitch in `table` traces [#2064]
+- Fix handling of 1D header values in `table` [#2072]
+- Fix `table` line style defaults [#2074]
+- Do not attempt to start drag on right-click [#2087]
+- Phase out `alignment-baseline` attributes in SVG text nodes [#2076]
+- Listen to document events on drag instead of relying on
+ cover-slip node [#2075]
+
+
## [1.31.0] -- 2017-10-05
### Added
| 3 |
diff --git a/bin/definition-validator.js b/bin/definition-validator.js @@ -101,7 +101,11 @@ function normalize (data) {
if (validator === true) {
Object.keys(definition).forEach(key => {
- Object.defineProperty(result, key, { value: definition[key] });
+ Object.defineProperty(result, key, {
+ configurable: true,
+ enumerable: true,
+ value: definition[key]
+ });
});
// Object.assign(result, util.copy(definition));
@@ -121,7 +125,11 @@ function normalize (data) {
if (!allowed) {
notAllowed.push(key);
} else if (!keyValidator.ignored || !fn(keyValidator.ignored, child)) {
- Object.defineProperty(result, key, { value: runChildValidator(child) });
+ Object.defineProperty(result, key, {
+ configurable: true,
+ enumerable: true,
+ value: runChildValidator(child)
+ });
valueSet = true;
}
}
@@ -138,7 +146,10 @@ function normalize (data) {
// organize definition properties
Object.keys(definition).forEach(key => {
if (rxExtension.test(key)) {
- Object.defineProperty(result, key, { value: definition[key] });
+ Object.defineProperty(result, key, {
+ configurable: true,
+ enumerable: true,
+ value: definition[key] });
} else {
unknownKeys.push(key);
}
@@ -182,6 +193,8 @@ function normalize (data) {
notAllowed.push(key);
} else if (!keyValidator.ignored || !fn(keyValidator.ignored, data)) {
Object.defineProperty(result, key, {
+ configurable: true,
+ enumerable: true,
value: runChildValidator(data)
});
}
| 11 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -38,8 +38,8 @@ articles:
- title: SPA + API
url: /architecture-scenarios/application/spa-api
- # - title: Mobile + API
- # url: /architecture-scenarios/application/mobile-api
+ - title: Mobile + API
+ url: /architecture-scenarios/application/mobile-api
# - title: SAML for Regular Web Apps
# url: /architecture-scenarios/application/web-saml
| 0 |
diff --git a/server/services/searchTRIPLE.php b/server/services/searchTRIPLE.php @@ -16,7 +16,7 @@ if (isset($post_params["service"]) && $post_params["service"] === "triple_km") {
$service_integration = $post_params["service"];
$post_params["vis_type"] = "overview";
$post_params["service"] = "triple";
- $param_types = array("from", "to", "sorting", "language", "limit");
+ $param_types = array("from", "to", "sorting", "language");
}
if (isset($post_params["service"]) && $post_params["service"] === "triple_sg") {
$service_integration = $post_params["service"];
| 2 |
diff --git a/README.md b/README.md @@ -10,7 +10,8 @@ SimpleBar is meant to be as easy to use as possible and lightweight. If you want
**- Via npm**
`npm install simplebar --save`
-Then don't forget to import both css and js in your project.
+**- Via Yarn**
+`yarn add simplebar`
**- Via `<script>` tag**
```
@@ -22,20 +23,22 @@ Then don't forget to import both css and js in your project.
```
note: you can replace `@latest` to the latest version (ex `@2.4.3`), if you want to lock to a specific version
-**- For Ruby On Rails**
-
-To include SimpleBar in the Ruby On Rails asset pipeline, use the [simplebar-rails](https://github.com/thutterer/simplebar-rails) gem.
### Usage
-If you are using a module loader you first need to load SimpleBar:
-`import 'SimpleBar';` or `import SimpleBar from 'SimpleBar';`
+If you are using a module loader (like Webpack) you first need to load SimpleBar:
+```
+import 'simplebar'; // or "import SimpleBar from 'simplebar';" if you want to use it manually.
+import 'simplebar/src/simplebar.css';
+```
Set `data-simplebar` on the element you want your custom scrollbar. You're done.
```
<div data-simplebar></div>
```
+**Don't forget to import both css and js in your project!**
+
### :warning: Warning!
SimpleBar is **not intended to be used on the `body` element!** I don't recommend wrapping your entire web page inside a custom scroll as it will often affect badly the user experience (slower scroll performances compare to native body scroll, no native scroll behaviours like click on track, etc.). Do it at your own risk!
SimpleBar is meant to improve the experience of **internal web pages scroll**: like a chat box or a small scrolling area.
@@ -193,9 +196,10 @@ Most of the credit goes to [Jonathan Nicol](http://www.f6design.com/) who made t
Website: http://html5up.net/
-### Additional contributors
+### Community plugins
-Yoh Suzuki: wrapContent option
+**Ruby On Rails**
+To include SimpleBar in the Ruby On Rails asset pipeline, use the [simplebar-rails](https://github.com/thutterer/simplebar-rails) gem.
[npm-badge]: https://img.shields.io/npm/v/simplebar.svg?style=flat-square
[npm]: https://www.npmjs.org/package/simplebar
| 7 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -100,8 +100,7 @@ module.exports = function(grunt) {
browserify: {
options: {
browserifyOptions: {
- debug: buildType === 'dev',
- fullPaths: true
+ debug: buildType === 'dev'
}
},
ui: {
| 2 |
diff --git a/bin/definition/index.js b/bin/definition/index.js @@ -96,7 +96,8 @@ function normalize(data) {
let result;
try {
-
+ // working on figuring out ambiguous type
+ const type = getValueType(value);
if (validator.type && (message = checkType(data))) {
exception('Value must be ' + message + '. Received: ' + util.smart(value));
@@ -106,7 +107,7 @@ function normalize(data) {
? exception('Value must equal: ' + message[0] + '. Received: ' + util.smart(value))
: exception('Value must be one of: ' + message.join(', ') + '. Received: ' + util.smart(value));
- } else if (validator.type === 'array') {
+ } else if (type === 'array') {
result = value.map((v, i) => {
return normalize({
exception: exception.at(i),
@@ -121,7 +122,7 @@ function normalize(data) {
});
});
- } else if (validator.type === 'object') {
+ } else if (type === 'object') {
result = {};
if (validator.additionalProperties) {
Object.keys(value).forEach(key => {
@@ -288,9 +289,7 @@ function checkType(params) {
if (!validator.type) return;
// get the value type
- let type = typeof value;
- if (Array.isArray(value)) type = 'array';
- if (type === 'object' && !util.isPlainObject(value)) type = undefined;
+ const type = getValueType(value);
// get valid types
let matches = fn(validator.type, params);
@@ -330,3 +329,10 @@ function checkEnum(params) {
? false
: matches;
}
+
+function getValueType(value) {
+ let type = typeof value;
+ if (Array.isArray(value)) type = 'array';
+ if (type === 'object' && !util.isPlainObject(value)) type = undefined;
+ return type;
+}
\ No newline at end of file
| 1 |
diff --git a/light.js b/light.js @@ -212,11 +212,15 @@ function prepareHistory(historyRequest, callbacks){
if (rows.length > MAX_HISTORY_ITEMS)
return callbacks.ifError("your history is too large, consider switching to a full client");
+ mutex.lock(['prepareHistory'], function(unlock){
+ var start_ts = Date.now();
witnessProof.prepareWitnessProof(
arrWitnesses, 0,
function(err, arrUnstableMcJoints, arrWitnessChangeAndDefinitionJoints, last_ball_unit, last_ball_mci){
- if (err)
- return callbacks.ifError(err);
+ if (err){
+ callbacks.ifError(err);
+ return unlock();
+ }
objResponse.unstable_mc_joints = arrUnstableMcJoints;
if (arrWitnessChangeAndDefinitionJoints.length > 0)
objResponse.witness_change_and_definition_joints = arrWitnessChangeAndDefinitionJoints;
@@ -249,11 +253,14 @@ function prepareHistory(historyRequest, callbacks){
if (objResponse.proofchain_balls.length === 0)
delete objResponse.proofchain_balls;
callbacks.ifOk(objResponse);
+ console.log("prepareHistory for addresses "+(arrAddresses || []).join(', ')+" and joints "+(arrRequestedJoints || []).join(', ')+" took "+(Date.now()-start_ts)+'ms');
+ unlock();
}
);
}
);
});
+ });
}
| 6 |
diff --git a/src/bot/publicbot/commands/add-server.js b/src/bot/publicbot/commands/add-server.js if (message.member.permissions.has("ADMINISTRATOR")) {
- Servers.findOne({ id: message.guild.id }).then((server) => {
+ Cache.Servers.findOne({ id: message.guild.id }).then((server) => {
if (!server) {
message.channel.send(
"Okay! Im adding this server on RDL! <:stonks:791163340607979561>"
@@ -7,7 +7,7 @@ if (message.member.permissions.has("ADMINISTRATOR")) {
/*message.channel.send("Making an invite link!").then(msg => {
msg.channel.createInvite({ maxAge: 0, reason: `${message.author.tag} asked to add this server to RDL!` }).then(invite => {
msg.edit(`Invite code: **${invite.code}**`);*/
- let Server = new Servers({
+ let Server = new Cache.models.Servers({
id: message.guild.id,
owner: message.guild.ownerId,
name: message.guild.name,
@@ -23,6 +23,7 @@ if (message.member.permissions.has("ADMINISTRATOR")) {
message.channel.send(
"Successfully Added your server to RDL!\nPlease update the description of your server on the dashboard on RDL."
);
+ Cache.Servers.refresh();
});
} else {
message.channel.send("Oi! This server is already on RDL!");
| 3 |
diff --git a/jest.config.js b/jest.config.js @@ -9,7 +9,7 @@ module.exports = {
functions: 80,
lines: 80,
},
- './src/components/**/!(ColumnHeaderRow|ColumnHeaderSelect|FilterHeaderRow|TableToolbar|RowActionsCell|RowActionsError|StatefulTable|StatefulTableDetailWizard|CatalogContent|FileDrop|HeaderMenu|Dashboard|CardRenderer|Attribute|UnitRenderer|ImageHotspots|ImageControls|TimeSeriesCard|ListCard|PageHero|PageTitle|EditPage|AsyncTable|ImageCard|WizardHeader).jsx': {
+ './src/components/**/!(ColumnHeaderRow|ColumnHeaderSelect|FilterHeaderRow|TableToolbar|RowActionsCell|RowActionsError|StatefulTable|StatefulTableDetailWizard|CatalogContent|FileDrop|HeaderMenu|Dashboard|CardRenderer|Attribute|UnitRenderer|ImageHotspots|ImageControls|TimeSeriesCard|PageHero|PageTitle|EditPage|AsyncTable|ImageCard|WizardHeader).jsx': {
statements: 80,
branches: 80,
functions: 80,
| 1 |
diff --git a/.github/workflows/jdl.yml b/.github/workflows/jdl.yml @@ -66,7 +66,7 @@ jobs:
- jdl: blog-store-microfrontend
environment: prod
# Use monorepository for diff
- extra-args: --workspaces --monorepository --interactive
+ extra-args: --workspaces --monorepository
new-extra-args: --microfrontend
# Backend is failing, disable it
skip-backend-tests: 1
| 2 |
diff --git a/src/manifest.json b/src/manifest.json {
"manifest_version": 2,
- "version": "0.1.7",
+ "version": "0.1.8",
"name": "Liquality Wallet",
"description": "Secure multi-crypto wallet with built-in Atomic Swaps!",
"homepage_url": "https://liquality.io",
| 3 |
diff --git a/lib/WebpackOptionsValidationError.js b/lib/WebpackOptionsValidationError.js @@ -51,15 +51,16 @@ class WebpackOptionsValidationError extends Error {
constructor(validationErrors) {
super();
- if(Error.hasOwnProperty("captureStackTrace")) {
- Error.captureStackTrace(this, this.constructor);
- }
this.name = "WebpackOptionsValidationError";
this.message = "Invalid configuration object. " +
"Webpack has been initialised using a configuration object that does not match the API schema.\n" +
validationErrors.map(err => " - " + indent(WebpackOptionsValidationError.formatValidationError(err), " ", false)).join("\n");
this.validationErrors = validationErrors;
+
+ if(Error.hasOwnProperty("captureStackTrace")) {
+ Error.captureStackTrace(this, this.constructor);
+ }
}
static formatSchema(schema, prevSchemas) {
| 1 |
diff --git a/src/layouts/index.js b/src/layouts/index.js @@ -27,16 +27,18 @@ const TemplateWrapper = ({
children,
}) => (
<Fragment>
- <Helmet title={title} meta={[{ name: 'description', content: description }]}>
+ <Helmet>
<link
rel="shortcut icon"
type="image/png"
href="/icon-learnstorybook.png"
sizes="16x16 32x32 64x64"
/>
+ <title>{title}</title>
+ <meta name="description" content={description} />
- <meta property="og:image" content="/opengraph-cover.jpg" />
- <meta name="twitter:image" content="/opengraph-cover.jpg" />
+ <meta property="og:image" content="https://www.learnstorybook.com/opengraph-cover.jpg" />
+ <meta name="twitter:image" content="https://www.learnstorybook.com/opengraph-cover.jpg" />
<meta property="og:url" content={permalink} />
<meta property="og:title" content={title} />
<meta property="og:description" content={description} />
| 1 |
diff --git a/tools/super-publisher/package.json b/tools/super-publisher/package.json "changelog-parser": "^2.6.0",
"commander": "^2.19.0",
"execa": "^4.0.3",
- "figlet": "^1.2.1",
"fs-extra": "^9.0.1",
"glob": "^7.1.3",
"inquirer": "^6.2.2",
| 3 |
diff --git a/web/components/pages/OrganisationSettingsPage.js b/web/components/pages/OrganisationSettingsPage.js @@ -157,9 +157,9 @@ const OrganisationSettingsPage = class extends Component {
let totalTraits = 0;
let totalIdentities = 0;
data.events_list.map((v) => {
- totalFlags += v.Flags;
- totalTraits += v.Traits;
- totalIdentities += v.Identities;
+ totalFlags += v.Flags||0;
+ totalTraits += v.Traits||0;
+ totalIdentities += v.Identities||0;
});
return (
<div>
| 9 |
diff --git a/services/importer/spec/unit/downloader_spec.rb b/services/importer/spec/unit/downloader_spec.rb @@ -309,25 +309,25 @@ describe Downloader do
describe '#name inference' do
it 'gets the file name from the Content-Disposition header if present' do
headers = { "Content-Disposition" => %{attachment; filename="bar.csv"} }
- downloader = Downloader.new(@user.id, @file_url, headers, Hash.new)
+ downloader = Downloader.new(@user.id, @file_url, headers)
downloader.send(:process_headers, headers)
downloader.instance_variable_get(:@filename).should eq 'bar.csv'
headers = { "Content-Disposition" => %{attachment; filename=bar.csv} }
- downloader = Downloader.new(@user.id, @file_url, headers, Hash.new)
+ downloader = Downloader.new(@user.id, @file_url, headers)
downloader.send(:process_headers, headers)
downloader.instance_variable_get(:@filename).should eq 'bar.csv'
disposition = "attachment; filename=map_gaudi3d.geojson; " +
'modification-date="Tue, 06 Aug 2013 15:05:35 GMT'
headers = { "Content-Disposition" => disposition }
- downloader = Downloader.new(@user.id, @file_url, headers, Hash.new)
+ downloader = Downloader.new(@user.id, @file_url, headers)
downloader.send(:process_headers, headers)
downloader.instance_variable_get(:@filename).should eq 'map_gaudi3d.geojson'
end
it 'gets the file name from the URL if no Content-Disposition header' do
- downloader = Downloader.new(@user.id, @file_url, Hash.new, Hash.new)
+ downloader = Downloader.new(@user.id, @file_url)
downloader.send(:process_headers, Hash.new)
downloader.instance_variable_get(:@filename).should eq 'ne_110m_lakes.zip'
@@ -336,7 +336,7 @@ describe Downloader do
it 'gets the file name from the URL if no Content-Disposition header and custom params schema is used' do
hard_url = "https://manolo.escobar.es/param&myfilenameparam&zip_file.csv.zip&otherinfo"
- downloader = Downloader.new(@user.id, hard_url, Hash.new, Hash.new)
+ downloader = Downloader.new(@user.id, hard_url)
downloader.send(:process_headers, Hash.new)
downloader.instance_variable_get(:@filename).should eq 'zip_file.csv.zip'
end
@@ -344,13 +344,13 @@ describe Downloader do
it 'uses random name in no name can be found in url or http headers' do
empty_url = "https://manolo.escobar.es/param&myfilenameparam¬hing&otherinfo"
- downloader = Downloader.new(@user.id, empty_url, Hash.new, Hash.new)
+ downloader = Downloader.new(@user.id, empty_url)
downloader.send(:process_headers, Hash.new)
downloader.instance_variable_get(:@filename).should_not eq nil
end
it 'discards url query params' do
- downloader = Downloader.new(@user.id, "#{@file_url}?foo=bar&woo=wee", Hash.new, Hash.new)
+ downloader = Downloader.new(@user.id, "#{@file_url}?foo=bar&woo=wee")
downloader.send(:process_headers, Hash.new)
downloader.instance_variable_get(:@filename).should eq 'ne_110m_lakes.zip'
end
@@ -358,7 +358,7 @@ describe Downloader do
it 'matches longer extension available from filename' do
hard_url = "https://cartofante.net/my_file.xlsx"
- downloader = Downloader.new(@user.id, hard_url, Hash.new, Hash.new)
+ downloader = Downloader.new(@user.id, hard_url)
downloader.send(:process_headers, Hash.new)
downloader.instance_variable_get(:@filename).should eq 'my_file.xlsx'
end
| 2 |
diff --git a/assets/js/modules/adsense/components/setup/v2/SetupMain.js b/assets/js/modules/adsense/components/setup/v2/SetupMain.js @@ -26,7 +26,7 @@ import PropTypes from 'prop-types';
* WordPress dependencies
*/
import { _x } from '@wordpress/i18n';
-import { useEffect, useState } from '@wordpress/element';
+import { useCallback, useEffect, useState } from '@wordpress/element';
/**
* Internal dependencies
@@ -48,6 +48,7 @@ import {
ACCOUNT_STATUS_MULTIPLE,
} from '../../../util/status';
import useViewContext from '../../../../../hooks/useViewContext';
+import { useRefocus } from '../../../../../hooks/useRefocus';
const { useSelect, useDispatch } = Data;
export default function SetupMain( { finishSetup } ) {
@@ -209,28 +210,7 @@ export default function SetupMain( { finishSetup } ) {
submitChanges,
] );
- // Reset all fetched data when user re-focuses tab.
- useEffect( () => {
- let timeout;
- let needReset = false;
-
- // Count 15 seconds once user focuses elsewhere.
- const countIdleTime = () => {
- timeout = global.setTimeout( () => {
- needReset = true;
- }, 15000 );
- };
-
- // Reset when user re-focuses after 15 seconds or more.
- const reset = () => {
- global.clearTimeout( timeout );
-
- // Do not reset if user has been away for less than 15 seconds.
- if ( ! needReset ) {
- return;
- }
- needReset = false;
-
+ const reset = useCallback( () => {
// Do not reset if account status has not been determined yet, or
// if the account is approved.
if (
@@ -247,14 +227,6 @@ export default function SetupMain( { finishSetup } ) {
resetAlerts();
resetClients();
resetSites();
- };
- global.addEventListener( 'focus', reset );
- global.addEventListener( 'blur', countIdleTime );
- return () => {
- global.removeEventListener( 'focus', reset );
- global.removeEventListener( 'blur', countIdleTime );
- global.clearTimeout( timeout );
- };
}, [
accountStatus,
clearError,
@@ -264,6 +236,9 @@ export default function SetupMain( { finishSetup } ) {
resetSites,
] );
+ // Reset all fetched data when user re-focuses window.
+ useRefocus( reset, 15000 );
+
useEffect( () => {
if ( accountStatus !== undefined ) {
trackEvent( eventCategory, 'receive_account_state', accountStatus );
| 14 |
diff --git a/Gulpfile.js b/Gulpfile.js @@ -762,12 +762,9 @@ function testFunctional (src, testingEnvironmentName, { allowMultipleWindows, ex
timeout: typeof v8debug === 'undefined' ? 3 * 60 * 1000 : Infinity // NOTE: disable timeouts in debug
};
- if (process.env.RETRY_FAILED_TESTS === 'true') {
+ if (process.env.RETRY_FAILED_TESTS === 'true')
opts.retries = RETRY_TEST_RUN_COUNT;
- console.log('!!!Retry filed tests'); //eslint-disable-line no-console
- }
-
return gulp
.src(tests)
.pipe(mocha(opts));
| 2 |
diff --git a/lib/core/services.js b/lib/core/services.js @@ -98,8 +98,8 @@ ServicesMonitor.prototype.check = function() {
});
},
function checkDevServer(result, callback) {
- var host = self.config.webServerConfig.host || self.serverHost;
- var port = self.config.webServerConfig.port || self.serverPort;
+ var host = self.serverHost || self.config.webServerConfig.host;
+ var port = self.serverPort || self.config.webServerConfig.port;
self.logger.trace('checkDevServer');
var devServer = 'Webserver (http://' + host + ':' + port + ')';
devServer = (self.runWebserver) ? devServer.green : devServer.red;
| 12 |
diff --git a/src/utils/formatters/perf-score.js b/src/utils/formatters/perf-score.js const chalk = require('chalk')
module.exports = score => {
- if (score >= 80) return chalk.green.bold(score)
- if (score > 60 && score < 80) return chalk.yellow.bold(score)
- if (score <= 60) return chalk.red.bold(score)
+ if (score >= 90) return chalk.green.bold(score)
+ if (score > 50 && score < 90) return chalk.yellow.bold(score)
+ if (score <= 50) return chalk.red.bold(score)
}
| 12 |
diff --git a/index.css b/index.css @@ -214,7 +214,7 @@ body > main, body > aside { flex: 1 }
@media (orientation: landscape) {
body { flex-flow: row wrap }
- body > main { margin-left: 20vw; flex-basis: 55vw }
+ body > main { margin-left: 20vw; flex-basis: 53vw }
body > aside { flex-basis: 25vw }
body > nav {
top: 0;
| 1 |
diff --git a/DungeonAlchemistImporter/DungeonAlchemist.js b/DungeonAlchemistImporter/DungeonAlchemist.js @@ -121,7 +121,6 @@ const DungeonAlchemistImporter = (() => {
create = true;
}
if (create || version !== state[scriptName].lastHelpVersion) {
- log(`Set handout content for ${scriptName}`);
hh.set({
notes: helpParts.helpDoc({ who: "handout", playerid: "handout" }),
});
@@ -237,6 +236,7 @@ const DungeonAlchemistImporter = (() => {
};
const getMap = (page, msg) => {
+
// simplest case - get the ONLY map graphic and use that one
var mapGraphics = findObjs({
_pageid: page.get("_id"),
@@ -249,6 +249,15 @@ const DungeonAlchemistImporter = (() => {
return mapGraphics[0];
}
+ // no map
+ if (mapGraphics.length == 0) {
+ sendChat(
+ "Dungeon Alchemist",
+ "You need to upload your map image and put it in the Map Layer before importing the line-of-sight data. Make sure that your map is in the background layer by right clicking on it, selecting \"Layer\" and choosing \"Map Layer\"."
+ );
+ return null;
+ }
+
// otherwise, see if we selected one
var selected = msg.selected;
if (selected === undefined || selected.length == 0) {
@@ -296,9 +305,17 @@ const DungeonAlchemistImporter = (() => {
const json = s.substring(endOfHeader);
const data = JSON.parse(json);
+ // load the player
+ const player = getObj("player", msg.playerid);
+ //log("PLAYER:");
+ //log(player);
+ const lastPageId = player.get("_lastpage");
+ //log(lastPageId);
+
// load the page
const pageId = Campaign().get("playerpageid");
- const page = getObj("page", pageId);
+ //log("Page id: " + pageId + " vs last page " + lastPageId);
+ const page = getObj("page", lastPageId);
//log("PAGE:");
//log(page);
| 1 |
diff --git a/components/Account/NewsletterSubscriptions.js b/components/Account/NewsletterSubscriptions.js import React, { Fragment } from 'react'
-import { Query, Mutation } from 'react-apollo'
+import { Query, Mutation, compose } from 'react-apollo'
import gql from 'graphql-tag'
import { css } from 'glamor'
import withT from '../../lib/withT'
@@ -8,6 +8,7 @@ import ErrorMessage from '../ErrorMessage'
import FrameBox from '../Frame/Box'
import { P } from './Elements'
import { Loader, InlineSpinner, Checkbox, Label } from '@project-r/styleguide'
+import { withMembership } from '../Auth/checkRoles'
const NoBox = ({ children, style: { margin } = {} }) => (
<div style={{ margin }}>{children}</div>
@@ -38,7 +39,6 @@ export const UPDATE_NEWSLETTER_SUBSCRIPTION = gql`
id
name
subscribed
- isEligible
}
}
`
@@ -53,7 +53,6 @@ export const NEWSLETTER_SETTINGS = gql`
id
name
subscribed
- isEligible
}
}
}
@@ -63,7 +62,7 @@ export const NEWSLETTER_SETTINGS = gql`
const NewsletterSubscriptions = props => (
<Query query={NEWSLETTER_SETTINGS}>
{({ loading, error, data }) => {
- const { t } = props
+ const { t, isMember } = props
if (loading || error) {
return <Loader loading={loading} error={error} />
@@ -84,10 +83,6 @@ const NewsletterSubscriptions = props => (
props.filter || Boolean
)
- const hasNonEligibleSubscription = subscriptions.some(
- ({ isEligible }) => !isEligible
- )
-
return (
<Fragment>
{status !== 'subscribed' && (
@@ -95,12 +90,12 @@ const NewsletterSubscriptions = props => (
<P>{t('account/newsletterSubscriptions/unsubscribed')}</P>
</Box>
)}
- {hasNonEligibleSubscription && (
+ {!isMember && (
<Box style={{ margin: '10px 0', padding: 15 }}>
<P>{t('account/newsletterSubscriptions/noMembership')}</P>
</Box>
)}
- {subscriptions.map(({ name, subscribed, isEligible }) => (
+ {subscriptions.map(({ name, subscribed }) => (
<Mutation key={name} mutation={UPDATE_NEWSLETTER_SUBSCRIPTION}>
{(mutate, { loading: mutating, error }) => {
return (
@@ -108,7 +103,7 @@ const NewsletterSubscriptions = props => (
<Checkbox
black={props.black}
checked={subscribed}
- disabled={!isEligible || mutating}
+ disabled={mutating}
onChange={(_, checked) => {
mutate({
variables: {
@@ -150,4 +145,4 @@ const NewsletterSubscriptions = props => (
</Query>
)
-export default withT(NewsletterSubscriptions)
+export default compose(withT, withMembership)(NewsletterSubscriptions)
| 14 |
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb @@ -29,9 +29,7 @@ class SessionsController < ApplicationController
# In case of fallback on SAML authorization failed, it will be manually checked.
skip_before_filter :verify_authenticity_token, only: [:create], if: :saml_authentication?
# We want the password expiration related methods to be executed regardless of CSRF token authenticity
- skip_before_filter :verify_authenticity_token,
- only: [:password_expired, :password_change],
- if: :json_formatted_request?
+ skip_before_filter :verify_authenticity_token, only: [:password_expired], if: :json_formatted_request?
skip_before_filter :ensure_account_has_been_activated,
only: [:account_token_authentication_error, :ldap_user_not_at_cartodb, :saml_user_not_in_carto]
| 2 |
diff --git a/src/encoded/tests/features/test_trackhubs.py b/src/encoded/tests/features/test_trackhubs.py @@ -57,6 +57,44 @@ def test_dataset_trackDb(testapp, workbook, expected):
assert expected in res.text
[email protected]('expected', [
+ "track chip",
+ "compositeTrack on",
+ "type bed 3",
+ "longLabel Collection of ENCODE ChIP-seq experiments",
+ "shortLabel ENCODE ChIP-seq",
+ "visibility full",
+ "html ChIP",
+ "subGroup1 view Views aOIDR=Optimal_IDR_thresholded_peaks bCIDR=Conservative_IDR_thresholded_peaks cRPKS=Replicated_peaks dPKS=Peaks eFCOC=Fold_change_over_control fSPV=Signal_p-value gSIG=Signal",
+ "subGroup2 BS Biosample GM12878=GM12878",
+ "subGroup3 EXP Experiment ENCSR000DZQ=ENCSR000DZQ",
+ "subGroup4 REP Replicates pool=Pooled",
+ "subGroup5 TARG Targets EBF1=EBF1",
+ "sortOrder BS=+ TARG=+ REP=+ view=+ EXP=+",
+ "dimensions dimA=REP",
+ "dimensionAchecked pool",
+ " track chip_aOIDR_view",
+ " parent chip on",
+ " view aOIDR",
+ " type bigBed 6 +",
+ " visibility dense",
+ " scoreFilter 100:1000",
+ " spectrum on",
+ " track ENCFF003COS",
+ " parent chip_aOIDR_view on",
+ " bigDataUrl /files/ENCFF003COS/@@download/ENCFF003COS.bigBed?proxy=true",
+ " longLabel EBF1 ChIP-seq of GM12878 optimal idr thresholded peaks pool ENCSR000DZQ - ENCFF003COS",
+ " shortLabel pool oIDR pk",
+ " type bigBed 6 +",
+ " color 153,38,0",
+ " altColor 115,31,0",
+ " subGroups BS=GM12878 EXP=ENCSR000DZQ REP=pool TARG=EBF1 view=aOIDR",
+])
+def test_genomes(testapp, workbook, expected):
+ res = testapp.get("/batch_hub/type%3Dexperiment%2C%2caccession%3DENCSR000DZQ%2C%2caccession%3DENCSRENCSR575ZXX/hg19/trackDb.txt")
+ assert expected in res.text
+
+
@pytest.mark.parametrize('expected', [
"track ENCSR727WCB",
"compositeTrack on",
| 0 |
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js 105: '9'
};
- $items = that.$lis;
isActive = that.$newElement.hasClass('open');
that.$menuInner.click();
that.$button.focus();
}
- // $items contains li elements when liveSearch is enabled
- $items = $items.filter(selector);
- if (!$this.val() && !/(38|40)/.test(e.keyCode.toString(10))) {
- if ($items.filter('.active').length === 0) {
- $items = that.$lis;
- if (that.options.liveSearchNormalize) {
- $items = $items.filter(':a' + that._searchStyle() + '(' + normalizeToBase(keyCodeMap[e.keyCode]) + ')');
- } else {
- $items = $items.filter(':' + that._searchStyle() + '(' + keyCodeMap[e.keyCode] + ')');
- }
- }
- }
}
+ if (/(38|40)/.test(e.keyCode.toString(10))) {
+ $items = that.$lis.filter(selector);
if (!$items.length) return;
- if (/(38|40)/.test(e.keyCode.toString(10))) {
if (!that.options.liveSearch) {
- $items = $items.filter(selector);
index = $items.index($items.find('a').filter(':focus').parent());
} else {
index = $items.index($items.filter('.active'));
count,
prevKey;
+ $items = that.$lis.filter(selector);
$items.each(function (i) {
- if (!$(this).hasClass('disabled')) {
if ($.trim($(this).children('a').text().toLowerCase()).substring(0, 1) == keyCodeMap[e.keyCode]) {
keyIndex.push(i);
}
- }
});
count = $(document).data('keycount');
| 7 |
diff --git a/factory-ai-vision/Tutorial/AKS_deploy.md b/factory-ai-vision/Tutorial/AKS_deploy.md @@ -69,8 +69,8 @@ kubectl create secret generic azure-secret --from-literal=azurestorageaccountnam
Also, IotHub/Edge credential is required in factory-ai solution.
```
-echo "IOTHUB_CONNECTION_STRING=<Your IotHub connection string>" > .az.env
-echo "IOTEDGE_DEVICE_CONNECTION_STRING=<Your IotEdge device connection sring>" >> .az.env
+echo "IOTHUB_CONNECTION_STRING=$(az iot hub connection-string show --hub-name <your_iothub_name> -o tsv)" > .az.env
+echo "IOTEDGE_DEVICE_CONNECTION_STRING=$(az iot hub device-identity connection-string show --hub-name <your_iothub_name> --device-id <your_edge_device_name> -o tsv)" > .az.env
kubectl create secret generic azure-env --from-env-file ./.az.env
```
| 4 |
diff --git a/README.md b/README.md -# Blockly [](https://travis-ci.org/google/blockly)
+# Blockly Developer Tools
+This is the future home for Google's Blockly Developer Tools.
-Google's Blockly is a web-based, visual programming editor. Users can drag
-blocks together to build programs. All code is free and open source.
-
-**The project page is https://developers.google.com/blockly/**
-
-
-
-Blockly has an active [developer forum](https://groups.google.com/forum/#!forum/blockly). Please drop by and say hello. Show us your prototypes early; collectively we have a lot of experience and can offer hints which will save you time.
-
-Help us focus our development efforts by telling us [what you are doing with
-Blockly](https://goo.gl/forms/kZTsO9wGLmpoPXC02). The questionnaire only takes
-a few minutes and will help us better support the Blockly community.
+Find out more at the
+[develop page](https://developers.google.com/blockly/), on [GitHub](https://github.com/google/blockly), or on the [developer forum](https://groups.google.com/forum/#!forum/blockly).
Want to contribute? Great! First, read [our guidelines for contributors](https://developers.google.com/blockly/guides/modify/contributing).
| 3 |
diff --git a/types/index.d.ts b/types/index.d.ts @@ -3199,7 +3199,12 @@ declare module 'mongoose' {
$search: {
[key: string]: any
index?: string
- highlight?: { path: string; maxCharsToExamine?: number; maxNumPassages?: number }
+ highlight?: {
+ /** [`highlightPath` reference](https://docs.atlas.mongodb.com/atlas-search/path-construction/#multiple-field-search) */
+ path: string | string[] | { value: string, multi: string};
+ maxCharsToExamine?: number;
+ maxNumPassages?: number;
+ }
}
}
| 1 |
diff --git a/components/table-list/table/index.js b/components/table-list/table/index.js @@ -18,7 +18,7 @@ class Table extends React.Component {
return (
<div className='table-container'>
- <table className={isWrap && !hasDisabledWrap && 'wrapped'}>
+ <table>
{children}
</table>
@@ -37,18 +37,6 @@ class Table extends React.Component {
width: 100%;
}
- table.wrapped:after {
- position: absolute;
- bottom: 35px;
- height: 3%;
- width: 100%;
- content: "";
- background: linear-gradient(to top,
- rgba(255,255,255, 1) 20%,
- rgba(255,255,255, 0) 80%
- );
- }
-
.wrap {
width: 100%;
text-align: center;
@@ -66,12 +54,6 @@ class Table extends React.Component {
font-size: x-small;
}
}
-
- @media (max-width: 400px) {
- table.wrapped:after {
- width: 90%;
- }
- }
`}</style>
</div>
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.