code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/generators/textWrap.js b/src/generators/textWrap.js @@ -2,13 +2,14 @@ import defineClasses from '../util/defineClasses'
export default function() {
return defineClasses({
- 'wrap-normal': { 'white-space': 'normal' },
- 'wrap-none': { 'white-space': 'nowrap' },
- 'wrap-pre': { 'white-space': 'pre' },
- 'wrap-pre-line': { 'white-space': 'pre-line' },
- 'wrap-pre-wrap': { 'white-space': 'pre-wrap' },
- 'wrap-force': { 'word-wrap': 'break-word' },
- 'wrap-truncate': {
+ 'wrap': { 'white-space': 'normal' },
+ 'no-wrap': { 'white-space': 'nowrap' },
+ 'pre': { 'white-space': 'pre' },
+ 'pre-line': { 'white-space': 'pre-line' },
+ 'pre-wrap': { 'white-space': 'pre-wrap' },
+ 'break-words': { 'word-wrap': 'break-word' },
+ 'break-normal': { 'word-wrap': 'normal' },
+ 'truncate': {
'overflow': 'hidden',
'text-overflow': 'ellipsis',
'white-space': 'nowrap',
| 10 |
diff --git a/packages/swagger2openapi/validate.js b/packages/swagger2openapi/validate.js @@ -412,9 +412,11 @@ function checkPathItem(pathItem,openapi,options) {
options.context.pop();
}
if (op.externalDocs) {
+ contextAppend(options,'externalDocs');
op.externalDocs.should.have.key('url');
op.externalDocs.url.should.have.type('string');
(function(){validateUrl(op.externalDocs.url,contextServers,'externalDocs',options)}).should.not.throw();
+ options.context.pop();
}
if (op.callbacks) {
contextAppend(options,'callbacks');
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## v1.9.1 (2020-8-12)
+
+### Bug Fixes
+
+* Pages proxied with TestCafe now expose the correct `File` object for uploaded files ([testcafe-hammerhead/#2338](https://github.com/DevExpress/testcafe-hammerhead/issues/2338))
+
## v1.9.0 (2020-8-6)
### Enhancements
| 0 |
diff --git a/src/client/js/components/CustomNavigation.jsx b/src/client/js/components/CustomNavigation.jsx @@ -25,7 +25,7 @@ const CustomNavigation = (props) => {
const random = Math.random().toString(32).substring(2);
const navTitleId = `custom-navtitle-${random}`;
- const navTabId = `custom-navtab-${random}`;
+ const grwNavTab = `custom-navtab-${random}`;
useEffect(() => {
if (activeTab === '') {
@@ -33,7 +33,7 @@ const CustomNavigation = (props) => {
}
const navTitle = document.getElementById(navTitleId);
- const navTabs = document.querySelectorAll(`li.${navTabId}`);
+ const navTabs = document.querySelectorAll(`li.${grwNavTab}`);
if (navTitle == null || navTabs == null) {
return;
@@ -60,7 +60,7 @@ const CustomNavigation = (props) => {
<Nav className="nav-title" id={navTitleId}>
{Object.entries(props.navTabMapping).map(([key, value]) => {
return (
- <NavItem key={key} type="button" className={`p-0 ${navTabId} ${activeTab === key && 'active'}`}>
+ <NavItem key={key} type="button" className={`p-0 ${grwNavTab} ${activeTab === key && 'active'}`}>
<NavLink onClick={() => { switchActiveTab(key) }}>
{value.icon}
{value.i18n}
| 10 |
diff --git a/src/common/quiz/card_strategies.js b/src/common/quiz/card_strategies.js @@ -39,8 +39,12 @@ function arrayToLowerCase(array) {
/* COMPARE ANSWER STRATEGIES */
+function removeSpoilerTags(answerCandidate) {
+ return answerCandidate.replace(/\|\|/g, '');
+}
+
function answerCompareConvertKana(card, answerCandidate) {
- let convertedAnswerCandidate = convertToHiragana(answerCandidate);
+ let convertedAnswerCandidate = convertToHiragana(removeSpoilerTags(answerCandidate));
let correctAnswersLowercase = arrayToLowerCase(card.answer);
for (let i = 0; i < correctAnswersLowercase.length; ++i) {
let correctAnswer = correctAnswersLowercase[i];
@@ -52,7 +56,7 @@ function answerCompareConvertKana(card, answerCandidate) {
}
function answerCompareStrict(card, answerCandidate) {
- return arrayToLowerCase(card.answer).indexOf(answerCandidate);
+ return arrayToLowerCase(card.answer).indexOf(removeSpoilerTags(answerCandidate));
}
function createAggregateLink(queryParts, tag) {
| 11 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -1965,7 +1965,7 @@ $sprk-big-nav-item-line-height: 53px !default;
// Masthead Accordion
/// The left border of the active item
/// in the navigation links when masthead is on narrow viewports.
-$sprk-masthead-accordion-active-left-border: 3px solid $sprk-black !default;
+$sprk-masthead-accordion-active-left-border: 3px solid $sprk-red !default;
/// The font weight of the active item
/// in the navigation links when masthead is on narrow viewports.
$sprk-masthead-accordion-active-heading-font-weight: 400 !default;
| 3 |
diff --git a/src/components/Editor/EditorControlPane/Widget.js b/src/components/Editor/EditorControlPane/Widget.js @@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import ImmutablePropTypes from "react-immutable-proptypes";
import { Map } from 'immutable';
+import { uniqueId } from 'lodash';
import ValidationErrorTypes from 'Constants/validationErrorTypes';
const truthy = () => ({ error: false });
@@ -194,7 +195,7 @@ export default class Widget extends Component {
onAddAsset,
onRemoveInsertedMedia,
getAsset,
- forID: field.get('name'),
+ forID: uniqueId(field.get('name')),
ref: this.processInnerControlRef,
classNameWrapper,
classNameWidget,
| 3 |
diff --git a/constants.js b/constants.js @@ -33,6 +33,7 @@ export const polygonVigilKey = `0937c004ab133135c86586b55ca212a6c9ecd224`;
export const storageHost = 'https://ipfs.webaverse.com';
export const previewHost = 'https://preview.exokit.org';
export const inappPreviewHost = 'https://app.webaverse.online';
+export const inappPreviewHostDev = 'https://staging.webaverse.online';
export const worldsHost = 'https://worlds.exokit.org';
export const accountsHost = `https://${chainName}sidechain-accounts.webaverse.com`;
export const contractsHost = 'https://contracts.webaverse.com';
| 0 |
diff --git a/src/sagas/authentication.js b/src/sagas/authentication.js @@ -26,7 +26,7 @@ export function* logoutSaga() {
]
while (true) {
yield take(actionTypes)
- document.cookie = 'ello_skip_prerender=false'
+ document.cookie = 'ello_skip_prerender=false; path=/; expires=Fri, 31 Dec 9999 23:59:59 GMT'
yield put(push('/enter'))
}
}
@@ -39,7 +39,7 @@ function* userSuccessSaga() {
]
while (true) {
yield take(actionTypes)
- document.cookie = 'ello_skip_prerender=true; expires=Fri, 31 Dec 9999 23:59:59 GMT'
+ document.cookie = 'ello_skip_prerender=true; path=/; expires=Fri, 31 Dec 9999 23:59:59 GMT'
}
}
| 12 |
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js @@ -210,9 +210,8 @@ module.exports = class DashboardUI extends Plugin {
document.body.classList.add('is-UppyDashboard-open')
document.body.style.top = `-${this.savedDocumentScrollPosition}px`
- this.setFocusToFirstNode()
-
- this.updateDashboardElWidth()
+ setTimeout(this.setFocusToFirstNode, 100)
+ setTimeout(this.updateDashboardElWidth, 100)
// to be sure, sometimes when the function runs, container size is still 0
// setTimeout(this.updateDashboardElWidth, 500)
}
| 0 |
diff --git a/vis/js/intermediate.js b/vis/js/intermediate.js @@ -408,7 +408,7 @@ function createZoomParameterMiddleware() {
) {
addQueryParam(
"area",
- action.selectedAreaData.uri
+ typeof action.selectedAreaData.uri !== "undefined"
? action.selectedAreaData.uri
: action.selectedAreaData.title
);
| 1 |
diff --git a/server/handlers/awsJobs.js b/server/handlers/awsJobs.js @@ -351,7 +351,8 @@ let handlers = {
.join('/')
const stream = aws.s3.sdk.getObject(objParams).createReadStream()
archive.append(stream, { name: fileName })
- async.setImmediate(cb)
+ // Prevent race condition blocking new streams
+ setTimeout(cb, 300)
},
() => {
archive.finalize()
| 11 |
diff --git a/token-metadata/0xF5DCe57282A584D2746FaF1593d3121Fcac444dC/metadata.json b/token-metadata/0xF5DCe57282A584D2746FaF1593d3121Fcac444dC/metadata.json "symbol": "CSAI",
"address": "0xF5DCe57282A584D2746FaF1593d3121Fcac444dC",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/docs/README.md b/docs/README.md @@ -19,8 +19,8 @@ First time using node.js ? You may want to start with the [tutorial](tutorial.md
* Supports Minecraft 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15 and 1.16.
* Entity knowledge and tracking.
- * Block knowledge. You can query the world around you.
- * Basic physics and movement - currently blocks are either "solid" or "empty".
+ * Block knowledge. You can query the world around you. Milliseconds to find any block.
+ * Physics and movement - handle all bounding boxes
* Attacking entities and using vehicles.
* Inventory management.
* Crafting, chests, dispensers, enchantment tables.
@@ -31,9 +31,26 @@ First time using node.js ? You may want to start with the [tutorial](tutorial.md
### Roadmap
- * Brewing stands, and anvils.
- * Better physics (support doors, ladders, water, etc).
- * Want to contribute on something important for PrismarineJS ? go to https://github.com/PrismarineJS/mineflayer/wiki/Big-Prismarine-projects
+ Checkout this page to see what are your current [projects](https://github.com/PrismarineJS/mineflayer/wiki/Big-Prismarine-projects).
+
+## Installation
+
+`npm install mineflayer`
+
+## Documentation
+
+| link | description |
+|---|---|
+|[tutorial](tutorial.md) | Begin with node.js and mineflayer |
+| [FAQ.md](FAQ.md) | Got a question ? go there first |
+| [api.md](api.md) [unstable_api.md](unstable_api.md) | The full API reference |
+| [history.md](history.md) | The changelog for mineflayer |
+| [examples/](https://github.com/PrismarineJS/mineflayer/tree/master/examples) | Checkout all the mineflayer examples |
+
+
+## Contribute
+
+Please read [CONTRIBUTING.md](CONTRIBUTING.md) and [prismarine-contribute](https://github.com/PrismarineJS/prismarine-contribute)
## Usage
@@ -57,6 +74,18 @@ bot.on('chat', function(username, message) {
bot.on('error', err => console.log(err))
```
+#### More Examples
+
+| example | description |
+|---|---|
+|[viewer](https://github.com/PrismarineJS/mineflayer/tree/master/examples/viewer) | display your bot world view in the browser |
+|[chest](https://github.com/PrismarineJS/mineflayer/blob/master/examples/chest.js) | Use chests, furnaces, dispensers, enchantment tables |
+|[digger](https://github.com/PrismarineJS/mineflayer/blob/master/examples/digger.js) | Learn how to create a simple bot that is capable of digging the block |
+|[discord](https://github.com/PrismarineJS/mineflayer/blob/master/examples/discord.js) | connect a discord bot with a mineflayer bot |
+|[jumper](https://github.com/PrismarineJS/mineflayer/blob/master/examples/jumper.js) | Learn how to move, jump, ride vehicles, attack nearby entities |
+
+And many mores in the [examples](https://github.com/PrismarineJS/mineflayer/tree/master/examples) folder
+
### Modules
A lot of the active development is happening inside of small npm packages which are used by mineflayer.
@@ -102,11 +131,6 @@ set DEBUG=minecraft-protocol
node your_script.js
```
-#### More Examples
-
- * In the [examples](https://github.com/PrismarineJS/mineflayer/tree/master/examples) folder.
- * [vogonistic's REPL bot](https://gist.github.com/vogonistic/4631678)
-
## Third Party Plugins
Mineflayer is pluggable; anyone can create a plugin that adds an even
@@ -150,22 +174,6 @@ The most updated and useful are :
* [hexatester/minetelegram](https://github.com/hexatester/minetelegram) - Minecraft - Telegram bridge, build on top of mineflayer & telegraf.
* [and hundreds more](https://github.com/PrismarineJS/mineflayer/network/dependents) - All the projects that github detected are using mineflayer
-## Installation
-
-`npm install mineflayer`
-
-## Documentation
-
- * See [docs/api.md](api.md).
- * See [docs/FAQ.md](FAQ.md).
- * See [docs/history.md](history.md).
- * See [examples/](https://github.com/PrismarineJS/mineflayer/tree/master/examples).
- * See [docs/unstable_api.md](unstable_api.md).
- * See [docs/CONTRIBUTING.md](CONTRIBUTING.md).
-
-## Contribute
-
-Please read https://github.com/PrismarineJS/prismarine-contribute
## Testing
@@ -195,15 +203,6 @@ Run `npm test -g <version>`, where `<version>` is a minecraft version like `1.12
### Testing specific test
Run `npm test -g <test_name>`, where `<test_name>` is a name of the test like `bed`, `useChests`, `rayTrace`...
-## Updating to a newer protocol version
-
-1. Wait for a new version of
- [node-minecraft-protocol](https://github.com/PrismarineJS/node-minecraft-protocol)
- to be released which supports the new Minecraft version.
-2. `npm install --save minecraft-protocol@latest`
-3. Apply the [protocol changes](http://wiki.vg/Protocol_History) where necessary.
-4. Run the test suite. See Testing above.
-
## Licence
[MIT](LICENCE)
| 7 |
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx @@ -87,7 +87,7 @@ const StyledFooter = styled.footer`
display: inline-block;
&:hover {
- color: rgba(255,255,255,0.87);
+ color: ${constants.textColorPrimary};
}
&::after {
| 14 |
diff --git a/rollup.config.js b/rollup.config.js @@ -6,7 +6,6 @@ import copy from "rollup-plugin-copy";
export default {
input: ['source/gltf-sample-viewer.js'],
- external: ['gl-matrix', 'axios', 'jpeg-js', 'fast-png'],
output: [
{
file: 'dist/gltf-viewer.js',
| 2 |
diff --git a/src/libs/API.js b/src/libs/API.js @@ -146,11 +146,9 @@ function handleExpiredAuthToken(originalResponse, originalCommand, originalParam
})
// Now that the API is authenticated, make the original request again with the new authToken
- // Use HttpUtils here so that retry logic is avoided. Since this code is triggered from a retry attempt
- // it can create an infinite loop
.then(() => {
const params = addAuthTokenToParameters(originalCommand, originalParameters);
- HttpUtils.xhr(originalCommand, params, originalType);
+ Network.post(originalCommand, params, originalType);
})
.catch((error) => {
| 4 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -384,6 +384,12 @@ metaversefile.setApi({
registerMirror(mirror) {
mirrors.push(mirror);
},
+ unregisterMirror(mirror) {
+ const index = mirrors.indexOf(mirror);
+ if (index !== -1) {
+ mirrors.splice(index, 1);
+ }
+ },
useWorld() {
return {
appManager: world.appManager,
| 0 |
diff --git a/src/App/App.js b/src/App/App.js @@ -13,7 +13,6 @@ import ProtectedRoute from './ProtectedRoute';
import Receive from '../Receive';
import Send from '../Send';
import Settings from '../Settings';
-import Signer from '../Signer';
import Tokens from '../Tokens';
import './App.css';
@@ -26,34 +25,37 @@ class App extends Component {
render() {
return (
<Router>
- <div className='wrapper'>
- <div className='content'>
- <div className='connector'>
- <svg width='60px' height='30px' viewBox='0 0 60 30'>
- <polygon points='0 30 60 30 30 0' />
+ <div className="wrapper">
+ <div className="content">
+ <div className="connector">
+ <svg width="60px" height="30px" viewBox="0 0 60 30">
+ <polygon points="0 30 60 30 30 0" />
</svg>
</div>
- <div className='window'>
- <nav className='header-nav'>
- <Link to='/'>Wallet</Link>
+ <div className="window">
+ <nav className="header-nav">
+ <Link to="/">Wallet</Link>
</nav>
- <div className='window_content'>
- <Route path='/loading' component={Loading} />
- <ProtectedRoute exact path='/' component={Tokens} />
- <ProtectedRoute path='/settings' component={Settings} />
- <ProtectedRoute path='/send' component={Send} />
- <ProtectedRoute path='/signer' component={Signer} />
- <ProtectedRoute path='/receive' component={Receive} />
- <ProtectedRoute path='/accounts/new' component={CreateAccount} />
+ <div className="window_content">
+ <Route path="/loading" component={Loading} />
+ <ProtectedRoute exact path="/" component={Tokens} />
+ <ProtectedRoute path="/settings" component={Settings} />
+ <ProtectedRoute path="/send" component={Send} />
+ <ProtectedRoute path="/signer" component={Signer} />
+ <ProtectedRoute path="/receive" component={Receive} />
+ <ProtectedRoute
+ path="/accounts/new"
+ component={CreateAccount}
+ />
</div>
- <nav className='footer-nav'>
- <div className='footer-nav_status'>
+ <nav className="footer-nav">
+ <div className="footer-nav_status">
<Health />
</div>
- <div className='footer-nav_icons'>
- <Link to='/settings' className='icon -settings'>
+ <div className="footer-nav_icons">
+ <Link to="/settings" className="icon -settings">
Settings
</Link>
</div>
| 2 |
diff --git a/character-controller.js b/character-controller.js @@ -545,6 +545,17 @@ class StatePlayer extends PlayerBase {
this.syncAvatarCancelFn = null;
}
+ setSpawnPoint(position, quaternion) {
+ const localPlayer = metaversefile.useLocalPlayer();
+ localPlayer.position.copy(position);
+ localPlayer.quaternion.copy(quaternion);
+
+ camera.position.copy(position);
+ camera.quaternion.copy(quaternion);
+ camera.updateMatrixWorld();
+
+ this.characterPhysics.setPosition(position);
+ }
getActions() {
return this.getActionsState();
}
| 0 |
diff --git a/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js b/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js @@ -33,7 +33,9 @@ var writeFileSync = require( '@stdlib/fs/write-file' ).sync;
var readFileSync = require( '@stdlib/fs/read-file' ).sync;
var readJSON = require( '@stdlib/fs/read-json' ).sync;
var contains = require( '@stdlib/assert/contains' );
+var trim = require( '@stdlib/string/trim' );
var replace = require( '@stdlib/string/replace' );
+var removeFirst = require( '@stdlib/string/remove-first' );
var startsWith = require( '@stdlib/string/starts-with' );
var namespaceDeps = require( '@stdlib/_tools/pkgs/namespace-deps' );
var ENV = require( '@stdlib/process/env' );
@@ -45,6 +47,11 @@ var debug = logger( 'scripts:publish-packages' );
// TODO: Edit the list of packages that will be published:
var PACKAGES_TO_PUBLISH = [
+
+ // 'assert',
+
+ // 'assert/is-arguments'
+
'assert/is-nan'
// 'assert/is-boolean',
@@ -116,8 +123,8 @@ var MAIN_REPO_SECTION = [
var mainDir = join( __dirname, '..', '..', '..', '..', '..' );
var DOTFILES = [ '.editorconfig', '.npmignore', '.npmrc', 'CONTRIBUTORS', 'LICENSE', 'NOTICE' ];
-var WORKFLOW = [
- 'name: Publish Package to npm',
+var WORKFLOW_PUBLISH = [
+ 'name: Publish Package',
'',
'on: push',
'',
@@ -143,7 +150,42 @@ var WORKFLOW = [
' - name: Publish package to npm',
' uses: JS-DevTools/npm-publish@v1',
' with:',
- ' token: ${{ secrets.NPM_TOKEN }}'
+ ' token: ${{ secrets.NPM_TOKEN }}',
+ ' - name: Clean-up tag in case publishing to npm has failed',
+ ' if: ${{ failure() }}',
+ ' run: git push --delete origin latest'
+].join( '\n' );
+var WORKFLOW_INSTALL = [
+ 'name: Install dependencies',
+ '',
+ 'on:',
+ ' workflow_run:',
+ ' workflows: ["Publish Package"]',
+ ' types: [completed]',
+ '',
+ 'jobs:',
+ ' on-success:',
+ ' runs-on: ubuntu-latest',
+ ' if: ${{ github.event.workflow_run.conclusion == \'success\' }}',
+ ' steps:',
+ ' - uses: actions/checkout@v1',
+ ' - uses: actions/setup-node@v1',
+ ' with:',
+ ' node-version: 10',
+ ' - name: Install dependencies via npm',
+ ' run: |',
+ ' npm install',
+ ' on-failure:',
+ ' runs-on: ubuntu-latest',
+ ' if: ${{ github.event.workflow_run.conclusion == \'failure\' }}',
+ ' steps:',
+ ' - uses: actions/checkout@v1',
+ ' - uses: actions/setup-node@v1',
+ ' with:',
+ ' node-version: 10',
+ ' - name: Install dependencies via npm',
+ ' run: |',
+ ' npm install'
].join( '\n' );
var EXISTING_REPOS = {};
@@ -218,7 +260,7 @@ function publish( pkg, clbk ) {
isTopLevelNS = !contains( pkg, '/' );
if ( !isTopLevelNS ) {
command = [
- 'find '+dist+' -type f -name \'*.[jt]s\' -print0 ', // Find all JavaScript and TypeScript files in the destination directory and print their full names to standard output...
+ 'find '+dist+' -type f \\( -name \'*.[jt]s\' -o -name \'*.md\' \\) -print0 ', // Find all JavaScript and TypeScript files in the destination directory and print their full names to standard output...
'| xargs -0 ', // Convert standard input to the arguments for following `sed` command...
'sed -Ei ', // Edit files in-place without creating a backup...
'"/',
@@ -241,7 +283,10 @@ function publish( pkg, clbk ) {
pkgJSON.name = '@stdlib/'+distPkg;
pkgJSON.repository.url = 'git://github.com/stdlib-js/'+distPkg+'.git';
try {
- version = shell( 'npm view @stdlib/'+distPkg+' version' ).toString();
+ command = 'git ls-remote --tags --sort="v:refname" git://github.com/stdlib-js/'+distPkg+'.git | tail -n1 | sed \'s/.*\\///; s/\\^{}//\'';
+ console.log( command );
+ version = shell( command ).toString();
+ version = trim( removeFirst( version ) ); // Remove leading `v`...
} catch ( err ) {
debug( 'Encountered an error: '+err.message );
version = '0.0.0';
@@ -279,8 +324,10 @@ function publish( pkg, clbk ) {
fs.mkdirSync( join( dist, '.github', 'workflows' ), {
'recursive': true
});
- workflowPath = join( dist, '.github', 'workflows', 'npm-publish.yml' );
- writeFileSync( workflowPath, WORKFLOW );
+ workflowPath = join( dist, '.github', 'workflows', 'publish.yml' );
+ writeFileSync( workflowPath, WORKFLOW_PUBLISH );
+ workflowPath = join( dist, '.github', 'workflows', 'install.yml' );
+ writeFileSync( workflowPath, WORKFLOW_INSTALL );
ghpagesOpts = {
'branch': 'main',
| 14 |
diff --git a/player/js/animation/AnimationManager.js b/player/js/animation/AnimationManager.js @@ -34,8 +34,8 @@ var animationManager = (function(){
i+=1;
}
var animItem = new AnimationItem();
- animItem.setData(element, animationData);
setupAnimation(animItem, element);
+ animItem.setData(element, animationData);
return animItem;
}
| 12 |
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js @@ -29,6 +29,10 @@ module.exports = {
defaultApiGatewayLogLevel,
apiGatewayValidLogLevels,
updateStage() {
+ const provider = this.state.service.provider;
+ this.hasTracingConfigured = provider.tracing && provider.tracing.apiGateway != null;
+ this.hasLogsConfigured = provider.logs && provider.logs.restApi != null;
+
// this array is used to gather all the patch operations we need to
// perform on the stage
this.apiGatewayStagePatchOperations = [];
@@ -45,11 +49,7 @@ module.exports = {
if (!this.apiGatewayRestApiId) {
// Could not resolve REST API id automatically
- const provider = this.state.service.provider;
- const isTracingEnabled = provider.tracing && provider.tracing.apiGateway;
- const areLogsEnabled = provider.logs && provider.logs.restApi;
-
- if (!isTracingEnabled && !areLogsEnabled) {
+ if (!this.hasTracingConfigured && !this.hasLogsConfigured) {
// Do crash if there are no API Gateway customizations to apply
return null;
}
| 7 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -4906,7 +4906,7 @@ RED.view = (function() {
if (d._def.button) {
var buttonEnabled = isButtonEnabled(d);
this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-disabled", !buttonEnabled);
- if (RED.runtime && Object.hasOwn(RED.runtime,'started')) {
+ if (RED.runtime && RED.runtime.started !== undefined) {
this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-stopped", !RED.runtime.started);
}
| 2 |
diff --git a/website/src/docs/server.md b/website/src/docs/server.md @@ -83,8 +83,7 @@ Please ensure that the required env variables are set before running/using uppy-
$ uppy-server
```
-If you cloned the repo from gtihub and want to run it as a standalone server, you may also run the following command from within its
-directory
+If you cloned the repo from github and want to run it as a standalone server, you may also run the following command from within its directory
```bash
npm run start:production
@@ -235,8 +234,7 @@ The default value simply returns `filename`, so all files will be uploaded to th
### Adding Custom Providers
-As of now, uppy-server supports **Google Drive**, **Dropbox** and **Instagram** out of the box, but you may also choose to add your custom providers. You can do this by passing the `customProviders`
-option when calling the uppy `app` method. The custom provider is expected to support Oauth 1 or 2 for authentication/authorization.
+As of now, uppy-server supports **Google Drive**, **Dropbox** and **Instagram** out of the box, but you may also choose to add your custom providers. You can do this by passing the `customProviders` option when calling the uppy `app` method. The custom provider is expected to support Oauth 1 or 2 for authentication/authorization.
```javascript
let options = {
@@ -273,7 +271,7 @@ To work well with uppy server, the **Module** must be a class with the following
- token - authorization token(retrieved from oauth process) to send along with your request.
- id - id of the file being downloaded.
- `onData (chunk)` - a callback that should be called with each data chunk received on download. This is useful if the size of the downloaded file can be pre-determined. This would allow for pipelined upload of the file (to the desired destination), while the download is still going on.
- - `onResponse (response)` - if the size of the downloaded file can not be pre-determined by uppy-server, then this callback should be called in place of the `onData` callback. This callback would be called after the download is done, and would the downloaded data(response) as argument.
+ - `onResponse (response)` - if the size of the downloaded file can not be pre-determined by uppy-server, then this callback should be called in place of the `onData` callback. This callback would be called after the download is done, and would take the downloaded data (response) as the argument.
## Development
@@ -305,9 +303,7 @@ It also expects the [uppy client](https://github.com/transloadit/uppy) to be run
An example server is running at http://server.uppy.io, which is deployed via
[Frey](https://github.com/kvz/frey), using the following [Freyfile](infra/Freyfile.toml).
-All the secrets are stored in `env.infra.sh`, so using `env.infra.example.sh`, you could
-use the same Freyfile but target a different cloud vendor with different secrets, and run your own
-uppy-server.
+All the secrets are stored in `env.infra.sh`, so using `env.infra.example.sh`, you could use the same Freyfile but target a different cloud vendor with different secrets, and run your own uppy-server.
## Logging
| 1 |
diff --git a/planet.js b/planet.js @@ -860,6 +860,7 @@ planet.addEventListener('trackedobjectadd', async e => {
planet.addEventListener('trackedobjectremove', async e => {
// XXX
});
+planet.isObject = object => objects.includes(object);
planet.intersectObjects = raycaster => {
return false; // XXX
};
\ No newline at end of file
| 0 |
diff --git a/NotAnAnswerFlagQueueHelper.user.js b/NotAnAnswerFlagQueueHelper.user.js // @description Inserts several sort options for the NAA / VLQ / Review LQ Disputed queues
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 3.5
+// @version 3.5.1
//
// @include */admin/dashboard?flagtype=postother*
// @include */admin/dashboard?flagtype=postlowquality*
@@ -491,9 +491,6 @@ input.js-helpful-purge {
margin: 10px 8px 15px !important;
background: #f6f6f6;
}
-.js-mod-history {
- padding: 5px 12px;
-}
.js-flagged-post {
margin-top: 10px !important;
margin-bottom: 20px !important;
| 2 |
diff --git a/package.json b/package.json "queue": "*",
"debug": "^4.1.1",
"serialport": "^6.2.2",
- "zigbee-shepherd": "https://github.com/kirovilya/zigbee-shepherd/tarball/1fc9189891e36a6af2fad772c57eccca56f060d4",
+ "zigbee-shepherd": "https://github.com/kirovilya/zigbee-shepherd/commit/13fbc39a2a8528e4d92c1a445c555854c2abb1b5",
"zigbee-shepherd-converters": "^8.0.14",
"@iobroker/adapter-core": "^1.0.3"
},
| 3 |
diff --git a/README.md b/README.md @@ -34,29 +34,20 @@ Full deployment documentation is available [here](https://github.com/HospitalRun
6. Copy the `config-example.js` to `config.js` in the folder you cloned the HospitalRun repository. If you already had a CouchDB admin user that you passed into the couch script (`initcouch.sh USER PASS`), then you will need to modify the `couchAdminUser` and `couchAdminPassword` values in `config.js` to reflect those credentials.
7. If you are on Linux distribution that uses **Upstart**, there is an upstart script in `utils/hospitalrun.conf`. By default this script assumes the server is installed at `/var/app/server`. This script relies on [forever](https://github.com/foreverjs/forever) which you will need to install via npm: `npm install -g forever`
* alternatively you can run server using npm's scripts `npm start` (this is not recommended for production usage).
-8. Search on the HospitalRun Server uses [elasticsearch](https://github.com/elastic/elasticsearch). You will also need the [CouchDB River Plugin for Elasticsearch](https://github.com/elastic/elasticsearch-river-couchdb) and the [JavaScript language Plugin for elasticsearch](https://github.com/elastic/elasticsearch-lang-javascript). If you are installing on a debian server you can use the following steps to setup elasticsearch and java (if needed):
+8. Search on the HospitalRun Server uses [Elasticsearch 5.x](https://www.elastic.co/products/elasticsearch) and [Logstash 5.x](https://www.elastic.co/products/logstash). If you are installing on a debian server you can use the following steps to setup elasticsearch and java (if needed):
```bash
- wget -qO - https://packages.elasticsearch.org/GPG-KEY-elasticsearch | sudo apt-key add -
- echo "deb http://packages.elastic.co/elasticsearch/1.6/debian stable main" | sudo tee -a /etc/apt/sources.list
+ wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
+ echo "deb https://artifacts.elastic.co/packages/5.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-5.x.list
+ sudo apt-get install apt-transport-https
sudo add-apt-repository ppa:webupd8team/java
sudo apt-get update
- sudo apt-get install oracle-java8-installer elasticsearch
- sudo update-rc.d elasticsearch defaults 95 10
- cd /usr/share/elasticsearch/
- sudo bin/plugin install elasticsearch/elasticsearch-river-couchdb/2.6.0
- sudo bin/plugin -install elasticsearch/elasticsearch-lang-javascript/2.6.0
- ```
-9. Add the following line to `/etc/elasticsearch/elasticsearch.yml` (or wherever your ElasticSearch configuration is located):
-
- ```
- script.disable_dynamic: false
- ```
-10. Start ElasticSearch. On debian/ubuntu: `service elasticsearch start`
-11. Run the setup script for linking CouchDB to ElasticSearch. You will need to specify the username and password for the HospitalRun admin account you created with `initcouch.sh` in [HospitalRun/frontend](https://github.com/HospitalRun/frontend/blob/master/script/initcouch.sh):
-
- ```
- /utils/elasticsearch.sh hradmin password
+ sudo apt-get install oracle-java8-installer elasticsearch logstash
+ sudo logstash-plugin update --no-verify logstash-input-couchdb_changes
+ sudo cp logstash/pipeline/logstash.conf /usr/share/logstash/pipeline/
+ sudo cp logstash/config/* /usr/share/logstash/config/
+ sudo service logstash restart
+ service elasticsearch restart
```
## Inventory Import
| 3 |
diff --git a/website/riot/entry-formatting/display-styles.riot b/website/riot/entry-formatting/display-styles.riot let value = existingData[key] || null
if (elementConfigData[key] != null) {
value = elementConfigData[key]
+ } else if (key === "layout"){
+ if (!value) {
+ value = "inline"
+ }
+ this.props.saveData(this.elementName, this.attributeName, "layout", value)
}
this.state.elementData[key] = value
}
| 12 |
diff --git a/token-metadata/0xe2f2a5C287993345a840Db3B0845fbC70f5935a5/metadata.json b/token-metadata/0xe2f2a5C287993345a840Db3B0845fbC70f5935a5/metadata.json "symbol": "MUSD",
"address": "0xe2f2a5C287993345a840Db3B0845fbC70f5935a5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/carto/importer/table_setup.rb b/lib/carto/importer/table_setup.rb @@ -38,7 +38,7 @@ module Carto
AND am.amname = 'gist'
) OR (
a.attname = '#{::Table::CARTODB_ID}'
- AND ir.relname <> '#{origin_table_name}_pkey'
+ AND ir.relname = '#{origin_table_name}_pkey'
)
)
)
| 8 |
diff --git a/test/jasmine/tests/cartesian_interact_test.js b/test/jasmine/tests/cartesian_interact_test.js @@ -440,3 +440,83 @@ describe('axis zoom/pan and main plot zoom', function() {
.then(done);
});
});
+
+describe('Event data:', function() {
+ var gd;
+
+ beforeEach(function() {
+ gd = createGraphDiv();
+ });
+
+ afterEach(destroyGraphDiv);
+
+ function _hover(px, py) {
+ return new Promise(function(resolve, reject) {
+ gd.once('plotly_hover', function(d) {
+ delete gd._lastHoverTime;
+ resolve(d);
+ });
+
+ mouseEvent('mousemove', px, py);
+
+ setTimeout(function() {
+ reject('plotly_hover did not get called!');
+ }, 100);
+ });
+ }
+
+ it('should have correct content for *scatter* traces', function(done) {
+ Plotly.plot(gd, [{
+ y: [1, 2, 1],
+ marker: {
+ color: [20, 30, 10],
+ colorbar: {
+ tickvals: [25],
+ ticktext: ['one single tick']
+ }
+ }
+ }], {
+ width: 500,
+ height: 500
+ })
+ .then(function() { return _hover(200, 200); })
+ .then(function(d) {
+ var pt = d.points[0];
+
+ expect(pt.y).toBe(2, 'y');
+ expect(pt['marker.color']).toBe(30, 'marker.color');
+ expect('marker.colorbar.tickvals' in pt).toBe(false, 'marker.colorbar.tickvals');
+ expect('marker.colorbar.ticktext' in pt).toBe(false, 'marker.colorbar.ticktext');
+ })
+ .catch(fail)
+ .then(done);
+ });
+
+ it('should have correct content for *heatmap* traces', function(done) {
+ Plotly.plot(gd, [{
+ type: 'heatmap',
+ z: [[1, 2, 1], [2, 3, 1]],
+ colorbar: {
+ tickvals: [2],
+ ticktext: ['one single tick']
+ },
+ text: [['incomplete array']],
+ ids: [['incomplete array']]
+ }], {
+ width: 500,
+ height: 500
+ })
+ .then(function() { return _hover(200, 200); })
+ .then(function(d) {
+ var pt = d.points[0];
+
+ expect(pt.z).toBe(3, 'z');
+ expect(pt.text).toBe(undefined, 'undefined text items are included');
+ expect('id' in pt).toBe(false, 'undefined ids items are not included');
+ expect('marker.colorbar.tickvals' in pt).toBe(false, 'marker.colorbar.tickvals');
+ expect('marker.colorbar.ticktext' in pt).toBe(false, 'marker.colorbar.ticktext');
+ })
+ .catch(fail)
+ .then(done);
+ });
+});
| 0 |
diff --git a/docs/en/installation.md b/docs/en/installation.md [https://unpkg.com/vue-router/dist/vue-router.js](https://unpkg.com/vue-router/dist/vue-router.js)
<!--email_off-->
-[Unpkg.com](https://unpkg.com) provides NPM-based CDN links. The above link will always point to the latest release on NPM. You can also use a specific version/tag via URLs like `https://unpkg.com/[email protected]/dist/vue-router.js`.
+[Unpkg.com](https://unpkg.com) provides npm-based CDN links. The above link will always point to the latest release on npm. You can also use a specific version/tag via URLs like `https://unpkg.com/[email protected]/dist/vue-router.js`.
<!--/email_off-->
Include `vue-router` after Vue and it will install itself automatically:
@@ -15,7 +15,7 @@ Include `vue-router` after Vue and it will install itself automatically:
<script src="/path/to/vue-router.js"></script>
```
-### NPM
+### npm
``` bash
npm install vue-router
| 14 |
diff --git a/edit.js b/edit.js @@ -3850,8 +3850,29 @@ class MeshComposer {
}
update() {
if (this.placeMesh) {
- this.placeMesh.position.copy(rigManager.localRig.inputs.leftGamepad.position);
- this.placeMesh.quaternion.copy(rigManager.localRig.inputs.leftGamepad.quaternion);
+ const {position, quaternion} = rigManager.localRig.inputs.leftGamepad;
+ this.placeMesh.position.copy(position);
+ this.placeMesh.quaternion.copy(quaternion);
+
+ this.targetMesh.visible = false;
+ const closestMesh = (() => {
+ let closestMesh = null;
+ let closestMeshDistance = Infinity;
+ for (const mesh of this.meshes) {
+ const distance = mesh.position.distanceTo(position);
+ if (distance < closestMeshDistance) {
+ closestMesh = mesh;
+ closestMeshDistance = distance;
+ }
+ }
+ return closestMesh;
+ })();
+ if (closestMesh && closestMesh.position.distanceTo(position) < 0.3) {
+ this.targetMesh.position.copy(closestMesh.position);
+ this.targetMesh.quaternion.copy(closestMesh.quaternion);
+ this.targetMesh.scale.copy(closestMesh.scale);
+ this.targetMesh.visible = true;
+ }
}
}
}
| 0 |
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js @@ -143,7 +143,7 @@ class ConcatenatedModule extends Module {
this.cacheable = modules.every(m => m.cacheable);
const modulesSet = new Set(modules);
this.reasons = rootModule.reasons.filter(reason => !modulesSet.has(reason.module));
- this.dependencies = [].concat.apply([], modules.map(m => m.dependencies.filter(dep => !modulesSet.has(dep.module))));
+ this.dependencies = [];
this.meta = rootModule.meta;
this.dependenciesWarnings = modules.reduce((w, m) => m.dependenciesWarnings.forEach(x => w.push(x)), []);
this.dependenciesErrors = modules.reduce((w, m) => m.dependenciesErrors.forEach(x => w.push(x)), []);
| 2 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -861,7 +861,9 @@ const _updateWeapons = () => {
inventoryUpdate();
- updateSphere();
+ for (const ticker of tickers) {
+ ticker.update();
+ }
};
/* const cubeMesh = new THREE.Mesh(new THREE.BoxBufferGeometry(0.01, 0.01, 0.01), new THREE.MeshBasicMaterial({
@@ -1615,13 +1617,16 @@ renderer.domElement.addEventListener('drop', async e => {
scene.add(cubeMesh); */
import Simplex from './simplex-noise.js';
+const tickers = [];
const simplex = new Simplex('lol'); // new MultiSimplex('lol', 6);
+const _addSphere = () => {
const sphere = new THREE.Mesh(new THREE.BoxGeometry(0.1, 0.05, 0.1, 10, 10, 10), new THREE.MeshNormalMaterial());
sphere.position.set(0, 1.4, 1);
sphere.scale.y = 0.3;
sphere.scale.multiplyScalar(0.5);
scene.add(sphere);
-function updateSphere() {
+ const ticker = {
+ update() {
// change '0.003' for more aggressive animation
var time = performance.now() * 0.002;
//console.log(time)
@@ -1638,7 +1643,11 @@ function updateSphere() {
sphere.geometry.computeVertexNormals();
sphere.geometry.normalsNeedUpdate = true;
sphere.geometry.verticesNeedUpdate = true;
+ },
+ };
+ tickers.push(ticker);
};
+_addSphere();
const weaponsManager = {
// weapons,
| 0 |
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb @@ -94,9 +94,13 @@ class ApplicationController < ActionController::Base
# use params[:locale] for single-request locale settings,
# otherwise use the session, user's preferred, or site default,
# or application default locale
- I18n.locale = params[:locale] || session[:locale] ||
- current_user.try(:locale) || @site.locale || locale_from_header ||
- I18n.default_locale
+ locale = params[:locale]
+ locale = session[:locale] if locale.blank?
+ locale = current_user.try(:locale) if locale.blank?
+ locale = @site.locale if locale.blank?
+ locale = locale_from_header if locale.blank?
+ locale = I18n.default_locale if locale.blank?
+ I18n.locale = locale
unless I18N_SUPPORTED_LOCALES.include?( I18n.locale.to_s )
I18n.locale = I18n.default_locale
end
| 9 |
diff --git a/templates/emails/collective.virtualcard.added.hbs b/templates/emails/collective.virtualcard.added.hbs @@ -5,25 +5,22 @@ Subject: Virtual Card added to {{collective.name}}
<center>
<h1>
- {{host.name}} added a new Virtual Card to {{collective.name}}
+ Virtual Card added for {{collective.name}}
</h1>
</center>
<p>
- {{host.name}} added a new Virtual Card to your collective {{collective.name}}. This means that you also agreed with
- the policy defined by {{host.name}} for using Virtual Cards. As a reminder, you have agreed to their virtual card use
- policy and you can find it <a href="{{config.host.website}}/{{collective.slug}}/admin/virtual-cards">here</a></p>
+ You have a new Virtual Card for {{collective.name}}. Use it like a credit or debit card online to spend directly from your Collective balance.
+</p>
+<p>
+ View and manage cards on your <a href="{{config.host.website}}/{{collective.slug}}/admin/virtual-cards">Virtual Cards settings page</a>, where you can also review {{host.name}}'s Virtual Card policy.
+</p>
<p>
- <strong>
- Please, make sure to keep all expenses up-to-date, uploading the payment receipt to every charge you have
- on this card. After each charge, you will receive an email with an invitation to submit the receipt of
- the purchase made. Your host may pause the card for future charges until you do.
- </strong>
+ Each charge to this card will trigger an email instructing you to submit the receipt. Your Fiscal Host may freeze the card if you do not upload all receipts. You can view all Virtual Card charges on your <a href="{{config.host.website}}/{{collective.slug}}/expenses">Expenses page</a>.
</p>
<p>
- For more info, please go ahead and read <a
- href="https://docs.opencollective.com/help/expenses-and-getting-paid/virtual-cards">the virtual cards documentation
- and FAQs</a>.
+ For more info, see <a
+ href="https://docs.opencollective.com/help/expenses-and-getting-paid/virtual-cards">the Virtual Cards documentation</a>.
</p>
@@ -32,7 +29,7 @@ Subject: Virtual Card added to {{collective.name}}
<center>
<a href="{{config.host.website}}/{{collective.slug}}/admin/virtual-cards" class="btn blue">
- See Virtual Cards
+ Your Virtual Cards
</a>
</center>
| 7 |
diff --git a/src/components/Plotter/Plotter.js b/src/components/Plotter/Plotter.js @@ -118,6 +118,7 @@ export const Plotter = ({ data, layout={}, xaxis={}, yaxis={}, config={}, margin
useResizeHandler={ true }
style={{ display: "block", height: 350 }}
layout={ {
+ hovermode: "x unified",
// barmode: "overlay",
// barmode: "stack",
// height: 320,
| 7 |
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] I have signed the [Adobe Open Source CLA](https://opensource.adobe.com/cla.html) or I'm an Adobe employee.
-- [ ] I have submitted a [documentation](https://github.com/AdobeDocs/alloy-docs) pull request or no changes are needed.
- [ ] I have made any necessary test changes and all tests pass.
- [ ] I have run the Sandbox successfully.
| 2 |
diff --git a/src/content/getusermedia/getdisplaymedia/js/main.js b/src/content/getusermedia/getdisplaymedia/js/main.js @@ -43,9 +43,9 @@ class ScreenSharing extends LitElement {
height: 100%;
}
video {
- --videoWidth: 100%;
- width: var(--videoWidth);
- height: calc(var(--videoWidth) * (16 / 9));
+ --video-width: 100%;
+ width: var(--video-width);
+ height: calc(var(--video-width) * (16 / 9));
}
</style>
<video playsinline autoplay muted .srcObject="${this.stream}"></video>
| 10 |
diff --git a/_includes/meshery.html b/_includes/meshery.html href="https://github.com/layer5io/meshery/blob/master/README.md#running-meshery">Download</a> </h3> -->
<!-- <h4 style="color:aliceblue;">Features</h4> -->
<div class="row">
+ <div id="meshery" class="card-content row">
+ <div class="col s12 m12">
+ <h5 style="text-align:center;color:aliceblue;">
+ <a style="font-size:.9em;padding-bottom:40px;padding-top:10px;width:300px;"
+ class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
+ href="#getting-started">Run Meshery</a>
+ </h5>
+ </div>
+ <!-- <div class="col s12 m6">
+ <h5 style="text-align:center;color:aliceblue;">
+ <a style="font-size:.9em;padding-bottom:40px;padding-top:10px;width:300px;"
+ class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
+ href="#smi">Service Mesh Interface</a> </h5>
+ </div> -->
+ </div>
+
<div class="col s12 m6">
<div class="card" style="z-index: 1;">
<!-- <div class="card-image">
</div>
</div>
-<div id="meshery" class="card-content row">
- <div class="col s12 m6">
- <h5 style="text-align:center;color:aliceblue;">
- <a style="font-size:.9em;padding-bottom:40px;padding-top:10px;width:300px;"
- class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
- href="#getting-started">Run Meshery</a>
- </h5>
- </div>
- <div class="col s12 m6">
- <h5 style="text-align:center;color:aliceblue;">
- <a style="font-size:.9em;padding-bottom:40px;padding-top:10px;width:300px;"
- class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
- href="#smi">Service Mesh Interface</a> </h5>
- </div>
-</div>
-
<div class="post-content row" style="position: relative;overflow: auto;" itemprop="articleBody">
<!-- <div style="margin-left: 0 auto; display: flex;text-align: center; justify-content: center; "> -->
<div class="col s12 m3" style="text-align: center;position:relative;float:left;">
| 14 |
diff --git a/bin/schemas.js b/bin/schemas.js **/
'use strict';
const Exception = require('./exception');
+const util = require('./util');
// define what properties are allowed for which types
const validations = {};
@@ -60,11 +61,7 @@ module.exports = {
const exception = Exception('Cannot merge schemas');
const merged = merge(exception, validations[version], schemas, options);
- const message = exception.toString();
- if (message && options.throw) throw Error(message);
- return options.throw
- ? merged
- : { error: message ? exception : null, value: message ? null : merged };
+ return util.errorHandler(options.throw, exception, merged);
},
/**
| 4 |
diff --git a/main/main.js b/main/main.js @@ -64,7 +64,16 @@ function handleCommandLineArguments (argv) {
function createWindow (cb) {
var savedBounds = fs.readFile(path.join(userDataPath, 'windowBounds.json'), 'utf-8', function (e, data) {
- if (e || !data) { // there was an error, probably because the file doesn't exist
+ var bounds
+
+ if (data) {
+ try {
+ bounds = JSON.parse(data)
+ } catch (e) {
+ console.warn('error parsing window bounds file: ', e)
+ }
+ }
+ if (e || !data || !bounds) { // there was an error, probably because the file doesn't exist
var size = electron.screen.getPrimaryDisplay().workAreaSize
var bounds = {
x: 0,
@@ -72,8 +81,6 @@ function createWindow (cb) {
width: size.width,
height: size.height
}
- } else {
- var bounds = JSON.parse(data)
}
// maximizes the window frame in windows 10
| 8 |
diff --git a/token-metadata/0x66fD97a78d8854fEc445cd1C80a07896B0b4851f/metadata.json b/token-metadata/0x66fD97a78d8854fEc445cd1C80a07896B0b4851f/metadata.json "symbol": "LMY",
"address": "0x66fD97a78d8854fEc445cd1C80a07896B0b4851f",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js @@ -380,7 +380,7 @@ class ReportActionCompose extends React.Component {
* @param {String} comment
* @param {Boolean} shouldDebounceSaveComment
*/
- updateComment(newComment, shouldDebounceSaveComment) {
+ updateComment(comment, shouldDebounceSaveComment) {
const newComment = EmojiUtils.replaceEmojis(comment);
this.setState({
isCommentEmpty: !!newComment.match(/^(\s|`)*$/),
| 10 |
diff --git a/src/components/tabs/__tests__/Tabs.test.js b/src/components/tabs/__tests__/Tabs.test.js @@ -57,7 +57,7 @@ describe('Tabs', () => {
test('tracks most recently clicked tab with "active_tab" prop', () => {
const mockSetProps = jest.fn();
const {container, getByText, rerender} = render(
- <Tabs setProps={mockSetProps}>
+ <Tabs setProps={mockSetProps} active_tab="tab-0">
<Tab label="tab-label-1">tab-content-1</Tab>
<Tab label="tab-label-2">tab-content-2</Tab>
</Tabs>
| 12 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -333,11 +333,9 @@ const baseReducer = ( state, { type, payload } ) => {
}
case RECEIVE_CHECK_REQUIREMENTS_ERROR: {
- const { errorMap } = payload;
-
const checkRequirementsResults = { ...state.checkRequirementsResults };
- for ( const [ slug, error ] of Object.entries( errorMap ) ) {
+ for ( const [ slug, error ] of Object.entries( payload ) ) {
checkRequirementsResults[ slug ] = error;
}
@@ -380,26 +378,32 @@ const baseResolvers = {
const module = registry.select( STORE_NAME ).getModule( slug );
const inactiveModules = [];
+
module.dependencies.forEach( ( dependencySlug ) => {
const dependedentModule = registry.select( STORE_NAME ).getModule( dependencySlug );
if ( ! dependedentModule.active ) {
inactiveModules.push( dependedentModule.name );
}
} );
- const formatter = new Intl.ListFormat( getLocale(), { style: 'long', type: 'conjunction' } );
- const checkResult = yield module.checkRequirements();
+
+ // If we have inactive dependencies, there's no need to check if we can
+ // activate the module until the dependencies have been activated.
if ( inactiveModules.length ) {
+ const formatter = new Intl.ListFormat( getLocale(), { style: 'long', type: 'conjunction' } );
+
/* translators: Error message text. 1: A flattened list of module names. 2: A module name. */
const errorMessage = sprintf( __( 'You need to set up %1$s to gain access to %2$s.', 'google-site-kit' ), formatter.format( inactiveModules ), module.name );
- console.log( errorMessage ); // eslint-disable-line no-console
- // @TODO: What do we do with this errorMessage?
- }
+
+ yield baseActions.receiveCheckRequirementsError( { [ slug ]: errorMessage } );
+ } else {
+ const checkResult = yield module.checkRequirements();
if ( checkResult === true ) {
yield baseActions.receiveCheckRequirementsSuccess( slug );
} else {
yield baseActions.receiveCheckRequirementsError( checkResult );
}
+ }
},
};
@@ -640,6 +644,7 @@ const baseSelectors = {
canActivateModule( state, slug ) {
const moduleRequirements = state.checkRequirementsResults?.[slug];
+
if ( moduleRequirements === undefined ) {
return undefined;
}
| 9 |
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -82,10 +82,8 @@ class ReportActionItemMessageEdit extends React.Component {
this.textInput.setNativeProps({text: newDraft});
this.setState({draft: newDraft});
- /**
- * This component is rendered only when draft is set to a non-empty string. In order to prevent component
- * unmount when user deletes content of textarea, we set previous message instead of empty string.
- */
+ // This component is rendered only when draft is set to a non-empty string. In order to prevent component
+ // unmount when user deletes content of textarea, we set previous message instead of empty string.
if (newDraft.trim().length > 0) {
this.debouncedSaveDraft(newDraft);
} else {
@@ -116,9 +114,8 @@ class ReportActionItemMessageEdit extends React.Component {
* the new content.
*/
publishDraft() {
- /**
- * To prevent re-mount after user saves edit before debounce duration (example: within 1 second), we cancel debounce here.
- */
+ // To prevent re-mount after user saves edit before debounce duration (example: within 1 second), we cancel
+ // debounce here.
this.debouncedSaveDraft.cancel();
const trimmedNewDraft = this.state.draft.trim();
| 14 |
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js fragment: document.createDocumentFragment()
}
+ elementTemplates.noResults = elementTemplates.li.cloneNode(false);
+ elementTemplates.noResults.className = 'no-results';
+
elementTemplates.a.setAttribute('role', 'option');
if (version.major === '4') elementTemplates.a.className = 'dropdown-item';
}
}
+ function showNoResults (searchMatch, searchValue) {
+ if (!searchMatch.length) {
+ elementTemplates.noResults.innerHTML = this.options.noneResultsText.replace('{0}', '"' + htmlEscape(searchValue) + '"');
+ this.$menuInner[0].firstChild.appendChild(elementTemplates.noResults);
+ }
+ }
+
var Selectpicker = function (element, options) {
var that = this;
},
liveSearchListener: function () {
- var that = this,
- noResults = document.createElement('li');
+ var that = this;
this.$button.on('click.bs.dropdown.data-api', function () {
if (!!that.$searchbox.val()) {
that.$menuInner.scrollTop(0);
that.selectpicker.search.elements = searchMatch;
that.createView(true);
-
- if (!searchMatch.length) {
- noResults.className = 'no-results';
- noResults.innerHTML = that.options.noneResultsText.replace('{0}', '"' + htmlEscape(searchValue) + '"');
- that.$menuInner[0].firstChild.appendChild(noResults);
- }
+ showNoResults.call(that, searchMatch, searchValue);
} else {
that.$menuInner.scrollTop(0);
that.createView(false);
| 5 |
diff --git a/src/TemplateWriter.js b/src/TemplateWriter.js @@ -241,12 +241,16 @@ TemplateWriter.prototype._getCollectionsData = function(activeTemplate) {
collections.all = this._createTemplateMapCopy(
this.collection.getAllSorted(activeTemplate)
);
+ debug(`Collection: collections.all has ${collections.all.length} items.`);
let tags = this._getAllTagsFromMap(collections.all);
for (let tag of tags) {
collections[tag] = this._createTemplateMapCopy(
this.collection.getFilteredByTag(tag, activeTemplate)
);
+ debug(
+ `Collection: collections.${tag} has ${collections[tag].length} items.`
+ );
}
let configCollections = eleventyConfig.getCollections();
@@ -254,6 +258,9 @@ TemplateWriter.prototype._getCollectionsData = function(activeTemplate) {
collections[name] = this._createTemplateMapCopy(
configCollections[name](this.collection)
);
+ debug(
+ `Collection: collections.${name} has ${collections[name].length} items.`
+ );
}
// console.log( "collections>>>>", collections );
| 0 |
diff --git a/ui/page/livestreamSetup/view.jsx b/ui/page/livestreamSetup/view.jsx @@ -28,6 +28,7 @@ export default function LivestreamSetupPage(props: Props) {
const [sigData, setSigData] = React.useState({ signature: undefined, signing_ts: undefined });
const [showHelpTest, setShowHelpTest] = usePersistedState('livestream-help-seen', true);
+ const [spin, setSpin] = React.useState(true);
const hasChannels = channels && channels.length > 0;
const activeChannelClaimStr = JSON.stringify(activeChannelClaim);
@@ -118,11 +119,13 @@ export default function LivestreamSetupPage(props: Props) {
} else {
setLivestreamClaims([]);
}
+ setSpin(false);
})
.catch(() => {
setLivestreamClaims([]);
+ setSpin(false);
});
- }, [activeChannelClaimStr, pendingLength, setShowHelpTest]);
+ }, [activeChannelClaimStr, pendingLength, setSpin]);
return (
<Page>
@@ -143,14 +146,21 @@ export default function LivestreamSetupPage(props: Props) {
}
/>
)}
-
- <div className="card-stack">
- {!fetchingChannels && activeChannelClaim && (
- <>
+ {!fetchingChannels && (
<div className="section__actions--between">
<ChannelSelector hideAnon />
<Button button="link" onClick={() => setShowHelpTest(!showHelpTest)} label={__('How does this work?')} />
</div>
+ )}
+
+ {spin && !fetchingChannels && (
+ <div className="main--empty">
+ <Spinner delayed />
+ </div>
+ )}
+ <div className="card-stack">
+ {!spin && !fetchingChannels && activeChannelClaim && (
+ <>
{showHelpTest && (
<Card
titleActions={<Button button="close" icon={ICONS.REMOVE} onClick={() => setShowHelpTest(false)} />}
| 7 |
diff --git a/code/js/modules/Sitelist.js b/code/js/modules/Sitelist.js "plex": { name: "Plex", url: "http://www.plex.tv" },
"pluralsight": { name: "Pluralsight", url: "https://app.pluralsight.com" },
"pocketcasts": { name: "Pocketcasts", url: "https://play.pocketcasts.com" },
- "y.qq.com/portal/player.html": { name: "QQ Music", url: "https://y.qq.com/portal/player.html", controller: "QQController.js" },
+ "qq.com/portal/player.html": { name: "QQ Music", url: "https://y.qq.com/portal/player.html", controller: "QQController.js" },
"radd": { name: "radd.it", url: "http://radd.it", controller: "RadditController.js" },
"radioparadise": { name: "RadioParadise", url: "http://www.radioparadise.com" },
"radioswissjazz": { name: "RadioSwissJazz", url: "http://www.radioswissjazz.ch" },
| 10 |
diff --git a/webaverse.js b/webaverse.js @@ -382,6 +382,8 @@ export default class Webaverse extends EventTarget {
world.appManager.pretick(timestamp, frame);
ioManager.update(timeDiffCapped);
+ cameraManager.update(timeDiffCapped);
+
// universe.update();
if (this.contentLoaded) {
// if (controlsManager.isPossessed()) {
| 0 |
diff --git a/README.md b/README.md @@ -41,7 +41,7 @@ For more information surrounding configuration, compiling and other developer do
### Disclaimer
*This project is NOT affiliated with Apple in any way shape or form. The project is open source and free to use (with an Apple Music subscription)
-for any legal concerns contact me at <a href="mailto:[email protected]">[email protected]</a>.*
+for any legal concerns contact me at <a href="mailto:[email protected]">[email protected]</a>.*
<p align="center">
<br>
| 3 |
diff --git a/src/Services/Air/AirParser.js b/src/Services/Air/AirParser.js @@ -432,7 +432,8 @@ const AirErrorHandler = function (obj) {
};
const airGetTicket = function (obj) {
- const passengersList = obj['air:ETR'][`common_${this.uapi_version}:BookingTraveler`];
+ const etr = obj['air:ETR'];
+ const passengersList = etr[`common_${this.uapi_version}:BookingTraveler`];
const passengers = Object.keys(passengersList).map(
passengerKey => ({
key: passengerKey,
@@ -440,12 +441,69 @@ const airGetTicket = function (obj) {
lastName: passengersList[passengerKey][`common_${this.uapi_version}:BookingTravelerName`].Last,
})
);
+ const airPricingInfo = etr['air:AirPricingInfo'][
+ Object.keys(etr['air:AirPricingInfo'])[0]
+ ];
+ const bookingInfo = airPricingInfo['air:BookingInfo'];
+ const ticketsList = etr['air:Ticket'];
+ let segmentIterator = 0;
+ const tickets = Object.keys(ticketsList).map(
+ (ticketKey) => {
+ const ticket = ticketsList[ticketKey];
+ return {
+ key: ticketKey,
+ ticketNumber: ticket.TicketNumber,
+ coupons: Object.keys(ticket['air:Coupon']).map(
+ (couponKey) => {
+ const coupon = ticket['air:Coupon'][couponKey];
+ const couponInfo = {
+ key: couponKey,
+ couponNumber: coupon.CouponNumber,
+ from: coupon.Origin,
+ to: coupon.Destination,
+ departure: coupon.DepartureTime,
+ airline: coupon.MarketingCarrier,
+ flightNumber: coupon.MarketingFlightNumber,
+ fareBasisCode: coupon.FareBasis,
+ status: coupon.Status,
+ notValidBefore: coupon.NotValidBefore,
+ notValidAfter: coupon.NotValidAfter,
+ serviceClass: bookingInfo[segmentIterator].CabinClass,
+ bookingClass: bookingInfo[segmentIterator].BookingCode,
+ };
+ // Incrementing segment index
+ segmentIterator += 1;
+ // Returning coupon info
+ return couponInfo;
+ }
+ ),
+ };
+ }
+ );
+ const taxes = Object.keys(airPricingInfo['air:TaxInfo']).map(
+ taxKey => ({
+ type: airPricingInfo['air:TaxInfo'][taxKey].Category,
+ value: airPricingInfo['air:TaxInfo'][taxKey].Amount,
+ })
+ );
const response = {
- type: 'airTicket',
+ type: 'airTicketDocument',
uapi_ur_locator: obj.UniversalRecordLocatorCode,
- uapi_reservation_locator: obj['air:ETR']['air:AirReservationLocatorCode'],
- pnr: obj['air:ETR'].ProviderLocatorCode,
+ uapi_reservation_locator: etr['air:AirReservationLocatorCode'],
+ pnr: etr.ProviderLocatorCode,
+ platingCarrier: etr.PlatingCarrier,
+ pcc: etr.PseudoCityCode,
+ issuedAt: etr.IssuedDate,
+ fareCalculation: etr['air:FareCalc'],
+ priceInfo: {
+ TotalPrice: etr.TotalPrice,
+ BasePrice: etr.BasePrice,
+ EquivalentBasePrice: etr.EquivalentBasePrice,
+ Taxes: etr.Taxes,
+ TaxesInfo: taxes,
+ },
passengers,
+ tickets,
};
return response;
| 0 |
diff --git a/app/shared/containers/Global/Blockchain/Dropdown.js b/app/shared/containers/Global/Blockchain/Dropdown.js @@ -36,6 +36,7 @@ class GlobalBlockchainDropdown extends Component<Props> {
blockchains,
selection,
settings,
+ style,
t,
} = this.props;
let defaultLocString = 'global_account_select_blockchain_default';
@@ -80,6 +81,7 @@ class GlobalBlockchainDropdown extends Component<Props> {
item
labeled
selection={selection}
+ style={style}
trigger={(
<span>
<GlobalFragmentChainLogo
| 11 |
diff --git a/packages/openneuro-server/Dockerfile b/packages/openneuro-server/Dockerfile @@ -11,6 +11,8 @@ FROM node:12.18.2-alpine3.12 AS server
COPY --from=build /srv/node_modules /srv/node_modules
COPY --from=build /srv/packages/openneuro-server/dist /srv/dist
+COPY --from=build /srv/packages/openneuro-server/src/libs/doi/templates/*.html /srv/dist/src/libs/doi/templates/
+COPY --from=build /srv/packages/openneuro-server/src/libs/email/templates/*.html /srv/dist/src/libs/email/templates/
HEALTHCHECK --interval=10s --retries=10 CMD curl -f 'http://localhost:8111' || exit 1
ENV NODE_OPTIONS=--max_old_space_size=1024
| 1 |
diff --git a/cypress/v1.0/documentation/1-Commands/35-location.md b/cypress/v1.0/documentation/1-Commands/35-location.md slug: location
excerpt: Get the `window.location`
-Get the `window.location`.
+Get the remote `window.location` as a normalized object.
+
+| | |
+|--- | --- |
+| **Returns** | location object detailed below |
+| **Timeout** | *cannot timeout* |
+
+# [cy.location()](#section-usage)
Given a remote URL of `http://localhost:8000/app/index.html?q=dan#/users/123/edit`, an object would be returned with the following properties:
@@ -18,16 +25,11 @@ Key | Type | Returns
`search` | string | ?q=brian
`toString` | function | http://localhost:8000/app/index.html?q=brian#/users/123/edit
-| | |
-|--- | --- |
-| **Returns** | location object detailed above |
-| **Timeout** | *cannot timeout* |
-
***
-# [cy.location()](#section-usage)
+# [cy.location( *key* )](#section-key-usage)
-Get the `window.location`
+Get the specific value by key of the location object above.
***
@@ -36,6 +38,7 @@ Get the `window.location`
Pass in an options object to change the default behavior of `cy.location`.
**cy.location( *options* )**
+**cy.location( *key*, *options* )**
Option | Default | Notes
--- | --- | ---
@@ -45,17 +48,6 @@ Option | Default | Notes
# Usage
-## Assert that a redirect works
-
-```javascript
-// we should be redirected to the login page
-cy
- .visit("http://localhost:3000/admin")
- .location().its("pathname").should("eq", "/login")
-```
-
-***
-
## Check location for query params and pathname
```javascript
@@ -63,7 +55,7 @@ cy
// it directly as an object
cy
.get("#search").type("brian{enter}")
- .location().then(function(location){
+ .location().should(function(location){
expect(location.search).to.eq("?search=brian")
expect(location.pathname).to.eq("/users")
expect(location.toString()).to.eq("http://localhost:8000/users?search=brian")
@@ -72,6 +64,19 @@ cy
***
+# Key Usage
+
+## Assert that a redirect works
+
+```javascript
+// we should be redirected to the login page
+cy
+ .visit("http://localhost:3000/admin")
+ .location("pathname").should("eq", "/login")
+```
+
+***
+
# Notes
## Do not use `window.location`
@@ -105,16 +110,18 @@ When changing properties on the real `window.location` object, it will force the
## Assert on the location's href
```javascript
-cy.location().its("href").should("include", "#users/new")
+cy.location().should(function(location){
+ expect(location.href).to.include("commands/querying")
+})
```
The commands above will display in the command log as:
-<img width="581" alt="screen shot 2015-11-29 at 1 39 13 pm" src="https://cloud.githubusercontent.com/assets/1271364/11459185/b2bca74a-969e-11e5-85b5-3d154efd57a7.png">
+
When clicking on `location` within the command log, the console outputs the following:
-<img width="818" alt="screen shot 2015-11-29 at 1 39 30 pm" src="https://cloud.githubusercontent.com/assets/1271364/11459186/b6766bc8-969e-11e5-85b4-d9a1c67e6ef2.png">
+
***
| 7 |
diff --git a/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs @@ -27,6 +27,8 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.netflix.zuul.filters.Route;
import org.springframework.cloud.netflix.zuul.filters.RouteLocator;
import org.springframework.http.*;
+import org.springframework.security.access.annotation.Secured;
+import <%=packageName%>.security.AuthoritiesConstants;
import org.springframework.web.bind.annotation.*;
import com.codahale.metrics.annotation.Timed;
@@ -54,6 +56,7 @@ public class GatewayResource {
*/
@GetMapping("/routes")
@Timed
+ @Secured(AuthoritiesConstants.ADMIN)
public ResponseEntity<List<RouteVM>> activeRoutes() {
List<Route> routes = routeLocator.getRoutes();
List<RouteVM> routeVMs = new ArrayList<>();
| 11 |
diff --git a/blockchain.js b/blockchain.js @@ -120,7 +120,7 @@ const runSidechainTransaction = mnemonic => async (contractName, method, ...args
{
name: 'geth',
networkId: 1,
- chainId: 1337,
+ chainId: isMainChain ? 1338 : 1337,
},
'petersburg',
),
| 0 |
diff --git a/src/converter/r2t/ImportEntities.js b/src/converter/r2t/ImportEntities.js @@ -66,6 +66,7 @@ export default class ImportEntities {
const entityIds = Object.keys(entities)
let refList = dom.find('ref-list')
+ refList.empty()
entityIds.forEach(entityId => {
const entity = entities[entityId].toJSON()
@@ -186,7 +187,7 @@ function _extractPersons(elementCitation, entityDb) {
function _injectPersons({elementCitation, entity, entityDb}) {
const authors = entity.authors
const authorsEl = elementCitation.createElement('person-group')
- .attr('person-group-type', 'authors')
+ .attr('person-group-type', 'author')
authors.forEach(author => {
authorsEl.append(_createNameElement(authorsEl, entityDb.get(author).toJSON()))
@@ -194,7 +195,7 @@ function _injectPersons({elementCitation, entity, entityDb}) {
const editors = entity.editors
const editorsEl = elementCitation.createElement('person-group')
- .attr('person-group-type', 'editors')
+ .attr('person-group-type', 'editor')
editors.forEach(editor => {
editorsEl.append(_createNameElement(editorsEl, entityDb.get(editor).toJSON()))
@@ -209,13 +210,20 @@ function _injectPersons({elementCitation, entity, entityDb}) {
// Create name element with person populated from entity
function _createNameElement(el, person) {
let nameEl = el.createElement('name')
- Object.keys(person).forEach(prop => {
- if(prop !== 'id' && prop !== 'type') {
nameEl.append(
- el.createElement(prop).append(person[prop])
+ el.createElement('surname').append(person.surname),
+ el.createElement('given-names').append(person.givenNames)
+ )
+ if(person.prefix) {
+ nameEl.append(
+ el.createElement('prefix').append(person.prefix)
+ )
+ }
+ if(person.suffix) {
+ nameEl.append(
+ el.createElement('suffix').append(person.suffix)
)
}
- })
return nameEl
}
| 7 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "5.4.3">
+<!ENTITY version-java-client "5.5.0">
<!ENTITY version-dotnet-client "5.1.0">
<!ENTITY version-server "3.7.8">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/pic.js b/pic.js @@ -112,6 +112,14 @@ export const genPic = 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();
+ player.addAction({
+ type: 'emote',
+ emotion: 'fun',
+ });
+ /* player.avatar.emotes.push({
+ emotion: 'fun',
+ value: 1,
+ }); */
// player.avatar.update(1000);
};
const _animate = (timestamp, timeDiff) => {
@@ -186,6 +194,8 @@ export const genPic = async ({
// _lookAt(camera, boundingBox);
const _renderFrames = async () => {
+ // console.log('got player emotes -1', player.avatar.emotes.length)
+
let now = 0;
const timeDiff = 1000/FPS;
for (let i = 0; i < FPS*2; i++) {
@@ -206,11 +216,15 @@ export const genPic = async ({
}, avatarInterpolationFrameRate); */
}
+ // console.log('got player emotes 0', player.avatar.emotes.length)
+
let index = 0;
const framesPerFrame = FPS;
while (now < idleAnimationDuration*1000) {
// console.log('got frame', index);
+ // console.log('got player emotes 1', player.avatar.emotes.length)
+
_lookAt(camera, boundingBox);
_animate(now, timeDiff);
| 0 |
diff --git a/src/components/routes/checkout/CreditCard.vue b/src/components/routes/checkout/CreditCard.vue </el-form-item>
<el-form-item size="mini">
- <el-checkbox :checked="true">{{ $t('card.sameAddress') }}</el-checkbox>
+ <el-checkbox v-model="sameAddress">
+ {{ $t('card.sameAddress') }}
+ </el-checkbox>
</el-form-item>
+ <el-collapse-transition>
+ <address-form key="address-form" v-if="!sameAddress"/>
+ </el-collapse-transition>
<el-form-item size="large">
<el-button type="success" @click="() => {}">
<a-icon icon="check" class="__icon-mr"></a-icon>
- {{ buttonText || $t('general.save') }}
+ {{ $t('general.save') }}
</el-button>
</el-form-item>
</el-form>
<script>
import cardValidator from 'card-validator'
import { addRule, checkMask } from '@/lib/utils'
+import AddressForm from '@/components/routes/account/AddressForm'
export default {
name: 'CreditCard',
+ components: {
+ AddressForm
+ },
+
props: [
'checkHolder',
'holderDoc'
@@ -176,6 +186,7 @@ export default {
doc: ''
},
rules,
+ sameAddress: true,
cardMask: {
mask: [
| 9 |
diff --git a/token-metadata/0xF3281c539716a08c754EC4C8F2B4cEe0faB64BB9/metadata.json b/token-metadata/0xF3281c539716a08c754EC4C8F2B4cEe0faB64BB9/metadata.json "symbol": "MKCY",
"address": "0xF3281c539716a08c754EC4C8F2B4cEe0faB64BB9",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/libraries/auth0js/v9/index.md b/articles/libraries/auth0js/v9/index.md @@ -262,7 +262,7 @@ webAuth.passwordlessStart({
### Verify passwordless
-If sending a code, you will then need to prompt the user to enter that code. You will process the code, and authenticate the user, with the `passwordlessVerify` method, which has several parameters which can be sent in its `options` object:
+If sending a code, you will then need to prompt the user to enter that code. You will process the code, and authenticate the user, with the `passwordlessLogin` method, which has several parameters which can be sent in its `options` object:
| **Parameter** | **Required** | **Description** |
| --- | --- | --- |
@@ -274,11 +274,11 @@ If sending a code, you will then need to prompt the user to enter that code. You
As with `passwordlessStart`, exactly _one_ of the optional `phoneNumber` and `email` parameters must be sent in order to verify the Passwordless transaction.
::: note
-In order to use `passwordlessVerify`, the options `redirectUri` and `responseType: 'token'` must be specified when first initializing WebAuth.
+In order to use `passwordlessLogin`, the options `redirectUri` and `responseType: 'token'` must be specified when first initializing WebAuth.
:::
```js
-webAuth.passwordlessVerify({
+webAuth.passwordlessLogin({
connection: 'email',
email: '[email protected]',
verificationCode: '389945'
| 10 |
diff --git a/package.json b/package.json {
"name": "docs",
- "version": "0.0.0",
- "description": "tbc",
+ "version": "1.0.0",
+ "description": "Documentation for the Ghost publishing platform",
"repository": "[email protected]:TryGhost/docs.git",
"author": "Ghost Foundation",
"license": "MIT",
| 12 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Buttercup browser extension changelog
+## v2.25.0
+_2022-06-02_
+
+ * Buttercup upgrade: v6
+ * Improved Dropbox/Google Drive integrations
+ * Improved vault stability and performance
+ * Improved support for Vault Format B
+ * Removed My Buttercup integration
+ * Vault editor page redesign
+ * Updated vault UI
+
## v2.24.3
_2021-05-24_
| 6 |
diff --git a/test/TemplateTest.js b/test/TemplateTest.js @@ -1138,6 +1138,26 @@ test("Test a transform", async t => {
t.is(renders[0], "OVERRIDE BY A TRANSFORM");
});
+// #789: https://github.com/11ty/eleventy/issues/789
+test.skip("Test a transform (does it have inputPath?)", async t => {
+ t.plan(3);
+
+ let tmpl = new Template(
+ "./test/stubs/template.ejs",
+ "./test/stubs/",
+ "./test/stubs/_site"
+ );
+
+ tmpl.addTransform(function(content, outputPath, inputPath) {
+ t.true(outputPath.endsWith(".html"));
+ t.true(!!inputPath);
+ return "OVERRIDE BY A TRANSFORM";
+ });
+
+ let renders = await tmpl._testCompleteRender();
+ t.is(renders[0], "OVERRIDE BY A TRANSFORM");
+});
+
test("Test a transform with pages", async t => {
t.plan(5);
| 0 |
diff --git a/src/encoded/static/components/search.js b/src/encoded/static/components/search.js @@ -1012,10 +1012,6 @@ const ResultTable = search.ResultTable = createReactClass({
childContextTypes: { actions: PropTypes.array },
- contextTypes: {
- session: React.PropTypes.object,
- },
-
getDefaultProps: function () {
return {
restrictions: {},
@@ -1076,7 +1072,6 @@ const ResultTable = search.ResultTable = createReactClass({
const filters = context.filters;
const label = 'results';
const trimmedSearchBase = searchBase.replace(/[\?|&]limit=all/, '');
- const loggedIn = this.context.session && this.context.session['auth.userid'];
let browseAllFiles = true; // True to pass all files to browser
let browserAssembly = ''; // Assembly to pass to ResultsBrowser component
let browserDatasets = []; // Datasets will be used to get vis_json blobs
@@ -1133,7 +1128,7 @@ const ResultTable = search.ResultTable = createReactClass({
// If we have only one "type" term in the query string and it's for File, then we can
// display the List/Browser tabs. Otherwise we just get the list.
- let browserAvail = counter === 1 && typeFilter && typeFilter.term === 'File' && assemblies.length === 1 && loggedIn;
+ let browserAvail = counter === 1 && typeFilter && typeFilter.term === 'File' && assemblies.length === 1;
if (browserAvail) {
// If dataset is in the query string, we can show all files.
const datasetFilter = filters.find(filter => filter.field === 'dataset');
| 2 |
diff --git a/app/components/Composer.jsx b/app/components/Composer.jsx @@ -78,7 +78,7 @@ class Composer extends Component {
});
renderProcess.on('postStatusComplete', (event, response) => {
- const { id_str, user, } = response;
+ const { id_str, user, } = response; /* eslint camelcase: 0 */
notificationManager.send(
localeManager.post_status_success.title,
| 8 |
diff --git a/test/unit/specs/main.spec.js b/test/unit/specs/main.spec.js @@ -22,6 +22,10 @@ jest.mock("fs-extra", () => {
"./app/networks/basecoind-2/basecoindversion.txt",
fs.readFileSync("./app/networks/basecoind-2/basecoindversion.txt", "utf8")
)
+ mockFs.writeFile(
+ "~/repo/gaia",
+ "THIS IS THE GAIA BINARY. IT IS NOT USED. IT IS HERE TO PASS THE EXISTANCE CHECK."
+ )
return mockFs
})
let fs = require("fs-extra")
@@ -125,7 +129,8 @@ describe("Startup Process", () => {
LOGGING: "false",
COSMOS_NETWORK: "app/networks/basecoind-2",
COSMOS_HOME: testRoot,
- NODE_ENV: "testing"
+ NODE_ENV: "testing",
+ BINARY_PATH: null // binary path is set for e2e tests but for some reason confuses the unit tests where child_processes should be mocked anyway o.O
})
jest.mock(appRoot + "src/root.js", () => "./test/unit/tmp/test_root")
| 12 |
diff --git a/README.md b/README.md Visualize distributed tracing with Jaeger.
+
+
+
+
## Contributing
See [CONTRIBUTING](./CONTRIBUTING.md).
| 0 |
diff --git a/publish/src/commands/fork.js b/publish/src/commands/fork.js @@ -9,15 +9,19 @@ const forkChain = async ({ network }) => {
console.log(`Forking ${network}...`);
- const protocolDaoAddress = getUsers({ network, user: 'owner' }).address;
- console.log(`Unlocking account ${protocolDaoAddress} (protocolDAO)`);
+ const users = getUsers({ network });
+
+ const pwnedAddresses = users
+ .map(user => user.address)
+ .filter(address => address !== '0xfeEFEEfeefEeFeefEEFEEfEeFeefEEFeeFEEFEeF')
+ .filter(address => address !== '0x0000000000000000000000000000000000000000');
const providerUrl = `https://${network}.infura.io/v3/${process.env.INFURA_PROJECT_ID}`;
const server = ganache.server({
fork: providerUrl,
gasLimit: 12e6,
keepAliveTimeout: 0,
- unlocked_accounts: [protocolDaoAddress],
+ unlocked_accounts: pwnedAddresses,
logger: console,
network_id: 1,
});
| 11 |
diff --git a/readme.md b/readme.md @@ -4,6 +4,14 @@ _Create the next immutable state tree by simply modifying the current tree_
---
+[](https://travis-ci.org/mweststrate/immer)
+[](https://github.com/prettier/prettier)
+
+
+
+* CDN:
+- https://unpkg.com/immer/immer.js
+
Immer (German for: always) is a tiny package that allows you to work with immutable state in a more convenient way.
It is based on the [_copy-on-write_](https://en.wikipedia.org/wiki/Copy-on-write) mechanism.
| 0 |
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js @@ -1150,9 +1150,22 @@ describe('Test geo interactions', function() {
done();
});
});
-
});
});
+
+ it('should not throw during hover when out-of-range pts are present in *albers usa* map', function(done) {
+ var gd = createGraphDiv();
+ var fig = Lib.extendDeep({}, require('@mocks/geo_scattergeo-out-of-usa.json'));
+ fig.layout.width = 700;
+ fig.layout.height = 500;
+
+ Plotly.plot(gd, fig).then(function() {
+ mouseEvent('mousemove', 350, 250);
+ expect(d3.selectAll('g.hovertext').size()).toEqual(1);
+ })
+ .catch(fail)
+ .then(done);
+ });
});
| 0 |
diff --git a/src/common/blockchain/interface-blockchain/transactions/pending/Transactions-Pending-Queue.js b/src/common/blockchain/interface-blockchain/transactions/pending/Transactions-Pending-Queue.js @@ -67,22 +67,15 @@ class TransactionsPendingQueue {
analyseMissingNonce(i){
- if( typeof this.listArray[i+1] !== "undefined")
+ if(this.listArray[i+1].nonce - this.listArray[i].nonce > 1)
if( this.listArray[i+1].from.addresses[0].unencodedAddress.compare(this.listArray[i].from.addresses[0].unencodedAddress) === 0 )
- if(this.listArray[i+1].nonce - this.listArray[i].nonce > 1) {
+ if( typeof this.listArray[i+1] !== "undefined") {
//Check all missing nonces for this address
- for (let j = i; j < this.listArray.length; j++) {
-
- if( this.listArray[j+1].from.addresses[0].unencodedAddress.compare(this.listArray[j].from.addresses[0].unencodedAddress) !== 0 )
- break;
-
- //Propagate missing nonce
- for( let k = this.listArray[j].nonce+1; k<this.listArray[j+1].nonce; k++)
- this.propagateMissingNonce(this.listArray[k].from.addresses[0].unencodedAddress, k);
+ for (let j = this.listArray[i].nonce+1; j < this.listArray[i+1].nonce; j++)
+ this.propagateMissingNonce(this.listArray[j].from.addresses[0].unencodedAddress, j);
}
- }
}
@@ -92,6 +85,8 @@ class TransactionsPendingQueue {
for (let i=0; i<this.listArray.length ; i++ ) {
+ this.analyseMissingNonce(i);
+
let compare = transaction.from.addresses[0].unencodedAddress.compare(this.listArray[i].from.addresses[0].unencodedAddress);
if (compare < 0) // next
@@ -104,33 +99,12 @@ class TransactionsPendingQueue {
break;
} else if (transaction.nonce < this.listArray[i].nonce){
- let nonceGap = true;
-
- if(this.listArray[i].nonce - transaction.nonce === 1) {
- this.propagateTransaction(this.listObject[transaction.txId.toString("hex")], exceptSockets);
- nonceGap = false;
- }
-
this.addNewTransaction(i,transaction);
inserted = true;
- //Propagate all unsent tx after solving nonce gap
- if (!nonceGap){
- for( let j = i+1; j<this.listArray.length; j++){
- let secondCompare = this.listArray[j].from.addresses[0].unencodedAddress.compare(this.listArray[j+1].from.addresses[0].unencodedAddress);
- if(secondCompare === 0){
- if(this.listArray[j].nonce - this.listArray[j+1].nonce === 1)
- this.propagateTransaction(this.listObject[this.listArray[j].txId.toString("hex")], []);
- else{
- this.analyseMissingNonce(j);
- break;
- }
- }else{
- break;
- }
+ if(this.listArray[i-1].nonce - this.listArray[i-2].nonce === 1) {
+ this.propagateTransaction(this.listObject[transaction.txId.toString("hex")], exceptSockets);
}
- }else
-
break;
}
| 7 |
diff --git a/edit.js b/edit.js @@ -2156,6 +2156,16 @@ const _makeChunkMesh = (seedString, parcelSize, subparcelSize) => {
currentVegetationMesh.freeSlabIndex(index);
currentVegetationTransparentMesh.freeSlabIndex(index);
+ const subparcelVegetationMeshesSpec = mesh.vegetationMeshes[index];
+ if (subparcelVegetationMeshesSpec) {
+ for (const mesh of subparcelVegetationMeshesSpec.meshes) {
+ if (mesh.physxGeometry) {
+ physxWorker.unregisterGeometry(mesh.physxGeometry);
+ mesh.physxGeometry = 0;
+ }
+ }
+ }
+
const subparcelTasks = vegetationsTasks[index];
if (subparcelTasks) {
for (const task of subparcelTasks) {
@@ -2230,6 +2240,25 @@ const _makeChunkMesh = (seedString, parcelSize, subparcelSize) => {
currentVegetationTransparentMesh.updateGeometry(transparentSlab, transparent);
const group2 = currentVegetationTransparentMesh.geometry.groups.find(group => group.start === transparentSlab.slabIndex * vegetationSlabSliceTris);
group2.count = transparent.indices.length;
+
+ let subparcelVegetationMeshesSpec = mesh.vegetationMeshes[index];
+ if (!subparcelVegetationMeshesSpec) {
+ subparcelVegetationMeshesSpec = {
+ index,
+ meshes: [],
+ };
+ mesh.vegetationMeshes[index] = subparcelVegetationMeshesSpec;
+ }
+ for (const vegetation of subparcel.vegetations) {
+ localVector3.fromArray(vegetation.position)
+ .add(localVector4.set(0, (2+0.5)/2, 0));
+ localQuaternion2.fromArray(vegetation.quaternion)
+ .multiply(capsuleUpQuaternion);
+ const physxGeometry = physxWorker.registerCapsuleGeometry(vegetation.id, localVector3, localQuaternion2, 0.5, 2);
+ subparcelVegetationMeshesSpec.meshes.push({
+ physxGeometry,
+ });
+ }
}
})()
.finally(() => {
| 0 |
diff --git a/shaders.js b/shaders.js @@ -841,6 +841,173 @@ const damageMaterial = new THREE.ShaderMaterial({
// polygonOffsetUnits: 1,
});
+const activateMaterial = new THREE.ShaderMaterial({
+ uniforms: {
+ uTime: {
+ type: 'f',
+ value: 0,
+ needsUpdate: true,
+ },
+ },
+ vertexShader: `\
+ precision highp float;
+ precision highp int;
+
+ uniform vec4 uSelectRange;
+
+ // attribute vec3 barycentric;
+ attribute float ao;
+ attribute float skyLight;
+ attribute float torchLight;
+
+ varying vec3 vViewPosition;
+ varying vec2 vUv;
+ varying vec3 vBarycentric;
+ varying float vAo;
+ varying float vSkyLight;
+ varying float vTorchLight;
+ varying vec3 vSelectColor;
+ varying vec2 vWorldUv;
+ varying vec3 vPos;
+ varying vec3 vNormal;
+
+ void main() {
+ vec4 mvPosition = modelViewMatrix * vec4(position, 1.0);
+ gl_Position = projectionMatrix * mvPosition;
+
+ vViewPosition = -mvPosition.xyz;
+ vUv = uv;
+ // vBarycentric = barycentric;
+ float vid = float(gl_VertexID);
+ if (mod(vid, 3.) < 0.5) {
+ vBarycentric = vec3(1., 0., 0.);
+ } else if (mod(vid, 3.) < 1.5) {
+ vBarycentric = vec3(0., 1., 0.);
+ } else {
+ vBarycentric = vec3(0., 0., 1.);
+ }
+ vAo = ao/27.0;
+ vSkyLight = skyLight/8.0;
+ vTorchLight = torchLight/8.0;
+
+ vSelectColor = vec3(0.);
+ if (
+ position.x >= uSelectRange.x &&
+ position.z >= uSelectRange.y &&
+ position.x < uSelectRange.z &&
+ position.z < uSelectRange.w
+ ) {
+ vSelectColor = vec3(${new THREE.Color(0x4fc3f7).toArray().join(', ')});
+ }
+
+ vec3 vert_tang;
+ vec3 vert_bitang;
+ if (abs(normal.y) < 0.05) {
+ if (abs(normal.x) > 0.95) {
+ vert_bitang = vec3(0., 1., 0.);
+ vert_tang = normalize(cross(vert_bitang, normal));
+ vWorldUv = vec2(dot(position, vert_tang), dot(position, vert_bitang));
+ } else {
+ vert_bitang = vec3(0., 1., 0.);
+ vert_tang = normalize(cross(vert_bitang, normal));
+ vWorldUv = vec2(dot(position, vert_tang), dot(position, vert_bitang));
+ }
+ } else {
+ vert_tang = vec3(1., 0., 0.);
+ vert_bitang = normalize(cross(vert_tang, normal));
+ vWorldUv = vec2(dot(position, vert_tang), dot(position, vert_bitang));
+ }
+ vWorldUv /= 4.0;
+ vec3 vert_norm = normal;
+
+ vec3 t = normalize(normalMatrix * vert_tang);
+ vec3 b = normalize(normalMatrix * vert_bitang);
+ vec3 n = normalize(normalMatrix * vert_norm);
+ mat3 tbn = transpose(mat3(t, b, n));
+
+ vPos = position;
+ vNormal = normal;
+ }
+ `,
+ fragmentShader: `\
+ precision highp float;
+ precision highp int;
+
+ #define PI 3.1415926535897932384626433832795
+
+ uniform float sunIntensity;
+ uniform sampler2D tex;
+ uniform float uTime;
+ uniform vec3 sunDirection;
+ float parallaxScale = 0.3;
+ float parallaxMinLayers = 50.;
+ float parallaxMaxLayers = 50.;
+
+ varying vec3 vViewPosition;
+ varying vec2 vUv;
+ varying vec3 vBarycentric;
+ varying float vAo;
+ varying float vSkyLight;
+ varying float vTorchLight;
+ varying vec3 vSelectColor;
+ varying vec2 vWorldUv;
+ varying vec3 vPos;
+ varying vec3 vNormal;
+
+ float edgeFactor(vec2 uv) {
+ float divisor = 0.5;
+ float power = 0.5;
+ return min(
+ pow(abs(uv.x - round(uv.x/divisor)*divisor), power),
+ pow(abs(uv.y - round(uv.y/divisor)*divisor), power)
+ ) > 0.1 ? 0.0 : 1.0;
+ /* return 1. - pow(abs(uv.x - round(uv.x/divisor)*divisor), power) *
+ pow(abs(uv.y - round(uv.y/divisor)*divisor), power); */
+ }
+
+ vec3 getTriPlanarBlend(vec3 _wNorm){
+ // in wNorm is the world-space normal of the fragment
+ vec3 blending = abs( _wNorm );
+ // blending = normalize(max(blending, 0.00001)); // Force weights to sum to 1.0
+ // float b = (blending.x + blending.y + blending.z);
+ // blending /= vec3(b, b, b);
+ // return min(min(blending.x, blending.y), blending.z);
+ blending = normalize(blending);
+ return blending;
+ }
+
+ void main() {
+ // vec3 diffuseColor1 = vec3(${new THREE.Color(0x1976d2).toArray().join(', ')});
+ vec3 diffuseColor2 = vec3(${new THREE.Color(0x66bb6a).toArray().join(', ')});
+ float normalRepeat = 1.0;
+
+ vec3 blending = getTriPlanarBlend(vNormal);
+ float xaxis = edgeFactor(vPos.yz * normalRepeat);
+ float yaxis = edgeFactor(vPos.xz * normalRepeat);
+ float zaxis = edgeFactor(vPos.xy * normalRepeat);
+ float f = xaxis * blending.x + yaxis * blending.y + zaxis * blending.z;
+
+ // vec2 worldUv = vWorldUv;
+ // worldUv = mod(worldUv, 1.0);
+ // float f = edgeFactor();
+ // float f = max(normalTex.x, normalTex.y, normalTex.z);
+
+ if (abs(length(vViewPosition) - uTime * 20.) < 0.1) {
+ f = 1.0;
+ }
+
+ float d = gl_FragCoord.z/gl_FragCoord.w;
+ vec3 c = diffuseColor2; // mix(diffuseColor1, diffuseColor2, abs(vPos.y/10.));
+ float f2 = 1. + d/10.0;
+ gl_FragColor = vec4(c, 0.5 + max(f, 0.3) * f2 * 0.5);
+ }
+ `,
+ transparent: true,
+ polygonOffset: true,
+ polygonOffsetFactor: -1,
+ // polygonOffsetUnits: 1,
+});
+
const portalMaterial = new THREE.ShaderMaterial({
uniforms: {
uColor: {
@@ -1434,6 +1601,7 @@ export {
makeDrawMaterial, */
buildMaterial,
damageMaterial,
+ activateMaterial,
portalMaterial,
arrowGeometry,
arrowMaterial,
| 0 |
diff --git a/admin-base/ui.apps/src/main/js/stateActions/editComponent.js b/admin-base/ui.apps/src/main/js/stateActions/editComponent.js @@ -28,7 +28,7 @@ let log = LoggerFactory.logger('editComponent').setLevelDebug()
import { set } from '../utils'
function bringUpEditor(me, view, target) {
- log.debug('Bring Up Editor, ')
+ log.fine('Bring Up Editor, ')
me.getApi().populateComponentDefinitionFromNode(view.pageView.path+target).then( (name) => {
log.fine('component name is', name)
set(view, '/state/editor/component', name)
| 12 |
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js @@ -85,7 +85,7 @@ export function disable() {
}
export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
- const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key.split('-')[0] === identifier);
+ const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
if (locales.length >= 1) {
return locales[0];
| 7 |
diff --git a/test/Request/Request.test.js b/test/Request/Request.test.js @@ -31,6 +31,19 @@ const serviceParams = [
() => ({}),
];
+const serviceParamsReturningString = [
+ 'URL',
+ {
+ username: 'USERNAME',
+ password: 'PASSWORD',
+ },
+ templates.lowFareSearch,
+ null,
+ () => ({}),
+ () => ({}),
+ () => '',
+];
+
const requestError = proxyquire('../../src/Request/uapi-request', {
axios: {
request: () => Promise.reject({ response: { status: 300, data: 3 } }),
@@ -115,5 +128,22 @@ describe('#Request', () => {
expect(log).to.have.callCount(6);
});
});
+
+ it('should test result of parser as string', () => {
+ const log = sinon.spy(function (...args) {
+ console.log(args);
+ return;
+ });
+
+ const params = serviceParamsReturningString
+ .concat([3])
+ .concat([{ logFunction: log }]);
+
+ const request = requestXMLError(...params);
+ return request({})
+ .then(() => {
+ expect(log).to.have.callCount(6);
+ });
+ });
});
});
| 0 |
diff --git a/src/app/Http/Controllers/CrudController.php b/src/app/Http/Controllers/CrudController.php @@ -64,7 +64,7 @@ class CrudController extends BaseController
$this->crud->hasAccessOrFail('list');
$this->data['crud'] = $this->crud;
- $this->data['title'] = ucfirst($this->crud->entity_name_plural);
+ $this->data['title'] = mb_convert_case($this->crud->entity_name_plural, MB_CASE_TITLE);
// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
return view($this->crud->getListView(), $this->data);
| 14 |
diff --git a/lib/schemaUtils.js b/lib/schemaUtils.js @@ -2911,7 +2911,7 @@ module.exports = {
return async.map(reqHeaders, (pHeader, cb) => {
let mismatches = [],
- index = _.findIndex(reqHeaders, pHeader);
+ index = _.findIndex(headers, pHeader); // find actual index from collection request headers
const schemaHeader = _.find(schemaHeaders, (header) => { return header.name === pHeader.key; });
@@ -3003,7 +3003,7 @@ module.exports = {
return async.map(resHeaders, (pHeader, cb) => {
let mismatches = [],
- index = _.findIndex(resHeaders, pHeader);
+ index = _.findIndex(headers, pHeader); // find actual index from collection response headers
const schemaHeader = _.get(schemaHeaders, pHeader.key);
| 4 |
diff --git a/app/addons/documents/assets/less/query-options.less b/app/addons/documents/assets/less/query-options.less #query-options-tray {
width: 490px;
padding-top: 6px;
+ max-height: calc(100vh - 64px);
+ overflow-y: scroll;
.query-group:first-child {
margin-top: 0;
| 0 |
diff --git a/src/main/java/org/cboard/jdbc/JdbcDataProvider.java b/src/main/java/org/cboard/jdbc/JdbcDataProvider.java @@ -399,6 +399,12 @@ public class JdbcDataProvider extends DataProvider implements Aggregatable, Init
List<ColumnIndex> dimensionList = dimStream.map(ColumnIndex::fromDimensionConfig).collect(Collectors.toList());
dimensionList.addAll(config.getValues().stream().map(ColumnIndex::fromValueConfig).collect(Collectors.toList()));
IntStream.range(0, dimensionList.size()).forEach(j -> dimensionList.get(j).setIndex(j));
+ int dimSize = dimensionList.stream().filter(i -> i.getAggType() == null).toArray().length;
+ list.forEach(row -> {
+ IntStream.range(0, dimSize).forEach(i -> {
+ if (row[i] == null) row[i] = NULL_STRING;
+ });
+ });
String[][] result = list.toArray(new String[][]{});
return new AggregateResult(dimensionList, result);
}
| 14 |
diff --git a/src/components/play-mode/infobox/Infobox.jsx b/src/components/play-mode/infobox/Infobox.jsx @@ -10,13 +10,25 @@ import {getRenderer} from '../../../../renderer.js';
import easing from '../../../../easing.js';
import {createObjectSprite} from '../../../../object-spriter.js'; */
import loadoutManager from '../../../../loadout-manager.js';
+import alea from '../../../../alea.js';
-const infoboxSize = new THREE.Vector3(600, 300);
+// const infoboxSize = new THREE.Vector3(600, 300);
const screenshotSize = 100;
export const Infobox = () => {
const canvasRef = useRef();
- const [selected, setSelected] = useState(false);
+ const [selectedApp, setSelectedApp] = useState(null);
+
+ const rng = selectedApp ? alea(selectedApp.contentId) : null;
+ const level = rng ? 1 + Math.floor((rng() ** 3) * 99) : 0;
+ const dps = rng ? Math.floor((rng() ** 3) * 1000) : 0;
+ const exp = rng ? Math.floor((rng() ** 3) * 100) : 0;
+
+ let name = selectedApp ? selectedApp.name : '';
+ if (name) {
+ console.warn('app has no name', selectedApp);
+ name = 'MissingNo.';
+ }
useEffect(() => {
if (canvasRef.current) {
@@ -32,8 +44,8 @@ export const Infobox = () => {
}, [canvasRef]);
useEffect(() => {
function selectedchange(e) {
- const {index} = e.data;
- setSelected(index !== -1)
+ const {app} = e.data;
+ setSelectedApp(app);
}
loadoutManager.addEventListener('selectedchange', selectedchange);
return () => {
@@ -42,20 +54,17 @@ export const Infobox = () => {
}, []);
return (
- <div className={ classnames(styles.infobox, selected ? styles.selected : null) } >
+ <div className={ classnames(styles.infobox, selectedApp ? styles.selected : null) } >
<canvas width={screenshotSize} height={screenshotSize} className={ styles.screenshot } ref={canvasRef} />
<div className={ styles.background }>
<div className={ styles['background-1'] } />
<div className={ styles['background-2'] } />
</div>
<div className={ styles.content }>
+ {selectedApp ? <>
<div className={ styles.row }>
- <h1>
- SilSword
- </h1>
- <h2>
- Lv. 3
- </h2>
+ <h1>{selectedApp.name}</h1>
+ <h2>Lv. {level}</h2>
</div>
{/* <div className={ styles.row }>
<div className={ styles.pill }>
@@ -64,20 +73,15 @@ export const Infobox = () => {
</div> */}
<div className={ styles.row }>
<div className={ styles.stat }>
- <div className={ styles.label }>
- DPS
- </div>
- <div className={ styles.value }>
- 130
- </div>
+ <div className={ styles.label }>DPS</div>
+ <div className={ styles.value }>{dps}</div>
</div>
</div>
<div className={ classnames(styles.row, styles.exp) }>
- <div className={ styles.label }>
- EXP
- </div>
- <progress className={ styles.progress } value={0.83}></progress>
+ <div className={ styles.label }>EXP</div>
+ <progress className={ styles.progress } value={exp} max={100}></progress>
</div>
+ </> : null}
</div>
</div>
);
| 0 |
diff --git a/packages/insight/src/components/latest-blocks/latest-blocks.ts b/packages/insight/src/components/latest-blocks/latest-blocks.ts @@ -65,7 +65,8 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
(block: ApiEthBlock & ApiUtxoCoinBlock) => {
if (
this.chainNetwork.chain === 'BTC' ||
- this.chainNetwork.chain === 'BCH'
+ this.chainNetwork.chain === 'BCH' ||
+ this.chainNetwork.chain === 'DOGE'
) {
return this.blocksProvider.toUtxoCoinAppBlock(block);
}
@@ -102,7 +103,8 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
(block: ApiEthBlock & ApiUtxoCoinBlock) => {
if (
this.chainNetwork.chain === 'BTC' ||
- this.chainNetwork.chain === 'BCH'
+ this.chainNetwork.chain === 'BCH' ||
+ this.chainNetwork.chain === 'DOGE'
) {
return this.blocksProvider.toUtxoCoinAppBlock(block);
}
| 3 |
diff --git a/src/components/general/inventory/Inventory.jsx b/src/components/general/inventory/Inventory.jsx @@ -117,7 +117,6 @@ export const Inventory = () => {
})();
const open = state.openedPanel === 'CharacterPanel';
- // const targetObject = selectObject || hoverObject;
const onMouseEnter = object => () => {
setHoverObject(object);
@@ -125,7 +124,7 @@ export const Inventory = () => {
const onMouseDown = object => () => {
setSelectObject(selectObject !== object ? object : null);
- game.renderCard(object);
+ // game.renderCard(object);
};
const onDragStart = object => e => {
e.dataTransfer.setData('application/json', JSON.stringify(object));
@@ -192,12 +191,6 @@ export const Inventory = () => {
/>
);
})}
- {/* <LightArrow
- enabled={!!arrowPosition}
- animate={!!selectCharacter}
- x={arrowPosition?.[0] ?? 0}
- y={arrowPosition?.[1] ?? 0}
- /> */}
</ul>
</div>
</div>
| 2 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -1263,21 +1263,21 @@ $sprk-radio-input-opacity: 0 !default;
/// The transition for the radio input.
$sprk-radio-input-transition: all 0.2s ease-in-out !default;
/// The border of the outer circle in the radio input on hover.
-$sprk-radio-input-outer-circle-hover-border: 1px solid $sprk-black-tint-75 !default;
+$sprk-radio-input-outer-circle-hover-border: 2px solid $sprk-black-tint-75 !default;
/// The border of the outer circle in the radio input on focus.
$sprk-radio-input-outer-circle-focus-border: 2px solid $sprk-green !default;
/// The border of the outer circle in the disabled radio input on focus.
-$sprk-radio-input-outer-circle-focus-border-disabled: 1px solid $sprk-gray-dark !default;
+$sprk-radio-input-outer-circle-focus-border-disabled: 2px solid $sprk-gray-dark !default;
/// The border radius of the circle in the radio input.
$sprk-radio-input-border-radius: 50% !default;
/// The background color of the inner circle in the radio input.
$sprk-radio-input-inner-circle-background-color: $sprk-green !default;
/// The border of the outer circle in the radio input when checked.
-$sprk-radio-input-outer-circle-border-checked: 1px solid $sprk-green !default;
+$sprk-radio-input-outer-circle-border-checked: 2px solid $sprk-green !default;
/// The border of the outer circle in the radio input.
-$sprk-radio-input-outer-circle-border: 1px solid $sprk-gray-dark !default;
+$sprk-radio-input-outer-circle-border: 2px solid $sprk-gray-dark !default;
/// The border of the outer circle in the disabled radio input on hover.
-$sprk-radio-input-outer-circle-border-hover-disabled: 1px solid $sprk-gray-dark !default;
+$sprk-radio-input-outer-circle-border-hover-disabled: 2px solid $sprk-gray-dark !default;
/// The height of the outer circle in the radio input.
$sprk-radio-input-outer-circle-height: 1rem !default;
/// The width of the outer circle in the radio input.
| 3 |
diff --git a/animations-baker.js b/animations-baker.js @@ -330,9 +330,11 @@ const baker = async (uriPath = '', fbxFileNames, vpdFileNames, outFile) => {
const rootBone = object; // not really a bone
const leftFootBone = bones.find(b => b.name === 'mixamorigLeftFoot');
const rightFootBone = bones.find(b => b.name === 'mixamorigRightFoot');
+ const allOnes = arr => arr[0] === 1 && arr.every(v => v === arr[0]);
const bonePositionInterpolants = {};
const boneQuaternionInterpolants = {};
+ const tracksToRemove = [];
for (const track of tracks) {
if (/\.position$/.test(track.name)) {
const boneName = track.name.replace(/\.position$/, '');
@@ -344,10 +346,23 @@ const baker = async (uriPath = '', fbxFileNames, vpdFileNames, outFile) => {
// const bone = bones.find(b => b.name === boneName);
const boneInterpolant = new THREE.QuaternionLinearInterpolant(track.times, track.values, track.getValueSize());
boneQuaternionInterpolants[boneName] = boneInterpolant;
+ } else if (/\.scale$/.test(track.name)) {
+ if (allOnes(track.values)) {
+ const index = tracks.indexOf(track);
+ if (index !== -1) {
+ tracksToRemove.push(index);
+ }
+ } else {
+ throw new Error(`Error with the following track. All scale transforms must be set to 1. Aborting.\n Animation: ${animation.name}, Track: ${track.name}, values: \n ${track.values}`);
+ }
} else {
console.warn('unknown track name', animation.name, track);
}
}
+ // remove scale transform tracks as they won't be used;
+ tracksToRemove.forEach(i => {
+ tracks.splice(i, 1);
+ });
const walkBufferSize = 256;
const leftFootYDeltas = new Float32Array(walkBufferSize);
| 2 |
diff --git a/NiL.JS/Expressions/Addition.cs b/NiL.JS/Expressions/Addition.cs @@ -215,11 +215,15 @@ namespace NiL.JS.Expressions
}
case JSValueType.Object:
case JSValueType.Function:
- case JSValueType.Date:
{
tstr = new RopeString(tstr, second.ToPrimitiveValue_Value_String().BaseToString());
break;
}
+ case JSValueType.Date:
+ {
+ tstr = new RopeString(tstr, second.ToPrimitiveValue_String_Value().BaseToString());
+ break;
+ }
}
resultContainer._oValue = tstr;
| 1 |
diff --git a/app/main.js b/app/main.js @@ -35,6 +35,8 @@ let userInfo = {
const dbStructWallet = "CREATE TABLE wallet (id INTEGER PRIMARY KEY AUTOINCREMENT, pk TEXT, addr TEXT UNIQUE, lastbalance REAL, name TEXT);";
// FIXME: dbStructContacts is unused
const dbStructContacts = "CREATE TABLE contacts (id INTEGER PRIMARY KEY AUTOINCREMENT, addr TEXT UNIQUE, name TEXT, nick TEXT);";
+// FIXME: dbStructSettings is unused
+const dbStructSettings = "CREATE TABLE settings (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT UNIQUE, value TEXT);";
const zenApi = "https://explorer.zensystem.io/insight-api-zen/";
function attachUpdaterHandlers() {
| 6 |
diff --git a/state.js b/state.js @@ -8,7 +8,7 @@ export const state = {
name: '',
avatar: null,
isMic: false,
- equipped: []
+ equipped: [],
},
inventory: {
items: [],
@@ -17,7 +17,8 @@ export const state = {
selectedFileName: null,
},
world: {
- peers: []
+ peers: [],
+ selectedPeerId: null,
},
},
weaponWheel: {
| 0 |
diff --git a/detox/ios/Detox/GREYActions+Detox.m b/detox/ios/Detox/GREYActions+Detox.m #import <Foundation/Foundation.h>
#import "GREYActions+Detox.h"
#import <EarlGrey/GREYActions.h>
+#import <EarlGrey/NSObject+GREYAdditions.h>
+#import <EarlGrey/GREYAppleInternals.h>
@import AudioToolbox;
@import ObjectiveC;
-@interface UIKeyboardTaskQueue : NSObject
+@interface UIKeyboardTaskQueue ()
- (void)performTask:(void (^)(id ctx))arg1;
- (void)waitUntilAllTasksAreFinished;
@end
-@interface UIKeyboardImpl : UIView
+@interface UIKeyboardImpl ()
+ (instancetype)sharedInstance;
@property(readonly, nonatomic) UIKeyboardTaskQueue *taskQueue;
@@ -54,6 +56,12 @@ static void _DTXTypeText(NSString* text)
}
}
+@interface GREYActions ()
+
++ (void)grey_setText:(NSString *)text onWebElement:(id)element;
+
+@end
+
@implementation GREYActions (Detox)
+ (void)load
@@ -62,6 +70,69 @@ static void _DTXTypeText(NSString* text)
method_setImplementation(m, imp_implementationWithBlock(^(id _self, NSString* text) {
return [self dtx_actionForTypeText:text];
}));
+
+ m = class_getClassMethod(self, NSSelectorFromString(@"actionForClearText"));
+ method_setImplementation(m, imp_implementationWithBlock(^(id _self, NSString* text) {
+ return [self dtx_actionForClearText];
+ }));
+}
+
+static BOOL _assureFirstResponderIfNeeded(id expectedFirstResponderView, NSError* __strong * errorOrNil)
+{
+ BOOL isFirstResponder = [expectedFirstResponderView isFirstResponder];
+
+ if(isFirstResponder == NO)
+ {
+ // Tap on the element to make expectedFirstResponderView a first responder.
+ if ([[GREYActions actionForTap] perform:expectedFirstResponderView error:errorOrNil] == NO)
+ {
+ return NO;
+ }
+
+ return [expectedFirstResponderView becomeFirstResponder];
+ }
+
+ return YES;
+}
+
++ (id<GREYAction>)dtx_actionForClearText
+{
+ return [GREYActionBlock actionWithName:@"Clear text" constraints:grey_not(grey_systemAlertViewShown()) performBlock:^BOOL(id _Nonnull element, NSError * _Nullable __strong * _Nullable errorOrNil) {
+
+ BOOL firstResponder = _assureFirstResponderIfNeeded(element, errorOrNil);
+ if(firstResponder == NO)
+ {
+ return NO;
+ }
+
+ NSString *textStr;
+ if ([element grey_isWebAccessibilityElement]) {
+ [GREYActions grey_setText:@"" onWebElement:element];
+ return YES;
+ } else if ([element isKindOfClass:NSClassFromString(@"UIAccessibilityTextFieldElement")]) {
+ element = [element textField];
+ } else if ([element respondsToSelector:@selector(text)]) {
+ textStr = [element text];
+ } else {
+ UITextRange *range = [element textRangeFromPosition:[element beginningOfDocument]
+ toPosition:[element endOfDocument]];
+ textStr = [element textInRange:range];
+ }
+
+ NSMutableString *deleteStr = [[NSMutableString alloc] init];
+ for (NSUInteger i = 0; i < textStr.length; i++) {
+ [deleteStr appendString:@"\b"];
+ }
+
+ if (deleteStr.length == 0) {
+ return YES;
+ } else if ([element conformsToProtocol:@protocol(UITextInput)]) {
+ id<GREYAction> typeAtEnd = [GREYActions dtx_actionForTypeText:deleteStr];
+ return [typeAtEnd perform:element error:errorOrNil];
+ } else {
+ return [[GREYActions dtx_actionForTypeText:deleteStr] perform:element error:errorOrNil];
+ }
+ }];
}
+ (id<GREYAction>)dtx_actionForTypeText:(NSString *)text
@@ -69,17 +140,11 @@ static void _DTXTypeText(NSString* text)
return [GREYActionBlock actionWithName:[NSString stringWithFormat:@"Type '%@'", text]
constraints:grey_not(grey_systemAlertViewShown())
performBlock:^BOOL (UIView* expectedFirstResponderView, __strong NSError **errorOrNil) {
- // If expectedFirstResponderView or one of its ancestors isn't the first responder, tap on
- // it so it becomes the first responder.
- if (![expectedFirstResponderView isFirstResponder] &&
- ![grey_ancestor(grey_firstResponder()) matches:expectedFirstResponderView])
- {
- // Tap on the element to make expectedFirstResponderView a first responder.
- if (![[GREYActions actionForTap] perform:expectedFirstResponderView error:errorOrNil])
+ BOOL firstResponder = _assureFirstResponderIfNeeded(expectedFirstResponderView, errorOrNil);
+ if(firstResponder == NO)
{
return NO;
}
- }
_DTXTypeText(text);
| 7 |
diff --git a/components/rocket/rocketController.js b/components/rocket/rocketController.js @@ -11,7 +11,7 @@ import users from '../users'
import crypto from '../crypto'
import axiosApi from '../axios'
import inviteUserToChannelQueue from '../queues/inviteUserToChannelQueue'
-import userStatusChange from '../queues/userStatusChangeQueue'
+import userStatusChangeQueue from '../queues/userStatusChangeQueue'
const file = 'Rocket | Controller'
let BOT_ID
@@ -55,7 +55,7 @@ const handleMessages = async (error, message, messageOptions) => {
}
const handleUserStatus = async ({ rocketId, username }) => {
- userStatusChange.add({ rocketId, username })
+ userStatusChangeQueue.add({ rocketId, username })
}
const getUserInfo = async userId => {
| 3 |
diff --git a/token-metadata/0x9556f8ee795D991fF371F547162D5efB2769425F/metadata.json b/token-metadata/0x9556f8ee795D991fF371F547162D5efB2769425F/metadata.json "symbol": "DMME",
"address": "0x9556f8ee795D991fF371F547162D5efB2769425F",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/server/src/analytics/flight.js b/server/src/analytics/flight.js import App from "../app";
import heap from "../helpers/heap";
-App.on("startFlight", ({ id, name, simulators }) => {
+App.on("startFlight", ({ name, simulators }) => {
heap.track("startFlight", App.thoriumId, {
- id,
name,
...simulators.reduce((prev, next, index) => {
const simulator = App.simulators.find(s => s.id === next.simulatorId);
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.