code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/protocols/indexer/test/Indexer-unit.js b/protocols/indexer/test/Indexer-unit.js @@ -18,9 +18,12 @@ contract('Indexer Unit Tests', async accounts => {
let nonOwner = accounts[1]
let aliceAddress = accounts[2]
let bobAddress = accounts[3]
+ let carolAddress = accounts[4]
let aliceLocator = padAddressToLocator(aliceAddress)
let bobLocator = padAddressToLocator(bobAddress)
+ let carolLocator = padAddressToLocator(carolAddress)
+ let emptyLocatorData = padAddressToLocator(EMPTY_ADDRESS)
let indexer
let snapshotId
@@ -414,8 +417,8 @@ contract('Indexer Unit Tests', async accounts => {
describe('Test getIntents', async () => {
it('should return an empty array if the index doesnt exist', async () => {
- let intents = await indexer.getIntents.call(tokenOne, tokenTwo, EMPTY_ADDRESS, 4)
- equal(intents.length, 0, 'intents array should be empty')
+ let intents = await indexer.getIntents.call(tokenOne, tokenTwo, EMPTY_ADDRESS, 3)
+ equal(intents.length, 0, 'intents array should be size 0')
})
it('should return an empty array if a token is blacklisted', async () => {
@@ -436,7 +439,7 @@ contract('Indexer Unit Tests', async accounts => {
// now try to get the intents
let intents = await indexer.getIntents.call(tokenOne, tokenTwo, EMPTY_ADDRESS, 4)
- equal(intents.length, 0, 'intents array should be empty')
+ equal(intents.length, 0, 'intents array should be size 0')
})
it('should otherwise return the intents', async () => {
@@ -452,14 +455,30 @@ contract('Indexer Unit Tests', async accounts => {
await indexer.setIntent(tokenOne, tokenTwo, 100, bobLocator, {
from: bobAddress,
})
+ await indexer.setIntent(tokenOne, tokenTwo, 75, carolLocator, {
+ from: carolAddress,
+ })
// now try to get the intents
let intents = await indexer.getIntents.call(tokenOne, tokenTwo, EMPTY_ADDRESS, 4)
- equal(intents.length, 2, 'intents array should be size 2')
+ equal(intents.length, 4, 'intents array should be size 4')
+ equal(intents[0], bobLocator, 'intent should be bob')
+ equal(intents[1], carolLocator, 'intent should be carol')
+ equal(intents[2], aliceLocator, 'intent should be alice')
+ equal(intents[3], emptyLocatorData, 'intent should be empty')
// should only get the number specified
intents = await indexer.getIntents.call(tokenOne, tokenTwo, EMPTY_ADDRESS, 1)
equal(intents.length, 1, 'intents array should be size 1')
+ equal(intents[0], bobLocator, 'intent should be bob')
+
+ // should start in the specified location
+ intents = await indexer.getIntents.call(tokenOne, tokenTwo, carolAddress, 5)
+ equal(intents.length, 5, 'intents array should be size 5')
+ equal(intents[0], carolLocator, 'intent should be carol')
+ equal(intents[1], aliceLocator, 'intent should be alice')
+ equal(intents[2], emptyLocatorData, 'intent should be empty')
+ equal(intents[3], emptyLocatorData, 'intent should be empty')
})
})
})
| 3 |
diff --git a/token-metadata/0xE6279E1c65DD41b30bA3760DCaC3CD8bbb4420D6/metadata.json b/token-metadata/0xE6279E1c65DD41b30bA3760DCaC3CD8bbb4420D6/metadata.json "symbol": "REB",
"address": "0xE6279E1c65DD41b30bA3760DCaC3CD8bbb4420D6",
"decimals": 9,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/app/src/stores/renderer.tsx b/packages/app/src/stores/renderer.tsx @@ -53,6 +53,9 @@ export const useViewOptions = (storeTocNodeHandler: (toc: HtmlElementNode) => vo
return useSWRImmutable<RendererOptions, Error>(
key,
(rendererId, currentPagePath, rendererConfig) => generateViewOptions(currentPagePath, rendererConfig, storeTocNodeHandler),
+ {
+ fallbackData: isAllDataValid ? generateViewOptions(currentPagePath, rendererConfig, storeTocNodeHandler) : undefined,
+ },
);
};
| 12 |
diff --git a/packages/app/src/server/routes/apiv3/user-group.js b/packages/app/src/server/routes/apiv3/user-group.js @@ -42,7 +42,7 @@ module.exports = (crowi) => {
} = crowi.models;
validator.listChildren = [
- query('parentIds', 'parentIds must be an string').optional().isString(),
+ query('parentIdsJoinedByComma', 'parentIds must be an string').optional().isString(),
query('includeGrandChildren', 'parentIds must be boolean').optional().isBoolean(),
];
| 10 |
diff --git a/server/game/cards/02.4-TCT/GaijinCustoms.js b/server/game/cards/02.4-TCT/GaijinCustoms.js @@ -4,7 +4,7 @@ class GaijinCustoms extends DrawCard {
setupCardAbilities() {
this.action({
title: 'Ready a non-unicorn character',
- condition: () => this.controller.findCard(this.controller.cardsInPlay, card => card.isFaction('unicorn')) || this.controller.stronghold.isFaction('unicorn'),
+ condition: () => this.controller.anyCardsInPlay(card => card.isFaction('unicorn')) || this.controller.stronghold.isFaction('unicorn'),
target: {
cardType: 'character',
cardCondition: (card) => card.location === 'play area' && !card.isFaction('unicorn') && card.bowed
| 13 |
diff --git a/frontend/lost/src/components/SIA/ToolBar.js b/frontend/lost/src/components/SIA/ToolBar.js @@ -162,17 +162,17 @@ class ToolBar extends Component{
renderFinishPrompt(){
return (
<Dimmer page active={this.state.showFinishPrompt}>
- <Header as="h2" inverted>
+ <Header as="h3" inverted>
<Icon name='paper plane outline'></Icon>
Do you wish to FINISH this SIA Task?
</Header>
- <Button color="green" inverted
+ <Button basic color="green" inverted
onClick={() => this.setFinished()}
>
<Icon name='check'></Icon>
Yes
</Button>
- <Button color="red" inverted
+ <Button basic color="red" inverted
onClick={() => this.toggleFinishPrompt()}
>
<Icon name='ban'></Icon> No
| 7 |
diff --git a/src/components/Modal.js b/src/components/Modal.js @@ -4,7 +4,7 @@ const React = require('react');
import { withTheme } from './Theme';
const Button = require('./Button');
const Icon = require('./Icon');
-const MXFocusTrap = require('../components/MXFocusTrap');
+const RestrictFocus = require('../components/RestrictFocus');
const _merge = require('lodash/merge');
@@ -190,7 +190,7 @@ class Modal extends React.Component {
const styles = this.styles(theme);
return (
- <MXFocusTrap {...mergedFocusTrapProps}>
+ <RestrictFocus>
<div className='mx-modal' style={Object.assign({}, styles.scrim, this.props.isRelative && styles.relative)}>
<div className='mx-modal-scrim' onClick={this.props.onRequestClose} style={Object.assign({}, styles.scrim, styles.overlay, this.props.isRelative && styles.relative)} />
<div
@@ -230,7 +230,7 @@ class Modal extends React.Component {
)}
</div>
</div>
- </MXFocusTrap>
+ </RestrictFocus>
);
}
| 14 |
diff --git a/server/game/cards/01 - Core/KitsukiInvestigator.js b/server/game/cards/01 - Core/KitsukiInvestigator.js @@ -6,37 +6,20 @@ class KitsukiInvestigator extends DrawCard {
title: 'Look at opponent\'s hand',
condition: () => this.game.currentConflict && this.game.currentConflict.isParticipating(this) && this.game.currentConflict.conflictType === 'political',
handler: () => {
- let opponent = this.controller.opponent;
-
- let buttons = opponent.hand.map(card => {
- return { method: 'cardSelected', card: card };
- });
-
- this.game.promptWithMenu(this.controller, this, {
- activePrompt: {
- menuTitle: 'Select a card',
- buttons: buttons
- },
+ this.game.promptWithHandlerMenu(this.controller, {
+ activePromptTitle: 'Choose card to discard',
+ choices: this.controller.opponent.hand.map(card => card.name),
+ handlers: this.controller.opponent.hand.map(card => {
+ return () => {
+ this.game.addMessage('{0} uses {1} to discard {2} from {3}\'s hand', this.controller, this, card, this.controller.opponent);
+ this.controller.opponent.discardCardFromHand(card);
+ };
+ }),
source: this
});
}
});
}
-
- cardSelected(player, cardId) {
- let opponent = this.controller.opponent;
-
- var card = opponent.findCardByUuid(opponent.hand, cardId);
- if(!card) {
- return false;
- }
-
- opponent.discardCard(card);
-
- this.game.addMessage('{0} uses {1} to discard {2} from {3}\'s hand', player, this, card, opponent);
-
- return true;
- }
}
KitsukiInvestigator.id = 'kitsuki-investigator';
| 2 |
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc @@ -352,7 +352,7 @@ NwCurrentWindowInternalCapturePageInternalFunction::Run() {
if (image_details->format !=
api::extension_types::IMAGE_FORMAT_NONE)
image_format_ = image_details->format;
- if (image_details->quality.get())
+ if (image_details->quality)
image_quality_ = *image_details->quality;
}
| 4 |
diff --git a/src/config/commandOptions.js b/src/config/commandOptions.js @@ -30,7 +30,8 @@ export default {
},
disableScheduledEvents: {
usage:
- 'Disables all scheduled events. Overrides configurations in serverless.yml.',
+ 'Disables all scheduled events. Overrides configurations in serverless.yml. Default: false',
+ type: 'boolean',
},
enforceSecureCookies: {
usage: 'Enforce secure cookies',
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md +# Upcoming Wekan release
+
+Known bugs:
+
+* https://github.com/wekan/wekan/issues/785
+* https://github.com/wekan/wekan/issues/784
+
+This release fixes the following bug:
+
+* No need for Array.prototype if using rest operator
+
+Thanks to GitHub user vuxor for contributions.
+
# v0.16 2017-03-15 Wekan release
Added missing changelog updates.
| 1 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead.component.spec.ts b/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead.component.spec.ts @@ -448,21 +448,15 @@ class Test1Component {
selector: 'sprk-test-2',
template: `
<sprk-masthead>
- <div
- sprkMastheadBranding
- sprkStackItem
- class="sprk-o-Stack__item--center-column@xxs"
- >
+ <div sprkMastheadBranding sprkStackItem class="sprk-u-TextAlign--left">
<a sprkLink href="#nogo" variant="unstyled">
<svg
- class="sprk-c-Masthead__logo"
+ class="sprk-c-Masthead__logo sprk-u-TextAlign--left"
xmlns="http://www.w3.org/2000/svg"
width="365.4"
height="48"
viewBox="0 0 365.4 101.35"
- >
- Test
- </svg>
+ ></svg>
</a>
</div>
@@ -472,7 +466,7 @@ class Test1Component {
class="sprk-o-Stack__item--center-column@xxs"
>
<a sprkMastheadLink href="#nogo">
- Sign In
+ Talk To Us
</a>
</div>
@@ -482,35 +476,6 @@ class Test1Component {
role="navigation"
class="sprk-o-Stack__item--flex@xxs sprk-o-Stack sprk-o-Stack--misc-a sprk-o-Stack--split@xxs sprk-o-Stack--end-row"
>
- <div sprkStackItem class="sprk-o-Stack__item--flex@xxs">
- <sprk-stack
- additionalClasses="sprk-o-Stack--center-column sprk-o-Stack--center-row"
- >
- <div sprkStackItem class="sprk-u-Position--relative">
- <sprk-masthead-selector
- triggerText="Choose One"
- heading="Choose One"
- triggerIconName="chevron-down"
- [choices]="selectorDropdown"
- >
- <div
- class="sprk-c-Masthead__selector-footer"
- sprkMastheadSelectorFooter
- >
- <a
- sprkLink
- variant="unstyled"
- href="#nogo"
- class="sprk-c-Button sprk-c-Button--secondary sprk-c-Button--compact"
- >
- Placeholder
- </a>
- </div>
- </sprk-masthead-selector>
- </div>
- </sprk-stack>
- </div>
-
<ul
sprkStackItem
class="
@@ -539,77 +504,6 @@ class Test1Component {
</li>
</ul>
</nav>
-
- <div sprkStackItem>
- <nav sprkMastheadNavBar sprkStackItem role="navigation" idString="cats">
- <ul
- class="sprk-c-Masthead__big-nav-items sprk-o-Stack sprk-o-Stack--misc-a sprk-o-Stack--center-row sprk-o-Stack--split@xxs sprk-b-List sprk-b-List--bare"
- >
- <li sprkStackItem class="sprk-c-Masthead__big-nav-item">
- <a
- sprkMastheadLink
- variant="navBar"
- analyticsString="nav-bar-item-1"
- href="#nogo"
- >
- Item One
- </a>
- </li>
-
- <li
- sprkStackItem
- class="sprk-c-Masthead__big-nav-item"
- aria-haspopup="true"
- >
- <sprk-dropdown
- [choices]="item2NavBarDropdownChoices"
- triggerAdditionalClasses="sprk-b-Link--simple sprk-c-Masthead__link sprk-c-Masthead__link--big-nav"
- additionalClasses="sprk-u-TextAlign--left"
- triggerIconName="chevron-down"
- analyticsString="cats"
- triggerText="Item Two"
- ></sprk-dropdown>
- </li>
-
- <li sprkStackItem class="sprk-c-Masthead__big-nav-item">
- <a
- sprkMastheadLink
- variant="navBar"
- analyticsString="nav-bar-item-3"
- href="#nogo"
- >
- Item Three
- </a>
- </li>
-
- <li
- sprkStackItem
- class="sprk-c-Masthead__big-nav-item"
- aria-haspopup="true"
- >
- <sprk-dropdown
- [choices]="item2NavBarDropdownChoices"
- triggerAdditionalClasses="sprk-b-Link--simple sprk-c-Masthead__link sprk-c-Masthead__link--big-nav"
- additionalClasses="sprk-u-TextAlign--left"
- triggerIconName="chevron-down"
- analyticsString="cats"
- triggerText="Item Four"
- ></sprk-dropdown>
- </li>
-
- <li sprkStackItem class="sprk-c-Masthead__big-nav-item">
- <a
- sprkMastheadLink
- variant="navBar"
- analyticsString="nav-bar-item-5"
- href="#nogo"
- >
- Item Five
- </a>
- </li>
- </ul>
- </nav>
- </div>
</sprk-masthead>
`,
})
| 3 |
diff --git a/packages/rmw-shell/cra-template-rmw/template/package.json b/packages/rmw-shell/cra-template-rmw/template/package.json "start": "react-scripts start",
"standard": "standard src/**/*.js ",
"build": "react-scripts build",
- "test": "react-scripts test --env=jsdom",
+ "test": "react-scripts test --env=jsdom --passWithNoTests",
"eject": "react-scripts eject"
},
"author": "Tarik Huber",
| 3 |
diff --git a/circle.yml b/circle.yml @@ -1028,7 +1028,7 @@ jobs:
PERCY_PARALLEL_TOTAL=-1 \
yarn percy exec -- \
yarn cypress:run --record --parallel --group 2x-desktop-gui \
- yarn cypress:run:ct
+ && yarn cypress:run:ct
working_directory: packages/desktop-gui
- verify-mocha-results
- store_test_results:
| 3 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -25,7 +25,7 @@ articles:
url: /architecture-scenarios
children:
- - title: SDLC Implementation Checklists
+ - title: Implementation Checklists
url: /architecture-scenarios/checklists
- title: SSO for Regular Web Apps
| 2 |
diff --git a/src/web/App.mjs b/src/web/App.mjs @@ -403,7 +403,9 @@ class App {
}
/**
+ * Gets the URI params from the window and parses them to extract the actual values.
*
+ * @returns {object}
*/
getURIParams() {
// Load query string or hash from URI (depending on which is populated)
| 0 |
diff --git a/src/middleware/packages/notifications/services/digest/service.js b/src/middleware/packages/notifications/services/digest/service.js @@ -38,7 +38,7 @@ const DigestNotificationsService = {
actions: {
async build(ctx) {
const { frequency, timestamp } = ctx.params;
- const returnValues = [];
+ const success = [], failures = [];
const currentDate = timestamp ? new Date(timestamp) : new Date();
@@ -52,6 +52,7 @@ const DigestNotificationsService = {
const subscriptions = await ctx.call('digest.subscription.find', { query: { frequency } });
for (let subscription of subscriptions) {
+ try {
const subscriber = await ctx.call('activitypub.actor.get', { actorUri: subscription.webId });
const account = await ctx.call('auth.account.findByWebId', { webId: subscription.webId });
const newActivities = await ctx.call('activitypub.inbox.getByDates', {
@@ -103,18 +104,25 @@ const DigestNotificationsService = {
}
);
- returnValues.push({
+ success.push({
email: subscription.email || account.email,
locale: subscription.locale || account.locale,
numNotifications: notifications.length,
categories: Object.keys(notificationsByCategories),
+ notificationsIds: notifications.map(n => n.id),
subscription
});
}
}
+ } catch(e) {
+ failures.push({
+ error: e.message,
+ subscription
+ });
+ }
}
- return returnValues;
+ return ({ failures, success });
}
},
methods: {
| 7 |
diff --git a/universe.js b/universe.js import * as THREE from './three.module.js';
+import {BufferGeometryUtils} from './BufferGeometryUtils.js';
import {rigManager} from './rig.js';
import {scene} from './app-object.js';
import {Sky} from './Sky.js';
import {world} from './world.js';
import {GuardianMesh} from './land.js';
import minimap from './minimap.js';
+import {makeTextMesh} from './vr-ui.js';
const localVector = new THREE.Vector3();
const localVector2 = new THREE.Vector3();
@@ -56,12 +58,91 @@ const universeSpecs = [{
10, 3, -4,
],
}];
+const _makeLabelMesh = text => {
+ const w = 2;
+ const h = 0.3;
+ const textMesh = makeTextMesh(text, undefined, h, 'center', 'middle');
+ textMesh.color = 0xFFFFFF;
+ textMesh.sync();
+ {
+ const geometry = new THREE.CircleBufferGeometry(h/2, 32);
+ const img = new Image();
+ img.src = `http://127.0.0.1:3000/assets/logo-circle.svg`;
+ img.crossOrigin = 'Anonymous';
+ img.onload = () => {
+ texture.needsUpdate = true;
+ };
+ img.onerror = err => {
+ console.warn(err.stack);
+ };
+ const texture = new THREE.Texture(img);
+ const material = new THREE.MeshBasicMaterial({
+ map: texture,
+ side: THREE.DoubleSide,
+ });
+ const avatarMesh = new THREE.Mesh(geometry, material);
+ avatarMesh.position.x = -w/2;
+ avatarMesh.position.y = -0.02;
+ textMesh.add(avatarMesh);
+ }
+ {
+ const roundedRectShape = new THREE.Shape();
+ ( function roundedRect( ctx, x, y, width, height, radius ) {
+ ctx.moveTo( x, y + radius );
+ ctx.lineTo( x, y + height - radius );
+ ctx.quadraticCurveTo( x, y + height, x + radius, y + height );
+ /* ctx.lineTo( x + radius + indentWidth, y + height );
+ ctx.lineTo( x + radius + indentWidth + indentHeight, y + height - indentHeight );
+ ctx.lineTo( x + width - radius - indentWidth - indentHeight, y + height - indentHeight );
+ ctx.lineTo( x + width - radius - indentWidth, y + height ); */
+ ctx.lineTo( x + width - radius, y + height );
+ ctx.quadraticCurveTo( x + width, y + height, x + width, y + height - radius );
+ ctx.lineTo( x + width, y + radius );
+ ctx.quadraticCurveTo( x + width, y, x + width - radius, y );
+ ctx.lineTo( x + radius, y );
+ ctx.quadraticCurveTo( x, y, x, y + radius );
+ } )( roundedRectShape, 0, 0, w, h, h/2 );
+
+ const extrudeSettings = {
+ steps: 2,
+ depth: 0,
+ bevelEnabled: false,
+ /* bevelEnabled: true,
+ bevelThickness: 0,
+ bevelSize: 0,
+ bevelOffset: 0,
+ bevelSegments: 0, */
+ };
+ const geometry = BufferGeometryUtils.mergeBufferGeometries([
+ new THREE.CircleBufferGeometry(0.13, 32)
+ .applyMatrix4(new THREE.Matrix4().makeTranslation(-w/2, -0.02, -0.01)).toNonIndexed(),
+ new THREE.ExtrudeBufferGeometry( roundedRectShape, extrudeSettings )
+ .applyMatrix4(new THREE.Matrix4().makeTranslation(-w/2, -h/2 - 0.02, -0.02)),
+ ]);
+ const material2 = new THREE.LineBasicMaterial({
+ color: 0x000000,
+ transparent: true,
+ opacity: 0.5,
+ side: THREE.DoubleSide,
+ });
+ const nametagMesh2 = new THREE.Mesh(geometry, material2);
+ textMesh.add(nametagMesh2);
+ }
+ return textMesh;
+};
const worldObjects = universeSpecs.map(spec => {
const guardianMesh = GuardianMesh(spec.extents, blueColor);
guardianMesh.name = spec.name;
const worldObject = minimap.addWorld(spec.extents);
guardianMesh.worldObject = worldObject;
scene.add(guardianMesh);
+
+ const labelMesh = _makeLabelMesh('Erithor');
+ labelMesh.position.x = (spec.extents[0]+spec.extents[3])/2;
+ labelMesh.position.y = spec.extents[4] + 1;
+ labelMesh.position.z = (spec.extents[2]+spec.extents[5])/2;
+ guardianMesh.add(labelMesh);
+
return guardianMesh;
});
| 0 |
diff --git a/tests/e2e/plugins/oauth-callback.php b/tests/e2e/plugins/oauth-callback.php @@ -30,15 +30,8 @@ add_action(
$user_options = new User_Options( $context );
if ( filter_input( INPUT_GET, 'googlesitekit_connect', FILTER_VALIDATE_BOOLEAN ) ) {
- $redirect_url = '';
- if ( ! empty( $_GET['redirect'] ) ) {
- $redirect_url = esc_url_raw( wp_unslash( $_GET['redirect'] ) );
- }
-
- $auth_client = new OAuth_Client( $context );
- // User is trying to authenticate, but access token hasn't been set.
- wp_safe_redirect( $auth_client->get_authentication_url( $redirect_url ) );
- exit();
+ // Allow this case to be handled by default implementation.
+ return;
}
if (
| 11 |
diff --git a/ui/app/keychains/hd/recover-seed/confirmation.js b/ui/app/keychains/hd/recover-seed/confirmation.js @@ -4,12 +4,21 @@ const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const actions = require('../../../actions')
+const { withRouter } = require('react-router-dom')
+const { compose } = require('recompose')
+const {
+ DEFAULT_ROUTE,
+ INITIALIZE_BACKUP_PHRASE_ROUTE,
+} = require('../../../routes')
RevealSeedConfirmation.contextTypes = {
t: PropTypes.func,
}
-module.exports = connect(mapStateToProps)(RevealSeedConfirmation)
+module.exports = compose(
+ withRouter,
+ connect(mapStateToProps)
+)(RevealSeedConfirmation)
inherits(RevealSeedConfirmation, Component)
@@ -109,6 +118,8 @@ RevealSeedConfirmation.prototype.componentDidMount = function () {
RevealSeedConfirmation.prototype.goHome = function () {
this.props.dispatch(actions.showConfigPage(false))
+ this.props.dispatch(actions.confirmSeedWords())
+ .then(() => this.props.history.push(DEFAULT_ROUTE))
}
// create vault
@@ -123,4 +134,5 @@ RevealSeedConfirmation.prototype.checkConfirmation = function (event) {
RevealSeedConfirmation.prototype.revealSeedWords = function () {
var password = document.getElementById('password-box').value
this.props.dispatch(actions.requestRevealSeed(password))
+ .then(() => this.props.history.push(INITIALIZE_BACKUP_PHRASE_ROUTE))
}
| 4 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -232,7 +232,7 @@ jobs:
# differ between the macOS image and the Docker containers above.
- run:
name: pre-start simulator
- command: xcrun simctl boot "iPhone 7 (10.3.1) [" || true
+ command: xcrun simctl boot "iPhone 7" || true
- run:
command: |
brew update
| 4 |
diff --git a/src/commands/addons/list.js b/src/commands/addons/list.js @@ -18,20 +18,20 @@ class AddonsListCommand extends Command {
const siteData = await api.getSite({ siteId })
const addons = await getAddons(siteId, accessToken)
- if (!addons || !addons.length) {
- this.log(`No addons currently installed for ${siteData.name}`)
- this.log(`> Run \`netlify addons:create addon-namespace\` to install an addon`)
- return false
- }
- // Json response for piping commands
+ // Return json response for piping commands
if (flags.json) {
this.log(JSON.stringify(addons, null, 2))
return false
}
+ if (!addons || !addons.length) {
+ this.log(`No addons currently installed for ${siteData.name}`)
+ this.log(`> Run \`netlify addons:create addon-namespace\` to install an addon`)
+ return false
+ }
+
const addonData = addons.map(addon => {
- // this.log('addon', addon)
return {
namespace: addon.service_path.replace('/.netlify/', ''),
name: addon.service_name,
@@ -63,6 +63,7 @@ AddonsListCommand.flags = {
description: 'Output add-on data as JSON'
})
}
+
AddonsListCommand.hidden = true
module.exports = AddonsListCommand
| 3 |
diff --git a/components/post.js b/components/post.js @@ -390,6 +390,23 @@ function Post({title, published_at, feature_image, html, backLink}) {
color: white;
margin-bottom: 1em;
}
+
+ .kg-product-card {
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ width: 100%;
+ }
+
+ .kg-product-card-container {
+ align-items: center;
+ background: 0 0;
+ max-width: 550px;
+ padding: 20px;
+ border-radius: 5px;
+ box-shadow: inset 0 0 0 1px rgb(124 139 154/25%);
+ margin-bottom: 1em;
+ }
`}</style>
</Section>
)
| 0 |
diff --git a/packages/node_modules/@node-red/editor-client/src/vendor/monaco/style.css b/packages/node_modules/@node-red/editor-client/src/vendor/monaco/style.css @@ -14,3 +14,9 @@ This stylesheet overrides those to correct some graphical glitches
color: unset;
margin: unset;
}
+
+/* unset some styles of `input` tag (set by node-red css) for monaco rename box */
+.monaco-editor .rename-box .rename-input {
+ box-sizing: unset;
+ height: unset;
+}
\ No newline at end of file
| 9 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -634,6 +634,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
var definedDelta;
if(isPeriod && tickformat) {
var noDtick = ax._dtickInit !== ax.dtick;
+ var prevDtick = ax.dtick;
if(
!(/%[fLQsSMX]/.test(tickformat))
// %f: microseconds as a decimal number [000000, 999999]
@@ -706,11 +707,16 @@ axes.calcTicks = function calcTicks(ax, opts) {
) ax.dtick = 'M12';
}
}
+
+ if(prevDtick !== ax.dtick) {
+ // move tick0 back
+ ax.tick0 = axes.tickIncrement(ax.tick0, prevDtick, !axrev, ax.calendar);
+
+ // redo first tick
+ ax._tmin = axes.tickFirst(ax, opts);
+ }
}
- var maxTicks = Math.max(1000, ax._length || 0);
- var tickVals = [];
- var xPrevious = null;
var x = ax._tmin;
if(ax.rangebreaks && ax._tick0Init !== ax.tick0) {
@@ -726,6 +732,9 @@ axes.calcTicks = function calcTicks(ax, opts) {
x = axes.tickIncrement(x, ax.dtick, !axrev, ax.calendar);
}
+ var maxTicks = Math.max(1000, ax._length || 0);
+ var tickVals = [];
+ var xPrevious = null;
for(;
(axrev) ? (x >= endTick) : (x <= endTick);
x = axes.tickIncrement(x, ax.dtick, axrev, ax.calendar)
| 9 |
diff --git a/.travis.yml b/.travis.yml @@ -69,3 +69,7 @@ jobs:
if: (branch = master OR tag IS present) AND type = push
env: NAME=deploy
script: node_modules/.bin/ember deploy production
+
+ allow_failures:
+ - env: EMBER_TRY_SCENARIO=ember-beta
+ - env: EMBER_TRY_SCENARIO=ember-canary
| 11 |
diff --git a/token-metadata/0xd0Df3b1Cf729A29B7404c40D61C750008E631bA7/metadata.json b/token-metadata/0xd0Df3b1Cf729A29B7404c40D61C750008E631bA7/metadata.json "symbol": "RUG",
"address": "0xd0Df3b1Cf729A29B7404c40D61C750008E631bA7",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
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 "4.0.1">
+<!ENTITY version-java-client "4.0.2">
<!ENTITY version-dotnet-client "3.6.6">
<!ENTITY version-server "3.6.6">
<!ENTITY version-erlang-client "3.6.6">
| 12 |
diff --git a/src/screens/HomeScreen/__snapshots__/Header.test.js.snap b/src/screens/HomeScreen/__snapshots__/Header.test.js.snap @@ -60,6 +60,7 @@ exports[`renders correctly 1`] = `
"backgroundColor": "#ffffff",
"paddingHorizontal": 8,
"paddingTop": 8,
+ "zIndex": 2,
}
}
type="uber"
@@ -71,11 +72,18 @@ exports[`renders correctly 1`] = `
markdown={false}
markdownStyle={Object {}}
style={
+ Array [
Object {
"backgroundColor": "#ffffff",
"paddingHorizontal": 8,
"paddingTop": 8,
- }
+ "zIndex": 2,
+ },
+ Object {
+ "marginTop": -6,
+ "zIndex": 1,
+ },
+ ]
}
type="uber"
>
| 3 |
diff --git a/src/feed/Page.js b/src/feed/Page.js @@ -58,7 +58,7 @@ class Page extends React.Component {
handleTopicClose = () => this.props.history.push(this.props.match.url);
render() {
- const { auth, match } = this.props;
+ const { auth, match, location } = this.props;
return (
<div>
@@ -78,13 +78,13 @@ class Page extends React.Component {
</div>
</Affix>
<div className="center">
- <TopicSelector
+ {location.pathname !== '/' && <TopicSelector
isSingle={false}
sort={this.state.currentKey}
topics={this.state.categories}
onSortChange={this.handleSortChange}
onTopicClose={this.handleTopicClose}
- />
+ />}
<Route path={`${match.path}:sortBy?/:category?`} component={SubFeed} />
</div>
</div>
| 2 |
diff --git a/src/generators/tailwind.js b/src/generators/tailwind.js @@ -46,8 +46,7 @@ module.exports = {
throw Error("Tailwind CSS was compiled to empty string.")
}
- // Temporary fix for Tailwind CSS escaped characters
- return result.css.replace(/\\-/g, '-')
+ return result.css
})
}
catch (err) {
@@ -71,8 +70,7 @@ module.exports = {
throw Error("Tailwind CSS was compiled to empty string.")
}
- // Temporary fix for Tailwind CSS escaped characters
- return result.css.replace(/\\-/g, '-')
+ return result.css
})
} catch (err) {
throw err
| 2 |
diff --git a/test/unit/docsify.test.js b/test/unit/docsify.test.js @@ -7,7 +7,8 @@ const handler = require('serve-handler');
const { expect } = require('chai');
const { initJSDOM } = require('../_helper');
-const docsifySite = 'http://127.0.0.1:3000';
+const port = 9753;
+const docsifySite = 'http://127.0.0.1:' + port;
const markup = /* html */ `<!DOCTYPE html>
<html>
@@ -30,7 +31,7 @@ describe('Docsify public API', () => {
return handler(request, response);
});
- await new Promise(r => server.listen(3000, r));
+ await new Promise(r => server.listen(port, r));
});
after(async () => {
| 4 |
diff --git a/examples/client_socks_proxy/client_socks_proxy.js b/examples/client_socks_proxy/client_socks_proxy.js @@ -15,7 +15,7 @@ const client = mc.createClient({
socks.createConnection({
proxy: {
host: proxyHost,
- port: proxyPort,
+ port: parseInt(proxyPort),
type: 5
},
command: 'connect',
@@ -33,7 +33,7 @@ const client = mc.createClient({
client.emit('connect')
})
},
- agent: new ProxyAgent({ protocol: 'socks5', host: proxyHost, port: proxyPort }),
+ agent: new ProxyAgent({ protocol: 'socks5:', host: proxyHost, port: proxyPort }),
username: process.argv[6] ? process.argv[6] : 'echo',
password: process.argv[7]
})
| 1 |
diff --git a/README.md b/README.md -# Ng6PdfViewer
+# ngx-extended-pdf-viewer
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.0.
+Bringing Mozilla's pdf.js to the Angular world. Well, not just displaying PDFs. If you only need the base functionality, I'll happily pass you to [the project of Vadym Yatsyuk](https://github.com/vadimdez/ng2-pdf-viewer/). Vadym does a great job delivering a no-nonsense PDF viewer. However, if you need something that can easily pass as the native viewer on a gloomy day, mgx-extended-pdf-viewer is your friend.
+
+# Features
+
+- Searching
+- Printing
+- Sidebar with thumbails, outlines, and attachments
+- Rotating
+- Download and upload
+- Zoom
+- Full-screen mode
+- various selection tools
+- standard display or even / odd spreads (like a book)
+- various approaches to scrolling (vertical, horizontal, "wrapped" scrolling)
+- Internationalization (providing translations to several dozen languages)
+- plus the ability to deactivate each of these features.
+
+Not to mention the ability to display PDF files, running on Mozilla's pdf.js 2.0.943.
## Build and run the demo project
| 7 |
diff --git a/src/components/select/editForm/Select.edit.data.js b/src/components/select/editForm/Select.edit.data.js @@ -65,7 +65,8 @@ export default [
input: true,
key: 'data.json',
label: 'Data Source Raw JSON',
- tooltip: 'A raw JSON array to use as a data source.',
+ tooltip: 'A valid JSON array to use as a data source.',
+ description: '<div>Example: <pre>["apple", "banana", "orange"].</pre></div> <div>Example 2: <pre>[{"name": "John", "email": "[email protected]"}, {"name": "Jane", "email": "[email protected]"}].</pre></div>',
conditional: {
json: { '===': [{ var: 'data.dataSrc' }, 'json'] },
},
| 7 |
diff --git a/src/og/scene/Planet.js b/src/og/scene/Planet.js @@ -978,25 +978,6 @@ class Planet extends RenderNode {
if (this._createdNodesCount > MAX_NODES && this._distBeforeMemClear > 10000.0) {
this.memClear();
}
-
- this._collectRenderNodes();
-
- // Here is the planet node dispatches a draw event before
- // rendering begins and we have got render nodes.
- this.events.dispatch(this.events.draw, this);
-
- this.transformLights();
-
- this._normalMapCreator.frame();
-
- // Creating geoImages textures.
- this._geoImageCreator.frame();
-
- // Collect entity collections from vector layers
- this._collectVectorLayerCollections();
-
- // Vector tiles rasteriazation
- this._vectorTileCreator.frame();
}
/**
@@ -1022,9 +1003,30 @@ class Planet extends RenderNode {
let h = renderer.handler;
let gl = h.gl;
let cam = renderer.activeCamera;
-
let frustumIndex = cam.getCurrentFrustum();
+ if (frustumIndex === cam.frustums.length - 1) {
+
+ this._collectRenderNodes();
+
+ // Here is the planet node dispatches a draw event before
+ // rendering begins and we have got render nodes.
+ this.events.dispatch(this.events.draw, this);
+
+ this.transformLights();
+
+ this._normalMapCreator.frame();
+
+ // Creating geoImages textures.
+ this._geoImageCreator.frame();
+
+ // Collect entity collections from vector layers
+ this._collectVectorLayerCollections();
+
+ // Vector tiles rasteriazation
+ this._vectorTileCreator.frame();
+ }
+
gl.blendEquation(gl.FUNC_ADD);
gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
gl.enable(gl.BLEND);
| 14 |
diff --git a/README.md b/README.md @@ -21,7 +21,7 @@ and install the latest yarn version for your system.
### 1. Clone the repo
-:horse_racing: Run this command to clone the repo
+:horse_racing: Run this command to clone the repo:
`git clone https://github.com/nas5w/typeofnan-javascript-quizzes`
@@ -29,7 +29,7 @@ and install the latest yarn version for your system.
### 2. Install dependencies
-First, before you can use the app, you have to run this command to install all the dependencies
+First, before you can use the app, you have to run this command to install all the dependencies:
`yarn install`
@@ -37,11 +37,11 @@ First, before you can use the app, you have to run this command to install all t
### 3. Start and view the app :eyes:
-After you've installed all the dependencies, run this command to start the app
+After you've installed all the dependencies, run this command to start the app:
`yarn start` :horse_racing:
-Then open, in your browser, this link `http://localhost:8000/` to view it! :tada: :tada:
+Then, in your browser, open http://localhost:8000/ to view it! :tada: :tada:
| 1 |
diff --git a/client/src/components/client/credits.js b/client/src/components/client/credits.js @@ -195,7 +195,7 @@ class Credits extends Component {
<li>
<a
download="Thorium.zip"
- href="https://github.com/Thorium-Sim/thorium-kiosk/releases/download/v1.0.2/thorium-client-1.0.3-mac.zip"
+ href="https://github.com/Thorium-Sim/thorium-kiosk/releases/download/v1.0.3/thorium-client-1.0.3-mac.zip"
>
Mac
</a>
@@ -203,7 +203,7 @@ class Credits extends Component {
<li>
<a
download="Thorium.zip"
- href="https://github.com/Thorium-Sim/thorium-kiosk/releases/download/v1.0.2/thorium-client-setup-1.0.3.exe"
+ href="https://github.com/Thorium-Sim/thorium-kiosk/releases/download/v1.0.3/thorium-client-setup-1.0.3.exe"
>
Windows
</a>
@@ -211,7 +211,7 @@ class Credits extends Component {
<li>
<a
download="Thorium.zip"
- href="https://github.com/Thorium-Sim/thorium-kiosk/releases/download/v1.0.2/thorium-client-1.0.3-x86_64.AppImage"
+ href="https://github.com/Thorium-Sim/thorium-kiosk/releases/download/v1.0.3/thorium-client-1.0.3-x86_64.AppImage"
>
Linux
</a>
| 1 |
diff --git a/packages/spark-core/components/masthead.js b/packages/spark-core/components/masthead.js @@ -4,9 +4,9 @@ import { focusFirstEl } from '../utilities/elementState';
import { isEscPressed } from '../utilities/keypress';
import { hideDropDown, showDropDown } from './dropdown';
-const addClassOnScroll = (element, scrollPos, elementHeight, classToToggle) => {
- // If user scrolls past the element then add class
- if (scrollPos >= elementHeight) {
+const addClassOnScroll = (element, scrollPos, scrollPoint, classToToggle) => {
+ // If user scrolls past the scrollPoint then add class
+ if (scrollPos >= scrollPoint) {
element.classList.add(classToToggle);
} else {
element.classList.remove(classToToggle);
@@ -138,7 +138,7 @@ const bindUIEvents = () => {
});
window.addEventListener('scroll', () => {
- addClassOnScroll(masthead, window.scrollY, masthead.offsetHeight, 'sprk-c-Masthead--scroll');
+ addClassOnScroll(masthead, window.scrollY, 10, 'sprk-c-Masthead--scroll');
});
mainLayout.addEventListener('focusin', () => {
| 3 |
diff --git a/package.json b/package.json {
"name": "BitShares2-light",
- "version": "2.0.181031-rc1",
+ "version": "2.0.181031-rc2",
"description": "Advanced wallet interface for the BitShares financial blockchain.",
"homepage": "https://github.com/bitshares/bitshares-ui",
"author": "Sigve Kvalsvik <[email protected]>",
| 6 |
diff --git a/boilerplate/app/index.html b/boilerplate/app/index.html </head>
<body>
<h3>Welcome to Embark!</h3>
- <p>See the <a href="https://github.com/iurimatias/embark-framework/wiki">Wiki</a> to see what you can do with Embark!</p>
+ <p>See the <a href="http://embark.readthedocs.io/en/latest/index.html" target="_blank">Embark's documentation</a> to see what you can do with Embark!</p>
</body>
</html>
| 3 |
diff --git a/views/env-parts/i18next.es b/views/env-parts/i18next.es @@ -65,7 +65,7 @@ i18next.use(reactI18nextModule)
},
saveMissing: window.dbg && window.dbg.isEnabled(),
missingKeyHandler: function (lng, ns, key, fallbackValue) {
- if (i18nFiles.map(i => path.basename(i)).includes(ns)) {
+ if (ns !== 'data' && i18nFiles.map(i => path.basename(i)).includes(ns)) {
const p = path.join(ROOT, 'i18n', ns, `${lng}.json`)
const cnt = readJSONSync(p)
cnt[key] = fallbackValue
| 8 |
diff --git a/src/server/bg_services/server_monitor.js b/src/server/bg_services/server_monitor.js @@ -30,10 +30,6 @@ function run() {
status: "UNKNOWN",
test_time: moment().unix()
},
- remote_syslog_status: {
- status: "UNKNOWN",
- test_time: moment().unix()
- }
};
if (!system_store.is_finished_initial_load) {
dbg.log0('waiting for system store to load');
| 2 |
diff --git a/modules/controller/rpc-controller.js b/modules/controller/rpc-controller.js @@ -653,10 +653,9 @@ class RpcController {
let response;
if (handlerData) {
+ const documentPath = this.fileService.getHandlerIdDocumentPath(handler_id);
switch (req.params.operation) {
case 'entities:search':
-
- const documentPath = this.fileService.getHandlerIdDocumentPath(handler_id);
handlerData.data = await this.fileService.loadJsonFromFile(documentPath);
response = handlerData.data.map(async (x) => ({
@@ -688,11 +687,8 @@ class RpcController {
});
break;
case 'assertions:search':
- const documentPath = this.fileService.getHandlerIdDocumentPath(handler_id);
handlerData.data = await this.fileService.loadJsonFromFile(documentPath);
-
-
response = handlerData.data.map(async (x) => ({
"@type": "AssertionSearchResult",
"result": {
@@ -723,7 +719,6 @@ class RpcController {
case 'publish':
const result = {};
if (handlerData.data) {
- const documentPath = this.fileService.getHandlerIdDocumentPath(handler_id);
const {rdf, assertion} = await this.fileService.loadJsonFromFile(documentPath);
result.data = JSON.parse(handlerData.data);
result.data.rdf = rdf;
@@ -732,8 +727,6 @@ class RpcController {
res.status(200).send({status: handlerData.status, data: result.data});
break;
default:
-
- const documentPath = this.fileService.getHandlerIdDocumentPath(handler_id);
handlerData.data = await this.fileService.loadJsonFromFile(documentPath);
res.status(200).send({status: handlerData.status, data: handlerData.data});
| 3 |
diff --git a/lib/bal/api.js b/lib/bal/api.js @@ -5,7 +5,7 @@ import HttpError from '../http-error'
const {publicRuntimeConfig} = getConfig()
-export const {BACKEND_URL} = publicRuntimeConfig
+export const BACKEND_URL = publicRuntimeConfig.BACKEND_URL || 'https://adresse.data.gouv.fr/backend'
async function _fetch(url, method, body) {
const options = {
| 0 |
diff --git a/tests/index.test.js b/tests/index.test.js @@ -60,9 +60,12 @@ module.exports = Object.assign(
},
after: (browser, done) => {
if (SLACK_TOKEN && browser.sessionId) {
- return browser.waitForElementVisible('#e2e-request', ()=> {
- return browser.getText('#e2e-error', error => {
- return browser.getText('#e2e-request', request => {
+ browser.waitForElementVisible('#e2e-request', false, () => {
+ // There is a chance e2e request will not be present if tests failed on another website i.e. mailinator
+ browser.isVisible('#e2e-request', result => {
+ if (result.value) {
+ browser.getText('#e2e-error', error => {
+ browser.getText('#e2e-request', request => {
if (error) {
const lastRequest = request.value ? JSON.parse(request.value) : {};
const lastError = error.value ? JSON.parse(error.value) : {};
@@ -81,9 +84,15 @@ module.exports = Object.assign(
});
})
}
+ });
+ });
+ } else {
+ server.kill('SIGINT');
+ browser.end();
+ done();
+ }
})
- })
- })
+ });
} else {
server.kill('SIGINT');
browser.end();
| 9 |
diff --git a/lib/models.js b/lib/models.js @@ -51,7 +51,7 @@ export const parseDifference = (previousState, currentState) => {
const actions = [];
Object.values(difference).forEach((df) => {
- let action = { tableName: df.path[0], depends: [df.path[0]] };
+ let action = { tableName: df.path[0], depends: [df.path[0]], options: {} };
let actionOptional = { ...action };
// log (JSON.stringify(df, null, 4));
| 1 |
diff --git a/musicgenerator/main.py b/musicgenerator/main.py @@ -6,8 +6,9 @@ from google.cloud import storage
PROJECT = 'halite-2'
-
# move to key management soon, create a new key and disable the current one
+AMPER_KEY = 'wLntjWsRjS3PpZZsIKvbLvIbWTEdLwVkQ7kznKi3DrU5Y4Ut7mKmxQnMjTpYomLm'
+
MUSIC_BUCKET = 'ampermusichalite2'
AMPER_BASE_API_URL = 'https://jimmy.ampermusic.com/v1/'
@@ -18,7 +19,7 @@ def ampergenerate():
url = AMPER_BASE_API_URL
payload = "{\n \"timeline\":\n {\n\t \"events\": [\n\t {\n\t \"event\": \"region\",\n\t \"id\": 1,\n\t \"time\": 0,\n\t \"descriptor\": \"epic_percussive_high\"\n\t },\n\t {\n\t \"event\": \"silence\",\n\t \"time\": 30.07\n\t }\n\t ]\n }\n}"
headers = {
- 'authorization': "Bearer wLntjWsRjS3PpZZsIKvbLvIbWTEdLwVkQ7kznKi3DrU5Y4Ut7mKmxQnMjTpYomLm",
+ 'authorization': "Bearer " + AMPER_KEY,
'content-type': "application/json",
'cache-control': "no-cache",
}
| 5 |
diff --git a/README.md b/README.md </h1>
# electerm
-[](https://badge.fury.io/gh/electerm%2Felecterm)
+[](http://electerm.html5beta.com)
[](https://travis-ci.org/electerm/electerm)
[](https://ci.appveyor.com/project/zxdong262/electerm/branch/release)
<span class="badge-daviddm"><a href="https://david-dm.org/electerm/electerm" title="View the status of this project's dependencies on DavidDM"><img src="https://img.shields.io/david/electerm/electerm.svg" alt="Dependency Status" /></a></span>
| 4 |
diff --git a/layouts/partials/fragments/list.html b/layouts/partials/fragments/list.html {{- end }}
</div>
{{- if $renderPagination -}}
- {{- partial "helpers/pagination.html" (dict "paginator" .root.Paginator) -}}
+ {{- partial "helpers/pagination.html" (dict "paginator" .root.Paginator "page_scratch" .page_scratch) -}}
{{- end }}
</div>
</div>
| 0 |
diff --git a/shared/js/background/trackers.es6.js b/shared/js/background/trackers.es6.js @@ -38,8 +38,7 @@ function isTracker (urlToCheck, thisTab, request) {
return checkFirstParty(embeddedTweets, currLocation, urlToCheck)
}
- const parsedUrl = tldjs.parse(urlToCheck)
- const urlSplit = getSplitURL(parsedUrl)
+ const urlSplit = getSplitURL(urlToCheck)
let trackerByParentCompany = checkTrackersWithParentCompany(urlSplit, siteDomain, request)
if (trackerByParentCompany) {
return checkFirstParty(trackerByParentCompany, currLocation, urlToCheck)
@@ -47,8 +46,10 @@ function isTracker (urlToCheck, thisTab, request) {
return false
}
-function getSplitURL (parsedUrl) {
- let hostname
+// return a hostname split on '.'
+function getSplitURL (url) {
+ const parsedUrl = tldjs.parse(url)
+ let hostname = ''
if (parsedUrl && parsedUrl.hostname) {
hostname = parsedUrl.hostname
@@ -139,10 +140,15 @@ function checkTrackersWithParentCompany (url, siteDomain, request) {
const foundOnWhitelist = matchedTracker.data.whitelist.some(ruleObj => {
if (requestMatchesRule(request, ruleObj, siteDomain)) {
matchedTracker.block = false
+ matchedTracker.type = 'trackersWhitelist'
// break loop early
return true
}
})
+
+ if (foundOnWhitelist) {
+ return getReturnTrackerObj(matchedTracker, request, 'whitelisted')
+ }
}
return getReturnTrackerObj(matchedTracker, request, 'trackersWithParentCompany')
} else {
| 3 |
diff --git a/src/offline/NetworkStatus.js b/src/offline/NetworkStatus.js @@ -94,10 +94,8 @@ const Service = class {
});
// We catch every $.ajax request errors or (canceled request).
-
// @ts-ignore
- const ajaxError = this.$document_['ajaxError'];
- if (ajaxError) {
+ if (this.$document_.ajaxError) {
/**
* @param {any} evt
* @param {any} jqxhr
@@ -110,7 +108,8 @@ const Service = class {
this.check(2000);
}
};
- ajaxError(onAjaxError);
+ // @ts-ignore
+ this.$document_.ajaxError(onAjaxError);
}
}
| 8 |
diff --git a/assets/src/libraries/Book.js b/assets/src/libraries/Book.js @@ -21,6 +21,7 @@ export default class Book extends Component {
this._actionButtons = this._actionButtons.bind(this);
this._borrow = this._borrow.bind(this);
this._return = this._return.bind(this);
+ this.showDetail = this.showDetail.bind(this);
}
onMouseOver() { return this.setState({ zDepth: 2 }); }
@@ -48,11 +49,15 @@ export default class Book extends Component {
return null;
}
+ showDetail() {
+ this.props.showDetail(this.props.book);
+ }
+
render() {
const book = this.props.book;
return (
- <Paper className="book" zDepth={this.state.zDepth} onMouseOver={this.onMouseOver} onClick={()=>this.props.showDetail(book)} onMouseOut={this.onMouseOut}>
+ <Paper className="book" zDepth={this.state.zDepth} onMouseOver={this.onMouseOver} onClick={this.showDetail} onMouseOut={this.onMouseOut}>
<div className="book-cover">
<img src={book.image_url} alt={"Cover of " + book.title} />
<div className="book-cover-overlay"></div>
| 0 |
diff --git a/README.md b/README.md @@ -54,8 +54,8 @@ npm install jquery.tabulator --save
### CDNJS
To access Tabulator directly from the CDNJS CDN servers, include the following two lines at the start of your project, instead of the localy hosted versions:
```html
-<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.2.0/tabulator.min.css" rel="stylesheet">
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.2.0/tabulator.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.2.1/tabulator.min.css" rel="stylesheet">
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.2.1/tabulator.min.js"></script>
```
Coming Soon
| 3 |
diff --git a/reddit-bot/bot.js b/reddit-bot/bot.js @@ -496,6 +496,7 @@ function dourl(url, post, options) {
bigimage(url, {
fill_object: true,
force_page: true,
+ exclude_videos: true,
//allow_thirdparty: true,
filter: function(url) {
if (!bigimage.is_internet_url(url))
@@ -617,6 +618,8 @@ const links = new NodeCache({ stdTTL: 600, checkperiod: 100 });
//dourl("https://thumbs.ebaystatic.com/d/l225/pict/400793189705_4.jpg");
// imgur nsfw that should still return a larger image
//dourl("https://i.imgur.com/L4BmEfg_d.jpg?maxwidth=640&shape=thumb&fidelity=medium");
+// shouldn't show anything if exclude_videos == true
+//dourl("https://thumbs.gfycat.com/YellowTornCockatiel-size_restricted.gif");
//console.dir(blacklist_json.disallowed);
if (true) {
| 12 |
diff --git a/src/components/UploadToS3Dialog/index.js b/src/components/UploadToS3Dialog/index.js @@ -65,7 +65,7 @@ export const UploadToS3Dialog = ({ open, onClose, onAddSamples }) => {
loadS3Path()
// eslint-disable-next-line
}, [s3Path, listBuckets, listBucketItemsAt])
- if (!open) return
+ if (!open) return null
return (
<SimpleDialog
onClose={onClose}
| 12 |
diff --git a/runtime.js b/runtime.js @@ -409,6 +409,7 @@ const _loadGltf = async (file, {optimize = false, physics = false, physics_url =
if (component) {
const componentHandler = componentHandlers[component.type];
componentHandler.trigger(mesh, component, rigAux);
+ used = true;
}
}
return used;
@@ -420,6 +421,7 @@ const _loadGltf = async (file, {optimize = false, physics = false, physics_url =
if (component) {
const componentHandler = componentHandlers[component.type];
componentHandler.untrigger(mesh, component, rigAux);
+ used = true;
}
}
return used;
@@ -432,6 +434,7 @@ const _loadGltf = async (file, {optimize = false, physics = false, physics_url =
if (component) {
const componentHandler = componentHandlers[component.type];
componentHandler.load(mesh, component, rigAux);
+ used = true;
}
}
return used;
@@ -894,6 +897,7 @@ const _loadScript = async (file, {files = null, parentUrl = null, instanceId = n
if (component) {
const componentHandler = componentHandlers[component.type];
componentHandler.trigger(mesh, component, rigAux);
+ used = true;
}
}
return used;
@@ -905,6 +909,7 @@ const _loadScript = async (file, {files = null, parentUrl = null, instanceId = n
if (component) {
const componentHandler = componentHandlers[component.type];
componentHandler.untrigger(mesh, component, rigAux);
+ used = true;
}
}
return used;
| 0 |
diff --git a/includes/Modules/PageSpeed_Insights.php b/includes/Modules/PageSpeed_Insights.php @@ -129,6 +129,7 @@ final class PageSpeed_Insights extends Module
* Parses a response for the given datapoint.
*
* @since 1.0.0
+ * @since n.e.x.t GET:pagespeed returns the full response, not just the lighthouse result.
*
* @param Data_Request $data Data request object.
* @param mixed $response Request response.
@@ -136,10 +137,7 @@ final class PageSpeed_Insights extends Module
* @return mixed Parsed response data on success, or WP_Error on failure.
*/
protected function parse_data_response( Data_Request $data, $response ) {
- switch ( "{$data->method}:{$data->datapoint}" ) {
- case 'GET:pagespeed':
- // TODO: Parse this response to a regular array.
- return $response->getLighthouseResult();
+ switch ( "{$data->method}:{$data->datapoint}" ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedSwitch
}
return $response;
| 2 |
diff --git a/packages/react-jsx-highcharts/src/utils/removeProvidedProps.js b/packages/react-jsx-highcharts/src/utils/removeProvidedProps.js import { mapValues } from 'lodash-es';
import { isPlainObject } from 'lodash-es';
-import { wrap } from 'lodash-es';
const FROM_HIGHCHARTS_PROVIDER = 'getHighcharts';
const FROM_CHART_PROVIDER = 'getChart';
@@ -34,8 +33,8 @@ function deepCleanConfig (config) {
}
export default function removeProvidedProps (func) {
- return wrap(func, function (origFunc, config, ...rest) {
+ return (config, ...rest) => {
const cleanedConfig = deepCleanConfig(config);
- return origFunc(cleanedConfig, ...rest);
- });
+ return func(cleanedConfig, ...rest);
+ };
}
| 14 |
diff --git a/demos/bibliographie/leoUIexample.js b/demos/bibliographie/leoUIexample.js @@ -56,11 +56,6 @@ export default class LeoUIExample{
var g = ohm.grammar('Academic { \n Exp = \n AcademicQuery \n \n AcademicQuery = Attribute Comparator Value -- simple \n | ("And" | "Or") "(" AcademicQuery "," AcademicQuery ")" -- complex \n | "Composite(" CompositeQuery ")" -- composite \n \n CompositeQuery = Attribute "." Attribute Comparator Value -- simple \n | ("And" | "Or") "(" CompositeQuery "," CompositeQuery ")" -- complex \n \n Comparator = \n PartialComparator "="? \n PartialComparator = \n "=" | "<" | ">" \n \n Attribute (an attribute) = \n letter letter? letter? \n \n Value (a value) = \n "\'" alnum* "\'" -- string \n | Number \n | Date \n | ( "[" | "(" ) Number "," Number ( "]" | ")" ) -- numberRange \n | ( "[" | "(" ) Date "," Date ( "]" | ")" ) -- dateRange \n \n Number = \n digit+ \n Date = \n "\'" Number "-" Number "-" Number "\'" \n}');
- /*lively.notify(g.match("Composite(And(AA.AuN='mike smith',AA.AfN='harvard university'))").succeeded(), "Composite(And(AA.AuN='mike smith',AA.AfN='harvard university'))");
- lively.notify(g.match("And(AA.AuN='mike smith',AA.AfN='harvard university')").succeeded(), "And(AA.AuN='mike smith',AA.AfN='harvard university')");*/
-
- //var queryObject = {};
-
var s = g.createSemantics();
s.addOperation(
@@ -76,16 +71,16 @@ export default class LeoUIExample{
}}
},
AcademicQuery_complex: function(conjunction, _1, left, _2, right, _3) {
- return {[conjunction.sourceString]: [
- left.interpret(),
- right.interpret()
- ]}
+ return {[conjunction.sourceString]:
+ Object.assign(left.interpret(), right.interpret())
+ }
},
AcademicQuery_composite: function(_1, query, _2) {
return query.interpret();
},
CompositeQuery_simple: function(mainAttribute, _, secondaryAttribute, comparator, value) {
+ // TODO: Don't set keys! Otherwise, queries on the same attribute will be overwritten
return {[mainAttribute.interpret()]:
{[secondaryAttribute.interpret()]:
{
@@ -96,10 +91,9 @@ export default class LeoUIExample{
}
},
CompositeQuery_complex: function(conjunction, _1, left, _2, right, _3) {
- return {[conjunction.sourceString]: [
- left.interpret(),
- right.interpret()
- ]}
+ return {[conjunction.sourceString]:
+ Object.assign(left.interpret(), right.interpret())
+ }
},
Comparator: function(main, secondary) {
@@ -120,7 +114,6 @@ export default class LeoUIExample{
return string.sourceString;
},
Value_numberRange: function(leftBracket, nLeft, _, nRight, rightBracket) {
- // TODO: refactor
return "TODO";//arguments.map(a => {a.sourceString}).join('');
},
Value_dateRange: function(leftBracket, dLeft, _, dRight, rightBracket) {
@@ -169,16 +162,18 @@ export default class LeoUIExample{
// event.target.appendChild(lively.query(this, '#'+data))
// }
- var query = "Ti='indexing by latent seman'";
+ var query = "And(Or(A='1985', Y='2008'), Ti='disordered electronic systems')";
var match = g.match(query);
var queryObject = s(match).interpret();
- var div = <div id="outerDiv"></div>
+ var input = <input id="queryInput" value={query} style="width: 100%"></input>
+ var div = <div id="outerDiv" style="padding-right : 20px">
+ {input}
+ </div>
Object.keys(queryObject).forEach(key => {
div.appendChild(createUILayer(queryObject, key));
});
- //div.appendChild(<div>key</div>)
return div;
// <div>
| 7 |
diff --git a/package.json b/package.json "name": "eleventy",
"version": "0.1.0",
"description": "Transform a directory of templates into HTML.",
- "license": "MIT",
"main": "cmd.js",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.0.0"
+ },
+ "bin": {
+ "eleventy": "./cmd.js"
+ },
"scripts": {
"default": "node cmd.js",
"watch": "node cmd.js --watch",
"email": "[email protected]",
"url": "https://zachleat.com/"
},
- "bin": {
- "eleventy": "./cmd.js"
- },
"repository": {
"type": "git",
"url": "git://github.com/zachleat/eleventy.git"
| 0 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -186,6 +186,21 @@ articles:
- title: "Addons/Third-Party Applications"
url: "/addons"
+ - title: "Support"
+ url: "/support"
+ children:
+ - title: "Support Matrix"
+ url: "/support/matrix"
+
+ - title: "SLA"
+ url: "/support/sla"
+
+ - title: "Tickets"
+ url: "/support/tickets"
+
+ - title: "Manage Subscription"
+ url: "/support/subscription"
+
- title: "Professional Services"
url: "/services"
| 0 |
diff --git a/src/encoded/static/components/home/card_definitions.js b/src/encoded/static/components/home/card_definitions.js @@ -273,7 +273,7 @@ export const CARDS_FOR_OTHER_DATA = {
title: 'Single-cell experiments',
help: 'Data generated by assays (such as scRNA-seq, snATAC-seq) that provide sequencing results for the individual cells within a sample.',
icon: icons.singleCell,
- link: '/single-cell/?type=Experiment&assay_slims=Single+cell&status=released',
+ link: '/single-cell/?type=Experiment&assay_slims=Single+cell&status=released&replicates.library.biosample.donor.organism.scientific_name=Homo%20sapiens',
color: CARD_COLORS.others,
useSearchTerm: false,
displayCount: false,
| 0 |
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js @@ -1458,6 +1458,12 @@ function getMarkerStandoff(d, trace) {
standoff = trace.marker.standoff || 0;
}
+ if(!trace._geo && !trace._xA) {
+ // case of legends
+ return -standoff;
+ }
+
+
return standoff;
}
| 7 |
diff --git a/struts2-jquery-plugin/src/test/java/com/jgeppert/struts2/jquery/components/AbstractComponentBaseTest.java b/struts2-jquery-plugin/src/test/java/com/jgeppert/struts2/jquery/components/AbstractComponentBaseTest.java package com.jgeppert.struts2.jquery.components;
-import org.apache.struts2.conversion.StrutsTypeConverterHolder;
-import org.junit.jupiter.api.BeforeEach;
-
import com.opensymphony.xwork2.DefaultTextProvider;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory;
+import com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory;
import com.opensymphony.xwork2.ognl.OgnlUtil;
import com.opensymphony.xwork2.ognl.OgnlValueStack;
import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.conversion.StrutsTypeConverterHolder;
+import org.junit.jupiter.api.BeforeEach;
public abstract class AbstractComponentBaseTest {
protected ValueStack valueStack;
@@ -27,7 +28,7 @@ public abstract class AbstractComponentBaseTest {
converter.setTypeConverterHolder(new StrutsTypeConverterHolder());
setXWorkConverter(converter);
- setOgnlUtil(new OgnlUtil(null, null));
+ setOgnlUtil(new OgnlUtil(new DefaultOgnlExpressionCacheFactory<>(), new DefaultOgnlBeanInfoCacheFactory<>()));
}
}
| 12 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/style/style-view.js b/lib/assets/core/javascripts/cartodb3/editor/style/style-view.js @@ -92,8 +92,7 @@ module.exports = CoreView.extend({
if (!this._editorModel.isEditing()) {
this._onboardingLauncher.launch({
geom: this._queryGeometryModel.get('simple_geom'),
- type: this._styleModel.get('type'),
- name: this._layerDefinitionModel.getName()
+ type: this._styleModel.get('type')
});
}
},
| 6 |
diff --git a/lib/core/engine.js b/lib/core/engine.js @@ -180,12 +180,12 @@ class Engine {
self.events.emit('code-generator-ready');
});
};
- const cargo = async.cargo((tasks, callback) => {
- generateCode(tasks[tasks.length - 1].contractsManager);
+ const cargo = async.cargo((_tasks, callback) => {
+ generateCode();
self.events.once('outputDone', callback);
});
const addToCargo = function () {
- cargo.push({contractsManager: self.contractsManager});
+ cargo.push({});
};
this.events.on('contractsDeployed', addToCargo);
@@ -230,7 +230,6 @@ class Engine {
logger: this.logger,
events: this.events,
plugins: this.plugins
- //gasLimit: options.gasLimit
});
this.events.on('file-event', function (fileType) {
| 2 |
diff --git a/yarn.lock b/yarn.lock @@ -13605,6 +13605,20 @@ web3-utils@^1.3.0:
underscore "1.9.1"
utf8 "3.0.0"
+web3-utils@^1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.1.tgz#9aa880dd8c9463fe5c099107889f86a085370c2e"
+ integrity sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ==
+ dependencies:
+ bn.js "^4.11.9"
+ eth-lib "0.2.8"
+ ethereum-bloom-filters "^1.0.6"
+ ethjs-unit "0.1.6"
+ number-to-bn "1.7.0"
+ randombytes "^2.1.0"
+ underscore "1.9.1"
+ utf8 "3.0.0"
+
[email protected]:
version "1.0.0-beta.33"
resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.33.tgz#c6021b5769927726371c184b868445311b139295"
| 3 |
diff --git a/1.0/resources/fields.md b/1.0/resources/fields.md @@ -339,10 +339,10 @@ use Laravel\Nova\Fields\Markdown;
Markdown::make('Biography')
```
-By default, Markdown fields will not display their content when viewing a resource on its detail page. It will be hidden behind a "Show Content" link, that when clicked will reveal the content. You may specify the Markdown field should always display its content by calling the `shouldBeExpanded` method on the field itself:
+By default, Markdown fields will not display their content when viewing a resource on its detail page. It will be hidden behind a "Show Content" link, that when clicked will reveal the content. You may specify the Markdown field should always display its content by calling the `alwaysShow` method on the field itself:
```php
-Markdown::make('Biography')->shouldBeExpanded();
+Markdown::make('Biography')->alwaysShow();
```
### Number Field
| 3 |
diff --git a/config/redirects.js b/config/redirects.js @@ -3649,10 +3649,6 @@ module.exports = [
from: ['/security/bulletins/cve-2020-15259','/security/cve-2020-15259'],
to: '/security/security-bulletins/cve-2020-15259'
},
- {
- from: ['/security/bulletins/cve-2020-15240','security/cve-2020-15240'],
- to: 'security/security-bulletins/cve-2020-15240'
- },
{
from: ['/security/bulletins/cve-2020-15125','/security/cve-2020-15125'],
to: '/security/security-bulletins/cve-2020-15125'
| 2 |
diff --git a/blocks/parameters.js b/blocks/parameters.js @@ -21,7 +21,6 @@ Blockly.Blocks['args_create_with_item'] = {
.appendField('x');
this.setPreviousStatement(true);
this.setNextStatement(true);
- this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_ITEM_TOOLTIP']);
this.contextMenu = false;
}
};
@@ -36,7 +35,6 @@ Blockly.Blocks['args_create_with_container'] = {
this.appendDummyInput()
.appendField('args');
this.appendStatementInput('STACK');
- this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_CONTAINER_TOOLTIP']);
this.contextMenu = false;
},
| 2 |
diff --git a/src/components/NavigationDesktop/NavigationItemDesktop.js b/src/components/NavigationDesktop/NavigationItemDesktop.js @@ -36,10 +36,7 @@ const styles = (theme) => ({
fontSize: "12px"
},
primaryNavItem: {
- "textTransform": "capitalize",
- "&:first-child": {
- paddingLeft: "16px"
- }
+ textTransform: "capitalize"
}
});
| 2 |
diff --git a/packages/bitcore-client/bin/wallet b/packages/bitcore-client/bin/wallet @@ -10,7 +10,7 @@ program
.command('register', 'register a wallet with bitcore-node').alias('r')
.command('balance', 'check wallet balance').alias('b')
.command('utxos', 'get wallet utxos').alias('u')
- .command('broadcast', 'get wallet utxos').alias('b')
+ .command('broadcast', 'broadcast transaction').alias('b')
.parse(process.argv);
| 3 |
diff --git a/src/bot.js b/src/bot.js @@ -282,7 +282,7 @@ class Genesis {
status: 'online',
afk: false,
game: {
- name: `@${this.client.user.username} help (${this.shardId + 1}/${this.shardCount})`,
+ name: `@${this.client.user.username} help`,
url: 'https://warframe.com',
},
});
| 2 |
diff --git a/package.json b/package.json "sql-template-strings": "^2.2.2",
"uws": "^0.12.0",
"warframe-location-query": "^0.0.3",
- "warframe-nexus-query": "^0.1.0",
+ "warframe-nexus-query": "^0.1.1",
"warframe-worldstate-parser": "^1.7.3"
},
"devDependencies": {
| 3 |
diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml @@ -23,18 +23,9 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
-
- - name: Use cached node_modules
- id: cache
- uses: actions/cache@v3
- with:
- path: node_modules
- key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
- restore-keys: |
- nodeModules-
+ cache: 'npm'
- name: Install dependencies
- if: steps.cache.outputs.cache-hit != 'true'
run: npm install
env:
CI: true
| 4 |
diff --git a/src/path.js b/src/path.js @@ -261,13 +261,13 @@ export class Path extends Shape {
* @name Two.Path#closed
* @property {Boolean} - Determines whether a final line is drawn between the final point in the `vertices` array and the first point.
*/
- this._closed = !!closed;
+ this.closed = !!closed;
/**
* @name Two.Path#curved
* @property {Boolean} - When the path is `automatic = true` this boolean determines whether the lines between the points are curved or not.
*/
- this._curved = !!curved;
+ this.curved = !!curved;
/**
* @name Two.Path#beginning
| 12 |
diff --git a/src/inner-slider.js b/src/inner-slider.js @@ -93,6 +93,12 @@ export var InnerSlider = createReactClass({
}
},
componentDidUpdate: function () {
+ let images = document.querySelectorAll('.slick-slide img')
+ images.forEach(image => {
+ if (!image.onload) {
+ image.onload = () => this.update(this.props)
+ }
+ })
if (this.props.reInit) {
this.props.reInit()
}
| 0 |
diff --git a/docs/src/pages/discover-more/showcase.md b/docs/src/pages/discover-more/showcase.md @@ -31,3 +31,6 @@ Want to add your app? Found an app that no longer works or no longer uses Materi
web: https://myblog831213.herokuapp.com/
project: https://github.com/shady831213/myBlog
+### 7. SlidesUp
+ SlidesUp is a platform to help conference organizers plan their events.
+ https://test.app.slidesup.com/confs/boston-conference-2017/agenda
| 0 |
diff --git a/lib/misc/paths.coffee b/lib/misc/paths.coffee @@ -17,17 +17,30 @@ module.exports =
expandHome: (p) ->
if p.startsWith '~' then p.replace '~', @home() else p
- fullPath: (path) ->
+ fullPath: (p) ->
new Promise (resolve, reject) ->
- if fs.existsSync(path) then resolve(path)
+ if fs.existsSync(p) then resolve(p)
+
+ current_dir = process.cwd()
+ exepath = path.dirname(process.execPath)
+
+ try
+ process.chdir(exepath)
+ realpath = fs.realpathSync(p)
+ if fs.existsSync(realpath) then resolve(realpath)
+ catch err
+ try
+ process.chdir(current_dir)
+ catch err
+ console.error(err)
if process.platform is 'win32'
- if /[a-zA-Z]\:/.test(path)
+ if /[a-zA-Z]\:/.test(p)
reject("Couldn't resolve path.")
return
which = if process.platform is 'win32' then 'where' else 'which'
- proc = child_process.exec "#{which} \"#{path}\"", (err, stdout, stderr) ->
+ proc = child_process.exec "#{which} \"#{p}\"", (err, stdout, stderr) ->
return reject(stderr) if err?
p = stdout.trim()
return resolve(p) if fs.existsSync(p)
| 11 |
diff --git a/apps/presentor/interface.html b/apps/presentor/interface.html for (let i = 0; i < jparts.length; i++) {
addFormPPart(jparts[i]);
}
+ addFormPPart(); // add empty element on startup
}
function load() {
function onInit() {
load();
- addFormPPart(); // add empty element on startup
}
// load from watch first.
// let qq = `[{"subject":"Hello","minutes":55,"seconds":4,"notes":""},{"subject":"dsfafds","minutes":4,"seconds":33,"notes":"fdasdfsafasfsd"},{"subject":"dsadsf","minutes":0,"seconds":4,"notes":""},{"subject":"sdasf","minutes":0,"seconds":0,"notes":""}]`;
| 1 |
diff --git a/Apps/Sandcastle/gallery/3D Tiles Next S2 Globe.html b/Apps/Sandcastle/gallery/3D Tiles Next S2 Globe.html // MAXAR OWT WFF 1.2 Base Globe
var tileset = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({
- url: Cesium.IonResource.fromAssetId(666330),
+ url: Cesium.IonResource.fromAssetId(691510),
maximumScreenSpaceError: 4,
})
);
| 3 |
diff --git a/src/components/OnlyUpdateWhenFocused.js b/src/components/OnlyUpdateWhenFocused.js @@ -17,6 +17,8 @@ type State = {
isFocused: boolean
};
+// This component stops children from updating when the given navigation
+// is not inFocus (I.e. not in the state between willFocus and blurred)
export class OnlyUpdateWhenFocusedComponent extends ReactComponent<
Props,
State
| 0 |
diff --git a/app/components/Account/AccountTreemap.jsx b/app/components/Account/AccountTreemap.jsx @@ -17,32 +17,25 @@ Heatmap(ReactHighcharts.Highcharts);
class AccountTreemap extends React.Component {
static propTypes = {
- assets: ChainTypes.ChainAssetsList
+ assets: ChainTypes.ChainAssetsList,
+ preferredAsset: ChainTypes.ChainAsset.isRequired
};
static defaultProps = {
- assets: []
+ assets: [],
+ preferredAsset: "1.3.0"
}
- constructor(props) {
- super(props);
- }
-
- shouldComponentUpdate(nextProps) {
- return (
- !utils.are_equal_shallow(nextProps.balanceObjects, this.props.balanceObjects) ||
- !utils.are_equal_shallow(nextProps.assets, this.props.assets)
- );
- }
+ // shouldComponentUpdate(nextProps) {
+ // return (
+ // !utils.are_equal_shallow(nextProps.balanceObjects, this.props.balanceObjects) ||
+ // !utils.are_equal_shallow(nextProps.assets, this.props.assets)
+ // );
+ // }
render() {
- let {balanceObjects, core_asset, settings, marketStats} = this.props;
- let preferredUnit = core_asset;
- if (settings.get("unit")) {
- preferredUnit = ChainStore.getAsset(settings.get("unit"));
- }
+ let {balanceObjects, core_asset, marketStats, preferredAsset} = this.props;
- // balanceObjects = balanceObjects.toJS ? balanceObjects.toJS() : balanceObjects;
let accountBalances = null;
if (balanceObjects && balanceObjects.length > 0) {
@@ -52,12 +45,11 @@ class AccountTreemap extends React.Component {
let balanceObject = typeof(balance) == "string" ? ChainStore.getObject(balance) : balance;
let asset_type = balanceObject.get("asset_type");
let asset = ChainStore.getAsset(asset_type);
- if (!asset) return;
+ if (!asset || !preferredAsset) return;
let amount = Number(balanceObject.get("balance"));
-
const eqValue = MarketUtils.convertValue(
amount,
- preferredUnit,
+ preferredAsset,
asset,
true,
marketStats,
@@ -65,7 +57,7 @@ class AccountTreemap extends React.Component {
);
if (!eqValue) return;
- const precision = utils.get_asset_precision(preferredUnit.get("precision"));
+ const precision = utils.get_asset_precision(preferredAsset.get("precision"));
totalValue += (eqValue / precision);
});
@@ -79,7 +71,7 @@ class AccountTreemap extends React.Component {
const eqValue = MarketUtils.convertValue(
amount,
- preferredUnit,
+ preferredAsset,
asset,
true,
marketStats,
@@ -88,7 +80,7 @@ class AccountTreemap extends React.Component {
if (!eqValue) { return null; }
- const precision = utils.get_asset_precision(preferredUnit.get("precision"));
+ const precision = utils.get_asset_precision(preferredAsset.get("precision"));
const finalValue = eqValue / precision;
return finalValue >= 1 ? {
@@ -128,7 +120,7 @@ class AccountTreemap extends React.Component {
animation: false,
tooltip: {
pointFormatter: function() {
- return `<b>${this.name}</b>: ${ReactHighcharts.Highcharts.numberFormat(this.value, 0)} ${preferredUnit.get("symbol")}`;
+ return `<b>${this.name}</b>: ${ReactHighcharts.Highcharts.numberFormat(this.value, 0)} ${preferredAsset.get("symbol")}`;
}
}
}
@@ -174,7 +166,7 @@ class AccountTreemapBalanceWrapper extends React.Component {
let assets = this.props.balanceObjects.filter(a => !!a).map(a => {
return a.get("asset_type");
});
- return <AccountTreemap assets={assets} {...this.props} />;
+ return <AccountTreemap preferredAsset={this.props.settings.get("unit", "1.3.0")} assets={assets} {...this.props} />;
}
}
| 7 |
diff --git a/articles/libraries/auth0js/v8/index.md b/articles/libraries/auth0js/v8/index.md @@ -94,7 +94,6 @@ The `authorize()` method can be used for logging in users via the [Hosted Login
| `scope` | required | (String) The scopes which you want to request authorization for. These must be separated by a space. You can request any of the standard OIDC scopes about users, such as `profile` and `email`, custom claims that must [conform to a namespaced format](/api-auth/tutorials/adoption/scope-custom-claims), or any scopes supported by the target API (for example, `read:contacts`). Include `offline_access` to get a refresh token. |
| `responseType` | required | (String) The value must be `'token'` or `'code'`. It defaults to `'token'`, unless a `redirectUri` is provided, then it defaults to `'code'`. |
| `clientID` | optional | (String) Your Auth0 client ID. |
-| `state` | recommended | (String) An opaque value the client adds to the initial request that Auth0 includes when redirecting back to the client. This value must be used by the client to prevent CSRF attacks. |
| `redirectUri` | optional | (String) The URL to which Auth0 will redirect the browser after authorization has been granted for the user. |
For hosted login, one must call the `authorize()` method.
| 2 |
diff --git a/token-metadata/0x310DA5e1E61cD9d6ECed092F085941089267E71E/metadata.json b/token-metadata/0x310DA5e1E61cD9d6ECed092F085941089267E71E/metadata.json "symbol": "MNT",
"address": "0x310DA5e1E61cD9d6ECed092F085941089267E71E",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/library-item/library-item.jsx b/src/components/library-item/library-item.jsx @@ -46,7 +46,7 @@ class LibraryItem extends React.PureComponent {
</div>
</div>
) : (
- <div
+ <Box
className={styles.libraryItem}
role="button"
tabIndex="0"
@@ -64,7 +64,7 @@ class LibraryItem extends React.PureComponent {
</Box>
</Box>
<span className={styles.libraryItemName}>{this.props.name}</span>
- </div>
+ </Box>
);
}
}
| 13 |
diff --git a/packages/ve-table/src/body/index.jsx b/packages/ve-table/src/body/index.jsx @@ -548,8 +548,7 @@ export default {
*/
tdSizeChange({ key, width }) {
const { colsWidths } = this;
- // fix reRender by column resize
- colsWidths.set(key, Math.floor(width));
+ colsWidths.set(key, width);
this.$emit(EMIT_EVENTS.BODY_CELL_WIDTH_CHANGE, colsWidths);
},
| 1 |
diff --git a/new-client/src/plugins/collector/components/CollectorForm.js b/new-client/src/plugins/collector/components/CollectorForm.js @@ -58,7 +58,7 @@ class CollectorForm extends Component {
renderPlaceForm = () => {
this.setState({
mode: "place",
- displayPlace: true
+ displayPlace: false
});
if (window.document.body.clientWidth < 600) {
this.props.closePanel();
| 12 |
diff --git a/lib/seriallist.js b/lib/seriallist.js @@ -20,6 +20,9 @@ class SerialList {
.then((ports) => {
this.adapter.log.debug('List of ports: ' + JSON.stringify(ports));
this.adapter.sendTo(obj.from, obj.command, ports, obj.callback);
+ }).catch((err) => {
+ this.adapter.log.error(`List of ports error: ${err}`);
+ this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
});
}
break;
| 9 |
diff --git a/server/platforms/twitter_crimson_hexagon.py b/server/platforms/twitter_crimson_hexagon.py @@ -21,9 +21,9 @@ class TwitterCrimsonHexagonProvider(ContentProvider):
def count(self, query: str, start_date: dt.datetime, end_date: dt.datetime, **kwargs) -> int:
"""
The number of tweets in the monitor.
- :param query:
- :param start_date:
- :param end_date:
+ :param query: ignored
+ :param start_date: ignored in favor of the monitor's start/end dates
+ :param end_date: ignored in favor of the monitor's start/end dates
:param kwargs: monitor_id
:return:
"""
@@ -31,15 +31,16 @@ class TwitterCrimsonHexagonProvider(ContentProvider):
'id': kwargs['monitor_id'],
'groupBy': 'DAILY',
}
- results = self._cached_query2('volume', start_date, end_date, params)
+ monitor_start, monitor_end = self._monitor_dates(kwargs['monitor_id'])
+ results = self._cached_query('volume', monitor_start, monitor_end, params)
return results['numberOfDocuments']
def count_over_time(self, query: str, start_date: dt.datetime, end_date: dt.datetime, **kwargs) -> Dict:
"""
The number of tweets in the monitor, broken out by day.
- :param query:
- :param start_date:
- :param end_date:
+ :param query: ignored
+ :param start_date: ignored in favor of the monitor's start/end dates
+ :param end_date: ignored in favor of the monitor's start/end dates
:param kwargs: monitor_id
:return:
"""
@@ -47,7 +48,8 @@ class TwitterCrimsonHexagonProvider(ContentProvider):
'id': kwargs['monitor_id'],
'groupBy': 'DAILY',
}
- results = self._cached_query2('volume', start_date, end_date, params)
+ monitor_start, monitor_end = self._monitor_dates(kwargs['monitor_id'])
+ results = self._cached_query('volume', monitor_start, monitor_end, params)
data = []
for d in results['volume']:
item_start_date = dt.datetime.strptime(d['startDate'][:10], CRIMSON_HEXAGON_DATE_FORMAT)
@@ -61,9 +63,9 @@ class TwitterCrimsonHexagonProvider(ContentProvider):
def words(self, query: str, start_date: dt.datetime, end_date: dt.datetime, limit: int = 100, **kwargs) -> List[Dict]:
"""
The top words in tweets in the monitor.
- :param query:
- :param start_date:
- :param end_date:
+ :param query: ignored
+ :param start_date: ignored in favor of the monitor's start/end dates
+ :param end_date: ignored in favor of the monitor's start/end dates
:param limit:
:param kwargs: monitor_id
:return:
@@ -71,7 +73,8 @@ class TwitterCrimsonHexagonProvider(ContentProvider):
params = {
'id': kwargs['monitor_id'],
}
- results = self._cached_query2('wordcloud', start_date, end_date, params)
+ monitor_start, monitor_end = self._monitor_dates(kwargs['monitor_id'])
+ results = self._cached_query('wordcloud', monitor_start, monitor_end, params)
data = []
for term, freq in results['data'].items():
data.append({
@@ -83,18 +86,42 @@ class TwitterCrimsonHexagonProvider(ContentProvider):
return data[:limit]
@cache.cache_on_arguments()
- def _cached_query2(self, url, start_date: dt.datetime, end_date: dt.datetime, params: Dict) -> Dict:
+ def _monitor_details(self, monitor_id) -> Dict:
+ """
+ Fetch the basic metadata about the monior the user wants to import from.
+ :param monitor_id:
+ :return:
+ """
+ monitor = self._cached_query('detail', None, None, {'id': monitor_id})
+ return monitor
+
+ def _monitor_dates(self, monitor_id) -> (str, str):
+ """
+ We need to use the monitor dates for all the preview information, because if we pass in the topic
+ dates then their API throws an error saying there is a mismatch. This can happen when a topic has a larger
+ date range than the monitor did. We are OK to use their dates because on the back-end we just import *all* the
+ content in the monitor (it doesn't filter by the dates of the topic).
+ :param monitor_id:
+ :return:
+ """
+ monitor = self._monitor_details(monitor_id)
+ return monitor['resultsStart'], monitor['resultsEnd']
+
+ @cache.cache_on_arguments()
+ def _cached_query(self, url, start_date: str, end_date: str, params: Dict) -> Dict:
"""
:param url:
- :param start_date:
- :param end_date:
- :param params:
+ :param start_date: the monitor's start date
+ :param end_date: the monitor's end date
+ :param params: should one item, called 'id' that is the monitor's id
:return:
"""
headers = {'Content-type': 'application/json'}
params['auth'] = self._api_key
- params['start'] = start_date.strftime(CRIMSON_HEXAGON_DATE_FORMAT)[:10]
- params['end'] = end_date.strftime(CRIMSON_HEXAGON_DATE_FORMAT)[:10]
+ if start_date is not None:
+ params['start'] = start_date
+ if end_date is not None:
+ params['end'] = end_date
r = requests.get(CRIMSON_HEXAGON_BASE_URL+url, headers=headers, params=params)
return r.json()
| 4 |
diff --git a/README.md b/README.md @@ -313,7 +313,7 @@ If you have a template you'd like to create [here's how](https://docs.github.com
-your friendly administrator.
-## Moving your existing website to a submodule
+### Moving your existing website to a submodule
If your website code lives in the pyladies repo already, you'll want to copy your contents into a new repository. Then in this repository you'll need to:
@@ -325,7 +325,7 @@ $ git rm --cached -rf {you_chapter_directory}
You can now complete the steps in `Adding your website as a submodule`.
-## Adding your website to a submodule
+### Adding your website to a submodule
The workflow for adding [your website as a submodule](https://www.vogella.com/tutorials/GitSubmodules/article.html#submodules_adding) is as follows:
| 12 |
diff --git a/src/data/common-typos.yaml b/src/data/common-typos.yaml ## British vs American spellings
# https://developers.google.com/style/spelling
+- typo: anonymise(d|)
+ fix: anonymize$1
+ british: True
+
- typo: analyse
fix: analyze
british: True
fix: color
british: True
-- typo: customise(d|)
- fix: customize$1
+- typo: customis(e|ed|ing)
+ fix: customiz$1
british: True
- typo: customisable
fix: initialization
british: True
+- typo: localisation
+ fix: localization
+ british: True
+
- typo: minimise
fix: minimize
british: True
fix: synchronization
british: True
-- typo: summarise
- fix: summarize
+- typo: summarise(d|)
+ fix: summariz$1
british: True
- typo: supercede
- typo: accpet
fix: accept
+- typo: acceptible
+ fix: acceptable
+
- typo: accessibile
fix: accessible
- typo: asume
fix: assume
+- typo: broswer
+ fix: browser
+
- typo: chome\s
fix: Chrome
- typo: choses
fix: chooses
+- typo: compolete
+ fix: complete
+
+- typo: connecto
+ fix: connect
+
- typo: defau[lt](s|)\b
fix: default$1
- typo: deubg
fix: debug
+- typo: dictionnary
+ fix: dictionary
+
- typo: doens't
fix: doesn't
- typo: flakey
fix: flaky
+- typo: (auto|)fillle(d|)
+ fix: $1fille$2
+
+- typo: filesytem
+ fix: filesystem
+
- typo: format(tt|)(ing|ed)
fix: formatt$2
-- typo: func(iton|toin)(s|al|ed|ing|)
+- typo: func(iton|toin)(s|al|ality|ed|ing|)
fix: function$2
+- typo: fundemental
+ fix: fundamental
+
+- typo: genearate
+ fix: generate
+
- typo: geo(\s|-)location
fix: geolocation
- typo: intializ(e|ed|er|ers|ing|ation|)
fix: initializ$1
+- typo: implment(s|ation|)
+ fix: implement$1
+
- typo: implicity
fix: implicitly
- typo: maxumum
fix: maximum
+- typo: negaive
+ fix: negative
+
- typo: oc+ur+(a|e)nce
fix: occurrence
- typo: \bfo\b
fix: of
+- typo: opportunites
+ fix: opportunities
+
- typo: ove(r|)riden
fix: overridden
- typo: recomend(ation|ations|s|ing|)
fix: recommend$1
+- typo: resouce
+ fix: resource
+
- typo: seperate
fix: separate
-- typo: specificly
+- typo: spec(ificly|fically)
fix: specifically
+- typo: specturum
+ fix: spectrum
+
- typo: stirng
fix: string
- typo: su(cccess|ccesss)
fix: success
+- typo: suppord
+ fix: support
+
- typo: thier
fix: their
- typo: upgarding
fix: upgrading
+- typo: unsteranding
+ fix: understanding
+
- typo: usecase
fix: use case
- typo: undefiend
fix: undefined
-- typo: balue
+- typo: (ba|vav)lue
fix: value
+- typo: runtume
+ fix: runtime
+
## Common issues in translations
- typo: \uFF1A
| 7 |
diff --git a/articles/libraries/auth0js/v8/index.md b/articles/libraries/auth0js/v8/index.md @@ -98,7 +98,7 @@ The `authorize()` method can be used for logging in users via the [Hosted Login
| `responseType` | optional | (String) It can be any space separated list of the values `code`, `token`, `id_token`. It defaults to `'token'`, unless a `redirectUri` is provided, then it defaults to `'code'`. |
| `clientID` | optional | (String) Your Auth0 client ID. |
| `redirectUri` | optional | (String) The URL to which Auth0 will redirect the browser after authorization has been granted for the user. |
-| `leeway` | optional | (Integer) Add leeway for clock skew to JWT expiration times. |
+| `leeway` | optional | (Integer) A value in seconds; leeway to allow for clock skew with regard to JWT expiration times. |
::: note
Because of clock skew issues, you may occasionally encounter the error `The token was issued in the future`. The `leeway` parameter can be used to allow a few seconds of leeway to JWT expiration times, to prevent that from occuring.
| 0 |
diff --git a/rig-aux.js b/rig-aux.js import * as THREE from './three.module.js';
import runtime from './runtime.js';
import physicsManager from './physics-manager.js';
-/* import fx from './fx.js';
-const {effects = []} = component;
-const effectInstances = effects.map(effect => {
- const {type, position = [0, 0, 0], quaternion = [0, 0, 0, 1]} = effect;
- const object = new THREE.Object3D();
- object.position.fromArray(position);
- object.quaternion.fromArray(quaternion);
- return fx.add(type, object);
-}); */
import {contentIdToFile} from './util.js';
const localVector = new THREE.Vector3();
| 2 |
diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json },
{
"displayName": "MRS",
- "id": "mrs-7ae8e2",
- "locationSet": {"include": ["ng"]},
+ "id": "mrs-0edd09",
+ "locationSet": {
+ "include": ["bj", "cm", "gh", "ng", "tg"]
+ },
"tags": {
"amenity": "fuel",
"brand": "MRS",
| 7 |
diff --git a/app/shared/components/Global/Transaction/Modal.js b/app/shared/components/Global/Transaction/Modal.js @@ -48,6 +48,7 @@ class GlobalTransactionModal extends Component<Props> {
icon,
title,
settings,
+ size,
system
} = this.props;
let {
@@ -80,6 +81,7 @@ class GlobalTransactionModal extends Component<Props> {
open={open}
onOpen={this.onOpen}
onClose={this.onClose}
+ size={size || 'small'}
>
<Header
icon={icon}
| 11 |
diff --git a/README.md b/README.md I like `short` README's so here we go :sunglasses:
+## Coming soon...
+
+`base-shell` with basic react settup (routing, intl, async load, redux)
+`material-ui-shell` expanded `base-shell` with Material-UI design and additional features like responsive menu, pwa features and some demo examples. Basicaly `rmw-shell` without Firebase
+`rmw-shell` will be updated to use `base-shell` and `material-ui-shell` with the addition that it uses Firebase
+
+Any help here is welcome :smile:
+
## How to start?
Just run this command:
| 3 |
diff --git a/server/controllers/api/channel/claims/getChannelClaims.js b/server/controllers/api/channel/claims/getChannelClaims.js @@ -5,7 +5,11 @@ const { returnPaginatedChannelClaims } = require('./channelPagination.js');
const getChannelClaims = async (channelName, channelShortId, page) => {
const channelId = await chainquery.claim.queries.getLongClaimId(channelName, channelShortId);
- const channelClaims = await chainquery.claim.queries.getAllChannelClaims(channelId);
+
+ let channelClaims;
+ if (channelId) {
+ channelClaims = await chainquery.claim.queries.getAllChannelClaims(channelId);
+ }
const processingChannelClaims = channelClaims ? channelClaims.map((claim) => getClaimData(claim)) : [];
const processedChannelClaims = await Promise.all(processingChannelClaims);
| 8 |
diff --git a/docs/docs.md b/docs/docs.md @@ -965,9 +965,6 @@ Make sure that the docker image you are using supports your app's meteor version
### Update Docker
Some problems are caused by old versions of docker. Since mup 1.3, `mup setup` and `mup docker setup` will update Docker if it is older than 1.13.
-### Increase RAM
-Some problems are caused by the server running out of ram.
-
### Check if Docker Containers are Restarting
You can view a list of Docker containers with
```bash
@@ -1026,6 +1023,10 @@ docker logs <AppName>-nginx-letsencrypt
```
Replace `<AppName>` with the name of the app.
+### Prepare Bundle ends with `Killed`
+
+The server ran out of memory during `npm install`. Try increasing the server's ram or creating a swap file.
+
### Unwanted redirects to https
Make sure `force-ssl` is not in `.meteor/versions`. If it is, either your app or a package it uses has `force-ssl` as a dependency.
| 7 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.