code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/bump.rb b/bump.rb @@ -135,4 +135,4 @@ puts 'Committing, tagging and pushing...' `git add NEWS.md` `git commit -m "Bump to #{next_version}"` `git tag -a v#{next_version} -m "Version #{next_version}"` -`git push origin master --follow-tags` +# `git push origin master --follow-tags`
2
diff --git a/weapons-manager.js b/weapons-manager.js @@ -872,11 +872,11 @@ const _updateWeapons = () => { } }; -const cubeMesh = new THREE.Mesh(new THREE.BoxBufferGeometry(0.01, 0.01, 0.01), new THREE.MeshBasicMaterial({ +/* const cubeMesh = new THREE.Mesh(new THREE.BoxBufferGeometry(0.01, 0.01, 0.01), new THREE.MeshBasicMaterial({ color: 0xFF0000, side: THREE.DoubleSide, })); -inventoryAvatarScene.add(cubeMesh); +inventoryAvatarScene.add(cubeMesh); */ window.addEventListener('mousemove', e => { if (weaponsManager.inventoryOpen) { @@ -896,7 +896,7 @@ window.addEventListener('mousemove', e => { localRaycaster.ray.direction ) ); - cubeMesh.position.copy(targetPoint); + // cubeMesh.position.copy(targetPoint); avatarMesh.rig.inputs.hmd.position.copy(initialAvatarPosition) .add(new THREE.Vector3(mouse.x * 0.03, mouse.y * 0.1, 0));
2
diff --git a/test/functional/specs/Data Collector/C75372.js b/test/functional/specs/Data Collector/C75372.js @@ -19,7 +19,7 @@ test.meta({ }); const sendEvent = ClientFunction(() => { - const xdmDataLayer = { foo: "bar" }; + const xdmDataLayer = { device: { screenHeight: 1 } }; const nonXdmDataLayer = { baz: "quux" }; // Using a merge ID is a decent test because it's one thing we know // gets merged with the XDM object. @@ -40,6 +40,6 @@ const sendEvent = ClientFunction(() => { test("C75372 - XDM and data objects passed into event command should not be modified", async () => { await configureAlloyInstance("alloy", orgMainConfigMain); const { xdmDataLayer, nonXdmDataLayer } = await sendEvent(); - await t.expect(xdmDataLayer).eql({ foo: "bar" }); + await t.expect(xdmDataLayer).eql({ device: { screenHeight: 1 } }); await t.expect(nonXdmDataLayer).eql({ baz: "quux" }); });
2
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -67,6 +67,8 @@ import WorkspaceSettingsDrawerNavigator from './WorkspaceSettingsDrawerNavigator import spacing from '../../../styles/utilities/spacing'; import CardOverlay from '../../../components/CardOverlay'; import defaultScreenOptions from './defaultScreenOptions'; +import * as API from '../../API'; +import {setLocale} from '../../actions/App'; Onyx.connect({ key: ONYXKEYS.MY_PERSONAL_DETAILS, @@ -87,6 +89,12 @@ Onyx.connect({ }, }); +let currentPreferredLocale; +Onyx.connect({ + key: ONYXKEYS.NVP_PREFERRED_LOCALE, + callback: val => currentPreferredLocale = val || CONST.DEFAULT_LOCALE, +}); + const RootStack = createCustomModalStackNavigator(); // We want to delay the re-rendering for components(e.g. ReportActionCompose) @@ -158,7 +166,19 @@ class AuthScreens extends React.Component { // Fetch some data we need on initialization NameValuePair.get(CONST.NVP.PRIORITY_MODE, ONYXKEYS.NVP_PRIORITY_MODE, 'default'); - NameValuePair.get(CONST.NVP.PREFERRED_LOCALE, ONYXKEYS.NVP_PREFERRED_LOCALE, 'en'); + + API.Get({ + returnValueList: 'nameValuePairs', + nvpNames: ONYXKEYS.NVP_PREFERRED_LOCALE, + }).then((response) => { + const preferredLocale = response.nameValuePairs.preferredLocale || CONST.DEFAULT_LOCALE; + if (currentPreferredLocale !== CONST.DEFAULT_LOCALE && preferredLocale !== currentPreferredLocale) { + setLocale(currentPreferredLocale); + } else { + Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale); + } + }); + PersonalDetails.fetchPersonalDetails(); User.getUserDetails(); User.getBetas();
9
diff --git a/src/shaders/brdf.glsl b/src/shaders/brdf.glsl // https://google.github.io/filament/Filament.md.html // -vec3 F_None(vec3 f0, vec3 f90, float VdotH) -{ - return f0; -} - // The following equation models the Fresnel reflectance term of the spec equation (aka F()) // Implementation of fresnel from [4], Equation 15 vec3 F_Schlick(vec3 f0, vec3 f90, float VdotH)
2
diff --git a/token-metadata/0x8fB00FDeBb4E83f2C58b3bcD6732AC1B6A7b7221/metadata.json b/token-metadata/0x8fB00FDeBb4E83f2C58b3bcD6732AC1B6A7b7221/metadata.json "symbol": "ORN", "address": "0x8fB00FDeBb4E83f2C58b3bcD6732AC1B6A7b7221", "decimals": 8, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/experimental/adaptive-tool/src/lg/providers/completion.ts b/experimental/adaptive-tool/src/lg/providers/completion.ts @@ -75,7 +75,7 @@ class LGCompletionItemProvider implements vscode.CompletionItemProvider { insertTextArray = util.cardPropDict.Cards; } - completionItem.insertText = '\r\n' + insertTextArray.map(u => `\t${u} = `).join('\r\n') + '\r\n'; + completionItem.insertText = value + '\r\n' + insertTextArray.map(u => `\t${u} = `).join('\r\n') + '\r\n'; items.push(completionItem); });
0
diff --git a/packages/workbox-webpack-plugin/src/lib/get-manifest-entries-from-compilation.js b/packages/workbox-webpack-plugin/src/lib/get-manifest-entries-from-compilation.js @@ -200,7 +200,10 @@ module.exports = async (compilation, config) => { transformParam: compilation, }); - compilation.warnings = compilation.warnings.concat(warnings || []); + // See https://github.com/GoogleChrome/workbox/issues/2790 + for (const warning of warnings) { + compilation.warnings.push(new Error(warning)); + } // Ensure that the entries are properly sorted by URL. const sortedEntries = manifestEntries.sort(
4
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -10,6 +10,9 @@ import * as ui from './vr-ui.js'; import {ShadertoyLoader} from './shadertoy.js'; import {GIFLoader} from './GIFLoader.js'; import {VOXLoader} from './VOXLoader.js'; +import ERC721 from './erc721-abi.json'; +import ERC1155 from './erc1155-abi.json'; +import {web3} from './blockchain.js'; const localVector2D = new THREE.Vector2(); const localMatrix = new THREE.Matrix4(); @@ -218,6 +221,11 @@ const loaders = { }; const _makeRegexp = s => new RegExp(s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'i'); +const abis = { + ERC721, + ERC1155, +}; + let currentAppRender = null; let iframeContainer = null; let recursion = 0; @@ -375,6 +383,12 @@ metaversefile.setApi({ throw new Error('usePhysics cannot be called outside of render()'); } }, + useWeb3() { + return web3.mainnet; + }, + useAbis() { + return abis; + }, useUi() { return ui; },
0
diff --git a/assets/js/modules/analytics/components/dashboard/DashboardAllTrafficWidget/UserDimensionsPieChart.js b/assets/js/modules/analytics/components/dashboard/DashboardAllTrafficWidget/UserDimensionsPieChart.js @@ -76,10 +76,6 @@ export default function UserDimensionsPieChart( { const newDimensionValue = chartWrapperRef.current.getDataTable().getValue( index, 0 ); const isOthers = __( 'Others', 'google-site-kit' ) === newDimensionValue; - if ( isOthers ) { - return; - } - const { row } = chartWrapperRef.current.getChart().getSelection()?.[ 0 ] || {}; if ( row === index || isOthers ) { setValues( {
11
diff --git a/generators/server/templates/gradle/_profile_prod.gradle b/generators/server/templates/gradle/_profile_prod.gradle @@ -102,9 +102,9 @@ gulpBuildWithOpts.dependsOn npm_install gulpBuildWithOpts.dependsOn bower processResources.dependsOn gulpBuildWithOpts test.dependsOn gulp_test -test.dependsOn webpack_test bootRun.dependsOn gulp_test <%_ } else { _%> +test.dependsOn webpack_test processResources.dependsOn webpack <%_ } _%> <%_ } _%>
2
diff --git a/fileserver/wsutil.js b/fileserver/wsutil.js -const pako = require('pako'); - /** * Parses the first 112 bits of a WebSocket dataframe, i.e. the control portion of the frame. * https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_servers#Exchanging_Data_frames @@ -91,42 +89,6 @@ let decodeUTF8 = (rawText, control) => { return text; }; -/** - * Unzips gzipped data using pako. Attempts to convert the data to a TypedArray before unzipping. - * - * @param {TypedArray|ArrayBuffer} arr - Raw gzipped image data. - * @returns Unzipped data or an error message. - */ -let unzipFile = (arr) => { - let parsedArr = new Uint8Array(arr); - let unzippedArr; - try { - unzippedArr = pako.ungzip(parsedArr); - return unzippedArr; - } catch (e) { - console.log('an error occured while unzipping the file', e); - return; - } -}; - -/** - * Gzips raw image data using pako. Attempts to convert data to a TypedArray before zipping. - * - * @param {TypedArray|ArrayBuffer} arr - Raw unzipped image data. - * @returns Zipped data or an error message. - */ -let zipFile = (arr) => { - let parsedArr = new Uint8Array(arr); - let zippedArr; - try { - zippedArr = pako.gzip(parsedArr); - console.log('compressed array' , zippedArr); - return zippedArr; - } catch (e) { - console.log('an error occured while zipping the file', e); - return; - } -}; /** * Attempts to read raw, stringified JSON and return a parsed JSON object. @@ -186,8 +148,6 @@ module.exports = { parseControlFrame: parseControlFrame, formatControlFrame: formatControlFrame, decodeUTF8: decodeUTF8, - unzipFile: unzipFile, - zipFile : zipFile, parseJSON: parseJSON, searchTree: searchTree };
2
diff --git a/lib/recurly/risk/three-d-secure/strategy/stripe.js b/lib/recurly/risk/three-d-secure/strategy/stripe.js @@ -44,11 +44,11 @@ export default class StripeStrategy extends ThreeDSecureStrategy { handleAction(this.stripeClientSecret).then(result => { if (result.error) { - return this.threeDSecure.error('3ds-auth-error', { cause: result.error }); + throw result.error; } const { id } = result.paymentIntent || result.setupIntent; this.emit('done', { id }); - }); + }).catch(err => this.threeDSecure.error('3ds-auth-error', { cause: err })); }); }
9
diff --git a/tools/make/lib/deps/david.mk b/tools/make/lib/deps/david.mk @@ -17,7 +17,8 @@ ROOT_PACKAGE_JSON ?= $(ROOT_DIR)/package.json DAVID_FLAGS ?= \ --package $(ROOT_PACKAGE_JSON) \ --ignore update-notifier \ - --ignore chai + --ignore chai \ + --ignore debug # TARGETS #
8
diff --git a/Source/DataSources/EllipsoidGeometryUpdater.js b/Source/DataSources/EllipsoidGeometryUpdater.js @@ -74,10 +74,10 @@ define([ this.vertexFormat = undefined; this.radii = undefined; this.innerRadii = undefined; - this.minimumAzimuth = undefined; - this.maximumAzimuth = undefined; - this.minimumElevation = undefined; - this.maximumElevation = undefined; + this.minimumClock = undefined; + this.maximumClock = undefined; + this.minimumCone = undefined; + this.maximumCone = undefined; this.stackPartitions = undefined; this.slicePartitions = undefined; this.subdivisions = undefined; @@ -503,10 +503,10 @@ define([ this._outlineEnabled = outlineEnabled; var innerRadii = ellipsoid.innerRadii; - var minimumAzimuth = ellipsoid.minimumAzimuth; - var maximumAzimuth = ellipsoid.maximumAzimuth; - var minimumElevation = ellipsoid.minimumElevation; - var maximumElevation = ellipsoid.maximumElevation; + var minimumClock = ellipsoid.minimumClock; + var maximumClock = ellipsoid.maximumClock; + var minimumCone = ellipsoid.minimumCone; + var maximumCone = ellipsoid.maximumCone; var stackPartitions = ellipsoid.stackPartitions; var slicePartitions = ellipsoid.slicePartitions; var outlineWidth = ellipsoid.outlineWidth; @@ -520,10 +520,10 @@ define([ !Property.isConstant(entity.orientation) || // !radii.isConstant || // !innerRadii.isConstant || // - !Property.isConstant(minimumAzimuth) || // - !Property.isConstant(maximumAzimuth) || // - !Property.isConstant(minimumElevation) || // - !Property.isConstant(maximumElevation) || // + !Property.isConstant(minimumClock) || // + !Property.isConstant(maximumClock) || // + !Property.isConstant(minimumCone) || // + !Property.isConstant(maximumCone) || // !Property.isConstant(stackPartitions) || // !Property.isConstant(slicePartitions) || // !Property.isConstant(outlineWidth) || // @@ -537,10 +537,10 @@ define([ options.vertexFormat = isColorMaterial ? PerInstanceColorAppearance.VERTEX_FORMAT : MaterialAppearance.MaterialSupport.TEXTURED.vertexFormat; options.radii = radii.getValue(Iso8601.MINIMUM_VALUE, options.radii); options.innerRadii = innerRadii.getValue(Iso8601.MINIMUM_VALUE, options.innerRadii); - options.minimumAzimuth = defined(minimumAzimuth) ? minimumAzimuth.getValue(Iso8601.MINIMUM_VALUE) : undefined; - options.maximumAzimuth = defined(maximumAzimuth) ? maximumAzimuth.getValue(Iso8601.MINIMUM_VALUE) : undefined; - options.minimumElevation = defined(minimumElevation) ? minimumElevation.getValue(Iso8601.MINIMUM_VALUE) : undefined; - options.maximumElevation = defined(maximumElevation) ? maximumElevation.getValue(Iso8601.MINIMUM_VALUE) : undefined; + options.minimumClock = defined(minimumClock) ? minimumClock.getValue(Iso8601.MINIMUM_VALUE) : undefined; + options.maximumClock = defined(maximumClock) ? maximumClock.getValue(Iso8601.MINIMUM_VALUE) : undefined; + options.minimumCone = defined(minimumCone) ? minimumCone.getValue(Iso8601.MINIMUM_VALUE) : undefined; + options.maximumCone = defined(maximumCone) ? maximumCone.getValue(Iso8601.MINIMUM_VALUE) : undefined; options.stackPartitions = defined(stackPartitions) ? stackPartitions.getValue(Iso8601.MINIMUM_VALUE) : undefined; options.slicePartitions = defined(slicePartitions) ? slicePartitions.getValue(Iso8601.MINIMUM_VALUE) : undefined; options.subdivisions = defined(subdivisions) ? subdivisions.getValue(Iso8601.MINIMUM_VALUE) : undefined; @@ -679,10 +679,10 @@ define([ } else { options.innerRadii = innerRadii; } - options.minimumAzimuth = Property.getValueOrUndefined(ellipsoid.minimumAzimuth, time); - options.maximumAzimuth = Property.getValueOrUndefined(ellipsoid.maximumAzimuth, time); - options.minimumElevation = Property.getValueOrUndefined(ellipsoid.minimumElevation, time); - options.maximumElevation = Property.getValueOrUndefined(ellipsoid.maximumElevation, time); + options.minimumClock = Property.getValueOrUndefined(ellipsoid.minimumClock, time); + options.maximumClock = Property.getValueOrUndefined(ellipsoid.maximumClock, time); + options.minimumCone = Property.getValueOrUndefined(ellipsoid.minimumCone, time); + options.maximumCone = Property.getValueOrUndefined(ellipsoid.maximumCone, time); appearance = new MaterialAppearance({ material : material,
10
diff --git a/packages/fela-bindings/src/RendererProviderFactory.js b/packages/fela-bindings/src/RendererProviderFactory.js @@ -3,8 +3,13 @@ import { render, rehydrate } from 'fela-dom' import objectEach from 'fast-loops/lib/objectEach' function hasDOM(renderer, targetDocument) { - if (typeof window === 'undefined') return false - if (!targetDocument) targetDocument = document + // ensure we're on a browser by using document since window is defined in e.g. React Native + // see https://github.com/robinweser/fela/issues/736 + if (typeof document === 'undefined') { + return false + } + + const doc = targetDocument || document return ( renderer &&
7
diff --git a/articles/connections/social/apple.md b/articles/connections/social/apple.md --- -title: Add Login with Apple to Your App +title: Add Sign in with Apple to Your App connection: Apple index: 3 image: /media/connections/apple.svg @@ -17,12 +17,12 @@ useCase: - customize-connections - add-idp --- -# Add Apple Login to Your App +# Add Sign in with Apple to Your App -This guide will show you how to add functionality to your web app that allows your users to "Sign in with Apple". Using the Apple connection will require the following: +This guide will show you how to add functionality to your web app that allows your users to use Apple's "Sign in with Apple" functionality. Using the Apple connection will require the following: -* An Apple Developer account, which is a paid account with Apple. -* A Custom Domain set up on your Auth0 tenant (This is required because you must be able to do domain verification with Apple). +* An [Apple Developer](https://developer.apple.com/programs/) account, which is a paid account with Apple. +* A [Custom Domain](/custom-domains) set up on your Auth0 tenant (this is required because you must be able to do domain verification with Apple). ## 1. Set up your app in your Apple Developer Account
3
diff --git a/FAQ.md b/FAQ.md - [Why reimplement module functionality already available on npm?](#reimplementing-existing-packages) - [Why not submit improvements to existing libraries?](#contributing-to-existing-libraries) - [Why not aggregate (curate) packages published to npm?](#why-not-curate) -- [Why are built-in JavaScript globals wrapped and imported as packages?](#wrapping-javascript-globals) +- [Why are built-in JavaScript globals wrapped and imported as packages?](#globals-as-packages) - [Backward compatibility?](#backward-compatibility) - [Why use semicolons?](#semicolons) - [Import support?](#import-support) @@ -427,7 +427,7 @@ This project has every intent on maintaining backward compatibility with older N * * * -<a name="wrapping-javascript-globals"></a> +<a name="globals-as-packages"></a> ### Why are built-in JavaScript globals wrapped and imported as packages?
10
diff --git a/packages/styles/src/style-system/plugins/extraSpecificity.js b/packages/styles/src/style-system/plugins/extraSpecificity.js import { clamp, repeat } from '@wp-g2/utils'; -// https://github.com/thysultan/stylis.js#plugins -const STYLIS_CONTEXTS = { - AT_RULE: 3, - NEWLINE: 0, - POST_PROCESS: -2, - PREPARATION: -1, - PROPERTY: 1, - SELECTOR_BLOCK: 2, -}; - -export const STYLIS_PROPERTY_CONTEXT = STYLIS_CONTEXTS.PREPARATION; const seen = new WeakSet(); const defaultOptions = { @@ -28,12 +17,14 @@ function stylisExtraSpecificityPlugin(options = defaultOptions) { seen.add(selectors); for (let i = 0; i < selectors.length; i++) { - const [match] = selectors[i].match(/.css-[\w|\d]*/g) || []; - const prefix = `${html}${repeat(match, repeatLevel)}`; - - if (match && prefix) { - selectors[i] = selectors[i].replace(prefix, ''); - selectors[i] = `${prefix}${selectors[i]}`; + let item = selectors[i]; + const [match] = item.match(/.css-[\w|\d]*/g) || []; + + if (match) { + item = item + .replace(html, '') + .replace(match, repeat(match, repeatLevel)); + selectors[i] = `${html}${item}`; } } };
7
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -7,6 +7,7 @@ metaversfile can load many file types, including javascript. import * as THREE from 'three'; import {GLTFLoader} from 'three/examples/jsm/loaders/GLTFLoader.js'; import {DRACOLoader} from 'three/examples/jsm/loaders/DRACOLoader.js'; +import {KTX2Loader} from 'three/examples/jsm/loaders/KTX2Loader.js'; import {Text} from 'troika-three-text'; import React from 'react'; import * as ReactThreeFiber from '@react-three/fiber'; @@ -238,10 +239,21 @@ const _dracoLoader = _memoize(() => { dracoLoader.setDecoderPath('/three/draco/'); return dracoLoader; }); +const _ktx2Loader = _memoize(() => { + const ktx2Loader = new KTX2Loader(); + ktx2Loader.setTranscoderPath('/three/basis/'); + return ktx2Loader; +}); const _gltfLoader = _memoize(() => { const gltfLoader = new GLTFLoader(); + { const dracoLoader = _dracoLoader(); gltfLoader.setDRACOLoader(dracoLoader); + } + { + const ktx2Loader = _ktx2Loader(); + gltfLoader.setKTX2Loader(ktx2Loader); + } return gltfLoader; }); const _shadertoyLoader = _memoize(() => new ShadertoyLoader());
0
diff --git a/readme.md b/readme.md [![npm](https://img.shields.io/npm/v/immer.svg)](https://www.npmjs.com/package/immer) [![size](http://img.badgesize.io/https://cdn.jsdelivr.net/npm/immer/dist/immer.umd.js?compression=gzip)](http://img.badgesize.io/https://cdn.jsdelivr.net/npm/immer/dist/immer.umd.js) [![install size](https://packagephobia.now.sh/badge?p=immer)](https://packagephobia.now.sh/result?p=immer) [![Build Status](https://travis-ci.org/mweststrate/immer.svg?branch=master)](https://travis-ci.org/mweststrate/immer) [![Coverage Status](https://coveralls.io/repos/github/mweststrate/immer/badge.svg?branch=master)](https://coveralls.io/github/mweststrate/immer?branch=master) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/michelweststrate) - - _Create the next immutable state tree by simply modifying the current tree_ +Did Immer make a difference to your project? Consider buying me a coffee! <a href="https://www.buymeacoffee.com/mweststrate" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: auto !important;width: auto !important;" ></a> + --- * NPM: `npm install immer` @@ -21,7 +21,8 @@ _Create the next immutable state tree by simply modifying the current tree_ * Egghead lesson covering all of immer (7m): [Simplify creating immutable data trees with Immer](https://egghead.io/lessons/redux-simplify-creating-immutable-data-trees-with-immer) * Introduction blogpost: [Immer: Immutability the easy way](https://medium.com/@mweststrate/introducing-immer-immutability-the-easy-way-9d73d8f71cb3) * [Talk](https://www.youtube.com/watch?v=-gJbS7YjcSo) + [slides](http://immer.surge.sh/) on Immer at React Finland 2018 by Michel Weststrate -* Blog by Workday Prism on why they picked Immer to manage immutable state [The Search for a Strongly-Typed, Immutable State](https://medium.com/workday-engineering/workday-prism-analytics-the-search-for-a-strongly-typed-immutable-state-a09f6768b2b5) +* Blog: by Workday Prism on why they picked Immer to manage immutable state [The Search for a Strongly-Typed, Immutable State](https://medium.com/workday-engineering/workday-prism-analytics-the-search-for-a-strongly-typed-immutable-state-a09f6768b2b5) +* Blog: [The Rise of Immer in React](https://www.netlify.com/blog/2018/09/12/the-rise-of-immer-in-react/) Immer (German for: always) is a tiny package that allows you to work with immutable state in a more convenient way. It is based on the [_copy-on-write_](https://en.wikipedia.org/wiki/Copy-on-write) mechanism. @@ -351,6 +352,8 @@ const userReducer = produce((draft, action) => { }) ``` +_Note: It is not possible to return `undefined` this way, as it is indistiguishable from updating the draft!_ + ## Extracting the original object from a proxied instance Immer exposes a named export `original` that will get the original object from the proxied instance inside `produce` (or return `undefined` for unproxied values). A good example of when this can be useful is when searching for nodes in a tree-like state using strict equality. @@ -466,6 +469,7 @@ Immer supports the following types of data: 1. Since Immer uses proxies, reading huge amounts of data from state comes with an overhead (especially in the ES5 implementation). If this ever becomes an issue (measure before you optimize!), do the current state analysis before entering the producer function or read from the `currentState` rather than the `draftState`. Also realize that immer is opt-in everywhere, so it is perfectly fine to manually write super performance critical reducers, and use immer for all the normal ones. Also note that `original` can be used to get the original state of an object, which is cheaper to read. 1. Some debuggers (at least Node 6 is known) have trouble debugging when Proxies are in play. Node 8 is known to work correctly. 1. Always try to pull `produce` 'up', for example `for (let x of y) produce(base, d => d.push(x))` is exponentially slower than `produce(base, d => { for (let x of y) d.push(x)})` +1. It is possible to return values from producers, except, it is not possible to return `undefined` that way, as it is indistiguishable from updating the draft! 1. Immer does not support built in data-structures like `Map` and `Set`. However, it is fine to just immutably "update" them yourself but still leverage immer wherever possible: ```javascript
0
diff --git a/src/components/waveform/waveform.jsx b/src/components/waveform/waveform.jsx @@ -22,15 +22,18 @@ class Waveform extends React.PureComponent { const filteredData = takeEveryN === 1 ? data.slice(0) : data.filter((_, i) => i % takeEveryN === 0); - filteredData[0] = 0; - filteredData[filteredData.length - 1] = 0; + // Need at least two points to render waveform. + if (filteredData.length === 1) { + filteredData.push(filteredData[0]); + } + const maxIndex = filteredData.length - 1; const points = [ ...filteredData.map((v, i) => - [width * i / filteredData.length, height * v / 2] + [width * (i / maxIndex), height * v / 2] ), ...filteredData.reverse().map((v, i) => - [width * (filteredData.length - i - 1) / filteredData.length, -height * v / 2] + [width * (1 - (i / maxIndex)), -height * v / 2] ) ]; const pathComponents = points.map(([x, y], i) => { @@ -41,15 +44,8 @@ class Waveform extends React.PureComponent { return ( <svg className={styles.container} - viewBox={`-1 0 ${width} ${height}`} + viewBox={`0 0 ${width} ${height}`} > - <line - className={styles.baseline} - x1={-1} - x2={width} - y1={height / 2} - y2={height / 2} - /> <g transform={`scale(1, -1) translate(0, -${height / 2})`}> <path className={styles.waveformPath}
7
diff --git a/packages/spark/settings/_settings.scss b/packages/spark/settings/_settings.scss @@ -587,7 +587,7 @@ $sprk-input-text-icon-offset-x: $sprk-space-m !default; $sprk-input-text-icon-offset-y: 2em !default; $sprk-input-text-icon-font-size: 1rem !default; $sprk-input-text-icon-font-weight: 700 !default; -$sprk-text-input-has-text-icon-padding: 12px 13px 12px 37px !default; +$sprk-text-input-has-text-icon-padding: 0 0 1px 37px !default; $sprk-text-input-huge-has-text-icon-padding: 0 40px !default; $sprk-input-text-icon-z-index: $sprk-layer-height-xs !default;
3
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js @@ -199,7 +199,7 @@ RED.sidebar = (function() { id = RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0] } if (id) { - if (!containsTab(id)) { + if (!containsTab(id) && knownTabs[id]) { sidebar_tabs.addTab(knownTabs[id]); } sidebar_tabs.activateTab(id);
9
diff --git a/src/Appwrite/Extend/PDOStatement.php b/src/Appwrite/Extend/PDOStatement.php @@ -49,7 +49,9 @@ class PDOStatement extends PDOStatementNative try { $result = $this->PDOStatement->execute($input_parameters); } catch (\Throwable $th) { - $this->pdo->reconnect(); + $this->pdo = $this->pdo->reconnect(); + //$this->PDOStatement = $this->pdo->prepare($this->PDOStatement->queryString, []); + $result = $this->PDOStatement->execute($input_parameters); }
7
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js @@ -202,7 +202,7 @@ SidebarLinks.defaultProps = defaultProps; * @param {Object} [report] * @returns {Object|undefined} */ -const reportSelector = (report) => { +const chatReportSelector = (report) => { if (ReportUtils.isIOUReport(report)) { return null; } @@ -272,7 +272,7 @@ export default compose( // with 10,000 withOnyx() connections, it would have unknown performance implications. chatReports: { key: ONYXKEYS.COLLECTION.REPORT, - selector: reportSelector, + selector: chatReportSelector, }, personalDetails: { key: ONYXKEYS.PERSONAL_DETAILS,
10
diff --git a/src/og/Globe.js b/src/og/Globe.js @@ -128,7 +128,6 @@ class Globe { context: { alpha: false, antialias: false, - powerPreference: "high-performance", premultipliedAlpha: true } }), {
2
diff --git a/buildtools/webpack.prod.js b/buildtools/webpack.prod.js @@ -64,6 +64,7 @@ module.exports = { resolve: { alias: { 'goog/asserts': path.resolve(__dirname, '../src/goog.asserts.prod.js'), + 'goog/asserts.js': path.resolve(__dirname, '../src/goog.asserts.prod.js'), } }, };
4
diff --git a/packages/composables/use-drawing/use-drawing-segment.ts b/packages/composables/use-drawing/use-drawing-segment.ts /* * @Author: zouyaoji@https://github.com/zouyaoji * @Date: 2021-10-22 14:09:42 - * @LastEditTime: 2022-08-02 22:20:33 + * @LastEditTime: 2022-12-11 23:40:39 * @LastEditors: zouyaoji * @Description: * @FilePath: \vue-cesium@next\packages\composables\use-drawing\use-drawing-segment.ts @@ -804,6 +804,7 @@ export default function (props, ctx, cmpName: string) { canShowDrawTip.value = true } } else { + if (cmpName !== 'VcMeasurementVertical') { if (platform().hasTouch === true) { const position = getWorldPosition(scene, movement, {} as any) if (defined(position)) { @@ -811,6 +812,8 @@ export default function (props, ctx, cmpName: string) { positions[1] = position } } + } + if (props.mode === 1) { drawingFabInstanceVm.toggleAction(selectedDrawingActionInstance) }
1
diff --git a/edit.js b/edit.js @@ -375,76 +375,6 @@ scene.add(floorMesh); } */ })(); -const geometry = new THREE.CircleBufferGeometry(1, 32) - .applyMatrix4(new THREE.Matrix4().makeScale(0.5, 1, 1)); -const material = new THREE.ShaderMaterial({ - uniforms: { - // tex: {type: 't', value: texture, needsUpdate: true}, - iTime: {value: 0, needsUpdate: true}, - }, - vertexShader: `\ - // uniform float iTime; - varying vec2 uvs; - /* varying vec3 vNormal; - varying vec3 vWorldPosition; */ - void main() { - uvs = uv; - gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 ); - // vNormal = normal; - // vec4 worldPosition = modelMatrix * vec4( position, 1.0 ); - /// vWorldPosition = worldPosition.xyz; - } - `, - fragmentShader: `\ - #define PI 3.1415926535897932384626433832795 - - uniform float iTime; - // uniform sampler2D tex; - varying vec2 uvs; - /* arying vec3 vNormal; - varying vec3 vWorldPosition; */ - - const vec3 c = vec3(${new THREE.Color(0x1565c0).toArray().join(', ')}); - - void main() { - vec2 uv = uvs; - /* uv.x *= 1.7320508075688772; - uv *= 8.0; - - vec3 direction = vWorldPosition - cameraPosition; - float d = dot(vNormal, normalize(direction)); - float glow = d < 0.0 ? max(1. + d * 2., 0.) : 0.; - - float animationFactor = (1.0 + sin((uvs.y*2. + iTime) * PI*2.))/2.; - float a = glow + (1.0 - texture2D(tex, uv).r) * (0.01 + pow(animationFactor, 10.0) * 0.5); */ - - const vec3 c = vec3(${new THREE.Color(0x29b6f6).toArray().join(', ')}); - - vec2 distanceVector = abs(uv - 0.5)*2.; - float a = pow(length(distanceVector), 5.); - vec2 normalizedDistanceVector = normalize(distanceVector); - float angle = atan(normalizedDistanceVector.y, normalizedDistanceVector.x) + iTime*PI*2.; - float skirt = pow(sin(angle*50.) * cos(angle*20.), 5.) * 0.2; - a += skirt; - // if (length(f) > 0.8) { - gl_FragColor = vec4(c, a); - /* } else { - discard; - } */ - } - `, - side: THREE.DoubleSide, - transparent: true, -}); -const portalMesh = new THREE.Mesh(geometry, material); -portalMesh.update = () => { - const portalRate = 30000; - portalMesh.material.uniforms.iTime.value = (Date.now()/portalRate) % 1; - portalMesh.material.uniforms.iTime.needsUpdate = true; -}; -portalMesh.position.y = 1; -scene.add(portalMesh); - /* const redBuildMeshMaterial = new THREE.ShaderMaterial({ vertexShader: ` void main() { @@ -587,8 +517,6 @@ function animate(timestamp, frame) { const timeDiff = Math.min((timestamp - lastTimestamp) / 1000, 0.05); lastTimestamp = timestamp; - portalMesh.update(); - const now = Date.now(); if (skybox) { for (const material of geometryManager.currentChunkMesh.material) {
2
diff --git a/src/components/Card.js b/src/components/Card.js @@ -4,12 +4,12 @@ import { AspectRatioBox, Box, Flex, - Image, Heading, Text, Stack, } from '@chakra-ui/core'; -import { Button } from './Button'; + +import { Button, Image } from '.'; const CardWrapper = forwardRef(({ children, ...props }, ref) => { return (
4
diff --git a/package.json b/package.json "ganache": "ganache-cli -p 8545 --gasLimit 0xfffffffffff --time '2017-05-10T00:00:00+00:00' -s 0", "publish": "lerna publish", "test": "yarn clean && yarn compile && lerna run test --concurrency=1", - "check_dep_graph" : "source venv/bin/activate; python scripts/identify_dependencies.py" + "check_dep_graph" : "source venv/bin/activate && pip3 install -r requirements.txt && python scripts/identify_dependencies.py" }, "devDependencies": { "@gnosis.pm/mock-contract": "^3.0.7",
3
diff --git a/src/user_interface.js b/src/user_interface.js @@ -14,10 +14,12 @@ class gltfUserInterface this.stats = stats; this.hexColor = this.toHexColor(this.renderingParameters.clearColor); this.version = ""; + this.sceneEnvironment = "Controlled by the scene"; this.gui = undefined; this.gltfFolder = undefined; this.animationFolder = undefined; + this.lightingFolder = undefined; this.updatables = []; this.onModelChanged = undefined; @@ -115,15 +117,34 @@ class gltfUserInterface initializeLightingSettings() { const self = this; - const lightingFolder = this.gui.addFolder("Lighting"); - lightingFolder.add(this.renderingParameters, "useIBL").name("Image-Based Lighting"); - lightingFolder.add(this.renderingParameters, "usePunctual").name("Punctual Lighting"); - lightingFolder.add(this.renderingParameters, "environmentName", Object.keys(Environments)).name("Environment") - .onChange(() => self.onEnvironmentChanged()); - lightingFolder.add(this.renderingParameters, "exposure", 0, 10, 0.1).name("Exposure"); - lightingFolder.add(this.renderingParameters, "toneMap", Object.values(ToneMaps)).name("Tone Map"); - lightingFolder.addColor(this, "hexColor", this.hexColor).name("Background Color") + this.lightingFolder = this.gui.addFolder("Lighting"); + this.lightingFolder.add(this.renderingParameters, "useIBL").name("Image-Based Lighting"); + this.lightingFolder.add(this.renderingParameters, "usePunctual").name("Punctual Lighting"); + this.lightingFolder.add(this.renderingParameters, "exposure", 0, 10, 0.1).name("Exposure"); + this.lightingFolder.add(this.renderingParameters, "toneMap", Object.values(ToneMaps)).name("Tone Map"); + this.lightingFolder.addColor(this, "hexColor", this.hexColor).name("Background Color") .onChange(() => self.renderingParameters.clearColor = self.fromHexColor(self.hexColor)); + + this.initializeEnvironmentSelection(); + } + + initializeEnvironmentSelection() + { + const self = this; + function createElement(gltf) + { + if (gltf !== undefined && + gltf.scenes[self.renderingParameters.sceneIndex].imageBasedLight !== undefined) + { + const sceneEnvironment = self.sceneEnvironment; + return self.lightingFolder.add(self, "sceneEnvironment", sceneEnvironment).name("Environment") + .onChange(() => self.sceneEnvironment = sceneEnvironment); + } + + return self.lightingFolder.add(self.renderingParameters, "environmentName", Object.keys(Environments)).name("Environment") + .onChange(() => self.onEnvironmentChanged()); + } + this.initializeUpdatable(this.lightingFolder, createElement); } initializeAnimationSettings()
3
diff --git a/contracts/Nomin.sol b/contracts/Nomin.sol @@ -16,7 +16,7 @@ date: 2018-05-29 MODULE DESCRIPTION ---------------------------------------------------------------- - -Ether-backed nomin stablecoin contract. +Havven-backed nomin stablecoin contract. This contract issues nomins, which are tokens worth 1 USD each.
3
diff --git a/layouts/partials/fragments/list.html b/layouts/partials/fragments/list.html {{- if and (not .Params.section) (eq .root.CurrentSection.Kind "section") -}} {{- .page_scratch.Set "pages" (.root.CurrentSection.Pages) -}} {{- end -}} -{{- $pages := where (.page_scratch.Get "pages") "Params.fragment" "eq" "content" -}} {{- $self := . -}} {{- $bg := .Params.background | default "light" }} {{- printf " text-muted text-%s" "secondary" -}} {{- end -}} "> - {{- range first (.Params.count | default 10) $pages }} + {{- range first (.Params.count | default 10) (.page_scratch.Get "pages") }} <article class="col-12 mb-4"> {{- if .Params.title }} <div class="col-12 pl-0
2
diff --git a/apps/dg/models/case_model.js b/apps/dg/models/case_model.js @@ -206,7 +206,9 @@ DG.Case = DG.BaseModel.extend((function() { */ getNumValue: function( iAttrID, oOptInfo) { var value = this.getRawValue( iAttrID), - valType = typeof value; + valType = typeof value, + tAttr = DG.Attribute.getAttributeByID( iAttrID), + attrType = tAttr && tAttr.type; if (DG.isDate(value)) { // treat dates numerically value = Number(value); @@ -214,9 +216,12 @@ DG.Case = DG.BaseModel.extend((function() { } else if (this._cachedDate[iAttrID]) { value = Number(this._cachedDate[iAttrID]); valType = "number"; + } else if (attrType === 'date') { + this._cachedDate[iAttrID] = DG.parseDate(value, true); + value = Number(this._cachedDate[iAttrID]); + valType = "number"; } else if (DG.isDateString(value)) { - DG.log('Caching date: ' + value); - this._cachedDate[iAttrID] = DG.createDate(value); + this._cachedDate[iAttrID] = DG.parseDate(value); value = Number(this._cachedDate[iAttrID]); valType = "number"; }
9
diff --git a/src/scripts/interaction.js b/src/scripts/interaction.js @@ -230,7 +230,11 @@ function Interaction(parameters, player, previousState) { } else { // URL var url = parameters.goto.url; - $anchor.attr({ + $anchor.keypress(function (event) { + if (event.which === 32) { + this.click(); + } + }).attr({ href: (url.protocol !== 'other' ? url.protocol : '') + url.url, target: '_blank' });
11
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js b/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js @@ -12,9 +12,9 @@ RED.actions = (function() { function getAction(name) { return actions[name]; } - function invokeAction(name) { + function invokeAction(name,args) { if (actions.hasOwnProperty(name)) { - actions[name](); + actions[name](args); } } function listActions() {
11
diff --git a/articles/multifactor-authentication/custom/custom-landing.md b/articles/multifactor-authentication/custom/custom-landing.md @@ -57,47 +57,6 @@ function (user, context, callback) { } ``` -### Access from a different device or location - -If the user makes a request from an IP address that Auth0 has not already associated with them, you can configure Auth0 to request MFA. - -```js -function (user, context, callback) { - - var deviceFingerPrint = getDeviceFingerPrint(); - user.app_metadata = user.app_metadata || {}; - - if (user.app_metadata.lastLoginDeviceFingerPrint !== deviceFingerPrint) { - - user.app_metadata.lastLoginDeviceFingerPrint = deviceFingerPrint; - - context.multifactor = { - allowRememberBrowser: false, - provider: 'guardian' - }; - - auth0.users.updateAppMetadata(user.user_id, user.app_metadata) - .then( function() { - callback(null, user, context); - }) - .catch( function(err) { - callback(err); - }); - } else { - callback(null, user, context); - } - - function getDeviceFingerPrint() { - - var shasum = crypto.createHash('sha1'); - shasum.update(context.request.userAgent); - shasum.update(context.request.ip); - return shasum.digest('hex'); - - } -} -``` - ## Use a Custom MFA Service If you are using an MFA provider that does not have Auth0 built-in support or if you are using a service you have created, you can use the [redirect](/rules/redirect) protocol for the integration.
2
diff --git a/src/components/App.js b/src/components/App.js @@ -2121,10 +2121,11 @@ class App extends Component { .map(x => x.trim()) .map(x => { let match = x.match(/[A-Za-z]\d+(\s+[A-Za-z]\d+)*$/) - if (match == null) return [x, []] + if (match == null) return null return [x.slice(0, match.index), match[0].split(/\s+/)] }) + .filter(x => x != null) .map(([x, y]) => [ x.trim().split(/\s+/).slice(0, -1), y.filter(x => x.length >= 2)
8
diff --git a/_data/conferences.yml b/_data/conferences.yml --- -- title: ICASSP - year: 2021 - id: icassp21 - link: https://2021.ieeeicassp.org/ - deadline: '2020-10-19 23:59:59' - timezone: UTC - date: June 6-11, 2021 - place: Toronto, Ontario, Canada - sub: SP - title: CoRL hindex: 20 note: '<b>NOTE</b>: Mandatory abstract deadline on September 28, 2020. More info <a href=''https://iclr.cc/Conferences/2021/CallForPapers''>here</a>.' +- title: ICASSP + hindex: 80 + year: 2021 + id: icassp21 + link: https://2021.ieeeicassp.org/ + deadline: '2020-10-19 23:59:59' + timezone: UTC + date: June 6-11, 2021 + place: Toronto, Ontario, Canada + sub: SP + - title: CVPR hindex: 240 year: 2021 sub: CV note: '<b>NOTE</b>: Second round submission deadline.' -- title: ICASSP - hindex: 80 - year: 2020 - id: icassp20 - link: https://2020.ieeeicassp.org/ - deadline: '2019-10-21 23:59:59' - timezone: UTC - date: May 4-8, 2020 - place: Barcelona, Spain - sub: SP - - title: AAMAS hindex: 25 year: 2020
2
diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php @@ -125,7 +125,9 @@ function table($type) { } echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL; + if ($type=='published' || $type=='static' || $type=='sticky') { echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL; + } echo '<a class="text-secondary d-none d-md-inline ml-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$child->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL; echo '<a class="ml-2 text-danger deletePageButton d-block d-sm-inline" href="#" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$child->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL; echo '</td>'; @@ -160,7 +162,9 @@ function table($type) { } echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL; + if ($type=='published' || $type=='static' || $type=='sticky') { echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL; + } echo '<a class="text-secondary d-none d-md-inline ml-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL; if (count($page->children())==0) { echo '<a href="#" class="ml-2 text-danger deletePageButton d-block d-sm-inline" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
2
diff --git a/cypress/integration/measurement.e2e.js b/cypress/integration/measurement.e2e.js @@ -135,7 +135,7 @@ describe('Measurement Page Tests', () => { .contains('Results') }) it('renders a failed measurement', () => { - cy.visit('/measurement/20190917T214045Z_AS0_P91OeXAs0Z8EN91RDcZNGZ2xMPHFEJ8E6PYSiah8gkcuT9qRAo') + cy.visit('/measurement/20190930T212715Z_AS17380_2W4uXDAWAckWTGI5TRep5hw5j5gSS31wKlbO2RHlV0v4fudSXW') cy.heroHasColor(errorColor) .contains('Error') })
14
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js @@ -388,7 +388,11 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> { _startRefreshAllWallets: void => Promise<void> = async () => { for (const publicDeriver of this.publicDerivers) { if (this.selected !== publicDeriver) { + try { await this.refreshWalletFromRemote(publicDeriver); + } catch { + // ignore error + } } } setTimeout(this._startRefreshAllWallets, this.WALLET_REFRESH_INTERVAL);
8
diff --git a/examples/helloworld/hello.js b/examples/helloworld/hello.js // In production, the bundled pdf.js shall be used instead of SystemJS. Promise.all([System.import('pdfjs/display/api'), System.import('pdfjs/display/global'), + System.import('pdfjs/display/network'), System.resolve('pdfjs/worker_loader')]) .then(function (modules) { var api = modules[0], global = modules[1]; // In production, change this to point to the built `pdf.worker.js` file. - global.PDFJS.workerSrc = modules[2]; + global.PDFJS.workerSrc = modules[3]; // Fetch the PDF document from the URL using promises. api.getDocument('helloworld.pdf').then(function (pdf) {
1
diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js @@ -395,8 +395,11 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn } }); - // send all our events to upper to merge, sort and reduce for display - events = newEvents; + newEvents.sort(function (a, b) { + return a.startDate - b.startDate; + }); + + events = newEvents.slice(0, maximumEntries); self.broadcastEvents(); scheduleTimer();
13
diff --git a/assets/src/dashboard/components/typeahead/test/useTypeahead.js b/assets/src/dashboard/components/typeahead/test/useTypeahead.js @@ -43,7 +43,7 @@ describe('useTypeahead()', function () { expect(result.current.inputValue.value).toBe(''); expect(result.current.showMenu.value).toBe(false); expect(result.current.menuFocused.value).toBe(false); - expect(result.current.selectedValueIndex.value).toBe(-1); + expect(result.current.selectedValueIndex.value).toBe(0); }); it('should set isMenuOpen to true when input value updates.', () => {
1
diff --git a/src/components/withEnvironment.js b/src/components/withEnvironment.js @@ -37,7 +37,7 @@ export default function (WrappedComponent) { } } - WithEnvironment.displayName = `withDrawerState(${getComponentDisplayName(WrappedComponent)})`; + WithEnvironment.displayName = `withEnvironment(${getComponentDisplayName(WrappedComponent)})`; return WithEnvironment; }
4
diff --git a/player-avatar-binding.js b/player-avatar-binding.js @@ -98,7 +98,7 @@ export function applyPlayerActionsToAvatar(player, rig) { rig.flyState = !!flyAction; rig.flyTime = flyAction ? player.actionInterpolants.fly.get() : -1; rig.activateTime = player.actionInterpolants.activate.get(); - rig.useTime = player.actionInterpolants.use.get(); + if (useAction?.animation) { rig.useAnimation = useAction.animation; } else { @@ -113,15 +113,21 @@ export function applyPlayerActionsToAvatar(player, rig) { rig.useAnimationCombo = []; } } - // console.log('got use action', useAction); if (useAction?.animationEnvelope) { rig.useAnimationEnvelope = useAction.animationEnvelope; + rig.unuseAnimation = rig.useAnimationEnvelope[2]; // the last animation in the triplet is the unuse animation } else { if (rig.useAnimationEnvelope.length > 0) { rig.useAnimationEnvelope = []; } } rig.useAnimationIndex = useAction?.index; + rig.useTime = player.actionInterpolants.use.get(); + rig.unuseTime = player.actionInterpolants.unuse.get(); + if (useAction) { + rig.used = true; + } + rig.narutoRunState = !!narutoRunAction && !crouchAction; rig.narutoRunTime = player.actionInterpolants.narutoRun.get(); rig.aimTime = player.actionInterpolants.aim.get();
0
diff --git a/packages/babel-plugin-transform-raptor-template/src/index.js b/packages/babel-plugin-transform-raptor-template/src/index.js @@ -60,24 +60,14 @@ export default function ({ types: t, template }) { Program: { enter(path) { validateTemplateRootFormat(path); - - // Find children of the root <template> node - const rootNode = path.get('body.0.expression'); // <template> - const rootChildren = rootNode.get('children').filter((c) => !t.isJSXText(c)); - - if (rootChildren.length !== 1) { - throw path.buildCodeFrameError('A component must have only one root element'); - } - - // Replace <template> by its child - rootNode.replaceWith(t.expressionStatement(rootChildren[0])); }, exit (path, state) { // Add exports declaration const body = path.node.body; const pos = body.findIndex(c => t.isExpressionStatement(c) && c.expression._jsxElement); const rootElement = path.get(`body.${pos}.expression`); - const exportDeclaration = exportsDefaultTemplate({ STATEMENT: rootElement }); + const children = rootElement.node.arguments.pop(); + const exportDeclaration = exportsDefaultTemplate({ STATEMENT: children }); rootElement.replaceWithMultiple(exportDeclaration); // Generate used identifiers
11
diff --git a/package.json b/package.json "lint": "prettier --single-quote --semi false -l \"{src,test,examples}/**/*.js\" && eslint \"{src,test,examples}/**/*.js\"", "pretty": "prettier --single-quote --semi false --write \"{src,test,examples}/**/*.{js,css}\" && eslint --fix \"{src,test,examples}/**/*.js\"", "docs": "jsdoc src -c jsdoc/conf.json && jsdoc src -c jsdoc/conf.json --package package.json", - "test": "jest --config test/dev.config.json", - "test:cov": "jest --config test/dev.config.json --coverage", - "test:prod": "make strict && jest --config test/prod.config.json", + "test": "jest --config test/dev.config.json --maxWorkers=2", + "test:cov": "jest --config test/dev.config.json --coverage --maxWorkers=2", + "test:prod": "make strict && jest --config test/prod.config.json --maxWorkers=2", "report-coverage": "codecov coverage/lcov.info", "release": "make release" },
12
diff --git a/src/charts/BarStacked.js b/src/charts/BarStacked.js @@ -124,16 +124,6 @@ class BarStacked extends Bar { // this.xArrj.push(x + barWidth / 2) // } - // fix issue #1215; - // where all stack bar disappear after collapsing the first series - // sol: if only 1 arr in this.prevY(this.prevY.length === 1) and all are NaN - if (this.prevY.length === 1 && this.prevY[0].every((val) => isNaN(val))) { - // make this.prevY[0] all zeroH - this.prevY[0] = this.prevY[0].map((val) => zeroH) - // make this.prevYF[0] all 0 - this.prevYF[0] = this.prevYF[0].map((val) => 0) - } - for (let j = 0; j < w.globals.dataPoints; j++) { const strokeWidth = this.barHelpers.getStrokeWidth(i, j, realIndex) const commonPathOpts = { @@ -426,9 +416,7 @@ class BarStacked extends Bar { let prevBarH = 0 for (let k = 0; k < this.prevYF.length; k++) { - // fix issue #1215 - // in case where this.prevYF[k][j] is NaN, use 0 instead - prevBarH = prevBarH + (!isNaN(this.prevYF[k][j]) ? this.prevYF[k][j] : 0) + prevBarH = prevBarH + this.prevYF[k][j] } if ( @@ -438,50 +426,21 @@ class BarStacked extends Bar { w.globals.seriesX[i - 1][j] === w.globals.seriesX[i][j]) ) { let bYP - let prevYValue - const p = Math.min(this.yRatio.length - 1, i + 1) - if (this.prevY[i - 1] !== undefined) { - for (let ii = 1; ii < p; ii++) { - if (!isNaN(this.prevY[i - ii][j])) { - // find the previous available value to give prevYValue - prevYValue = this.prevY[i - ii][j] - // if found it, break the loop - break - } - } - } + let prevYValue = this.prevY[i - 1][j] - for (let ii = 1; ii < p; ii++) { - // find the previous available value(non-NaN) to give bYP - if (this.prevYVal[i - ii][j] < 0) { + if (this.prevYVal[i - 1][j] < 0) { bYP = this.series[i][j] >= 0 ? prevYValue - prevBarH + (this.isReversed ? prevBarH : 0) * 2 : prevYValue - // found it? break the loop - break - } else if (this.prevYVal[i - ii][j] >= 0) { + } else { bYP = this.series[i][j] >= 0 ? prevYValue : prevYValue + prevBarH - (this.isReversed ? prevBarH : 0) * 2 - // found it? break the loop - break - } } - // if this.prevYF[0] is all 0 resulted from line #486 - // AND every arr starting from the second only contains NaN - if ( - this.prevYF[0].every((val) => val === 0) && - this.prevYF.slice(1, i).every((arr) => arr.every((val) => isNaN(val))) - ) { - // Use the same calc way as line #485 - barYPosition = w.globals.gridHeight - zeroH - } else { - // Nothing special barYPosition = bYP - } } else { // the first series will not have prevY values, also if the prev index's series X doesn't matches the current index's series X, then start from zero barYPosition = w.globals.gridHeight - zeroH
13
diff --git a/beeline/directives/crowdstartShare.js b/beeline/directives/crowdstartShare.js @@ -22,11 +22,11 @@ export default function($cordovaSocialSharing, $rootScope) { link: function(scope, element, attributes) { scope.showCopy = !window.cordova || false; //if has cordova no need to show shareLink text area - scope.shareLink = "Hey, check out this new Crowdstart route from Beeline! "+$rootScope.o.APP.INDEX+"#/tabs/crowdstart/"+scope.routeId+"/detail"; + scope.shareLink = "Hey, check out this new Crowdstart route from "+$rootScope.o.APP.NAME +"! "+$rootScope.o.APP.INDEX+"#/tabs/crowdstart/"+scope.routeId+"/detail"; scope.shareAnywhere = function() { - $cordovaSocialSharing.share("Hey, check out this new Crowdstart route from Beeline!", - "New Beeline Crowdstart Route", null, $rootScope.o.APP.INDEX+scope.routeId+"/detail"); + $cordovaSocialSharing.share("Hey, check out this new Crowdstart route from "+$rootScope.o.APP.NAME+"!", + "New "+$rootScope.o.APP.NAME+" Crowdstart Route", null, $rootScope.o.APP.INDEX+scope.routeId+"/detail"); }; }, };
14
diff --git a/converters/fromZigbee.js b/converters/fromZigbee.js @@ -2368,9 +2368,7 @@ const converters = { AC0251100NJ_cmdMoveToColorTemp: { cid: 'lightingColorCtrl', type: 'cmdMoveToColorTemp', - convert: (model, msg, publish, options) => { - return {action: 'circle_click'}; - }, + convert: (model, msg, publish, options) => null, }, visonic_contact: { cid: 'ssIasZone',
7
diff --git a/docs/guides/theme-directory.md b/docs/guides/theme-directory.md @@ -10,11 +10,11 @@ Sabaki v0.40.0 has introduced changes the DOM structure, so themes that worked u | Theme | Screenshot | | ----- | ---------- | -| [BattsGo Theme](https://github.com/JJscott/BattsGo) | ![Screenshot](https://github.com/JJscott/BattsGo/raw/master/board_example.png) | | [Photorealistic Theme](https://github.com/SabakiHQ/theme-photorealistic) | ![Screenshot](https://github.com/SabakiHQ/theme-photorealistic/raw/master/screenshot.png) | | [Wood Stone Theme](https://github.com/geovens/Sabaki-Theme#wood-stone) | ![Screenshot](https://github.com/geovens/sabaki-theme/raw/master/woodstone/screenshot.jpg) | | [Cartoon Theme](https://github.com/geovens/Sabaki-Theme#cartoon) | ![Screenshot](https://github.com/geovens/sabaki-theme/raw/master/cartoon/screenshot.jpg) | | [Subdued Theme](https://github.com/fohristiwhirl/sabaki_subdued_theme_40) | ![Screenshot](https://user-images.githubusercontent.com/16438795/47953994-c773e480-df7c-11e8-87d9-002d833cca18.png) | [Real Stones](https://github.com/ParmuzinAlexander/go-themes/raw/master/non-free/real-stones.asar) | ![Screenshot](https://github.com/ParmuzinAlexander/go-themes/raw/master/non-free/real-stones.png) | +| [BattsGo Theme](https://github.com/JJscott/BattsGo) | ![Screenshot](https://github.com/JJscott/BattsGo/raw/master/board_example.png) | You can also customize Sabaki using a [userstyle](userstyle-tutorial.md). Learn [how to package a userstyle into a theme](create-themes.md) and feel free to send in a pull request to add yours to the list!
3
diff --git a/backend/registration_api/pkg/services/enrollment_service.go b/backend/registration_api/pkg/services/enrollment_service.go @@ -22,17 +22,17 @@ func CreateEnrollment(enrollment models.Enrollment, currentRetryCount int) error } func NotifyRecipient(enrollment models.Enrollment) error { - EnrollmentRegistered := "EnrollmentRegistered" - preEnrollmentTemplateString := kernelService.FlagrConfigs.NotificationTemplates[EnrollmentRegistered].Message + EnrollmentRegistered := "enrollmentRegistered" + enrollmentTemplateString := kernelService.FlagrConfigs.NotificationTemplates[EnrollmentRegistered].Message subject := kernelService.FlagrConfigs.NotificationTemplates[EnrollmentRegistered].Subject - var preEnrollmentTemplate = template.Must(template.New("").Parse(preEnrollmentTemplateString)) + var enrollmentTemplate = template.Must(template.New("").Parse(enrollmentTemplateString)) recipient := "sms:" + enrollment.Phone message := "Your pre enrollment for vaccination is " + enrollment.Code log.Infof("Sending SMS %s %s", recipient, message) buf := bytes.Buffer{} - err := preEnrollmentTemplate.Execute(&buf, enrollment) + err := enrollmentTemplate.Execute(&buf, enrollment) if err == nil { if len(enrollment.Phone) > 0 { PublishNotificationMessage("tel:"+enrollment.Phone, subject, buf.String())
10
diff --git a/articles/multifactor-authentication/developer/mfa-from-id-token.md b/articles/multifactor-authentication/developer/mfa-from-id-token.md @@ -65,10 +65,7 @@ In the following snippets you can see examples of how the decoded ID Token will ## Example -In this section we will see how you can check if a user logged in with MFA in a Node.js web app. The code snippets use the following modules: - -- [jwks-rsa](https://github.com/auth0/node-jwks-rsa): Library that retrieves the RSA signing keys from a [**JWKS** (JSON Web Key Set)](/jwks) endpoint. We will use this to retrieve your RSA keys from Auth0 so we can verify the signed ID Token. -- [express-jwt](https://github.com/auth0/express-jwt): Library that validates JWT tokens in your Node.js applications. It provides several functions that make working with JWTs easier. +In this section we will see how you can check if a user logged in with MFA in a web app. ### 1. Authenticate the user @@ -160,7 +157,7 @@ For details on how to do these validations, see the following docs: - [Validate an ID Token](/tokens/id-token#validate-an-id-token) - [Verify Access Tokens for Custom APIs](/api-auth/tutorials/verify-access-token) (this tutorial is about how an API can verify an Access Token, but the content applies also to server-side web apps that validate ID Tokens) -There are many libraries you can use to do these validations. For example, in the snippet below we use the [jwks-rsa](https://github.com/auth0/node-jwks-rsa) and [express-jwt](https://github.com/auth0/express-jwt) libraries. +There are many libraries you can use to do these validations. For example, in the Node.js snippet below we use the [jwks-rsa](https://github.com/auth0/node-jwks-rsa) and [express-jwt](https://github.com/auth0/express-jwt) libraries. ```js // Create middleware for checking the JWT
2
diff --git a/packages/gridfs/gridfs.server.js b/packages/gridfs/gridfs.server.js @@ -167,7 +167,7 @@ FS.Store.GridFS = function(name, options) { // ensure that indexes are added as otherwise CollectionFS fails for Mongo >= 3.0 var collection = new Mongo.Collection(gridfsName); - collection.rawCollection.ensureIndex({ "files_id": 1, "n": 1}); + collection.rawCollection().ensureIndex({ "files_id": 1, "n": 1}); callback(null); });
1
diff --git a/src/controllers/v3-rockets.js b/src/controllers/v3-rockets.js @@ -15,9 +15,11 @@ module.exports = { .limit(limitQuery(ctx.request.query)) .toArray(); data.forEach((rocket) => { + rocket.id = rocket.rocketid; rocket.rocket_id = rocket.id; rocket.rocket_name = rocket.name; rocket.rocket_type = rocket.type; + delete rocket.rocketid; delete rocket.id; delete rocket.name; delete rocket.type; @@ -34,9 +36,11 @@ module.exports = { .find({ id: ctx.params.rocket }) .project({ _id: 0 }) .toArray(); + data[0].id = data[0].rocketid; data[0].rocket_id = data[0].id; data[0].rocket_name = data[0].name; data[0].rocket_type = data[0].type; + delete data[0].rocketid; delete data[0].id; delete data[0].name; delete data[0].type;
10
diff --git a/articles/rules/legacy/index.md b/articles/rules/legacy/index.md @@ -29,10 +29,6 @@ Among many possibilities, Rules can be used to: * Enable counters or persist other information. (For information on storing user data, see: [Metadata in Rules](/rules/metadata-in-rules).) * Enable __multifactor__ authentication, based on context (e.g. last login, IP address of the user, location, etc.). -::: note -You can find more examples of common Rules on Github at [auth0/rules](https://github.com/auth0/rules). -::: - ## Video: Using Rules Watch this video learn all about rules in just a few minutes.
2
diff --git a/src/modules/ui/directives/assetLogo/AssetLogo.js b/src/modules/ui/directives/assetLogo/AssetLogo.js [WavesApp.defaultAssets.BTC]: '/img/assets/bitcoin.svg', [WavesApp.defaultAssets.ETH]: '/img/assets/ethereum.svg', [WavesApp.defaultAssets.EUR]: '/img/assets/euro.svg', - [WavesApp.defaultAssets.USD]: '/img/assets/dollar.svg' + [WavesApp.defaultAssets.USD]: '/img/assets/usd.svg' }; const COLORS_MAP = {
10
diff --git a/server/services/getLinkedCatAuthors.php b/server/services/getLinkedCatAuthors.php @@ -22,7 +22,7 @@ $base_url = "https://" . $author_facet_query = "select?facet.field=author100_a_str" . "&facet.query=author100_a_str" . "&facet=on&fl=author100_a_str" . - "&q=*:*&rows=0"; + "&q=*:*&rows=0&facet.limit=-1&facet.sort=index"; $author_data_query = "select?fl=author100_0,author100_d" . "&rows=1" . @@ -109,7 +109,7 @@ function getAuthors() { # the following array contains a placeholder "" for a possible image link $authors[] = array($author_id, $name, $author_count, $author_date, ""); } - return json_encode($authors); + return json_encode($authors, JSON_UNESCAPED_UNICODE); } function loadCache($fname) {
2
diff --git a/userscript.user.js b/userscript.user.js @@ -90133,6 +90133,7 @@ var $$IMU_EXPORT$$; + // -- general rules -- @@ -96916,7 +96917,13 @@ var $$IMU_EXPORT$$; } var run_cbs = function(our_this, args) { + //console_log("Running cbs for", our_this, args, cb_key); var cbs = check_image_cbs[cb_key]; + if (!cbs) { + console_error("Already ran cbs?", our_this, args, cb_key); + return; + } + delete check_image_cbs[cb_key]; array_foreach(cbs, function(cb) { cb(our_this, args); @@ -97408,7 +97415,7 @@ var $$IMU_EXPORT$$; get_library("shaka", settings, do_request, function(_shaka) { if (!_shaka) { - video.src = src; + err_cb(); return; } @@ -97423,7 +97430,7 @@ var $$IMU_EXPORT$$; //shaka.polyfill.installAll(); if (!shaka.Player.isBrowserSupported()) { console_warn("Unsupported browser for Shaka"); - video.src = src; + err_cb(); return; } @@ -97434,7 +97441,7 @@ var $$IMU_EXPORT$$; var shaka_error_handler = function(e) { console_error(e); - video.src = src; + err_cb(); return; };
1
diff --git a/src/models/behaviors.js b/src/models/behaviors.js @@ -156,8 +156,7 @@ function execShell (command, request, response, logger) { const exec = require('child_process').exec, env = require('../util/helpers').clone(process.env), maxBuffer = require('buffer').constants.MAX_STRING_LENGTH, - isWindows = require('os').platform().indexOf('win') === 0, - maxShellCommandLength = isWindows ? 2048 : 100000; + maxShellCommandLength = 2048; logger.debug(`Shelling out to ${command}`);
12
diff --git a/react/src/components/masthead/components/SprkMastheadAccordion/SprkMastheadAccordion.js b/react/src/components/masthead/components/SprkMastheadAccordion/SprkMastheadAccordion.js @@ -56,17 +56,43 @@ SprkMastheadAccordion.propTypes = { */ idString: PropTypes.string, /** - * Used to render child `SprkMastheadAccordionItem`. + * Used to render children of `SprkMastheadAccordionItem`. */ links: PropTypes.arrayOf( PropTypes.shape({ + /** + * Determines if link renders as an anchor tag, or router link. + */ element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), + /** + * When the link is rendered to a compatible element + * (narrowNav), will draw the specified icon + * to the left of the link text. + */ leadingIcon: PropTypes.string, + /** + * Text for accordion link + */ text: PropTypes.string, + /** + * Expects an array containing link objects. + * Will be treated as a subnav to the link. + */ subNavLinks: PropTypes.arrayOf( PropTypes.shape({ + /** + * Determines if link renders as an anchor tag, or router link. + */ element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), + /** + * When the link is rendered to a compatible element + * (narrowNav), will draw the specified icon + * to the left of the link text. + */ leadingIcon: PropTypes.string, + /** + * text for sub na link + */ text: PropTypes.string, }), ),
7
diff --git a/js/trackCore.js b/js/trackCore.js @@ -264,7 +264,6 @@ var igv = (function (igv) { // Special case -- UCSC refgene files if (fn.endsWith("refgene.txt.gz") || fn.endsWith("refgene.txt")) { return "refgene"; - return; }
1
diff --git a/sirepo/template/warpvnd.py b/sirepo/template/warpvnd.py @@ -6,7 +6,6 @@ u"""Warp VND/WARP execution template. """ from __future__ import absolute_import, division, print_function -from pykern import pkcollections from pykern import pkio from pykern.pkcollections import PKDict from pykern.pkdebug import pkdc, pkdp, pkdlog @@ -234,10 +233,10 @@ def open_data_file(run_dir, model_name, file_index=None): file_index (int): which file to open (default: last one) Returns: - OrderedMapping: various parameters + PKDict: various parameters """ files = _h5_file_list(run_dir, model_name) - res = pkcollections.OrderedMapping() + res = PKDict() res.num_frames = len(files) res.frame_index = res.num_frames - 1 if file_index is None else file_index res.filename = str(files[res.frame_index])
14
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,21 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master where X.Y.Z is the semver of most recent plotly.js release. +## [1.38.1] -- 2018-05-29 + +### Fixed +- Fix transforms on `scattergl` traces [#2677] +- Fix `marker.line.width` scaling in `scattergl` traces [#2677] +- Fix `[un]selected.marker.size` scaling in `scattergl` traces [#2677] +- Create two not three WebGL contexts for scattergl/splom graphs + (bug introduced 1.36.0) [#2656] +- Fix `z` updates of interpolated values on heatmap and contour traces with gaps [#2657] +- Fix select/pan double-click behavior when relayout from one another + (bug introduced in 1.36.0) [#2668] +- Fix shift selection behavior after pan/scroll + (bug introduced in 1.36.0) [#2676] + + ## [1.38.0] -- 2018-05-23 ### Added
3
diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js @@ -1095,6 +1095,14 @@ describe('#AirParser', () => { assert(err instanceof AirRuntimeError.SegmentBookingFailed, 'Should be SegmentBookingFailed error.'); }); }); + + it('should auto detect version and parse 36 version for a failed reservation', () => { + const uParser = new ParserUapi('universal:AirCreateReservationRsp', 'v33_0', { }, false, errorsConfig()); + const xml = fs.readFileSync(`${xmlFolder}/AirCreateReservation.Waitlist.xml`).toString(); + return uParser.parse(xml).then(() => { + assert(uParser.uapi_version === 'v36_0', 'auto-detect correct version'); + }); + }); }); describe('AIR_TICKET_REQUEST', () => {
0
diff --git a/src/components/dashboard/Send.js b/src/components/dashboard/Send.js @@ -81,13 +81,10 @@ const Send = props => { useEffect(() => { const { screenProps } = props - - try { const { state } = props.navigation if (state.params && state.params.code) { const code = readCode(state.params.code) - routeAndPathForCode('send', code) .then(({ route, params }) => screenProps.push(route, params)) .catch(({ message }) => { @@ -98,13 +95,6 @@ const Send = props => { }) }) } - } catch (e) { - showDialogWithData({ - title: 'Error', - message: e.message, - onDismiss: screenProps.goToRoot - }) - } }, []) const { to } = screenState
2
diff --git a/README.md b/README.md @@ -16,6 +16,7 @@ from Node.js applications. * Data Services First - MarkLogic's support for microservices * Optic query DSL, document matching, relevance, multiple groups * Generate query based views, redaction on rows +* Data Movement SDK - move large amounts of data into, out of, or within a MarkLogic cluster ## Getting Started
0
diff --git a/imports/ui/templates/widgets/tally/tally.js b/imports/ui/templates/widgets/tally/tally.js @@ -10,14 +10,6 @@ import { getUser } from '/imports/ui/templates/components/identity/avatar/avatar import '/imports/ui/templates/widgets/tally/tally.html'; -/** -* @summary checks if this transaction is a revoke -* @param {string} userId check if user exists -*/ -const _isRevoke = (userId) => { - return !Meteor.users.findOne({ _id: userId }); -}; - /** * @summary translates data info about vote into a renderable contracts * @param {object} post a transaction Object @@ -119,29 +111,17 @@ Template.tally.onRendered(function () { const currentFeed = instance.feed.get(); const post = fields; post._id = id; - let voteContract; const userSubscriptionId = _requiresUserSubscription(post); - console.log(userSubscriptionId); if (userSubscriptionId) { getUser(userSubscriptionId); - voteContract = _voteToContract(post, contract, noTitle); - /* - if (!currentFeed) { - instance.feed.set([voteContract]); - } else if (!here(voteContract, currentFeed)) { - currentFeed.push(voteContract); - instance.feed.set(_.uniq(currentFeed)); } - */ - } else if (Meteor.userId()) { - voteContract = _voteToContract(post, contract, noTitle); + const voteContract = _voteToContract(post, contract, noTitle); if (!currentFeed) { instance.feed.set([voteContract]); } else if (!here(voteContract, currentFeed)) { currentFeed.push(voteContract); instance.feed.set(_.uniq(currentFeed)); } - } }, }); }
11
diff --git a/app/models/map/copier.rb b/app/models/map/copier.rb @@ -18,6 +18,11 @@ module CartoDB if map.user @new_map.user ||= map.user end + + # Default is to copy all attributes from the canonical map. This overrides it + @new_map.scrollwheel = true + @new_map.options[:scrollwheel] = true + @new_map end
12
diff --git a/src/components/legend/get_legend_data.js b/src/components/legend/get_legend_data.js @@ -86,18 +86,19 @@ module.exports = function getLegendData(calcdata, opts) { } if(shouldCollapse) legendData = [legendData]; - // sort considering trace.legendrank and legend.traceorder var orderFn = function(a, b) { return a.trace.legendrank - b.trace.legendrank; }; for(i = 0; i < legendData.length; i++) { + // sort considering trace.legendrank and legend.traceorder legendData[i].sort(orderFn); if(reversed) legendData[i].reverse(); - } - for(i = 0; i < legendData.length; i++) { + // add extra dim for(j = 0; j < legendData[i].length; j++) { - legendData[i][j] = [legendData[i][j]]; + legendData[i][j] = [ + legendData[i][j] + ]; } }
2
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/survey.html b/modules/xerte/parent_templates/Nottingham/models_html5/survey.html correctAnswer.push(value.getAttribute("name")); }); - //TODO fix feedback == null - //fix next button disabled after change after submit - var name = $thisQ.getAttribute("prompt"); if ($thisQ.getAttribute("name")) if (survey.currentQuestion == survey.questions.length) { survey.trackSurvey(); + survey.resultShown = true; } else { $("#qTxt").html(""); XTSetPageScore(x_currentPage, myScore); + survey.checked = true; } function calcPercentage(index, count) } else { - survey.loadQuestions(); + survey.loadQuestion(); } // Queue reparsing of MathJax - fails if no network connection try
1
diff --git a/app_headless/index.js b/app_headless/index.js @@ -42,6 +42,7 @@ async function main() state.userCamera.fitViewToScene(state.gltf, state.sceneIndex); view.animate(state); + view.updateViewport(width, height); view.renderFrame(state); let pixels = new Uint8Array(width * height * 4);
3
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thanks for contributing to Cesium. You rock! Are you * [getting started contributing](#getting-started-contributing), or * [opening a pull request](#opening-a-pull-request)? -To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](#code-of-conduct). +To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](CODEOFCONDUCT.md). # Submitting an Issue @@ -79,7 +79,3 @@ Our code is our lifeblood so maintaining Cesium's high code quality is important * Include reference documentation with code examples. Follow the [Documentation Guide](Documentation/Contributors/DocumentationGuide/README.md). * If the change is significant, add a new [Sandcastle](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html) example or extend and existing one. * If you added third-party libraries, including new version of existing libraries, update [LICENSE.md](LICENSE.md). Mention it in [CHANGES.md](CHANGES.md). If you plan to add a third-party library, start a new thread on the [Cesium forum](http://cesiumjs.org/forum.html) first. - -# Code of Conduct - -View our current code of conduct [here](CODEOFCONDUCT.md).
3
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/content/admin/.content.xml b/admin-base/ui.apps/src/main/content/jcr_root/content/admin/.content.xml sling:resourceType="admin/components/debugger" dataFrom="/"/> <tour jcr:primaryType="nt:unstructured" sling:resourceType="admin/components/tour"> - <item1 jcr:primaryType="nt:unstructured" locator="/jcr:content/content/iconlist" text="select one of the main pillars of peregrine cms to start exploring"/> - <item2 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/pages" text="create and manage pages for your site"/> - <item3 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/assets" text="create and manage assets for your site"/> - <item4 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/objects" text="create and manage objects for your site"/> - <item5 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/templates" text="create and manage templates for your site"/> - <item6 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" text="primary navigation to navigate between screens, access to help and logout"/> - <item7 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" text="return to this screen" selector=".peregrine-logo"/> - <item8 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" text="logout" selector="li:nth-child(1)"/> + + <item1 jcr:primaryType="nt:unstructured" locator="/jcr:content" + text="Welcome to the Peregrine Administrator dashboard!"/> + <item2 jcr:primaryType="nt:unstructured" locator="/jcr:content/content/iconlist" + text="From this page you can access all of the core tools provided by Peregrine to manage your sites"/> + <item3 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/pages" + text="The Sites explorer gives you an overview of your sites, and allows you to edit the structure of your pages"/> + <item4 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/assets" + text="From the Asset explorer, you can add and manage assets such as images that are available throughout your sites"/> + <item5 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/objects" + text="Use the Object explorer to create and manage common content data for your sites"/> + <item6 jcr:primaryType="nt:unstructured" locator="/content/admin/tools/templates" + text="Create and edit page Templates for use throughout your sites pages"/> + <item7 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" + text="Use the navigation bar to quickly move throughout the dashboard"/> + <item8 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" + text="Return to the Admin dashboard home page (this page)" selector=".peregrine-logo"/> + <item9 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" + text="Logout of the admin dashboard" selector="li:nth-child(1)"/> + <item10 jcr:primaryType="nt:unstructured" locator="/jcr:content/nav" + text="Try the help button on other pages!" selector="li:nth-child(2)"/> + <item11 jcr:primaryType="nt:unstructured" locator="/jcr:content" + text="Thanks for choosing Peregrine CMS!"/> + </tour> </jcr:content>
7
diff --git a/src/components/galleria/Galleria.css b/src/components/galleria/Galleria.css display: flex; flex-direction: column; position: relative; + flex-shrink: 0; } .p-galleria-preview-container { position: relative; + display: flex; + flex-shrink: 0; } .p-galleria-preview-container .p-galleria-preview-nav-button { .p-galleria-preview-caption { position: absolute; bottom: 0; + left: 0; padding: 1em; width: 100%; } /* Indicators */ .p-galleria-indicator-onpreview .p-galleria-indicator-container { position: absolute; + z-index: 1; } .p-galleria-indicator-onpreview.p-galleria-indicators-top .p-galleria-indicator-container { top: 1em; + left: 0; width: 100%; } .p-galleria-indicator-onpreview.p-galleria-indicators-right .p-galleria-indicator-container { right: 1em; + top: 0; height: 100%; } .p-galleria-indicator-onpreview.p-galleria-indicators-bottom .p-galleria-indicator-container { bottom: 1em; + left: 0; width: 100%; } .p-galleria-indicator-onpreview.p-galleria-indicators-left .p-galleria-indicator-container { left: 1em; + top: 0; height: 100%; } .p-galleria-indicator-onpreview.p-galleria-indicators-left .p-galleria-preview-caption, .p-galleria-indicator-onpreview.p-galleria-indicators-left .p-galleria-preview-prev { left: 4em; } +.p-galleria-indicator-onpreview.p-galleria-indicators-left .p-galleria-preview-content .p-galleria-preview-container, +.p-galleria-indicator-onpreview.p-galleria-indicators-right .p-galleria-preview-content .p-galleria-preview-container { + flex-shrink: 1; +} /* Positions */ /* Thumbnails */ align-items: center; } .p-galleria-thumbnails-left .p-galleria-content .p-galleria-preview-content, +.p-galleria-thumbnails-right .p-galleria-content .p-galleria-preview-content { + flex-direction: row; + flex-shrink: 1; +} +.p-galleria-thumbnails-left .p-galleria-preview-content .p-galleria-preview-container, +.p-galleria-thumbnails-right .p-galleria-preview-content .p-galleria-preview-container { + flex-shrink: 1; +} +.p-galleria-thumbnails-left .p-galleria-content .p-galleria-preview-content, .p-galleria-thumbnails-top .p-galleria-content .p-galleria-preview-content { order: 2; } .p-galleria-indicators-right .p-galleria-preview-content .p-galleria-indicator-container { flex-direction: column; } +.p-galleria-indicators-left .p-galleria-preview-content .p-galleria-preview-container, +.p-galleria-indicators-right .p-galleria-preview-content .p-galleria-preview-container { + flex-shrink: 1; +} /* FullScreen */ .p-galleria-mask {
7
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -428,6 +428,8 @@ const baseResolvers = { } }, }; +// Use the canActivateModule resolver for getCheckRequirementsStatus +baseResolvers.getCheckRequirementsStatus = baseResolvers.canActivateModule; const baseSelectors = { /**
4
diff --git a/js/binance.js b/js/binance.js // --------------------------------------------------------------------------- const Exchange = require ('./base/Exchange'); -const { - ExchangeError, - ArgumentsRequired, - ExchangeNotAvailable, - InsufficientFunds, - OrderNotFound, - InvalidOrder, - DDoSProtection, - InvalidNonce, - AuthenticationError, - RateLimitExceeded, - PermissionDenied, - NotSupported, - BadRequest, - BadSymbol, - AccountSuspended, - OrderImmediatelyFillable, -} = require ('./base/errors'); +const { ExchangeError, ArgumentsRequired, ExchangeNotAvailable, InsufficientFunds, OrderNotFound, InvalidOrder, DDoSProtection, InvalidNonce, AuthenticationError, RateLimitExceeded, PermissionDenied, NotSupported, BadRequest, BadSymbol, AccountSuspended, OrderImmediatelyFillable} = require ('./base/errors'); const { TRUNCATE } = require ('./base/functions/number'); const Precise = require ('./base/Precise'); @@ -3441,15 +3424,12 @@ module.exports = class binance extends Exchange { if (tag !== undefined) { request['addressTag'] = tag; } - const network = this.safeString (params, 'network'); + const networks = this.safeValue (this.options, 'networks', {}); + let network = this.safeString (params, 'network'); // this line allows the user to specify either ERC20 or ETH + network = this.safeString (networks, network, network); // handle ERC20>ETH alias if (network !== undefined) { - if (this.options.networks[network] !== undefined) { request['network'] = network; - } else { - const networkEnabled = []; - for (let i = 0; i < currency.networkList.length; i++) networkEnabled.push (currency.networkList[i].network); - throw new ArgumentsRequired (this.id + ' does not have this network enabled, only this ' + networkEnabled.join (', ')); - } + params = this.omit (params, 'network'); } const response = await this.sapiPostCapitalWithdrawApply (this.extend (request, params)); // { id: '9a67628b16ba4988ae20d329333f16bc' }
1
diff --git a/src/components/topic/snapshots/foci/builder/keywordSearch/KeywordStoryCountPreviewContainer.js b/src/components/topic/snapshots/foci/builder/keywordSearch/KeywordStoryCountPreviewContainer.js @@ -34,7 +34,7 @@ class KeywordStoryCountPreviewContainer extends React.Component { if (counts !== null) { const data = [ // format the data for the bubble chart help { label: formatMessage(localMessages.filteredLabel), - value: counts.filtered, + value: counts.count, color: getBrandDarkColor(), labelColor: 'rgb(255,255,255)' }, { label: formatMessage(localMessages.totalLabel), value: counts.total },
4
diff --git a/ui/src/components/Collection/CollectionDiagramsIndexMode.jsx b/ui/src/components/Collection/CollectionDiagramsIndexMode.jsx @@ -6,7 +6,7 @@ import { connect } from 'react-redux'; import { queryDiagrams } from 'src/actions'; import { queryCollectionDiagrams } from 'src/queries'; import { selectDiagramsResult } from 'src/selectors'; -import ErrorScreen from 'src/components/Screen/ErrorScreen'; +import { ErrorSection } from 'src/components/common'; import DiagramCreateMenu from 'src/components/Diagram/DiagramCreateMenu'; import DiagramList from 'src/components/Diagram/DiagramList'; @@ -27,7 +27,7 @@ export class CollectionDiagramsIndexMode extends Component { const { collection, result } = this.props; if (result.isError) { - return <ErrorScreen error={result.error} />; + return <ErrorSection error={result.error} />; } return (
14
diff --git a/src/shared/components/Bordered.js b/src/shared/components/Bordered.js @@ -7,8 +7,7 @@ const styles = theme => ({ border: `${theme.border.borderWidth}px solid ${theme.border.borderColor}` }, greyed: { - border: `${theme.border.borderWidth}px solid rgba(0, 0, 0, 0.23)`, - borderRadius: 0 + border: `${theme.border.borderWidth}px solid rgba(0, 0, 0, 0.23)` } });
5
diff --git a/frontend/imports/ui/client/widgets/markets.html b/frontend/imports/ui/client/widgets/markets.html MARKETS </h2> </div> - {{#if pairContains 'sai' }} + {{#if pairContains 'dai' }} <div class="col-xs-6"> - <a class="action-button" href="https://sai.makerdao.com" target="_blank">CREATE SAI</a> + <a class="action-button" href="https://dai.makerdao.com" target="_blank">CREATE DAI</a> </div> {{/if}} </div>
14
diff --git a/shared/js/background/classes/tab.es6.js b/shared/js/background/classes/tab.es6.js @@ -113,10 +113,6 @@ class Tab { } }; - addOrUpdateScriptsBlocked (url) { - this.scriptsBlocked += `|${url}` - }; - checkHttpsRequestsOnComplete () { // TODO later: watch all requests for http/https status and // report mixed content
2
diff --git a/articles/clients/client-grant-types.md b/articles/clients/client-grant-types.md @@ -121,6 +121,12 @@ Trusted first-party clients can additionally use the following `grant_types`: </tr> </table> +<!-- markdownlint-enable MD033 --> + +::: note +Those implementing Passwordless Authentication should use hosted login pages instead of the `oauth/ro` endpoint. +::: + ## Enable a Legacy Grant Type ::: warning
0
diff --git a/iris/queries/community/billingSettings.js b/iris/queries/community/billingSettings.js @@ -29,13 +29,15 @@ export default async ( loaders.stripeCustomers.load(stripeCustomerId), ]); - const { isOwner } = permissions; + const { isOwner, isModerator } = permissions; const customer = stripeCustomer && stripeCustomer.reduction.length > 0 ? stripeCustomer.reduction[0] : null; const sources = - isOwner && customer ? await StripeUtil.getSources(customer) : []; + (isOwner || isModerator) && customer + ? await StripeUtil.getSources(customer) + : []; const invoices = isOwner && customer ? await getInvoicesByCustomerId(stripeCustomerId) : []; const cleanInvoices = StripeUtil.cleanInvoices(invoices);
11
diff --git a/packages/react-jsx-highstock-datepickers/src/index.js b/packages/react-jsx-highstock-datepickers/src/index.js @@ -141,15 +141,15 @@ class DateRangePickers extends Component { value={fromDate} onDayChange={this.handleFromDateChange(onChangeFromDate)} format={dayFormat} - {...datePickerProps} - {...localisationOpts} /> + dayPickerProps={{ ...datePickerProps, ...localisationOpts }} + /> <span className={`${className}__label ${className}__to-label`}>{toLabel}: </span> <DayPickerInput value={toDate} onDayChange={this.handleToDateChange(onChangeToDate)} format={dayFormat} - {...datePickerProps} - {...localisationOpts} /> + dayPickerProps={{ ...datePickerProps, ...localisationOpts }} + /> </div> ); }
1
diff --git a/packages/node_modules/@ciscospark/internal-plugin-ediscovery-report-client/src/ediscovery-report-client.js b/packages/node_modules/@ciscospark/internal-plugin-ediscovery-report-client/src/ediscovery-report-client.js @@ -24,7 +24,15 @@ const EDiscoveryReportClient = SparkPlugin.extend({ service: 'ediscovery', resource: 'report', body - }).then((res) => this._processCreateReportSuccess(res)); + }).then((res) => { + console.log(res); + this._processCreateReportSuccess(res); + }).catch((reason) => { + console.log(reason); + return reason; + // Normal behaviour + //return Promise.reject(reason); + }); }, _processCreateReportSuccess(res) { @@ -38,7 +46,15 @@ const EDiscoveryReportClient = SparkPlugin.extend({ method: 'GET', service: 'ediscovery', resource: 'reports' - }).then((res) => this._processGetReportsSuccess(res)); + }).then((res) => { + console.log(res); + this._processGetReportsSuccess(res); + }).catch((reason) => { + console.log(reason); + return reason; + // Normal behaviour + //return Promise.reject(reason); + }); }, _processGetReportsSuccess(res) {
9
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml @@ -15,7 +15,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs on Stripe SDKs - if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'com.stripe:stripe-java', 'Stripe.net') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}} + if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'com.stripe:stripe-java') || contains(steps.dependabot-metadata.outputs.dependency-names, 'Stripe.net') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}} run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}}
3
diff --git a/src/pages/Armor.jsx b/src/pages/Armor.jsx @@ -162,11 +162,11 @@ function Armor() { charSet='utf-8' /> <title> - Escape from Tarkov item tracker + Escape from Tarkov Armor chart </title> <meta name = 'description' - content = 'Track what items you need to Find in Raid for Escape from Tarkov quests' + content = 'All armor in Escape from Tarkov sortable by price, repairability, armor class etc' /> </Helmet>, <Menu
7
diff --git a/core/block.js b/core/block.js @@ -1796,14 +1796,14 @@ Blockly.Block.prototype.resolveReferenceWithEnv_ = function(env, opt_bind) { * the given connection's input. * @param {!Blockly.Connection} connection Connection to specify a scope. * @param {boolean=} opt_implicit If true, also collect implicit context of the - * workspace. + * workspace. Defaults to false. * @return {Object} Object mapping variable name to its variable representation. */ Blockly.Block.prototype.allVisibleVariables = function(conn, opt_implicit) { if (conn.getSourceBlock() != this) { return {}; } - var env = opt_implicit == true ? this.workspace.getImplicitContext() : {}; + var env = opt_implicit === true ? this.workspace.getImplicitContext() : {}; // TODO(harukam): Use ordered dictionary to keep the order of variable // declaration.
4
diff --git a/website/content/docs/widgets/index.md b/website/content/docs/widgets/index.md @@ -8,7 +8,7 @@ Widgets define the data type and interface for entry fields. Netlify CMS comes w Widgets are specified as collection fields in the Netlify CMS `config.yml` file. Note that [YAML syntax](https://en.wikipedia.org/wiki/YAML#Basic_components) allows lists and objects to be written in block or inline style, and the code samples below include a mix of both. -To see working examples of all of the built-in widgets, try making a 'Kitchen Sink' collection item on the [CMS demo site](https://cms-demo.netlify.com). (No login required: click the login button and the CMS will open.) You can refer to the demo [configuration code](https://github.com/netlify/netlify-cms/blob/master/example/config.yml#L60) to see how each field was configured. +To see working examples of all of the built-in widgets, try making a 'Kitchen Sink' collection item on the [CMS demo site](https://cms-demo.netlify.com). (No login required: click the login button and the CMS will open.) You can refer to the demo [configuration code](https://github.com/netlify/netlify-cms/blob/master/packages/netlify-cms/example/config.yml) to see how each field was configured. ## Common widget options
3
diff --git a/components/Social.js b/components/Social.js @@ -3,7 +3,7 @@ const PeerCard = (props) => { return ` <div class="twoD-social-peerCard"> <div class="twoD-social-peerCard-imgWrap"> - <img class="twoD-social-peerCard-avatar" src="https://media.istockphoto.com/vectors/default-avatar-profile-icon-gray-placeholder-photo-vector-id844061224?b=1&k=6&m=844061224&s=612x612&w=0&h=adm3xmgWwC3YTVC2swWz02NDmtZ6vFaIw8a_XBGsOLk="> + <img class="twoD-social-peerCard-avatar" src="../assets/avatar.jpg"> </div> <div class="twoD-social-peerCard-peerName"> <h2>Peer ID</h2>
2
diff --git a/articles/product-lifecycle/migrations.md b/articles/product-lifecycle/migrations.md @@ -77,7 +77,7 @@ We are actively migrating customers to new behaviors for all <dfn data-key="depr </td> </tr> <tr> - <td><a href="/logs/migrate-logs-v2-v3">Tenant Logs Search v2</a></td> + <td><a href="/logs/guides/migrate-logs-v2-v3">Tenant Logs Search v2</a></td> <td>21 May 2019</td> <td> <strong>Free</strong>: 9 July 2019<br> @@ -85,7 +85,7 @@ We are actively migrating customers to new behaviors for all <dfn data-key="depr <strong>Developer Pro</strong>: 20 August 2019<br> <strong>Enterprise</strong>: 4 November 2019 </td> - <td>To provide our customers with the most reliable and scalable solution, Auth0 has deprecated Tenant Logs Search Engine v2 in favor of v3. Auth0 is proactively migrating customers unaffected by this change, while those who are potentially affected are being notified to opt in for v3 during the provided grace period. See the <a href="/logs/migrate-logs-v2-v3">migration guide</a> for more information.</td> + <td>To provide our customers with the most reliable and scalable solution, Auth0 has deprecated Tenant Logs Search Engine v2 in favor of v3. Auth0 is proactively migrating customers unaffected by this change, while those who are potentially affected are being notified to opt in for v3 during the provided grace period. See the <a href="/logs/guides/migrate-logs-v2-v3">migration guide</a> for more information.</td> </tr> </tbody> </table>
1
diff --git a/src/Input/Input.js b/src/Input/Input.js @@ -130,7 +130,7 @@ export default class Input extends Component { /** * The input value, required for a controlled component. */ - value: PropTypes.string, + value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), }; static defaultProps = {
11
diff --git a/token-metadata/0x9a7a4C141a3BCCE4A31e42C1192Ac6Add35069b4/metadata.json b/token-metadata/0x9a7a4C141a3BCCE4A31e42C1192Ac6Add35069b4/metadata.json "symbol": "XMM", "address": "0x9a7a4C141a3BCCE4A31e42C1192Ac6Add35069b4", "decimals": 10, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/src/core/operations/PhpSerialization.js b/src/core/operations/PhpSerialization.js @@ -26,7 +26,16 @@ const PhpSerialization = { * @returns {string} */ PhpDeserialize: function (input, args) { + /** + * Recursive method for deserializing. + * @returns {*} + */ function handleInput() { + /** + * Read `length` characters from the input, shifting them out the input. + * @param length + * @returns {string} + */ function read(length) { let result = ""; for (let idx = 0; idx < length; idx++) { @@ -39,9 +48,14 @@ const PhpSerialization = { return result; } + /** + * Read characters from the input until `until` is found. + * @param until + * @returns {string} + */ function readUntil(until) { let result = ""; - while (true) { + for(;;) { let char = read(1); if (char === until) { break; @@ -53,6 +67,11 @@ const PhpSerialization = { } + /** + * Read characters from the input that must be equal to `expect` + * @param expect + * @returns {string} + */ function expect(expect) { let result = read(expect.length); if (result !== expect) { @@ -61,6 +80,10 @@ const PhpSerialization = { return result; } + /** + * Helper function to handle deserialized arrays. + * @returns {Array} + */ function handleArray() { let items = parseInt(readUntil(":"), 10) * 2; expect("{");
0
diff --git a/src/scripts/admin/admin.apps.jsx b/src/scripts/admin/admin.apps.jsx @@ -76,10 +76,8 @@ let Apps = React.createClass({ <div>{bidsContainer}</div> </div> <div className="col-xs-2 job-col last"> - <div className="tools clearfix"> <button className="tool cte-edit-button btn btn-admin fade-in" onClick={this._editJobDefinition.bind(this, app)} ><i className="fa fa-pencil" ></i> Edit </button> - <button className="tool cte-edit-button btn btn-admin fade-in" onClick={this._deleteJobDefinition.bind(this, app)} ><i className="fa fa-trash" ></i> Delete</button> - </div> + <WarnButton action={this._deleteJobDefinition.bind(this, app)} icon="fa-trash" message="Delete"/> </div> </div> </div>
4