code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/lib/substituteTailwindAtRules.js b/src/lib/substituteTailwindAtRules.js @@ -54,11 +54,11 @@ export default function(config) {
if (atRule.params === 'components') {
const tailwindComponentTree = postcss.root({
- nodes: [...container(unwrappedConfig)],
+ nodes: container(unwrappedConfig),
})
const pluginComponentTree = postcss.root({
- nodes: [...pluginComponents],
+ nodes: pluginComponents,
})
applyClassPrefix(tailwindComponentTree, unwrappedConfig.options.prefix)
@@ -79,11 +79,11 @@ export default function(config) {
}
const tailwindUtilityTree = postcss.root({
- nodes: [...utilities.nodes],
+ nodes: utilities.nodes,
})
const pluginUtilityTree = postcss.root({
- nodes: [...pluginUtilities],
+ nodes: pluginUtilities,
})
applyClassPrefix(tailwindUtilityTree, unwrappedConfig.options.prefix)
| 2 |
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js @@ -267,6 +267,20 @@ describe('Test axes', function() {
});
checkTypes('date', 'linear');
});
+
+ it('needs one *true* category inner-array to be consider *multicategory*', function() {
+ supplyWithTrace({
+ x: [
+ [2018, 2018, 2017, 2017],
+ ['a', 'b', 'a', 'b']
+ ],
+ y: [
+ ['a', 'b', 'c'],
+ ['d', 'e', 'f']
+ ]
+ });
+ checkTypes('multicategory', 'multicategory');
+ });
});
it('should set undefined linewidth/linecolor if linewidth, linecolor or showline is not supplied', function() {
| 0 |
diff --git a/docs/jobs.pug b/docs/jobs.pug @@ -7,6 +7,12 @@ block content
style.
.job {
position: relative;
+ cursor: pointer;
+ border: 1px solid #eef0f1;
+ padding: 15px;
+ margin-bottom: 15px;
+ border-radius: 4px;
+ transition: all .2s ease-in-out;
}
.job .company-logo {
@@ -17,7 +23,6 @@ block content
}
.job .title {
- cursor: pointer;
color: #0971B2;
}
@@ -30,66 +35,20 @@ block content
.job .description {
display: inline-block;
width: 600px;
- }
-
- .job .location {
- background-color: #ddd;
- border-radius: 3px;
- font-size: 0.75em;
- display: inline-block;
- padding: 0.25em;
- padding-left: 0.75em;
- padding-right: 0.75em;
- }
-
- .job .apply-button {
- position: absolute;
- right: 10px;
- top: 0px;
- font-size: 1.5em;
- padding-top: 0.75em;
- padding-bottom: 0.75em;
- margin-top: 0.75em;
- width: 180px;
- background-color: #4DBA13;
- text-align: center;
- border-radius: 4px;
+ margin-top: 0.25em;
cursor: pointer;
- opacity: 0;
}
- .job:hover .apply-button {
- opacity: 100%;
+ .job .company {
+ font-weight: bold;
}
- .job a .apply-button {
- color: black;
- }
-
- .job a .apply {
- color: black;
- margin-left: auto;
- margin-right: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
-
- .job-description .apply {
- font-size: 1.5em;
- padding-top: 0.75em;
- padding-bottom: 0.75em;
- margin-top: 0.75em;
- width: 180px;
- background-color: #4DBA13;
- text-align: center;
- border-radius: 4px;
- cursor: pointer;
+ .job:hover {
+ background-color: #eef0f1;
}
- .post {
- border: 1px solid #ddd;
- padding: 15px;
- margin-bottom: 15px;
+ .job .at {
+ color: #495057;
}
.post .title {
@@ -125,25 +84,38 @@ block content
display: block;
}
+ .job-description .apply {
+ font-size: 1.5em;
+ padding-top: 0.75em;
+ padding-bottom: 0.75em;
+ margin-top: 0.75em;
+ width: 180px;
+ background-color: #4DBA13;
+ text-align: center;
+ border-radius: 4px;
+ cursor: pointer;
+ margin-left: auto;
+ margin-right: auto;
+ color: #495057;
+ }
+
div
each job in jobs
.post.job
.company-logo
img(src=job.logo)
- .description
- div #{job.company}
+ label.description(for='checkbox-' + job._id)
input(id='checkbox-' + job._id, type="checkbox")
- label.title(for='checkbox-' + job._id) #{job.title}
- div
- .location.
- #{job.location}
+ label.title #{job.title}
+ div.at
+ span at
+ span.company #{job.company}
+ span.location • #{job.location}
div.job-description
div !{job.description}
a(href=job.url)
div.apply Apply
- a(href=job.url)
- div.apply-button Apply
h2 Add Your Own
div.
| 7 |
diff --git a/config/locales/en.json b/config/locales/en.json "module-uninstalling": "Uninstalling...",
"module-date": "Date",
"module-upgrade": "Upgrade",
+ "module-version-description": "This module does not come from the official store. Please specify the new version number to continue the update.",
"alarm-sleep-now": "Sleep now",
"alarm-time-sleep": "Sleep time (in hours)",
"alarm-cron-rule": "Cron rules",
| 1 |
diff --git a/gridsome/lib/build.js b/gridsome/lib/build.js @@ -44,6 +44,7 @@ module.exports = async (context, args) => {
// 5. clean up
await plugins.callHook('afterBuild', { context, config, queue })
+ await fs.remove(path.resolve(config.cacheDir, 'data'))
await fs.remove(config.manifestsDir)
console.log()
| 1 |
diff --git a/token-metadata/0x646707246D7d5C2a86d7206f41CA8199ea9CED69/metadata.json b/token-metadata/0x646707246D7d5C2a86d7206f41CA8199ea9CED69/metadata.json "symbol": "CHOP",
"address": "0x646707246D7d5C2a86d7206f41CA8199ea9CED69",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs @@ -61,7 +61,6 @@ export class <%= entityReactName %>Detail extends React.Component<I<%= entityRea
<h2>
<Translate contentKey="<%= i18nKeyPrefix %>.detail.title"><%= entityClass %></Translate> [<b>{<%= entityInstance %>.id}</b>]
</h2>
- <Row size="md">
<dl className="jh-entity-details">
<%_ for (idx in fields) {
const fieldType = fields[idx].fieldType;
@@ -173,10 +172,9 @@ export class <%= entityReactName %>Detail extends React.Component<I<%= entityRea
<%_ } _%>
<%_ } _%>
</dl>
- </Row>
<Button tag={Link} to="/entity/<%= entityFileName %>" replace color="info">
<FontAwesomeIcon icon="arrow-left" /> <span className="d-none d-md-inline" ><Translate contentKey="entity.action.back">Back</Translate></span>
- </Button>
+ </Button>
<Button tag={Link} to={`/entity/<%= entityFileName %>/${<%=entityInstance %>.id}/edit`} replace color="primary">
<FontAwesomeIcon icon="pencil-alt" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.edit">Edit</Translate></span>
</Button>
| 7 |
diff --git a/ui/app/components/modals/qr-scanner/qr-scanner.component.js b/ui/app/components/modals/qr-scanner/qr-scanner.component.js @@ -114,14 +114,17 @@ export default class QrScanner extends Component {
// For ex. EIP-681 (https://eips.ethereum.org/EIPS/eip-681)
// Bitcoin Cash address links - fox ex. ethereum:0x.....1111
- if (content.split('bitcoincash:').length > 1) {
+ if (
+ content.split('bitcoincash:').length > 1 ||
+ content.split('simpleledger:').length > 1
+ ) {
+ // Cash Address format
type = 'address'
- values = { address: content.split('bitcoincash:')[1] }
-
- // Regular ethereum addresses - fox ex. 0x.....1111
+ values = { address: content }
} else if (
- content.substring(0, 1).toLowerCase() === 'q' ||
- content.substring(0, 1).toLowerCase() === 'p'
+ (content.substring(0, 1).toLowerCase() === 'q' &&
+ content.length === 42) ||
+ (content.substring(0, 1).toLowerCase() === 'p' || content.length === 42)
) {
type = 'address'
values = { address: content }
| 9 |
diff --git a/app/shared/components/Wallet/Status/Actions/Table.js b/app/shared/components/Wallet/Status/Actions/Table.js @@ -21,9 +21,9 @@ class WalletStatusActionsTable extends Component<Props> {
if (!loading) {
let fullResults = actionHistory.list.slice(0, amount);
- const filterSpamTransfersUnder = settings.filterSpamTransfersUnder || 0;
+ const filterSpamTransfersUnder = settings.filterSpamTransfersUnder || 0.0000;
- if (filterSpamTransfersUnder !== 0) {
+ if (filterSpamTransfersUnder !== 0.0000) {
fullResults = fullResults.filter(action => {
const {
act
| 4 |
diff --git a/app/models/carto/user_table.rb b/app/models/carto/user_table.rb @@ -179,7 +179,6 @@ module Carto
end
def save_changes
- CartoDB::Logger.debug(message: "Carto::UserTable#save_changes")
# TODO: Compatibility with Sequel model, can be removed afterwards. Used in ::Table.set_the_geom_column!
save if changed?
end
| 2 |
diff --git a/src/pages/tag.js b/src/pages/tag.js import React, { Component } from "react";
import PropTypes from "prop-types";
import { observer, inject } from "mobx-react";
+import Helmet from "react-helmet";
import withData from "lib/apollo/withData";
import withCatalogItems from "containers/catalog/withCatalogItems";
@@ -9,8 +10,6 @@ import withShop from "containers/shop/withShop";
import Layout from "components/Layout";
import ProductGrid from "components/ProductGrid";
-import Helmet from "react-helmet";
-
@withData
@withShop
@withCatalogItems
@@ -29,18 +28,16 @@ class Shop extends Component {
return (
<Helmet>
- <title>TAG {shop.name}</title>
+ <title>{shop.name}</title>
<meta name="description" content={shop.description} />
</Helmet>
);
}
render() {
- console.log("dogman", this.props.composedInitialProps.shop);
-
+ const { shop } = this.props;
return (
<Layout title="Reaction Shop">
- <h1>On a tag page</h1>
{this.renderHelmet()}
<ProductGrid catalogItems={this.props.catalogItems}/>
</Layout>
| 3 |
diff --git a/src/intrinsics/JSON.mjs b/src/intrinsics/JSON.mjs @@ -155,13 +155,16 @@ class JSONValidator {
}
parseNumber() {
+ this.eat('-');
Q(this.expect(NUMERIC_START));
while (this.eat(NUMERIC));
if (this.eat('.')) {
+ Q(this.expect(NUMERIC));
while (this.eat(NUMERIC));
}
if (this.eat(['e', 'E'])) {
this.eat(['-', '+']);
+ Q(this.expect(NUMERIC));
while (this.eat(NUMERIC));
}
X(this.eatWhitespace());
| 1 |
diff --git a/src/ipcHelper.js b/src/ipcHelper.js @@ -26,8 +26,12 @@ process.on('message', (opts) => {
memorySize,
} = opts;
- function done(error, ret) {
- process.send({ error, id, ret });
+ function callback(error, ret) {
+ process.send({
+ error,
+ id,
+ ret,
+ });
}
const handler = fun[handlerName];
@@ -44,11 +48,13 @@ process.on('message', (opts) => {
const context = {
...optsContext,
- done,
- fail: (err) => done(err, null),
- succeed: (res) => done(null, res),
+ done: callback,
+ fail: (err) => callback(err, null),
+ succeed: (res) => callback(null, res),
- getRemainingTimeInMillis: () => endTime - new Date().getTime(),
+ getRemainingTimeInMillis() {
+ return endTime - new Date().getTime();
+ },
awsRequestId: `offline_awsRequestId_${id}`,
clientContext: {},
@@ -61,7 +67,7 @@ process.on('message', (opts) => {
memoryLimitInMB: memorySize,
};
- const x = handler(event, context, done);
+ const x = handler(event, context, callback);
if (x && typeof x.then === 'function') {
x.then(context.succeed).catch(context.fail);
| 10 |
diff --git a/.gitignore b/.gitignore -_site/
+# Ignore installed npm modules
node_modules/
+
+# Ignore build tool output, e.g. code coverage
.nyc_output/
coverage/
-package-lock.json
+
+# Ignore API documentation
api-docs/
+
+# Ignore folders from source code editors
+.vscode
+.idea
+
+# Ignore eleventy output when doing manuell tests
+_site/
+
+package-lock.json
| 8 |
diff --git a/lib/polyfill/patchedmediakeys_ms.js b/lib/polyfill/patchedmediakeys_ms.js @@ -517,6 +517,9 @@ shaka.polyfill.PatchedMediaKeysMs.MediaKeySession.prototype.
*/
shaka.polyfill.PatchedMediaKeysMs.onMsNeedKey_ = function(event) {
shaka.log.debug('PatchedMediaKeysMs.onMsNeedKey_', event);
+ if (!event.initData) {
+ return;
+ }
// Alias
const PatchedMediaKeysMs = shaka.polyfill.PatchedMediaKeysMs;
@@ -612,7 +615,7 @@ shaka.polyfill.PatchedMediaKeysMs.MediaKeySession.prototype.
let isNew = this.keyStatuses.getStatus() == undefined;
let event2 = new shaka.util.FakeEvent('message', {
- messageType: isNew ? 'licenserequest' : 'licenserenewal',
+ messageType: isNew ? 'license-request' : 'license-renewal',
message: event.message.buffer,
});
| 1 |
diff --git a/contracts/IssuanceController.sol b/contracts/IssuanceController.sol /*
-----------------------------------------------------------------
-FILE INFORMATION
------------------------------------------------------------------
+FILE INFORMATION -----------------------------------------------------------------
file: IssuanceController.sol
version: 2.0
@@ -16,17 +15,15 @@ MODULE DESCRIPTION
Issuance controller contract. The issuance controller provides
a way for users to acquire nomins (Nomin.sol) and havvens
(Havven.sol) by paying ETH and a way for users to acquire havvens
-(Havven.sol) by paying nomins.
+(Havven.sol) by paying nomins. Users can also deposit their nomins
+and allow other users to purchase them with ETH. The ETH is sent
+to the user who offered their nomins for sale.
This smart contract contains a balance of each currency, and
allows the owner of the contract (the Havven Foundation) to
-manage the available balances of both currencies at their
-discretion.
-
-In future releases this functionality will gradually move away
-from a centralised approach with the Havven foundation
-controlling all of the currency to a decentralised exchange
-approach where users can exchange these assets freely.
+manage the available balance of havven at their discretion, while
+users are allowed to deposit and withdraw their own nomin deposits
+if they have not yet been taken up by another user.
-----------------------------------------------------------------
*/
| 3 |
diff --git a/client/app/cloud/project/compute/infrastructure/virtualMachine/addEdit/cloud-project-compute-infrastructure-virtualMachine-addEdit.controller.js b/client/app/cloud/project/compute/infrastructure/virtualMachine/addEdit/cloud-project-compute-infrastructure-virtualMachine-addEdit.controller.js @@ -1090,6 +1090,8 @@ angular.module("managerApp")
const planHourly = self.panelsData.prices[flavor.planCodes.hourly];
if (planHourly) {
price.price = planHourly.price;
+ // Set 3 digits for hourly price
+ price.price.text = price.price.text.replace(/\d+(?:[.,]\d+)?/, "" + price.price.value.toFixed(3));
}
const planMonthly = self.panelsData.prices[flavor.planCodes.monthly];
if (planMonthly) {
| 12 |
diff --git a/src/consumer/index.js b/src/consumer/index.js @@ -7,7 +7,7 @@ const { KafkaJSError } = require('../errors')
const eventNames = Object.values(events)
const eventKeys = Object.keys(events)
- .map(key => `Consumer.${key}`)
+ .map(key => `consumer.events.${key}`)
.join(', ')
module.exports = ({
| 7 |
diff --git a/lib/core/engine.js b/lib/core/engine.js @@ -252,7 +252,6 @@ class Engine {
storageService(_options) {
this.registerModule('storage', {
- addCheck: this.servicesMonitor.addCheck.bind(this.servicesMonitor),
storageConfig: this.config.storageConfig,
webServerConfig: this.config.webServerConfig,
blockchainConfig: this.config.blockchainConfig,
| 2 |
diff --git a/contributors.json b/contributors.json "country": "Indonesia",
"linkedin": "https://www.linkedin.com/in/fardeen-atallah-kabir-muhammad-4787681a0",
"name": "Fardeen Atallah Kabir Muhammad"
+ },
+
+ "Ahkam95": {
+ "country": "Sri Lanka",
+ "linkedin": "https://www.linkedin.com/in/ahkamnaseek/",
+ "name": "Ahkam Naseek",
+ "twitter": "https://twitter.com/mohamedahkam"
}
}
| 3 |
diff --git a/packages/idyll-compiler/src/lexer.js b/packages/idyll-compiler/src/lexer.js @@ -57,13 +57,14 @@ const lex = function(options, alias = {}) {
str
).tokens;
};
- const findAlias = name => {
- const AliasNames = Object.keys(alias);
- return (
- AliasNames.find(
+ const findAliases = name => {
+ const aliasNames = Object.keys(alias);
+ return [
+ name,
+ ...aliasNames.filter(
aliasName => alias[aliasName].toLowerCase() === name.toLowerCase()
- ) || name
- );
+ )
+ ].join('|');
};
var updatePosition = function(lexeme) {
var lines = lexeme.split('\n');
@@ -77,10 +78,10 @@ const lex = function(options, alias = {}) {
// Rules at the front are pre-processed,
// e.g. equations, and code snippets
// that shouldn't be formatted.
- const equationAlias = findAlias('equation');
+ const equationAliases = findAliases('equation');
lexer.addRule(
new RegExp(
- String.raw`\[\s*(equation|${equationAlias})\s*([^\/\]]*)\s*\][\n\s\t]*(((?!(\[\s*\/(equation|${equationAlias})\s*\])).\n?)*)[\n\s\t]*\[\s*\/\s*(equation|${equationAlias})\s*\]`,
+ String.raw`\[\s*(${equationAliases})\s*([^\/\]]*)\s*\][\n\s\t]*(((?!(\[\s*\/(${equationAliases})\s*\])).\n?)*)[\n\s\t]*\[\s*\/\s*(${equationAliases})\s*\]`,
'i'
),
function(lexeme, tagName, props, innerText) {
@@ -98,10 +99,10 @@ const lex = function(options, alias = {}) {
.concat(['CLOSE_BRACKET']);
}
);
- const codeAlias = findAlias('code');
+ const codeAlias = findAliases('code');
lexer.addRule(
new RegExp(
- String.raw`\[\s*(code|${codeAlias})\s*([^\/\]]*)\s*\][\n\s\t]*(((?!(\[\s*\/(code|${codeAlias})\s*\])).\n?)*)[\n\s\t]*\[\s*\/\s*(code|${codeAlias})\s*\]`,
+ String.raw`\[\s*(${codeAlias})\s*([^\/\]]*)\s*\][\n\s\t]*(((?!(\[\s*\/(${codeAlias})\s*\])).\n?)*)[\n\s\t]*\[\s*\/\s*(${codeAlias})\s*\]`,
'i'
),
function(lexeme, tagName, props, innerText) {
| 11 |
diff --git a/src/styles/variables.js b/src/styles/variables.js @@ -46,5 +46,5 @@ export default {
tooltipzIndex: 10050,
gutterWidth: 16,
popoverMenuShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.06)',
- minHeightToShowGraphics: 854, // below this height UI was broken on login form layout as there isn't enough height to show forma and graphics.
+ minHeightToShowGraphics: 854, // Login form layout breaks below this height due to insufficient space to show the form and graphics
};
| 7 |
diff --git a/articles/tutorials/calling-an-external-idp-api.md b/articles/tutorials/calling-an-external-idp-api.md @@ -74,6 +74,10 @@ Replace these values:
Within the user's `identities` array, there will be an `access_token` that you can extract and use to make calls to the IdP's API: `user.identities[0].access_token`.
+::: note
+The `access_token` is only returned from the BitBucket, Google (OAuth 2.0), OAuth 2.0, SharePoint and Azure AD Identity Providers. For more information refer to the [Identity Provider Access Tokens](https://auth0.com/docs/tokens/idp#renewing-the-token) documentation.
+:::
+
In most cases, the user will only have one identity, but if you have used the [account linking feature](/link-accounts), there may be more.
In this sample response we can see that our user had only one identity: `google-oauth2`.
| 0 |
diff --git a/token-metadata/0xb4058411967D5046f3510943103805be61f0600E/metadata.json b/token-metadata/0xb4058411967D5046f3510943103805be61f0600E/metadata.json "symbol": "STONK",
"address": "0xb4058411967D5046f3510943103805be61f0600E",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.md b/README.md 
-
+
# SpaceX Data REST API
@@ -29,11 +29,11 @@ GET https://api.spacexdata.com/v2/launches/latest
```json
{
- "flight_number": 51,
+ "flight_number":52,
"launch_year":"2017",
- "launch_date_unix": 1513352160,
- "launch_date_utc": "2017-12-15T15:36:00Z",
- "launch_date_local": "2017-12-15T10:36:00-05:00",
+ "launch_date_unix":1513992443,
+ "launch_date_utc":"2017-12-23T01:27:23Z",
+ "launch_date_local":"2017-12-22T17:27:23-08:00",
"rocket":{
"rocket_id":"falcon9",
"rocket_name":"Falcon 9",
@@ -41,62 +41,57 @@ GET https://api.spacexdata.com/v2/launches/latest
"first_stage":{
"cores":[
{
- "core_serial": "B1035",
+ "core_serial":"B1036",
"reused":true,
- "land_success": true,
- "landing_type": "RTLS",
- "landing_vehicle": "LZ-1"
+ "land_success":false,
+ "landing_type":null,
+ "landing_vehicle":null
}
]
},
"second_stage":{
"payloads":[
{
- "payload_id": "SpaceX CRS-13",
- "cap_serial": "C108",
- "reused": true,
+ "payload_id":"Iridium NEXT 4",
+ "reused":false,
"customers":[
- "NASA (CRS)"
+ "Iridium Communications"
],
- "payload_type": "Dragon 1.1",
- "payload_mass_kg": 2205,
- "payload_mass_lbs": 4861.2,
- "orbit": "ISS",
- "mass_returned_kg": null,
- "mass_returned_lbs": null,
- "flight_time_sec": null,
- "cargo_manifest": "https://www.nasa.gov/sites/default/files/atoms/files/spacex_crs-13_mision_overview_low_res8.pdf"
+ "payload_type":"Satellite",
+ "payload_mass_kg":9600,
+ "payload_mass_lbs":21164.38,
+ "orbit":"LEO"
}
]
}
},
"telemetry":{
- "flight_club": "https://www.flightclub.io/results/?code=CR13"
+ "flight_club":"https://www.flightclub.io/result?code=IRD4"
},
"reuse":{
"core":true,
"side_core1":false,
"side_core2":false,
"fairings":false,
- "capsule": true
+ "capsule":false
},
"launch_site":{
- "site_id": "ccafs_slc_40",
- "site_name": "CCAFS SLC 40",
- "site_name_long": "Cape Canaveral Air Force Station Space Launch Complex 40"
+ "site_id":"vafb_slc_4e",
+ "site_name":"VAFB SLC 4E",
+ "site_name_long":"Vandenberg Air Force Base Space Launch Complex 4E"
},
"launch_success":true,
"links":{
- "mission_patch": "https://i.imgur.com/YxaiZqy.png",
- "reddit_campaign": "https://www.reddit.com/r/spacex/comments/7bxg5a/crs13_launch_campaign_thread/",
- "reddit_launch": "https://www.reddit.com/r/spacex/comments/7j725w/rspacex_crs13_official_launch_discussion_updates/",
+ "mission_patch":"https://i.imgur.com/bNwARXL.png",
+ "reddit_campaign":"https://www.reddit.com/r/spacex/comments/7cgts7/iridium_next_constellation_mission_4_launch/",
+ "reddit_launch":"https://www.reddit.com/r/spacex/comments/7li8y2/rspacex_iridium_next_4_official_launch_discussion/",
"reddit_recovery":null,
- "reddit_media": "https://www.reddit.com/r/spacex/comments/7j6oxz/rspacex_crs13_media_thread_videos_images_gifs/",
- "presskit": "http://www.spacex.com/sites/spacex/files/crs13presskit12_11.pdf",
- "article_link": "https://spaceflightnow.com/2017/12/15/spacexs-50th-falcon-rocket-launch-kicks-off-station-resupply-mission/",
- "video_link": "https://www.youtube.com/watch?v=OPHbqY9LHCs"
+ "reddit_media":"https://www.reddit.com/r/spacex/comments/7litv2/rspacex_iridium4_media_thread_videos_images_gifs/",
+ "presskit":"http://www.spacex.com/sites/spacex/files/iridium4presskit.pdf",
+ "article_link":"https://spaceflightnow.com/2017/12/23/spacex-launch-dazzles-delivering-10-more-satellites-for-iridium/",
+ "video_link":"https://www.youtube.com/watch?v=wtdjCwo6d3Q"
},
- "details": "Will reuse the Dragon capsule previously flown on CRS-6 and will reuse the booster from CRS-11."
+ "details":"Reusing the booster first used on Iridium-2, but will be flying expendable."
}
```
| 3 |
diff --git a/src/components/ScrollViewWithPickers.js b/src/components/ScrollViewWithPickers.js @@ -23,10 +23,10 @@ class ScrollViewWithPickers extends React.Component {
};
this.scrollViewRef = React.createRef(null);
- this.handleScroll = this.handleScroll.bind(this);
+ this.handleScroll = this.setContextScrollPosition.bind(this);
}
- handleScroll(event) {
+ setContextScrollPosition(event) {
if (this.props.onScroll) {
this.props.onScroll(event);
}
@@ -41,7 +41,7 @@ class ScrollViewWithPickers extends React.Component {
// eslint-disable-next-line react/jsx-props-no-spreading
{...propsWithoutChildrenAndScrollEventThrottle}
ref={this.scrollViewRef}
- onScroll={this.handleScroll}
+ onScroll={this.setContextScrollPosition}
scrollEventThrottle={scrollEventThrottle || 16}
scrollToOverflowEnabled
>
| 10 |
diff --git a/packages/@uppy/core/src/index.js b/packages/@uppy/core/src/index.js @@ -53,7 +53,7 @@ class Uppy {
// set default options
const defaultOptions = {
id: 'uppy',
- autoProceed: true,
+ autoProceed: false,
debug: false,
restrictions: {
maxFileSize: null,
| 12 |
diff --git a/src/basic_crawler.js b/src/basic_crawler.js @@ -181,6 +181,7 @@ class BasicCrawler {
this.maxRequestRetries = maxRequestRetries;
this.handledRequestsCount = 0;
+ let shouldLogMaxPagesExceeded = true;
const isMaxPagesExceeded = () => maxRequestsPerCrawl && maxRequestsPerCrawl <= this.handledRequestsCount;
const { isFinishedFunction } = autoscaledPoolOptions;
@@ -190,14 +191,22 @@ class BasicCrawler {
maxConcurrency,
runTaskFunction: this._runTaskFunction.bind(this),
isTaskReadyFunction: async () => {
- if (isMaxPagesExceeded()) return false;
+ if (isMaxPagesExceeded()) {
+ if (shouldLogMaxPagesExceeded) {
+ log.info('BasicCrawler: Crawler reached the maxRequestsPerCrawl limit of '
+ + `${maxRequestsPerCrawl} requests and will shut down soon. Requests that are in progress will be allowed to finish.`);
+ shouldLogMaxPagesExceeded = false;
+ }
+ return false;
+ }
return this._isTaskReadyFunction();
},
isFinishedFunction: async () => {
if (isMaxPagesExceeded()) {
- log.info('BasicCrawler: Crawler reached the max requests per crawl limit by crawling '
- + `${this.handledRequestsCount} requests and will shut down.`);
+ log.info(`BasicCrawler: Earlier, the crawler reached the maxRequestsPerCrawl limit of ${maxRequestsPerCrawl} requests `
+ + 'and all requests that were in progress at that time have now finished. '
+ + `In total, the crawler processed ${this.handledRequestsCount} requests and will shut down.`);
return true;
}
| 7 |
diff --git a/lib/base/model.js b/lib/base/model.js @@ -28,10 +28,12 @@ function ModelBase(attributes, options) {
this._reset();
this.relations = {};
this.cid = _.uniqueId('c');
- if (options) {
_.extend(this, _.pick(options, modelProps));
+
if (options.parse) attrs = this.parse(attrs, options) || {};
- }
+ if (options.visible) this.visible = _.clone(options.visible);
+ if (options.hidden) this.hidden = _.clone(options.hidden);
+
this.set(attrs, options);
this.initialize.apply(this, arguments);
}
@@ -368,23 +370,29 @@ ModelBase.prototype.isNew = function() {
*/
ModelBase.prototype.serialize = function(options) {
if (!options) options = {};
+ if (options.visibility === null || options.visibility === undefined) options.visibility = true;
+
+ if (options.omitNew && this.isNew()) return null;
+
+ let attributes = Object.assign({}, this.attributes);
- if (options.omitNew && this.isNew()) {
- return null;
+ if (options.visibility) {
+ const visible = (options && options.visible) || this.visible;
+ const hidden = (options && options.hidden) || this.hidden;
+
+ if (visible) attributes = _.pick(attributes, visible);
+ if (hidden) attributes = _.omit(attributes, hidden);
}
- if (!options.shallow) {
+ if (options.shallow) return attributes;
+
let relations = _.mapValues(this.relations, (relation) => (relation.toJSON ? relation.toJSON(options) : relation));
- // Omit null relations from the omitNew option
relations = _.omitBy(relations, _.isNull);
const pivot = this.pivot && !options.omitPivot && this.pivot.attributes;
const pivotAttributes = _.mapKeys(pivot, (value, key) => `${constants.PIVOT_PREFIX}${key}`);
- return Object.assign({}, this.attributes, relations, pivotAttributes);
- }
-
- return Object.assign({}, this.attributes);
+ return Object.assign(attributes, relations, pivotAttributes);
};
/**
| 5 |
diff --git a/setup.py b/setup.py @@ -5,7 +5,7 @@ here = os.path.abspath(os.path.dirname(__file__))
README = open(os.path.join(here, 'README.md')).read()
CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
# Edit Snovault version after the `@` here, can be a branch or tag
-SNOVAULT_DEP = "git+https://github.com/ENCODE-DCC/snovault.git@pin-antlr"
+SNOVAULT_DEP = "git+https://github.com/ENCODE-DCC/[email protected]"
INSTALL_REQUIRES = [
"PasteDeploy==2.1.0",
| 3 |
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml @@ -39,7 +39,7 @@ jobs:
- name: Set up JDK 12
uses: actions/setup-java@v1
with:
- java-version: 12
+ java-version: 11
- name: Install Java dependencies
run: make installLocalDependencies
| 12 |
diff --git a/lib/api/models/mock.js b/lib/api/models/mock.js @@ -124,7 +124,9 @@ export class Mock {
matches(request) {
const preparedRegex = toRegExp(this.url);
- return request.method === this.method &&
+ const methodMatches = request.method.toLowerCase() === this.method.toLowerCase();
+
+ return methodMatches &&
this.matchParams(request.params) &&
preparedRegex.test(request.url);
}
@@ -134,8 +136,8 @@ export class Mock {
return true;
}
- const emptyMockParams = this.params === undefined || this.params === null || this.params === '';
- const emptyRequestParams = params === undefined || params === null || this.params === '';
+ const emptyMockParams = this.params === undefined || this.params === null || this.params === '' || this.params === 'null';
+ const emptyRequestParams = params === undefined || params === null || params === '' || params === 'null';
if (emptyMockParams && emptyRequestParams) {
return true;
| 1 |
diff --git a/react/src/base/inputs/SprkInput/SprkInput.test.js b/react/src/base/inputs/SprkInput/SprkInput.test.js @@ -49,12 +49,16 @@ describe('SprkInput:', () => {
it('should assign id when id has a value', () => {
const wrapper = mount(<SprkInput id="321" />);
- expect(wrapper.find('.sprk-b-TextInput').prop('id')).toBe('321');
+ expect(
+ wrapper.find('.sprk-b-TextInput').getDOMNode().getAttribute('id'),
+ ).toBe('321');
});
it('should assign default id when id has no value', () => {
const wrapper = mount(<SprkInput />);
- expect(wrapper.find('.sprk-b-TextInput').prop('id')).toContain('sprk-');
+ expect(
+ wrapper.find('.sprk-b-TextInput').getDOMNode().getAttribute('id'),
+ ).toContain('sprk-');
});
it(`should add floating label class
| 3 |
diff --git a/types/index.d.ts b/types/index.d.ts @@ -1978,7 +1978,7 @@ declare namespace Knex {
static extend(
methodName: string,
fn: <TRecord extends {} = any, TResult = unknown[]>(
- this: Knex<TRecord, TResult>,
+ this: QueryBuilder<TRecord, TResult>,
...args: any[]
) => QueryBuilder<TRecord, TResult>
): void;
| 1 |
diff --git a/src/js/components/Clock/Clock.js b/src/js/components/Clock/Clock.js @@ -27,6 +27,9 @@ const parseTime = (time, hourLimit) => {
match = TIME_REGEXP.exec(normalizedTime);
if (match) {
result.hours = parseFloat(match[1]);
+ if (hourLimit === 12) {
+ result.hours = (result.hours > 12 ? (result.hours - 12) : result.hours);
+ }
result.minutes = parseFloat(match[2]) || 0;
result.seconds = parseFloat(match[3]) || 0;
} else {
| 1 |
diff --git a/src/client/js/components/Me/PersonalSettings.jsx b/src/client/js/components/Me/PersonalSettings.jsx @@ -10,74 +10,43 @@ import ApiSettings from './ApiSettings';
class PersonalSettings extends React.Component {
-
render() {
const { t } = this.props;
- // const Icons = [
- // <i className="icon-fw icon-user"></i>,
- // <i className="icon-fw icon-share-alt"></i>,
- // <i className="icon-fw icon-lock"></i>,
- // <i className="icon-fw icon-paper-plane"></i>,
- // ];
- // console.log(`Icons = ${Icons}`);
-
- // const setIcons = () => {
- // Icons.map((icon) => {
- // console.log(icon);
- // return (
- // <>
- // { icon }
- // </>
- // );
- // });
- // };
- // const setIcons = () => {
- // Icons.map(icon => icon);
- // };
-
- const setIcon1 = () => {
- return (
- <i className="icon-fw icon-user"></i>
- );
+ const UserIcon = () => {
+ return <i className="icon-fw icon-user"></i>;
};
- const setIcon2 = () => {
- return (
- <i className="icon-fw icon-share-alt"></i>
- );
+ const shereAltIcon = () => {
+ return <i className="icon-fw icon-share-alt"></i>;
};
- const setIcon3 = () => {
- return (
- <i className="icon-fw icon-lock"></i>
- );
+ const lockIcon = () => {
+ return <i className="icon-fw icon-lock"></i>;
};
- const setIcon4 = () => {
- return (
- <i className="icon-fw icon-paper-plan"></i>
- );
+ const paperPlaneIcon = () => {
+ return <i className="icon-fw icon-paper-plane"></i>;
};
const navTabMapping = {
user_infomation: {
- Icon: setIcon1,
+ Icon: UserIcon,
Content: UserSettings,
i18n: t('User Information'),
index: 0,
},
external_accounts: {
- Icon: setIcon2,
+ Icon: shereAltIcon,
Content: ExternalAccountLinkedMe,
i18n: t('admin:user_management.external_accounts'),
index: 1,
},
password_settings: {
- Icon: setIcon3,
+ Icon: lockIcon,
Content: PasswordSettings,
i18n: t('Password Settings'),
index: 2,
},
api_settings: {
- Icon: setIcon4,
+ Icon: paperPlaneIcon,
Content: ApiSettings,
i18n: t('API Settings'),
index: 3,
| 10 |
diff --git a/packages/context/src/context-connect.js b/packages/context/src/context-connect.js @@ -16,7 +16,7 @@ import { CONNECT_STATIC_NAMESPACE } from './constants';
* component wrappers.
*
* @template {import('@wp-g2/create-styles').ViewOwnProps<{}, any>} P
- * @param {(props: P, ref: import('react').Ref<any>) => JSX.Element} Component The component to register into the Context system.
+ * @param {(props: P, ref: import('react').Ref<any>) => JSX.Element | null} Component The component to register into the Context system.
* @param {Array<string>|string} namespace The namespace to register the component under.
* @param {object} options
* @param {boolean} [options.memo=true]
| 11 |
diff --git a/lib/assets/javascripts/new-dashboard/pages/Maps.vue b/lib/assets/javascripts/new-dashboard/pages/Maps.vue @@ -149,8 +149,11 @@ export default {
return !this.isFetchingMaps && !this.numResults && (!this.hasFilterApplied('mine') || this.totalUserEntries > 0);
},
emptyStateText () {
- const route = this.$router.resolve({name: 'datasets', params: { filter: 'shared' }});
- return (this.initialState && this.hasSharedMaps) ? this.$t('MapsPage.emptyCase.onlyShared', { path: route.href }) : this.$t('MapsPage.emptyCase.default', { path: route.href });
+ const route = this.$router.resolve({name: 'maps', params: { filter: 'shared' }});
+
+ return (this.initialState && this.hasSharedMaps)
+ ? this.$t('MapsPage.emptyCase.onlyShared', { path: route.href })
+ : this.$t('MapsPage.emptyCase.default', { path: route.href });
},
hasSharedMaps () {
return this.totalShared > 0;
| 10 |
diff --git a/src/components/Header.js b/src/components/Header.js import React from 'react';
-import { NavLink } from 'react-router-dom';
+import { NavLink , Link } from 'react-router-dom';
import globe from '../Globe.svg';
import '../styles/Header.css';
@@ -7,11 +7,11 @@ const header = () => {
return (
<header className="white-80 tc pv4 header pb7 ">
- <h1 className="mt2 mb3 headertext" data-aos="fade-down" data-aos-duration="5000"><a href="/">Travel Guide</a></h1>
- <div data-aos="fade-up" data-aos-duration="7000"><a href="/"><img src={globe} className="App-logo" alt="logo" /></a></div>
+ <h1 className="mt2 mb3 headertext" data-aos="fade-down" data-aos-duration="5000"><Link to="/travel-guide">Travel Guide</Link></h1>
+ <div data-aos="fade-up" data-aos-duration="7000"><Link to="/travel-guide"><img src={globe} className="App-logo" alt="logo" /></Link></div>
<nav className="bt bb tc center mt4 nav">
- <NavLink to='/' activeClassName="is-active" className="f6 f5-l link bg-animate white-80 hover-bg-purple b dib pa3 ph4-l">Home</NavLink>
+ <NavLink to='/travel-guide' activeClassName="is-active" className="f6 f5-l link bg-animate white-80 hover-bg-purple b dib pa3 ph4-l">Home</NavLink>
<NavLink to='/africa' activeClassName="is-active" className="f6 f5-l link bg-animate white-80 hover-bg-purple b dib pa3 ph4-l">Africa</NavLink>
<NavLink to='/americas' activeClassName="is-active" className="f6 f5-l link bg-animate white-80 hover-bg-purple b dib pa3 ph4-l">Americas</NavLink>
<NavLink to='/asia' activeClassName="is-active" className="f6 f5-l link bg-animate white-80 hover-bg-purple b dib pa3 ph4-l">Asia</NavLink>
| 14 |
diff --git a/src/js/controllers/wallet-selector.controller.js b/src/js/controllers/wallet-selector.controller.js @@ -129,6 +129,11 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
} else {
$scope.walletsInsufficientFunds.push(wallet);
}
+ if ($scope.coin === 'btc') { // As this is a promise
+ $scope.walletsBtc = walletsSufficientFunds;
+ } else {
+ $scope.walletsBch = walletsSufficientFunds;
+ }
ongoingProcess.set('scanning', false);
});
} else {
| 3 |
diff --git a/src/scripts/interactive-video.js b/src/scripts/interactive-video.js @@ -355,6 +355,13 @@ function InteractiveVideo(params, id, contentData) {
// Handle video captions loaded
self.video.on('captions', function (event) {
+ if (!self.controls) {
+ // Video is loaded but there are no controls
+ self.addControls();
+ self.trigger('resize');
+ }
+
+ // Add captions selector
self.setCaptionTracks(event.data);
});
| 0 |
diff --git a/packages/openneuro-app/src/scripts/client.jsx b/packages/openneuro-app/src/scripts/client.jsx @@ -11,9 +11,16 @@ import * as GoogleAnalytics from 'react-ga'
if (module.hot) module.hot.accept()
loadConfig().then(config => {
+ if (
+ config.sentry.environment === 'production' ||
+ config.sentry.environment === 'staging'
+ ) {
initApm({
serverUrl: `${config.url}/apm`,
+ serviceVersion: packageJson.version,
+ environment: config.sentry.environment,
})
+ }
GoogleAnalytics.initialize(config.analytics.trackingId)
| 8 |
diff --git a/package.json b/package.json "./entity": "./src/og/entity/index.js",
"./control": "./src/og/control/index.js",
"./webgl": "./src/og/webgl/index.js",
- "./scene": "./src/og/scene/index.js"
+ "./scene": "./src/og/scene/index.js",
+ "./css/og.css": "./css/og.css"
},
"devDependencies": {
"@babel/preset-env": "^7.12.17",
| 0 |
diff --git a/runtime.js b/runtime.js @@ -909,8 +909,10 @@ const _loadScript = async (file, {files = null, parentUrl = null, contentId = nu
mesh.getPhysicsIds = () => app.physicsIds;
mesh.getComponents = () => components;
mesh.getApp = () => app;
+ let hitTime = -1;
mesh.hit = () => {
console.log('hit', mesh);
+ hitTime = 0;
};
const jitterObject = new THREE.Object3D();
@@ -986,6 +988,20 @@ const _loadScript = async (file, {files = null, parentUrl = null, contentId = nu
};
const u = await _mapUrl(srcUrl);
+ const hitAnimationLength = 300;
+ app.addEventListener('frame', e => {
+ if (hitTime !== -1) {
+ hitTime += e.data.timeDiff;
+
+ const scale = (1-hitTime/hitAnimationLength) * 0.1;
+ jitterObject.position.set((-1+Math.random()*2)*scale, (-1+Math.random()*2)*scale, (-1+Math.random()*2)*scale);
+
+ if (hitTime > hitAnimationLength) {
+ hitTime = -1;
+ }
+ }
+ });
+
return mesh;
};
const _loadManifestJson = async (file, {files = null, contentId = null, instanceId = null, autoScale = true, monetizationPointer = null, ownerAddress = null} = {}) => {
| 0 |
diff --git a/src/__experimental__/components/decimal/decimal.component.js b/src/__experimental__/components/decimal/decimal.component.js @@ -64,9 +64,10 @@ class Decimal extends React.Component {
if (isValid) {
this.props.onChange(evt);
-
+ } else {
+ const newPosition = selectionEnd - 1;
setTimeout(() => {
- target.setSelectionRange(selectionEnd, selectionEnd);
+ target.setSelectionRange(newPosition, newPosition);
});
}
}
| 5 |
diff --git a/shared/img/hero-ribbon__mixed.svg b/shared/img/hero-ribbon__mixed.svg -<svg xmlns="http://www.w3.org/2000/svg" width="48" height="65"><g fill="none"><path fill="#B8BABC" d="M24.422 58.014l10.35 6.393a1.08 1.08 0 0 0 1.653-.922v-28.84c0-.599-.486-1.085-1.085-1.085H12.369c-.6 0-1.086.486-1.086 1.086v28.84a1.08 1.08 0 0 0 1.654.92l10.35-6.392a1.085 1.085 0 0 1 1.135 0z"/><path fill="#8D9099" d="M23.854 44.654c-2.524 0-5.13 1.793-7.396 1.073-2.265-.72-3.452-3.786-5.364-5.244-1.912-1.458-5.244-1.552-6.563-3.458-1.426-1.893-.473-5.01-1.193-7.396C2.625 27.363 0 25.457 0 22.946c0-2.512 2.625-4.418 3.338-6.677.713-2.26-.12-5.49 1.193-7.396 1.433-1.893 4.651-2.026 6.563-3.458C13.006 3.982 14.073.883 16.458.17c2.266-.719 4.897 1.092 7.396 1.092 2.5 0 5.131-1.811 7.396-1.092 2.266.72 3.459 3.818 5.352 5.245 1.893 1.426 5.25 1.552 6.563 3.458 1.426 1.893.473 5.01 1.193 7.396.713 2.26 3.338 4.171 3.338 6.677 0 2.505-2.625 4.417-3.338 6.683-.713 2.265.12 5.49-1.193 7.396-1.432 1.893-4.65 2.025-6.563 3.458-1.912 1.433-2.979 4.531-5.364 5.244-2.253.72-4.878-1.073-7.384-1.073z"/><path fill="#FFF" d="M36.242 14.426a1.975 1.975 0 0 0-2.783 0L20.585 27.3l-6.31-6.31a1.969 1.969 0 0 0-3.358 1.388c.002.52.208 1.019.575 1.388l7.705 7.705c.77.765 2.013.765 2.783 0L36.242 17.21a1.975 1.975 0 0 0 0-2.783zm-.46.227zM11.8 21.293zm9.845 9.844a1.496 1.496 0 0 1-1.414.391 1.52 1.52 0 0 0 1.414-.391l4.752-4.752-4.752 4.752zM36.26 15.36c.085.248.105.513.057.77.052-.265.033-.54-.057-.795v.025z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="65"><g fill="none"><path fill="#B8BABC" d="M24.442 58.014L34.8 64.407a1.08 1.08 0 0 0 1.655-.922v-28.84c0-.599-.487-1.085-1.087-1.085h-22.99c-.599 0-1.085.486-1.085 1.086v28.84a1.079 1.079 0 0 0 1.654.92l10.358-6.392a1.087 1.087 0 0 1 1.137 0z"/><path fill="#8D9099" d="M23.874 44.654c-2.527 0-5.135 1.793-7.402 1.073-2.268-.72-3.455-3.786-5.369-5.244-1.914-1.458-5.248-1.552-6.568-3.458-1.428-1.893-.474-5.01-1.194-7.396C2.627 27.363 0 25.457 0 22.946c0-2.512 2.627-4.418 3.341-6.677.714-2.26-.12-5.49 1.194-7.396 1.433-1.893 4.654-2.026 6.568-3.458C13.017 3.982 14.084.883 16.472.17c2.267-.719 4.9 1.092 7.402 1.092 2.5 0 5.134-1.811 7.402-1.092 2.267.72 3.46 3.818 5.356 5.245 1.894 1.426 5.254 1.552 6.568 3.458 1.427 1.893.474 5.01 1.194 7.396.713 2.26 3.34 4.171 3.34 6.677 0 2.505-2.627 4.417-3.34 6.683-.714 2.265.12 5.49-1.194 7.396-1.434 1.893-4.655 2.025-6.568 3.458-1.914 1.433-2.981 4.531-5.369 5.244-2.255.72-4.882-1.073-7.39-1.073z"/><path fill="#FFF" d="M26.798 23.514l5.905-5.9a2.065 2.065 0 0 0-.927-3.457 2.069 2.069 0 0 0-1.997.534l-5.905 5.894-5.906-5.894a2.069 2.069 0 0 0-3.459.926 2.065 2.065 0 0 0 .535 1.996l5.905 5.9-5.905 5.895a2.069 2.069 0 0 0 .892 3.527 2.073 2.073 0 0 0 2.032-.6l5.906-5.9 5.905 5.9a2.073 2.073 0 0 0 3.528-.898 2.069 2.069 0 0 0-.604-2.03l-5.905-5.893z"/></g></svg>
\ No newline at end of file
| 4 |
diff --git a/tabulator.js b/tabulator.js return match;
},
+ _setColGroupVisibility:function(column, visibility){
+ var self = this;
+
+ var group = column.parent().closest(".tabulator-col-group");
+
+ console.log("group", visibility, group.length, group)
+
+ if(group.length){
+ var visCols = $(".tabulator-col:visible", group);
+
+ if(visCols.length || visibility){
+ group.show();
+ }else{
+ group.hide();
+ }
+
+ self._setColGroupVisibility(group, visibility);
+ }
+
+ },
+
_setColVisibility:function(column, visibility){
var self = this;
elements.hide();
}
+ self._setColGroupVisibility($(".tabulator-col[data-index=" + column.index + "]"), visibility);
+
self._renderTable();
if(self.options.persistentLayout){
| 9 |
diff --git a/node_common/constants.js b/node_common/constants.js @@ -6,8 +6,8 @@ export const FILE_STORAGE_URL = "./public/static/files/";
export const GITHUB_URL = "https://github.com/filecoin-project/slate";
export const ANALYTICS_URL = "https://slate-stats-dev.azurewebsites.net/";
-// NOTE(toast): 30 GB from jim/martina/ignacio
-export const TEXTILE_ACCOUNT_BYTE_LIMIT = 1073741824 * 30;
+// NOTE(toast): 4 GB from jim/martina/ignacio
+export const TEXTILE_ACCOUNT_BYTE_LIMIT = 1073741824 * 4;
// NOTE(jim): 4 GB - minus .textileseed
export const TEXTILE_BUCKET_LIMIT = TEXTILE_ACCOUNT_BYTE_LIMIT - 234;
| 2 |
diff --git a/codegens/ruby/lib/util/parseBody.js b/codegens/ruby/lib/util/parseBody.js var _ = require('../lodash'),
- sanitize = require('./sanitize').sanitize;
+ sanitize = require('./sanitize').sanitize,
+ nullToken = '__RUBY#%0NULL__';
+
+/**
+ * Convert null to Ruby equivalent nil
+ *
+ * @param {String} key
+ * @param {Object} value
+ */
+function replacer (key, value) {
+ if (value === null) {
+ return nullToken;
+ }
+ return value;
+}
/**
* Used to parse the body of the postman SDK-request and return in the desired format
@@ -28,7 +42,9 @@ module.exports = function (request, trimRequestBody, contentType) {
if (contentType && (contentType === 'application/json' || contentType.match(/\+json$/))) {
try {
let jsonBody = JSON.parse(request.body[request.body.mode]);
- return `request.body = JSON.dump(${JSON.stringify(jsonBody, null, 4)})\n`;
+ jsonBody = JSON.stringify(jsonBody, replacer, 4)
+ .replace(new RegExp(`"${nullToken}"`, 'g'), 'nil');
+ return `request.body = JSON.dump(${jsonBody})\n`;
}
catch (error) {
// Do nothing
| 9 |
diff --git a/buildtools/check-example.js b/buildtools/check-example.js @@ -103,7 +103,7 @@ function loaded(page, browser) {
if (url == 'https://ows.asitvd.ch/wmts/1.0.0/WMTSCapabilities.xml') {
request.respond(ASITVDCapabilities);
} else if (parse(url).host == parse(page_url).host ||
- url.startsWith('http://localhost:3000/') ||
+ url.startsWith('http://localhost:') ||
url.startsWith('https://geomapfish-demo') ||
url.startsWith('https://wmts.geo.admin.ch/') ||
url.startsWith('https://wms.geo.admin.ch/')) {
| 8 |
diff --git a/client/public/index.html b/client/public/index.html <body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
- <script>(function(){var s = document.createElement('script'),e = ! document.body ? document.querySelector('head') : document.body;s.src = 'https://acsbapp.com/apps/app/assets/js/acsb.js';s.async = s.defer = true;s.onload = function(){acsbJS.init({statementLink : '',feedbackLink : '',footerHtml : '',hideMobile : false,hideTrigger : false,language : 'en',position : 'right',leadColor : '#425af2',triggerColor : '#425af2',triggerRadius : '50%',triggerPositionX : 'right',triggerPositionY : 'bottom',triggerIcon : 'default',triggerSize : 'medium',triggerOffsetX : 20,triggerOffsetY : 20,mobile : {triggerSize : 'small',triggerPositionX : 'left',triggerPositionY : 'center',triggerOffsetX : 0,triggerOffsetY : 0,triggerRadius : '0'}});};e.appendChild(s);}());</script>
+ <script>(function(){var s = document.createElement('script'),e = ! document.body ? document.querySelector('head') : document.body;s.src = 'https://acsbapp.com/apps/app/assets/js/acsb.js';s.async = s.defer = true;s.onload = function(){acsbJS.init({statementLink : '',feedbackLink : '',footerHtml : '',hideMobile : false,hideTrigger : false,language : 'en',position : 'left',leadColor : '#425af2',triggerColor : '#425af2',triggerRadius : '50%',triggerPositionX : 'left',triggerPositionY : 'bottom',triggerIcon : 'default',triggerSize : 'medium',triggerOffsetX : 20,triggerOffsetY : 20,mobile : {triggerSize : 'small',triggerPositionX : 'left',triggerPositionY : 'center',triggerOffsetX : 0,triggerOffsetY : 0,triggerRadius : '0'}});};e.appendChild(s);}());</script>
<script>
function isIE() {
return (window.navigator.userAgent.match(/MSIE|Trident/) !== null);
| 5 |
diff --git a/content/articles/add-an-external-css-file-to-a-javafx-application/index.md b/content/articles/add-an-external-css-file-to-a-javafx-application/index.md @@ -30,13 +30,9 @@ In the FXML file, it's also hard to follow up with the styling in the code since
- [Folder structure](#folder-structure)
- [Add code inside the FXML application](#add-code-inside-the-fxml-application)
- [Add styling to the application](#add-styling-to-the-application)
- - [1. Adding an internal styling](#1-adding-an-internal-styling)
- - [Hardcode it](#hardcode-it)
- - [Using the SceneBuilder](#using-the-scenebuilder)
- - [2. Using pre-saved variables](#2-using-pre-saved-variables)
- - [3. Using an external CSS file](#3-using-an-external-css-file)
- - [External styling format](#external-styling-format)
- - [External CSS for multiple scenes instances](#external-css-for-multiple-scenes-instances)
+ - [Adding an internal styling](#1-adding-an-internal-styling)
+ - [Using pre-saved variables](#2-using-pre-saved-variables)
+ - [Using an external CSS file](#3-using-an-external-css-file)
- [Conclusion](#conclusion)
- [References](#references)
| 1 |
diff --git a/assets/js/googlesitekit/datastore/site/connection.js b/assets/js/googlesitekit/datastore/site/connection.js @@ -103,21 +103,6 @@ export const actions = {
type: RECEIVE_CONNECTION,
};
},
-
- /**
- * Dispatches an action signifying the `fetchConnection` side-effect failed.
- *
- * @since 1.5.0
- * @private
- *
- * @return {Object} Redux-style action.
- */
- receiveConnectionFailed() {
- return {
- payload: {},
- type: CATCH_FETCH_CONNECTION,
- };
- },
};
export const controls = {
@@ -140,7 +125,6 @@ export const reducer = ( state, { type, payload } ) => {
return {
...state,
- isFetchingConnection: false,
connection,
};
}
| 2 |
diff --git a/src/encoded/tests/data/inserts/user.json b/src/encoded/tests/data/inserts/user.json "community"
],
"uuid": "75659c39-eaea-47b7-ba26-92e9ff183e6c"
+ },
+ {
+ "email": "[email protected]",
+ "first_name": "Paul",
+ "groups": [
+ "admin"
+ ],
+ "job_title": "Associate Data Wrangler",
+ "lab": "/labs/j-michael-cherry/",
+ "last_name": "Sud",
+ "schema_version": "8",
+ "status": "current",
+ "submits_for": [
+ "/labs/j-michael-cherry/"
+ ],
+ "viewing_groups": [
+ "community",
+ "ENCODE3",
+ "ENCODE4",
+ "GGR",
+ "REMC",
+ "ENCORE"
+ ],
+ "uuid": "473a72c0-6f20-4f81-9093-198e92fee470"
}
]
| 0 |
diff --git a/html/components/card.stories.js b/html/components/card.stories.js @@ -283,7 +283,7 @@ export const twoUpCards = () => (
>
Learn More
<svg class="sprk-c-Icon" viewBox="0 0 64 64">
- <use xlink:href="#chevron-right" />
+ <use xlink:href="#right-arrow" />
</svg>
</a>
</div>
@@ -334,7 +334,7 @@ export const twoUpCards = () => (
>
Learn More
<svg class="sprk-c-Icon" viewBox="0 0 64 64">
- <use xlink:href="#chevron-right" />
+ <use xlink:href="#right-arrow" />
</svg>
</a>
</div>
@@ -409,7 +409,7 @@ export const threeUpCards = () => (
>
Learn More
<svg class="sprk-c-Icon" viewBox="0 0 64 64">
- <use xlink:href="#chevron-right" />
+ <use xlink:href="#right-arrow" />
</svg>
</a>
</div>
@@ -464,7 +464,7 @@ export const threeUpCards = () => (
>
Learn More
<svg class="sprk-c-Icon" viewBox="0 0 64 64">
- <use xlink:href="#chevron-right" />
+ <use xlink:href="#right-arrow" />
</svg>
</a>
</div>
@@ -518,7 +518,7 @@ export const threeUpCards = () => (
>
Learn More
<svg class="sprk-c-Icon" viewBox="0 0 64 64">
- <use xlink:href="#chevron-right" />
+ <use xlink:href="#right-arrow" />
</svg>
</a>
</div>
| 3 |
diff --git a/generators/server/templates/src/main/java/package/domain/_User.java b/generators/server/templates/src/main/java/package/domain/_User.java @@ -99,8 +99,7 @@ public class User<% if (databaseType == 'sql' || databaseType == 'mongodb') { %>
@Size(max = 256)<% if (databaseType == 'sql') { %>
@Column(name = "image_url", length = 256)<% } %><% if (databaseType == 'mongodb') { %>
- @Field("image_url")<% } %><% if (databaseType == 'cassandra') { %>
- @Column(name = "image_url")<% } %>
+ @Field("image_url")<% } %>
private String imageUrl;
@Size(max = 20)<% if (databaseType == 'sql') { %>
| 2 |
diff --git a/drop-manager.js b/drop-manager.js @@ -96,6 +96,7 @@ const loadPromise = (async () => {
let lastTimestamp = Date.now();
let animation = null;
+ const timeOffset = Math.random() * 10;
o.update = () => {
const now = Date.now();
const timeDiff = (now - lastTimestamp) / 1000;
@@ -157,7 +158,7 @@ const loadPromise = (async () => {
}
}
- const time = performance.now() * 0.002;
+ const time = timeOffset + performance.now() * 0.002;
const k = 1;
for (var i = 0; i < sphere.geometry.vertices.length; i++) {
const p = sphere.geometry.vertices[i];
@@ -197,6 +198,7 @@ const loadPromise = (async () => {
let lastTimestamp = Date.now();
let animation = null;
+ const timeOffset = Math.random() * 10;
o.update = () => {
const now = Date.now();
const timeDiff = (now - lastTimestamp) / 1000;
@@ -262,7 +264,7 @@ const loadPromise = (async () => {
}
const time = performance.now() * 0.0005;
- o.rotation.y = time * Math.PI*2;
+ o.rotation.y = (timeOffset + time * Math.PI*2) % Math.PI*2;
};
tickers.push(o);
};
| 0 |
diff --git a/site/monitoring.xml b/site/monitoring.xml @@ -79,7 +79,7 @@ limitations under the License.
<li>Memory usage (used, buffered, cached & free percentages)</li>
<li><a href="https://www.kernel.org/doc/Documentation/sysctl/vm.txt">Virtual Memory</a> statistics (dirty page flushes, writeback volume)</li>
<li>Disk I/O (operations & amount of data transferred per unit time, time to service operations)</li>
- <li>Free disk space on the mount used for <code>MNESIA_BASE</code></li>
+ <li>Free disk space on the mount used for the <a href="/relocate.html">node data directory</a></li>
<li>File descriptors used by <code>beam.smp</code> vs. <a href="/networking.html#open-file-handle-limit">max system limit</a></li>
<li>TCP connections by state (<code>ESTABLISHED</code>, <code>CLOSE_WAIT</code>, <code>TIME_WAIT</code>)</li>
<li>Network throughput (bytes received, bytes sent) & maximum network throughput)</li>
| 14 |
diff --git a/lib/aggregate.js b/lib/aggregate.js @@ -623,6 +623,9 @@ Aggregate.prototype.unionWith = function(options) {
*/
Aggregate.prototype.read = function(pref, tags) {
+ if (!this.options) {
+ this.options = {};
+ }
read.call(this, pref, tags);
return this;
};
@@ -641,6 +644,9 @@ Aggregate.prototype.read = function(pref, tags) {
*/
Aggregate.prototype.readConcern = function(level) {
+ if (!this.options) {
+ this.options = {};
+ }
readConcern.call(this, level);
return this;
};
@@ -862,6 +868,9 @@ Aggregate.prototype.option = function(value) {
*/
Aggregate.prototype.cursor = function(options) {
+ if (!this.options) {
+ this.options = {};
+ }
this.options.cursor = options || {};
return new AggregationCursor(this); // return this;
};
@@ -880,6 +889,9 @@ Aggregate.prototype.cursor = function(options) {
*/
Aggregate.prototype.collation = function(collation) {
+ if (!this.options) {
+ this.options = {};
+ }
this.options.collation = collation;
return this;
};
| 13 |
diff --git a/lib/carto/assets_service.rb b/lib/carto/assets_service.rb @@ -57,9 +57,6 @@ module Carto
filename = resource.respond_to?(:original_filename) ? resource.original_filename : resource
extension = File.extname(filename).downcase
- # Filename might include a postfix hash -- Rack::Test::UploadedFile adds it
- extension.gsub!(/\d+-\w+-\w+\z/, '') if Rails.env.test?
-
raise UnprocesableEntityError.new("extension not accepted") unless VALID_EXTENSIONS.include?(extension)
extension
end
| 2 |
diff --git a/articles/quickstart/spa/angular-beta/02-calling-an-api.md b/articles/quickstart/spa/angular-beta/02-calling-an-api.md @@ -20,7 +20,7 @@ Most single-page apps use resources from data APIs. You may want to restrict acc
This tutorial shows you how to create a simple API using [Express](https://expressjs.com) that serves resources protected by a middleware that looks for and validates access tokens. You will then see how to call this API using an access token granted by the Auth0 authorization server.
:::note
-If you have been following [part 1 of this tutorial](/docs/quickstart/angular-beta/01-login), then the following steps can be completed within the same project.
+If you have been following [part 1 of this tutorial](/quickstart/spa/angular-beta/01-login), then the following steps can be completed within the same project.
:::
<%= include('../_includes/_calling_api_create_api') %>
@@ -260,4 +260,8 @@ Finally, add a link to the navigation bar so that the user may reach this new pa
</header>
```
+:::note
+You may need to restart the application in order for the server changes to take effect. Press `Ctrl+C` in the terminal to stop the application, then run it again using `npm run dev`
+:::
+
At this point, you should be able to run the application, browse to the External API page and click the **Ping API** button to initiate the API call. The results of that call should then be available in the browser.
| 3 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/layers-view.js b/lib/assets/core/javascripts/cartodb3/editor/layers/layers-view.js @@ -28,10 +28,6 @@ var REQUIRED_OPTS = [
*/
module.exports = CoreView.extend({
- events: {
- 'click .js-analysis-node': '_onAnalysisNodeClicked'
- },
-
initialize: function (opts) {
checkAndBuildOpts(opts, REQUIRED_OPTS, this);
| 2 |
diff --git a/netlify.toml b/netlify.toml [build]
base = "docs/"
publish = "docs/public/"
- command = "gatsby build --prefix-paths && mkdir -p docs && mv public/* docs && mv docs public/"
+ command = "gatsby build --prefix-paths && mkdir -p docs && mv public/* docs && mv docs public/ && mv public/docs/_redirects public"
[build.environment]
NPM_VERSION = "6"
| 5 |
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml name: iOS CI/CD v1
-#
-#on:
-# push:
-# branches: [master, staging, next]
-# pull_request:
-# branches: [master, staging, next]
-# types:
-# - closed
+on:
+ push:
+ branches: [master, staging, next]
+ pull_request:
+ branches: [master, staging, next]
+ types:
+ - closed
#
# workflow_dispatch:
# inputs:
@@ -21,15 +20,15 @@ name: iOS CI/CD v1
# - qa: '/staging'
# - prod: '/next'
#
-#jobs:
-# set_target_branch:
-# steps:
-# name: Detect and set target branch
-# run: |
+jobs:
+ set_target_branch:
+ steps:
+ name: Detect and set target branch
+ run: |
# ${{ github.event.inputs.release != '' && echo "TARGET_BRANCH= ${{ github.event.inputs.release }}" >> $GITHUB_ENV ||
-# endsWith(github.ref, '/master') && echo "TARGET_BRANCH= '/master'" >> $GITHUB_ENV ||
-# endsWith(github.ref, '/staging') && echo "TARGET_BRANCH= '/staging'" >> $GITHUB_ENV ||
-# endsWith(github.ref, '/next') && echo "TARGET_BRANCH= '/next'" >> $GITHUB_ENV }}
+ endsWith(github.ref, '/master') && echo "TARGET_BRANCH='/master'" >> $GITHUB_ENV ||
+ endsWith(github.ref, '/staging') && echo "TARGET_BRANCH='/staging'" >> $GITHUB_ENV ||
+ endsWith(github.ref, '/next') && echo "TARGET_BRANCH='/next'" >> $GITHUB_ENV }}
#
# build:
# runs-on: macOS-latest
| 0 |
diff --git a/aura-impl/src/main/java/org/auraframework/impl/ServerServiceImpl.java b/aura-impl/src/main/java/org/auraframework/impl/ServerServiceImpl.java @@ -219,6 +219,8 @@ public class ServerServiceImpl implements ServerService {
} catch (QuickFixException qfe) {
// well, it's not a component, it's not an app... give up trying to exclude it from the set being serialized
}
+ } catch (Exception e) {
+ // ignore other exceptions that may surface from trying to get the definition, like from layouts
}
context.setPreloadedDefinitions(preloadedDefinitions);
}
| 8 |
diff --git a/app/screens/home/search/search.tsx b/app/screens/home/search/search.tsx @@ -93,26 +93,22 @@ const SearchScreen = ({teamId}: Props) => {
const {scrollPaddingTop, scrollRef, scrollValue, onScroll, headerHeight, hideHeader} = useCollapsibleHeader<FlatList>(true, onSnap);
+ const handleCancelAndClearSearch = useCallback(() => {
+ setSearchValue('');
+ setLastSearchedValue('');
+ setFilter(FileFilters.ALL);
+ setShowResults(false);
+ }, []);
+
const handleTextChange = useCallback((newValue: string) => {
setSearchValue(newValue);
setCursorPosition(newValue.length);
}, []);
- const handleClearSearch = useCallback(() => {
- handleTextChange('');
- setLastSearchedValue('');
- setFilter(FileFilters.ALL);
- }, [handleTextChange]);
-
- const handleCancelSearch = useCallback(() => {
- handleClearSearch();
- setShowResults(false);
- }, [handleClearSearch]);
-
const handleSearch = useCallback(async (newSearchTeamId: string, term: string) => {
const searchParams = getSearchParams(term);
if (!searchParams.terms) {
- handleClearSearch();
+ handleCancelAndClearSearch();
return;
}
setLoading(true);
@@ -130,7 +126,7 @@ const SearchScreen = ({teamId}: Props) => {
setShowResults(true);
setLoading(false);
- }, [handleClearSearch]);
+ }, [handleCancelAndClearSearch]);
const onSubmit = useCallback(() => {
handleSearch(searchTeamId, searchValue);
@@ -264,8 +260,8 @@ const SearchScreen = ({teamId}: Props) => {
onSubmitEditing={onSubmit}
blurOnSubmit={true}
placeholder={intl.formatMessage({id: 'screen.search.placeholder', defaultMessage: 'Search messages & files'})}
- onClear={handleClearSearch}
- onCancel={handleCancelSearch}
+ onClear={handleCancelAndClearSearch}
+ onCancel={handleCancelAndClearSearch}
defaultValue={searchValue}
/>
<Animated.View style={[top, {zIndex: AutocompleteZindex}]}>
| 4 |
diff --git a/token-metadata/0xa5Fd1A791C4dfcaacC963D4F73c6Ae5824149eA7/metadata.json b/token-metadata/0xa5Fd1A791C4dfcaacC963D4F73c6Ae5824149eA7/metadata.json "symbol": "JNT",
"address": "0xa5Fd1A791C4dfcaacC963D4F73c6Ae5824149eA7",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/elements/editable-table/lib/editable-table.haxProperties.json b/elements/editable-table/lib/editable-table.haxProperties.json }
],
"advanced": [
+ {
+ "property": "dataCsv",
+ "title": "CSV Data",
+ "description": "Make a table from an uploaded CSV file",
+ "inputMethod": "fileupload",
+ "accepts": "csv"
+ },
{
"property": "downloadable",
"title": "Download Button",
| 11 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## v1.8.4 (2020-4-7)
+
+### Bug Fixes
+
+* TestCafe no longer throws an error when you access the `visible` selector property for a non-existing element ([#2386](https://github.com/DevExpress/testcafe/issues/2386))
+* `t.pressKey` now works if the active element is inside the Shadow DOM ([#2432](https://github.com/DevExpress/testcafe/issues/2432))
+* An original Node.js error is displayed if a browser provider was unable to load ([#4522](https://github.com/DevExpress/testcafe/issues/4522))
+* Custom hooks that use `responseEventConfigureOpts` now trigger the `onResponse` handler for AJAX requests ([testcafe-hammerhead/#2190](https://github.com/DevExpress/testcafe-hammerhead/issues/2190))
+
## v1.8.3 (2020-3-17)
### Bug Fixes
| 0 |
diff --git a/core/block.js b/core/block.js @@ -2473,35 +2473,6 @@ Blockly.Blocks['lambda_typed'] = {
return xml;
},
- /**
- * Create XML to represent list inputs.
- * @return {Element} XML storage element.
- * @this Blockly.Block
- */
- mutationToDom: function() {
- var container = document.createElement('mutation');
- return container;
- },
- /**
- * Parse XML to restore the list inputs.
- * @param {!Element} xmlElement XML storage element.
- * @this Blockly.Block
- */
- domToMutation: function(xmlElement) {
- goog.asserts.assert(false, 'Not implemented');
- },
- /**
- * Populate the mutator's dialog with this block's components.
- * @param {!Blockly.Workspace} workspace Mutator's workspace.
- * @return {!Blockly.Block} Root block in mutator.
- * @this Blockly.Block
- */
- decompose: function(workspace) {
- var dummyBlock = workspace.newBlock('logic_boolean_typed');
- dummyBlock.initSvg();
- return dummyBlock;
- },
-
clearTypes: function() {
this.outputConnection.typeExpr.arg_type.clear();
this.outputConnection.typeExpr.return_type.clear();
@@ -2777,35 +2748,6 @@ Blockly.Blocks['let_typed'] = {
return xml;
},
- /**
- * Create XML to represent list inputs.
- * @return {Element} XML storage element.
- * @this Blockly.Block
- */
- mutationToDom: function() {
- var container = document.createElement('mutation');
- return container;
- },
- /**
- * Parse XML to restore the list inputs.
- * @param {!Element} xmlElement XML storage element.
- * @this Blockly.Block
- */
- domToMutation: function(xmlElement) {
- goog.asserts.assert(false, 'Not implemented');
- },
- /**
- * Populate the mutator's dialog with this block's components.
- * @param {!Blockly.Workspace} workspace Mutator's workspace.
- * @return {!Blockly.Block} Root block in mutator.
- * @this Blockly.Block
- */
- decompose: function(workspace) {
- var dummyBlock = workspace.newBlock('logic_boolean_typed');
- dummyBlock.initSvg();
- return dummyBlock;
- },
-
/**
* Add menu option to create getter/setter block for this setter/getter.
* @param {!Array} options List of menu options to add to.
| 2 |
diff --git a/lib/networks.js b/lib/networks.js @@ -157,6 +157,8 @@ function removeNetwork(network) {
unindexNetworkBy(network, Object.keys(networkMaps));
}
+
+
var networkMagic = {
livenet: 0xe3e1f3e8,
testnet: 0xf4e5f3f4,
@@ -171,6 +173,23 @@ var dnsSeeds = [
'seed.deadalnix.me'
];
+
+var TESTNET = {
+ PORT: 18333,
+ NETWORK_MAGIC: networkMagic.testnet,
+ DNS_SEEDS: dnsSeeds,
+ PREFIX: 'bchtest'
+};
+
+
+var REGTEST = {
+ PORT: 18444,
+ NETWORK_MAGIC: networkMagic.regtest,
+ DNS_SEEDS: [],
+ PREFIX: 'bchreg'
+};
+
+
var liveNetwork = {
name: 'livenet',
alias: 'mainnet',
@@ -197,14 +216,14 @@ var testNetwork = {
var regtestNetwork = {
name: 'regtest',
- prefix: 'bchreg',
+ prefix: REGTEST.PREFIX,
pubkeyhash: 0x6f,
privatekey: 0xef,
scripthash: 0xc4,
xpubkey: 0x043587cf,
xprivkey: 0x04358394,
- networkMagic: networkMagic.testnet,
- port: 18444,
+ networkMagic: REGTEST.NETWORK_MAGIC,
+ port: REGTEST.PORT,
dnsSeeds: [],
indexBy: [
'port',
@@ -227,21 +246,6 @@ var regtest = get('regtest');
var testnet = get('testnet');
-var TESTNET = {
- PORT: 18333,
- NETWORK_MAGIC: networkMagic.testnet,
- DNS_SEEDS: dnsSeeds,
- PREFIX: 'bchtest'
-};
-
-
-var REGTEST = {
- PORT: 18444,
- NETWORK_MAGIC: networkMagic.regtest,
- DNS_SEEDS: [],
- PREFIX: 'bchreg'
-};
-
Object.defineProperty(testnet, 'port', {
enumerable: true,
| 5 |
diff --git a/config/creds_united_marbles.json b/config/creds_united_marbles.json "network_id": "asdf",
"peers": [
{
- "grpc_host": "localhost",
+ "grpc_host": "192.168.99.100",
"grpc_port": 7051,
"type": "peer",
"network_id": "asdf",
"id": "peer1"
},
{
- "grpc_host": "localhost",
+ "grpc_host": "192.168.99.100",
"grpc_port": 7056,
"type": "peer",
"network_id": "asdf",
"memberservices": [
{
"id": "asdf-ca",
- "host": "localhost",
+ "host": "192.168.99.100",
"port": 8888,
"type": "ca",
"network_id": "asdf"
],
"orderers": [
{
- "host": "localhost",
+ "host": "192.168.99.100",
"port": 5151,
"type": "orderer",
"network_id": "asdf",
| 13 |
diff --git a/lib/helpers/setDefaultsOnInsert.js b/lib/helpers/setDefaultsOnInsert.js 'use strict';
-
const modifiedPaths = require('./common').modifiedPaths;
+const get = require('./get');
/**
* Applies defaults to update and findOneAndUpdate operations.
@@ -95,7 +95,7 @@ module.exports = function(filter, schema, castedDoc, options) {
if (!isModified(modified, path) && typeof def !== 'undefined') {
castedDoc = castedDoc || {};
castedDoc.$setOnInsert = castedDoc.$setOnInsert || {};
- if (!castedDoc[path]) {
+ if (get(castedDoc, path) == null) {
castedDoc.$setOnInsert[path] = def;
}
updatedValues[path] = def;
| 11 |
diff --git a/Dockerfile b/Dockerfile @@ -69,7 +69,10 @@ COPY ./docker/lnd.conf.sample /relay/.lnd/lnd.conf
RUN git clone https://github.com/stakwork/sphinx-keysend-test/ /sphinx-keysend/
WORKDIR /sphinx-keysend/
-RUN git checkout binary
+
+ARG sphinx_keysend_checkout="binary"
+
+RUN git checkout $sphinx_keysend_checkout
RUN npm install
WORKDIR /relay/
| 0 |
diff --git a/src/encoded/schemas/library.json b/src/encoded/schemas/library.json "XXXenum": [
"gel",
"see document",
- "SPRI beads"
+ "SPRI beads",
+ "BluePippin"
],
"format": "semi-controlled"
},
"type": "string",
"enum": [
"formaldehyde",
+ "EGS and formaldehyde",
"ultraviolet irradiation"
]
},
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -5483,9 +5483,16 @@ var $$IMU_EXPORT$$;
domain.match(/pic[0-9]\.zhimg\.com/)) {
// https://pic1.zhimg.com/74c63994d55e7307d41d39066d53eb72_1200x500.jpg
// https://pic1.zhimg.com/74c63994d55e7307d41d39066d53eb72.jpg
+ // https://pic1.zhimg.com/74c63994d55e7307d41d39066d53eb72_r.jpg
// https://pic1.zhimg.com/80/4ae63ae895f29a18e035d78aad1804d8_hd.png
// https://pic1.zhimg.com/80/4ae63ae895f29a18e035d78aad1804d8.png
- return src.replace(/_[^/._]*(\.[^/.]*)$/, "$1");
+ // https://pic1.zhimg.com/80/4ae63ae895f29a18e035d78aad1804d8_r.png
+ // https://pic3.zhimg.com/90/v2-d9e93a3b23f6fe8ff5bfbb07317dce9f_250x0.jpg
+ // https://pic3.zhimg.com/90/v2-d9e93a3b23f6fe8ff5bfbb07317dce9f_r.jpg
+ // https://pic1.zhimg.com/v2-6349cfe0f38eab94c9fc41a919c526c4_540x450.jpeg -- 540x540
+ // https://pic1.zhimg.com/v2-6349cfe0f38eab94c9fc41a919c526c4_r.jpeg -- 540x540
+ // doesn't work with google's referer
+ return src.replace(/\/((?:v[0-9]*-)?[0-9a-f]+)(?:_[^/._]*)?(\.[^/.]*)$/, "/$1_r$2");
}
// seems to returns 403 if 'referer' header is set:
| 7 |
diff --git a/templates/actor-sheet-gcs.html b/templates/actor-sheet-gcs.html ({{eqtsummary.eqtlbs}} lb; ${{eqtsummary.eqtcost}}) <i class='fas fa-plus addequipmenticon'></i></span>
</div>
<div class="cost header">$</div>
- <div class="weight header"><i class="fas fa-weight"></i></div>
+ <div class="weight header"><i class="fas fa-weight-hanging"></i></div>
<div class="sum_cost header">∑ $</div>
- <div class="sum_weight header">∑ <i class="fas fa-weight"></i></div>
+ <div class="sum_weight header">∑ <i class="fas fa-weight-hanging"></i></div>
<div class="ref header">Ref</div>
<div></div>
"GURPS.otherEquipment"}}
(${{eqtsummary.othercost}}) <i class='fas fa-plus addequipmenticon'></i></span></div>
<div class="cost header">$</div>
- <div class="weight header"><i class="fas fa-weight"></i></div>
+ <div class="weight header"><i class="fas fa-weight-hanging"></i></div>
<div class="sum_cost header">∑ $</div>
- <div class="sum_weight header">∑ <i class="fas fa-weight"></i></div>
+ <div class="sum_weight header">∑ <i class="fas fa-weight-hanging"></i></div>
<div class="ref header">Ref</div>
{{#listeqt data.equipment.other }}
| 3 |
diff --git a/lib/build/fix-shrinkwrap.js b/lib/build/fix-shrinkwrap.js const fs = require('fs');
const path = require('path');
-const colors = require('colors');
const file = path.resolve(__dirname, '../../npm-shrinkwrap.json');
const buildPattern = (protocol) => `"resolved": "${protocol}://registry.npmjs`;
@@ -15,7 +14,7 @@ let replacements = 0;
console.log('> Fixing npm-shrinkwrap.json');
if (!fs.existsSync(file)) {
- console.error(colors.red(`File ${file} does not exist!`));
+ console.error(`File ${file} does not exist!`);
return 1;
}
@@ -28,5 +27,5 @@ if (matches !== null) {
}
replacements
- ? console.log(colors.yellow(` Made ${replacements} replacements.`))
- : console.log(colors.yellow(' Nothing to replace!'));
+ ? console.log(` Made ${replacements} replacements.`)
+ : console.log(' Nothing to replace!');
| 2 |
diff --git a/lib/plugins/input/elasticsearchHttp.js b/lib/plugins/input/elasticsearchHttp.js @@ -16,7 +16,7 @@ function InputElasticsearchHttp (config, eventEmitter) {
}
}
InputElasticsearchHttp.prototype.start = function () {
- consoleLogger.log('loading Elasticsearch HTTP')
+ consoleLogger.log('Loading Elasticsearch HTTP input')
if (this.config) {
throng({
workers: this.config.workers || this.WORKERS || 2,
@@ -105,7 +105,7 @@ InputElasticsearchHttp.prototype.elasticSearchHttpHandler = function (req, res)
var emitMsg = cretaIndexCall(lineObj.index, source)
self.eventEmitter.emit('data.raw', emitMsg, { source: 'input-elasticsearch-http', index: lineObj.index._index })
} else {
- console.log('command not supported yet' + document[offSet])
+ consoleLogger.log('Command not supported yet: ' + document[offSet])
offSet += 1
}
}
@@ -113,7 +113,7 @@ InputElasticsearchHttp.prototype.elasticSearchHttpHandler = function (req, res)
res.end(okResponse)
})
} catch (err) {
- consoleLogger.error('Error in Elasticsearch http: ' + err)
+ consoleLogger.error('Error in Elasticsearch HTTP: ' + err)
}
}
@@ -126,7 +126,7 @@ InputElasticsearchHttp.prototype.startElasticsearchHttp = function (id) {
return
}
exitInProgress = true
- consoleLogger.log('stop Elasticsearch http worker: ' + id + ', pid:' + process.pid + ', terminate reason: ' + reason + ' memory rss: ' + (process.memoryUsage().rss / (1024 * 1024)).toFixed(2) + ' MB')
+ consoleLogger.log('Stop Elasticsearch http worker: ' + id + ', pid:' + process.pid + ', terminate reason: ' + reason + ' memory rss: ' + (process.memoryUsage().rss / (1024 * 1024)).toFixed(2) + ' MB')
setTimeout(process.exit, 250)
}
}
| 14 |
diff --git a/Dockerfile b/Dockerfile # base image
FROM pelias/libpostal_baseimage
-MAINTAINER Pelias
+
+# maintainer information
+LABEL maintainer="[email protected]"
EXPOSE 3100
-LABEL io.openshift.expose-services 3100:http
# Where the app is built and run inside the docker fs
ENV WORK=/opt/pelias
| 4 |
diff --git a/src/lib/util.js b/src/lib/util.js @@ -1524,16 +1524,35 @@ const util = {
* It is can use ".children(util.getListChildren)" to exclude text nodes, but "documentFragment.children" is not supported in IE.
* So check the node type and exclude the text no (current.nodeType !== 1)
*/
- // empty whitelist
- const emptyWhitelistTags = [];
+ const emptyWhitelistTags = [], emptyTags = [], wrongList = [], withoutFormatCells = [];
// wrong position
const wrongTags = this.getListChildNodes(documentFragment, function (current) {
if (current.nodeType !== 1) return false;
+
+ // white list
if (!htmlCheckWhitelistRegExp.test(current.nodeName) && current.childNodes.length === 0) {
emptyWhitelistTags.push(current);
return false;
}
+ // empty tags
+ if ((!this.isTable(current) && !this.isListCell(current)) && (this.isFormatElement(current) || this.isRangeFormatElement(current) || this.isTextStyleElement(current)) && current.childNodes.length === 0 && !this.getParentElement(current, '.katex')) {
+ emptyTags.push(current);
+ return false;
+ }
+
+ // wrong list
+ if (this.isList(current.parentNode) && !this.isList(current) && !this.isListCell(current)) {
+ wrongList.push(current);
+ return false;
+ }
+
+ // table cells
+ if (this.isCell(current) && (!this.isFormatElement(current.firstElementChild) || current.textContent.trim().length === 0)) {
+ withoutFormatCells.push(current);
+ return false;
+ }
+
return current.parentNode !== documentFragment &&
(this.isFormatElement(current) || this.isComponent(current) || this.isList(current)) &&
!this.isRangeFormatElement(current.parentNode) && !this.isListCell(current.parentNode) && !this.getParentElement(current, this.isComponent) &&
@@ -1545,11 +1564,12 @@ const util = {
}
const checkTags = [];
- for (let i = 0, len = wrongTags.length, t, tp; i < len; i++) {
+ for (let i = 0, len = wrongTags.length, t, p; i < len; i++) {
t = wrongTags[i];
- tp = t.parentNode;
- tp.parentNode.insertBefore(t, tp);
- checkTags.push(tp);
+ p = t.parentNode;
+ if (!p || !p.parentNode) continue;
+ p.parentNode.insertBefore(t, p);
+ checkTags.push(p);
}
for (let i = 0, len = checkTags.length, t; i < len; i++) {
@@ -1559,23 +1579,11 @@ const util = {
}
}
- // remove empty tags
- const emptyTags = this.getListChildNodes(documentFragment, function (current) {
- if (current.nodeType !== 1) return false;
- return (!this.isTable(current) && !this.isListCell(current)) && (this.isFormatElement(current) || this.isRangeFormatElement(current) || this.isTextStyleElement(current)) && current.childNodes.length === 0 && !this.getParentElement(current, '.katex');
- }.bind(this));
-
for (let i in emptyTags) {
this.removeItem(emptyTags[i]);
}
- // wrong list
- const wrongList = this.getListChildNodes(documentFragment, function (current) {
- if (current.nodeType !== 1) return false;
- return this.isList(current.parentNode) && !this.isList(current) && !this.isListCell(current);
- }.bind(this));
-
- for (let i = 0, len = wrongList.length, t, tp, children; i < len; i++) {
+ for (let i = 0, len = wrongList.length, t, tp, children, p; i < len; i++) {
t = wrongList[i];
tp = this.createElement('LI');
@@ -1584,19 +1592,14 @@ const util = {
tp.appendChild(children[0]);
}
- t.parentNode.insertBefore(tp, t);
+ p = t.parentNode;
+ if (!p) continue;
+ p.insertBefore(tp, t);
this.removeItem(t);
}
- // table cells without format
- const withoutFormatCells = this.getListChildNodes(documentFragment, function (current) {
- if (current.nodeType !== 1) return false;
- return this.isCell(current) && (!this.isFormatElement(current.firstElementChild) || current.textContent.trim().length === 0);
- }.bind(this));
-
for (let i = 0, len = withoutFormatCells.length, t, f; i < len; i++) {
t = withoutFormatCells[i];
-
f = this.createElement('DIV');
f.innerHTML = t.textContent.trim().length === 0 ? '<br>' : t.innerHTML;
t.innerHTML = f.outerHTML;
| 3 |
diff --git a/Makefile b/Makefile @@ -72,7 +72,7 @@ test: test-sources
.PHONY: test-docs
test-docs:
ifeq ($(MODERN_NODE), true)
- @evaldown --comment-marker unexpected-markdown --require ./bootstrap-unexpected-markdown.js --validate --reporter spec ./documentation
+ @./node_modules/.bin/evaldown --comment-marker unexpected-markdown --require ./bootstrap-unexpected-markdown.js --validate --reporter spec ./documentation
else
echo "testing documentation is not supported on this version of node"
endif
| 4 |
diff --git a/src/muncher/adventure.js b/src/muncher/adventure.js @@ -139,6 +139,7 @@ export async function generateAdventureConfig(full = true, cobalt = true) {
result.index = srdIndex;
const skillEntry = srdIndex.find((i) => i.name === "Using Each Ability");
+ if (skillEntry) {
result.lookups.skills = CONFIG.DDB.abilitySkills.map((skill) => {
return {
id: skill.id,
@@ -148,6 +149,8 @@ export async function generateAdventureConfig(full = true, cobalt = true) {
documentName: skillEntry.name,
};
});
+ }
+
result.lookups.senses = CONFIG.DDB.senses.filter((sense) => srdIndex.some((i) => i.name === sense.name))
.map((sense) => {
const entry = srdIndex.find((i) => i.name === sense.name);
@@ -174,6 +177,7 @@ export async function generateAdventureConfig(full = true, cobalt = true) {
});
const actionEntry = srdIndex.find((i) => i.name === "Actions in Combat");
+ if (actionEntry) {
result.lookups.actions = CONFIG.DDB.basicActions.map((action) => {
return {
id: action.id,
@@ -183,8 +187,10 @@ export async function generateAdventureConfig(full = true, cobalt = true) {
documentName: actionEntry.name,
};
});
+ }
const weaponPropertiesEntry = srdIndex.find((i) => i.name === "Weapons");
+ if (weaponPropertiesEntry) {
result.lookups.weaponproperties = CONFIG.DDB.weaponProperties.map((prop) => {
return {
id: prop.id,
@@ -194,6 +200,7 @@ export async function generateAdventureConfig(full = true, cobalt = true) {
documentName: weaponPropertiesEntry.name,
};
});
+ }
// vehicles
if (!customProxy && cobalt) {
| 9 |
diff --git a/src/client/styles/scss/_navbar.scss b/src/client/styles/scss/_navbar.scss .grw-navbar {
top: -$grw-navbar-height !important;
- &.grw-navbar-for-old-ios {
- top: initial !important;
- }
-
max-height: $grw-navbar-height + $grw-navbar-border-width;
border-top: 0;
border-right: 0;
| 13 |
diff --git a/ethereum.js b/ethereum.js import storage from './storage.js';
+import {loginEndpoint} from './constants.js';
import Web3 from './web3.min.js';
import bip39 from './bip39.js';
import hdkeySpec from './hdkey.js';
@@ -764,6 +765,37 @@ const discordOauthUrl = `https://discord.com/api/oauth2/authorize?client_id=6841
console.warn('invalid mnemonic');
}
});
+ ethEmailForm.addEventListener('submit', async e => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ const res = await fetch(loginEndpoint + `?email=${encodeURIComponent(ethEmailInput.value)}`, {
+ method: 'POST',
+ });
+ if (res.status >= 200 && res.status < 300) {
+ ethEmailForm.classList.add('hidden');
+ ethCodeForm.classList.remove('hidden');
+ } else {
+ console.warn('invalid status code: ' + res.status);
+ }
+ });
+ ethCodeForm.addEventListener('submit', async e => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ const res = await fetch(loginEndpoint + `?email=${encodeURIComponent(ethEmailInput.value)}&code=${encodeURIComponent(ethCodeInput.value)}`, {
+ method: 'POST',
+ });
+ if (res.status >= 200 && res.status < 300) {
+ const j = await res.json();
+ const {mnemonic} = j;
+ await storage.set('loginToken', {mnemonic});
+ ethCodeForm.classList.add('hidden');
+ await _absorbSidechain();
+ } else {
+ console.warn('invalid status code: ' + res.status);
+ }
+ });
ethKeyCancelButton.addEventListener('click', e => {
ethKeyForm.classList.add('hidden');
connectButtons.classList.remove('hidden');
| 0 |
diff --git a/src/types/swiper-options.d.ts b/src/types/swiper-options.d.ts @@ -43,16 +43,6 @@ export interface SwiperOptions {
*/
initialSlide?: number;
- /**
- * Force Swiper container width. Useful to be set in SSR and Test environments for correct Swiper initialization
- */
- width?: number;
-
- /**
- * Force Swiper container height. Useful to be set in SSR and Test environments for correct Swiper initialization
- */
- height?: number;
-
/**
* Could be 'horizontal' or 'vertical' (for vertical slider).
*
@@ -81,7 +71,7 @@ export interface SwiperOptions {
/**
* Swiper width (in px). Parameter allows to force Swiper width.
- * Useful only if you initialize Swiper when it is hidden.
+ * Useful only if you initialize Swiper when it is hidden and in SSR and Test environments for correct Swiper initialization
*
* @note Setting this parameter will make Swiper not responsive
*/
@@ -89,7 +79,7 @@ export interface SwiperOptions {
/**
* Swiper height (in px). Parameter allows to force Swiper height.
- * Useful only if you initialize Swiper when it is hidden.
+ * Useful only if you initialize Swiper when it is hidden and in SSR and Test environments for correct Swiper initialization
*
* @note Setting this parameter will make Swiper not responsive
*/
| 2 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -197,19 +197,6 @@ release-api-keys: &release-api-keys
echo 'export GOOGLE_MAPS_API_KEY=$RELEASE_GOOGLE_MAPS_API_KEY' >> $BASH_ENV
source $BASH_ENV
-set-beta-stage: &set-beta-stage
- run:
- name: Set release stage env-var to beta
- command: |
- echo 'export RELEASE_STAGE=beta' >> $BASH_ENV
- source $BASH_ENV
-set-release-stage: &set-release-stage
- run:
- name: Set release stage env-var to release
- command: |
- echo 'export RELEASE_STAGE=release' >> $BASH_ENV
- source $BASH_ENV
-
bugsnag-upload-sourcemaps-android: &bugsnag-upload-sourcemaps-android
run:
name: Generate js sourcemaps and upload to Bugsnag
@@ -299,6 +286,7 @@ jobs:
environment:
<<: *env-docker
APK_PATH: "./app/build/outputs/apk/beta/release/app-beta-release.apk"
+ RELEASE_STAGE: "beta"
steps:
- <<: *checkout-docker
- <<: *workspace-docker
@@ -332,6 +320,7 @@ jobs:
environment:
<<: *env-docker
APK_PATH: "./app/build/outputs/apk/production/release/app-production-release.apk"
+ RELEASE_STAGE: "release"
steps:
- <<: *checkout-docker
- <<: *workspace-docker
@@ -344,7 +333,6 @@ jobs:
- <<: *android-dependencies
- <<: *save-gradle-cache
- <<: *release-api-keys
- - <<: *set-release-stage
- <<: *generate-env
- run:
name: Build Release binary and upload for distribution
@@ -394,6 +382,7 @@ jobs:
working_directory: /Users/distiller/project/ios
environment:
<<: *env-macos
+ RELEASE_STAGE: "beta"
steps:
- <<: *checkout-macos
- <<: *set-ruby-version-macos
@@ -407,7 +396,6 @@ jobs:
- <<: *get-yarn-cache-macos
- <<: *yarn-dependencies-macos
- <<: *save-yarn-cache-macos
- - <<: *set-beta-stage
- <<: *generate-env-macos
- run:
name: Build Beta binary and upload for distribution
@@ -430,6 +418,7 @@ jobs:
working_directory: /Users/distiller/project/ios
environment:
<<: *env-macos
+ RELEASE_STAGE: "release"
steps:
- <<: *checkout-macos
- <<: *set-ruby-version-macos
@@ -444,7 +433,6 @@ jobs:
- <<: *yarn-dependencies-macos
- <<: *save-yarn-cache-macos
- <<: *release-api-keys
- - <<: *set-release-stage
- <<: *generate-env-macos
- run:
name: Build Release binary and upload for distribution
| 4 |
diff --git a/articles/protocols/saml/saml-idp-generic.md b/articles/protocols/saml/saml-idp-generic.md ---
+title: Auth0 as Identity Provider
description: How to configure Auth0 to serve as an Identity Provider in a SAML federation.
+toc: true
---
# Auth0 as Identity Provider
| 0 |
diff --git a/CHANGES.md b/CHANGES.md - Added `FeatureDetection.supportsBigInt64Array`, `FeatureDetection.supportsBigUint64Array` and `FeatureDetection.supportsBigInt`.
+- Added `ShadowMap.fadingEnabled` for disabling shadows fading when the light source is close to the horizon [#9565](https://github.com/CesiumGS/cesium/pull/9565)
+
##### Fixes :wrench:
- Fixed `processTerrain` in `decodeGoogleEarthEnterprisePacket` to handle a newer terrain packet format that includes water surface meshes after terrain meshes. [#9519](https://github.com/CesiumGS/cesium/pull/9519)
| 3 |
diff --git a/sources/osgUtil/NodeGizmo.js b/sources/osgUtil/NodeGizmo.js @@ -156,6 +156,10 @@ var NodeGizmo = function ( viewer ) {
this._iv = new IntersectionVisitor();
this._iv.setIntersector( this._lsi );
+ // disable mouse camera event when interacting with gizmo
+ this._eventMouse = viewer._eventProxy.StandardMouseKeyboard;
+ this._enableMouseBack = false;
+
this.init();
};
@@ -196,6 +200,10 @@ NodeGizmo.prototype = MACROUTILS.objectInherit( MatrixTransform.prototype, {
this._tmask = tmask;
},
+ isEditing: function () {
+ return this._isEditing;
+ },
+
init: function () {
this.getOrCreateStateSet().setAttributeAndModes( new Depth( Depth.DISABLE ) );
this.getOrCreateStateSet().setAttributeAndModes( new CullFace( CullFace.DISABLE ) );
@@ -701,7 +709,9 @@ NodeGizmo.prototype = MACROUTILS.objectInherit( MatrixTransform.prototype, {
getCanvasCoord( this._downCanvasCoord, e );
if ( !this._hoverNode || !this._attachedNode )
return;
- this._viewer._eventProxy.StandardMouseKeyboard._enable = false;
+
+ this._enableMouseBack = this._eventMouse.getEnable();
+ this._eventMouse.setEnable( false );
this.saveEditMatrices();
var nm = this._hoverNode.getParents()[ 0 ].getNodeMask();
@@ -837,11 +847,12 @@ NodeGizmo.prototype = MACROUTILS.objectInherit( MatrixTransform.prototype, {
},
onMouseUp: function ( e ) {
- var smk = this._viewer._eventProxy.StandardMouseKeyboard;
- if ( smk._enable === false ) {
- smk._enable = true;
- this._viewer._eventProxy.StandardMouseKeyboard.mouseup( e );
+ if ( this._enableMouseBack ) {
+ this._enableMouseBack = false;
+ this._eventMouse.setEnable( true );
+ this._eventMouse.mouseup( e );
}
+
if ( this._debugNode )
this._debugNode.setNodeMask( 0x0 );
| 7 |
diff --git a/package.json b/package.json "name": "find-and-replace",
"main": "./lib/find",
"description": "Find and replace within buffers and across the project.",
- "version": "0.207.5",
+ "version": "0.208.0",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/test/Terminal/Terminal.test.js b/test/Terminal/Terminal.test.js */
import sinon from 'sinon';
-import { expect } from 'chai';
+import chai, { expect } from 'chai';
+import sinonChai from 'sinon-chai';
import proxyquire from 'proxyquire';
import config from '../testconfig';
import uAPI from '../../src';
+chai.use(sinonChai);
+
const TerminalError = uAPI.errors.Terminal;
const TerminalRuntimeError = TerminalError.TerminalRuntimeError;
@@ -144,6 +147,15 @@ const terminalEmulationFailed = proxyquire('../../src/Services/Terminal/Terminal
// Tests
describe('#Terminal', function terminalTest() {
this.timeout(5000);
+
+ beforeEach(() => {
+ sinon.spy(console, 'log');
+ });
+
+ afterEach(() => {
+ console.log.restore();
+ });
+
describe('Exit handlers', () => {
it('should not close session in beforeExit for terminal with NONE state', (done) => {
// Resetting spies
@@ -165,15 +177,17 @@ describe('#Terminal', function terminalTest() {
const uAPITerminal = terminalCloseSessionError({
auth: config,
+ debug: 1,
});
- uAPITerminal.executeCommand('I')
+ return uAPITerminal.executeCommand('I')
.then(() => {
expect(closeSession.callCount).to.equal(0);
process.emit('beforeExit');
setTimeout(() => {
- expect(closeSessionError.callCount).to.equal(1);
- expect(DumbErrorClosingSession.callCount).to.equal(1);
+ expect(closeSessionError).to.have.callCount(1);
+ expect(DumbErrorClosingSession).to.have.callCount(1);
+ expect(console.log).to.have.callCount(4);
done();
}, 100);
});
@@ -191,7 +205,7 @@ describe('#Terminal', function terminalTest() {
expect(closeSession.callCount).to.equal(0);
process.emit('beforeExit');
setTimeout(() => {
- expect(closeSession.callCount).to.equal(1);
+ expect(closeSession).to.have.callCount(1);
done();
}, 100);
});
@@ -206,6 +220,7 @@ describe('#Terminal', function terminalTest() {
const uAPITerminal = terminalOk({
auth: config,
+ debug: 1,
});
return uAPITerminal
@@ -219,6 +234,7 @@ describe('#Terminal', function terminalTest() {
expect(err).to.be.an.instanceof(
TerminalRuntimeError.TerminalIsClosed
);
+ expect(console.log).to.have.callCount(1);
});
});
it('Should return error when executing command on busy terminal', () => {
@@ -252,6 +268,7 @@ describe('#Terminal', function terminalTest() {
const uAPITerminal = terminalOk({
auth: config,
+ debug: 1,
});
return uAPITerminal
@@ -266,6 +283,7 @@ describe('#Terminal', function terminalTest() {
expect(closeSession.callCount).to.equal(1);
expect(executeCommandOk.getCall(0).args[0].sessionToken).to.equal(token);
expect(executeCommandOk.getCall(0).args[0].command).to.equal('I');
+ expect(console.log).to.have.callCount(2);
});
});
it('should concatenate command output with MD', () => {
| 0 |
diff --git a/server/preprocessing/other-scripts/linkedcat.R b/server/preprocessing/other-scripts/linkedcat.R @@ -139,8 +139,8 @@ build_query <- function(query, params, limit){
'tags', 'category', 'bib', 'language_code',
'ocrtext', 'goobi_link')
query <- gsub(" ?<<von>>", "", query)
- aq <- paste0(lapply(q_fields, build_authorfield_query))
- qq <- paste0(lapply(q_fields, build_queryfield_query))
+ aq <- paste0(lapply(q_fields, build_authorfield_query, query=query))
+ qq <- paste0(lapply(q_fields, build_queryfield_query, query=query))
q <- paste(c(aq, qq), collapse = " OR ")
q_params <- list(q = q, rows = limit, fl = r_fields)
@@ -190,12 +190,17 @@ boost_factors <- list(
'keyword_label'=30
)
-build_authorfield_query <- function(field) {
+build_authorfield_query <- function(field, query) {
paste0(field, ':', '"', paste0(gsub("[^a-zA-Z<>]+", "*", query), "*"), '"', add_boost_factor(field))
}
-build_queryfield_query <- function(field) {
- paste0(field, ':', '"', query, '"', add_boost_factor(field))
+build_queryfield_query <- function(field, query) {
+ if (length(unlist(strsplit(query, " "))) > 1) {
+ query <- paste0(unlist(strsplit(query, " ")), collapse = " AND ")
+ query <- paste0(field, ':', '(', query, ')', add_boost_factor(field))
+ } else {
+ query <- paste0(field, ':', '"', query, '"', add_boost_factor(field))
+ }
}
add_boost_factor <- function(field) {
| 7 |
diff --git a/articles/support/index.md b/articles/support/index.md @@ -109,8 +109,6 @@ Using this page, you can:
## Program Features
-The Support Program applies to **production instances** of the Auth0 Platform only. If you require support for non-production instances, then you may request [Demand Services](#demand-services) from Auth0.
-
Your Sales Order will indicate whether you are subscribed to the **Standard** Support Program or the **Enterprise** Support Program.
The following features are provided with **every** support plan:
| 2 |
diff --git a/src/arrows.js b/src/arrows.js 'use strict';
import React from 'react';
-import createReactClass from 'create-react-class';
import classnames from 'classnames';
import Helpers from './mixins/helpers';
-export var PrevArrow = createReactClass({
-
- clickHandler: function (options, e) {
+export class PrevArrow extends React.Component {
+ clickHandler(options, e) {
if (e) { e.preventDefault(); }
this.props.clickHandler(options, e);
- },
- render: function () {
+ }
+ render() {
var prevClasses = {'slick-arrow': true, 'slick-prev': true};
var prevHandler = this.clickHandler.bind(this, {message: 'previous'});
@@ -41,15 +39,15 @@ export var PrevArrow = createReactClass({
return prevArrow;
}
-});
+}
-export var NextArrow = createReactClass({
- clickHandler: function (options, e) {
+export class NextArrow extends React.Component {
+ clickHandler(options, e) {
if (e) { e.preventDefault(); }
this.props.clickHandler(options, e);
- },
- render: function () {
+ }
+ render() {
var nextClasses = {'slick-arrow': true, 'slick-next': true};
var nextHandler = this.clickHandler.bind(this, {message: 'next'});
@@ -79,4 +77,4 @@ export var NextArrow = createReactClass({
return nextArrow;
}
-});
+}
| 2 |
diff --git a/src/lib/contract/method.js b/src/lib/contract/method.js @@ -304,7 +304,6 @@ export default class Method {
since,
eventName: this.name,
sort: 'block_timestamp',
- // blockNumber: 'latest',
filters: options.filters
}
if (options.resourceNode) {
| 5 |
diff --git a/src/containers/catalog/withCatalogItems.js b/src/containers/catalog/withCatalogItems.js import React from "react";
import { Query } from "react-apollo";
-import { Provider } from "mobx-react";
import primaryShopIdQuery from "../common-gql/primaryShopId.gql";
import catalogItemsQuery from "./catalogItems.gql";
@@ -28,9 +27,7 @@ export default (Component) => (
const { catalogItems } = catalogData || {};
return (
- <Provider>
<Component catalogItems={catalogItems.edges} />
- </Provider>
);
}}
</Query>
| 2 |
diff --git a/README.md b/README.md @@ -248,7 +248,7 @@ sudo systemctl enable edumeet
## Load balanced installation
-To deploy this as a load balanced cluster, have a look at [HAproxy](HAproxy.md).
+To deploy this as a load balanced cluster, have a look at [HAproxy](/docs/HAproxy.md).
## Learning management integration
| 3 |
diff --git a/tests/integration/blob.test.js b/tests/integration/blob.test.js @@ -79,12 +79,12 @@ describe('Blob Module', () => {
expect(chainBlob[1].toString(16)).toEqual(blobHex);
}, 30000);
- test('Can create and read a Uint8Array Blob.', async () => {
- const blobUint = new Uint8Array([1, 2, 3]);
+ test('Can create and read a Vector Blob.', async () => {
+ const blobVect = [1, 2, 3];
const result = await dock.blob.new(
{
id: blobId,
- blob: blobUint,
+ blob: blobVect,
author: getHexIdentifierFromDID(dockDID),
},
pair,
@@ -94,7 +94,7 @@ describe('Blob Module', () => {
const chainBlob = await dock.blob.get(blobId);
expect(!!chainBlob).toBe(true);
- expect(Array.from(chainBlob[1])).toEqual(blobUint);
+ expect(Array.from(chainBlob[1])).toEqual(blobVect);
}, 30000);
| 13 |
diff --git a/data.js b/data.js @@ -2330,6 +2330,13 @@ module.exports = [
url: "https://github.com/creationix/domchanger",
source: "https://raw.githubusercontent.com/creationix/domchanger/master/domchanger.js"
},
+ {
+ name: "onfontload",
+ tags: ["font", "load", "webfont", "font-face", "FOUT"],
+ description: "Detects when fonts are loaded.",
+ url: "https://github.com/eduardomb/onfontload",
+ source: "https://raw.githubusercontent.com/eduardomb/onfontload/master/onfontload.js"
+ },
{
name: "msgpack-js",
tags: ["msgpack", "json", "format", "encoder", "decoder", ],
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.