code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/Components/NotFoundErrorPage.js b/src/Components/NotFoundErrorPage.js @@ -29,7 +29,9 @@ class NotFoundErrorPage extends React.Component {
<h2 className="hero-small">The page you are looking for does not exist.</h2>
</div>
<div className="text-center">
- <LinkTo obj={ Scrivito.Obj.root() }/>
+ <Scrivito.LinkTag to={ Scrivito.Obj.root() } className="btn btn-primary">
+ Go to mainpage <i className="fa fa-angle-right fa-4" aria-hidden="true" />
+ </Scrivito.LinkTag>
</div>
</div>
</section>
@@ -39,14 +41,6 @@ class NotFoundErrorPage extends React.Component {
}
}
-function LinkTo({ obj }) {
- return (
- <Scrivito.LinkTag to={ obj } className="btn btn-primary">
- Go to mainpage<i className="fa fa-angle-right fa-4" aria-hidden="true" />
- </Scrivito.LinkTag>
- );
-}
-
const ConnectedNotFoundErrorPage = Scrivito.connect(NotFoundErrorPage);
export default () => {
| 4 |
diff --git a/magda-web-client/src/UI/DataPreviewMap.js b/magda-web-client/src/UI/DataPreviewMap.js @@ -29,12 +29,13 @@ const determineDistribution = memoize(function determineDistribution(
distributions,
dataSourcePreference
) {
- if (!dataSourcePreference || !dataSourcePreference.length)
+ if (!distributions || !distributions.length) return null;
+ if (!dataSourcePreference || !dataSourcePreference.length) {
dataSourcePreference = defaultDataSourcePreference;
+ }
dataSourcePreference = dataSourcePreference.map(item => item.toLowerCase());
- if (!distributions || !distributions.length) return null;
let selectedDis = null,
- perferenceOrder = -1;
+ preferenceOrder = -1;
distributions
.filter(
item =>
@@ -43,15 +44,15 @@ const determineDistribution = memoize(function determineDistribution(
)
.forEach(dis => {
const format = dis.format.toLowerCase();
- const distributionPerferenceOrder = dataSourcePreference.indexOf(
+ const distributionPreferenceOrder = dataSourcePreference.indexOf(
format
);
- if (distributionPerferenceOrder === -1) return;
+ if (distributionPreferenceOrder === -1) return;
if (
- perferenceOrder === -1 ||
- distributionPerferenceOrder < perferenceOrder
+ preferenceOrder === -1 ||
+ distributionPreferenceOrder < preferenceOrder
) {
- perferenceOrder = distributionPerferenceOrder;
+ preferenceOrder = distributionPreferenceOrder;
selectedDis = dis;
return;
}
| 7 |
diff --git a/src/components/profile/EditProfile.js b/src/components/profile/EditProfile.js // @flow
import React, { useEffect, useState } from 'react'
+import debounce from 'lodash/debounce'
import { useWrappedUserStorage } from '../../lib/gundb/useWrappedStorage'
import logger from '../../lib/logger/pino-logger'
import GDStore from '../../lib/undux/GDStore'
@@ -27,7 +28,7 @@ const EditProfile = ({ screenProps, theme, styles }) => {
setProfile(storedProfile)
}, [storedProfile])
- const validate = async () => {
+ const validate = debounce(async () => {
log.info({ validate: profile })
if (profile && profile.validate) {
const { isValid, errors } = profile.validate()
@@ -37,7 +38,7 @@ const EditProfile = ({ screenProps, theme, styles }) => {
return isValid && indexIsValid
}
return false
- }
+ }, 500)
const handleProfileChange = newProfile => {
if (saving) {
| 0 |
diff --git a/conf/application.conf b/conf/application.conf @@ -10,7 +10,7 @@ application.secret=${?SIDEWALK_APPLICATION_SECRET}
# The application languages
# ~~~~~
-application.langs="en"
+application.langs="en,es"
# Global object class
# ~~~~~
| 12 |
diff --git a/lib/modules/solidity/index.js b/lib/modules/solidity/index.js @@ -15,12 +15,6 @@ class Solidity {
embark.registerCompiler(".sol", this.compile_solidity.bind(this));
-
- this.events.setCommandHandler("contract:compile", (contractCode, cb) => {
- const input = {'fiddler': {content: contractCode.replace(/\r\n/g, '\n')}};
- this.compile_solidity_code(input, {}, true, cb);
- });
-
embark.registerAPICall(
'post',
'/embark-api/contract/compile',
| 2 |
diff --git a/lib/node_modules/@stdlib/_tools/scripts/create_namespace_types.js b/lib/node_modules/@stdlib/_tools/scripts/create_namespace_types.js var path = require( 'path' );
var fs = require( 'fs' );
+var contains = require( '@stdlib/assert/contains' );
+var stdin = require( '@stdlib/process/read-stdin' );
+var stdinStream = require( '@stdlib/streams/node/stdin' );
+var reEOL = require( '@stdlib/regexp/eol' );
var removePunctuation = require( '@stdlib/string/remove-punctuation' );
var readJSON = require( '@stdlib/fs/read-json' ).sync;
var replace = require( '@stdlib/string/replace' );
@@ -141,12 +145,13 @@ function createDefinitionFile( ns, imports, properties, description ) {
}
/**
-* Main execution sequence.
+* Creates Typescript definition and test files for the namespace ass.
*
* @private
+* @param {string} fullPath - full namespace name
* @returns {void}
*/
-function main() {
+function create( fullPath ) {
var RE_DOC_MAIN_DECLARE;
var nsIdentifier;
var description;
@@ -156,7 +161,6 @@ function main() {
var properties;
var indexFile;
var tsDefPath;
- var fullPath;
var testFile;
var defFile;
var pkgPath;
@@ -171,15 +175,17 @@ function main() {
var ns;
var RE;
- fullPath = process.argv[ 2 ];
- ns = path.basename( fullPath );
importStmts = [];
properties = [];
+ ns = path.basename( fullPath );
entryPoint = require.resolve( fullPath );
indexFile = fs.readFileSync( entryPoint, 'utf-8' );
console.log( 'Loading '+entryPoint+'...' );
+ if ( !RE_NAMESPACE.test( indexFile ) ) {
+ return;
+ }
nsIdentifier = RE_NAMESPACE.exec( indexFile )[ 1 ];
nsIdentifier = removePunctuation( nsIdentifier );
RE = new RegExp( 'setReadOnly\\( '+nsIdentifier+', \'([a-z0-9_]+)\', require\\( \'([^\']+)\' \\) \\)', 'ig' );
@@ -258,4 +264,40 @@ function main() {
}
}
+/**
+* Callback invoked upon reading from `stdin`.
+*
+* @private
+* @param {(Error|null)} error - error object
+* @param {Buffer} data - data
+* @returns {void}
+*/
+function onRead( error, data ) {
+ var lines;
+ var i;
+ if ( error ) {
+ return console.error( error.message );
+ }
+ lines = data.toString().split( reEOL.REGEXP );
+ for ( i = 0; i < lines.length; i++ ) {
+ if ( lines[ i ] && !contains( lines[ i ], '_tools' ) ) {
+ create( lines[ i ] );
+ }
+ }
+}
+
+/**
+* Main execution sequence.
+*
+* @private
+* @returns {void}
+*/
+function main() {
+ // Check if we are receiving data from `stdin`...
+ if ( !stdinStream.isTTY ) {
+ return stdin( onRead );
+ }
+ create( process.argv[ 2 ] );
+}
+
main();
| 11 |
diff --git a/lib/assets/test/spec/new-dashboard/unit/specs/components/MapCard/__snapshots__/CondensedMapCard.spec.js.snap b/lib/assets/test/spec/new-dashboard/unit/specs/components/MapCard/__snapshots__/CondensedMapCard.spec.js.snap @@ -19,7 +19,7 @@ exports[`MapCard.vue Events should receive and process correctly the event when
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -43,7 +43,7 @@ exports[`MapCard.vue Events should receive and process correctly the event when
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -67,7 +67,7 @@ exports[`MapCard.vue Methods should close quick actions 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -91,7 +91,7 @@ exports[`MapCard.vue Methods should open quick actions 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -117,7 +117,7 @@ exports[`MapCard.vue Methods should show thumbnail error 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -141,7 +141,7 @@ exports[`MapCard.vue Methods should toggle mouse hover 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -165,7 +165,7 @@ exports[`MapCard.vue Methods should toggle mouse hover 2`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -189,7 +189,7 @@ exports[`MapCard.vue should render correct contents 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -213,7 +213,7 @@ exports[`MapCard.vue should render description and tag dropdown 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -237,7 +237,7 @@ exports[`MapCard.vue should render description and tags 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
@@ -261,7 +261,7 @@ exports[`MapCard.vue should show the map is shared 1`] = `
</div>
<div class="cell cell--actions">
<!---->
- <mapquickactions-stub map="[object Object]"></mapquickactions-stub>
+ <mapquickactions-stub map="[object Object]" class="map--quick-actions"></mapquickactions-stub>
</div>
</a>
`;
| 3 |
diff --git a/packages/titus-backend/package.json b/packages/titus-backend/package.json "docker:dev:exec": "docker-compose -f docker/docker-compose-dev.yml exec api",
"docker:dev:migrate": "docker-compose -f docker/docker-compose-dev.yml exec api npm run migrate",
"docker:dev:seed": "docker-compose -f docker/docker-compose-dev.yml exec api npm run dev:seed",
- "dev:start": "nodemon -P 5000 -L .",
+ "dev:start": "nodemon --ignore pgdata/ -P 5000 -L .",
"dev:cleandb": "rm -rf pgdata",
"lint": "eslint .",
"lint:fix": "eslint . --fix"
| 8 |
diff --git a/Source/DataSources/CzmlDataSource.js b/Source/DataSources/CzmlDataSource.js @@ -1534,11 +1534,11 @@ define([
processPacketData(Boolean, ellipsoid, 'show', ellipsoidData.show, interval, sourceUri, entityCollection, query);
processPacketData(Cartesian3, ellipsoid, 'radii', ellipsoidData.radii, interval, sourceUri, entityCollection, query);
- processPacketData(Cartesian3, ellipsoid, 'innerRadii', ellipsoidData.innerRadii, interval, sourceUri, entityCollection);
- processPacketData(Number, ellipsoid, 'minimumAzimuth', ellipsoidData.minimumAzimuth, interval, sourceUri, entityCollection);
- processPacketData(Number, ellipsoid, 'maximumAzimuth', ellipsoidData.maximumAzimuth, interval, sourceUri, entityCollection);
- processPacketData(Number, ellipsoid, 'minimumElevation', ellipsoidData.minimumElevation, interval, sourceUri, entityCollection);
- processPacketData(Number, ellipsoid, 'maximumElevation', ellipsoidData.maximumElevation, interval, sourceUri, entityCollection);
+ processPacketData(Cartesian3, ellipsoid, 'innerRadii', ellipsoidData.innerRadii, interval, sourceUri, entityCollection, query);
+ processPacketData(Number, ellipsoid, 'minimumClock', ellipsoidData.minimumClock, interval, sourceUri, entityCollection, query);
+ processPacketData(Number, ellipsoid, 'maximumClock', ellipsoidData.maximumClock, interval, sourceUri, entityCollection, query);
+ processPacketData(Number, ellipsoid, 'minimumCone', ellipsoidData.minimumCone, interval, sourceUri, entityCollection, query);
+ processPacketData(Number, ellipsoid, 'maximumCone', ellipsoidData.maximumCone, interval, sourceUri, entityCollection, query);
processPacketData(Boolean, ellipsoid, 'fill', ellipsoidData.fill, interval, sourceUri, entityCollection, query);
processMaterialPacketData(ellipsoid, 'material', ellipsoidData.material, interval, sourceUri, entityCollection, query);
processPacketData(Boolean, ellipsoid, 'outline', ellipsoidData.outline, interval, sourceUri, entityCollection, query);
@@ -1617,7 +1617,6 @@ define([
processPacketData(Number, model, 'maximumScale', modelData.maximumScale, interval, sourceUri, entityCollection, query);
processPacketData(Boolean, model, 'incrementallyLoadTextures', modelData.incrementallyLoadTextures, interval, sourceUri, entityCollection, query);
processPacketData(Boolean, model, 'runAnimations', modelData.runAnimations, interval, sourceUri, entityCollection, query);
- processPacketData(Boolean, model, 'clampAnimations', modelData.clampAnimations, interval, sourceUri, entityCollection, query);
processPacketData(ShadowMode, model, 'shadows', modelData.shadows, interval, sourceUri, entityCollection, query);
processPacketData(HeightReference, model, 'heightReference', modelData.heightReference, interval, sourceUri, entityCollection, query);
processPacketData(Color, model, 'silhouetteColor', modelData.silhouetteColor, interval, sourceUri, entityCollection, query);
| 3 |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -356,6 +356,8 @@ buildtest:storage-api:
- cd magda-storage-api
- docker-compose up -d
- lerna run build --scope=@magda/storage-api --include-filtered-dependencies
+ - export MINIO_HOST=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' `docker ps | egrep -i minio | cut -d' ' -f1`)
+ - echo "Mino Host is $MINIO_HOST"
- yarn run build
- yarn run test
- docker-compose down
| 12 |
diff --git a/scripts/importers/companyList.js b/scripts/importers/companyList.js @@ -3,21 +3,19 @@ var request = require('request')
* https://raw.githubusercontent.com/mozilla-services/shavar-prod-lists/master/disconnect-blacklist.json
* "<tracker host>" : { "c": <company name>, "u": "company url" }
*/
-var remapDataLoc = 'https://raw.githubusercontent.com/mozilla-services/shavar-prod-lists/master/google_mapping.json'
-var companyListLoc = 'https://raw.githubusercontent.com/mozilla-services/shavar-prod-lists/master/disconnect-blacklist.json'
+var companyListLoc = 'https://duckduckgo.com/contentblocking.js?l=disconnect'
const constants = require('./../../shared/data/constants.js')
const majorNetworks = constants.majorTrackingNetworks
var trackerList = { TopTrackerDomains: {} }
-var trackerTypes = ['Advertising', 'Analytics', 'Disconnect', 'Social']
-var remapData
+var trackerTypes = ['Advertising', 'Analytics', 'Social']
var companyList
global.companyList = function (listData) {
return new Promise ((resolve) => {
- request.get(remapDataLoc, (err, res, body) => {
- remapData = JSON.parse(body).categories;
-
- request.get(companyListLoc, (err, res, body) => {
+ request({
+ method: 'GET',
+ uri: companyListLoc,
+ gzip: true}, (err, res, body) => {
companyList = JSON.parse(body);
trackerTypes.forEach((type) => {
@@ -40,14 +38,11 @@ global.companyList = function (listData) {
}
});
});
-
resolve({'name': 'trackersWithParentCompany.json', 'data': trackerList})
})
})
- })
function addToList (type, url, data) {
- type = applyRemapping(type, data.c, url);
trackerList[type] = trackerList[type] ? trackerList[type] : {};
trackerList[type][url] = data;
@@ -56,39 +51,4 @@ global.companyList = function (listData) {
trackerList.TopTrackerDomains[url] = {'c': data.c, 't': type};
}
}
-
- function applyRemapping(type, name, url) {
- if (type === 'Disconnect'){
- var socialRemap = remapSocial(type, name, url);
- if(socialRemap){
- return socialRemap;
- }
-
- var googleReMap = remapGoogle(type, name, url);
- if (googleReMap) {
- return googleReMap
- }
- }
- return type;
- }
-
- function remapSocial(type, name, url){
- var newType
- if (name === 'Facebook' || name === 'Twitter') {
- newType = 'Social'
- }
- return newType;
- }
-
- function remapGoogle(type, name, url){
- var newType;
- if(name === 'Google'){
- Object.keys(remapData).some( function(category) {
- if(remapData[category][0]['Google']['http://www.google.com/'].indexOf(url) !== -1){
- return newType = category;
- }
- });
- }
- return newType;
- }
}
| 4 |
diff --git a/src/traces/isosurface/attributes.js b/src/traces/isosurface/attributes.js @@ -36,7 +36,10 @@ function makeSliceAttr(axLetter) {
description: [
'Specifies the location(s) of slices on the axis [0, n].',
'When not locations specified slices would be created for',
- 'all (0, n) i.e. except start and end caps.'
+ 'all (0, n) i.e. except start and end caps. Please note that',
+ 'if a location do not match the point on the (x|y|z) axis,',
+ 'the slicing plane would simply be located on the closest',
+ 'point on the axis in question (no interpolation on the axis).'
].join(' ')
},
fill: {
| 0 |
diff --git a/assets/js/modules/analytics/datastore/properties.test.js b/assets/js/modules/analytics/datastore/properties.test.js @@ -153,7 +153,6 @@ describe( 'modules/analytics properties', () => {
await registry.dispatch( STORE_NAME ).selectProperty( propertyID );
expect( registry.select( STORE_NAME ).getPropertyID() ).toMatch( propertyID );
- expect( registry.select( STORE_NAME ).getProperties( accountID ) ).toEqual( fixtures.propertiesProfiles.properties );
expect( registry.select( STORE_NAME ).getInternalWebPropertyID() ).toEqual( fixtures.propertiesProfiles.properties[ 0 ].internalWebPropertyId );
expect( registry.select( STORE_NAME ).getProfileID() ).toEqual( fixtures.propertiesProfiles.properties[ 0 ].defaultProfileId );
} );
| 2 |
diff --git a/src/utils/mixins.js b/src/utils/mixins.js @@ -129,7 +129,13 @@ const getModel = (el, $) => {
};
const getElRect = el => {
- if (!el) return;
+ const def = {
+ top: 0,
+ left: 0,
+ width: 0,
+ height: 0
+ };
+ if (!el) return def;
let rectText;
if (isTextNode(el)) {
@@ -139,7 +145,9 @@ const getElRect = el => {
range.detach();
}
- return rectText || el.getBoundingClientRect();
+ return (
+ rectText || (el.getBoundingClientRect ? el.getBoundingClientRect() : def)
+ );
};
/**
| 7 |
diff --git a/lerna.json b/lerna.json "command": {
"init": {
"exact": true
+ },
+ "bootstrap": {
+ "npmClientArgs": [
+ "--no-package-lock"
+ ]
}
},
"packages": [
"packages/*"
],
- "ignoreChanges": ["docs/**"],
+ "ignoreChanges": [
+ "docs/**",
+ "packages/*/package-lock.json"
+ ],
"version": "7.4.1"
}
| 8 |
diff --git a/docs/Introduction.Android.md b/docs/Introduction.Android.md @@ -64,7 +64,7 @@ Following device types could be used to control Android devices:
- `android.attached`. Connect to already-attached android device. The device should be listed in the output of `adb devices` command under provided `name`.
Use this type to connect to Genymotion emulator.
- The `adbName` property accepts a regular expression pattern that allows to specify the pool of device candidates to which you wish to connect. Use this property to run tests in parallel on multiple attached devices.
+ The `avdName` property accepts a regular expression pattern that allows to specify the pool of device candidates to which you wish to connect. Use this property to run tests in parallel on multiple attached devices.
For a complete, working example, refer to the [Detox example app](/examples/demo-react-native/detox.config.js).
| 1 |
diff --git a/docs/recipes/babel.md b/docs/recipes/babel.md @@ -173,7 +173,7 @@ You'll need to install `@babel/register` yourself.
// test/_register.js:
require('@babel/register')({
// These patterns are relative to the project directory (where the `package.json` file lives):
- ignore: ['test/*']
+ ignore: ['node_modules/*', 'test/*']
});
```
| 8 |
diff --git a/README.md b/README.md -Swagger-JS
+Swagger Client
===========
[](https://travis-ci.org/swagger-api/swagger-js)
+**Swagger Client** is a JavaScript module that allows you to fetch, resolve, and interact with Swagger/OpenAPI documents.
+
## New!
-**This is the new version of swagger-js, 3.x. Want to learn more? Check out our [FAQ](https://github.com/swagger-api/swagger-js/blob/master/docs/MIGRATION_2_X.md).**
+**This is the new version of swagger-js, 3.x.** The new version supports Swagger 2.0 as well as OpenAPI 3.
+
+ Want to learn more? Check out our [FAQ](https://github.com/swagger-api/swagger-js/blob/master/docs/MIGRATION_2_X.md).
For the older version of swagger-js, refer to the [*2.x branch*](https://github.com/swagger-api/swagger-js/tree/2.x).
@@ -49,15 +53,15 @@ var swaggerClient = new SwaggerClient(specUrl);
#### API
-This lib exposes these functionalities:
+This lib exposes these functionalities for Swagger 2.0 and OpenAPI 3:
- Static functions for...
- HTTP Client
- - Swagger Spec Resolver ( OAS 2.0 )
+ - Document Resolver (monolithic & subtree)
- TryItOut Executor
- A constructor with the methods...
- HTTP Client, for convenience
- - Swagger Spec Resolver ( OAS 2.0 ), which will use `url` or `spec` from the instance
+ - Document Resolver, which will use `url` or `spec` from the instance
- TryItOut Executor, bound to the `http` and `spec` instance properties
- Tags Interface, also bound to the instance
| 7 |
diff --git a/src/ROUTES.js b/src/ROUTES.js @@ -67,7 +67,7 @@ export default {
getReportDetailsRoute: reportID => `r/${reportID}/details`,
VALIDATE_LOGIN: 'v',
VALIDATE_LOGIN_WITH_VALIDATE_CODE: 'v/:accountID/:validateCode',
- LOGIN_WITH_SHORT_LIVED_TOKEN: 'transition/:accountID/:email/:shortLivedToken/:encryptedAuthToken/:exitTo',
+ LOGIN_WITH_SHORT_LIVED_TOKEN: 'transition',
// This is a special validation URL that will take the user to /workspace/new after validation. This is used
// when linking users from e.com in order to share a session in this app.
| 10 |
diff --git a/src/mode/fdm/prepare.js b/src/mode/fdm/prepare.js point.y += minby - miny;
}
}
+ let thresh = firstLayerHeight * 1.05;
// iterate over layers, find extrusion on belt and
// apply corrections and add brim when specified
for (let layer of output) {
let lastout, first = false;
let minz = Infinity, maxy = -Infinity, minx = Infinity, maxx = -Infinity;
- let thresh = miny * 1.1;
for (let out of layer) {
let point = out.point;
let belty = out.belty = -point.y + point.z * bfactor;
- if (out.emit && belty < firstLayerHeight && lastout && lastout.belty < firstLayerHeight) {
+ if (out.emit && belty <= thresh && lastout && lastout.belty <= thresh) {
out.speed = firstLayerRate;
out.emit *= firstLayerMult;
minx = Math.min(minx, point.x, lastout.point.x);
| 1 |
diff --git a/articles/connections/enterprise/ip-address.md b/articles/connections/enterprise/ip-address.md @@ -10,9 +10,20 @@ seo_alias: ip-address
description: How to use IP Address Authentication with Auth0.
crews: crew-2
---
+# Configure IP Address Authentication
-In this type of connection Auth0 will simply check that the request is coming from an IP address that is within the range specified in the configuration. An optional `username` can be assigned to a given range.
+In this type of connection Auth0 will check that the request is coming from an IP address that is within the range specified in the configuration.
-
+To configure this connection, navigate to [Dashboard > Connections](${manage_url}/#/connections/enterprise) and select the __IP Address Authentication__.
-Notice that ranges are specified in the [CIDR-notation](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). Multiple ranges can be added by separating them with a comma.
+Click __Create New Connection__ and fill in the required information.
+
+
+
+- __Connection Name__: a descriptive name for the connection
+- __IP Range__: comma-seperated list of IP Addresses, as specified in the [CIDR-notation](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) (for example, `62.1.62.25, 172.25.1.244`)
+- __Default username__: (optional) set this to assign a generic username to anyone connecting from this range of IP addresses
+
+Click __Save__. You will then see a list of your registered [clients](${manage_url}/#/clients) and be able to enable the connection for any of them, using a toggle.
+
+That's it! You are now ready to test and start using your connection.
| 0 |
diff --git a/Specs/Scene/ModelExperimental/Model3DTileContentSpec.js b/Specs/Scene/ModelExperimental/Model3DTileContentSpec.js @@ -118,11 +118,6 @@ describe(
scene.camera.lookAt(center, new HeadingPitchRange(0.0, -1.57, range));
}
- function setCameraWithHeight(longitude, latitude, range, centerHeight) {
- const center = Cartesian3.fromRadians(longitude, latitude, centerHeight);
- scene.camera.lookAt(center, new HeadingPitchRange(0.0, -1.57, range));
- }
-
beforeAll(function () {
ExperimentalFeatures.enableModelExperimental = true;
scene = createScene();
@@ -1401,8 +1396,11 @@ describe(
});
describe("clipping planes", function () {
- it("Links model to tileset clipping planes based on bounding volume clipping", function () {
+ beforeEach(function () {
setCamera(centerLongitude, centerLatitude, 15.0);
+ });
+
+ it("Links model to tileset clipping planes based on bounding volume clipping", function () {
return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(
function (tileset) {
const tile = tileset.root;
@@ -1433,7 +1431,6 @@ describe(
});
it("Links model to tileset clipping planes if tileset clipping planes are reassigned", function () {
- setCamera(centerLongitude, centerLatitude, 15.0);
return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(
function (tileset) {
const tile = tileset.root;
@@ -1468,8 +1465,7 @@ describe(
});
it("clipping planes selectively disable rendering", function () {
- setCameraWithHeight(centerLongitude, centerLatitude, 5.0, 5.0);
- return Cesium3DTilesTester.loadTileset(scene, pointCloudRGBUrl).then(
+ return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(
function (tileset) {
let color;
expect(scene).toRenderAndCall(function (rgba) {
@@ -1483,7 +1479,7 @@ describe(
expect(scene).notToRender(color);
- clipPlane.distance = 0.0;
+ clipPlane.distance = 5.0;
expect(scene).toRender(color);
}
@@ -1491,8 +1487,7 @@ describe(
});
it("clipping planes apply edge styling", function () {
- setCamera(centerLongitude, centerLatitude, 5.0);
- return Cesium3DTilesTester.loadTileset(scene, pointCloudRGBUrl).then(
+ return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(
function (tileset) {
let color;
expect(scene).toRenderAndCall(function (rgba) {
@@ -1515,13 +1510,12 @@ describe(
});
it("clipping planes union regions (Uint8)", function () {
- setCamera(centerLongitude, centerLatitude, 5.0);
// Force uint8 mode - there's a slight rendering difference between
// float and packed uint8 clipping planes for this test due to the small context
spyOn(ClippingPlaneCollection, "useFloatTexture").and.returnValue(
false
);
- return Cesium3DTilesTester.loadTileset(scene, pointCloudRGBUrl).then(
+ return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(
function (tileset) {
let color;
expect(scene).toRenderAndCall(function (rgba) {
@@ -1549,12 +1543,11 @@ describe(
});
it("clipping planes union regions (Float)", function () {
- setCamera(centerLongitude, centerLatitude, 5.0);
if (!ClippingPlaneCollection.useFloatTexture(scene.context)) {
// This configuration for the test fails in uint8 mode due to the small context
return;
}
- return Cesium3DTilesTester.loadTileset(scene, pointCloudRGBUrl).then(
+ return Cesium3DTilesTester.loadTileset(scene, withBatchTableUrl).then(
function (tileset) {
let color;
expect(scene).toRenderAndCall(function (rgba) {
| 4 |
diff --git a/test/cases/resolving/data-uri/index.js b/test/cases/resolving/data-uri/index.js @@ -5,7 +5,7 @@ it("should require js module from base64 data-uri", function() {
});
it("should require js module from ascii data-uri", function() {
- const mod = require("data:text/javascript;charset=utf-8;ascii,module.exports={number:42,fn:()=>\"Hello world\"}");
+ const mod = require("data:text/javascript;charset=utf-8,module.exports={number:42,fn:()=>\"Hello world\"}");
expect(mod.number).toBe(42);
expect(mod.fn()).toBe("Hello world");
});
| 2 |
diff --git a/source/setup/components/RemoteFileTree.js b/source/setup/components/RemoteFileTree.js @@ -151,7 +151,7 @@ class RemoteFileTree extends Component {
renderDirectory(dir, depth = 0) {
const isOpen = this.state.openDirectories.includes(dir.path);
const isLoading = this.props.directoriesLoading.includes(dir.path);
- const name = dir.name || "/";
+ const name = dir.name.trim().length > 0 ? dir.name : "/";
const thisItem = (
<ItemRow depth={depth} key={dir.path}>
<ExpandBox onClick={() => this.handleExpansionClick(dir)}>
| 4 |
diff --git a/test/jasmine/tests/hover_spikeline_test.js b/test/jasmine/tests/hover_spikeline_test.js @@ -4,6 +4,7 @@ var Plotly = require('@lib/index');
var Fx = require('@src/components/fx');
var Lib = require('@src/lib');
+var fail = require('../assets/fail_test');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
@@ -16,6 +17,7 @@ describe('spikeline', function() {
describe('hover', function() {
var mockCopy = Lib.extendDeep({}, mock);
+ var gd;
mockCopy.layout.xaxis.showspikes = true;
mockCopy.layout.xaxis.spikemode = 'toaxis';
@@ -24,8 +26,10 @@ describe('spikeline', function() {
mockCopy.layout.xaxis2.showspikes = true;
mockCopy.layout.xaxis2.spikemode = 'toaxis';
mockCopy.layout.hovermode = 'closest';
+
beforeEach(function(done) {
- Plotly.plot(createGraphDiv(), mockCopy.data, mockCopy.layout).then(done);
+ gd = createGraphDiv();
+ Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(done);
});
it('draws lines and markers on enabled axes', function() {
@@ -34,6 +38,20 @@ describe('spikeline', function() {
expect(d3.selectAll('circle.spikeline').size()).toEqual(1);
});
+ it('draws lines and markers on enabled axes w/o tick labels', function(done) {
+ Plotly.relayout(gd, {
+ 'xaxis.showticklabels': false,
+ 'yaxis.showticklabels': false
+ })
+ .then(function() {
+ Fx.hover('graph', {xval: 2, yval: 3}, 'xy');
+ expect(d3.selectAll('line.spikeline').size()).toEqual(4);
+ expect(d3.selectAll('circle.spikeline').size()).toEqual(1);
+ })
+ .catch(fail)
+ .then(done);
+ });
+
it('doesn\'t draw lines and markers on disabled axes', function() {
Fx.hover('graph', {xval: 30, yval: 40}, 'x2y2');
expect(d3.selectAll('line.spikeline').size()).toEqual(2);
| 0 |
diff --git a/app/views/console/functions/function.phtml b/app/views/console/functions/function.phtml @@ -416,7 +416,7 @@ sort($patterns);
<span data-ls-bind="{{execution.trigger}}"></span>
</td>
<td data-title="Time: ">
- <span data-ls-if="{{execution.status}} === 'completed' || {{execution.status}} === 'failed'" data-ls-bind="{{execution.time|seconds2hum}}"></span>
+ <span data-ls-if="{{execution.status}} === 'completed' || {{execution.status}} === 'failed'" data-ls-bind="{{execution.duration|seconds2hum}}"></span>
<span data-ls-if="{{execution.status}} === 'waiting' || {{execution.status}} === 'processing'">-</span>
</td>
<td data-title="">
| 10 |
diff --git a/samples/csharp_dotnetcore/15.handling-attachments/Startup.cs b/samples/csharp_dotnetcore/15.handling-attachments/Startup.cs using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Bot.Builder;
-using Microsoft.Bot.Builder.Integration;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Configuration;
using Microsoft.Bot.Connector.Authentication;
| 0 |
diff --git a/token-metadata/0xD5525D397898e5502075Ea5E830d8914f6F0affe/metadata.json b/token-metadata/0xD5525D397898e5502075Ea5E830d8914f6F0affe/metadata.json "symbol": "MEME",
"address": "0xD5525D397898e5502075Ea5E830d8914f6F0affe",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package.json b/package.json },
"scripts": {
"start": "ws",
- "build": "node build.js type=node",
+ "build": "node build.js type=browser",
"version": "npm run build && git add -A dist",
"test": "./node_modules/.bin/karma start saucelabs.karma.conf.js --single-run --verbose && for a in coverage/*; do codeclimate-test-reporter < \"$a/lcov.info\"; break; done",
"test-local": "karma start",
| 12 |
diff --git a/docs/app/helpers/dynamic-code-snippet.js b/docs/app/helpers/dynamic-code-snippet.js @@ -7,6 +7,7 @@ export default helper(function ([source], { language, dynamic, quote = '"' }) {
}
Object.keys(dynamic).forEach((property) => {
let propertyValue = get(dynamic, property);
+ let hasValue = propertyValue !== undefined && propertyValue !== null;
let type = typeof propertyValue;
let quotedValue =
@@ -16,8 +17,15 @@ export default helper(function ([source], { language, dynamic, quote = '"' }) {
case 'handlebars':
case 'htmlbars':
source = source.replace(
- new RegExp(`(<\\w*[^>]*\\s@[^=]+=){{${property}}}([^>]*>)`, 'g'),
- type === 'string' ? `$1${quotedValue}$2` : `$1{{${propertyValue}}}$2`
+ new RegExp(
+ `(<\\w*[^>]*\\s)(@[^=]+)={{(?:this\\.)?${property}}}([^>]*>)`,
+ 'g'
+ ),
+ hasValue
+ ? type === 'string'
+ ? `$1$2=${quotedValue}$3`
+ : `$1$2={{${propertyValue}}}$3`
+ : '$1$3'
);
source = source.replace(
new RegExp(`{{${property}}}`, 'g'),
@@ -36,5 +44,5 @@ export default helper(function ([source], { language, dynamic, quote = '"' }) {
}
});
- return source;
+ return source.replace(/\n\s*\n/g, '\n');
});
| 7 |
diff --git a/src/serviceworker.js b/src/serviceworker.js @@ -25,3 +25,28 @@ self.addEventListener('push', ev => {
icon: './img/icon128.png'
});
});
+
+self.addEventListener('notificationclick', function(event) {
+ console.log('On notification click: ', event.notification.tag);
+ // Android doesn't close the notification when you click on it
+ // See: http://crbug.com/463146
+ event.notification.close();
+
+ // This looks to see if the current is already open and
+ // focuses if it is
+ event.waitUntil(
+ clients.matchAll({
+ type: "window"
+ })
+ .then(function(clientList) {
+ for (var i = 0; i < clientList.length; i++) {
+ var client = clientList[i];
+ if (client.url == '/' && 'focus' in client)
+ return client.focus();
+ }
+ if (clients.openWindow) {
+ return clients.openWindow('/');
+ }
+ })
+ );
+});
| 9 |
diff --git a/src/web/App.js b/src/web/App.js @@ -676,7 +676,14 @@ App.prototype.stateChange = function(e) {
if (recipeConfig.length === 1) {
title = `${recipeConfig[0].op} - ${title}`;
} else if (recipeConfig.length > 1) {
- title = `${recipeConfig.length} operations - ${title}`;
+ // See how long the full recipe is
+ const ops = recipeConfig.map(op => op.op).join(", ");
+ if (ops.length < 45) {
+ title = `${ops} - ${title}`;
+ } else {
+ // If it's too long, just use the first one and say how many more there are
+ title = `${recipeConfig[0].op}, ${recipeConfig.length - 1} more - ${title}`;
+ }
}
document.title = title;
| 7 |
diff --git a/api/controllers/MusicController.js b/api/controllers/MusicController.js @@ -50,7 +50,7 @@ module.exports = {
/**
* @api {get} /music/queue Get Queue
- * @apiName MusicGetCurrentTrack
+ * @apiName MusicGetQueue
* @apiGroup Music
* @apiPermission authenticated
*
| 10 |
diff --git a/src/validate/meteor.js b/src/validate/meteor.js -import { VALIDATE_OPTIONS, addLocation, combineErrorDetails, serversExist } from './utils';
+import {
+ VALIDATE_OPTIONS,
+ addLocation,
+ combineErrorDetails,
+ serversExist
+} from './utils';
import joi from 'joi';
@@ -16,9 +21,9 @@ const schema = joi.object().keys({
imageFrontendServer: joi.string(),
args: joi.array().items(joi.string().label('docker.args array items')),
bind: joi.string().trim(),
- networks: joi.array().items(
- joi.string().label('docker.networks array items')
- )
+ networks: joi
+ .array()
+ .items(joi.string().label('docker.networks array items'))
}),
buildOptions: joi.object().keys({
serverOnly: joi.bool(),
@@ -35,7 +40,10 @@ const schema = joi.object().keys({
.keys({
ROOT_URL: joi
.string()
- .regex(new RegExp('^(http|https)://', 'i'))
+ .regex(
+ new RegExp('^(http|https)://', 'i'),
+ 'valid url with "http://" or "https://"'
+ )
.required(),
MONGO_URL: joi.string()
})
| 7 |
diff --git a/app/styles/components/_forms.scss b/app/styles/components/_forms.scss @@ -71,6 +71,19 @@ input:invalid {
box-shadow: initial;
}
+input[type='text'],
+input[type='password'],
+input[type='number'],
+input[type='date'],
+input[type='email'],
+input[type='search'],
+input[type='tel'],
+input[type='url'],
+textarea {
+ background: $input-bg;
+ color: $input-color;
+}
+
input[type='text'],
input[type='password'],
input[type='number'],
@@ -87,19 +100,23 @@ select {
border-color: $input-border;
border-radius: 0;
border-style: solid;
- background: $input-bg;
padding: 5px 10px;
font-size: 15px;
line-height: 24px;
width: 100%;
- color: $input-color;
// firefox quirk, options were not inheriting there parents color styles
option,
optgroup {
- color: $label-color;
+ color: $input-color;
background: $input-bg;
+ &.disabled,
+ &[disabled] {
+ color: $mid-grey;
+ cursor: not-allowed;
}
+ }
+
&[size] {
@@ -108,17 +125,19 @@ select {
}
&::placeholder {
- color: rgba($input-color-placeholder, .8);
+ color: rgba($input-color-placeholder, 0.8);
}
&:hover {
border-color: $input-bg-hover;
- background-color: rgba($input-bg-hover, .2);
+ background-color: rgba($input-bg-hover, 0.2);
&::placeholder {
- color: rgba($input-color-placeholder, .35);
+ color: rgba($input-color-placeholder, 0.35);
}
}
- &.disabled, &[disabled], &[disabled]:hover {
+ &.disabled,
+ &[disabled],
+ &[disabled]:hover {
@extend .bg-disabled;
border-color: $input-bg-disabled;
cursor: not-allowed;
@@ -127,11 +146,11 @@ select {
}
}
&:focus {
- background-color: rgba($input-border-focus, .2);
+ background-color: rgba($input-border-focus, 0.2);
border-color: $input-border-focus;
- transition: ease-in-out all .25s;
+ transition: ease-in-out all 0.25s;
&::placeholder {
- color: rgba($input-color-placeholder, .5);
+ color: rgba($input-color-placeholder, 0.5);
}
}
}
| 3 |
diff --git a/src/MUIDataTable.js b/src/MUIDataTable.js @@ -894,7 +894,7 @@ class MUIDataTable extends React.Component {
const filterType = column.filterType || options.filterType;
if (filterVal.length || filterType === 'custom') {
if (column.filterOptions && column.filterOptions.logic) {
- if (column.filterOptions.logic(columnValue, filterVal)) isFiltered = true;
+ if (column.filterOptions.logic(columnValue, filterVal, row)) isFiltered = true;
} else if (filterType === 'textField' && !this.hasSearchText(columnVal, filterVal, caseSensitive)) {
isFiltered = true;
} else if (
| 0 |
diff --git a/appjs/logicjavascript.js b/appjs/logicjavascript.js @@ -2897,14 +2897,15 @@ else{
}
function impse10find(){
- let n = parseInt(document.getElementById("impse14").value)
- var res = 0, fact = 1;
+ let num = parseInt(document.getElementById("impse14").value)
+ var result = 0;
+ var fact = 1;
for (i = 1; i <= num; i++)
{
fact = fact * i;
- res = res + (i / fact);
+ result = result + (i / fact);
}
- document.getElementById("impse10ans").innerHTML = res;
+ document.getElementById("impse10ans").innerHTML = result.toFixed(5) ;
}
function impse11find(){
| 1 |
diff --git a/polyfills/MediaQueryList/prototype/addEventListener/tests.js b/polyfills/MediaQueryList/prototype/addEventListener/tests.js @@ -11,6 +11,10 @@ it("should define the EventTarget methods on the MediaQueryList prototype", func
// We can only test these behaviors with native `matchMedia` as iframes don't trigger resize events.
if (typeof (self.matchMedia('(min-width: 1px)').listeners) === 'undefined') {
describe('WPT (with native matchMedia)', function () {
+ // Uses network calls in iframes, this can fail.
+ // Adding retries reduces test flakiness.
+ this.retries(2);
+
var IFRAME_DEFAULT_SIZE = "200";
var iframes = {};
| 0 |
diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml @@ -27,6 +27,7 @@ jobs:
timeout-minutes: 60
runs-on: ubuntu-latest
if: github.event_name == 'push' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
+ environment: ${{ github.event.inputs.environment || "browser-tests-local" }}
defaults:
run:
working-directory: ghost/core
@@ -52,7 +53,7 @@ jobs:
run: npx playwright install --with-deps
- name: Build Admin
- if: github.event.inputs.site_url == ''
+ if: github.event.inputs.environment == 'browser-tests-local'
working-directory: ghost/admin
run: yarn build:prod
| 12 |
diff --git a/packages/spark-core/settings/_settings.scss b/packages/spark-core/settings/_settings.scss @@ -238,7 +238,7 @@ $border-radius: 5px !default;
///
$alert-border: 1px solid $gray !default;
$alert-bar-width: -10px !default;
-$alert-color: $white !default;
+$alert-bg-color: $white !default;
$alert-color-info: $blue !default;
$alert-color-success: $green !default;
$alert-color-fail: $yellow !default;
| 3 |
diff --git a/src/parser/ad_parser.js b/src/parser/ad_parser.js @@ -191,7 +191,7 @@ function parseAdElement(adTypeElement, emit) {
}
}
- if (adVerificationFromExtensions.length) {
+ if (adVerificationFromExtensions.length && ad.system.version < 4.1) {
ad.adVerifications = ad.adVerifications.concat(
adVerificationFromExtensions
);
| 0 |
diff --git a/src/components/nodes/parallelGateway/parallelGateway.vue b/src/components/nodes/parallelGateway/parallelGateway.vue @@ -11,5 +11,15 @@ export default {
nodeIcon: parallelGatewaySymbol,
};
},
+ watch: {
+ 'node.definition': {
+ deep:true,
+ immediate:true,
+ handler() {
+ //insure that parallel gateways don't have the 'default' attribute
+ delete this.node.definition.default;
+ },
+ },
+ },
};
</script>
| 2 |
diff --git a/lib/assets/javascripts/builder/data/analyses.js b/lib/assets/javascripts/builder/data/analyses.js @@ -11,7 +11,7 @@ var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/an
var DAO_TYPES = ['age-and-gender', 'boundaries', 'education', 'employment', 'families', 'housing', 'income', 'language', 'migration', 'nationality', 'population-segments', 'race-and-ethnicity', 'religion', 'transportation'];
-var DO_DEPRECATION_WARNING_DATE = '2021-02-05';
+var DO_DEPRECATION_WARNING_DATE = '2021-02-09';
var MAP = {
'aggregate-intersection': {
@@ -107,7 +107,7 @@ var MAP = {
genericType: 'data-observatory-measure',
deprecationWarningDate: DO_DEPRECATION_WARNING_DATE,
deprecationDate: '2021-03-15',
- deprecationLink: 'https://carto.com'
+ deprecationLink: 'mailto:[email protected]'
},
'data-observatory-multiple-measures': {
title: _t('analyses.data-observatory-measure.title'),
@@ -137,7 +137,7 @@ var MAP = {
genericType: 'data-observatory-multiple-measures',
deprecationWarningDate: DO_DEPRECATION_WARNING_DATE,
deprecationDate: '2021-03-15',
- deprecationLink: 'https://carto.com'
+ deprecationLink: 'mailto:[email protected]'
},
'filter-by-node-column': {
title: _t('analyses.filter-by-node-column.title'),
| 12 |
diff --git a/src/scss/_dashboard.scss b/src/scss/_dashboard.scss .uppy-Dashboard-dropFilesTitle {
max-width: 460px;
text-align: center;
- font-size: 19px;
+ font-size: 18px;
line-height: 1.45;
font-weight: 300;
color: rgba($color-asphalt-gray, 0.8);
+ padding: 0 15px;
// margin: 0;
// margin-top: 25px;
| 0 |
diff --git a/articles/quickstart/webapp/java-spring-boot/01-login.md b/articles/quickstart/webapp/java-spring-boot/01-login.md @@ -62,7 +62,7 @@ If you are using Maven:
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
| 3 |
diff --git a/assets/js/modules/subscribe-with-google/components/common/RevenueModelInput.js b/assets/js/modules/subscribe-with-google/components/common/RevenueModelInput.js @@ -31,10 +31,15 @@ import { useCallback } from '@wordpress/element';
*/
import Data from 'googlesitekit-data';
import { STORE_NAME } from '../../datastore/constants';
-import { TextField, Input } from '../../../../material-components';
+import { Option, Select } from '../../../../material-components';
import { isValidRevenueModel } from '../../util/validation';
const { useDispatch, useSelect } = Data;
+const REVENUE_MODELS = [
+ { displayName: 'Contributions', value: 'contribution' },
+ { displayName: 'Subscriptions', value: 'subscription' },
+];
+
export default function RevenueModelInput() {
// Get value.
const revenueModel = useSelect( ( select ) =>
@@ -44,8 +49,8 @@ export default function RevenueModelInput() {
// Handle form input.
const { setRevenueModel } = useDispatch( STORE_NAME );
const onChange = useCallback(
- ( { currentTarget } ) => {
- setRevenueModel( currentTarget.value.trim() );
+ ( index ) => {
+ setRevenueModel( REVENUE_MODELS[ index ].value );
},
[ setRevenueModel ]
);
@@ -56,20 +61,22 @@ export default function RevenueModelInput() {
}
return (
- <TextField
+ <Select
className={ classnames( {
'mdc-text-field--error':
revenueModel && ! isValidRevenueModel( revenueModel ),
} ) }
label="Revenue Model"
+ value={ revenueModel }
+ onEnhancedChange={ onChange }
+ enhanced
outlined
>
- <Input
- id="revenueModel"
- name="revenueModel"
- value={ revenueModel }
- onChange={ onChange }
- />
- </TextField>
+ { REVENUE_MODELS.map( ( { displayName, value } ) => (
+ <Option key={ value } value={ value }>
+ { displayName }
+ </Option>
+ ) ) }
+ </Select>
);
}
| 4 |
diff --git a/package-lock.json b/package-lock.json }
},
"lodash": {
- "version": "4.17.11",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
- "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=",
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
"lodash.flattendeep": {
| 1 |
diff --git a/ui/src/actions/index.js b/ui/src/actions/index.js @@ -2,22 +2,18 @@ import {endpoint} from 'src/app/api';
import asyncActionCreator from './asyncActionCreator';
export const fetchCollections = () => async dispatch => {
- const limit = 5000;
-
- async function fetchCollectionsPages(page=1) {
- const response = await endpoint.get('collections', {
- params: { limit, offset: (page - 1) * limit }
+ const limit = 1;
+ let page = 0;
+ let response;
+ do {
+ response = await endpoint.get('collections', {
+ params: { limit, offset: page * limit }
});
dispatch({
type: 'FETCH_COLLECTIONS_SUCCESS',
payload: { collections: response.data },
});
- if (page < response.data.pages) {
- await fetchCollectionsPages(page + 1);
- }
- }
-
- await fetchCollectionsPages();
+ } while (++page < response.data.pages);
};
export const fetchSearchResults = asyncActionCreator(({ filters }) => async dispatch => {
| 14 |
diff --git a/articles/quickstart/spa/angular2/01-login.md b/articles/quickstart/spa/angular2/01-login.md @@ -15,6 +15,6 @@ useCase: quickstart
<!-- markdownlint-disable MD034 MD041 -->
-<%= include('../_includes/_getting_started', { library: 'Angular 7+', callback: 'http://localhost:3000', showLogoutInfo: true, returnTo: 'http://localhost:3000', webOriginUrl: 'http://localhost:3000', showWebOriginInfo: true, new_js_sdk: true }), show_install_info: false %>
+<%= include('../_includes/_getting_started', { library: 'Angular 7+', callback: 'http://localhost:3000', showLogoutInfo: true, returnTo: 'http://localhost:3000', webOriginUrl: 'http://localhost:3000', showWebOriginInfo: true, new_js_sdk: true, show_install_info: false }) %>
<%= include('_includes/_centralized_login') %>
\ No newline at end of file
| 1 |
diff --git a/src/Services/Air/AirFormat.js b/src/Services/Air/AirFormat.js @@ -300,7 +300,7 @@ function setIndexesForSegments(
const indexedSegments = allSegments.map((s, k) => ({ ...s, index: k + 1 }));
return {
- segments: indexedSegments.filter(s => s.SegmentType !== 'Service'),
+ segments: indexedSegments.filter(s => s.SegmentType === undefined),
serviceSegments: indexedSegments.filter(s => s.SegmentType === 'Service'),
};
}
| 1 |
diff --git a/includes/Core/Authentication/Clients/Google_Site_Kit_Client.php b/includes/Core/Authentication/Clients/Google_Site_Kit_Client.php @@ -282,4 +282,26 @@ class Google_Site_Kit_Client extends Google_Client {
throw new Google_OAuth_Exception( $error );
}
+ /**
+ * Create a default Google OAuth2 object.
+ *
+ * @return OAuth2 Crated OAuth2 instance.
+ */
+ protected function createOAuth2Service() {
+ $auth = new OAuth2(
+ array(
+ 'clientId' => $this->getClientId(),
+ 'clientSecret' => $this->getClientSecret(),
+ 'authorizationUri' => self::OAUTH2_AUTH_URL,
+ 'tokenCredentialUri' => self::OAUTH2_TOKEN_URI,
+ 'redirectUri' => $this->getRedirectUri(),
+ 'issuer' => $this->getConfig( 'client_id' ),
+ 'signingKey' => $this->getConfig( 'signing_key' ),
+ 'signingAlgorithm' => $this->getConfig( 'signing_algorithm' ),
+ )
+ );
+
+ return $auth;
+ }
+
}
| 4 |
diff --git a/token-metadata/0x36F3FD68E7325a35EB768F1AedaAe9EA0689d723/metadata.json b/token-metadata/0x36F3FD68E7325a35EB768F1AedaAe9EA0689d723/metadata.json "symbol": "ESD",
"address": "0x36F3FD68E7325a35EB768F1AedaAe9EA0689d723",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/addon/components/docs-hero/template.hbs b/addon/components/docs-hero/template.hbs <div class='docs-container'>
<h1 class='docs-hero__heading'>
- {{#if logo}}
+ {{#if hasBlock}}
+ {{yield}}
+ {{else if logo}}
<span class='docs-hero__logo'>
{{docs-logo logo=logo}}
</span>
| 11 |
diff --git a/app/builtin-pages/views/bookmarks.js b/app/builtin-pages/views/bookmarks.js @@ -17,7 +17,7 @@ import renderPencilIcon from '../icon/pencil'
//
var query = '' // current search query
-var currentView = 'feed'
+var currentView = 'all'
var bookmarks = []
var userProfile = null
var followedUserProfiles = null
| 12 |
diff --git a/.travis.yml b/.travis.yml @@ -6,6 +6,7 @@ sudo: false
addons:
code_climate:
repo_token: $CODECLIMATE_REPO_TOKEN
+before_install: sudo apt-get install libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
install:
- npm install
- npm run build-css
| 1 |
diff --git a/.storybook/utils/resetGlobals.js b/.storybook/utils/resetGlobals.js @@ -45,8 +45,6 @@ export const resetGlobals = () => {
'http://example.com/wp-admin/index.php?action=googlesitekit_proxy_setup&nonce=abc123',
proxyPermissionsURL:
'http://example.com/wp-admin/index.php?action=googlesitekit_proxy_permissions&nonce=abc123',
- trackingEnabled: false,
- trackingID: 'UA-000000000-1',
userRoles: [ 'administrator' ],
isAuthenticated: false,
};
| 2 |
diff --git a/package.json b/package.json },
"scripts": {
"lint": "eslint polyfills lib tasks test",
- "clean": "rimraf ./polyfills/__dist",
+ "clean": "rimraf ./polyfills/__dist && node tasks/clean",
"build": "npm run clean && node tasks/updatesources && node tasks/buildsources/buildsources",
"build-series": "npm run clean && node tasks/updatesources && node tasks/buildsources",
"watch": "npm run clean && node tasks/updatesources && node tasks/buildsources/watchsource",
| 0 |
diff --git a/best-practices.md b/best-practices.md - [Formats with no registered media type](#formats-with-no-registered-media-type)
- [Asset Roles](#asset-roles)
- [List of Asset Roles](#list-of-asset-roles)
- - [Thumbnails](#thumbnails)
+ - [Thumbnail](#thumbnail)
+ - [Overview](#overview)
+ - [Visual](#visual)
- **[Catalog & Collection Best Practices](#catalog--collection-practices)**
- [Static and Dynamic Catalogs](#static-and-dynamic-catalogs)
- [Static Catalogs](#static-catalogs)
@@ -298,7 +300,7 @@ register the media type with IANA, so that other STAC clients can find it easily
[acceptable to not register](https://stackoverflow.com/questions/29121241/custom-content-type-is-registering-with-iana-mandatory)
it. It is relatively easy to [register](https://www.iana.org/form/media-types) a `vnd` media type.
-## Asset Roles
+### Asset Roles
[Asset roles](item-spec/item-spec.md#asset-roles) are used to describe what each asset is used for. They are particular useful
when several assets have the same media type, such as when an Item has a multispectral analytic asset, a 3-band full resolution
@@ -311,7 +313,7 @@ role in the [Asset Role Types](item-spec/item-spec.md#asset-role-types) or the f
the role. And you are encouraged to add it to the list below and/or in an extension if you think the new role will have broader
applicability.
-### List of Asset Roles
+#### List of Asset Roles
In addition to the thumbnail, data and overview [roles listed](item-spec/item-spec.md#asset-role-types) in the Item spec, there
are a number of roles that are emerging in practice, but don't have enough widespread use to justify standardizing them. So if
@@ -342,18 +344,38 @@ actual role requirements.
Some of the particular asset roles also have some best practices:
-### Thumbnails
+##### Thumbnail
Thumbnails are typically used to give quick overview, often embedded in a list of items. So think small with these, as
keeping the size down helps it load fast, and the typical display of a thumbnail won't benefit from a large size. Often 256 by
-256 pixels is used as a default. Generally they should be no more than 1000 by 1000 pixels. Some implementors provide different sizes
+256 pixels is used as a default. Generally they should be no more than 600 by 600 pixels. Some implementors provide different sizes
of thumbnails - using something like thumbnail-small and thumbnail-large, with a small one being 100x100 pixels or less, for truly
fast rendering in a small image. Be sure to name one just 'thumbnail' though, as that's the default most STAC clients will look for.
+Thumbnails should be png, jpeg or webp, so that they can easily display in browsers, and they should be a true color composite
+(red, green and blue bands) if there are multiple bands.
+
If your data for the Item does not come with a thumbnail already we do recommend generating one, which can be done quite easily.
[GDAL](https://gdal.org/) and [Rasterio](https://rasterio.readthedocs.io/en/latest/) both make this very easy - if you need help
just ask on the [STAC Gitter](https://gitter.im/SpatioTemporal-Asset-Catalog/Lobby).
+##### Overview
+
+An overview is a high definition browse image of the dataset, giving the user more of a sense of the data than a thumbnail could.
+It's something that can be easily displayed on a map without tiling, or viewed at full screen resolution (but not zoomed in). Similar
+to a thumbnail it should be png, jpeg or webp, for easy display in browsers, and should be a true color composite
+(red, green and blue bands) if there are multiple bands. The sizes could range from the high end of a thumbnail (600 by 600 pixels)
+to a few thousand pixels on each side.
+
+###### Visual
+
+A visual asset is a full-resolution version of the data, but one that is optimized for display purposes. It can be in any file format,
+but Cloud Optimized GeoTIFF's are preferred, since the inner pyramids and tiles enable faster display of the full resolution data.
+It is typically an composite of red, blue and green bands, often with a nice color curve and sharpening for enhanced display. It should
+be possible to open up on non-specialist software and display just fine. It can complement assets where one band is per file (like landsat),
+by providing the key display bands combined, or can complement assets where many non-visible bands are included, by being a lighter weight
+file that just has the bands needed for display
+
## Catalog & Collection Practices
### Static and Dynamic Catalogs
| 0 |
diff --git a/src/XR.js b/src/XR.js @@ -341,7 +341,7 @@ class XRFrame {
this._pose = new XRViewerPose(this);
}
- getDevicePose(coordinateSystem) {
+ getViewerPose(coordinateSystem) {
return this._pose;
}
getInputPose(inputSource, coordinateSystem) {
| 10 |
diff --git a/src/config/scrivitoContentBrowser.js b/src/config/scrivitoContentBrowser.js import * as Scrivito from "scrivito";
export function configureScrivitoContentBrowser() {
- if (typeof window === "undefined") return;
-
Scrivito.configureContentBrowser({
filters: ({ _validObjClasses }) => {
if (_validObjClasses) {
| 11 |
diff --git a/lib/hooks/helpers/private/load-helpers.js b/lib/hooks/helpers/private/load-helpers.js var _ = require('@sailshq/lodash');
var flaverr = require('flaverr');
var includeAll = require('include-all');
-var Machine = require('machine');
@@ -46,16 +45,18 @@ module.exports = function loadHelpers(sails, done) {
// e.g. /user-helpers/foo/my-helper => userHelpers.foo.myHelper
var keyPath = _.map(identity.split('/'), _.camelCase).join('.');
- // Use filename-derived `identity` if no explicit identity was set,
- // but exclude any extra hierarchy.
- // (Otherwise, as of machine@v15, this could fail with an ImplementationError.)
- if (!helperDef.identity) {
- helperDef.identity = _.last(identity.split('/'));
- }
+ // Save _loadedFrom property for debugging purposes
+ // (e.g. `financial/calculate-mortgage-series`)
+ helperDef._loadedFrom = identity;
+
+ // Use filename-derived `identity` REGARDLESS if an explicit identity
+ // was set. (And exclude any extra hierarchy.) Otherwise, as of
+ // machine@v15, this could fail with an ImplementationError.
+ helperDef.identity = identity.match(/\//) ? _.last(identity.split('/')) : identity;
- // Use _.set to set the (possibly nested) property of sails.helpers
- // e.g. sails.helpers.userHelpers.foo.myHelper
- _.set(sails.helpers, keyPath, Machine.build(helperDef));
+ // Build & expose helper on `sails.helpers`
+ // > e.g. sails.helpers.userHelpers.foo.myHelper
+ sails.hooks.helpers.furnishHelper(keyPath, helperDef);
} catch (err) {
// If an error occurs building the callable, throw here to bust
// out of the _.each loop early
| 12 |
diff --git a/src/transforms/aggregate.js b/src/transforms/aggregate.js @@ -68,7 +68,7 @@ var attrs = exports.attributes = {
},
func: {
valType: 'enumerated',
- values: ['count', 'sum', 'avg', 'median', 'mode', 'rms', 'stddev', 'min', 'max', 'first', 'last', 'change'],
+ values: ['count', 'sum', 'avg', 'median', 'mode', 'rms', 'stddev', 'min', 'max', 'first', 'last', 'change', 'range'],
dflt: 'first',
role: 'info',
editType: 'calc',
@@ -87,7 +87,8 @@ var attrs = exports.attributes = {
'*median* will return the average of the two central values if there is',
'an even count. *mode* will return the first value to reach the maximum',
'count, in case of a tie.',
- '*change* will return the difference between the first and last linked value.'
+ '*change* will return the difference between the first and last linked values.',
+ '*range* will return the difference between the min and max linked values.'
].join(' ')
},
funcmode: {
@@ -348,6 +349,20 @@ function getAggregateFunction(opts, conversions) {
return (out === -Infinity) ? BADNUM : c2d(out);
};
+ case 'range':
+ return function(array, indices) {
+ var min = Infinity;
+ var max = -Infinity;
+ for(var i = 0; i < indices.length; i++) {
+ var vi = d2c(array[indices[i]]);
+ if(vi !== BADNUM) {
+ min = Math.min(min, vi);
+ max = Math.max(max, vi);
+ };
+ }
+ return (max === -Infinity || min === Infinity) ? BADNUM : c2d(max - min);
+ };
+
case 'median':
return function(array, indices) {
var sortCalc = [];
| 0 |
diff --git a/contracts/Havven.sol b/contracts/Havven.sol @@ -228,6 +228,7 @@ contract Havven is ERC20Token, Owned {
onlyOwner
returns (bool)
{
+ // Use "this" in order that the havven account is the sender.
return this.transfer(account, value);
}
@@ -246,11 +247,8 @@ contract Havven is ERC20Token, Owned {
// an exception will be thrown in super.transfer().
super.transfer(_to, _value);
- // If there was no balance update, no need to update any fee entitlement information.
- if (_value == 0) {
- return true;
- }
-
+ // Zero-value transfers still update fee entitlement information,
+ // and may roll over the fee period.
adjustFeeEntitlement(msg.sender, senderPreBalance);
adjustFeeEntitlement(_to, recipientPreBalance);
@@ -272,11 +270,8 @@ contract Havven is ERC20Token, Owned {
// an exception will be thrown in super.transferFrom().
super.transferFrom(_from, _to, _value);
- // If there was no balance update, no need to update any fee entitlement information.
- if (_value == 0) {
- return true;
- }
-
+ // Zero-value transfers still update fee entitlement information,
+ // and may roll over the fee period.
adjustFeeEntitlement(_from, senderPreBalance);
adjustFeeEntitlement(_to, recipientPreBalance);
| 11 |
diff --git a/app/webpack/observations/show/ducks/observation.js b/app/webpack/observations/show/ducks/observation.js @@ -512,6 +512,7 @@ export function addAnnotation( controlledAttribute, controlledValue ) {
return ( dispatch, getState ) => {
const state = getState( );
if ( !hasObsAndLoggedIn( state ) ) { return; }
+ console.log(state.observation.annotations);
const newAnnotations = ( state.observation.annotations || [] ).concat( [{
controlled_attribute: controlledAttribute,
controlled_value: controlledValue,
@@ -563,17 +564,18 @@ export function voteAnnotation( id, voteValue ) {
return ( dispatch, getState ) => {
const state = getState( );
if ( !hasObsAndLoggedIn( state ) ) { return; }
- const newAnnotations = Object.assign( { }, state.observation.annotations );
- const annotation = _.find( newAnnotations, a => ( a.uuid === id ) );
- if ( annotation ) {
- annotation.api_status = "voting";
- annotation.votes = ( annotation.votes || [] ).concat( [{
+ const newAnnotations = _.map( state.observation.annotations, a => (
+ ( a.uuid === id ) ?
+ Object.assign( { }, a, {
+ api_status: "voting",
+ votes: ( a.votes || [] ).concat( [{
vote_flag: ( voteValue !== "bad" ),
user: state.config.currentUser,
api_status: "saving"
- }] );
+ }] )
+ } ) : a
+ ) );
dispatch( setAttributes( { annotations: newAnnotations } ) );
- }
const payload = { id, vote: voteValue };
const actionTime = getActionTime( );
@@ -591,17 +593,17 @@ export function unvoteAnnotation( id ) {
return ( dispatch, getState ) => {
const state = getState( );
if ( !hasObsAndLoggedIn( state ) ) { return; }
- const newAnnotations = Object.assign( { }, state.observation.annotations );
- const annotation = _.find( newAnnotations, a => ( a.uuid === id ) );
- if ( annotation && annotation.votes ) {
- annotation.api_status = "voting";
- annotation.votes = _.map( annotation.votes, v => (
+ const newAnnotations = _.map( state.observation.annotations, a => (
+ ( a.uuid === id ) ?
+ Object.assign( { }, a, {
+ api_status: "voting",
+ votes: _.map( a.votes, v => (
v.user.id === state.config.currentUser.id ?
Object.assign( { }, v, { api_status: "deleting" } ) : v
+ ) )
+ } ) : a
) );
-
dispatch( setAttributes( { annotations: newAnnotations } ) );
- }
const payload = { id };
const actionTime = getActionTime( );
| 1 |
diff --git a/src/components/List/List.story.jsx b/src/components/List/List.story.jsx import React, { useState } from 'react';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
-import { text, select } from '@storybook/addon-knobs';
-import { Add16, Edit16, Star16, StarFilled16 } from '@carbon/icons-react';
+import { text } from '@storybook/addon-knobs';
+import { Add16, Edit16, Star16 } from '@carbon/icons-react';
import { Button, OverflowMenu, OverflowMenuItem } from '../..';
@@ -360,62 +360,3 @@ storiesOf('Watson IoT Experimental|List', module)
<ExpandableList />
</div>
));
-
-/*
- .add('Simple List with title and button in header', () => {
- const size = select('size', Object.keys(CARD_SIZES), CARD_SIZES.MEDIUM);
-
- return (
- <ListSimple
- id="List"
- title={text('Text', 'Simple List')}
- items={data1}
- size={size}
- headerHasButton
- />
- );
- })
- .add('List with search', () => {
- const size = select('size', Object.keys(CARD_SIZES), CARD_SIZES.MEDIUM);
-
- return (
- <ListSimple
- id="List"
- title={text('Text', 'Simple List')}
- items={data1}
- size={size}
- hasSearch
- />
- );
- })
- .add('Two level list, expandable list', () => {
- const size = select('size', Object.keys(CARD_SIZES), CARD_SIZES.MEDIUM);
-
- return (
- <ListSimple id="List" title={text('Text', 'Two level list')} items={data2} size={size} />
- );
- })
- .add('Three level list, expandable list', () => {
- const size = select('size', Object.keyrom(CARD_SIZES), CARD_SIZES.MEDIUM);
-
- return (
- <ListSimple id="List" title={text('Text', 'Three level list')} items={data3} size={size} />
- );
- })
- .add('expanded list with search', () => {
- const size = select('size', Object.keys(CARD_SIZES), CARD_SIZES.LARGE);
-
- return (
- <ListSimple
- id="List"
- title={text('Text', '2 level List with Search and Button')}
- items={items}
- size={size}
- hasSearch={{
- placeHolderText: 'Search list',
- onSearch: action('search'),
- }}
- />
- );
- });
- */
| 1 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js b/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/assets-picker/assets-list-view.js @@ -8,7 +8,6 @@ module.exports = CoreView.extend({
initialize: function (opts) {
if (!opts.icons) throw new Error('icons is required');
- this.model = opts.model;
this._icons = opts.icons;
this._setupAssets();
},
| 2 |
diff --git a/SearchbarNavImprovements.user.js b/SearchbarNavImprovements.user.js // @description Site search selector on meta sites. Add advanced search helper when search box is focused. Adds link to meta in left sidebar, and link to main from meta.
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 2.11
+// @version 2.11.1
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
<input name="not-words" id="not-words" data-clearbtn data-autofill data-termvalue="section" data-neg=" -" />
<label class="section-label">URL</label>
<label for="url">mentions url/domain (accepts * wildcard):</label>
- <input name="url" id="url" placeholder="example.com" data-clearbtn data-autofill data-prefix='url:"' data-suffix='"' />
+ <input name="url" id="url" placeholder="example.com" data-clearbtn data-autofill data-validate-url data-prefix='url:"' data-suffix='"' />
</div>
<div>
<label class="section-label">Tags</label>
<label class="section-label">In a Specific Question</label>
<input type="checkbox" name="question-current" id="question-current" data-checks="#type-a" /><label for="question-current">current question</label>
<label for="question-id">question id:</label>
- <input name="question-id" id="question-id" class="input-small" maxlength="12" data-clearbtn data-numeric data-checks="#type-a" data-clears="#question-current" data-autofill data-prefix="inquestion:" />
+ <input name="question-id" id="question-id" class="input-small" maxlength="12" data-clearbtn data-validate-numeric data-checks="#type-a" data-clears="#question-current" data-autofill data-prefix="inquestion:" />
</div>
<div class="fixed-width-radios">
<label class="section-label">Post Status</label>
// Restrict typed value to numerical value
searchhelper
- .on('keydown', '[data-numeric]', function(evt) {
+ .on('keydown', '[data-validate-numeric]', function(evt) {
const isSpecialKey = evt.altKey || evt.ctrlKey || evt.metaKey || evt.shiftKey || evt.key.length > 1;
return /\d/.test(evt.key) || isSpecialKey;
})
- .on('change blur', '[data-numeric]', function(evt) {
+ .on('change blur', '[data-validate-numeric]', function(evt) {
this.value = this.value.replace(/[^\d]+/g, '');
});
+ // Restrict typed value to URL
+ searchhelper
+ .on('change blur', '[data-validate-url]', function(evt) {
+ this.value = this.value.replace(/^https?:\/\//, '').replace(/\/$/, '');
+ });
+
// Handle display name lookup using API
searchhelper.find('.js-dnlookup').dnLookup();
| 2 |
diff --git a/src/embeds/NewsEmbed.js b/src/embeds/NewsEmbed.js @@ -24,21 +24,16 @@ class NewsEmbed extends BaseEmbed {
this.color = news.length > 0 ? 0x00ff00 : 0xff0000;
let value = news.map(n => n.toString()).join('\n');
- let title = '';
if (type) {
if (type === 'update') {
value = value.length > 0 ? value : 'No Update News Currently';
- title = 'Updates';
} else {
value = value.length > 0 ? value : 'No Prime Access Currently';
- title = 'Prime Access';
}
} else {
value = value.length > 0 ? value : 'No News Currently';
- title = 'News';
}
this.fields = [{ name: '_ _', value }];
- this.title = title;
}
}
| 2 |
diff --git a/readme.md b/readme.md <br>
<br>
-### Give **power to designers & content creators**, in a place where they currently feel they have little to none, **by bringing design tool interactions and hotkeys to the browser**
+<h3 style="font-weight:300; max-width: 40ch;"><b>Give power</b> to designers & content creators, in a place where they currently feel they have little to none, <b>by bringing design tool interactions<b> to the browser</h3>
+
+<br>
+<br>
+<br>
Check out the [list of features me and other's are wishing for](https://github.com/GoogleChromeLabs/ProjectVisBug/issues?q=is%3Aopen+is%3Aissue+label%3A%22%E2%9A%A1%EF%B8%8F+feature%22). There's a lot of fun stuff planned or in demand. Cast your vote on a feature, leave some feedback or add clarity.
@@ -38,6 +42,10 @@ Let's do this **design community, I'm looking at you!** Make a GitHub account an
> - A **design system recognizer**, enforcer, enabler, or anything
> - An **interaction** prototyping tool
+<br>
+<br>
+<br>
+
## Installation
### Add to your browser
@@ -56,14 +64,7 @@ Let's do this **design community, I'm looking at you!** Make a GitHub account an
npm i visbug
```
-## Tool Architecture
-**VisBug is a custom element** on your page that intercepts interactions, selecting the item(s) instead, and then provides keyboard driven patterns to manipulate the selected DOM nodes. It can do these things on any page without the need for extension or browser priveledges. Extension integrations are to power a 2nd screen experience, while also providing browser specific features to enhance the experience.
-
-The illusion of selection and hover interactions are **more custom elements**. They are sag positioned overtop the elements to provide the same visual feedback that design tools do. It is essential that these elements leverage the shadow DOM; they're in a foreign environment yet need to look the same across any page.
-
-**Each tool is a function** that gets called when the user changes tools, and expects the feature function to return a function for disassembly/cleanup. Think of it as, "hey feature, you're up" and then later "hey feature, your turn is up, clean up."
-It's the responsibility of each feature to register keyboard listeners and handle the manipulations. It's a courtesty to expose functions from a feature for other features to use. **Features must be able to handle multiselect**.
## Contribute
| 5 |
diff --git a/articles/quickstart/webapp/aspnet-core/04-storing-tokens.md b/articles/quickstart/webapp/aspnet-core/04-storing-tokens.md @@ -29,6 +29,13 @@ The value will be stored as a property with the name ".Token." suffixed with the
Once you have retrieved the value of the token, you can then simply store it as a claim for the `ClaimsIdentity`:
```csharp
+// Startup.cs
+
+public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory,
+ IOptions<Auth0Settings> auth0Settings)
+{
+ [...]
+
var options = new OpenIdConnectOptions("Auth0")
{
// Set the authority to your Auth0 domain
@@ -55,7 +62,7 @@ var options = new OpenIdConnectOptions("Auth0")
// Saves tokens to the AuthenticationProperties
SaveTokens = true,
- Events = new OpenIdConnectEvents()
+ Events = new OpenIdConnectEvents
{
OnTicketReceived = context =>
{
@@ -63,29 +70,23 @@ var options = new OpenIdConnectOptions("Auth0")
var identity = context.Principal.Identity as ClaimsIdentity;
if (identity != null)
{
- // Check if token names are stored in Properties
- if (context.Properties.Items.ContainsKey(".TokenNames"))
- {
- // Token names a semicolon separated
- string[] tokenNames = context.Properties.Items[".TokenNames"].Split(';');
-
- // Add each token value as Claim
- foreach (var tokenName in tokenNames)
- {
- // Tokens are stored in a Dictionary with the Key ".Token.<token name>"
- string tokenValue = context.Properties.Items[$".Token.{tokenName}"];
-
- identity.AddClaim(new Claim(tokenName, tokenValue));
- }
- }
+ // Add the Name ClaimType. This is required if we want User.Identity.Name to actually return something!
+ if (!context.Principal.HasClaim(c => c.Type == ClaimTypes.Name) &&
+ identity.HasClaim(c => c.Type == "name"))
+ identity.AddClaim(new Claim(ClaimTypes.Name, identity.FindFirst("name").Value));
}
- return Task.FromResult(0);
- }
+ return Task.CompletedTask;
+ },
+ // handle the logout redirection
+ OnRedirectToIdentityProviderForSignOut = [...] // omitted for brevity
}
};
options.Scope.Clear();
options.Scope.Add("openid");
+ options.Scope.Add("name");
+ options.Scope.Add("email");
+ options.Scope.Add("picture");
app.UseOpenIdConnectAuthentication(options);
```
| 0 |
diff --git a/config/config.js b/config/config.js @@ -5,12 +5,12 @@ let publcPath = '/static/dists/';
if (process.env.SEPARATION === 'true') {
publcPath = `/`;
}
-const isHash = process.env.ROUTE_MODE === 'hash';
+const isHistory = process.env.ROUTE_MODE === 'history';
export default {
- history: isHash ? 'hash' : 'browser',
+ history: isHistory ? 'browser' : 'hash',
publicPath: publcPath,
- hash: isHash,
+ hash: !isHistory,
plugins: [
[
'umi-plugin-react',
| 1 |
diff --git a/includes/Modules/Optimize.php b/includes/Modules/Optimize.php @@ -23,7 +23,6 @@ use Google\Site_Kit\Core\Modules\Module_With_Assets_Trait;
use Google\Site_Kit\Core\Modules\Module_With_Owner;
use Google\Site_Kit\Core\Modules\Module_With_Owner_Trait;
use Google\Site_Kit\Core\Authentication\Clients\Google_Site_Kit_Client;
-use Google\Site_Kit\Core\Modules\Module_With_Service_Entity;
use Google\Site_Kit\Core\Util\Debug_Data;
use Google\Site_Kit\Core\Util\Method_Proxy_Trait;
use Google\Site_Kit\Modules\Optimize\Settings;
@@ -38,7 +37,7 @@ use Google\Site_Kit\Modules\Optimize\Tag_Guard;
* @ignore
*/
final class Optimize extends Module
- implements Module_With_Settings, Module_With_Debug_Fields, Module_With_Assets, Module_With_Owner, Module_With_Service_Entity, Module_With_Deactivation {
+ implements Module_With_Settings, Module_With_Debug_Fields, Module_With_Assets, Module_With_Owner, Module_With_Deactivation {
use Module_With_Settings_Trait, Module_With_Assets_Trait, Module_With_Owner_Trait, Method_Proxy_Trait;
/**
@@ -282,16 +281,4 @@ final class Optimize extends Module
}
}
}
-
- /**
- * Checks if the current user has access to the current configured service entity.
- *
- * @since 1.70.0
- *
- * @return boolean|WP_Error
- */
- public function check_service_entity_access() {
- // TODO: For Optimize module, there is no API to check service entity access. This is a no-op for now that always returns true.
- return true;
- }
}
| 2 |
diff --git a/templates/copyedit/note.txt b/templates/copyedit/note.txt {% trans count=graphics|length %}
-This graphic accompanies [AUTHOR]'s story, running [TIME], about [SUBJECT].
+This graphic accompanies __AUTHOR__'s story, running __TIME__, about __SUBJECT__.
{% pluralize %}
-These graphics accompany [AUTHOR]'s story, running [TIME], about [SUBJECT].
+These graphics accompany __AUTHOR__'s story, running __TIME__, about __SUBJECT__.
{% endtrans %}
-Story URL (not yet published): http://seamus.npr.org/templates/story/story.php?storyId=[SEAMUS_ID]&live=1
+Story URL (not yet published): http://seamus.npr.org/templates/story/story.php?storyId=__SEAMUS_ID__&live=1
-Expected run date: [TIME]
+Expected run date: __TIME__
-Primary graphics contact: [GRAPHICS_CONTACT]
-Primary editorial contact: [EDITORIAL_CONTACT]
+Primary graphics contact: __GRAPHICS_CONTACT__
+Primary editorial contact: __EDITORIAL_CONTACT__
{% for graphic in graphics %}{% include 'copyedit/graphic.txt' %}{% endfor %}
| 3 |
diff --git a/universe.js b/universe.js @@ -2,7 +2,6 @@ import * as THREE from './three.module.js';
import {BufferGeometryUtils} from './BufferGeometryUtils.js';
import {rigManager} from './rig.js';
import {renderer, scene, camera, dolly} from './app-object.js';
-import {Sky} from './Sky.js';
import {world} from './world.js';
import {GuardianMesh} from './land.js';
import weaponsManager from './weapons-manager.js';
@@ -22,42 +21,6 @@ const localObject = new THREE.Object3D();
const blueColor = 0x42a5f5;
const greenColor = 0xaed581;
-let skybox;
-{
- const effectController = {
- turbidity: 2,
- rayleigh: 3,
- mieCoefficient: 0.2,
- mieDirectionalG: 0.9999,
- inclination: 0, // elevation / inclination
- azimuth: 0, // Facing front,
- // exposure: renderer.toneMappingExposure
- };
- const sun = new THREE.Vector3();
- function update() {
- var uniforms = skybox.material.uniforms;
- uniforms.turbidity.value = effectController.turbidity;
- uniforms.rayleigh.value = effectController.rayleigh;
- uniforms.mieCoefficient.value = effectController.mieCoefficient;
- uniforms.mieDirectionalG.value = effectController.mieDirectionalG;
-
- // effectController.azimuth = (0.05 + ((Date.now() / 1000) * 0.1)) % 1;
- effectController.azimuth = 0.25;
- var theta = Math.PI * (effectController.inclination - 0.5);
- var phi = 2 * Math.PI * (effectController.azimuth - 0.5);
-
- sun.x = Math.cos(phi);
- sun.y = Math.sin(phi) * Math.sin(theta);
- sun.z = Math.sin(phi) * Math.cos(theta);
-
- uniforms.sunPosition.value.copy(sun);
- }
- skybox = new Sky();
- skybox.scale.setScalar(1000);
- skybox.update = update;
- skybox.update();
- scene.add(skybox);
-}
const universeSpecs = {
universeObjects: [
{
| 2 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-buffer.js b/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-buffer.js @@ -44,8 +44,11 @@ LegendBuffer.prototype._run = function (callback) {
LegendBuffer.prototype._removePrevious = function (layer_id, type, callback) {
var types = this._findSameType(type);
+ var dryRun = true;
+
this._legendDefinitionsCollection.forEach(function (legend) {
if (legend.get('layer_id') === layer_id && _.includes(types, legend.get('type'))) {
+ dryRun = false;
legend.destroy({
success: function (model) {
this._legendDefinitionsCollection.remove(model);
@@ -56,6 +59,10 @@ LegendBuffer.prototype._removePrevious = function (layer_id, type, callback) {
});
}
}.bind(this));
+
+ if (this._legendDefinitionsCollection.size() === 0 || dryRun) {
+ callback && callback();
+ }
};
LegendBuffer.prototype._cleanQueue = function (layer_id, type) {
| 1 |
diff --git a/articles/appliance/infrastructure/extensions.md b/articles/appliance/infrastructure/extensions.md @@ -3,7 +3,9 @@ section: appliance
description: Appliance infrastructure information about enabling Webtasks and Web Extensions
---
-# Enable Webtasks and Web Extensions
+# Enable Webtasks, Web Extensions, and User Search
+
+Beginning with version 10755, the Appliance supports User search (using our improved user search capabilites, Elastic search). This will allow you to use the [Delegated Admininstration extension](/extensions/delegated-admin) and other extensions that require User Search.
Beginning with version 8986, the Appliance supports web extensions. This is in addition to support for [Webtasks](appliance/webtasks).
@@ -11,9 +13,24 @@ Beginning with version 8986, the Appliance supports web extensions. This is in a
Some of the [Extensions](/extensions) available to users of the Auth0 public cloud are unavailable in the Appliance. As such, these do not appear as options in the Appliance's Dashboard.
:::
-## Requirements for Updating to Version 8986
+## Requirements for Enabling User Search
+
+Your Development and/or Production environments must meet the following requirements before you can enable User search.
+
+* If you have a single non-production/development node, you need to add an additional drive: 50 GB for User Search
+* If you have a 3-node PROD cluster, you need to add an additional drive on all 3 VMs: 100 GB for User Search
+* If you have another configuration, please consult with your Customer Success Engineer.
+
+## Enabling User Search
+
+Once you have added the additional drive(s), submit a Support ticket to request the following:
+
+* Enable User search
+* Perform the update to version 10755 or above. Auth0 will work with you to upgrade your Development environment first, so that you can test the changes. Afterwards, Auth0 will coordinate the Production upgrade.
+
+## Requirements for Enabling Webtasks
-Your Development and/or Production environments must meet the following requirements before you can update to version 8986.
+Your Development and/or Production environments must meet the following requirements before you can enable Webtasks and update to version 8986 or above.
* All nodes in the cluster need outbound access using **Port 443** to:
* `docker.it.auth0.com` (or `52.9.124.234`)
@@ -24,9 +41,9 @@ Your Development and/or Production environments must meet the following requirem
* `webtask.<yourdomain>.com`
* `webtask-dev.<yourdomain>.com`
-## Updating to Version 8986
+## Enabling Webtasks
-Once you have met the requirements for updating to version 8986, contact an Auth0 Customer Success Engineer to:
+Once you have met the requirements for enabling Webtasks, submit a Support ticket to request the following:
* Configure Webtasks (including switching your sandbox mode to `auth0-sandbox`)
* Perform the upgrade. Auth0 will work with you to upgrade your Development environment first, so that you can test the changes. Afterwards, Auth0 will coordinate the Production upgrade.
@@ -35,5 +52,6 @@ Once you have met the requirements for updating to version 8986, contact an Auth
* [IP Address and Port Requirements](/appliance/infrastructure/ip-domain-port-list)
* [Web Extensions](/extensions)
+* [Delegated Admininstration extension](/extensions/delegated-admin)
* [Webtasks](appliance/webtasks)
* [Version Change Logs](https://auth0.com/changelog/appliance)
| 0 |
diff --git a/assets/js/components/Alert.js b/assets/js/components/Alert.js @@ -32,7 +32,6 @@ import { Component, Fragment } from '@wordpress/element';
*/
import data, { TYPE_MODULES } from './data';
import Notification from './legacy-notifications/notification';
-import SunSmallSVG from '../../svg/sun-small.svg';
class Alert extends Component {
constructor( props ) {
@@ -83,7 +82,6 @@ class Alert extends Component {
key={ item.id }
title={ item.title }
description={ item.message || item.description }
- WinImageSVG={ SunSmallSVG }
dismiss={ __( 'Dismiss', 'google-site-kit' ) }
isDismissable={ item.isDismissible }
format="small"
| 2 |
diff --git a/packages/vulcan-ui-material/lib/components/forms/base-controls/MuiRadioGroup.jsx b/packages/vulcan-ui-material/lib/components/forms/base-controls/MuiRadioGroup.jsx @@ -9,6 +9,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
import Radio from '@material-ui/core/Radio';
import RadioGroup from '@material-ui/core/RadioGroup';
import classNames from 'classnames';
+import _isArray from 'lodash/isArray';
const styles = theme => ({
group: {
@@ -173,7 +174,9 @@ const MuiRadioGroup = createReactClass({
},
renderElement: function() {
- const { options, value, name, disabled: _disabled } = this.props.inputProperties;
+ const {options, name, disabled: _disabled} = this.props.inputProperties;
+ let value = this.props.inputProperties.value;
+ if (_isArray(value)) value = value[0];
const controls = options.map((radio, key) => {
let checked = value === radio.value;
let disabled = radio.disabled || _disabled;
@@ -199,10 +202,9 @@ const MuiRadioGroup = createReactClass({
const maxLength = options.reduce(
(max, option) => (option.label.length > max ? option.label.length : max),
- 0
+ 0,
);
-
const getColumnClass = maxLength => {
if (maxLength < 3) {
return 'tenColumn';
| 1 |
diff --git a/src/components/accounts/AccountFormAccountId.js b/src/components/accounts/AccountFormAccountId.js @@ -19,7 +19,7 @@ class AccountFormAccountId extends Component {
}
handleChangeAccountId = (e, { name, value }) => {
- if (value.match(/[^a-zA-Z0-9@._-]/)) {
+ if (value.match(/[^a-zA-Z0-9_-]/)) {
return false
}
| 3 |
diff --git a/lib/assets/javascripts/new-dashboard/i18n/locales/en.json b/lib/assets/javascripts/new-dashboard/i18n/locales/en.json "UserDropdown": {
"settings": "Settings",
"organizationSettings": "Your organization",
- "apiKeys": "API Keys & OAuth",
+ "apiKeys": "API Keys",
"publicProfile": "Public Profile",
"notifications": "Notifications",
"logout": "LOG OUT"
| 2 |
diff --git a/README.md b/README.md @@ -442,7 +442,7 @@ In this section, we use badges to indicate the targeted Vue version for each plu
### Docker
-- [Vite.js Docker Dev](https://github.com/nystudio107/vitejs-docker-dev) - Local development environment for developing vite.js via Docker container.
+- [Vite.js Docker Dev](https://github.com/nystudio107/vitejs-docker-dev) - Local development environment for developing Vite via Docker container.
### Django
| 1 |
diff --git a/README.md b/README.md # Sparta <p align="center">
-[](https://travis-ci.org/mweagle/Sparta) [](https://godoc.org/github.com/mweagle/Sparta)
+[](https://travis-ci.org/mweagle/Sparta) [](https://godoc.org/github.com/mweagle/Sparta) [](https://sourcegraph.com/github.com/mweagle/Sparta?badge)
Visit [gosparta.io](http://gosparta.io) for complete documentation.
| 0 |
diff --git a/src/parsers/GmlSeeker.hx b/src/parsers/GmlSeeker.hx @@ -456,7 +456,17 @@ class GmlSeeker {
out.instFieldComp.push(fd.comp);
}
}
- function doLoop(?exitAtCubDepth:Int) while (q.loop) {
+ function doLoop(?exitAtCubDepth:Int) {
+ //var oldPos = q.pos, oldSource = q.source;
+ while (q.loop) {
+ /*//
+ if (q.pos < oldPos && debug) {
+ Main.console.warn("old", oldPos, oldSource.length);
+ Main.console.warn("new", q.pos, q.source.length, q.source == oldSource);
+ }
+ oldPos = q.pos;
+ oldSource = q.source;
+ //*/
var p:Int, flags:Int;
var c:CharCode, mt:RegExpMatch;
flags = Ident | Doc | Define | Macro;
@@ -890,18 +900,18 @@ class GmlSeeker {
// skip unless it's `some =` (and no `some ==`)
var skip = false;
- var i = q.pos;
- while (i < q.length) switch (q.get(i++)) {
+ q_store();
+ while (q.loop) switch (q.read()) {
case " ".code, "\t".code, "\r".code, "\n".code: { };
- case "=".code: skip = q.get(i) == "=".code; break;
+ case "=".code: skip = q.peek() == "=".code; break;
case ":".code: {
- var k = q.pos;
+ var k = q_swap.pos;
skip = true;
while (k > 0) {
- var c = q.get(k - 1);
+ var c = q_swap.get(k - 1);
if (c.isIdent1()) k--; else break;
}
- while (--k >= 0) switch (q.get(k)) {
+ while (--k >= 0) switch (q_swap.get(k)) {
case " ".code, "\t".code, "\r".code, "\n".code: { };
case ",".code, "{".code: skip = false; break;
default: break;
@@ -910,15 +920,13 @@ class GmlSeeker {
};
default: skip = true; break;
}
- if (skip) continue;
+ if (skip) { q_restore(); continue; }
// that's an instance variable then
if (addInstField) addInstVar(s);
//
if (isConstructorField) {
- var oldPos = q.pos;
- q.pos = i;
q.skipSpaces1();
var args:String = null;
var isConstructor = false;
@@ -947,11 +955,12 @@ class GmlSeeker {
}
} while (false);
addFieldHint(isConstructor, null, true, s, args, null);
- q.pos = oldPos;
}
+ q_restore();
};
} // switch (s)
} // while in doLoop, can continue
+ } // doLoop
doLoop();
flushDoc();
//
| 1 |
diff --git a/src/containers/language-selector.jsx b/src/containers/language-selector.jsx @@ -12,7 +12,7 @@ class LanguageSelector extends React.Component {
super(props);
bindAll(this, [
'handleChange',
- 'handleMouseLeave',
+ 'handleMouseOut',
'ref'
]);
document.documentElement.lang = props.currentLocale;
@@ -25,12 +25,12 @@ class LanguageSelector extends React.Component {
this.removeListeners();
}
addListeners () {
- this.select.addEventListener('mouseleave', this.handleMouseLeave);
+ this.select.addEventListener('mouseout', this.handleMouseOut);
}
removeListeners () {
- this.select.removeEventListener('mouseleave', this.handleMouseLeave);
+ this.select.removeEventListener('mouseout', this.handleMouseOut);
}
- handleMouseLeave () {
+ handleMouseOut () {
this.select.blur();
}
ref (c) {
| 14 |
diff --git a/readme.md b/readme.md @@ -256,6 +256,10 @@ A: Yes
A: Yes
+**Q: Idea! Can Immer freeze the state for me?**
+
+A: Yes
+
## Credits
Special thanks goes to @Mendix, which supports it's employees to experiment completely freely two full days a month, which formed the kick-start for this project.
| 0 |
diff --git a/OurUmbraco.Site/Views/Download.cshtml b/OurUmbraco.Site/Views/Download.cshtml <p>
Umbraco 8 is the upcoming new major release of Umbraco with native support for Language Variants, Infinite Editing and Content Apps. You can access a pre-release nightly build of Umbraco 8 using NuGet with:
- <pre class="pre small-margin-bottom"><span>PM></span>Install-Package UmbracoCms -Pre -Source <br />https://www.myget.org/F/umbracocore/api/v3/index.json</pre>
+ <pre class="pre small-margin-bottom" style="height: 50px; overflow: hidden;"><span>PM></span>Install-Package UmbracoCms -Pre -Source <br />https://www.myget.org/F/umbracocore/api/v3/index.json</pre>
</p>
<p>Check out the <a href="https://github.com/umbraco/Umbraco-CMS/blob/temp8/.github/V8_GETTING_STARTED.md">getting started</a> for details on setup and requirements.</p>
| 1 |
diff --git a/src/libs/address.js b/src/libs/address.js @@ -77,6 +77,10 @@ function findAdminIdunn(raw, name) {
*/
export function toArray(address, { omitStreet, omitCountry } = {}) {
if (!address.street) {
+ // Tripadvisor POI only have a valid address in the label field
+ if(!address.cityDistrict && !address.countryRegion && !address.suburb){
+ return [address.label]
+ }
return [
address.suburb,
address.cityDistrict,
| 4 |
diff --git a/generators/server/templates/src/main/java/package/web/rest/_UserJWTController.java b/generators/server/templates/src/main/java/package/web/rest/_UserJWTController.java @@ -25,20 +25,16 @@ import <%=packageName%>.web.rest.vm.LoginVM;
import com.codahale.metrics.annotation.Timed;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.Collections;
/**
* Controller to authenticate users.
@@ -47,8 +43,6 @@ import java.util.Collections;
@RequestMapping("/api")
public class UserJWTController {
- private final Logger log = LoggerFactory.getLogger(UserJWTController.class);
-
private final TokenProvider tokenProvider;
private final AuthenticationManager authenticationManager;
@@ -60,7 +54,7 @@ public class UserJWTController {
@PostMapping("/authenticate")
@Timed
- public ResponseEntity<JWTToken> authorize(@Valid @RequestBody LoginVM loginVM, HttpServletResponse response) {
+ public ResponseEntity<JWTToken> authorize(@Valid @RequestBody LoginVM loginVM) {
UsernamePasswordAuthenticationToken authenticationToken =
new UsernamePasswordAuthenticationToken(loginVM.getUsername(), loginVM.getPassword());
@@ -69,9 +63,9 @@ public class UserJWTController {
SecurityContextHolder.getContext().setAuthentication(authentication);
boolean rememberMe = (loginVM.isRememberMe() == null) ? false : loginVM.isRememberMe();
String jwt = tokenProvider.createToken(authentication, rememberMe);
- response.addHeader(JWTConfigurer.AUTHORIZATION_HEADER, "Bearer " + jwt);
- return ResponseEntity.ok(new JWTToken(jwt));
-
+ HttpHeaders httpHeaders = new HttpHeaders();
+ httpHeaders.add(JWTConfigurer.AUTHORIZATION_HEADER, "Bearer " + jwt);
+ return new ResponseEntity<>(new JWTToken(jwt), httpHeaders, HttpStatus.OK);
}
/**
| 2 |
diff --git a/packages/bas-shell/demo/src/containers/Menu/Menu.js b/packages/bas-shell/demo/src/containers/Menu/Menu.js @@ -5,7 +5,7 @@ import { default as withAppConfigs } from 'base-shell/lib/providers/ConfigProvid
import { compose } from 'redux'
const Menu = ({ history, appConfig }) => {
- const handleSignOut = async (user) => {
+ const handleSignOut = (user) => {
logout()
history.push('/signin');
}
| 1 |
diff --git a/src/layout/card.js b/src/layout/card.js @@ -2,6 +2,13 @@ import PropTypes from 'prop-types';
import React, { Fragment } from 'react';
+/**
+ * [description]
+ * @param {[type]} options.text [description]
+ * @param {[type]} options.headingSize [description]
+ * @param {[type]} options.fullwidth [description]
+ * @return {[type]} [description]
+ */
export const AUcardHeading = ({ text, headingSize, fullwidth }) => {
const HeadingContainer = `h${ headingSize }`;
@@ -12,7 +19,19 @@ export const AUcardHeading = ({ text, headingSize, fullwidth }) => {
);
};
+AUcardHeading.propTypes = {};
+
+AUcardHeading.defaultProps = {};
+
+/**
+ * [description]
+ * @param {[type]} options.image [description]
+ * @param {[type]} options.description [description]
+ * @param {[type]} options.link [description]
+ * @param {[type]} options.fullwidth [description]
+ * @return {[type]} [description]
+ */
export const AUcardImage = ({ image, description, link, fullwidth }) => {
let ImageContainer = 'div';
let imageProps = {};
@@ -29,24 +48,64 @@ export const AUcardImage = ({ image, description, link, fullwidth }) => {
);
};
+AUcardImage.propTypes = {};
+
+AUcardImage.defaultProps = {};
+
+/**
+ * [description]
+ * @param {[type]} options.text [description]
+ * @param {[type]} options.fullwidth [description]
+ * @return {[type]} [description]
+ */
export const AUcardContent = ({ text, fullwidth }) => (
<p className={ `au-card__content${ fullwidth ? ' au-card__fullwidth' : '' }` }>{ text }</p>
);
+AUcardContent.propTypes = {};
+
+AUcardContent.defaultProps = {};
+
+/**
+ * [description]
+ * @param {[type]} options.html [description]
+ * @param {[type]} options.fullwidth [description]
+ * @return {[type]} [description]
+ */
export const AUcardHTML = ({ html, fullwidth }) => (
<div className={ `au-card__html${ fullwidth ? ' au-card__fullwidth' : '' }` }>
{ html }
</div>
);
+AUcardHTML.propTypes = {};
+AUcardHTML.defaultProps = {};
+
+
+/**
+ * [description]
+ * @param {[type]} options.fullwidth [description]
+ * @return {[type]} [description]
+ */
export const AUcardLine = ({ fullwidth }) => (
<hr className={ `au-card__line${ fullwidth ? ' au-card__fullwidth' : '' }` } />
);
+AUcardLine.propTypes = {};
+AUcardLine.defaultProps = {};
+
+
+/**
+ * [description]
+ * @param {[type]} options.text [description]
+ * @param {[type]} options.link [description]
+ * @param {[type]} options.fullwidth [description]
+ * @return {[type]} [description]
+ */
export const AUcardCTA = ({ text, link, fullwidth }) => {
let CTAContainer = 'div';
let CTAProps = {};
@@ -63,9 +122,20 @@ export const AUcardCTA = ({ text, link, fullwidth }) => {
);
};
+AUcardCTA.propTypes = {};
+
+AUcardCTA.defaultProps = {};
+
/**
- * The card component
+ * [description]
+ * @param {[type]} options.rows [description]
+ * @param {[type]} options.link [description]
+ * @param {[type]} options.appearance [description]
+ * @param {[type]} options.centered [description]
+ * @param {[type]} options.href [description]
+ * @param {...[type]} options.attributesOptions [description]
+ * @return {[type]} [description]
*/
export const AUcard = ({ rows, link, appearance, centered, href, ...attributesOptions = {} }) => {
@@ -116,9 +186,13 @@ export const AUcard = ({ rows, link, appearance, centered, href, ...attributesOp
AUcard.propTypes = {};
+AUcard.defaultProps = {};
+
/**
- * The CardList component
+ * [description]
+ * @param {[type]} { cards, columnSize, matchHeight, centered, appearance }) [description]
+ * @return {[type]} [description]
*/
export const AUcardList = ({ cards, columnSize, matchHeight, centered, appearance }) => (
<ul className={ `au-card-list${ matchHeight ? ' au-card-list--matchheight' : '' }` }>
@@ -136,3 +210,7 @@ export const AUcardList = ({ cards, columnSize, matchHeight, centered, appearanc
}
</ul>
);
+
+AUcardList.propTypes = {};
+
+AUcardList.defaultProps = {};
| 6 |
diff --git a/src/view/get-event-listener.js b/src/view/get-event-listener.js @@ -35,6 +35,11 @@ function getEventListener(eventBind, owner, data, isComponentEvent) {
));
}
+ if (eventBind.modifier.prevent) {
+ e.preventDefault && e.preventDefault();
+ return false;
+ }
+
if (eventBind.modifier.stop) {
if (e.stopPropagation) {
e.stopPropagation();
@@ -43,11 +48,6 @@ function getEventListener(eventBind, owner, data, isComponentEvent) {
e.cancelBubble = true;
}
}
-
- if (eventBind.modifier.prevent) {
- e.preventDefault && e.preventDefault();
- return false;
- }
};
}
| 9 |
diff --git a/website/javascript/templates/Home.vue b/website/javascript/templates/Home.vue <template>
<div class="home-container">
- <div class="notification font-headline">Halite II launches on October 23rd, Finals begin on January 22nd, 2018</div>
+ <div class="notification font-headline">Welcome to the 2017-2018 season of Halite, running until January 22nd, 2018</div>
<div class="row">
<div class="col-md-12">
<div class="line-container"><i class="xline xline-top"></i></div>
<div class="ha-button-container no-bg-button">
<div>
- <a class="ha-button" href="/learn-programming-challenge/the-halite-codex"><span>READ THE CODEX</span></a>
+ <a class="ha-button" href="/learn-programming-challenge/basic-game-rules/the-halite-codex"><span>READ THE CODEX</span></a>
</div>
</div>
</div>
<input id="intmpid" type="email" placeholder="Your friend's email..."/>
<button class="btn" v-on:click="invite"><span>INVITE</span></button>
<br/>
- <p id="invitestatus" class="t5 c-gry"></p>
</div>
+ <p id="invitestatus" class="t5 c-gry"></p>
</div>
</div>
</div>
<div class="clear"></div>
<div class="ha-button-container no-bg-button">
<div>
- <a v-on:click="gaData('click-external', 'click-tscareers','spotlight')" href="https://www.twosigma.com/careers" class="ha-button"><span>EXPLORE CAREERS</span></a>
+ <a v-on:click="gaData('click-external', 'click-tscareers','spotlight')" href="https://www.twosigma.com/careers" class="ha-button" target="_blank"><span>EXPLORE CAREERS</span></a>
</div>
</div>
</div>
<i class="xline xline-right"></i>
<div class="content">
<p class="t3 c-wht font-headline">ABOUT THE COMPETITION</p>
- <p class="t5 c-gry">Halite is an AI programming challenge running October 23 - January 26, 2017. Created by two interns at <a href="https://twosigma.com">Two Sigma</a> in 2016, the first iteration of Halite was such a success that Halite II was built the summer of 2017.</p>
+ <p class="t5 c-gry">Halite is an AI programming challenge running October 23 - January 26, 2017. Created by two interns at <a href="https://twosigma.com" target="_blank">Two Sigma</a> in 2016, the first iteration of Halite was such a success that Halite II was built the summer of 2017.</p>
<div class="clear"></div>
<div class="ha-button-container no-bg-button">
<div>
<div class="col-md-6 col-sm-6 sponsor-section text-center">
<p class="t2 c-wht font-headline">LAUNCH PARTNER</p>
<div class="text-center">
+ <a href="https://tech.cornell.edu/" target="_blank">
<img class="logo center-block" :src="`${baseUrl}/assets/images/temp/logo_corneltech.png`"/>
+ </a>
</div>
</div>
<div class="col-md-6 col-sm-6 sponsor-section text-center">
<p class="t2 c-wht font-headline">SUPPORT FROM</p>
<div class="text-center">
+ <a href="https://cloud.google.com/" target="_blank">
<img class="logo center-block" :src="`${baseUrl}/assets/images/logo_cloud_reverse.png`"/>
+ </a>
</div>
</div>
<div class="col-md-12 big-menu">
@@ -339,17 +343,17 @@ export default {
},
methods: {
invite: function () {
- gaData('invite', 'click-to-invite', 'home')
+ this.gaData('invite', 'click-to-invite', 'home')
if (!document.getElementById('intmpid').checkValidity()) {
document.getElementById('invitestatus').style.color = 'red'
document.getElementById('invitestatus').textContent = 'Invalid email..'
- gaData('invite-error', 'click-to-invite', 'home')
+ this.gaData('invite-error', 'click-to-invite', 'home')
} else {
let content = document.getElementById('intmpid').value
api.invitefriend(content).then(status => {
document.getElementById('invitestatus').style.color = 'green'
document.getElementById('invitestatus').textContent = 'Invitation sent...'
- gaData('invite-success', 'click-to-invite', 'home')
+ this.gaData('invite-success', 'click-to-invite', 'home')
})
}
},
| 1 |
diff --git a/components/explorer/commune/voies-commune.js b/components/explorer/commune/voies-commune.js @@ -57,7 +57,9 @@ const VoiesCommune = ({voies, commune}) => {
VoiesCommune.propTypes = {
voies: PropTypes.array,
- commune: PropTypes.object
+ commune: PropTypes.shape({
+ code: PropTypes.string.isRequired
+ })
}
VoiesCommune.defaultProps = {
| 0 |
diff --git a/package.json b/package.json "name": "find-and-replace",
"main": "./lib/find",
"description": "Find and replace within buffers and across the project.",
- "version": "0.215.4",
+ "version": "0.215.5",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/includes/Modules/Subscribe_With_Google/Header.php b/includes/Modules/Subscribe_With_Google/Header.php @@ -28,8 +28,6 @@ final class Header {
* @param bool $is_amp True if an AMP request, false otherwise.
*/
public function __construct( $is_amp ) {
- $this->is_amp = $is_amp;
-
$publication_id = get_option( Key::from( 'publication_id' ) );
$product = get_post_meta( get_the_ID(), Key::from( 'product' ), true );
$this->product_id = $publication_id . ':' . $product;
| 2 |
diff --git a/src/web/OperationsWaiter.js b/src/web/OperationsWaiter.js @@ -38,7 +38,6 @@ OperationsWaiter.prototype.searchOperations = function(e) {
selected = this.getSelectedOp(ops);
if (selected > -1) {
this.manager.recipe.addOperation(ops[selected].innerHTML);
- this.app.autoBake();
}
}
}
@@ -197,7 +196,6 @@ OperationsWaiter.prototype.operationDblclick = function(e) {
const li = e.target;
this.manager.recipe.addOperation(li.textContent);
- this.app.autoBake();
};
| 2 |
diff --git a/source/tab/messaging.js b/source/tab/messaging.js @@ -54,7 +54,8 @@ function handleMessage(request, sender, sendResponse) {
setPasswordForCurrentInput(request.password);
break;
default:
- throw new Error(`Unknown message received: ${request.type}`);
+ // ignore
+ break;
}
}
| 8 |
diff --git a/assets/js/components/dashboard-sharing/ModuleRecoveryAlert/index.stories.js b/assets/js/components/dashboard-sharing/ModuleRecoveryAlert/index.stories.js @@ -185,11 +185,6 @@ SingleRecoverableModuleError.args = {
);
},
};
-SingleRecoverableModuleError.scenario = {
- label:
- 'Global/ModuleRecoveryAlert/Single Recoverable Module with Error Message',
- delay: 250,
-};
export const MultipleRecoverableModuleErrors = Template.bind( {} );
MultipleRecoverableModuleErrors.storyName =
@@ -224,11 +219,6 @@ MultipleRecoverableModuleErrors.args = {
);
},
};
-MultipleRecoverableModuleErrors.scenario = {
- label:
- 'Global/ModuleRecoveryAlert/Multiple Recoverable Modules with Error Messages',
- delay: 250,
-};
export default {
title: 'Components/ModuleRecoveryAlert',
| 2 |
diff --git a/src/og/entity/Polyline.js b/src/og/entity/Polyline.js @@ -187,7 +187,8 @@ class Polyline {
* @param {Array.<Array.<og.LonLat>>} [outTransformedPathLonLat] - Geodetic coordinates out array.
* @param {Array.<Array.<og.LonLat>>} [outPath3v] - Cartesian coordinates out array.
* @param {Array.<Array.<og.LonLat>>} [outTransformedPathMerc] - Mercator coordinates out array.
- * @param {og.Extent} outExtent - Geodetic line extent.
+ * @param {og.Extent} [outExtent] - Geodetic line extent.
+ * @param {Array} [outColors] - Geodetic line extent.
* @static
*/
static appendLineData3v(
| 0 |
diff --git a/src/editor/components/JournalCitationPreview.js b/src/editor/components/JournalCitationPreview.js import { Component } from 'substance'
-import ElementCitationAuthorsList from './ElementCitationAuthorsList'
+import PersonGroupPreview from './PersonGroupPreview'
+import YearPreviewComponent from './YearPreviewComponent'
+import ArticleTitlePreviewComponent from './ArticleTitlePreviewComponent'
+import SourcePreviewComponent from './SourcePreviewComponent'
+import VolumePreviewComponent from './VolumePreviewComponent'
+import FpagePreviewComponent from './FpagePreviewComponent'
+import LpagePreviewComponent from './LpagePreviewComponent'
export default class JournalCitationPreview extends Component {
render($$) {
let node = this.props.node
- let articleTitle = node.find('article-title').text()
- let source = node.find('source').text()
- let year = node.find('year').text()
- let volume = node.find('volume').text()
- let fpage = node.find('fpage').text()
- let lpage = node.find('lpage').text()
let el = $$('div').addClass('sc-journal-citation-preview')
el.append(
- $$(ElementCitationAuthorsList, {node: node}),
+ $$(PersonGroupPreview, {node: node, type: 'author', label: 'Authors'}),
'. ',
- year,
+ $$(PersonGroupPreview, {node: node, type: 'editor', label: 'Editors'}),
'. ',
- articleTitle,
+ $$(YearPreviewComponent, {node: node}),
'. ',
- source,
+ $$(ArticleTitlePreviewComponent, {node: node}),
+ '. ',
+ $$(SourcePreviewComponent, {node: node}),
' ',
$$('bold').append(
- volume
+ $$(VolumePreviewComponent, {node: node})
),
':',
- fpage,
+ $$(FpagePreviewComponent, {node: node}),
'-',
- lpage
+ $$(LpagePreviewComponent, {node: node})
)
return el
| 7 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.