code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/node_modules/@stdlib/repl/ctor/lib/fs_alias_args.js b/lib/node_modules/@stdlib/repl/ctor/lib/fs_alias_args.js @@ -26,13 +26,13 @@ var FS_ALIASES = require( './fs_aliases.js' );
// MAIN //
/**
-* Returns a list of argument types for a specified file system API.
+* Returns a list of argument completion flags for a specified file system API.
*
* @private
* @param {string} alias - alias
-* @returns {(Array|null)} argument types
+* @returns {(Array|null)} argument completion flags
*/
-function argTypes( alias ) {
+function argFlags( alias ) {
var i;
for ( i = 0; i < FS_ALIASES.length; i++ ) {
if ( FS_ALIASES[ i ][ 0 ] === alias ) {
@@ -45,4 +45,4 @@ function argTypes( alias ) {
// EXPORTS //
-module.exports = argTypes;
+module.exports = argFlags;
| 10 |
diff --git a/userscript.user.js b/userscript.user.js @@ -21738,6 +21738,15 @@ var $$IMU_EXPORT$$;
if (newsrc !== src)
return newsrc;
+ // https://images-4.gog-statics.com/7ec3664b4bb3746797e252fd71ad48abea130abf847bf30d0b9eaf25a915da2d_product_tile_349.webp
+ // https://images-4.gog-statics.com/7ec3664b4bb3746797e252fd71ad48abea130abf847bf30d0b9eaf25a915da2d_product_tile_349_2x.webp
+ // https://images-4.gog-statics.com/7ec3664b4bb3746797e252fd71ad48abea130abf847bf30d0b9eaf25a915da2d_product_tile_398.webp
+ // https://images-4.gog-statics.com/7ec3664b4bb3746797e252fd71ad48abea130abf847bf30d0b9eaf25a915da2d_product_tile_398_2x.webp
+ // https://images-1.gog-statics.com/43f1850febaf13b4185d9f31ffb7d63ee1e85b496bac723af2bffc7a832ab827_product_tile_536.webp
+ newsrc = src.replace(/(\/[0-9a-f]{10,}_product_tile_(?:349|398))(\.[^/.]+)(?:[?#].*)?$/, "$1_2x$2");
+ if (newsrc !== src)
+ return newsrc;
+
return src.replace(/(\/[0-9a-f]*)_[^/.]*(\.[^/.]*)$/, "$1$2");
}
| 7 |
diff --git a/docs/source/grid.md b/docs/source/grid.md @@ -31,7 +31,7 @@ Basic grid example:
Columns don't need to fill a row:
<div class="bg-light-softer text-medium text-sm mb-6">
- <div class="text-dark-soft p-4 leading-none">.flex</div>
+ <div class="text-dark-soft p-4 leading-none">.flex.flex-wrap</div>
<div class="flex flex-wrap">
<div class="w-full md:w-1/4">
<div class="text-center py-4 bg-dark-softer text-light">
@@ -55,7 +55,7 @@ Columns don't need to fill a row:
Columns can be different widths:
<div class="bg-light-softer text-medium text-sm mb-6">
- <div class="text-dark-soft p-4 leading-none">.flex</div>
+ <div class="text-dark-soft p-4 leading-none">.flex.flex-wrap</div>
<div class="flex flex-wrap">
<div class="w-full md:w-1/4">
<div class="text-center py-4 bg-dark-softer text-light">
@@ -112,27 +112,24 @@ Rows can overflow and wrap:
Columns can have gutters:
<div class="bg-light-softer text-medium text-sm mb-6">
- <div class="text-dark-soft p-4 leading-none">.flex.pull-x-4</div>
+ <div class="text-dark-soft p-4 leading-none">.flex.flex-wrap.pull-x-4</div>
<div class="flex flex-wrap pull-x-4">
- <div class="flex-none w-full md:w-1/3 px-4">
+ <div class="w-full md:w-1/3 px-4">
<div class="text-center py-4 bg-dark-softer text-light">
- <div>.flex-none</div>
<div>.w-full</div>
<div>.md:w-1/3</div>
<div>.px-4</div>
</div>
</div>
- <div class="flex-none w-full md:w-1/3 px-4">
+ <div class="w-full md:w-1/3 px-4">
<div class="text-center py-4 bg-dark-soft text-light">
- <div>.flex-none</div>
<div>.w-full</div>
<div>.md:w-1/3</div>
<div>.px-4</div>
</div>
</div>
- <div class="flex-none w-full md:w-1/3 px-4">
+ <div class="w-full md:w-1/3 px-4">
<div class="text-center py-4 bg-dark-softer text-light">
- <div>.flex-none</div>
<div>.w-full</div>
<div>.md:w-1/3</div>
<div>.px-4</div>
@@ -145,7 +142,7 @@ Columns can have gutters:
Column widths can be automatic:
<div class="bg-light-softer text-medium text-sm mb-6">
- <div class="text-dark-soft p-4 leading-none">.flex</div>
+ <div class="text-dark-soft p-4 leading-none">.flex.flex-wrap</div>
<div class="flex flex-wrap">
<div class="w-1/4 md:flex-fill">
<div class="text-center py-4 bg-dark-softer text-light">
@@ -178,7 +175,7 @@ Column widths can be automatic:
Fixed width columns are still respected even if a smaller screen has auto column widths:
<div class="bg-light-softer text-medium text-sm mb-6">
- <div class="text-dark-soft p-4 leading-none">.flex</div>
+ <div class="text-dark-soft p-4 leading-none">.flex.flex-wrap</div>
<div class="flex flex-wrap">
<div class="flex-fill md:w-1/6 md:flex-none">
<div class="text-center py-4 bg-dark-softer text-light">
@@ -222,7 +219,7 @@ Fixed width columns are still respected even if a smaller screen has auto column
Use margin auto utilities to accomplish offsets:
<div class="bg-light-softer text-medium text-sm mb-6">
- <div class="text-dark-soft p-4 leading-none">.flex</div>
+ <div class="text-dark-soft p-4 leading-none">.flex.flex-wrap</div>
<div class="flex flex-wrap">
<div class="w-full md:w-1/3 md:ml-auto">
<div class="text-center py-4 bg-dark-soft text-light">
| 2 |
diff --git a/articles/deprecations/index.md b/articles/deprecations/index.md @@ -74,14 +74,6 @@ We are actively migrating customers to new behaviors for all **Deprecations** wi
The Webtask engine powering Auth0 extensibility points currently utilizes Node 4. Beginning <strong>30 April 2018</strong>, <a href="https://github.com/nodejs/Release#release-schedule">Node.js v4 will no longer be under long-term support (LTS)</a>. This means that critical security fixes will no longer be back-ported to this version. As such, Auth0 will be migrating the Webtask runtime from Node.js v4 to Node.js v8.<br><br>On <strong>17 April 2018</strong> we will make the Node 8 runtime available for extensibility to all public cloud customers. You will be provided a migration switch that allows you to control your environment's migration to the new runtime environment.<br><br>For more information on this migration and the steps you should follow to upgrade your implementation, see <a href="/migrations/guides/extensibility-node8">Migration Guide: Extensibility and Node.js v8</a>.
</td>
</tr>
- <tr>
- <td><a href="/migrations/guides/migration-oauthro-oauthtoken">oauth/ro</a></td>
- <td>26 December 2017</td>
- <td>TBD</td>
- <td>
- If you are currently implementing the <a href="/api/authentication#resource-owner">/oauth/ro</a> endpoint your application can be updated to use the <a href="/api/authentication#authorization-code">/oauth/token</a> endpoint. For details on how to make this transition, see the <a href="/migrations/guides/migration-oauthro-oauthtoken">Migration Guide for Resource Owner Password Credentials Exchange</a>.
- </td>
- </tr>
</tbody>
</table>
| 2 |
diff --git a/scripts/rollup/plugins/index.js b/scripts/rollup/plugins/index.js @@ -11,7 +11,7 @@ module.exports = function(version, options) {
aliasPlugin,
nodeResolve({
extensions: ['.ts', '.js', '.json'],
- jsnext: true
+ mainFields: ['module', 'main']
}),
commonjs({
include: 'node_modules/**'
| 14 |
diff --git a/docs/README.md b/docs/README.md @@ -57,7 +57,7 @@ git checkout v0.11.0 # Latest release as of now is v0.11.0
### Using starter
-If you don't have a site yet, you can use our starter.
+If you don't have a site yet, you can use our [starter](https://github.com/okkur/syna-start).
Using the starter you will have a sample page with several fragment examples and you can use them to start building your own website.
```bash
| 0 |
diff --git a/tests/browser/nightwatch.js b/tests/browser/nightwatch.js * @copyright Crown Copyright 2018
* @license Apache-2.0
*/
+
module.exports = {
before: browser => {
browser
| 0 |
diff --git a/test/integration/connection-pool/error-tests.js b/test/integration/connection-pool/error-tests.js @@ -3,7 +3,7 @@ var helper = require('./test-helper')
const pg = helper.pg
// first make pool hold 2 clients
-pg.defaults.poolSize = 2
+pg.defaults.max = 2
const pool = new pg.Pool()
| 14 |
diff --git a/ui/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js @@ -35,8 +35,15 @@ export default Vue.extend({
// focus button if it came from ENTER on form
// prevent the new submit (already done)
if (this.type === 'submit') {
+ const el = document.activeElement
+
if (
- (document.activeElement !== document.body && this.$el.contains(document.activeElement) === false) ||
+ (
+ el !== document.body &&
+ this.$el.contains(el) === false &&
+ // required for iOS and desktop Safari
+ el.contains(this.$el) === false
+ ) ||
(this.$q.platform.is.ie === true && e.clientX < 0)
) {
stopAndPrevent(e)
| 1 |
diff --git a/airesources/FSharp/Halite2/hlt.fs b/airesources/FSharp/Halite2/hlt.fs let sendString (input: string) =
Console.WriteLine input
- let getString =
+ let getString () =
Console.ReadLine().Trim()
- let getInt =
- getString |> int
+ let getInt () =
+ getString() |> int
// newConnection initializes a new connection for one of the bots
// participating in a match
let newConnection botName =
- let playerTag = getInt
- let sizeInfo = getString.Split " "
+ let playerTag = getInt()
+ let sizeInfo = getString().Split " "
let width = sizeInfo.[0] |> int
let height = sizeInfo.[1] |> int
// updateMap decodes the current turn's game state from a string
let updateMap connection =
- let gameString = getString
+ let gameString = getString()
parseGameString connection gameString
// submitCommands encodes the player's commands into a string
| 1 |
diff --git a/guide/miscellaneous/parsing-mention-arguments.md b/guide/miscellaneous/parsing-mention-arguments.md @@ -36,7 +36,7 @@ If you send
<discord-messages>
<discord-message author="User" avatar="djs">
- I think we should add @GoodPerson to the @Mod role.
+ I think we should add <mention>GoodPerson</mention> to the <mention>Mod</mention> role.
</discord-message>
</discord-messages>
@@ -132,7 +132,7 @@ And that is it! Simple, isn't it? Start up your bot and see if it works.
<discord-messages>
<discord-message author="AnotherUser" avatar="green">
- !avatar @User
+ !avatar <mention>User</mention>
</discord-message>
<discord-message author="User" avatar="blue" :bot="true">
User's avatar: https://cdn.discordapp.com/avatars/208330347295932416/e2456a4bc63ec0215334434ade7fa45c.png
| 4 |
diff --git a/packages/lib-classifier/src/store/WorkflowStepStore/WorkflowStepStore.js b/packages/lib-classifier/src/store/WorkflowStepStore/WorkflowStepStore.js @@ -85,7 +85,7 @@ const WorkflowStepStore = types
const workflow = tryReference(() => getRoot(self).workflows?.active)
if (workflow) {
self.reset()
- _setStepsAndTasks(workflow)
+ setStepsAndTasks(workflow)
}
}, { name: 'WorkflowStepStore Workflow Observer autorun' })
addDisposer(self, workflowDisposer)
@@ -124,7 +124,7 @@ const WorkflowStepStore = types
}
}
- function _setStepsAndTasks ({ steps, tasks }) {
+ function setStepsAndTasks ({ steps, tasks }) {
self.setSteps(steps)
self.setTasks(tasks)
}
@@ -159,6 +159,7 @@ const WorkflowStepStore = types
reset,
resetSteps,
selectStep,
+ setStepsAndTasks,
setSteps,
setTasks
}
| 1 |
diff --git a/site/monitoring.xml b/site/monitoring.xml @@ -87,7 +87,7 @@ limitations under the License.
</p>
<p>
- There is no shortage of existing tools (such as Graphite or Datadog) that collect infrastructure
+ There is no shortage of existing tools (such as Prometheus or Datadog) that collect infrastructure
and kernel metrics, store and visualise them over periods of time.
</p>
</doc:section>
| 14 |
diff --git a/src/components/inputnumber/InputNumber.css b/src/components/inputnumber/InputNumber.css .p-fluid .p-inputnumber-button {
width: 2em;
+ flex-shrink: 0;
}
.p-fluid .p-inputnumber {
.p-fluid .p-inputnumber-buttons-stacked .p-inputnumber-input,
.p-fluid .p-inputnumber-buttons-horizontal .p-inputnumber-input {
- width: auto;
+ min-width: 2em;
}
.p-fluid .p-inputnumber-buttons-vertical {
| 7 |
diff --git a/docs/src/pages/discover-more/related-projects.md b/docs/src/pages/discover-more/related-projects.md ## Material-UI Specific Projects
+- [dx-react-grid-material-ui](https://devexpress.github.io/devextreme-reactive/react/grid/) A data grid for Material-UI with paging, sorting, filtering, grouping and editing features.
- [formsy-material-ui](https://github.com/mbrookes/formsy-material-ui)
A Formsy compatibility wrapper for Material-UI form components.
- [react-materialui-notifications](https://github.com/puranjayjain/react-materialui-notifications) Spec compliant notifications for react and material ui users.
| 0 |
diff --git a/src/modules/dex/directives/dexCandleChart/DexCandleChart.js b/src/modules/dex/directives/dexCandleChart/DexCandleChart.js controller.load = function () {
const script = document.createElement('script');
- const root = '/trading-view/';
+ const root = WavesApp.isWeb() ? 'https://jslib.wavesnodes.com/' : '/trading-view/';
script.src = `${root}charting_library.min.js`;
const promise = new Promise((resolve, reject) => {
script.onload = resolve;
| 13 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -738,10 +738,10 @@ metaversefile.setApi({
getNextInstanceId() {
return getRandomString();
},
- createApp({/* name = '', */start_url = '', type = '', /*components = [], */in_front = false} = {}) {
+ createApp({/* name = '', */start_url = '', /*components = [], */in_front = false} = {}) {
const app = new App();
// app.name = name;
- app.type = type;
+ // app.type = type;
app.contentId = start_url;
// app.components = components;
if (in_front) {
| 2 |
diff --git a/web/settings.html b/web/settings.html <option value="nl" {{global.language=='nl'|isSelected}}>Dutch</option>
<option value="pl" {{global.language=='pl'|isSelected}}>Polish</option>
<option value="pt_BR" {{global.language=='pt_BR'|isSelected}}>Portuguese (Brazil)</option>
+ <option value="pt_PT" {{global.language=='pt_PT'|isSelected}}>Portuguese (Portugal)</option>
<option value="ro" {{global.language=='ro'|isSelected}}>Romanian</option>
<option value="ru" {{global.language=='ru'|isSelected}}>Russian</option>
<option value="th" {{global.language=='th'|isSelected}}>Thai</option>
| 3 |
diff --git a/package-lock.json b/package-lock.json "qs": "^6.5.1"
}
},
- "react-native-zoom": {
- "version": "github:GoodDollar/ReactNativeZoom#46c781b4c1b3717a2b71e68ced63d5c3143a260a",
- "from": "github:GoodDollar/ReactNativeZoom#master"
- },
"react-phone-number-input": {
"version": "2.3.18",
"resolved": "https://registry.npmjs.org/react-phone-number-input/-/react-phone-number-input-2.3.18.tgz",
| 2 |
diff --git a/src/client/js/components/FormattedDistanceDate.jsx b/src/client/js/components/FormattedDistanceDate.jsx import React from 'react';
import PropTypes from 'prop-types';
-import { format, formatDistanceStrict } from 'date-fns';
+import { format, formatDistanceStrict, differenceInSeconds } from 'date-fns';
import { UncontrolledTooltip } from 'reactstrap';
const FormattedDistanceDate = (props) => {
@@ -11,9 +11,15 @@ const FormattedDistanceDate = (props) => {
const baseDate = props.baseDate || new Date();
- const elemId = `grw-fdd-${props.id}`;
const dateFormatted = format(date, 'yyyy/MM/dd HH:mm');
+ const diff = Math.abs(differenceInSeconds(date, baseDate));
+ if (diff > props.differenceForAvoidingFormat) {
+ return <>{dateFormatted}</>;
+ }
+
+ const elemId = `grw-fdd-${props.id}`;
+
return (
<>
<span id={elemId}>{formatDistanceStrict(date, baseDate)}</span>
@@ -26,6 +32,11 @@ FormattedDistanceDate.propTypes = {
id: PropTypes.string.isRequired,
date: PropTypes.oneOfType([PropTypes.string, PropTypes.instanceOf(Date)]).isRequired,
baseDate: PropTypes.instanceOf(Date),
+ // the number(sec) from 'baseDate' to avoid format
+ differenceForAvoidingFormat: PropTypes.number,
+};
+FormattedDistanceDate.defaultProps = {
+ differenceForAvoidingFormat: 86400 * 3,
};
export default FormattedDistanceDate;
| 7 |
diff --git a/packages/bitcore-lib-ltc/lib/networks.js b/packages/bitcore-lib-ltc/lib/networks.js @@ -141,8 +141,8 @@ addNetwork({
alias: 'mainnet',
pubkeyhash: 0x30, // 48
privatekey: 0xb0, // 176
- scripthash: 0x05, // 5
- scripthash2: 0x32, // 50
+ scripthash: 0x32, // 50
+ scripthash2: 0x05, // 5
bech32prefix: 'ltc',
xpubkey: 0x0488b21e,
xprivkey: 0x0488ade4,
| 4 |
diff --git a/tasks/stats.js b/tasks/stats.js @@ -122,7 +122,7 @@ function getMainBundleInfo() {
// info about partial bundles
function getPartialBundleInfo() {
- return partialBundlePaths.map(makeBundleInfo);
+ return partialBundlePaths.map(distBundleInfo);
}
// footer info
@@ -143,11 +143,11 @@ function createLink(base, name) {
return '[' + name + '](' + base + name + ')';
}
-function makeBundleInfo(pathObj) {
+function distBundleInfo(pathObj) {
var name = pathObj.name;
var sizes = findSizes(pathObj);
var traceList = pathObj.traceList;
- var pkgName = 'plotly.js-' + name + '-dist';
+ var nameDist = 'plotly.js-' + name + '-dist';
var nameVersion = name + '-' + pkgVersion;
return [
@@ -168,9 +168,9 @@ function makeBundleInfo(pathObj) {
'',
'',
'#### npm packages',
- '> ' + createLink('https://www.npmjs.com/package/', pkgName),
+ '> ' + createLink('https://www.npmjs.com/package/', nameDist),
'',
- '> ' + createLink('https://www.npmjs.com/package/', pkgName + '-min'),
+ '> ' + createLink('https://www.npmjs.com/package/', nameDist + '-min'),
'',
'---',
''
| 10 |
diff --git a/src/1_utils.js b/src/1_utils.js @@ -967,7 +967,7 @@ utils.removePropertiesFromObject = function(objectToModify, keysToRemove) {
// v2/event utility functions
-var BRANCH_STANDARD_EVENTS = [ 'ADD_TO_CART', 'ADD_TO_WISHLIST', 'VIEW_CART', 'INITIATE_PURCHASE', 'ADD_PAYMENT_INFO', 'PURCHASE', 'SPEND_CREDITS', 'SEARCH', 'VIEW_ITEM', 'VIEW_ITEMS', 'RATE', 'SHARE', 'COMPLETE_REGISTRATION', 'COMPLETE_TUTORIAL', 'ACHIEVE_LEVEL', 'UNLOCK_ACHIEVEMENT', 'LOGIN' ];
+var BRANCH_STANDARD_EVENTS = [ 'ADD_TO_CART', 'ADD_TO_WISHLIST', 'VIEW_CART', 'INITIATE_PURCHASE', 'ADD_PAYMENT_INFO', 'PURCHASE', 'SPEND_CREDITS', 'SEARCH', 'VIEW_ITEM', 'VIEW_ITEMS', 'RATE', 'SHARE', 'COMPLETE_REGISTRATION', 'COMPLETE_TUTORIAL', 'ACHIEVE_LEVEL', 'UNLOCK_ACHIEVEMENT', 'LOGIN', 'SUBSCRIBE' ];
var BRANCH_STANDARD_EVENT_DATA = [ 'transaction_id', 'revenue', 'currency', 'shipping', 'tax', 'coupon', 'affiliation', 'search_query', 'description' ];
utils.isStandardEvent = function(eventName) {
| 3 |
diff --git a/html/components/_accordions.scss b/html/components/_accordions.scss ////
/// @group accordion
////
-
.sprk-c-Accordion {
border-top: $sprk-accordion-border;
max-width: $sprk-accordion-max-width;
}
&:focus:not(.focus-visible) {
- outline: none;
+ outline: none; /* stylelint-disable-line selector-class-pattern */
}
}
| 3 |
diff --git a/components/Article/PayNote.js b/components/Article/PayNote.js @@ -32,7 +32,7 @@ const styles = {
banner: css({
padding: '5px 0'
}),
- body: css({
+ content: css({
margin: 0,
paddingBottom: 0
}),
@@ -97,8 +97,7 @@ export const MAX_PAYNOTE_SEED = Math.max(
const generatePositionedNote = (variation, target, cta, position) => {
return {
[position]: {
- title: t(`article/${variation}/${position}/title`, undefined, ''),
- body: t(`article/${variation}/${position}`, undefined, ''),
+ content: t(`article/${variation}/${position}`, undefined, ''),
cta: cta,
button: {
label: t(`article/${variation}/${position}/buy/button`, undefined, ''),
@@ -174,8 +173,7 @@ const predefinedNotes = generateNotes(
)
)
-const isEmpty = positionedNote =>
- !positionedNote.cta && !positionedNote.title && !positionedNote.body
+const isEmpty = positionedNote => !positionedNote.cta && !positionedNote.content
const meetTarget = target => payNote => {
const targetKeys = new Set(Object.keys(payNote.target))
@@ -375,20 +373,12 @@ export const PayNote = compose(
>
<Center>
<Interaction.P
- {...styles.body}
+ {...styles.content}
style={{ color: isBefore ? colors.negative.text : '#000000' }}
- >
- <Interaction.Emphasis
- dangerouslySetInnerHTML={{
- __html: withCount(positionedNote.title, membershipStats)
- }}
- />{' '}
- <span
dangerouslySetInnerHTML={{
- __html: withCount(positionedNote.body, membershipStats)
+ __html: withCount(positionedNote.content, membershipStats)
}}
/>
- </Interaction.P>
{cta}
</Center>
</div>
| 14 |
diff --git a/data.js b/data.js @@ -3654,6 +3654,14 @@ module.exports = [
url: "https://github.com/jasonmoo/t.js",
source: "https://raw.githubusercontent.com/jasonmoo/t.js/master/t.js"
},
+ {
+ name: "displace.js",
+ github: "catc/displace",
+ tags: ["move", "dom", "drag", "tiny", "mouse", "touch"],
+ description: "Minimal javascript library for creating movable DOM elements",
+ url: "https://catc.github.io/displace",
+ source: "https://raw.githubusercontent.com/catc/displace/master/dist/displace.js"
+ },
{
name: "statelet",
tags: ["events"],
| 0 |
diff --git a/src/scripts/content/todoist.js b/src/scripts/content/todoist.js 'use strict';
-function getProjectNameFromLabel(elem) {
- var projectLabel = '',
- projectLabelEle = $('.project_item__name', elem.parentNode.parentNode);
- if (projectLabelEle) {
- projectLabel = projectLabelEle.textContent.trim();
- }
- return projectLabel;
-}
-
-var levelPattern = /(?:^|\s)indent_([0-9]*?)(?:\s|$)/;
-function getParentEle(sidebarCurrentEle) {
- var curLevel, parentClass, parentCandidate;
- curLevel = sidebarCurrentEle.className.match(levelPattern)[1];
- parentClass = 'indent_' + (curLevel - 1);
-
- parentCandidate = sidebarCurrentEle;
- while (parentCandidate.previousElementSibling) {
- parentCandidate = parentCandidate.previousElementSibling;
- if (parentCandidate.classList.contains(parentClass)) {
- break;
- }
- }
- return parentCandidate;
-}
+function getProjectName(item) {
+ var projectItems = item.parentNode.getElementsByClassName('project_item__name');
-function isTopLevelProject(sidebarCurrentEle) {
- return sidebarCurrentEle.classList.contains('indent_1');
-}
-
-function getProjectNameHierarchy(sidebarCurrentEle) {
- var parentProjectEle, projectName;
- projectName = $('.name', sidebarCurrentEle).firstChild.textContent.trim();
- if (isTopLevelProject(sidebarCurrentEle)) {
- return [projectName];
- }
- parentProjectEle = getParentEle(sidebarCurrentEle);
- return [projectName].concat(getProjectNameHierarchy(parentProjectEle));
+ if (projectItems.length > 0) {
+ return projectItems[0].textContent;
}
-function projectWasJustCreated(projectId) {
- return projectId.startsWith('_');
+ return item.closest('.list_editor').querySelector('a.project_link span').textContent;
}
-function getSidebarCurrentEle(elem) {
- var editorInstance,
- projectId,
- sidebarRoot,
- sidebarColorEle,
- sidebarCurrentEle;
- editorInstance = elem.closest('.project_editor_instance');
- if (editorInstance) {
- projectId = editorInstance.getAttribute('data-project-id');
- sidebarRoot = $('#project_list');
- if (projectWasJustCreated(projectId)) {
- sidebarCurrentEle = $('.current', sidebarRoot);
- } else {
- sidebarColorEle = $('#project_color_' + projectId, sidebarRoot);
- if (sidebarColorEle) {
- sidebarCurrentEle = sidebarColorEle.closest('.menu_clickable');
- }
- }
- }
- return sidebarCurrentEle;
-}
+function getTags(item) {
+ var tags = item.querySelectorAll('.labels_holder a:not(.label_sep)')
-function getProjectNames(elem) {
- var projectNames, viewingInbox, sidebarCurrentEle;
- viewingInbox = $('#filter_inbox.current, #filter_team_inbox.current');
- if (viewingInbox) {
- projectNames = ['Inbox'];
- } else {
- sidebarCurrentEle = getSidebarCurrentEle(elem);
- if (sidebarCurrentEle) {
- projectNames = getProjectNameHierarchy(sidebarCurrentEle);
- } else {
- projectNames = [getProjectNameFromLabel(elem)];
- }
- }
- return projectNames;
+ return Array.from(tags).map(function(tag) {
+ return tag.textContent;
+ });
}
togglbutton.render(
@@ -123,7 +60,8 @@ togglbutton.render(
link = togglbutton.createTimerLink({
className: 'todoist',
description: descFunc(),
- projectName: getProjectNames(elem)
+ projectName: getProjectName(elem),
+ tags: getTags(elem)
});
container.insertBefore(link, container.lastChild);
| 7 |
diff --git a/rig.js b/rig.js @@ -2,33 +2,14 @@ import * as THREE from './three.module.js';
import {GLTFLoader} from './GLTFLoader.js';
import cameraManager from './camera-manager.js';
import {makeTextMesh, makeRigCapsule} from './vr-ui.js';
-import {makePromise, WaitQueue} from './util.js';
+import {makePromise, /*WaitQueue, */downloadFile} from './util.js';
import {renderer, scene, appManager} from './app-object.js';
import runtime from './runtime.js';
import Avatar from './avatars/avatars.js';
import {FBXLoader} from './FBXLoader.js';
import physicsMananager from './physics-manager.js';
+import cbor from './cbor.js';
-const animationFileNames = [
- `idle.fbx`,
- `jump.fbx`,
- `left strafe walking.fbx`,
- `left strafe.fbx`,
- // `left turn 90.fbx`,
- // `left turn.fbx`,
- `right strafe walking.fbx`,
- `right strafe.fbx`,
- // `right turn 90.fbx`,
- // `right turn.fbx`,
- `running.fbx`,
- `walking.fbx`,
- // `ybot.fbx`,
- `running backwards.fbx`,
- `walking backwards.fbx`,
- `falling.fbx`,
- `falling idle.fbx`,
- `falling landing.fbx`,
-];
const animationsSelectMap = {
'idle.fbx': new THREE.Vector3(0, 0, 0),
'jump.fbx': new THREE.Vector3(0, 1, 0),
@@ -82,6 +63,26 @@ const animationsDistanceMap = {
let testRig = null, objects = [], animations = [], idleAnimation = null, jumpAnimation = null, lastPosition = new THREE.Vector3(), smoothVelocity = new THREE.Vector3();
(async () => {
const fbxLoader = new FBXLoader();
+ const animationFileNames = [
+ `idle.fbx`,
+ `jump.fbx`,
+ `left strafe walking.fbx`,
+ `left strafe.fbx`,
+ // `left turn 90.fbx`,
+ // `left turn.fbx`,
+ `right strafe walking.fbx`,
+ `right strafe.fbx`,
+ // `right turn 90.fbx`,
+ // `right turn.fbx`,
+ `running.fbx`,
+ `walking.fbx`,
+ // `ybot.fbx`,
+ `running backwards.fbx`,
+ `walking backwards.fbx`,
+ `falling.fbx`,
+ `falling idle.fbx`,
+ `falling landing.fbx`,
+ ];
for (const name of animationFileNames) {
const u = './animations/' + name;
let o = await new Promise((accept, reject) => {
@@ -127,6 +128,9 @@ let testRig = null, objects = [], animations = [], idleAnimation = null, jumpAni
reverseAnimation.name = animation.name.replace(/\.fbx$/, ' reverse.fbx');
animations.push(reverseAnimation);
}
+ const ab = cbor.encode(animations.map(a => a.toJSON()));
+ animations = cbor.decode(ab).map(a => THREE.AnimationClip.parse(a));
+ downloadFile(new Blob([ab], {type: 'application/octet-stream'}), 'animations.cbor');
const _normalizeAnimationDurations = (animations, baseAnimation) => {
for (let i = 1; i < animations.length; i++) {
| 0 |
diff --git a/src/extensions/renderer/base/coord-ele-math/edge-control-points.js b/src/extensions/renderer/base/coord-ele-math/edge-control-points.js @@ -64,7 +64,7 @@ BRp.findSegmentsPoints = function( edge, pairInfo ){
// Segments (multiple straight lines)
const rs = edge._private.rscratch;
- const { posPts, midptSrcPts, vectorNormInverse } = pairInfo;
+ const { posPts, intersectionPts, vectorNormInverse } = pairInfo;
const edgeDistances = edge.pstyle('edge-distances').value;
const segmentWs = edge.pstyle( 'segment-weights' );
const segmentDs = edge.pstyle( 'segment-distances' );
@@ -80,7 +80,7 @@ BRp.findSegmentsPoints = function( edge, pairInfo ){
let w1 = 1 - w;
let w2 = w;
- let midptPts = edgeDistances === 'node-position' ? posPts : midptSrcPts;
+ let midptPts = edgeDistances === 'node-position' ? posPts : intersectionPts;
let adjustedMidpt = {
x: midptPts.x1 * w1 + midptPts.x2 * w2,
@@ -191,7 +191,7 @@ BRp.findStraightEdgePoints = function( edge ){
BRp.findBezierPoints = function( edge, pairInfo, i, edgeIsUnbundled ){
const rs = edge._private.rscratch;
- const { vectorNormInverse, posPts, midptSrcPts } = pairInfo;
+ const { vectorNormInverse, posPts, intersectionPts } = pairInfo;
const edgeDistances = edge.pstyle('edge-distances').value;
const stepSize = edge.pstyle('control-point-step-size').pfValue;
const ctrlptDists = edge.pstyle('control-point-distances');
@@ -229,7 +229,7 @@ BRp.findBezierPoints = function( edge, pairInfo, i, edgeIsUnbundled ){
let w1 = 1 - ctrlptWeight;
let w2 = ctrlptWeight;
- let midptPts = edgeDistances === 'node-position' ? posPts : midptSrcPts;
+ let midptPts = edgeDistances === 'node-position' ? posPts : intersectionPts;
let adjustedMidpt = {
x: midptPts.x1 * w1 + midptPts.x2 * w2,
@@ -572,7 +572,7 @@ BRp.findEdgeControlPoints = function( edges ){
let tgtIntn = pairInfo.tgtIntn = tgtOutside;
- let midptSrcPts = pairInfo.midptSrcPts = {
+ let intersectionPts = pairInfo.intersectionPts = {
x1: srcOutside[0],
x2: tgtOutside[0],
y1: srcOutside[1],
@@ -635,9 +635,9 @@ BRp.findEdgeControlPoints = function( edges ){
x1: posPts.x2, y1: posPts.y2,
x2: posPts.x1, y2: posPts.y1
},
- midptSrcPts: {
- x1: midptSrcPts.x2, y1: midptSrcPts.y2,
- x2: midptSrcPts.x1, y2: midptSrcPts.y1
+ intersectionPts: {
+ x1: intersectionPts.x2, y1: intersectionPts.y2,
+ x2: intersectionPts.x1, y2: intersectionPts.y1
},
vector: { x: -vector.x, y: -vector.y },
vectorNorm: { x: -vectorNorm.x, y: -vectorNorm.y },
| 10 |
diff --git a/components/aggregation/mat/Charts.js b/components/aggregation/mat/Charts.js @@ -19,7 +19,7 @@ export const StackedBarChart = ({data, cols, indexBy}) => (
data={data}
keys={cols}
indexBy={indexBy}
- margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
+ margin={{ top: 50, right: 130, bottom: 100, left: 80 }}
padding={0.3}
colors={colorFunc}
borderColor={{ from: 'color', modifiers: [ [ 'darker', 1.6 ] ] }}
@@ -28,18 +28,18 @@ export const StackedBarChart = ({data, cols, indexBy}) => (
axisBottom={{
tickSize: 5,
tickPadding: 5,
- tickRotation: 0,
+ tickRotation: 45,
legend: 'day',
- legendPosition: 'middle',
+ legendPosition: 'left',
legendOffset: 32
}}
axisLeft={{
tickSize: 5,
tickPadding: 5,
tickRotation: 0,
- legend: 'msmt count',
+ legend: 'measurement count',
legendPosition: 'middle',
- legendOffset: -40
+ legendOffset: -60
}}
labelSkipWidth={12}
labelSkipHeight={12}
| 7 |
diff --git a/api/utils/get-random-default-photo.js b/api/utils/get-random-default-photo.js @@ -17,7 +17,7 @@ const PALETTE = [
export default () => {
const color = faker.random.arrayElement(PALETTE);
return {
- profilePhoto: `https://s3.amazonaws.com/spectrum-chat/default_images/profile-${color}.png`,
- coverPhoto: `https://s3.amazonaws.com/spectrum-chat/default_images/cover-${color}.svg`,
+ profilePhoto: `/default_images/profile-${color}.png`,
+ coverPhoto: `/default_images/cover-${color}.svg`,
};
};
| 12 |
diff --git a/src/sensors/MultiDropdownList.js b/src/sensors/MultiDropdownList.js @@ -55,7 +55,7 @@ class MultiDropdownList extends Component {
this.props.updateQuery(this.internalComponent, null);
if (this.props.defaultSelected) {
- this.setValue(this.props.defaultSelected);
+ this.selectItem(this.props.defaultSelected, true);
}
}
@@ -69,7 +69,7 @@ class MultiDropdownList extends Component {
});
}
if (this.props.defaultSelected !== nextProps.defaultSelected) {
- this.setValue(nextProps.defaultSelected);
+ this.selectItem(nextProps.defaultSelected, true);
}
}
@@ -120,20 +120,25 @@ class MultiDropdownList extends Component {
return null;
}
- selectItem = (item) => {
+ selectItem = (item, isDefaultValue = false) => {
let { currentValue } = this.state;
+ if (isDefaultValue) {
+ currentValue = item;
+ } else {
if (currentValue.includes(item)) {
currentValue = currentValue.filter(value => value !== item);
} else {
currentValue = [ ...currentValue, item ];
}
+ }
const performUpdate = () => {
this.setState({
currentValue
});
this.updateQuery(currentValue);
}
+
checkValueChange(
this.props.componentId,
currentValue,
@@ -143,22 +148,6 @@ class MultiDropdownList extends Component {
);
}
- setValue = (value) => {
- const performUpdate = () => {
- this.setState({
- currentValue: value
- });
- this.updateQuery(value);
- }
- checkValueChange(
- this.props.componentId,
- value,
- this.props.beforeValueChange,
- this.props.onValueChange,
- performUpdate
- );
- };
-
toggleModal = () => {
this.setState({
showModal: !this.state.showModal
| 7 |
diff --git a/generators/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs @@ -168,11 +168,11 @@ limitations under the License.
<%_ } _%>
"jest": "jest --coverage --logHeapUsage --maxWorkers=2 --no-cache --config src/test/javascript/jest.conf.js",
"jest:update": "<%= clientPackageManager %> run jest <%= optionsForwarder %>--updateSnapshot",
- "webpack:build": "<%= clientPackageManager %> run cleanup && npm run webpack:build:main",
- "webpack:build:main": "<%= clientPackageManager %> run webpack -- --config webpack/webpack.dev.js --progress --profile",
- "webpack:prod:main": "<%= clientPackageManager %> run webpack -- --config webpack/webpack.prod.js --profile",
- "webpack:prod": "<%= clientPackageManager %> run cleanup && npm run webpack:prod:main && npm run clean-www",
- "webpack:dev": "<%= clientPackageManager %> run webpack-dev-server -- --config webpack/webpack.dev.js --progress --inline",
+ "webpack:build": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:build:main",
+ "webpack:build:main": "<%= clientPackageManager %> run webpack <%= optionsForwarder %>--config webpack/webpack.dev.js --progress --profile",
+ "webpack:prod:main": "<%= clientPackageManager %> run webpack <%= optionsForwarder %>--config webpack/webpack.prod.js --profile",
+ "webpack:prod": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:prod:main && <%= clientPackageManager %> run clean-www",
+ "webpack:dev": "<%= clientPackageManager %> run webpack-dev-server <%= optionsForwarder %>--config webpack/webpack.dev.js --progress --inline",
"webpack:test": "<%= clientPackageManager %> run test",
"webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js",
"webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js",
| 2 |
diff --git a/angular/projects/spark-angular/src/lib/directives/inputs/sprk-button/sprk-button.stories.ts b/angular/projects/spark-angular/src/lib/directives/inputs/sprk-button/sprk-button.stories.ts @@ -32,7 +32,7 @@ export const primary = () => ({
data-id="button-primary"
sprkButton
>
- Buttons
+ Button
</button>
`,
});
| 3 |
diff --git a/index.d.ts b/index.d.ts @@ -596,13 +596,13 @@ declare namespace Moleculer {
interface ServiceHooks {
before?: {
- [key: string]: ((ctx: Context<any, any>) => Promise<void> | void) | string
+ [key: string]: ((ctx: Context<any, any>) => Promise<void> | void) | string | string[]
},
after?: {
- [key: string]: ((ctx: Context<any, any>, res: any) => Promise<any> | any) | string
+ [key: string]: ((ctx: Context<any, any>, res: any) => Promise<any> | any) | string | string[]
},
error?: {
- [key: string]: ((ctx: Context<any, any>, err: Error) => Promise<void> | void) | string
+ [key: string]: ((ctx: Context<any, any>, err: Error) => Promise<void> | void) | string | string[]
},
}
| 11 |
diff --git a/protocols/swap/package.json b/protocols/swap/package.json "@airswap/types": "0.1.0",
"openzeppelin-solidity": "^v2.2",
"solidity-coverage": "^0.6.3",
- "solc": "0.5.10",
- "solidity-coverage": "^0.6.3",
"solidity-docgen": "0.3.0-beta.3",
"truffle-flattener": "^1.4.0",
"truffle-hdwallet-provider-privkey": "1.0.3",
| 2 |
diff --git a/packages/mjml-validator/src/rules/validChildren.js b/packages/mjml-validator/src/rules/validChildren.js @@ -36,7 +36,10 @@ export default function validChildren(element, { components }) {
return true
}
- const allowedDependencies = keys(dependencies).filter(key => includes(dependencies[key], childTagName))
+ const allowedDependencies = keys(dependencies).filter(key => {
+ return includes(dependencies[key], childTagName)
+ || dependencies[key].some(dep => dep instanceof RegExp && dep.test(childTagName))
+ })
return ruleError(
`${childTagName} cannot be used inside ${tagName}, only inside: ${allowedDependencies.join(
| 9 |
diff --git a/karma.browsers.js b/karma.browsers.js @@ -247,10 +247,10 @@ saucelabs["Firefox 4 on Mac OS X Sierra"] = {
browserName: "firefox",
version: "4"
};
-browserStack["Firefox 4 on Mac OS X High Sierra"] = {
+browserStack["Firefox 4 on Mac OS X Snow Leopard"] = {
base: "BrowserStack",
os: "OS X",
- os_version: "High Sierra",
+ os_version: "Snow Leopard",
browser: "firefox",
browser_version: "4"
};
| 1 |
diff --git a/scss/typography/_small.scss b/scss/typography/_small.scss // Website: https://www.siimple.xyz
//
@import "../_variables.scss";
+@import "../_functions.scss";
//Small variables
$siimple-small-font-size: 14px;
-$siimple-small-color: $siimple-navy-light;
+$siimple-small-color: siimple-default-color("dark", "light");
//Small class
.siimple-small {
@@ -17,3 +18,4 @@ $siimple-small-color: $siimple-navy-light;
font-size: $siimple-small-font-size;
color: $siimple-small-color;
}
+
| 1 |
diff --git a/lib/assets/javascripts/new-dashboard/store/utils/getCARTOData.js b/lib/assets/javascripts/new-dashboard/store/utils/getCARTOData.js @@ -5,6 +5,6 @@ export default function getCARTOData () {
return {
user_data: window.user_data,
- organization_notifications: window.organization_notifications
+ organization_notifications: window.organization_notifications || []
};
}
| 12 |
diff --git a/address-completion-c4c/sales-cloud-address-completion-dqs/k8s/function.yaml b/address-completion-c4c/sales-cloud-address-completion-dqs/k8s/function.yaml @@ -20,10 +20,10 @@ spec:
- name: DQS_UAA
valueFrom:
secretKeyRef:
- name: data-quality-service-sb
+ name: sap-dqs-kyma-demo
key: uaa
- name: URI
valueFrom:
secretKeyRef:
- name: data-quality-service-sb
+ name: sap-dqs-kyma-demo
key: uri
| 4 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## v1.8.6 (2020-5-29)
+
+### Bug Fixes
+
+* Added TypeScript definitions for the `RequestMock.onRequestTo` and `RequestMock.respond` methods ([#5108](https://github.com/DevExpress/testcafe/issues/5108))
+* Added a TypeScript definition for the client script's `module` option ([#5071](https://github.com/DevExpress/testcafe/issues/5071))
+* TestCafe can now run `.jsx` and `.tsx` files with test code ([#4817](https://github.com/DevExpress/testcafe/issues/4817))
+* Firefox now uses the system certificate storage by default on Windows ([PR#5077](https://github.com/DevExpress/testcafe/pull/5077)) by [@rybesh](https://github.com/rybesh)
+* Fixed an error that occurred in PowerShell Strict Mode ([#4665](https://github.com/DevExpress/testcafe/issues/4665))
+* Fixed a bug that prevented tested pages from changing their title ([testcafe-hammerhead/#2328](https://github.com/DevExpress/testcafe-hammerhead/issues/2328))
+* Fixed an `Invalid Calling Object` error in IE11 ([testcafe-hammerhead/#2236](https://github.com/DevExpress/testcafe-hammerhead/issues/2236))
+* Fixed an error (`Cannot read property 'on' of undefined`) that occurred when testing iframes ([testcafe-hammerhead/#2326](https://github.com/DevExpress/testcafe-hammerhead/issues/2326))
+* Fixed a bug when `MutationObserver.prevSibling` and `MutationObserver.nextSibling` returned wrong values ([testcafe-hammerhead/#2321](https://github.com/DevExpress/testcafe-hammerhead/issues/2321))
+* Fixed a page render error that occurred when using ES6 `Proxy` ([testcafe-hammerhead/#2056](https://github.com/DevExpress/testcafe-hammerhead/issues/2056))
+* Fixed the `ERR_HTTP_HEADERS_SENT` error ([testcafe-hammerhead/#2317](https://github.com/DevExpress/testcafe-hammerhead/issues/2317))
+* Fixed a `QuotaExceedError` error occurred when the `LocalStorage` API was used ([testcafe-hammerhead/#1454](https://github.com/DevExpress/testcafe-hammerhead/issues/1454))
+
## v1.8.5 (2020-5-19)
### Bug Fixes
| 0 |
diff --git a/protocols/swap/MIGRATION.md b/protocols/swap/MIGRATION.md This document is intended for those migrating from Swap V1 to V2 and does not include all of the features of Swap V2. [Read more about Swap V2](README.md).
-:bulb: **Note**: A key feature of V2 is that every order must have a `nonce` value that is unique to its makerWallet.
+:bulb: **Note**: A key feature of V2 is that every order must have a `nonce` value that is unique to its signerWallet.
## Signing an Order
@@ -15,10 +15,10 @@ const ethUtil = require('ethereumjs-util')
const msg = web3.utils.soliditySha3(
{ type: 'address', value: makerAddress },
{ type: 'uint256', value: makerAmount },
- { type: 'address', value: signerToken },
+ { type: 'address', value: makerToken },
{ type: 'address', value: takerAddress },
{ type: 'uint256', value: takerAmount },
- { type: 'address', value: senderToken },
+ { type: 'address', value: takerToken },
{ type: 'uint256', value: expiration },
{ type: 'uint256', value: nonce }
)
@@ -32,11 +32,11 @@ return ethUtil.fromRpcSig(sig)
const { hashes } = require('@airswap/order-utils')
const orderHash = hashes.getOrderHash(order, swapContractAddress)
const orderHashHex = ethUtil.bufferToHex(orderHash)
-const sig = await web3.eth.sign(orderHashHex, signer)
+const sig = await web3.eth.sign(orderHashHex, signatory)
const { r, s, v } = ethUtil.fromRpcSig(sig)
return {
version: '0x45', // EIP-191: Version 0x45 (personalSign)
- signer,
+ signatory,
r,
s,
v,
@@ -47,7 +47,7 @@ Alternatively you can use `signatures` from the `order-utils` package.
```JavaScript
const { signatures } = require('@airswap/order-utils')
-return await signatures.getWeb3Signature(order, signer, swapContractAddress)
+return await signatures.getWeb3Signature(order, signatory, swapContractAddress)
```
Where `order` is specified by example below.
@@ -60,10 +60,10 @@ The **V1** contract has `fill` function.
function fill(
address makerAddress,
uint makerAmount,
- address signerToken,
+ address makerToken,
address takerAddress,
uint takerAmount,
- address senderToken,
+ address takerToken,
uint256 expiration,
uint256 nonce,
uint8 v,
@@ -79,10 +79,10 @@ A successful `fill` transaction emits a `Filled` event.
event Filled(
address indexed makerAddress,
uint makerAmount,
- address indexed signerToken,
+ address indexed makerToken,
address takerAddress,
uint takerAmount,
- address indexed senderToken,
+ address indexed takerToken,
uint256 expiration,
uint256 nonce
);
@@ -102,8 +102,8 @@ Where the `_order` argument is an `Order` struct.
struct Order {
uint256 nonce; // Unique per order and should be sequential
uint256 expiry; // Expiry in seconds since 1 January 1970
- Party maker; // Party to the trade that sets terms
- Party taker; // Party to the trade that accepts terms
+ Party signer; // Party to the trade that sets terms
+ Party sender; // Party to the trade that accepts terms
Party affiliate; // Party compensated for facilitating (optional)
Signature signature; // Signature of the order
}
@@ -124,7 +124,7 @@ And the `_order` argument has a `signature` struct.
```
struct Signature {
- address signer; // Address of the wallet used to sign
+ address signatory; // Address of the wallet used to sign
uint8 v; // `v` value of an ECDSA signature
bytes32 r; // `r` value of an ECDSA signature
bytes32 s; // `s` value of an ECDSA signature
@@ -140,11 +140,11 @@ A successful `swap` transaction emits a `Swap` event.
event Swap(
uint256 indexed nonce,
uint256 timestamp,
- address indexed makerWallet,
- uint256 makerParam,
+ address indexed signerWallet,
+ uint256 signerParam,
address signerToken,
- address indexed takerWallet,
- uint256 takerParam,
+ address indexed senderWallet,
+ uint256 senderParam,
address senderToken,
address affiliateWallet,
uint256 affiliateParam,
@@ -162,10 +162,10 @@ event Swap(
function cancel(
address makerAddress,
uint makerAmount,
- address signerToken,
+ address makerToken,
address takerAddress,
uint takerAmount,
- address senderToken,
+ address takerToken,
uint256 expiration,
uint256 nonce,
uint8 v,
@@ -180,10 +180,10 @@ A successful `cancel` transaction will emit a `Canceled` event.
event Canceled(
address indexed makerAddress,
uint makerAmount,
- address indexed signerToken,
+ address indexed makerToken,
address takerAddress,
uint takerAmount,
- address indexed senderToken,
+ address indexed takerToken,
uint256 expiration,
uint256 nonce
);
@@ -202,7 +202,7 @@ A successful `cancel` transaction will emit one or more `Cancel` events.
```
event Cancel(
uint256 indexed nonce,
- address indexed makerWallet
+ address indexed signerWallet
);
```
| 3 |
diff --git a/src/plugins/StatusBar/StatusBar.js b/src/plugins/StatusBar/StatusBar.js @@ -116,7 +116,10 @@ module.exports = (props) => {
style="width: ${width}%"
role="progressbar"
aria-valuemin="0"
- aria-valuemax="100"></div>
+ aria-valuemax="100"
+ ${progressValue
+ ? { 'aria-valuenow': progressValue }
+ : {}}></div>
${progressBarContent}
<div class="UppyStatusBar-actions">
${props.newFiles && !props.hideUploadButton ? UploadBtn(props) : ''}
@@ -125,9 +128,9 @@ module.exports = (props) => {
</div>
`
- if (progressValue) {
- statusBarEl.querySelector('.UppyStatusBar-progress').setAttribute('aria-valuenow', progressValue)
- }
+ // if (progressValue) {
+ // statusBarEl.querySelector('.UppyStatusBar-progress').setAttribute('aria-valuenow', progressValue)
+ // }
return statusBarEl
}
| 4 |
diff --git a/assets/js/modules/search-console/components/dashboard/SearchFunnelWidget/Overview.js b/assets/js/modules/search-console/components/dashboard/SearchFunnelWidget/Overview.js @@ -34,23 +34,17 @@ import { Grid, Row, Cell } from '../../../../../material-components';
import { extractSearchConsoleDashboardData } from '../../../util';
import { calculateChange } from '../../../../../util';
import { CORE_MODULES } from '../../../../../googlesitekit/modules/datastore/constants';
-import { CORE_SITE } from '../../../../../googlesitekit/datastore/site/constants';
import { MODULES_ANALYTICS } from '../../../../analytics/datastore/constants';
import { CORE_LOCATION } from '../../../../../googlesitekit/datastore/location/constants';
import { MODULES_SEARCH_CONSOLE } from '../../../datastore/constants';
-import { useFeature } from '../../../../../hooks/useFeature';
import useDashboardType, {
DASHBOARD_TYPE_MAIN,
DASHBOARD_TYPE_ENTITY,
} from '../../../../../hooks/useDashboardType';
-import CompleteModuleActivationCTA from '../../../../../components/CompleteModuleActivationCTA';
-import ActivateModuleCTA from '../../../../../components/ActivateModuleCTA';
import ActivateAnalyticsCTA from './ActivateAnalyticsCTA';
import CreateGoalCTA from './CreateGoalCTA';
-import CTA from '../../../../../components/notifications/CTA';
import DataBlock from '../../../../../components/DataBlock';
import ProgressBar from '../../../../../components/ProgressBar';
-import ReportZero from '../../../../../components/ReportZero';
import RecoverableModules from '../../../../../components/RecoverableModules';
import {
BREAKPOINT_SMALL,
@@ -84,7 +78,6 @@ const Overview = ( {
showRecoverableAnalytics,
} ) => {
const dashboardType = useDashboardType();
- const zeroDataStatesEnabled = useFeature( 'zeroDataStates' );
const breakpoint = useBreakpoint();
const viewOnly = useViewOnly();
@@ -112,13 +105,7 @@ const Overview = ( {
const isNavigatingToReauthURL = useSelect( ( select ) =>
select( CORE_LOCATION ).isNavigatingTo( adminReauthURL )
);
- const isAnalyticsGatheringData = useInViewSelect( ( select ) =>
- analyticsModuleActiveAndConnected &&
- canViewSharedAnalytics &&
- ! showRecoverableAnalytics
- ? select( MODULES_ANALYTICS ).isGatheringData()
- : false
- );
+
const isSearchConsoleGatheringData = useInViewSelect( ( select ) =>
select( MODULES_SEARCH_CONSOLE ).isGatheringData()
);
@@ -168,15 +155,9 @@ const Overview = ( {
}
const showAnalytics =
- ( ( canViewSharedAnalytics &&
- analyticsModuleConnected &&
- ! isAnalyticsGatheringData &&
- ! zeroDataStatesEnabled &&
- ! error ) ||
- ( canViewSharedAnalytics &&
+ canViewSharedAnalytics &&
analyticsModuleConnected &&
- zeroDataStatesEnabled &&
- ! error ) ) &&
+ ! error &&
! showRecoverableAnalytics;
const showGoalsCTA =
@@ -187,7 +168,7 @@ const Overview = ( {
const quarterCellProps = {
smSize: 2,
- mdSize: showGoalsCTA && zeroDataStatesEnabled ? 4 : 2,
+ mdSize: showGoalsCTA ? 4 : 2,
lgSize: 3,
};
@@ -215,13 +196,6 @@ const Overview = ( {
lgSize: 12,
};
- const supportURL = useSelect( ( select ) =>
- select( CORE_SITE ).getGoogleSupportURL( {
- path: '/analytics/answer/1032415',
- hash: 'create_or_edit_goals',
- } )
- );
-
// Collection of all the data blocks to be displayed
const dataBlocks = [
{
@@ -341,16 +315,9 @@ const Overview = ( {
( ! analyticsModuleConnected || ! analyticsModuleActive ) &&
! isNavigatingToReauthURL && (
<Cell { ...halfCellProps }>
- { zeroDataStatesEnabled &&
- BREAKPOINT_SMALL !== breakpoint && (
+ { BREAKPOINT_SMALL !== breakpoint && (
<ActivateAnalyticsCTA />
) }
- { ! zeroDataStatesEnabled &&
- ( analyticsModuleActive ? (
- <CompleteModuleActivationCTA moduleSlug="analytics" />
- ) : (
- <ActivateModuleCTA moduleSlug="analytics" />
- ) ) }
</Cell>
) }
@@ -366,39 +333,9 @@ const Overview = ( {
</Cell>
) }
- { canViewSharedAnalytics &&
- isAnalyticsGatheringData &&
- ! error &&
- ! zeroDataStatesEnabled && (
- <Cell { ...halfCellProps }>
- { /* We need to use ReportZero rather than WidgetReportZero to not associate a zero state for the whole widget. */ }
- <ReportZero moduleSlug="analytics" />
- </Cell>
- ) }
-
{ showAnalytics && (
<Cell { ...quarterCellProps } smSize={ 4 }>
- { showGoalsCTA && zeroDataStatesEnabled && (
- <CreateGoalCTA />
- ) }
- { showGoalsCTA && ! zeroDataStatesEnabled && (
- <CTA
- title={ __(
- 'Use goals to measure success',
- 'google-site-kit'
- ) }
- description={ __(
- 'Goals measure how well your site or app fulfills your target objectives',
- 'google-site-kit'
- ) }
- ctaLink={ supportURL }
- ctaLabel={ __(
- 'Create a new goal',
- 'google-site-kit'
- ) }
- ctaLinkExternal
- />
- ) }
+ { showGoalsCTA && <CreateGoalCTA /> }
</Cell>
) }
| 2 |
diff --git a/README.md b/README.md @@ -5,6 +5,9 @@ ERP beyond your fridge
- Public demo of the latest stable version → [https://demo.grocy.info](https://demo.grocy.info)
- Public demo of the latest pre-release version (current master branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
+## Getting in touch
+There is the [r/grocy subreddit](https://www.reddit.com/r/grocy) to connect with other grocy users. If you've found something that does not work or if you have an idea for an improvement or new things which you would find useful, feel free to open an issue in the [issue tracker](https://github.com/grocy/grocy/issues) here.
+
## Motivation
A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
| 0 |
diff --git a/js/bin/bisdcmconvert.js b/js/bin/bisdcmconvert.js require('../../config/bisweb_pathconfig.js');
const exec = require('child_process').exec;
+const spawn = require('child_process').spawn;
const program = require('commander');
const process = require('process');
@@ -14,7 +15,7 @@ program
.option('-d, --date <b>', 'Put the date in the filename. Optional, true by default.')
.option('-e, --events <b>', 'Put events (series, acquisitions) in the filename, e.g. filename.dcm -> s002a003.nii. Optional, true by default')
.option('-f, --source-filenames', 'Source the filenames. Optional, false by default.')
- .option('-g, --gzip <b>', 'Compress output. Optional, true by default')
+ .option('-g, --gzip <b>', 'Compress output. Optional, false by default')
.option('--id <b>', 'Put id in the filename, e.g. filename.dcm -> johndoe.nii. Optional, false by default')
.option('-m, --manual <b>', 'Manually prompt the user to specify an output format. Optional, true by default')
.option('-n, --nii <b>', 'Output nii file. Optional, true by default, if false will create .hdr/.img pair')
@@ -27,7 +28,7 @@ program
.parse(process.argv);
let parseOptions = () => {
- let optionString = '';
+ let optionArray = [];
addOption('fourDimentional', '-4');
addOption('anonymize', '-a');
addOption('settings', '-b');
@@ -46,22 +47,32 @@ let parseOptions = () => {
addOption('convert', '-v');
addOption('reorientCrop', '-x');
- console.log('option string', optionString);
- return optionString;
+ if (!optionArray.includes('-g')) { optionArray.push('-g', 'N'); }
+ return optionArray;
function addOption(key, code) {
if (key in program) {
- return (program[key] === true) ? optionString.concat(`${code} Y `) : optionString.concat(`${code} N `);
+ console.log(key, 'in program', program[key], program[key] === 'true');
+ return (program[key] === true || program[key] === 'true') ? optionArray.push(code, 'Y') : optionArray.push(code, 'N');
}
}
};
let runDCM2NII = (inFolder, outFolder) => {
- let optionString = parseOptions();
+ let optionArray = parseOptions();
+ optionArray.push('-o', outFolder, inFolder);
+ console.log('option array', optionArray);
+ const dcmProcess = spawn('dcm2nii', optionArray);
- exec(`dcm2nii ${optionString} -o ${outFolder} ${inFolder}`, (err, stdout) => {
- if (err) { console.log('An error occurred during conversion', err); return; }
- console.log('stdout', stdout);
+ dcmProcess.on('close', (code) => {
+ console.log('dcm2nii closed with error code', code);
+
+ //spawn new process to separate parsed files into BIDS directories
+
+ });
+
+ dcmProcess.on('error', (err) => {
+ console.log('dcm2nii returned an error', err);
});
};
@@ -80,13 +91,27 @@ exec('which dcm2nii', (err, stdout, stderr) => {
const outFolder = program.out;
if (!outFolder) {
- const dateString = Date.getMonth() + 1 + '-' + Date.getDate() + '-' + Date.getFullYear();
+ const date = new Date();
+ const dateString = date.getMonth() + 1 + '-' + date.getDate() + '-' + date.getFullYear();
const defaultOutFolder = process.cwd() + '/dcm2nii_' + dateString;
- console.log('default out folder', defaultOutFolder);
+
+ exec('ls -a', (err, stdout) => {
+ if (err) { console.log('Process encountered an error while creating the default folder', err); }
+
+ console.log('using default out folder', defaultOutFolder);
+ let splitFolderName = defaultOutFolder.split('/');
+ let deindexedFolderName = splitFolderName[splitFolderName.length - 1];
+
+ if (stdout.indexOf(deindexedFolderName) < 0) {
exec(`mkdir ${defaultOutFolder}`, (err) => {
if (err) { console.log('An error occured while making the default folder', err); return; }
runDCM2NII(inFolder, defaultOutFolder);
});
+ } else {
+ runDCM2NII(inFolder, defaultOutFolder);
+ }
+ });
+
} else {
const outFolder = program.out;
runDCM2NII(inFolder, outFolder);
| 7 |
diff --git a/Source/dom/utils.js b/Source/dom/utils.js @@ -16,7 +16,9 @@ export function isWrappedObject(object) {
export function getURLFromPath(path) {
return typeof path === 'string'
? NSURL.fileURLWithPath(
- NSString.stringWithString(path).stringByExpandingTildeInPath()
+ NSString.stringWithString(
+ path.replace(/^file:\/\//, '')
+ ).stringByExpandingTildeInPath()
)
: path
}
| 9 |
diff --git a/types/index.d.ts b/types/index.d.ts @@ -1884,6 +1884,7 @@ export declare namespace Knex {
boolean(columnName: string): ColumnBuilder;
date(columnName: string): ColumnBuilder;
dateTime(columnName: string, options?: Readonly<{useTz?: boolean, precision?: number}>): ColumnBuilder;
+ datetime(columnName: string, options?: Readonly<{useTz?: boolean, precision?: number}>): ColumnBuilder;
time(columnName: string): ColumnBuilder;
timestamp(columnName: string, options?: Readonly<{useTz?: boolean, precision?: number}>): ColumnBuilder;
/** @deprecated */
@@ -1908,12 +1909,16 @@ export declare namespace Knex {
uuid(columnName: string): ColumnBuilder;
comment(val: string): TableBuilder;
specificType(columnName: string, type: string): ColumnBuilder;
+ primary(columnNames: readonly string[], options?: Readonly<{constraintName?: string, deferrable?: deferrableType}>): TableBuilder;
+ /** @deprecated */
primary(columnNames: readonly string[], constraintName?: string): TableBuilder;
index(
columnNames: string | readonly (string | Raw)[],
indexName?: string,
indexType?: string
): TableBuilder;
+ unique(columnNames: readonly (string | Raw)[], options?: Readonly<{indexName?: string, deferrable?: deferrableType}>): TableBuilder;
+ /** @deprecated */
unique(columnNames: readonly (string | Raw)[], indexName?: string): TableBuilder;
foreign(column: string, foreignKeyName?: string): ForeignConstraintBuilder;
foreign(
@@ -1936,10 +1941,15 @@ export declare namespace Knex {
}
interface AlterTableBuilder extends TableBuilder {}
-
+ type deferrableType = 'not deferrable' | 'immediate' | 'deferred';
interface ColumnBuilder {
index(indexName?: string): ColumnBuilder;
+ primary(options?: Readonly<{constraintName?: string, deferrable?: deferrableType}>): ColumnBuilder;
+ /** @deprecated */
primary(constraintName?: string): ColumnBuilder;
+
+ unique(options?: Readonly<{indexName?: string, deferrable?: deferrableType}>): ColumnBuilder;
+ /** @deprecated */
unique(indexName?: string): ColumnBuilder;
references(columnName: string): ReferencingColumnBuilder;
onDelete(command: string): ColumnBuilder;
@@ -1954,6 +1964,7 @@ export declare namespace Knex {
withKeyName(keyName: string): ColumnBuilder;
after(columnName: string): ColumnBuilder;
first(): ColumnBuilder;
+ deferrable(type: deferrableType): ColumnBuilder;
}
interface ForeignConstraintBuilder {
| 7 |
diff --git a/Source/Core/CircleGeometry.js b/Source/Core/CircleGeometry.js /*global define*/
define([
'./Cartesian3',
+ './Check',
'./defaultValue',
'./defined',
'./defineProperties',
@@ -10,6 +11,7 @@ define([
'./VertexFormat'
], function(
Cartesian3,
+ Check,
defaultValue,
defined,
defineProperties,
@@ -54,9 +56,7 @@ define([
var radius = options.radius;
//>>includeStart('debug', pragmas.debug);
- if (!defined(radius)) {
- throw new DeveloperError('radius is required.');
- }
+ Check.typeOf.number(radius, 'radius');
//>>includeEnd('debug');
var ellipseGeometryOptions = {
@@ -92,9 +92,7 @@ define([
*/
CircleGeometry.pack = function(value, array, startingIndex) {
//>>includeStart('debug', pragmas.debug);
- if (!defined(value)) {
- throw new DeveloperError('value is required');
- }
+ Check.typeOf.object(value, 'value');
//>>includeEnd('debug');
return EllipseGeometry.pack(value._ellipseGeometry, array, startingIndex);
};
| 14 |
diff --git a/app/src/pages/inside/stepPage/modals/editDefectModals/makeDecisionModal/makeDecisionModal.jsx b/app/src/pages/inside/stepPage/modals/editDefectModals/makeDecisionModal/makeDecisionModal.jsx @@ -61,10 +61,12 @@ const MakeDecision = ({ data }) => {
},
decisionType: SELECT_DEFECT_MANUALLY,
issueActionType: '',
- optionValue: itemData.issue.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX)
+ optionValue:
+ itemData.issue && itemData.issue.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX)
? SIMILAR_TI_CURRENT_LAUNCH
: CURRENT_EXECUTION_ONLY,
- searchMode: itemData.issue.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX)
+ searchMode:
+ itemData.issue && itemData.issue.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX)
? SEARCH_MODES.SIMILAR_TI_CURRENT_LAUNCH
: '',
testItems: [],
| 1 |
diff --git a/app/controllers/api/json/visualizations_controller.rb b/app/controllers/api/json/visualizations_controller.rb @@ -19,11 +19,11 @@ class Api::Json::VisualizationsController < Api::ApplicationController
include Carto::VisualizationMigrator
ssl_allowed :notify_watching, :list_watching, :add_like, :remove_like
- ssl_required :create, :update, :destroy, :set_next_id
+ ssl_required :create, :update, :set_next_id
skip_before_filter :api_authorization_required, only: [:add_like, :remove_like]
before_filter :optional_api_authorization, only: [:add_like, :remove_like]
- before_filter :table_and_schema_from_params, only: [:update, :destroy, :stats,
+ before_filter :table_and_schema_from_params, only: [:update, :stats,
:notify_watching, :list_watching,
:add_like, :remove_like, :set_next_id]
| 2 |
diff --git a/generators/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs "node_modules"
],
"dependencies": {
- "@angular/common": "6.1.0",
- "@angular/compiler": "6.1.0",
- "@angular/core": "6.1.0",
- "@angular/forms": "6.1.0",
- "@angular/platform-browser": "6.1.0",
- "@angular/platform-browser-dynamic": "6.1.0",
- "@angular/router": "6.1.0",
- "@fortawesome/angular-fontawesome": "0.2.0",
+ "@angular/common": "7.0.0",
+ "@angular/compiler": "7.0.0",
+ "@angular/core": "7.0.0",
+ "@angular/forms": "7.0.0",
+ "@angular/platform-browser": "7.0.0",
+ "@angular/platform-browser-dynamic": "7.0.0",
+ "@angular/router": "7.0.0",
+ "@fortawesome/angular-fontawesome": "0.2.1",
"@fortawesome/fontawesome-svg-core": "1.2.4",
"@fortawesome/free-solid-svg-icons": "5.3.1",
"@ng-bootstrap/ng-bootstrap": "3.0.0",
"ngx-infinite-scroll": "6.0.1",
"ngx-webstorage": "2.0.1",
"reflect-metadata": "0.1.12",
- "rxjs": "6.1.0",
+ "rxjs": "6.3.3",
"swagger-ui": "2.2.10",
<%_ if (websocket === 'spring-websocket') { _%>
"sockjs-client": "1.1.4",
"zone.js": "0.8.26"
},
"devDependencies": {
- "@angular/cli": "6.1.2",
- "@angular/compiler-cli": "7.0.0-beta.4",
- "@ngtools/webpack": "6.1.5",
+ "@angular/cli": "7.0.2",
+ "@angular/compiler-cli": "7.0.0",
+ "@ngtools/webpack": "7.0.2",
<%_ if (protractorTests) { _%>
"@types/chai": "4.1.4",
"@types/chai-string": "1.4.1",
<%_ } _%>
- "@types/jest": "22.2.3",
+ "@types/jest": "23.3.5",
<%_ if (protractorTests) { _%>
"@types/mocha": "5.2.5",
<%_ } _%>
"chai-as-promised": "7.1.1",
"chai-string": "1.5.0",
<%_ } _%>
- "codelyzer": "4.2.1",
+ "codelyzer": "4.5.0",
"copy-webpack-plugin": "4.5.1",
"css-loader": "0.28.10",
"exports-loader": "0.7.0",
"file-loader": "1.1.11",
- "fork-ts-checker-webpack-plugin": "0.4.1",
+ "fork-ts-checker-webpack-plugin": "0.4.10",
"friendly-errors-webpack-plugin": "1.7.0",
"generator-jhipster": "<%= packagejs.version %>",
"html-loader": "0.5.5",
<%_ if(!skipCommitHook) { _%>
"husky": "1.1.0",
<%_ } _%>
- "jest": "22.4.3",
+ "jest": "23.6.0",
"jest-junit": "5.1.0",
- "jest-preset-angular": "5.2.2",
+ "jest-preset-angular": "6.0.1",
"jest-sonar-reporter": "2.0.0",
<%_ if(!skipCommitHook) { _%>
"lint-staged": "7.3.0",
"tslint": "5.11.0",
"tslint-config-prettier": "1.9.0",
"tslint-loader": "3.6.0",
- "typescript": "3.0.1",
+ "typescript": "3.1.3",
<%_ if (useSass) { _%>
"sass": "1.13.0",
"sass-loader": "7.1.0",
| 4 |
diff --git a/token-metadata/0x27E627d032593fE2A8EbBB30f3B1264B3b51a707/metadata.json b/token-metadata/0x27E627d032593fE2A8EbBB30f3B1264B3b51a707/metadata.json "symbol": "PTC",
"address": "0x27E627d032593fE2A8EbBB30f3B1264B3b51a707",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/AKSe-on-AzStackHub/README.md b/AKSe-on-AzStackHub/README.md @@ -312,16 +312,18 @@ Secrets/credentials should never be stored in plaintext in your application code
**Patch and Update**
-The **Patch and Update (PNU)** process in Azure Kubernetes Service (in Azure) is partially automated, security updates are automatically applied to Linux nodes. These updates include OS security fixes or kernel updates. AKS doesn't automatically reboot these Linux nodes to complete the update process.
+The **Patch and Update (PNU)** process in Azure Kubernetes Service (in Azure) is partially automated, Kubernetes version upgrades are triggered manually while security updates are applied automatically. These updates can include OS security fixes or kernel updates. AKS does not automatically reboot these Linux nodes to complete the update process.
-On a Kubernetes Cluster deployed by AKS Engine on Azure Stack Hub is the PNU process unmanaged and the responsibility of the cluster operator. AKS Engine helps with the two most important tasks:
+On a Kubernetes Cluster deployed using AKS Engine on Azure Stack Hub is the PNU process unmanaged and the responsibility of the cluster operator.
+
+AKS Engine helps with the two most important tasks:
- [Upgrade to a newer Kubernetes and base OS image version](https://docs.microsoft.com/azure-stack/user/azure-stack-kubernetes-aks-engine-upgrade#steps-to-upgrade-to-a-newer-kubernetes-version)
- [Upgrade the base OS image only](https://docs.microsoft.com/azure-stack/user/azure-stack-kubernetes-aks-engine-upgrade#steps-to-only-upgrade-the-os-image)
-Newer base OS images contain the latest OS security fixes and kernel updates. Updates that were released between two OS image versions or before a newer base OS image version is available in the Azure Stack Hub Marketplace are automatically installed using Debian's (the foundation Ubuntu, which is the Linux distro that is used for the Kubernetes cluster nodes, is build on top of) [Unattended Upgrade](https://wiki.debian.org/UnattendedUpgrades) mechanism to automatically apply the latest security (and other) updates automatically.
+Newer base OS images contain the latest OS security fixes and kernel updates.
-The _Unattended Upgrade_ mechanism does not automatically reboot cluster nodes. This can be done automatically using the open-source [kured (KUbernetes REboot Daemon)](https://docs.microsoft.com/en-us/azure/aks/node-updates-kured) that watches for Linux nodes that require a reboot, then automatically handle the rescheduling of running pods and node reboot process.
+Security updates that are released before a new base OS image version is available in the Azure Stack Hub Marketplace are automatically installed using the [Unattended Upgrade](https://wiki.debian.org/UnattendedUpgrades) mechanism. The _Unattended Upgrade_ mechanism is enabled by default and installs security updates automatically, but does not reboot the Kubernetes cluster nodes. Rebooting the nodes can be automated using the open-source [**K**Ubernetes **RE**boot **D**aemon (kured))](https://docs.microsoft.com/en-us/azure/aks/node-updates-kured) that watches for Linux nodes that require a reboot, then automatically handle the rescheduling of running pods and node reboot process.
## Deployment (CI/CD) considerations
| 7 |
diff --git a/tasks/stats.js b/tasks/stats.js @@ -7,6 +7,10 @@ var prettySize = require('prettysize');
var common = require('./util/common');
var constants = require('./util/constants');
var pkgVersion = require('../package.json').version;
+var majorVersion = pkgVersion.split('.')[0];
+var theLatest = 'latest' + (
+ (majorVersion === '1') ? '' : ('-v' + majorVersion)
+);
var pathDistREADME = path.join(constants.pathToDist, 'README.md');
var cdnRoot = 'https://cdn.plot.ly/plotly-';
@@ -74,7 +78,7 @@ function getInfoContent() {
'Plotly.js defaults to US English (en-US) and includes British English (en) in the standard bundle.',
'Many other localizations are available - here is an example using Swiss-German (de-CH),',
'see the contents of this directory for the full list.',
- 'They are also available on our CDN as ' + cdnRoot + 'locale-de-ch-' + 'latest' + '.js OR ' + cdnRoot + 'locale-de-ch-' + pkgVersion + '.js',
+ 'They are also available on our CDN as ' + cdnRoot + 'locale-de-ch-' + theLatest + '.js OR ' + cdnRoot + 'locale-de-ch-' + pkgVersion + '.js',
'Note that the file names are all lowercase, even though the region is uppercase when you apply a locale.',
'',
'*After* the plotly.js script tag, add:',
@@ -109,12 +113,12 @@ function getMainBundleInfo() {
'',
'It be can imported as minified javascript',
'- using dist file `dist/plotly.min.js`',
- '- using CDN URL ' + cdnRoot + 'latest' + MINJS + ' OR ' + cdnRoot + pkgVersion + MINJS,
+ '- using CDN URL ' + cdnRoot + theLatest + MINJS + ' OR ' + cdnRoot + pkgVersion + MINJS,
'',
'or as raw javascript:',
'- using the `plotly.js-dist` npm package (starting in `v1.39.0`)',
'- using dist file `dist/plotly.js`',
- '- using CDN URL ' + cdnRoot + 'latest' + JS + ' OR ' + cdnRoot + pkgVersion + JS,
+ '- using CDN URL ' + cdnRoot + theLatest + JS + ' OR ' + cdnRoot + pkgVersion + JS,
'- using CommonJS with `require(\'plotly.js\')`',
'',
'If you would like to have access to the attribute meta information ' +
@@ -185,8 +189,8 @@ function makeBundleInfo(pathObj) {
'',
'| Flavor | URL |',
'| ------ | --- |',
- '| Latest | ' + cdnRoot + name + '-' + 'latest' + JS + ' |',
- '| Latest minified | ' + cdnRoot + name + '-' + 'latest' + MINJS + ' |',
+ '| Latest | ' + cdnRoot + name + '-' + theLatest + JS + ' |',
+ '| Latest minified | ' + cdnRoot + name + '-' + theLatest + MINJS + ' |',
'| Tagged | ' + cdnRoot + name + '-' + pkgVersion + JS + ' |',
'| Tagged minified | ' + cdnRoot + name + '-' + pkgVersion + MINJS + ' |',
'',
| 0 |
diff --git a/src/screens/ParadeMapScreen/Map.js b/src/screens/ParadeMapScreen/Map.js @@ -23,7 +23,7 @@ import locationButtonActive from "../../../assets/images/location-active.png";
type PermissionStatus = "authorized" | "denied" | "restricted" | "undetermined";
const neverAskStatuses = Platform.select({
- android: new Set(),
+ android: new Set(["restricted"]),
ios: new Set(["denied", "restricted"])
});
| 13 |
diff --git a/src/Services/Air/transformers/convert-passengers-object-to-array.js b/src/Services/Air/transformers/convert-passengers-object-to-array.js @@ -7,7 +7,7 @@ module.exports = (params) => {
for (let i = 0; i < number; i += 1) {
list.push({
ageCategory,
- isChild: (ageCategory === 'CNN'), // quickfix
+ child: (ageCategory === 'CNN'), // quickfix
});
}
}
| 13 |
diff --git a/app/src/config.ts b/app/src/config.ts @@ -57,6 +57,7 @@ const configSchema = convict({
'internet explorer' : '>12',
'microsoft edge' : '>18'
},
+ 'microsoft edge' : '>=74',
'safari' : '>12',
'firefox' : '>=60',
'chrome' : '>=74',
| 9 |
diff --git a/token-metadata/0xF8F237D074F637D777bcD2A4712bde793f94272B/metadata.json b/token-metadata/0xF8F237D074F637D777bcD2A4712bde793f94272B/metadata.json "symbol": "ERC223",
"address": "0xF8F237D074F637D777bcD2A4712bde793f94272B",
"decimals": 10,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/util.js b/src/util.js @@ -376,8 +376,10 @@ var _ = $.extend(Mavo, {
when: element => {
var observer = _.inView.observer = _.inView.observer || new IntersectionObserver(function(entries, observer) {
entries.forEach(entry => {
+ if (entry.intersectionRatio > 0) {
observer.unobserve(entry.target);
$.fire(entry.target, "mv-inview", {entry});
+ }
});
});
| 1 |
diff --git a/web/components/modals/CreateFlag.js b/web/components/modals/CreateFlag.js @@ -58,7 +58,7 @@ const TheComponent = class extends Component {
type="text"
title={"Value (optional)" + (!isEdit ? "- these can be set later per environment" : "")}
placeholder="e.g. 'big' "/>
- {initial_value || initial_value === false && (
+ {(initial_value || initial_value === false) && (
<FormGroup className={"flag-example"}>
<strong>Example response:</strong>
<Highlight className={"json no-pad"}>
| 9 |
diff --git a/pages/tutorials/ASP.NET Core.md b/pages/tutorials/ASP.NET Core.md # Setup
+> Note! Updates for Visual Studio 2017 and the latest version of ASP.NET coming soon!
+
## Install ASP.NET Core and TypeScript
First, [install ASP.NET Core](https://get.asp.net) if you need it.
-This quick-start guide uses Visual Studio, which means that you'll need Visual Studio 2015 or [Visual Studio 2017](https://www.visualstudio.com/downloads/) in order to use ASP.NET Core.
+This quick-start guide uses Visual Studio, which means that you'll need Visual Studio 2015 in order to use ASP.NET Core.
Next, if your version of Visual Studio does not already have the latest TypeScript, you can [install it](http://www.microsoft.com/en-us/download/details.aspx?id=48593).
| 3 |
diff --git a/src/utils/order.js b/src/utils/order.js export const ORDER_STATUS_STEP_MAP = {
- QUOTE: 1,
- SECRET_READY: 1,
+ QUOTE: 0,
+ SECRET_READY: 0,
INITIATED: 1,
- INITIATION_REPORTED: 2,
- WAITING_FOR_CONFIRMATIONS: 3,
- READY_TO_CLAIM: 3,
- WAITING_FOR_CLAIM_CONFIRMATIONS: 3,
- GET_REFUND: 3,
- WAITING_FOR_REFUND_CONFIRMATIONS: 3,
- READY_TO_SEND: 4
+ INITIATION_REPORTED: 1,
+ WAITING_FOR_CONFIRMATIONS: 1,
+ READY_TO_CLAIM: 2,
+ WAITING_FOR_CLAIM_CONFIRMATIONS: 2,
+ GET_REFUND: 2,
+ WAITING_FOR_REFUND_CONFIRMATIONS: 2,
+ REFUNDED: 3,
+ SUCCESS: 3,
+ READY_TO_SEND: 3
}
export const ORDER_STATUS_LABEL_MAP = {
| 3 |
diff --git a/test/filters/filter.spec.js b/test/filters/filter.spec.js @@ -159,4 +159,20 @@ describe('Directive: pfFilter', function () {
expect(activeFilters.length).toBe(0);
expect(clearButtons.length).toBe(0);
});
-})
+
+ it('should not show selected results when selectedCount and totalCount are undefined', function() {
+ $scope.filterConfig.selectedCount = undefined;
+ $scope.filterConfig.totalCount = undefined;
+ $scope.$digest();
+
+ expect(element.find('.pf-table-view-selected-label').length).toBe(0);
+ });
+
+ it('should show selected results and totalCount are defined', function() {
+ $scope.filterConfig.selectedCount = 0;
+ $scope.filterConfig.totalCount = 10;
+ $scope.$digest();
+
+ expect(element.find('.pf-table-view-selected-label').text()).toContain('0 of 10 selected');
+ });
+});
| 0 |
diff --git a/test/cli/import-jdl.spec.js b/test/cli/import-jdl.spec.js @@ -314,14 +314,13 @@ describe('JHipster generator import jdl', () => {
describe('imports single app and entities passed with --inline', () => {
beforeEach(done => {
testInTempDir(dir => {
- shelljs.rm(`${dir}/.yo-rc.json`);
importJdl(
[],
{
skipInstall: true,
noInsight: true,
'skip-git': false,
- inline: 'application { config { baseName jhapp }} entity Customer'
+ inline: 'application { config { baseName jhapp } entities * } entity Customer'
},
env,
mockFork(done, 1)
@@ -342,6 +341,17 @@ describe('JHipster generator import jdl', () => {
'--skip-install',
'--no-insight',
'--no-skip-git',
+ '--inline',
+ 'application',
+ '{',
+ 'config',
+ 'baseName',
+ 'jhapp',
+ '}',
+ 'entities',
+ '*',
+ 'entity',
+ 'Customer',
'--with-entities',
'--force',
'--from-cli'
| 3 |
diff --git a/src/view/compile-js-source.js b/src/view/compile-js-source.js @@ -808,7 +808,7 @@ var stringifier = {
}
};
-var COMPONENT_RESERVED_MEMBERS = splitStr2Obj('computed,filters,components,'
+var COMPONENT_RESERVED_MEMBERS = splitStr2Obj('aNode,computed,filters,components,'
+ 'initData,template,attached,created,detached,disposed,compiled'
);
| 8 |
diff --git a/userscript.user.js b/userscript.user.js @@ -41348,12 +41348,16 @@ var $$IMU_EXPORT$$;
if (desc) {
sources[src].desc = desc;
- // TODO: improve
- if (desc.match(/^ *[0-9]*[whx] *$/)) {
- var desc_x = parseInt(desc.replace(/^ *([0-9]*)[whx] *$/, "$1"));
- if (!sources[src].desc_x || sources[src].desc_x > desc_x) {
- sources[src].desc_x = desc_x;
- }
+ var whxmatch = desc.match(/^ *([0-9.]+)([whx]) *$/);
+ if (whxmatch) {
+ var number = parseFloat(whxmatch[1]);
+
+ if (whxmatch[2] === "w" && !sources[src].width)
+ sources[src].width = number;
+ else if (whxmatch[2] === "h" && !sources[src].height)
+ sources[src].height = number;
+ else if (whxmatch[2] === "x" && !sources[src].desc_x)
+ sources[src].desc_x = number;
}
}
| 7 |
diff --git a/tests/e2e/specs/Tasks.spec.js b/tests/e2e/specs/Tasks.spec.js @@ -125,17 +125,4 @@ describe('Tasks', () => {
typeIntoTextInput('[name=name]', testString);
cy.get('[name=name]').should('have.value', testString);
});
-
- it('sets and retains task assignment value after re-highlighting node', () => {
- const userAssignment = '1234';
- dragFromSourceToDest(nodeTypes.task, taskPosition);
- cy.contains('Assignment Rules').click();
- typeIntoTextInput('input[name="taskAssignment"]', userAssignment);
-
- cy.get('.paper-container').click();
-
- getElementAtPosition(taskPosition).click();
- cy.contains('Assignment Rules').click();
- cy.get('input[name="taskAssignment"]').should('have.value', userAssignment);
- });
});
| 2 |
diff --git a/js/Helpers/DisplaySelector.js b/js/Helpers/DisplaySelector.js @@ -6,7 +6,7 @@ function getAlgs(caseid, cb){
function DisplaySelector(viewer1, viewer2, imgs, getAlgs, annotools1, annotools2){
// viewer 1 is l or base, viewer2 is r or spyglass; annotools follows same
- // imgs is a dict structued as name:open obj
+ // imgs is a dict structued as name:open obj, or null to use only loaded img
// get alg should return a list of algorithms; args (caseid, callback)
// if returns null, ok
@@ -52,15 +52,16 @@ function DisplaySelector(viewer1, viewer2, imgs, getAlgs, annotools1, annotools2
}
if (!imgs){
+ var current_case_id = window.location.search.replace("?","").split("=")[1];
document.getElementById("DS-LI").style.display = "none";
document.getElementById("DS-RI").style.display = "none";
viewer2.open(_viewer_source);
addOption('DS-LA', "", "None");
- getAlgs(imgs, function(algs){
+ getAlgs(current_case_id, function(algs){
algs.forEach((k)=>addOption("DS-LA", algs[k], algs[k]));
});
addOption('DS-RA', "", "None");
- getAlgs(imgs, function(algs){
+ getAlgs(current_case_id, function(algs){
algs.forEach((k)=>addOption("DS-RA", algs[k], algs[k]));
});
} else {
| 4 |
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml @@ -16,7 +16,8 @@ jobs:
- name: Check if CookieMonster.js is built correctly
run: |
npm install
- npx terser ./src/Header.js ./src/Cache.js ./src/Config.js ./src/Data.js ./src/Disp.js ./src/Main.js ./src/Sim.js ./src/Footer.js -o CookieMonsterTest.js
+ npx webpack
+ npx terser ./dist/Header.js ./dist/Cache.js ./dist/Config.js ./dist/Data.js ./dist/Disp.js ./dist/Main.js ./dist/Sim.js ./dist/Footer.js -o CookieMonsterTest.js
if cmp CookieMonster.js CookieMonsterTest.js; then
echo '### SUCCESS: CookieMonster is correctly built! ###'
else
| 3 |
diff --git a/src/js/base/summernote-en-US.js b/src/js/base/summernote-en-US.js @@ -104,7 +104,7 @@ $.extend($.summernote.lang, {
recent: 'Recent Color',
more: 'More Color',
background: 'Background Color',
- foreground: 'Foreground Color',
+ foreground: 'Text Color',
transparent: 'Transparent',
setTransparent: 'Set transparent',
reset: 'Reset',
| 10 |
diff --git a/modules/@apostrophecms/rich-text-widget/index.js b/modules/@apostrophecms/rich-text-widget/index.js @@ -44,7 +44,78 @@ module.exports = {
}
]
},
- defaultOptions: {}
+ defaultOptions: {},
+ components: {
+ widgetEditor: 'AposRichTextWidgetEditor',
+ widget: 'AposRichTextWidget'
+ },
+ editorTools: {
+ styles: {
+ component: 'AposTiptapStyles',
+ label: 'Styles'
+ },
+ '|': { component: 'AposTiptapDivider' },
+ bold: {
+ component: 'AposTiptapButton',
+ label: 'Bold',
+ icon: 'format-bold-icon'
+ },
+ italic: {
+ component: 'AposTiptapButton',
+ label: 'Italic',
+ icon: 'format-italic-icon'
+ },
+ underline: {
+ component: 'AposTiptapButton',
+ label: 'Underline',
+ icon: 'format-underline-icon'
+ },
+ horizontal_rule: {
+ component: 'AposTiptapButton',
+ label: 'Horizontal Rule',
+ icon: 'minus-icon'
+ },
+ link: {
+ component: 'AposTiptapLink',
+ label: 'Link',
+ icon: 'link-icon'
+ },
+ bullet_list: {
+ component: 'AposTiptapButton',
+ label: 'Bulleted List',
+ icon: 'format-list-bulleted-icon'
+ },
+ ordered_list: {
+ component: 'AposTiptapButton',
+ label: 'Ordered List',
+ icon: 'format-list-numbered-icon'
+ },
+ strike: {
+ component: 'AposTiptapButton',
+ label: 'Strike',
+ icon: 'format-strikethrough-variant-icon'
+ },
+ blockquote: {
+ component: 'AposTiptapButton',
+ label: 'Blockquote',
+ icon: 'format-quote-close-icon'
+ },
+ code_block: {
+ component: 'AposTiptapButton',
+ label: 'Code Block',
+ icon: 'code-tags-icon'
+ },
+ undo: {
+ component: 'AposTiptapButton',
+ label: 'Undo',
+ icon: 'undo-icon'
+ },
+ redo: {
+ component: 'AposTiptapButton',
+ label: 'Redo',
+ icon: 'redo-icon'
+ }
+ }
},
beforeSuperClass(self, options) {
options.defaultOptions = {
@@ -252,83 +323,10 @@ module.exports = {
getBrowserData(_super, req) {
const initialData = _super(req);
- const rteData = {
- components: {
- widgetEditor: 'AposRichTextWidgetEditor',
- widget: 'AposRichTextWidget'
- },
- tools: {
- styles: {
- component: 'AposTiptapStyles',
- label: 'Styles'
- },
- '|': { component: 'AposTiptapDivider' },
- bold: {
- component: 'AposTiptapButton',
- label: 'Bold',
- icon: 'format-bold-icon'
- },
- italic: {
- component: 'AposTiptapButton',
- label: 'Italic',
- icon: 'format-italic-icon'
- },
- underline: {
- component: 'AposTiptapButton',
- label: 'Underline',
- icon: 'format-underline-icon'
- },
- horizontal_rule: {
- component: 'AposTiptapButton',
- label: 'Horizontal Rule',
- icon: 'minus-icon'
- },
- link: {
- component: 'AposTiptapLink',
- label: 'Link',
- icon: 'link-icon'
- },
- bullet_list: {
- component: 'AposTiptapButton',
- label: 'Bulleted List',
- icon: 'format-list-bulleted-icon'
- },
- ordered_list: {
- component: 'AposTiptapButton',
- label: 'Ordered List',
- icon: 'format-list-numbered-icon'
- },
- strike: {
- component: 'AposTiptapButton',
- label: 'Strike',
- icon: 'format-strikethrough-variant-icon'
- },
- blockquote: {
- component: 'AposTiptapButton',
- label: 'Blockquote',
- icon: 'format-quote-close-icon'
- },
- code_block: {
- component: 'AposTiptapButton',
- label: 'Code Block',
- icon: 'code-tags-icon'
- },
- undo: {
- component: 'AposTiptapButton',
- label: 'Undo',
- icon: 'undo-icon'
- },
- redo: {
- component: 'AposTiptapButton',
- label: 'Redo',
- icon: 'redo-icon'
- }
- }
- };
-
const finalData = {
...initialData,
- ...rteData,
+ components: options.components,
+ tools: options.editorTools,
defaultOptions: options.defaultOptions
};
return finalData;
| 5 |
diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/Autopilot/WT_VnavAutopilot.js b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/Autopilot/WT_VnavAutopilot.js @@ -627,7 +627,7 @@ class WT_VerticalAutopilot {
if (this.altSlot !== AltitudeSlot.SELECTED) {
this.setAltitudeAndSlot(AltitudeSlot.SELECTED);
}
- if (this._navModeSelector.isAltitudeLocked) {
+ if (this._navModeSelector.isAltitudeLocked && this.indicatedAltitude < this.targetAltitude + 1000) {
console.log("setting PathInterceptStatus.LEVELING because of alt select");
this.setAltitudeAndSlot(AltitudeSlot.SELECTED, this.targetAltitude);
this._pathInterceptStatus = PathInterceptStatus.LEVELING;
| 1 |
diff --git a/backend/lib/endpoints/schema/organizations.js b/backend/lib/endpoints/schema/organizations.js @@ -4,7 +4,7 @@ const { locationSchema } = require("./location");
const organization = {
about: S.string(),
- email: S.string(),
+ email: S.string().format("email"),
global: S.boolean(),
industry: S.string(),
language: S.string(),
| 12 |
diff --git a/Dockerfile b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /usr/src/app
COPY package*.json ./
COPY src ./src
COPY public ./public
-COPY migrations_old ./migrations
+COPY migrations_old ./migrations_old
COPY migrate-mongo-config.js .
RUN apk add --update alpine-sdk
| 10 |
diff --git a/.travis.yml b/.travis.yml @@ -12,9 +12,11 @@ before_install:
- gem update --system
- gem --version
+
before_script:
- chmod +x ./script/cibuild
- chmod +x ./script/gh_pages_push
+ - git config merge.renameLimit 999999
script: ./script/cibuild
| 0 |
diff --git a/packages/crypto-wallet-core/tests/validation.ts b/packages/crypto-wallet-core/tests/validation.ts @@ -2,25 +2,43 @@ import { expect } from 'chai';
import { Validation } from '../src';
describe('Address Validation', () => {
+ // BTC
const btcAddress = '1NuKwkDtCymgA1FNLUBaUWLD8s4kdKWvgn';
+ const btcTestAddress = 'mkUNMewkQsHKRcUvv5HLKbqmepCqNH8goc';
+
+ // BCH
const bchAddress = 'qr8uujscckc56ancdkmqnyyl2rx6pnp24gmdfrf8qd';
+ const bchLegacyAddress = '1Kwmzx8V9waJLmaYov5ia4C6Ngdo52qA53';
+ const bchTestLegacyAddress = 'mms6yCDGo3fDdapguTSMtCyF9XGfWJpD6H';
+
+ // ETH
const ethAddress = '0x37d7B3bBD88EFdE6a93cF74D2F5b0385D3E3B08A';
+ // Uri
const btcUri = 'bitcoin:1NuKwkDtCymgA1FNLUBaUWLD8s4kdKWvgn';
const bchUri = 'bitcoincash:qr8uujscckc56ancdkmqnyyl2rx6pnp24gmdfrf8qd';
+ const btcTestUri = 'bitcoin:mkUNMewkQsHKRcUvv5HLKbqmepCqNH8goc';
+ const bchTestUri = 'bchtest:qpz6q59cu5gtn27z92c5f9vrrvm8yf5spc77xxm22l';
+ // Invalid
const invalidBtcAddress = '1NuKwkDtCymgA1FNLUBaUWLD8s4kKWvgn';
const invalidBchAddress = 'r8uujscckc56ancdkmqnyyl2rx6pnp24gmdfrf8qd';
const invalidEthAddress = '37d7B3bBD88EFdE6a93cF74D2F5b0385D3E3B08A';
it('should be able to validate an BTC address', async () => {
const isValidAddress = await Validation.validateAddress('BTC', 'mainnet', btcAddress);
+ const isValidTestAddress = await Validation.validateAddress('BTC', 'testnet', btcTestAddress);
expect(isValidAddress).to.equal(true);
+ expect(isValidTestAddress).to.equal(true);
});
it('should be able to validate an BCH address', async () => {
const isValidAddress = await Validation.validateAddress('BCH', 'mainnet', bchAddress);
+ const isValidLegacyAddress = await Validation.validateAddress('BCH', 'mainnet', bchLegacyAddress);
+ const isValidTestLegacyAddress = await Validation.validateAddress('BCH', 'testnet', bchTestLegacyAddress);
expect(isValidAddress).to.equal(true);
+ expect(isValidLegacyAddress).to.equal(true);
+ expect(isValidTestLegacyAddress).to.equal(true);
});
it('should be able to validate an ETH address', async () => {
@@ -30,12 +48,16 @@ describe('Address Validation', () => {
it('should be able to validate an BTC Uri', async () => {
const isValidUri = await Validation.validateAddress('BTC', 'mainnet', btcUri);
+ const isValidTestUri = await Validation.validateAddress('BTC', 'testnet', btcTestUri);
expect(isValidUri).to.equal(true);
+ expect(isValidTestUri).to.equal(true);
});
it('should be able to validate an BCH Uri', async () => {
const isValidUri = await Validation.validateAddress('BCH', 'mainnet', bchUri);
+ const isValidTestUri = await Validation.validateAddress('BCH', 'testnet', bchTestUri);
expect(isValidUri).to.equal(true);
+ expect(isValidTestUri).to.equal(true);
});
it('should be able to invalidate an incorrect BTC address', async () => {
@@ -50,6 +72,8 @@ describe('Address Validation', () => {
it('should be able to invalidate an incorrect ETH address', async () => {
const inValidAddress = await Validation.validateAddress('ETH', 'mainnet', invalidEthAddress);
+ const inValidTestAddress = await Validation.validateAddress('ETH', 'testnet', ethAddress);
expect(inValidAddress).to.equal(true);
+ expect(inValidTestAddress).to.equal(true);
});
});
| 3 |
diff --git a/src/inertia.js b/src/inertia.js @@ -108,7 +108,10 @@ export default {
},
setState(page, replace = false) {
- replace = replace || page.url === window.location.pathname + window.location.search
+ replace = replace
+ || page.url === window.location.href
+ || (window.location.pathname === '/' && page.url === window.location.href.replace(/\/$/, ''))
+
window.history[replace ? 'replaceState' : 'pushState'](page, '', page.url)
},
| 1 |
diff --git a/infra/testing/server/templates/sw-clients-claim.js.njk b/infra/testing/server/templates/sw-clients-claim.js.njk // {{ version }}
addEventListener('install', (event) => event.waitUntil(skipWaiting()));
-addEventListener('activate', (event) => event.waitUntil(clients.claim()));
+addEventListener('activate', (event) => event.waitUntil(
+ clients.claim().catch((error) => console.error(error)));
| 8 |
diff --git a/assets/sass/components/user-input/googlesitekit-user-input-controls.scss b/assets/sass/components/user-input/googlesitekit-user-input-controls.scss padding: 3px 0;
}
- .mdc-text-field {
- background-color: transparent;
- height: 36px;
- margin: 0 1rem;
- max-width: 250px;
- width: calc(100% - 2rem);
-
- input {
- border: none;
- padding: 0;
-
- &:placeholder-shown {
- text-overflow: ellipsis;
- }
- }
- }
-
label {
color: $c-surfaces-on-background;
font-size: $fs-body-md;
padding: 10px 0;
}
}
-
- .mdc-text-field--disabled,
- .mdc-checkbox--disabled,
- .mdc-checkbox--disabled + label {
- opacity: 0.25;
- }
- }
-
- .googlesitekit-user-input__select-option-text-field {
- flex: 1;
-
- .mdc-text-field--error .mdc-line-ripple--active {
- background-color: $c-black;
- opacity: 1;
- }
}
.googlesitekit-user-input__select-option:not(:last-child) {
| 2 |
diff --git a/_data/conferences.yml b/_data/conferences.yml year: 2019
id: naacl19
link: http://naacl2019.org/
- deadline: "2018-12-03 23:59:59"
+ deadline: "2018-12-10 23:59:59"
timezone: Etc/GMT+12
date: June 2-7, 2019
place: Minneapolis, USA
| 3 |
diff --git a/sirepo/package_data/static/json/srw-schema.json b/sirepo/package_data/static/json/srw-schema.json }
},
"view": {
+ "arbitraryMagField": {
+ "title": "Arbitrary Magnetic Field",
+ "basic": [],
+ "advanced": [
+ "longitudinalPosition",
+ "magneticFile",
+ "interpolationOrder"
+ ]
+ },
"aperture": {
"title": "Aperture",
"basic": [],
},
"gaussianBeam": {
"title": "Coherent Gaussian Beam",
- "basic": [
+ "basic": [],
+ "advanced": [
"photonEnergy",
"energyPerPulse",
"polarization",
"waistAngleY"
]]
]
- ],
- "advanced": []
+ ]
},
"grating": {
"title": "Grating",
},
"undulator": {
"title": "Idealized Undulator",
- "basic": [
+ "basic": [],
+ "advanced": [
"period",
"length",
"longitudinalPosition",
"verticalSymmetry"
]]
]
- ],
- "advanced": []
- },
- "arbitraryMagField": {
- "title": "Arbitrary Magnetic Field",
- "basic": [
- "longitudinalPosition",
- "magneticFile",
- "interpolationOrder"
- ],
- "advanced": []
+ ]
},
"watch": {
"title": "Watchpoint",
| 5 |
diff --git a/accessibility-checker-extension/src/ts/devtools/ReportRow.tsx b/accessibility-checker-extension/src/ts/devtools/ReportRow.tsx import React, { RefObject } from "react";
-import ReactTooltip from "react-tooltip";
+// import ReactTooltip from "react-tooltip";
import { IReportItem, valueMap, ICheckpoint, IReport} from "./Report";
@@ -190,15 +190,16 @@ export default class ReportRow extends React.Component<IReportRowProps, IReportR
return <React.Fragment>
{!this.props.focusedViewFilter || (focusedView && (item.selected || item.selectedChild)) ?
(this.props.dataFromParent[0] || this.props.dataFromParent[1] && val === "Violation" || this.props.dataFromParent[2] && val === "Needs review" || this.props.dataFromParent[3] && val === "Recommendation") ?
+ // (<div data-tip data-for={item.selected ? "selectedTip" : "selectedChildTip" } tabIndex={0} role="row" style={{cursor:'pointer'}} aria-rowindex={++rowindex} aria-selected={!!item.selected} className={"bx--row itemDetail"+(item.selected ? " selected": "")+(item.selectedChild ? " selectedChild": "")} onClick={this.props.selectItem.bind(this, item, this.props.group.checkpoint)} onKeyDown={this.onKeyDown.bind(this)}>
(<div data-tip data-for={item.selected ? "selectedTip" : "selectedChildTip" } tabIndex={0} role="row" style={{cursor:'pointer'}} aria-rowindex={++rowindex} aria-selected={!!item.selected} className={"bx--row itemDetail"+(item.selected ? " selected": "")+(item.selectedChild ? " selectedChild": "")} onClick={this.props.selectItem.bind(this, item, this.props.group.checkpoint)} onKeyDown={this.onKeyDown.bind(this)}>
- {focusedView && item.selected ?
+ {/* {focusedView && item.selected ?
<ReactTooltip id="selectedTip" place="top" effect="solid">
Parent element issue
</ReactTooltip> : ""}
{focusedView && item.selectedChild ?
<ReactTooltip id="selectedChildTip" place="top" effect="solid">
Child element issue
- </ReactTooltip> : ""}
+ </ReactTooltip> : ""} */}
<div role="cell" className="bx--col-sm-1"> </div>
<div role="cell" className="bx--col-sm-3">
<div className="itemMessage">
| 2 |
diff --git a/src/interpreter/runtime/castIntoStackLocalOfType.js b/src/interpreter/runtime/castIntoStackLocalOfType.js @@ -15,12 +15,20 @@ export function castIntoStackLocalOfType(
const castFn = {
i32: i32.createValueFromAST,
i64: i64.createValueFromAST,
- f32: inf
- ? f32.createInfFromAST
- : nan ? f32.createNanFromAST : f32.createValueFromAST,
- f64: inf ? f64.createInfFromAST : f64.createValueFromAST
+ f32: f32.createValueFromAST,
+ f64: f64.createValueFromAST
};
+ if (nan) {
+ castFn.f32 = f32.createNanFromAST;
+ castFn.f64 = f64.createNanFromAST;
+ }
+
+ if (inf) {
+ castFn.f32 = f32.createInfFromAST;
+ castFn.f64 = f64.createInfFromAST;
+ }
+
if (typeof castFn[type] === "undefined") {
throw new RuntimeError("Cannot cast: unsupported type " + type);
}
| 14 |
diff --git a/scripts/ci/ie_setup.bat b/scripts/ci/ie_setup.bat @@ -49,7 +49,7 @@ REG ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Se
@echo off
setlocal
-set "URL=https://raw.githubusercontent.com/shicks/closure-library-temp/master/CloseAdobeDialog.exe"
+set "URL=https://raw.githubusercontent.com/google/closure-library/master/scripts/ci/CloseAdobeDialog.exe"
set "SaveAs=C:\Users\Administrator\Desktop\CloseAdobeDialog.exe"
powershell "Import-Module BitsTransfer; Start-BitsTransfer '%URL%' '%SaveAs%'"
| 12 |
diff --git a/src/app/Console/Commands/Install.php b/src/app/Console/Commands/Install.php @@ -5,6 +5,7 @@ namespace Backpack\CRUD\app\Console\Commands;
use Backpack\CRUD\BackpackServiceProvider;
use Carbon\Carbon;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Process\Process;
@@ -113,7 +114,7 @@ class Install extends Command
$user = collect([
'name' => $name,
'email' => $mail,
- 'password' => bcrypt($pass),
+ 'password' => Hash::make($pass),
]);
// Merge timestamps
| 14 |
diff --git a/web/kiri/index.css b/web/kiri/index.css @@ -774,21 +774,20 @@ th, tr, td {
justify-content: center;
align-items: center;
max-width: 50%;
- background-color: rgba(230,245,255,0.8);
- border: 3px solid rgba(200,215,255,0.6);
+ background-color: rgba(255,255,255,0.5);
+ border: 3px solid var(--bg-gray);
border-radius: 5px;
}
#alert-border:hover {
- background-color: rgba(230,245,255,0.9);
- border: 3px solid rgba(200,215,255,0.95);
+ background-color: rgba(0,0,0,0.1);
}
#alert-text {
display: flex;
- flex-direction: column;
text-align: left;
font-weight: bold;
+ flex-direction: column;
+ margin: 3px 5px 3px 5px;
color: black;
- margin: 5px;
}
#alert-text p {
margin: 5px;
| 3 |
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js @@ -221,11 +221,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
});
this.set("optimization.splitChunks.minChunks", 1);
this.set("optimization.splitChunks.maxAsyncRequests", "make", options => {
- return isProductionLikeMode(options) ? 5 : Infinity;
+ return isProductionLikeMode(options) ? 6 : Infinity;
});
this.set("optimization.splitChunks.automaticNameDelimiter", "~");
this.set("optimization.splitChunks.maxInitialRequests", "make", options => {
- return isProductionLikeMode(options) ? 3 : Infinity;
+ return isProductionLikeMode(options) ? 4 : Infinity;
});
this.set("optimization.splitChunks.name", true);
this.set("optimization.splitChunks.cacheGroups", {});
| 3 |
diff --git a/src/parsers/GmlSeeker.hx b/src/parsers/GmlSeeker.hx @@ -230,7 +230,9 @@ class GmlSeeker {
var s:String, name:String, start:Int;
var doc:GmlFuncDoc = null;
function flushDoc():Void {
- if (doc == null && main != null) {
+ if (doc != null) {
+ doc.procHasReturn(src, start, q.pos);
+ } else if (main != null) {
doc = out.docMap[main];
if (doc == null) {
doc = new GmlFuncDoc(main, main + "(", ")", [], false);
@@ -239,7 +241,7 @@ class GmlSeeker {
}
doc.fromCode(src, start, q.pos);
if (mainComp != null) mainComp.doc = doc.getAcText();
- } else doc.procHasReturn(src, start, q.pos);
+ }
doc = null;
}
function procLambdaIdent(s:GmlName, locals:GmlLocals):Void {
| 1 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -405,6 +405,7 @@ const abis = {
let currentAppRender = null;
let iframeContainer = null;
let recursion = 0;
+let wasDecapitated = false;
// const apps = [];
metaversefile.setApi({
// apps,
@@ -473,16 +474,18 @@ metaversefile.setApi({
if (recursion === 1) {
// scene.directionalLight.castShadow = false;
if (rigManager.localRig) {
- rigManager.localRig.model.visible = true;
+ wasDecapitated = rigManager.localRig.decapitated;
+ rigManager.localRig.undecapitate();
}
}
},
useAfterRender() {
recursion--;
if (recursion === 0) {
- // scene.directionalLight.castShadow = true;
- if (rigManager.localRig) {
- rigManager.localRig.model.visible = false;
+ // console.log('was decap', wasDecapitated);
+ if (rigManager.localRig && wasDecapitated) {
+ rigManager.localRig.decapitate();
+ rigManager.localRig.skeleton.update();
}
}
},
| 11 |
diff --git a/test/test.js b/test/test.js @@ -48,6 +48,50 @@ describe( 'Bounds Tree', () => {
} );
+ it( 'should respect index group invariants', () => {
+
+ const geo = new THREE.TorusBufferGeometry( 5, 5, 400, 100 );
+ const groupCount = 10;
+ const groupSize = geo.index.array.length / groupCount;
+
+ for ( let g = 0; g < groupCount; g ++ ) {
+
+ const groupStart = g * groupSize;
+ geo.addGroup( groupStart, groupSize, 0 );
+
+ }
+
+ const indicesByGroup = () => {
+
+ const result = {};
+
+ for ( let g = 0; g < geo.groups.length; g ++ ) {
+
+ result[ g ] = new Set();
+ const { start, count } = geo.groups[ g ];
+ for ( let i = start; i < start + count; i ++ ) {
+
+ result[ g ].add( geo.index.array[ i ] );
+
+ }
+
+ }
+ return result;
+
+ };
+
+ const before = indicesByGroup();
+ geo.computeBoundsTree();
+ const after = indicesByGroup();
+
+ for ( let g in before ) {
+
+ expect( before[ g ] ).toEqual( after[ g ] );
+
+ }
+
+ } );
+
} );
describe( 'Options', () => {
| 0 |
diff --git a/src/inner-slider.js b/src/inner-slider.js @@ -160,7 +160,10 @@ export class InnerSlider extends React.Component {
setTimeout(this.onWindowResized, this.props.speed)
} else {
image.onload = handler
- image.onerror = handler
+ image.onerror = () => {
+ handler()
+ this.props.onLazyLoadError && this.props.onLazyLoadError()
+ }
}
}
})
| 0 |
diff --git a/OurUmbraco.Site/config/IISRewriteMaps.config b/OurUmbraco.Site/config/IISRewriteMaps.config <add key="documentation/references/searching/examine/full-configuration" value="/documentation/Reference/Config/ExamineSettings/" />
<add key="documentation/Umbraco-Cloud/Troubleshooting/Moving-From-Courier-To-Deploy" value="/documentation/Umbraco-Cloud/Upgrades/Moving-From-Courier-To-Deploy/" />
- <add key="documentation/Umbraco-Cloud/Troubleshooting/Minor-Upgrades/" value="/documentation/Umbraco-Cloud/Upgrades/Minor-Upgrades/" />
+ <add key="documentation/Umbraco-Cloud/Troubleshooting/Minor-Upgrades" value="/documentation/Umbraco-Cloud/Upgrades/Minor-Upgrades/" />
<!-- Umbraco Cloud section -->
<add key="documentation/Umbraco-Cloud/Deployment/Migrate-Existing-Site" value="/documentation/Umbraco-Cloud/Getting-Started/Migrate-Existing-Site/" />
| 3 |
diff --git a/src/containers/tags/withNavigationTags.js b/src/containers/tags/withNavigationTags.js @@ -13,13 +13,20 @@ import navigationTagsQuery from "./navigationTags.gql";
*/
export default (Component) => (
@inject("primaryShopId")
+ @inject("tags")
@observer
class NavigationTags extends React.Component {
static propTypes = {
/**
* ShopId used to obtain tags for
*/
- primaryShopId: PropTypes.string.isRequired
+ primaryShopId: PropTypes.string.isRequired,
+ /**
+ * Object of tags available to shop
+ */
+ tags: PropTypes.shape({
+ edges: PropTypes.arrayOf(PropTypes.object).isRequired
+ })
}
@observable _data = {}
@@ -72,71 +79,10 @@ export default (Component) => (
return [];
})
- /**
- * Generates a tree from the given array of subTagIds.
- * @param {Function} fetchMore - Function used to fetch more data from a graphql endpoint
- * @param {Object} data - Data from previous query, used for recursion to fetch all tags
- * @return {undefined} no return value
- */
- fetchMoreDataIfNecessary = (fetchMore, data) => {
- const { primaryShopId } = this.props;
- const pageInfo = data && data.tags.pageInfo;
-
- if (pageInfo && pageInfo.hasNextPage) {
- fetchMore({
- variables: {
- shopId: primaryShopId,
- cursor: pageInfo.endCursor
- },
- updateQuery: (previousResult, { fetchMoreResult }) => {
- const { tags: { edges: newEdges, pageInfo: newPageInfo } } = fetchMoreResult;
-
- // Return with additional results
- if (newEdges.length) {
- // Concat the previous and next data
- let newEdgesArray = [...previousResult.tags.edges, ...newEdges];
-
- // Remove duplicates
- newEdgesArray = newEdgesArray.filter((obj, pos, arr) => (
- arr
- .map(({ node }) => node._id)
- .indexOf(obj.node._id) === pos
- ));
-
- return {
- tags: {
- __typename: previousResult.tags.__typename,
- edges: newEdgesArray,
- pageInfo: newPageInfo
- }
- };
- }
-
- // Send the previous result if the new result contains no additional data
- return previousResult;
- }
- }).catch(() => {
- /*
- Catch errors, namely `TypeError: Cannot set property 'networkStatus' of undefined` which seems to be
- an Apollo issue: https://github.com/apollographql/apollo-client/issues/2539
- */
- });
- }
- }
-
render() {
- const { primaryShopId } = this.props;
-
- return (
- <Query query={navigationTagsQuery} variables={{ shopId: primaryShopId }}>
- {({ loading, error, data, fetchMore }) => {
- if (loading || error) return null;
- if (!data || !data.tags) return null;
+ const { tags } = this.props;
- this.data = data;
-
- // Recursively more tags until we can fetch no more
- this.fetchMoreDataIfNecessary(fetchMore, data);
+ this.data = { tags };
return (
<Component
@@ -144,9 +90,6 @@ export default (Component) => (
navItems={{ edges: this.getTagTree(null, this.data) }}
/>
);
- }}
- </Query>
- );
}
}
);
| 2 |
diff --git a/website/versioned_docs/version-4.x/stack-navigator.md b/website/versioned_docs/version-4.x/stack-navigator.md @@ -263,7 +263,7 @@ const SomeStack = createStackNavigator({
### Examples
-See the examples [SimpleStack.tsx](https://github.com/react-navigation/react-navigation/blob/master/examples/NavigationPlayground/src/SimpleStack.tsx) and [ModalStack.tsx](https://github.com/react-navigation/react-navigation/blob/master/examples/NavigationPlayground/src/ModalStack.tsx) which you can run locally as part of the [NavigationPlayground](https://github.com/react-navigation/react-navigation/tree/master/examples/NavigationPlayground) app.
+See the examples [SimpleStack.tsx](https://github.com/react-navigation/react-navigation/blob/master/example/src/SimpleStack.tsx) and [ModalStack.tsx](https://github.com/react-navigation/react-navigation/blob/master/example/src/ModalStack.tsx) which you can run locally as part of the [NavigationPlayground](https://github.com/react-navigation/react-navigation/blob/master/example) app.
You can view these examples directly on your phone by visiting [our expo demo](https://exp.host/@react-navigation/NavigationPlayground).
| 1 |
diff --git a/node/lib/util/submodule_config_util.js b/node/lib/util/submodule_config_util.js @@ -443,11 +443,6 @@ exports.getConfigLines = function (name, url) {
* `name` in the config file.
*
* @async
- * @param {NodeGit.Repository} repo
- * @param {String} name
- * @param {String} url
- *
- * @async
* @param {String} repoPath
* @param {String} name
* @param {String} url
| 2 |
diff --git a/README.md b/README.md @@ -74,28 +74,31 @@ GET https://api.spacexdata.com/launches/from=2011-01-20/to=2017-05-25
Example JSON Response for a launch
```json
{
- "flight_number": 28,
- "launch_year": 2016,
- "launch_date": "2016-04-08",
- "time_utc": "20:43",
+ "flight_number": 38,
+ "launch_year": 2017,
+ "launch_date": "2017-03-30",
+ "time_utc": "22:27",
+ "time_local": "",
"rocket": "Falcon 9",
"rocket_type": "FT",
- "launch_site": "CCAFS LC-40",
- "payload_1": "SpaceX CRS-8",
+ "core_serial": "B1021",
+ "cap_serial": "",
+ "launch_site": "KSC LC39A",
+ "payload_1": "SES-10",
"payload_2": "",
- "payload_type": "Dragon 1.1",
- "payload_mass_kg": "3136",
- "payload_mass_lbs": "6914",
- "orbit": "LEO",
- "customer_1": "NASA (CRS)",
+ "payload_type": "Satelite",
+ "payload_mass_kg": "5300",
+ "payload_mass_lbs": "11700",
+ "orbit": "GTO",
+ "customer_1": "SES",
"customer_2": "",
"launch_success": "Success",
"reused": "FALSE",
"land_success": "Success",
"landing_type": "ASDS",
- "article_link": "https://en.wikipedia.org/wiki/SpaceX_CRS-8",
- "video_link": "https://www.youtube.com/watch?v=7pUAydjne5M",
- "Details": "Dragon carried over 1500 kg of supplies and delivered (stowed in its trunk) the inflatable Bigelow Expandable Activity Module (BEAM) to the ISS for two years of in-orbit tests. The rocket's first stage landed smoothly on SpaceX's autonomous spaceport drone ship 9 minutes after liftoff, making this the first ever successful landing of a rocket booster on a ship at sea as part of an orbital launch. The first stage B1021 was later also the first orbital booster to be used again, when launching SES-10 on March 30, 2017."
+ "article_link": "https://en.wikipedia.org/wiki/SES-10",
+ "video_link": "https://www.youtube.com/watch?v=xsZSXav4wI8",
+ "details": "First payload to fly on a reused first stage, B1021, previously launched with CRS-8, which also landed a second time. In what is also a first, the payload fairing remained intact after a successful splashdown achieved with thrusters and a steerable parachute."
}
```
<br></br>
| 3 |
diff --git a/src/components/general/character-select/CharacterSelect.jsx b/src/components/general/character-select/CharacterSelect.jsx @@ -139,6 +139,8 @@ export const CharacterSelect = () => {
const [ npcPlayerCache, setNpcPlayerCache ] = useState(new Map());
const [ themeSongCache, setThemeSongCache ] = useState(new Map());
const [ characterIntroCache, setCharacterIntroCache ] = useState(new Map());
+ const [ messageAudioCache, setMessageAudioCache ] = useState(new Map());
+ const [ selectAudioCache, setSelectAudioCache ] = useState(new Map());
const [ text, setText ] = useState('');
const refsMap = (() => {
@@ -181,10 +183,10 @@ export const CharacterSelect = () => {
const {avatarUrl} = targetCharacter;
let live = true;
+ let npcPlayer = null;
(async () => {
sounds.playSoundName('menuClick');
- let npcPlayer = null;
const [
_npcPlayer,
_themeSong,
@@ -228,7 +230,6 @@ export const CharacterSelect = () => {
if (!characterIntro) {
const loreAIScene = metaversefile.useLoreAIScene();
characterIntro = await loreAIScene.generateCharacterIntroPrompt(targetCharacter.name, targetCharacter.bio);
- // console.log('got character intro', response);
characterIntroCache.set(targetCharacter.avatarUrl, characterIntro);
if (!live) return;
}
@@ -245,7 +246,12 @@ export const CharacterSelect = () => {
const {message} = characterIntro;
setText(message);
- const preloadedMessage = npcPlayer.voicer.preloadMessage(message);
+ let preloadedMessage = messageAudioCache.get(targetCharacter.avatarUrl);
+ if (!preloadedMessage) {
+ preloadedMessage = npcPlayer.voicer.preloadMessage(message);
+ messageAudioCache.set(targetCharacter.avatarUrl, preloadedMessage);
+ }
+ npcPlayer.voicer.stop();
await chatManager.waitForVoiceTurn(() => {
return npcPlayer.voicer.start(preloadedMessage);
});
@@ -276,6 +282,8 @@ export const CharacterSelect = () => {
world.appManager.removeEventListener('frame', frame);
if (npcPlayer) {
npcPlayer.voicer.stop();
+ } else {
+ console.log('no stop');
}
};
}
@@ -325,7 +333,12 @@ export const CharacterSelect = () => {
const characterIntro = characterIntroCache.get(character.avatarUrl);
if (characterIntro) {
const {onselect} = characterIntro;
- const preloadedMessage = localPlayer.voicer.preloadMessage(onselect);
+
+ let preloadedMessage = selectAudioCache.get(targetCharacter.avatarUrl);
+ if (!preloadedMessage) {
+ preloadedMessage = npcPlayer.voicer.preloadMessage(onselect);
+ selectAudioCache.set(targetCharacter.avatarUrl, preloadedMessage);
+ }
npcPlayer.voicer.stop();
localPlayer.voicer.stop();
await chatManager.waitForVoiceTurn(() => {
| 0 |
diff --git a/test/schema/validate.test.js b/test/schema/validate.test.js const Enforcer = require('../../index');
const expect = require('chai').expect;
-describe.only('schema.validate', () => {
+describe('schema.validate', () => {
const definition = {
openapi: '3.0.0',
| 3 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.