code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/types.d.ts b/types.d.ts @@ -2476,7 +2476,7 @@ declare module "two.js/src/path" {
* @returns {Object}
* @description Given a float `t` from 0 to 1, return a point or assign a passed `obj`'s coordinates to that percentage on this {@link Two.Path}'s curve.
*/
- getPointAt(t: number, obj: any): any;
+ getPointAt(t: number, obj?: Vector): Vector;
/**
* @name Two.Path#plot
* @function
@@ -2502,6 +2502,7 @@ declare module "two.js/src/path" {
private _updateLength;
_lengths: any[];
}
+ import { Vector } from "two.js/src/vector";
import { Anchor } from "two.js/src/anchor";
import { Shape } from "two.js/src/shape";
import { Gradient } from "two.js/src/effects/gradient";
| 7 |
diff --git a/lib/node_modules/@stdlib/_tools/eslint/rules/no-internal-require/lib/main.js b/lib/node_modules/@stdlib/_tools/eslint/rules/no-internal-require/lib/main.js var startsWith = require( '@stdlib/string/starts-with' );
var contains = require( '@stdlib/assert/contains' );
+var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
// MAIN //
@@ -40,6 +41,7 @@ function main( context ) {
if ( node.callee.name === 'require' ) {
requirePath = node.arguments[ 0 ].value;
if (
+ isString( requirePath ) &&
startsWith( requirePath, '@stdlib' ) &&
contains( requirePath, '/lib/' )
) {
| 9 |
diff --git a/src/components/item-table/index.js b/src/components/item-table/index.js @@ -10,6 +10,7 @@ import ArrowIcon from '../../components/data-table/Arrow.js';
import DataTable from '../data-table';
import ValueCell from '../value-cell';
+import TraderPriceCell from '../trader-price-cell';
// import { selectAllItems, fetchItems } from '../../features/items/itemsSlice';
import './index.css';
@@ -61,7 +62,7 @@ const imageCell = ({value}) => {
};
function ItemTable(props) {
- const {maxItems, nameFilter, items, columns} = props;
+ const {maxItems, nameFilter, items, columns, traderPrice} = props;
// const dispatch = useDispatch();
// const itemStatus = useSelector((state) => {
// return state.items.status;
@@ -96,14 +97,27 @@ function ItemTable(props) {
);
let displayColumns = useMemo(
- () => columns.map(({title, key, type}) => {
+ () => {
+ const displayColumns = columns.map(({title, key, type}) => {
return {
Header: t(title),
accessor: key,
Cell: getCell(type),
};
- }),
- [t, columns]
+ });
+
+ if(traderPrice){
+ displayColumns.push({
+ Header: t('Trader buy'),
+ accessor: d => Number(d.instaProfit),
+ Cell: TraderPriceCell,
+ id: 'traderBuyCell',
+ });
+ }
+
+ return displayColumns;
+ },
+ [t, columns, traderPrice]
);
displayColumns = [
| 11 |
diff --git a/source/Overture/io/XHR.js b/source/Overture/io/XHR.js @@ -190,6 +190,10 @@ const XHR = Class({
const io = this.io;
const that = this;
+ if ( io ) {
+ io.fire( 'io:begin' );
+ }
+
xhr.open( method, url, this.makeAsyncRequests );
xhr.withCredentials = !!withCredentials;
responseType = responseType || '';
@@ -210,6 +214,7 @@ const XHR = Class({
xhr.onreadystatechange = function () {
that._xhrStateDidChange( this );
};
+
if ( xhr.upload ) {
// FF will force a preflight on simple cross-origin requests if
// there is an upload handler set. This follows the spec, but the
@@ -222,10 +227,14 @@ const XHR = Class({
}
xhr.addEventListener( 'progress', this, false );
}
- xhr.send( data );
- if ( io ) {
- io.fire( 'io:begin' );
+ try {
+ xhr.send( data );
+ } catch ( error ) {
+ // Some browsers can throw a NetworkError under certain conditions
+ // for example if this is a synchronous request and there's no
+ // network. Treat as an abort.
+ this.abort();
}
return this;
| 9 |
diff --git a/packages/medusa/src/services/order.js b/packages/medusa/src/services/order.js @@ -248,7 +248,8 @@ class OrderService extends BaseService {
query.relations = relations
}
- const [raw, count] = await orderRepo.findAndCount(query)
+ const raw = await orderRepo.findWithRelations(query.relations, query)
+ const count = await orderRepo.count(query)
const orders = raw.map(r => this.decorateTotals_(r, totalsToSelect))
return [orders, count]
| 14 |
diff --git a/test-complete/nodejs-optic-from-triples.js b/test-complete/nodejs-optic-from-triples.js @@ -515,4 +515,25 @@ describe('Node.js Optic from triples test', function(){
}, done);
});
+ it('TEST 13 - dedup off', function(done){
+ const bb = op.prefixer('http://marklogic.com/baseball/players/');
+ const ageCol = op.col('age');
+ const idCol = op.col('id');
+ const nameCol = op.col('name');
+ const teamCol = op.col('team');
+ const output =
+ op.fromTriples([
+ op.pattern(idCol, bb('age'), ageCol),
+ op.pattern(idCol, bb('name'), nameCol),
+ op.pattern(idCol, bb('team'), teamCol)
+ ], null, null, {dedup: 'off'})
+ .orderBy(op.desc(ageCol))
+ db.rows.query(output, { format: 'json', structure: 'object', columnTypes: 'header' })
+ .then(function(output) {
+ //console.log(JSON.stringify(output, null, 2));
+ expect(output.rows.length).to.be.above(8);
+ done();
+ }, done);
+ });
+
});
| 0 |
diff --git a/src/article/InternalArticleSchema.js b/src/article/InternalArticleSchema.js @@ -512,6 +512,7 @@ ContainerTranslation.schema = {
class TextTranslation extends XMLTextElement {}
TextTranslation.schema = {
type: 'text-translation',
+ content: TEXT(...RICH_TEXT_ANNOS),
language: STRING
}
| 11 |
diff --git a/articles/connections/calling-an-external-idp-api.md b/articles/connections/calling-an-external-idp-api.md @@ -177,6 +177,10 @@ Then, you can call your proxy API from your public client using the respective f
- [Implicit Grant](/api-auth/tutorials/implicit-grant) if you are working with a SPA
- [Authorization Code Grant (PKCE)](/api-auth/tutorials/authorization-code-grant-pkce) if you are working with a mobile client
+:::panel Show me how to do it
+If you haven't implemented this before, you might find our [SPA + API](/architecture-scenarios/application/spa-api) article useful. It covers a different scenario but it does explain how to configure Auth0, call an API from a SPA, and implement the API validations. It comes with a sample that uses [Angular 2](https://github.com/auth0-samples/auth0-pnp-exampleco-timesheets/tree/master/timesheets-spa/angular) and [Node.js](https://github.com/auth0-samples/auth0-pnp-exampleco-timesheets/tree/master/timesheets-api/node). We also offer a [Mobile + API](/architecture-scenarios/application/mobile-api) variation (the sample uses [Android](https://github.com/auth0-samples/auth0-pnp-exampleco-timesheets/tree/master/timesheets-mobile/android) and [Node.js](https://github.com/auth0-samples/auth0-pnp-exampleco-timesheets/tree/master/timesheets-api/node)).
+:::
+
### Option 2: Use webtasks
If you don't already have a backend server, and you don't want to set up one, then you can leverage serverless technology, using webtasks.
| 0 |
diff --git a/src/app/api/api.version.js b/src/app/api/api.version.js @@ -3,6 +3,9 @@ import registryUrl from 'registry-url';
import registryAuthToken from 'registry-auth-token';
import request from 'superagent';
import pkg from '../../package.json';
+import {
+ ERR_INTERNAL_SERVER_ERROR
+} from '../constants';
export const getLatestVersion = (req, res) => {
const scope = pkg.name.split('/')[0];
@@ -20,7 +23,9 @@ export const getLatestVersion = (req, res) => {
.set(headers)
.end((err, _res) => {
if (err) {
- res.status(err.statusCode).send({ err: err });
+ res.status(ERR_INTERNAL_SERVER_ERROR).send({
+ msg: `Failed to connect to ${pkgUrl}: code=${err.code}`
+ });
return;
}
| 1 |
diff --git a/README.md b/README.md @@ -150,7 +150,7 @@ Play [`<hello-kitty>` Demo](https://jsfiddle.net/sfd1p2m5)
<button onclick=meow>Hello new kitty!</button>
</figcaption>
- <img alt='Random kitty cat' src={kitty} onclick=pet >
+ <img alt='Random kitty cat' src={url} onclick=pet >
</figure>
</hello-world>
| 3 |
diff --git a/src/module/actor/sheet/vehicle.js b/src/module/actor/sheet/vehicle.js @@ -207,7 +207,7 @@ export class ActorSheetSFRPGVehicle extends ActorSheetSFRPG {
if (rawItemData.type === "weapon" || rawItemData.type === "vehicleAttack") {
return this.processDroppedData(event, data);
}
- else if (rawItemData.type === "starshipExpansionBay") {
+ else if (rawItemData.type === "starshipExpansionBay" || rawItemData.type === "vehicleSystem") {
return this.actor.createEmbeddedEntity("OwnedItem", rawItemData);
}
}
| 0 |
diff --git a/README.md b/README.md @@ -367,6 +367,12 @@ Use ESLint when writing and editing TestCafe tests.
* [ESLint plugin](https://github.com/miherlosev/eslint-plugin-testcafe)
+### Accessibility
+
+Find accessibility issues in your web app.
+
+* [axe-testcafe](https://github.com/helen-dikareva/axe-testcafe)
+
## Thanks to BrowserStack
We are grateful to BrowserStack for providing infrastructure that we use to test code in this repository.
| 0 |
diff --git a/token-metadata/0xDF2C7238198Ad8B389666574f2d8bc411A4b7428/metadata.json b/token-metadata/0xDF2C7238198Ad8B389666574f2d8bc411A4b7428/metadata.json "symbol": "MFT",
"address": "0xDF2C7238198Ad8B389666574f2d8bc411A4b7428",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/util.js b/util.js @@ -624,3 +624,17 @@ export function getVelocityDampingFactor(dampingPer60Hz, timeDiff) {
export function getPlayerPrefix(playerId) {
return playersMapName + '.' + playerId;
}
+
+export function fitCameraToBox(camera, boundingBox, fitOffset = 1) {
+ const center = boundingBox.getCenter(localVector);
+ const size = boundingBox.getSize(localVector2);
+
+ const maxSize = Math.max( size.x, size.y, size.z );
+ const fitHeightDistance = maxSize / ( 2 * Math.atan( Math.PI * camera.fov / 360 ) );
+ const fitWidthDistance = fitHeightDistance / camera.aspect;
+ const distance = fitOffset * Math.max( fitHeightDistance, fitWidthDistance );
+
+ camera.position.z = distance;
+ // camera.lookAt(center);
+ camera.updateMatrixWorld();
+}
\ No newline at end of file
| 0 |
diff --git a/README.md b/README.md @@ -145,6 +145,10 @@ By default you can send your requests to `http://localhost:3000/`. Please note t
- [schedule](#schedule-Cloudwatch) (Cloudwatch)
- [websocket](#websocket-api-gateway-websocket) (API Gateway WebSocket)
+:white_check_mark: supported <br/>
+:x: unsupported <br/>
+:information_source: ignored <br/>
+
### http (API Gateway)
docs: https://serverless.com/framework/docs/providers/aws/events/apigateway/
| 0 |
diff --git a/assets/js/modules/analytics/setup.js b/assets/js/modules/analytics/setup.js @@ -696,6 +696,7 @@ class AnalyticsSetup extends Component {
__( 'IP addresses will be anonymized.', 'google-site-kit' ) :
__( 'IP addresses will not be anonymized.', 'google-site-kit' )
}
+ { ' ' }
<Link
href="https://support.google.com/analytics/answer/2763052"
external
| 1 |
diff --git a/src/app/Sidebar/UserInfo.js b/src/app/Sidebar/UserInfo.js @@ -59,7 +59,7 @@ const UserInfo = ({ intl, authenticated, authenticatedUser, user, ...props }) =>
</div>
</div>
</div>}
- {(user && authenticated && !isSameUser) && <Action
+ {(user && !isSameUser) && <Action
style={{ margin: '5px 0' }}
text={intl.formatMessage({
id: 'transfer',
| 2 |
diff --git a/token-metadata/0xCeD4E93198734dDaFf8492d525Bd258D49eb388E/metadata.json b/token-metadata/0xCeD4E93198734dDaFf8492d525Bd258D49eb388E/metadata.json "symbol": "EDO",
"address": "0xCeD4E93198734dDaFf8492d525Bd258D49eb388E",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/editor/config/config.js b/src/editor/config/config.js @@ -128,7 +128,7 @@ export default {
// Avoid default properties from storable JSON data, like `components` and `styles`.
// With this option enabled your data will be smaller (usefull if need to
// save some storage space)
- avoidDefaults: 0,
+ avoidDefaults: 1,
// (experimental)
// The structure of components is always on the screen but it's not the same
| 12 |
diff --git a/js/readerview.js b/js/readerview.js var webviews = require('webviews.js')
var browserUI = require('browserUI.js')
+var searchbar = require('searchbar/searchbar.js')
var searchbarUtils = require('searchbar/searchbarUtils.js')
var urlParser = require('util/urlParser.js')
@@ -101,7 +102,7 @@ var readerView = {
descriptionBlock: article.article.excerpt,
url: readerView.getReaderURL(article.url),
delete: function (el) {
- db.readingList.where('url').equals(el.getAttribute('data-url')).delete()
+ db.readingList.where('url').equals(article.url).delete()
}
})
@@ -125,6 +126,11 @@ registerCustomBang({
isAction: false,
showSuggestions: function (text, input, event, container) {
readerView.showReadingList(container, text)
+ },
+ fn: function (text) {
+ db.readingList.orderBy('time').reverse().first(function (article) {
+ searchbar.openURL(readerView.getReaderURL(article.url))
+ })
}
})
| 1 |
diff --git a/lib/ferryman/lib/ferryman.js b/lib/ferryman/lib/ferryman.js @@ -531,10 +531,10 @@ class Ferryman {
if (!tokenData) {return false;}
- if(this.nodeSettings.applyTransform &&
- this.nodeSettings.applyTransform === 'before') {
+ if (this.nodeSettings && this.nodeSettings.applyTransform
+ && this.nodeSettings.applyTransform === 'before') {
const cfg = {
- customMapping: this.nodeSettings.transformFunction,
+ customMapping: this.nodeSettings.transformFunction
};
const transformedMsg = transform(message, cfg, false);
payload = transformedMsg;
@@ -696,10 +696,10 @@ class Ferryman {
}
}
- if(this.nodeSettings.applyTransform &&
- this.nodeSettings.applyTransform === 'after') {
+ if (this.nodeSettings && this.nodeSettings.applyTransform
+ && this.nodeSettings.applyTransform === 'after') {
const cfg = {
- customMapping: this.nodeSettings.transformFunction,
+ customMapping: this.nodeSettings.transformFunction
};
const transformedMsg = transform(message, cfg, false);
data = transformedMsg;
| 9 |
diff --git a/assets/js/app/plugins/add-plugins.html b/assets/js/app/plugins/add-plugins.html <div class="panel-body text-center">
<div class="center-block">
<h5 class="capitalize margin-bottom">{{key.split('-').join(" ")}}</h5>
- <img ng-src="images/kong/plugins/{{key}}.png" class="img-responsive" style="margin: auto;height: 72px;width: ">
+ <img ng-src="images/kong/plugins/{{key}}.png"
+ onerror="this.src='images/kong/plugins/kong.svg'"
+ class="img-responsive" style="margin: auto;height: 72px;">
<div class="clearfix"></div>
<br>
<p class="help-block max-2-lines" data-ng-bind-html="value.description || 'no description available...'"></p>
| 9 |
diff --git a/src/javaHelper.js b/src/javaHelper.js 'use strict';
-/* eslint-disable no-extend-native */
+/* eslint no-extend-native:0 func-names:0 */
/* ---------------------------------------------------------------
String functions
For velocity templates to access java functions, to mimick AWS
--------------------------------------------------------------- */
-String.prototype.contains = value => this.indexOf(value) >= 0;
+String.prototype.contains = function (value) {
+ return this.indexOf(value) >= 0;
+};
-String.prototype.replaceAll = (oldValue, newValue) => this.replace(new RegExp(oldValue, 'gm'), newValue);
+String.prototype.replaceAll = function (oldValue, newValue) {
+ return this.replace(new RegExp(oldValue, 'gm'), newValue);
+};
-String.prototype.replaceFirst = (oldValue, newValue) => this.replace(new RegExp(oldValue, 'm'), newValue);
+String.prototype.replaceFirst = function (oldValue, newValue) {
+ return this.replace(new RegExp(oldValue, 'm'), newValue);
+};
-String.prototype.matches = value => this.match(new RegExp(value, 'm'));
+String.prototype.matches = function (value) {
+ return this.match(new RegExp(value, 'm'));
+};
-String.prototype.regionMatches = (ignoreCase, toffset, other, ooffset, len) => {
+String.prototype.regionMatches = function (ignoreCase, toffset, other, ooffset, len) {
/*
* Support different method signatures
*/
- if (typeof ignoreCase === 'number' || (ignoreCase !== true && ignoreCase !== false)) {
+ if (typeof ignoreCase === 'number'
+ || (ignoreCase !== true && ignoreCase !== false)) {
len = ooffset;
ooffset = other;
other = toffset;
@@ -28,7 +37,8 @@ String.prototype.regionMatches = (ignoreCase, toffset, other, ooffset, len) => {
}
// Note: toffset, ooffset, or len might be near -1>>>1.
- if ((ooffset < 0) || (toffset < 0) || (toffset > this.length - len) || (ooffset > other.length - len)) {
+ if ((ooffset < 0) || (toffset < 0) || (toffset > this.length - len) ||
+ (ooffset > other.length - len)) {
return false;
}
@@ -43,11 +53,15 @@ String.prototype.regionMatches = (ignoreCase, toffset, other, ooffset, len) => {
return s1 == s2; // eslint-disable-line eqeqeq
};
-String.prototype.equals = anObject => this.toString() === anObject.toString();
+String.prototype.equals = function (anObject) {
+ return this.toString() === anObject.toString();
+};
+
+String.prototype.equalsIgnoreCase = function (anotherString) {
+ return (anotherString === null) ? false :
+ (this === anotherString || this.toLowerCase() === anotherString.toLowerCase());
+};
-String.prototype.equalsIgnoreCase = anotherString => anotherString === null ?
- false :
- this === anotherString || this.toLowerCase() === anotherString.toLowerCase();
// No particular exports
module.exports = null;
| 14 |
diff --git a/source/views/menu/MenuOptionView.js b/source/views/menu/MenuOptionView.js @@ -23,7 +23,8 @@ const MenuOptionView = Class({
className: function () {
return (
'v-MenuOption' +
- (this.get('content').get('button').get('isLastOfSection')
+ (this.get('content').get('button').get('isLastOfSection') &&
+ this.get('index') < this.getFromPath('list.length') - 1
? ' v-MenuOption--lastOfSection'
: '') +
(this.get('isFocused') ? ' is-focused' : '')
| 8 |
diff --git a/articles/tutorials/generic-oauth2-connection-examples.md b/articles/tutorials/generic-oauth2-connection-examples.md @@ -3,6 +3,10 @@ description: This document covers generic OAuth 1.0/2.0 examples.
toc: true
---
+::: panel-info
+The preferred method for creating custom Social Connections is to use Auth0's [Custom Social Connections Extension](/extensions/custom-social-connections). The information contained below should be used for reference purposes only.
+:::
+
# Generic OAuth 1.0 and 2.0 Examples
Adding [OAuth 1.0](/oauth1) and [OAuth 2.0](/oauth2) providers as Connections allow you to support providers that are not currently built-in to the [Auth0 Management Dashboard](${manage_url}), like [DigitalOcean](#digitalocean), [Tumblr](#tumblr), and more.
| 0 |
diff --git a/packages/insomnia-inso/src/scripts/artifacts.ts b/packages/insomnia-inso/src/scripts/artifacts.ts @@ -11,7 +11,7 @@ const isMac = () => platform === 'darwin';
const isLinux = () => platform === 'linux';
const isWindows = () => platform === 'win32';
-const getName = () => {
+const getArchiveName = () => {
const version = getVersion();
if (isMac()) {
return `inso-macos-${version}.zip`;
@@ -29,7 +29,7 @@ const getName = () => {
};
const startProcess = (cwd: ProcessEnvOptions['cwd']) => {
- const name = getName();
+ const name = getArchiveName();
if (isMac()) {
return spawn('ditto',
@@ -52,7 +52,7 @@ const startProcess = (cwd: ProcessEnvOptions['cwd']) => {
'../binaries',
isWindows() ? '-a -cf' : '-cJf',
name,
- '.',
+ isWindows() ? 'inso.exe' : 'inso',
], {
cwd,
shell: true,
| 4 |
diff --git a/README.md b/README.md @@ -17,15 +17,12 @@ Support this project by becoming a sponsor! [Become a sponsor](https://opencolle
**Gold sponsors**
[![Okta][okta-image]][okta-url]
-[Okta][okta-url]
[![Octo Consulting Group][octoconsulting-image]][octoconsulting-url]
-[Octo Consulting Group][octoconsulting-url]
**Silver sponsors**
[![BizEquity][bizequity-image]][bizequity-url]
-[BizEquity][bizequity-url]
**Bronze sponsors**
| 2 |
diff --git a/apps/poikkipuinen/app.js b/apps/poikkipuinen/app.js @@ -79,7 +79,7 @@ function draw() {
var lines = 13;
var lineh = faceh * 2 / (lines - 2);
for (var i = 1; i < lines; i++) {
- var w = 2;
+ var w = 3;
var y = faceh - lineh * (i - 1);
if (i % 3 == 0) {
@@ -93,7 +93,8 @@ function draw() {
// get hour y position
var hour = date.getHours() % 12; // modulate away the 24h
if (hour == 0) hour = 12; // fix a problem with 0-23 hours
- var hourMin = date.getMinutes() / 60; // move hour line by minutes
+ //var hourMin = date.getMinutes() / 60; // move hour line by minutes
+ var hourMin = Math.floor(date.getMinutes() / 15) / 4; // move hour line by 15-minutes
if (hour == 12) hourMin = 0; // don't do minute moving if 12 (line ends there)
if (i == hour) houry = y - (lineh * hourMin);
}
@@ -104,7 +105,7 @@ function draw() {
lines = 60;
lineh = faceh * 2 / (lines - 1);
for (i = 0; i < lines; i++) {
- var mw = 2;
+ var mw = 3;
var my = faceh - lineh * i;
if (i % 15 == 0 && i != 0) {
| 3 |
diff --git a/src/encoded/schemas/analysis_step_run.json b/src/encoded/schemas/analysis_step_run.json {
+ "title": "Analysis step run",
"description": "Schema for reporting the specific calculation of an analysis_step",
"id": "/profiles/analysis_step_run.json",
"$schema": "http://json-schema.org/draft-04/schema#",
| 0 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -84,10 +84,10 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
[`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
used and updated correctly.
-#### Step 1: Clone the plotly.js repo and install its dependencies
+#### Step 1: Clone the plotly.js repo, download it and install dependencies
```bash
-git clone https://github.com/plotly/plotly.js.git
+git clone --depth 1 [email protected]:<your-GitHub-username>/plotly.js.git
cd plotly.js
npm install
```
| 7 |
diff --git a/util/filter.js b/util/filter.js @@ -38,7 +38,7 @@ function filter(matches, filters) {
included_account_id(m, key, arr) {
return arr.every((k) => {
let passed = false;
- Object.keys(m.heroes).forEach((key) => {
+ Object.keys(m.heroes || {}).forEach((key) => {
if (m.heroes[key].account_id === k) {
passed = true;
}
@@ -49,7 +49,7 @@ function filter(matches, filters) {
excluded_account_id(m, key, arr) {
return arr.every((k) => {
let passed = true;
- Object.keys(m.heroes).forEach((key) => {
+ Object.keys(m.heroes || {}).forEach((key) => {
if (m.heroes[key].account_id === k) {
passed = false;
}
@@ -60,7 +60,7 @@ function filter(matches, filters) {
with_hero_id(m, key, arr) {
return arr.every((k) => {
let passed = false;
- Object.keys(m.heroes).forEach((key) => {
+ Object.keys(m.heroes || {}).forEach((key) => {
if (m.heroes[key].hero_id === k && isRadiant(m.heroes[key]) === isRadiant(m)) {
passed = true;
}
@@ -71,7 +71,7 @@ function filter(matches, filters) {
against_hero_id(m, key, arr) {
return arr.every((k) => {
let passed = false;
- Object.keys(m.heroes).forEach((key) => {
+ Object.keys(m.heroes || {}).forEach((key) => {
if (m.heroes[key].hero_id === k && isRadiant(m.heroes[key]) !== isRadiant(m)) {
passed = true;
}
| 9 |
diff --git a/docs/index.html b/docs/index.html function colorizeEverything() {
colorize.map((id) => {
- monaco.editor.colorizeElement(document.getElementById('code' + id))
+ monaco.editor.colorizeElement(document.getElementById('code' + id), { theme: 'mermaid' })
})
colorize = colorize.filter(colorizeEl => colorizeEl)
}
| 4 |
diff --git a/.github/workflows/release-rc.yml b/.github/workflows/release-rc.yml @@ -76,6 +76,7 @@ jobs:
uses: seebees/aws-codebuild-run-build@support-batch # https://github.com/aws-actions/aws-codebuild-run-build/pull/59
with:
project-name: growi-official-image-builder
+ batch: true
env-vars-for-codebuild: |
TAGS
env:
| 12 |
diff --git a/tests/phpunit/integration/Modules/Analytics_4Test.php b/tests/phpunit/integration/Modules/Analytics_4Test.php @@ -208,8 +208,8 @@ class Analytics_4Test extends TestCase {
$property_id = '1001';
$webdatastream_id = '2001';
$measurement_id = '1A2BCD345E';
- $account_id = '123';
- $container_id = '456';
+ $google_tag_account_id = '123';
+ $google_tag_container_id = '456';
$tag_ids = array( 'GT-123', 'G-456' );
$options = new Options( $this->context );
@@ -225,7 +225,7 @@ class Analytics_4Test extends TestCase {
$http_client = new FakeHttpClient();
$http_client->set_request_handler(
- function( Request $request ) use ( $property_id, $webdatastream_id, $measurement_id, $account_id, $container_id, $tag_ids ) {
+ function( Request $request ) use ( $property_id, $webdatastream_id, $measurement_id, $google_tag_account_id, $google_tag_container_id, $tag_ids ) {
$url = parse_url( $request->getUrl() );
if ( ! in_array( $url['host'], array( 'analyticsadmin.googleapis.com', 'tagmanager.googleapis.com' ), true ) ) {
@@ -262,8 +262,8 @@ class Analytics_4Test extends TestCase {
);
case '/tagmanager/v2/accounts/containers:lookup':
$data = new Container();
- $data->setAccountId( $account_id );
- $data->setContainerId( $container_id );
+ $data->setAccountId( $google_tag_account_id );
+ $data->setContainerId( $google_tag_container_id );
$data->setTagIds( $tag_ids );
return new Response(
200,
@@ -297,8 +297,8 @@ class Analytics_4Test extends TestCase {
'ownerID' => 0,
'useSnippet' => true,
'googleTagID' => 'GT-123',
- 'googleTagAccountID' => $account_id,
- 'googleTagContainerID' => $container_id,
+ 'googleTagAccountID' => $google_tag_account_id,
+ 'googleTagContainerID' => $google_tag_container_id,
),
$options->get( Settings::OPTION )
);
@@ -453,8 +453,8 @@ class Analytics_4Test extends TestCase {
),
'multiple tag IDs - no GT, G or measurement ID - first' => array(
array(
- array( 'WA-012', 'WA-123' ),
- 'WA-012',
+ array( 'AW-012', 'AW-123' ),
+ 'AW-012',
),
),
);
| 7 |
diff --git a/src/components/general/character/Character.jsx b/src/components/general/character/Character.jsx @@ -3,6 +3,7 @@ import React, { useEffect, useState, useRef, useContext } from 'react';
import classnames from 'classnames';
import { defaultPlayerName } from '../../../../ai/lore/lore-model.js';
+import * as sounds from '../../../../sounds.js';
// import cameraManager from '../../../../camera-manager.js';
import {
hp,
@@ -107,6 +108,8 @@ const Stat = ({
export const Character = ({ game, /* wearActions,*/ dioramaCanvasRef }) => {
const { state, setState } = useContext( AppContext );
+ const [ open, setOpen ] = useState(false);
+ const [ characterSelectOpen, setCharacterSelectOpen ] = useState(false);
const sideSize = 400;
@@ -148,6 +151,34 @@ export const Character = ({ game, /* wearActions,*/ dioramaCanvasRef }) => {
}, [ dioramaCanvasRef, state.openedPanel ] );
+
+ useEffect( () => {
+
+ const lastOpen = open;
+ const lastCharacterSelectOpen = characterSelectOpen;
+
+ const newOpen = state.openedPanel === 'CharacterPanel';
+ const newCharacterSelectOpen = state.openedPanel === 'CharacterSelect';
+
+ if (!lastOpen && newOpen) {
+
+ const soundFiles = sounds.getSoundFiles();
+ const audioSpec = soundFiles.menuOpen[Math.floor(Math.random() * soundFiles.menuOpen.length)];
+ sounds.playSound(audioSpec);
+
+ } else if (lastOpen && !newOpen) {
+
+ const soundFiles = sounds.getSoundFiles();
+ const audioSpec = soundFiles.menuClose[Math.floor(Math.random() * soundFiles.menuClose.length)];
+ sounds.playSound(audioSpec);
+
+ }
+
+ setOpen(newOpen);
+ setCharacterSelectOpen(newCharacterSelectOpen);
+
+ }, [ state.openedPanel ] );
+
function onCanvasClick () {
game.playerDiorama.toggleShader();
@@ -169,8 +200,6 @@ export const Character = ({ game, /* wearActions,*/ dioramaCanvasRef }) => {
game.handleDropJsonItemToPlayer(e.dataTransfer.items[0]);
}
- const open = state.openedPanel === 'CharacterPanel';
- const characterSelectOpen = state.openedPanel === 'CharacterSelect';
//
| 0 |
diff --git a/src/background/utils/requests.js b/src/background/utils/requests.js @@ -3,7 +3,7 @@ import { forEachEntry, objectPick } from '#/common/object';
import ua from '#/common/ua';
import cache from './cache';
import { isUserScript, parseMeta } from './script';
-import { extensionRoot, postInitialize } from './init';
+import { extensionRoot } from './init';
import { commands } from './message';
const VM_VERIFY = 'VM-Verify';
@@ -124,6 +124,12 @@ const HeaderInjector = (() => {
},
},
};
+ // Chrome 74+ needs to have any extraHeaders listener at tab load start, https://crbug.com/1074282
+ // We're attaching a no-op in non-blocking mode so it's very lightweight and fast.
+ // TODO: check the version range (via feature detection?) when it's fixed in Chrome
+ if (ua.isChrome && TextEncoder.prototype.encodeInto) {
+ browser.webRequest.onBeforeSendHeaders.addListener(noop, apiFilter, ['extraHeaders']);
+ }
return {
add(reqId, headers) {
// need to set the entry even if it's empty [] so that 'if' check in del() runs only once
@@ -146,13 +152,6 @@ const HeaderInjector = (() => {
};
})();
-// In Chrome 74+ the listener can't be attached during page load https://crbug.com/1074282
-if (ua.isChrome && TextEncoder.prototype.encodeInto) {
- postInitialize.push(() => {
- HeaderInjector.add(0);
- });
-}
-
function xhrCallbackWrapper(req) {
let lastPromise = Promise.resolve();
let contentType;
| 1 |
diff --git a/contribs/gmf/apps/oeedit/less/main.less b/contribs/gmf/apps/oeedit/less/main.less width: 36rem;
max-width: 36rem;
}
+
+.gmf-displayquerywindow .gmf-displayquerywindow-details {
+ overflow-x: auto;
+}
+
+::-webkit-scrollbar {
+ height: @half-app-margin;
+}
| 11 |
diff --git a/fastlane/Fastfile b/fastlane/Fastfile @@ -81,7 +81,8 @@ platform :ios do
upload_symbols_to_crashlytics(
dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH],
- gsp_path: "./ios/GoogleService-Info.plist"
+ gsp_path: "./ios/GoogleService-Info.plist",
+ binary_path: "./ios/Pods/FirebaseCrashlytics/upload-symbols"
)
end
end
| 12 |
diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php @@ -543,6 +543,23 @@ final class Analytics extends Module
);
if ( ! empty( $dimensions ) ) {
+ $invalid_dimensions_error_message = $this->validate_report_dimensions(
+ array_map(
+ function ( $dimension_def ) {
+ return $dimension_def->getName();
+ },
+ $dimensions
+ )
+ );
+
+ if ( isset( $invalid_dimensions_error_message ) ) {
+ return new WP_Error(
+ 'invalid_dimensions',
+ $invalid_dimensions_error_message,
+ array( 'status' => 400 )
+ );
+ }
+
$request_args['dimensions'] = $dimensions;
}
}
@@ -641,6 +658,23 @@ final class Analytics extends Module
);
if ( ! empty( $metrics ) ) {
+ $invalid_metrics_error_message = $this->validate_report_metrics(
+ array_map(
+ function ( $metric_def ) {
+ return $metric_def->getExpression();
+ },
+ $metrics
+ )
+ );
+
+ if ( isset( $invalid_metrics_error_message ) ) {
+ return new WP_Error(
+ 'invalid_metrics',
+ $invalid_metrics_error_message,
+ array( 'status' => 400 )
+ );
+ }
+
$request->setMetrics( $metrics );
}
}
| 4 |
diff --git a/src/app/controllers/Marlin/MarlinController.js b/src/app/controllers/Marlin/MarlinController.js @@ -83,15 +83,15 @@ class MarlinController {
feedOverride = 100;
spindleOverride = 100;
- writeHistory = {
+ history = {
// The write source is one of the following:
// * WRITE_SOURCE_CLIENT
// * WRITE_SOURCE_FEEDER
// * WRITE_SOURCE_SENDER
// * WRITE_SOURCE_QUERY
- source: null,
+ writeSource: null,
- line: ''
+ writeLine: ''
};
// Event Trigger
@@ -218,8 +218,8 @@ class MarlinController {
const line = data.trim();
// Update write history
- this.writeHistory.source = source;
- this.writeHistory.line = line;
+ this.history.writeSource = source;
+ this.history.writeLine = line;
if (!line) {
return data;
@@ -575,35 +575,35 @@ class MarlinController {
});
this.controller.on('pos', (res) => {
- log.silly(`controller.on('pos'): source=${this.writeHistory.source}, line=${JSON.stringify(this.writeHistory.line)}, res=${JSON.stringify(res)}`);
+ log.silly(`controller.on('pos'): source=${this.history.writeSource}, line=${JSON.stringify(this.history.writeLine)}, res=${JSON.stringify(res)}`);
- if (_.includes(['client', 'feeder'], this.writeHistory.source)) {
+ if (_.includes(['client', 'feeder'], this.history.writeSource)) {
this.emit('serialport:read', res.raw);
}
});
this.controller.on('temperature', (res) => {
- log.silly(`controller.on('temperature'): source=${this.writeHistory.source}, line=${JSON.stringify(this.writeHistory.line)}, res=${JSON.stringify(res)}`);
+ log.silly(`controller.on('temperature'): source=${this.history.writeSource}, line=${JSON.stringify(this.history.writeLine)}, res=${JSON.stringify(res)}`);
- if (_.includes(['client', 'feeder'], this.writeHistory.source)) {
+ if (_.includes(['client', 'feeder'], this.history.writeSource)) {
this.emit('serialport:read', res.raw);
}
});
this.controller.on('ok', (res) => {
- log.silly(`controller.on('ok'): source=${this.writeHistory.source}, line=${JSON.stringify(this.writeHistory.line)}, res=${JSON.stringify(res)}`);
+ log.silly(`controller.on('ok'): source=${this.history.writeSource}, line=${JSON.stringify(this.history.writeLine)}, res=${JSON.stringify(res)}`);
if (res) {
- if (_.includes(['client', 'feeder'], this.writeHistory.source)) {
+ if (_.includes(['client', 'feeder'], this.history.writeSource)) {
this.emit('serialport:read', res.raw);
- } else if (!this.writeHistory.source) {
+ } else if (!this.history.writeSource) {
this.emit('serialport:read', res.raw);
- log.error('"writeHistory.source" should not be empty');
+ log.error('"history.writeSource" should not be empty');
}
}
- this.writeHistory.source = null;
- this.writeHistory.line = '';
+ this.history.writeSource = null;
+ this.history.writeLine = '';
// Perform preemptive query to prevent starvation
const now = new Date().getTime();
@@ -720,7 +720,7 @@ class MarlinController {
this.queryTemperature();
{ // The following criteria must be met to issue a query
- const notBusy = !(this.writeHistory.source);
+ const notBusy = !(this.history.writeSource);
const senderIdle = (this.sender.state.sent === this.sender.state.received);
const feederEmpty = (this.feeder.size() === 0);
@@ -1230,7 +1230,7 @@ class MarlinController {
this.feeder.feed(data, context);
{ // The following criteria must be met to trigger the feeder
- const notBusy = !(this.writeHistory.source);
+ const notBusy = !(this.history.writeSource);
const senderIdle = (this.sender.state.sent === this.sender.state.received);
const feederIdle = !(this.feeder.isPending());
| 10 |
diff --git a/src/commands/Core/Ping.js b/src/commands/Core/Ping.js @@ -53,7 +53,7 @@ class Ping extends Command {
* or perform an action based on parameters.
*/
run(message) {
- const hosts = ['content.warframe.com', 'forums.warframe.com', 'wf.christx.tw', 'store.warframe.com'];
+ const hosts = ['content.warframe.com', 'forums.warframe.com', 'trials.wf', 'store.warframe.com', 'nexus-stats.com', 'warframe.market'];
const results = [];
hosts.forEach((host) => {
| 2 |
diff --git a/polyfills/String/prototype/normalize/config.json b/polyfills/String/prototype/normalize/config.json },
"install": {
"module": "unorm",
- "paths": ["lib/unorm.js"]
+ "paths": ["lib/unorm.js"],
+ "postinstall": "update.task.js"
},
"dependencies": [
"Array.prototype.reduceRight"
| 0 |
diff --git a/docs/common/changelog.md b/docs/common/changelog.md @@ -9,6 +9,10 @@ this will be evened out from v24
- Upgrade rnkiwimobile to version `0.0.45`
+### v34
+
+- Added library to handle decimal prices
+
### v31
- Upgraded react-native and other native dependencies
| 0 |
diff --git a/test/jasmine/tests/range_slider_test.js b/test/jasmine/tests/range_slider_test.js @@ -461,8 +461,7 @@ describe('the range slider', function() {
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444',
- _input: layoutIn.xaxis.rangeslider,
- fixedyrange: true
+ _input: layoutIn.xaxis.rangeslider
};
_supply(layoutIn, layoutOut, 'xaxis');
@@ -479,8 +478,7 @@ describe('the range slider', function() {
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444',
- _input: layoutIn.xaxis.rangeslider,
- fixedyrange: true
+ _input: layoutIn.xaxis.rangeslider
};
_supply(layoutIn, layoutOut, 'xaxis');
@@ -501,8 +499,7 @@ describe('the range slider', function() {
thickness: 'invalid',
bgcolor: 42,
bordercolor: 42,
- borderwidth: 'superfat',
- fixedyrange: null
+ borderwidth: 'superfat'
}}},
layoutOut = { xaxis: {} },
expected = {
@@ -512,8 +509,7 @@ describe('the range slider', function() {
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444',
- _input: layoutIn.xaxis.rangeslider,
- fixedyrange: true
+ _input: layoutIn.xaxis.rangeslider
};
_supply(layoutIn, layoutOut, 'xaxis');
@@ -530,8 +526,7 @@ describe('the range slider', function() {
bgcolor: '#fff',
borderwidth: 0,
bordercolor: '#444',
- _input: layoutIn.xaxis.rangeslider,
- fixedyrange: true
+ _input: layoutIn.xaxis.rangeslider
};
_supply(layoutIn, layoutOut, 'xaxis');
| 1 |
diff --git a/scripts/bundle.config.js b/scripts/bundle.config.js @@ -62,7 +62,9 @@ const config = {
loader: 'babel-loader',
include: [/src/, /bundle/, /esm/],
options: {
- presets: [['@babel/preset-env', {forceAllTransforms: true}]],
+ presets: [['@babel/preset-env', {
+ targets: ["supports webgl", "not dead"]
+ }]],
// all of the helpers will reference the module @babel/runtime to avoid duplication
// across the compiled output.
plugins: [
| 3 |
diff --git a/README.md b/README.md @@ -63,11 +63,11 @@ Chocolatey (Windows):
[`choco install streamlink-twitch-gui`][Package-Chocolatey]
AUR (Arch Linux):
-[`yaourt -S streamlink-twitch-gui`][Package-AUR]
-[`yaourt -S streamlink-twitch-gui-git`][Package-AUR-git]
+[`pacaur -S streamlink-twitch-gui`][Package-AUR]
+[`pacaur -S streamlink-twitch-gui-git`][Package-AUR-git]
-Homebrew Cask (OS X):
-[`brew cask install streamlink-twitch-gui`][Package-Homebrew-cask]
+Homebrew Cask (MacOS):
+[`brew cask install streamlink-twitch-gui`][Package-Homebrew-Cask]
#### Development version
@@ -119,5 +119,5 @@ Every contribution is welcome! Please read [CONTRIBUTING.md][Contributing] first
[Package-Chocolatey]: https://chocolatey.org/packages/streamlink-twitch-gui "Chocolatey package"
[Package-AUR]: https://aur.archlinux.org/packages/streamlink-twitch-gui "AUR stable package"
[Package-AUR-git]: https://aur.archlinux.org/packages/streamlink-twitch-gui-git "AUR git package"
- [Package-Homebrew-cask]: https://caskroom.github.io/
+ [Package-Homebrew-Cask]: https://caskroom.github.io/
[Application-rename]: https://github.com/streamlink/streamlink-twitch-gui/issues/331 "The future of Livestreamer Twitch GUI"
| 7 |
diff --git a/src/components/views/DamageControl/index.js b/src/components/views/DamageControl/index.js @@ -341,7 +341,16 @@ class DamageControl extends Component {
</Col>
<Col sm={6}>
<h3 className="text-center">
- {system && system.damage.damageReportText
+ {(() => {
+ system &&
+ console.log(
+ system.damage,
+ system.damage.damageReportText,
+ system.damage.currentStep
+ );
+ })()}
+ {system &&
+ (system.damage.damageReportText || system.damage.report)
? system.damage.currentStep + 1
: 0}{" "}
/ {steps.length}
| 1 |
diff --git a/package.json b/package.json "babel-loader": "^8.0.6",
"babel-plugin-transform-object-assign": "*",
"babel-preset-es2015": "^6.9.0",
- "bootstrap-loader": "^3.0.4",
"bootstrap-sass": "^3.3.6",
"clean-webpack-plugin": "^1.0.1",
"copy-webpack-plugin": "^3.0.1",
"mini-css-extract-plugin": "^0.8.0",
"node-sass": "^4.13.0",
"php-loader": "^0.2.0",
+ "postcss-loader": "^3.0.0",
"resolve": "^1.7.1",
"sass": "^1.23.7",
"sass-loader": "^8.0.0",
| 2 |
diff --git a/src/MeshBVH.js b/src/MeshBVH.js @@ -79,9 +79,10 @@ export default class MeshBVH {
rangeBoundaries.add( group.start + group.count );
}
+
// note that if you don't pass in a comparator, it sorts them lexicographically as strings :-(
const sortedBoundaries = Array.from( rangeBoundaries.values() ).sort( ( a, b ) => a - b );
- for ( let i = 0; i < sortedBoundaries.length - 2; i ++ ) {
+ for ( let i = 0; i < sortedBoundaries.length - 1; i ++ ) {
const start = sortedBoundaries[ i ], end = sortedBoundaries[ i + 1 ];
ranges.push( { offset: ( start / 3 ), count: ( end - start ) / 3 } );
| 1 |
diff --git a/avatar-screenshotter.js b/avatar-screenshotter.js @@ -20,6 +20,8 @@ export const screenshotAvatarUrl = async ({
start_url,
width = 300,
height = 300,
+ canvas = null,
+ emotion = '',
}) => {
const app = await metaversefile.createAppAsync({
start_url,
@@ -28,12 +30,16 @@ export const screenshotAvatarUrl = async ({
app,
width,
height,
+ canvas,
+ emotion,
});
};
export const screenshotAvatarApp = async ({
app,
width = 300,
height = 300,
+ canvas = null,
+ emotion = '',
}) => {
await Avatar.waitForLoad();
@@ -66,10 +72,13 @@ export const screenshotAvatarApp = async ({
player.avatar.inputs.hmd.position.y = player.avatar.height;
player.avatar.inputs.hmd.quaternion.setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI);
player.avatar.inputs.hmd.updateMatrixWorld();
+ if (emotion) {
+ player.clearActions();
player.addAction({
type: 'facepose',
- emotion: 'angry',
+ emotion,
});
+ }
};
const _preAnimate = () => {
for (let i = 0; i < FPS*2; i++) {
@@ -88,9 +97,14 @@ export const screenshotAvatarApp = async ({
};
// rendering
- const writeCanvas = document.createElement('canvas');
+ let writeCanvas;
+ if (canvas) {
+ writeCanvas = canvas;
+ } else {
+ writeCanvas = document.createElement('canvas');
writeCanvas.width = width;
writeCanvas.height = height;
+ }
const localLights = _makeLights();
const objects = localLights.concat([
| 0 |
diff --git a/source/Overture/application/GlobalKeyboardShortcuts.js b/source/Overture/application/GlobalKeyboardShortcuts.js @@ -43,6 +43,10 @@ var allowedInputs = {
submit: 1
};
+var DEFAULT_IN_INPUT = 0;
+var ACTIVE_IN_INPUT = 1;
+var DISABLE_IN_INPUT = 2;
+
var handleOnDown = {};
/**
@@ -109,24 +113,32 @@ var GlobalKeyboardShortcuts = NS.Class({
Parameters:
key - {String} The key to trigger the callback on. Modifier keys
- (alt, ctrl, meta, shift) should be prefixed in alphabetical
- order and with a hypen after each one. Letters should be
- lower case. e.g. `ctrl-f`.
+ (alt, ctrl, meta, shift) should be prefixed in
+ alphabetical order and with a hypen after each one.
+ Letters should be lower case. e.g. `ctrl-f`.
The special modifier "cmd-" may be used, which will map
to "meta-" on a Mac (the command key) and "Ctrl-"
elsewhere.
object - {Object} The object to trigger the callback on.
method - {String} The name of the method to trigger.
+ ifInput - {Number} Determines whether the shortcut is active when
+ focused inside an <input> or equivalent. Defaults to
+ active if and only if meta or ctrl are part of the
+ shortcut. The value must be one of:
+
+ * DEFAULT_IN_INPUT (Use the default)
+ * ACTIVE_IN_INPUT (Active when input is focused)
+ * DISABLE_IN_INPUT (Not active when input is focused)
Returns:
{O.GlobalKeyboardShortcuts} Returns self.
*/
- register: function ( key, object, method ) {
+ register: function ( key, object, method, ifInput ) {
key = key.replace( 'cmd-', isMac ? 'meta-' : 'ctrl-' );
var shortcuts = this._shortcuts;
( shortcuts[ key ] || ( shortcuts[ key ] = [] ) )
- .push([ object, method ]);
+ .push([ object, method, ifInput || DEFAULT_IN_INPUT ]);
return this;
},
@@ -193,17 +205,16 @@ var GlobalKeyboardShortcuts = NS.Class({
event - {DOMEvent} The keydown/keypress event.
*/
trigger: function ( event ) {
- var target = event.target,
- nodeName = target.nodeName,
- isSpecialKey = event.ctrlKey || event.metaKey,
- handler, key;
- if ( !isSpecialKey && ( nodeName === 'TEXTAREA' ||
- ( nodeName === 'SELECT' ) ||
+ var target = event.target;
+ var nodeName = target.nodeName;
+ var isSpecialKey = event.ctrlKey || event.metaKey;
+ var inputIsFocused = (
+ nodeName === 'TEXTAREA' ||
+ nodeName === 'SELECT' ||
( nodeName === 'INPUT' && !allowedInputs[ target.type ] ) ||
( event.targetView instanceof NS.RichTextView )
- ) ) {
- return;
- }
+ );
+ var handler, key, ifInput;
key = NS.DOMEvent.lookupKey( event );
if ( event.type === 'keydown' ) {
handleOnDown[ key ] = true;
@@ -212,6 +223,11 @@ var GlobalKeyboardShortcuts = NS.Class({
}
handler = this.getHandlerForKey( key );
if ( handler ) {
+ ifInput = handler[2];
+ if ( inputIsFocused && ifInput !== ACTIVE_IN_INPUT &&
+ ( !isSpecialKey || ifInput === DISABLE_IN_INPUT ) ) {
+ return;
+ }
handler[0][ handler[1] ]( event );
if ( !event.doDefault ) {
event.preventDefault();
@@ -220,6 +236,10 @@ var GlobalKeyboardShortcuts = NS.Class({
}.on( 'keydown', 'keypress' )
});
+GlobalKeyboardShortcuts.DEFAULT_IN_INPUT = DEFAULT_IN_INPUT;
+GlobalKeyboardShortcuts.ACTIVE_IN_INPUT = ACTIVE_IN_INPUT;
+GlobalKeyboardShortcuts.DISABLE_IN_INPUT = DISABLE_IN_INPUT;
+
NS.GlobalKeyboardShortcuts = GlobalKeyboardShortcuts;
}( O ) );
| 0 |
diff --git a/truffle.js b/truffle.js @@ -2,7 +2,7 @@ module.exports = {
networks: {
development: {
host: "localhost",
- port: 9545,
+ port: 8545,
gas: 4700000,
gasPrice: 40000000000,
network_id: "*" // Match any network id
| 12 |
diff --git a/app/styles/components/_page-header.scss b/app/styles/components/_page-header.scss @@ -12,9 +12,6 @@ $nav-spacing: 4px;
NAV {
font-size: .9em;
width: 100%;
- // border-collapse: collapse;
- // border-spacing: 0px;
- // display: table;
box-sizing: border-box;
display: -ms-flexbox;
display: -webkit-box;
@@ -37,9 +34,7 @@ $nav-spacing: 4px;
> ul {
background-color: $header;
border-radius: 3px 0 0 3px;
- // display: table-cell;
padding: 0;
- // width: 100%;
vertical-align: middle;
&.nav-main {
@@ -82,7 +77,6 @@ $nav-spacing: 4px;
}
.nav-logo {
- // display:table-cell;
height: 48px;
background-size: auto 32px;
background-position: left center;
@@ -94,7 +88,6 @@ $nav-spacing: 4px;
.nav-user {
- // display:table-cell;
border-radius: 0 3px 3px 0;
margin: 0;
@@ -138,7 +131,6 @@ $nav-spacing: 4px;
}
&:hover {
- background-color: mix($user-btn, black, 80%);
color: white;
text-decoration: none;
@@ -288,12 +280,26 @@ $nav-spacing: 4px;
.global {
border-bottom: 1px solid $accent-border;
background-color: $accent-one;
+
+ > ul.list-unstyled {
+ &:first-child {
+ border-right: 1px solid $table-border-color;
+
+ }
+
+ > LI:hover {
+ background-color: $secondary;
+ A, .state {
+ color: white;
+ }
+ }
+
+ }
}
.global {
grid-column-start: 1;
grid-row-start: 1;
- line-height: 40px;
}
.search {
@@ -313,24 +319,15 @@ $nav-spacing: 4px;
padding: 5px 10px;
@include hand;
- &.project {
- A {
- display: block;
- padding: 5px 10px;
- }
- }
-
- &.project:hover {
+ &.project:hover,
+ &.cluster:hover {
background-color: $secondary;
A, .state {
color: white;
}
}
- .top {
- }
-
&:not(:first-child) {
border-top: 1px solid $accent-border;
}
@@ -365,14 +362,7 @@ $nav-spacing: 4px;
.global {
A {
display: block;
- padding: 5px 10px;
- background-color: $secondary;
- }
- }
- .global LI:hover, LI.hover {
-
- A, .state {
- color: white;
+ padding: 10px;
}
}
}
| 1 |
diff --git a/lib/assets/javascripts/dashboard/data/api-key-model.js b/lib/assets/javascripts/dashboard/data/api-key-model.js @@ -36,7 +36,7 @@ module.exports = Backbone.Model.extend({
},
parse: function (data) {
- const { grants, name, ...attrs } = data;
+ const { grants, ...attrs } = data;
const apis = this._parseApiGrants(grants);
const tables = this._parseTableGrants(grants);
@@ -44,13 +44,12 @@ module.exports = Backbone.Model.extend({
...attrs,
apis,
tables,
- id: name,
- name: decodeURIComponent(name)
+ id: attrs.name
};
},
toJSON: function () {
- const { apis, name, ...attrs } = this.attributes;
+ const { apis, ...attrs } = this.attributes;
// TODO: Refactor
const grants = [
@@ -58,7 +57,7 @@ module.exports = Backbone.Model.extend({
{ type: GRANT_TYPES.DATABASE, tables: this.getTablesGrants() }
];
- return { ...attrs, name: encodeURIComponent(name), grants };
+ return { ...attrs, grants };
},
getApiGrants: function () {
| 2 |
diff --git a/src/common/mining-pools/miner/Miner-Pool-Management.js b/src/common/mining-pools/miner/Miner-Pool-Management.js @@ -56,11 +56,11 @@ class MinerProtocol {
}
if (poolURL !== undefined)
- await this.minerPoolSettings.setPoolURL(poolURL);
+ await this.minerPoolSettings.setPoolURL(poolURL, skipSaving);
if (this.minerPoolSettings.poolURL !== undefined && this.minerPoolSettings.poolURL !== '') {
this._minerPoolStarted = false;
- return await this.setMinerPoolStarted(true, true, skipSaving);
+ return await this.setMinerPoolStarted(true, forceStartMinerPool, skipSaving);
}
else {
console.error("Couldn't start MinerPool");
| 13 |
diff --git a/src/components/Pagination/Pagination.js b/src/components/Pagination/Pagination.js @@ -310,6 +310,7 @@ export default class Pagination extends Component {
className={backButtonClasses}
onClick={this.decrementPage}
disabled={this.props.disabled || statePage === 1}
+ type="button"
>
<Icon
className="wfp--pagination__button-icon"
@@ -335,6 +336,7 @@ export default class Pagination extends Component {
disabled={
this.props.disabled || statePage === totalPages || isLastPage
}
+ type="button"
>
<Icon
className="wfp--pagination__button-icon"
| 1 |
diff --git a/docs/en/platform/turtlebot3/contact_us.md b/docs/en/platform/turtlebot3/contact_us.md @@ -59,11 +59,11 @@ There are many answers to this question, but we strive to develop and apply prod
**ROBOTIS Korea Office**
-* Address: #1505, Gasan Digital-1ro 145 (Ace High End Tower 3), Geumchungu, Seoul, South Korea
+* Address: 37, Magok Jungang 5-ro 1-gil, Gangseo-gu, Seoul, Korea 07594
* Tel: +82-70-8671-2609
* Fax: +82-70-8230-1336
* Web: [http://www.robotis.com/](http://www.robotis.com/)
-* E-Mail: [email protected]
+* E-Mail: [email protected]
## [About OST (Open Source Team)](#about-ost-open-source-team)
| 14 |
diff --git a/articles/connections/database/password-change.md b/articles/connections/database/password-change.md @@ -67,7 +67,7 @@ Users will not receive notification that their password has been manually change
```har
{
"method": "PATCH",
- "url": "https://${account.namespace}/api/v2/users/{id}",
+ "url": "https://${account.namespace}/api/v2/users/USER_ID",
"headers": [{
"name": "Content-Type",
"value": "application/json"
| 2 |
diff --git a/userscript.user.js b/userscript.user.js @@ -20357,6 +20357,13 @@ var $$IMU_EXPORT$$;
options.do_request && options.cb) {
newsrc = (function() {
var query_ig = function(url, cb) {
+ // Normalize the URL to reduce duplicate cache checks
+ url = url
+ .replace(/[?#].*/, "")
+ .replace(/([^/])$/, "$1/")
+ .replace(/^http:/, "https:")
+ .replace(/(:\/\/.*?)\/\/+/g, "$1/");
+
var cache_key = "instagram_sharedData_query:" + url;
api_cache.fetch(cache_key, cb, function (done) {
options.do_request({
@@ -20654,6 +20661,8 @@ var $$IMU_EXPORT$$;
if (current.tagName === "HEADER") {
var sharedData = null;
+ // Still keep this code because this way we can know it exists?
+ if (true) {
var scripts = document.getElementsByTagName("script");
for (var i = 0; i < scripts.length; i++) {
if (scripts[i].innerText.match(/^ *window\._sharedData/)) {
@@ -20667,6 +20676,13 @@ var $$IMU_EXPORT$$;
} else {
sharedData = JSON.parse(sharedData);
}
+ }
+
+ query_ig(options.host_url, function (sharedData) {
+ if (!sharedData) {
+ console_error("Shared data not found");
+ return;
+ }
uid_to_profile(uid_from_sharedData(sharedData), function (profile) {
if (!profile) {
@@ -20676,6 +20692,7 @@ var $$IMU_EXPORT$$;
options.cb(profile_to_url(profile));
});
+ });
return {
waiting: true
| 7 |
diff --git a/packages/nova-embedly/lib/server/get_embedly_data.js b/packages/nova-embedly/lib/server/get_embedly_data.js @@ -27,7 +27,7 @@ function getEmbedlyData(url) {
});
if (!!result.data.images && !!result.data.images.length) // there may not always be an image
- result.data.thumbnailUrl = result.data.images[0].url // add thumbnailUrl as its own property and leave "http" in, Facebook scraper won't accept it as valid otherwise
+ result.data.thumbnailUrl = result.data.images[0].url.replace("http:","") // add thumbnailUrl as its own property
if (result.data.authors && result.data.authors.length > 0) {
result.data.sourceName = result.data.authors[0].name;
| 13 |
diff --git a/modules/keyboard.js b/modules/keyboard.js @@ -255,9 +255,12 @@ Keyboard.DEFAULTS = {
default:
value = 'ordered';
}
- this.quill.scroll.deleteAt(range.index - length, length);
+ this.quill.insertText(range.index, ' ', Quill.sources.SILENT);
+ this.quill.history.cutoff();
+ this.quill.scroll.deleteAt(range.index - length, length + 1);
this.quill.formatLine(range.index - length, 1, 'list', value, Quill.sources.USER);
this.quill.setSelection(range.index - length, Quill.sources.SILENT);
+ this.quill.history.cutoff();
}
},
'code exit': {
| 11 |
diff --git a/definitions/npm/react-router_v4.x.x/flow_v0.38.x-/react-router_v4.x.x.js b/definitions/npm/react-router_v4.x.x/flow_v0.38.x-/react-router_v4.x.x.js @@ -115,7 +115,7 @@ declare module 'react-router' {
declare type FunctionComponent<P> = (props: P) => ?React$Element<any>;
declare type ClassComponent<D, P, S> = Class<React$Component<D, P, S>>;
- declare export function withRouter<P, S>(Component: ClassComponent<void, P, S> | FunctionComponent<P>): ClassComponent<void, $Diff<P, ContextRouter>, S>;
+ declare export function withRouter<D, P, S>(Component: ClassComponent<D, P, S> | FunctionComponent<P>): ClassComponent<D, $Diff<P, ContextRouter>, S>;
declare type MatchPathOptions = {
exact?: boolean,
| 11 |
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js @@ -449,7 +449,7 @@ RED.debug = (function() {
var metaRow = $('<div class="debug-message-meta"></div>').appendTo(msg);
$('<span class="debug-message-date">'+ getTimestamp()+'</span>').appendTo(metaRow);
if (sourceNode) {
- $('<a>',{href:"#",class:"debug-message-name"}).html('node: '+(sourceNode.name||sourceNode.id))
+ $('<a>',{href:"#",class:"debug-message-name"}).text('node: '+(sourceNode.name||sourceNode.id))
.appendTo(metaRow)
.click(function(evt) {
evt.preventDefault();
| 9 |
diff --git a/test/acceptance/dataviews/overviews-test.js b/test/acceptance/dataviews/overviews-test.js @@ -678,7 +678,7 @@ describe('dataviews using tables with overviews', function() {
function createMapConfig(options) {
return {
- version: '1.5.0',
+ version: '1.8.0',
analyses: [
{ id: 'data-source',
type: 'source',
@@ -733,7 +733,7 @@ describe('dataviews using tables with overviews', function() {
};
var missingColumnMapConfig = createMapConfig(options);
- var testClient = new TestClient(missingCOlumnMapConfig);
+ var testClient = new TestClient(missingColumnMapConfig);
testClient.getDataview('test_invalid_aggregation', params, function (err, dataview) {
if (err) {
return done(err);
| 4 |
diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs <%_ if (!skipClient) { _%>
<sonar.testExecutionReportPaths>${project.testresult.directory}/jest/TESTS-results-sonar.xml</sonar.testExecutionReportPaths>
<%_ } _%>
+ <%_ if (applicationType !== 'microservice') { _%>
<sonar.typescript.lcov.reportPaths>${project.testresult.directory}/lcov.info</sonar.typescript.lcov.reportPaths>
+ <%_ } _%>
<sonar.sources>${project.basedir}/<%= MAIN_DIR %></sonar.sources>
<sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
<sonar.tests>${project.basedir}/<%= TEST_DIR %></sonar.tests>
| 2 |
diff --git a/src/server/service/config-loader.js b/src/server/service/config-loader.js @@ -29,7 +29,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
type: TYPES.STRING,
default: 'aws',
},
- IS_FILE_UPLOAD_ENV_PRIORITIZED: {
+ FILE_UPLOAD_PRIORITIZE_ENV_VAR: {
ns: 'crowi',
key: 'app:isFileUploadEnvPrioritized',
type: TYPES.BOOLEAN,
| 10 |
diff --git a/biz/webui/cgi-bin/composer.js b/biz/webui/cgi-bin/composer.js @@ -19,7 +19,7 @@ module.exports = function(req, res) {
var _url = req.body.url;
if (_url && typeof _url == 'string') {
- _url = _url.replace(/#.*$/, '');
+ _url = util.encodeNonAsciiChar(_url.replace(/#.*$/, ''));
var options = url.parse(util.setProtocol(_url));
var rawHeaderNames = {};
var headers = parseHeaders(req.body.headers, rawHeaderNames);
| 1 |
diff --git a/common/lib/util/utils.js b/common/lib/util/utils.js @@ -13,12 +13,14 @@ var Utils = (function() {
* props: an object whose enumerable properties are
* added, by reference only
*/
- Utils.mixin = function(target, src) {
- if(src) {
- var hasOwnProperty = src.hasOwnProperty;
- for(var key in src) {
- if(!hasOwnProperty || hasOwnProperty.call(src, key)) {
- target[key] = src[key];
+ Utils.mixin = function(target) {
+ for(var i = 1; i < arguments.length; i++) {
+ var source = arguments[i];
+ if(!source) { break; }
+ var hasOwnProperty = source.hasOwnProperty;
+ for(var key in source) {
+ if(!hasOwnProperty || hasOwnProperty.call(source, key)) {
+ target[key] = source[key];
}
}
}
| 11 |
diff --git a/public/viewjs/components/barcodescanner.js b/public/viewjs/components/barcodescanner.js @@ -101,7 +101,8 @@ Grocy.Components.BarcodeScanner.StartScanning = function()
"ean_reader",
"ean_8_reader",
"code_128_reader",
- "datamatrix"
+ "datamatrix",
+ "code_39_reader"
],
debug: {
showCanvas: Grocy.UserSettings.quagga2_debug,
@@ -174,7 +175,8 @@ Quagga.onDetected(function(result)
}
});
- if (Grocy.Components.BarcodeScanner.DecodedCodesErrorCount / Grocy.Components.BarcodeScanner.DecodedCodesCount < 0.15)
+ if ((Grocy.Components.BarcodeScanner.DecodedCodesErrorCount / Grocy.Components.BarcodeScanner.DecodedCodesCount < 0.15) ||
+ (Grocy.Components.BarcodeScanner.DecodedCodesErrorCount == 0 && Grocy.Components.BarcodeScanner.DecodedCodesCount == 0 && result.codeResult.code.length != 0))
{
Grocy.Components.BarcodeScanner.StopScanning();
$(document).trigger("Grocy.BarcodeScanned", [result.codeResult.code, Grocy.Components.BarcodeScanner.CurrentTarget]);
| 0 |
diff --git a/src/liff/pages/Article.svelte b/src/liff/pages/Article.svelte import { onMount } from 'svelte';
import { t } from 'ttag';
import { gql } from '../lib';
+ import { gaTitle } from 'src/lib/sharedUtils';
import FullpagePrompt from '../components/FullpagePrompt.svelte';
import Header from '../components/Header.svelte';
import ArticleCard from '../components/ArticleCard.svelte';
createdAt = new Date(articleData.createdAt);
// Send event to Google Analytics
+ gtag('set', { page_title: gaTitle(articleData.text) });
gtag('event', 'ViewArticle', {
event_category: 'LIFF',
event_label: articleId,
| 12 |
diff --git a/token-metadata/0x5580ab97F226C324c671746a1787524AEF42E415/metadata.json b/token-metadata/0x5580ab97F226C324c671746a1787524AEF42E415/metadata.json "symbol": "JUL",
"address": "0x5580ab97F226C324c671746a1787524AEF42E415",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/item-name-cell/index.js b/src/components/item-name-cell/index.js @@ -22,10 +22,22 @@ const ItemLinks = ({itemList, parentItem}) => {
const currentCategoryData = categoryData[itemOrCategoryId];
let item = false;
+ if(itemOrCategoryId === '54009119af1c881c07000029'){
+ // Special case for items that can contain all items
+
+ return null;
+ }
+
if(!currentCategoryData){
item = items.find(item => item.id === itemOrCategoryId);
}
+ if(!item && !currentCategoryData){
+ console.log(itemOrCategoryId);
+
+ return null;
+ }
+
return <span
key = {`item-link-${parentItem.id}-${item?.id || currentCategoryData._id}`}
>
| 9 |
diff --git a/token-metadata/0xfe5F141Bf94fE84bC28deD0AB966c16B17490657/metadata.json b/token-metadata/0xfe5F141Bf94fE84bC28deD0AB966c16B17490657/metadata.json "symbol": "LBA",
"address": "0xfe5F141Bf94fE84bC28deD0AB966c16B17490657",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/.github/workflows/dt.yaml b/.github/workflows/dt.yaml @@ -25,6 +25,8 @@ jobs:
git config user.password ${{ secrets.DEFINITELY_TYPED_PR_GITHUB_ACCESS_TOKEN }}
git remote set-url origin https://github.com/dbrudner/DefinitelyTyped
git fetch --unshallow -p origin
+ git remote add upstream https://github.com/DefinitelyTyped/DefinitelyTyped.git
+ git pull upstream master
- name: Add DefinitelyTyped header
run: |
version=$(cat recurly-js/package.json | jq '.version' -r | sed -ne 's/^\([0-9]*\.[0-9]*\).*/\1/p')
| 3 |
diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json {
"id": "chimer",
"name": "Chimer",
- "version": "0.01",
+ "version": "0.02",
"description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
"icon": "widget.png",
"type": "widget",
| 3 |
diff --git a/packages/frontend/src/redux/actions/account.js b/packages/frontend/src/redux/actions/account.js @@ -21,6 +21,7 @@ import {
ENABLE_IDENTITY_VERIFIED_ACCOUNT
} from '../../utils/wallet';
import { WalletError } from '../../utils/walletError';
+import refreshAccountOwner from '../sharedThunks/refreshAccountOwner';
import {
actions as flowLimitationActions,
selectFlowLimitationAccountBalance,
@@ -638,12 +639,8 @@ export const getAvailableAccountsBalance = () => async (dispatch, getState) => {
}
};
-export const { makeAccountActive, refreshAccountOwner, refreshAccountExternal, refreshUrl, updateStakingAccount, updateStakingLockup, getBalance, setLocalStorage, getAccountBalance, setAccountBalance, clearAccountState } = createActions({
+export const { makeAccountActive, refreshAccountExternal, refreshUrl, updateStakingAccount, updateStakingLockup, getBalance, setLocalStorage, getAccountBalance, setAccountBalance, clearAccountState } = createActions({
MAKE_ACCOUNT_ACTIVE: wallet.makeAccountActive.bind(wallet),
- REFRESH_ACCOUNT_OWNER: [
- wallet.refreshAccount.bind(wallet),
- () => ({ accountId: wallet.accountId })
- ],
REFRESH_ACCOUNT_EXTERNAL: [
async (accountId) => ({
...await (await wallet.getAccount(accountId)).state(),
| 4 |
diff --git a/docs/publications/publications.json b/docs/publications/publications.json [
+ {
+ "type": "Mention",
+ "title": "Why End-to-End Testing is Important for Your Team",
+ "excerpt": "At Hubba, our business needs are always evolving and the development speed needs to catch up with it. One of the ways to keep the team moving forward without breaking everything is End-to-end Testing (E2E).",
+ "author": "Phong Huynh",
+ "date": "2017-12-4",
+ "publisher": "medium.freecodecamp.org",
+ "url": "https://medium.freecodecamp.org/why-end-to-end-testing-is-important-for-your-team-cb7eb0ec1504"
+ },
{
"type": "Tutorial",
"title": "E2E Testing Angular Applications with TestCafe",
| 0 |
diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js @@ -104,6 +104,8 @@ function LineWithMarkers(scene, uid) {
this.scatter._trace = this;
this.fancyScatter = createFancyScatter(scene.glplot, this.scatterOptions);
this.fancyScatter._trace = this;
+
+ this.isVisible = false;
}
var proto = LineWithMarkers.prototype;
@@ -232,12 +234,14 @@ function _convertColor(colors, opacities, count) {
*/
proto.update = function(options) {
if(options.visible !== true) {
+ this.isVisible = false;
this.hasLines = false;
this.hasErrorX = false;
this.hasErrorY = false;
this.hasMarkers = false;
}
else {
+ this.isVisible = true;
this.hasLines = subTypes.hasLines(options);
this.hasErrorX = options.error_x.visible === true;
this.hasErrorY = options.error_y.visible === true;
@@ -250,7 +254,10 @@ proto.update = function(options) {
this.bounds = [Infinity, Infinity, -Infinity, -Infinity];
this.connectgaps = !!options.connectgaps;
- if(this.isFancy(options)) {
+ if(!this.isVisible) {
+ this.clear();
+ }
+ else if(this.isFancy(options)) {
this.updateFancy(options);
}
else {
@@ -285,6 +292,22 @@ function allFastTypesLikely(a) {
return true;
}
+proto.clear = function() {
+ this.lineOptions.positions = new Float64Array(0);
+ this.line.update(this.lineOptions);
+
+ this.errorXOptions.positions = new Float64Array(0);
+ this.errorX.update(this.errorXOptions);
+
+ this.errorYOptions.positions = new Float64Array(0);
+ this.errorY.update(this.errorYOptions);
+
+ this.scatterOptions.positions = new Float64Array(0);
+ this.scatterOptions.glyphs = [];
+ this.scatter.update(this.scatterOptions);
+ this.fancyScatter.update(this.scatterOptions);
+};
+
proto.updateFast = function(options) {
var x = this.xData = this.pickXData = options.x;
var y = this.yData = this.pickYData = options.y;
| 0 |
diff --git a/src/utils/async-event-emitter.js b/src/utils/async-event-emitter.js -import Emittery from 'emittery/legacy';
-import Promise from 'pinkie';
-
+import Emittery from 'emittery';
export default class AsyncEventEmitter extends Emittery {
once (event, listener) {
| 4 |
diff --git a/app/helpers/frontend_config_helper.rb b/app/helpers/frontend_config_helper.rb @@ -80,7 +80,7 @@ module FrontendConfigHelper
if CartoDB.account_host.present? && show_account_update_url(user)
config[:account_update_url] = "#{CartoDB.account_host}"\
"#{CartoDB.account_path}/"\
- "#{user.username}/plan"
+ "#{user.username}/update_payment"
end
config
| 13 |
diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/Autopilot/CJ4NavModeSelector.js b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/Autopilot/CJ4NavModeSelector.js @@ -548,7 +548,6 @@ class CJ4NavModeSelector {
this.isVNAVOn = true;
SimVar.SetSimVarValue("K:HEADING_SLOT_INDEX_SET", "number", 2);
-
if (this.vPathState === VPathState.ACTIVE) {
this.currentVerticalActiveState = VerticalNavModeState.GP;
}
@@ -574,7 +573,20 @@ class CJ4NavModeSelector {
SimVar.SetSimVarValue('K:TOGGLE_GPS_DRIVES_NAV1', 'number', 0);
}
+ const headingLockActive = SimVar.GetSimVarValue('AUTOPILOT HEADING LOCK', 'number') === 1;
+ if (headingLockActive) {
+ SimVar.SetSimVarValue('K:AP_PANEL_HEADING_HOLD', 'number', 0);
+ }
+
+ if (this.currentLateralActiveState !== LateralNavModeState.NAV) {
+ SimVar.SetSimVarValue("K:AP_NAV1_HOLD", "number", 1);
+ }
+
+ setTimeout(() => {
+ if (this.currentLateralActiveState === LateralNavModeState.APPR) {
SimVar.SetSimVarValue("K:AP_APR_HOLD", "number", 1);
+ }
+ }, 1000);
break;
}
| 7 |
diff --git a/package.json b/package.json "jest-watch-typeahead": "^0.2.1",
"js-sha256": "^0.9.0",
"mini-css-extract-plugin": "0.5.0",
- "nearlib": "github:nearprotocol/nearlib#staging",
+ "nearlib": "0.13.2",
"optimize-css-assets-webpack-plugin": "5.0.1",
"pnp-webpack-plugin": "1.2.1",
"postcss-flexbugs-fixes": "4.1.0",
| 1 |
diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php @@ -209,7 +209,7 @@ $dbTags = new dbTags();
$dbCategories = new dbCategories();
$Site = new dbSite();
$Url = new Url();
-$Parsedown = new ParsedownExtra();
+$Parsedown = new Parsedown();
$Security = new Security();
$Syslog = new dbSyslog();
| 2 |
diff --git a/packages/bitcore-node/src/modules/ethereum/api/csp.ts b/packages/bitcore-node/src/modules/ethereum/api/csp.ts @@ -450,6 +450,7 @@ export class ETHStateProvider extends InternalStateProvider implements IChainSta
async estimateGas(params): Promise<number> {
return new Promise(async (resolve, reject) => {
+ try {
let { network, value, from, data, gasPrice, to } = params;
const { web3 } = await this.getWeb3(network);
const dataDecoded = EthTransactionStorage.abiDecode(data);
@@ -464,8 +465,8 @@ export class ETHStateProvider extends InternalStateProvider implements IChainSta
params: [
{
data,
- to: to.toLowerCase(),
- from: from.toLowerCase(),
+ to: to && to.toLowerCase(),
+ from: from && from.toLowerCase(),
gasPrice: web3.utils.toHex(gasPrice),
value: web3.utils.toHex(value)
}
@@ -480,6 +481,9 @@ export class ETHStateProvider extends InternalStateProvider implements IChainSta
if (!data.result) return reject(data.message);
return resolve(Number(data.result));
});
+ } catch (err) {
+ return reject(err);
+ }
});
}
| 1 |
diff --git a/lib/assets/javascripts/dashboard/views/organization/icon-picker/icons/organization-icon-collection.js b/lib/assets/javascripts/dashboard/views/organization/icon-picker/icons/organization-icon-collection.js @@ -13,7 +13,7 @@ module.exports = Backbone.Collection.extend({
},
model: function (attrs, opts) {
- const options = { ...opts, configModel: opts.collection._configModel };
+ const options = { ...opts, configModel: this._configModel };
return new IconModel(attrs, options);
},
| 4 |
diff --git a/gatsby-node.js b/gatsby-node.js @@ -5,7 +5,7 @@ const select = require(`unist-util-select`)
const fs = require(`fs-extra`)
exports.createPages = ({ graphql, boundActionCreators }) => {
- const { upsertPage } = boundActionCreators
+ const { createPage } = boundActionCreators
return new Promise((resolve, reject) => {
const pages = []
@@ -33,7 +33,7 @@ exports.createPages = ({ graphql, boundActionCreators }) => {
// Create blog posts pages.
_.each(result.data.allMarkdownRemark.edges, edge => {
- upsertPage({
+ createPage({
path: edge.node.fields.slug, // required
component: blogPost,
context: {
@@ -47,15 +47,15 @@ exports.createPages = ({ graphql, boundActionCreators }) => {
}
// Add custom slug for blog posts to both File and MarkdownRemark nodes.
-exports.onNodeCreate = ({ node, boundActionCreators, getNode }) => {
- const { addFieldToNode } = boundActionCreators
+exports.onCreateNode = ({ node, boundActionCreators, getNode }) => {
+ const { createNodeField } = boundActionCreators
if (node.internal.type === `File`) {
const parsedFilePath = path.parse(node.relativePath)
const slug = `/${parsedFilePath.dir}/`
- addFieldToNode({ node, fieldName: `slug`, fieldValue: slug })
+ createNodeField({ node, fieldName: `slug`, fieldValue: slug })
} else if (node.internal.type === `MarkdownRemark`) {
const fileNode = getNode(node.parent)
- addFieldToNode({
+ createNodeField({
node,
fieldName: `slug`,
fieldValue: fileNode.fields.slug,
| 3 |
diff --git a/assets/js/hooks/useDebounce.js b/assets/js/hooks/useDebounce.js /**
* External dependencies
*/
-import { useRef, useState } from 'react';
+import { useMemoOne } from 'use-memo-one';
import { debounce } from 'lodash';
/**
@@ -29,68 +29,6 @@ import { debounce } from 'lodash';
*/
import { useEffect } from '@wordpress/element';
-/**
- * Compares input arrays.
- *
- * This is a dependency of @wordpress/compose/useDebounce.
- *
- * @since n.e.x.t
- * @see https://github.com/alexreardon/use-memo-one
- *
- * @param {Array} newInputs Array of new inputs to compare.
- * @param {Array} lastInputs Array of previouse inputs.
- * @return {boolean} Whether the two sets of inputs are the same.
- */
-function areInputsEqual( newInputs, lastInputs ) {
- if ( newInputs.length !== lastInputs.length ) {
- return false;
- }
-
- for ( let i = 0; i < newInputs.length; i++ ) {
- if ( newInputs[ i ] !== lastInputs[ i ] ) {
- return false;
- }
- }
- return true;
-}
-
-/**
- * Provides UseMemo with a semantic guarantee.
- *
- * This is a dependency of @wordpress/compose/useDebounce.
- *
- * @since n.e.x.t
- * @see https://github.com/alexreardon/use-memo-one
- *
- * @param {Function} getResult Returns a cache object.
- * @param {Array} inputs Array of inputs.
- * @return {Object} Cache object.
- */
-function useMemoOne( getResult, inputs ) {
- const initial = useState( () => ( {
- inputs,
- result: getResult(),
- } ) )[ 0 ];
- const isFirstRun = useRef( true );
- const committed = useRef( initial );
-
- const useCache = isFirstRun.current || Boolean( inputs && committed.current.inputs && areInputsEqual( inputs, committed.current.inputs ) );
-
- const cache = useCache
- ? committed.current
- : {
- inputs,
- result: getResult(),
- };
-
- useEffect( () => {
- isFirstRun.current = false;
- committed.current = cache;
- }, [ cache ] );
-
- return cache.result;
-}
-
/**
* Debounces a function with Lodash's `debounce`.
*
| 2 |
diff --git a/src/view/items/Element.js b/src/view/items/Element.js @@ -516,7 +516,7 @@ function delegateHandler ( ev ) {
}
}
- node = node.parentNode;
+ node = node.parentNode || node.correspondingUseElement; // SVG with a <use> element in certain environments
}
return bubble;
@@ -528,7 +528,7 @@ function shouldFire ( event, start, end ) {
let node = start;
while ( node && node !== end ) {
if ( node.disabled ) return false;
- node = node.parentNode;
+ node = node.parentNode || node.correspondingUseElement;
}
}
| 9 |
diff --git a/test/utils.test.js b/test/utils.test.js @@ -7,6 +7,19 @@ import errors from '../src/error-types';
import utils from '../src/utils';
describe('#Utils', () => {
+ describe('.getBookingFromUr', () => {
+ it('should return undefined when ur array is empty', () => {
+ expect(utils.getBookingFromUr([], 'PNR001')).to.equal(undefined);
+ });
+ it('should return undefined when ur array does not contain needed pnr', () => {
+ expect(utils.getBookingFromUr([{ pnr: 'PNR002' }], 'PNR001')).to.equal(undefined);
+ });
+ it('should return undefined when ur array does not contain needed pnr', () => {
+ const x = utils.getBookingFromUr([{ pnr: 'PNR001' }], 'PNR001');
+ expect(x).to.be.an('object');
+ expect(x.pnr).to.equal('PNR001');
+ });
+ });
describe('.price', () => {
it('should return test that price return null is not string', () => {
expect(utils.price(undefined)).equal(null);
| 0 |
diff --git a/src/Cart.js b/src/Cart.js @@ -70,7 +70,7 @@ class Cart {
return 0
}
- return (this.totalItems + this.totalDelivery).toFixed(2)
+ return this.totalItems + this.totalDelivery
}
get totalItems() {
return _.reduce(this.items, function(memo, item) { return memo + item.total; }, 0)
@@ -97,3 +97,6 @@ class Cart {
}
module.exports = Cart;
+module.exports.formatPrice = (price) => {
+ return (price / 100).toFixed(2)
+}
| 9 |
diff --git a/package.json b/package.json "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
"license": "MIT",
"main": "lib/index.js",
+ "style": "dist/tailwind.css",
"repository": "https://github.com/tailwindcss/tailwindcss.git",
"bugs": "https://github.com/tailwindcss/tailwindcss/issues",
"homepage": "https://tailwindcss.com",
| 3 |
diff --git a/android.Dockerfile b/android.Dockerfile @@ -26,6 +26,7 @@ RUN \
$ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "platforms;android-28" && \
$ANDROID_HOME/tools/bin/sdkmanager "ndk-bundle" && \
export PATH="$PATH:$(pwd)/node/bin" && \
+ npm -g config set user root && \
scripts/make-toolchain-android.sh && \
scripts/build-android.sh && \
export TEST_ENV=ci && \
| 12 |
diff --git a/userscript.user.js b/userscript.user.js @@ -33970,6 +33970,7 @@ if (domain_nosub === "lystit.com" && domain.match(/cdn[a-z]?\.lystit\.com/)) {
var mouseAbsContextX = 0;
var mouseAbsContextY = 0;
+ var mouse_in_image_yet = false;
var mouseDelayX = 0;
var mouseDelayY = 0;
@@ -35825,6 +35826,7 @@ if (domain_nosub === "lystit.com" && domain.match(/cdn[a-z]?\.lystit\.com/)) {
var viewport = get_viewport();
var edge_buffer = 40;
var min_move_amt = 5;
+ var moved = false;
if (pan_behavior === "drag" && dragstart) {
var origleft = parseInt(popup.style.left);
@@ -35836,12 +35838,14 @@ if (domain_nosub === "lystit.com" && domain.match(/cdn[a-z]?\.lystit\.com/)) {
lastX = left - (origleft - lastX);
popup.style.left = left + "px";
dragged = true;
+ moved = true;
}
}
} else if (pan_behavior === "movement" && popup.offsetWidth > viewport[0]) {
var mouse_edge = Math.min(Math.max((mouseX - edge_buffer), 0), viewport[0] - edge_buffer * 2);
var percent = mouse_edge / (viewport[0] - (edge_buffer * 2));
popup.style.left = percent * (viewport[0] - popup.offsetWidth) + "px";
+ moved = true;
}
if (pan_behavior === "drag" && dragstart) {
@@ -35854,12 +35858,18 @@ if (domain_nosub === "lystit.com" && domain.match(/cdn[a-z]?\.lystit\.com/)) {
lastY = top - (origtop - lastY);
popup.style.top = top + "px";
dragged = true;
+ moved = true;
}
}
} else if (pan_behavior === "movement" && popup.offsetHeight > viewport[1]) {
var mouse_edge = Math.min(Math.max((mouseY - edge_buffer), 0), viewport[1] - edge_buffer * 2);
var percent = mouse_edge / (viewport[1] - (edge_buffer * 2));
popup.style.top = percent * (viewport[1] - popup.offsetHeight) + "px";
+ moved = true;
+ }
+
+ if (moved) {
+ mouse_in_image_yet = false;
}
}
@@ -35923,20 +35933,59 @@ if (domain_nosub === "lystit.com" && domain.match(/cdn[a-z]?\.lystit\.com/)) {
var w = Math.min(parseInt(img.style.maxWidth), img.naturalWidth);
var h = Math.min(parseInt(img.style.maxHeight), img.naturalHeight);
- jitter_threshx = Math.min(Math.max(jitter_threshx, w / 3), img.naturalWidth);
- jitter_threshy = Math.min(Math.max(jitter_threshy, h / 3), img.naturalHeight);
+ jitter_threshx = Math.min(Math.max(jitter_threshx, w / 2), img.naturalWidth);
+ jitter_threshy = Math.min(Math.max(jitter_threshy, h / 2), img.naturalHeight);
+
+ jitter_threshx += 30;
+ jitter_threshy += 30;
+
+ var rect = img.getBoundingClientRect();
+ if (mouse_in_image_yet === false) {
+ if (mouseX >= rect.left && mouseX <= rect.right &&
+ mouseY >= rect.top && mouseY <= rect.bottom) {
+ mouse_in_image_yet = true;
+ //mouseDelayX = mouseX;
+ //mouseDelayY = mouseY;
+
+ mouseDelayX = rect.x + rect.width / 2;
+ mouseDelayY = rect.y + rect.height / 2;
+
+ if (false) {
+ var viewport = get_viewport();
+ if ((mouseDelayX + jitter_threshx) > viewport[0]) {
+ mouseDelayX = viewport[0] - jitter_threshx;
+ }
+ if ((mouseDelayX - jitter_threshx) < 0) {
+ mouseDelayX = jitter_threshx;
}
+ if ((mouseDelayY + jitter_threshy) > viewport[1]) {
+ mouseDelayY = viewport[1] - jitter_threshy;
+ }
+ if ((mouseDelayY - jitter_threshy) < 0) {
+ mouseDelayY = jitter_threshy;
+ }
+ }
+ }
+ }
+ }
+
+ if (mouse_in_image_yet) {
if (Math.abs(mouseX - mouseDelayX) > jitter_threshx ||
Math.abs(mouseY - mouseDelayY) > jitter_threshy) {
+ console_log(mouseX);
+ console_log(mouseDelayX);
+ console_log(jitter_threshx);
resetpopups();
}
}
}
+ }
if (popups.length === 0) {
mouseDelayX = mouseX;
mouseDelayY = mouseY;
+ mouse_in_image_yet = false;
delay_handle = setTimeout(trigger_popup, delay * 1000);
}
| 7 |
diff --git a/src/views/annual-report/2020/annual-report.scss b/src/views/annual-report/2020/annual-report.scss @@ -1788,6 +1788,10 @@ img.comment-viz{
flex-direction: column;
justify-content: center;
align-items: center;
+ div{
+ width: 250px;
+ margin: auto;
+ }
}
.twitter-tweet{
width: 100%;
| 12 |
diff --git a/server/views/explorer/stories.py b/server/views/explorer/stories.py @@ -41,7 +41,7 @@ def api_explorer_demo_story_sample():
@app.route('/api/explorer/stories/samples.csv', methods=['POST'])
-def explorer_stories_csv2():
+def explorer_stories_csv():
filename = u'explorer-stories-'
data = request.form
if 'searchId' in data:
@@ -56,29 +56,6 @@ def explorer_stories_csv2():
return _stream_story_list_csv(filename, solr_query)
-# if this is a sample search, we will have a search id and a query index
-# if this is a custom search, we will have a query will q,start_date, end_date, sources and collections
[email protected]('/api/explorer/stories/samples.csv/<search_id_or_query>/<index>', methods=['GET'])
-def explorer_stories_csv(search_id_or_query, index=None):
- filename = u'explorer-stories-'
- try:
- search_id = int(search_id_or_query)
- if search_id >= 0: # this is a sample query
- solr_query = parse_as_sample(search_id, index)
- # TODO
- filename = filename # don't have this info + current_query['q']
- # for demo users we only download 100 random stories (ie. not all matching stories)
- return _stream_story_list_csv(filename, solr_query, 100, MediaCloud.SORT_RANDOM, 1)
- except ValueError:
- # planned exception if search_id is actually a keyword or query
- # csv downloads are 1:1 - one query to one download, so we can use index of 0
- query_or_keyword = search_id_or_query
- current_query = json.loads(query_or_keyword)[0]
- solr_query = parse_query_with_keywords(current_query) # TODO don't mod the start and end date unless permissions
- # now page through all the stories and download them
- return _stream_story_list_csv(filename, solr_query)
-
-
def _stream_story_list_csv(filename, query, stories_per_page=500, sort=MediaCloud.SORT_PROCESSED_STORIES_ID,
page_limit=None):
props = ['stories_id', 'publish_date', 'title', 'url', 'language', 'ap_syndicated',
| 5 |
diff --git a/appjs/logicjavascript.js b/appjs/logicjavascript.js @@ -4012,12 +4012,13 @@ function alisum1find() {
}
function alisum3find(){
- let n = parseInt(document.getElementById("alisum3").value)
+ let n = parseInt(document.getElementById("alisum3").value);
+ document.getElementById("alisum3ans").innerHTML = "";
for (let i = 0; i < n; i++){
for (let j = 0; j <= i; j++)
- document.getElementById("alisum3ans").innerHTML = Hosoya(i, j)+ " ";
+ document.getElementById("alisum3ans").innerHTML += Hosoya(i, j)+ " ";
- document.getElementById("alisum3ans").innerHTML = "<br/>";
+ document.getElementById("alisum3ans").innerHTML += "<br/>";
}
}
@@ -4029,11 +4030,10 @@ function alisum4find(){
function Hosoya(n, m)
{
- if ((n == 0 && m == 0) ||
- (n == 1 && m == 0) ||
- (n == 1 && m == 1) ||
- (n == 2 && m == 1))
+ if ((n == 0 && m == 0) || (n == 1 && m == 0) || (n == 1 && m == 1) || (n == 2 && m == 1))
+ {
return 1;
+ }
if (n > m)
return Hosoya(n - 1, m)+ Hosoya(n - 2, m);
| 1 |
diff --git a/edit.js b/edit.js @@ -332,6 +332,7 @@ const chunkMeshContainer = new THREE.Object3D();
scene.add(chunkMeshContainer);
let currentChunkMesh = null;
let physics = null;
+let physicalMesh = null;
(async () => {
const [
@@ -392,8 +393,7 @@ physics = (() => {
object.updateMatrixWorld();
object.traverse(o => {
if (o.isMesh) {
- const {geometry} = o;
- const positions = geometry.attributes.position.array;
+ const positions = o.geometry.attributes.position.array;
for (let i = 0; i < positions.length; i += 3) {
localVector.set(positions[i], positions[i+1], positions[i+2])
// .applyMatrix4(o.matrixWorld);
@@ -409,8 +409,65 @@ physics = (() => {
// console.log('sword points', numPoints);
return shape;
};
+ const _makeTriangleMeshShape = object => {
+ const triangle_mesh = new Ammo.btTriangleMesh();
+ const _vec3_1 = new Ammo.btVector3(0, 0, 0);
+ const _vec3_2 = new Ammo.btVector3(0, 0, 0);
+ const _vec3_3 = new Ammo.btVector3(0, 0, 0);
+
+ object.updateMatrixWorld();
+ object.traverse(o => {
+ if (o.isMesh) {
+ const positions = o.geometry.attributes.position.array;
+ for (let i = 0; i < positions.length; i += 9) {
+ _vec3_1.setX(positions[i]);
+ _vec3_1.setY(positions[i+1]);
+ _vec3_1.setZ(positions[i+2]);
+
+ _vec3_2.setX(positions[i+3]);
+ _vec3_2.setY(positions[i+4]);
+ _vec3_2.setZ(positions[i+5]);
+
+ _vec3_3.setX(positions[i+6]);
+ _vec3_3.setY(positions[i+7]);
+ _vec3_3.setZ(positions[i+8]);
+
+ triangle_mesh.addTriangle(
+ _vec3_1,
+ _vec3_2,
+ _vec3_3,
+ true
+ );
+ }
+ }
+ });
+
+ const shape = new Ammo.btBvhTriangleMeshShape(
+ triangle_mesh,
+ true,
+ true
+ );
+ return shape;
+ };
return {
+ bindStaticMeshPhysics(objectMesh) {
+ const shape = _makeTriangleMeshShape(objectMesh);
+
+ const transform = new Ammo.btTransform();
+ transform.setIdentity();
+ transform.setOrigin(new Ammo.btVector3(objectMesh.position.x, objectMesh.position.y, objectMesh.position.z));
+
+ const mass = 0;
+ const localInertia = new Ammo.btVector3(0, 0, 0);
+ shape.calculateLocalInertia(mass, localInertia);
+
+ const myMotionState = new Ammo.btDefaultMotionState(transform);
+ const rbInfo = new Ammo.btRigidBodyConstructionInfo(mass, myMotionState, shape, localInertia);
+ const body = new Ammo.btRigidBody(rbInfo);
+
+ dynamicsWorld.addRigidBody(body);
+ },
bindMeshPhysics(objectMesh) {
if (!objectMesh.body) {
const shape = _makeConvexHullShape(objectMesh);
@@ -470,9 +527,45 @@ physics = (() => {
lastTimestamp = now;
},
+ pullObjectMesh(mesh) {
+ // if (mesh.body) {
+ mesh.body.getMotionState().getWorldTransform(localTransform);
+ const origin = localTransform.getOrigin();
+ mesh.position.set(origin.x(), origin.y(), origin.z());
+ // console.log('mesh pos', mesh.position.toArray());
+ const rotation = localTransform.getRotation();
+ mesh.quaternion.set(rotation.x(), rotation.y(), rotation.z(), rotation.w());
+ // }
+ },
+ resetObjectMesh(mesh) {
+ // if (mesh.body) {
+ localTransform.setOrigin(new Ammo.btVector3(mesh.originalPosition.x, mesh.originalPosition.y, mesh.originalPosition.z));
+ localTransform.setRotation(new Ammo.btQuaternion(mesh.originalQuaternion.x, mesh.originalQuaternion.y, mesh.originalQuaternion.z, mesh.originalQuaternion.w));
+ mesh.body.setWorldTransform(localTransform);
+ mesh.body.activate(true);
+
+ mesh.position.copy(mesh.originalPosition);
+ mesh.quaternion.copy(mesh.originalQuaternion);
+ mesh.scale.copy(mesh.originalScale);
+ // }
+ },
};
})();
+physicalMesh = (() => {
+ const geometry = new THREE.TetrahedronBufferGeometry(1, 0);
+ const material = new THREE.MeshBasicMaterial({
+ color: 0x0000FF,
+ });
+ const mesh = new THREE.Mesh(geometry, material);
+ mesh.frustumCulled = false;
+ return mesh;
+})();
+physicalMesh.position.set(10, 20, 10);
+scene.add(physicalMesh);
+physics.bindMeshPhysics(physicalMesh);
+window.physicalMesh = physicalMesh;
+
const _makeChunkMesh = () => {
const {potentials, dims} = _makePotentials();
@@ -563,9 +656,11 @@ for (let i = 0; i < numRemoteChunkMeshes; i++) {
}
remoteChunkMeshes.push(chunkMesh);
-physics.bindMeshPhysics(chunkMesh);
+physics.bindStaticMeshPhysics(chunkMesh);
/* for (let i = 0; i < remoteChunkMeshes.length; i++) {
- physics.bindMeshPhysics(remoteChunkMeshes[i]);
+ console.time('lol');
+ physics.bindStaticMeshPhysics(remoteChunkMeshes[i]);
+ console.timeEnd('lol');
} */
})();
@@ -1103,7 +1198,10 @@ function animate(timestamp, frame) {
const timeDiff = Math.min((timestamp - lastTimestamp) / 1000, 0.05);
lastTimestamp = timestamp;
- physics && physics.simulate();
+ if (physics) {
+ physics.simulate();
+ physics.pullObjectMesh(physicalMesh);
+ }
// loadMeshMaterial.uniforms.uTime.value = (Date.now() % timeFactor) / timeFactor;
for (let i = 0; i < remoteChunkMeshes.length; i++) {
@@ -1759,6 +1857,10 @@ window.addEventListener('keydown', e => {
}
break;
}
+ case 80: { // P
+ physics.resetObjectMesh(physicalMesh);
+ break;
+ }
case 8: // backspace
case 46: // del
{
| 0 |
diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs @@ -521,7 +521,6 @@ dependencies {
<%_ if (databaseType === 'couchbase') { _%>
testImplementation "org.testcontainers:couchbase"
<%_ } _%>
- testImplementation "org.hamcrest:hamcrest"
<%_ if (databaseType === 'sql') { _%>
testImplementation "com.h2database:h2"
<%_ } _%>
| 2 |
diff --git a/vault/dendron.topic.vaults.md b/vault/dendron.topic.vaults.md id: 6682fca0-65ed-402c-8634-94cd51463cc4
title: Vaults
desc: ""
-updated: 1650052895884
+updated: 1655317082844
created: 1622841137387
---
@@ -91,7 +91,7 @@ A local vault is what you start off with. Its a vault that is local to your file
### Remote
-A remote vault is what you get when you run the [[Vault Add|dendron.ref.commands#vault-add]] command and select a remote vault. This is a vault that is cloned from a git repo. It should be a similar format as what you see below
+A remote vault is what you get when you run the [[Vault Add|dendron.ref.commands#vault-add]] command and select a remote vault. This is a vault that is cloned from a git repo. It will be listed in a similar format as what you see below in your configuration file.
```yml
vaults:
| 7 |
diff --git a/.eslintrc b/.eslintrc "@typescript-eslint"
],
"rules": {
- "@typescript-eslint/no-unused-vars": "warn"
+ "no-unused-vars": ["warn", {
+ "argsIgnorePattern": "^_",
+ "varsIgnorePattern": "^_"
+ }],
+ "@typescript-eslint/no-unused-vars": ["warn", {
+ "argsIgnorePattern": "^_",
+ "varsIgnorePattern": "^_"
+ }]
}
}
| 11 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.