code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/packages/project-disaster-trail/src/components/Game/index.js b/packages/project-disaster-trail/src/components/Game/index.js @@ -7,7 +7,7 @@ import "@hackoregon/component-library/assets/global.styles.css";
const Game = () => (
<div>
<h1>This is the game</h1>
- <Orb x={200} y={400} />
+ <Orb />
</div>
);
| 2 |
diff --git a/source/Renderer/shaders/ibl.glsl b/source/Renderer/shaders/ibl.glsl @@ -16,7 +16,7 @@ vec4 getSheenSample(vec3 reflection, float lod)
vec3 getIBLRadianceGGX(vec3 n, vec3 v, float roughness, vec3 F0)
{
float NdotV = clampedDot(n, v);
- float lod = clamp(roughness * float(u_MipCount), 0.0, float(u_MipCount));
+ float lod = roughness * float(u_MipCount - 1);
vec3 reflection = normalize(reflect(-v, n));
vec2 brdfSamplePoint = clamp(vec2(NdotV, roughness), vec2(0.0, 0.0), vec2(1.0, 1.0));
@@ -114,7 +114,7 @@ vec3 getIBLRadianceLambertian(vec3 n, vec3 v, float roughness, vec3 diffuseColor
vec3 getIBLRadianceCharlie(vec3 n, vec3 v, float sheenRoughness, vec3 sheenColor)
{
float NdotV = clampedDot(n, v);
- float lod = clamp(sheenRoughness * float(u_MipCount), 0.0, float(u_MipCount));
+ float lod = sheenRoughness * float(u_MipCount - 1);
vec3 reflection = normalize(reflect(-v, n));
vec2 brdfSamplePoint = clamp(vec2(NdotV, sheenRoughness), vec2(0.0, 0.0), vec2(1.0, 1.0));
| 2 |
diff --git a/config/sections.yml b/config/sections.yml - id: "articles"
title: "Articles"
url: "/getting-started"
- folder: "articles"
+ folder: ""
default: true
# - id: "sdks"
- id: "apis"
title: "Auth0 APIs"
url: "/api/info"
- folder: "articles/apis"
+ folder: "api"
- id: "quickstarts"
title: "QuickStarts"
url: "/quickstarts"
- folder: "articles/quickstart"
+ folder: "quickstart"
- id: "libraries"
title: "Libraries"
url: "/libraries"
- folder: "articles/libraries"
+ folder: "libraries"
- id: "appliance"
title: "PSaaS Appliance"
url: "/appliance"
- folder: "articles/appliance"
+ folder: "appliance"
| 3 |
diff --git a/karma.conf.js b/karma.conf.js @@ -39,6 +39,12 @@ module.exports = function (config) {
base: 'SauceLabs',
browserName: 'MicrosoftEdge',
version: 'latest'
+ },
+ sl_safari_ios: {
+ base: 'SauceLabs',
+ browserName: 'safari',
+ platform: 'iOS',
+ version: 'latest'
}
};
| 0 |
diff --git a/learn/getting_started/quick_start.md b/learn/getting_started/quick_start.md @@ -100,7 +100,7 @@ Choose the release you want to use. You can find the full list [here](https://gi
In the cloned repository, run the following command to access the most recent version of Meilisearch:
```bash
-git checkout stable
+git checkout latest
```
Finally, update the rust toolchain, compile the project, and execute the binary.
| 4 |
diff --git a/src/utils/rules-proxy.js b/src/utils/rules-proxy.js @@ -164,9 +164,9 @@ module.exports.createRewriter = function(config) {
}
function notStatic(pathname) {
- return alternativePathsFor(pathname)
+ return !alternativePathsFor(pathname)
.map(p => path.resolve(config.publicFolder, p))
- .every(p => !fs.existsSync(p))
+ .some(p => fs.existsSync(p))
}
function render404() {
| 7 |
diff --git a/articles/user-profile/user-profile-details.md b/articles/user-profile/user-profile-details.md ---
description: This page details Auth0 User Profiles, such as sources of profile data, normalized user profiles, caching, profile structure and custom profiles.
+toc: true
---
# User Profile: In-Depth Details
The Auth0 **User Profile** is a set of attributes about a user, such as first name, last name, email address, and nickname. The attributes may also include information from social providers, such as a person's contacts or their profile picture, or in the case of Enterprise users, company identifiers such as an employee number or the name of the department to which an employee belongs.
-- [Sources of User Profile Data](#sources-of-user-profile-data)
-- [Normalized User Profile](#normalized-user-profile)
-- [Caching of the User Profile in Auth0](#caching-of-the-user-profile-in-auth0)
-- [Structure of User Profile Data](#structure-of-user-profile-data)
-- [Storing Custom Profile Data](#storing-custom-profile-data)
-- [Application Access to User Profile](#application-access-to-user-profile)
-- [Management API Access to User Profiles](#management-api-access-to-user-profiles)
-- [User Profile vs Tokens](#user-profile-vs-tokens)
-- [Modification of User Profiles](#modification-of-user-profiles)
-- [Mapping User Profile Attributes in AD/LDAP Connector](#mapping-user-profile-attributes-in-ad-ldap-connector)
-- [Mapping User Profile Attributes in SAML Assertions](#mapping-user-profile-attributes-in-saml-assertions)
-- [User Profile with Account Linking](#user-profile-with-account-linking)
-- [User Data Storage Guidance](/user-profile/user-data-storage)
-
## Sources of User Profile Data
User Profile attributes may come from multiple sources. A core set of attributes will come from the service, such as Facebook or LinkedIn, that authenticates a user. Alternatively, the authentication service might be an enterprise provider, such as Active Directory, or a SAML-compliant authentication service operated by a business or other organization.
| 14 |
diff --git a/mk b/mk @@ -26,6 +26,7 @@ const pj = JSON.parse(rf('package.json'));
// v:version string - "x.y.z" where z is the number of commits since the beginning of the project
const v = `${pj.version.replace(/\.0$/, '')}.${sh('git rev-list --count HEAD')}`;
//const isDyalogBuild = /^dyalog/.test(pj.name);
+const isDyalogBuild = false
const tasks = { };
let buildDone = 0;
| 12 |
diff --git a/data.js b/data.js @@ -41,6 +41,14 @@ module.exports = [
url: "http://fusejs.io",
source: "https://raw.githubusercontent.com/krisk/Fuse/master/src/fuse.js"
},
+ {
+ name: "Tiny Browser Framework",
+ github: "thedumbterminal/TinyBrowserFramework",
+ tags: ["framework", "web", "websocket", "browser"],
+ description: "Minimal Client JS Framework",
+ url: "https://github.com/thedumbterminal/TinyBrowserFramework",
+ source: "https://raw.githubusercontent.com/thedumbterminal/TinyBrowserFramework/master/src/index.js"
+ },
{
name: "blobcounter.js",
github: "satrobit/blobcounter.js",
| 0 |
diff --git a/examples/_midi.orca b/examples/_midi.orca .........................................
.#.MIDI.#................................
.........................................
-...gC4...................................
-.gD214TCAFE..################............
-...:02A.g....#..............#............
+...wC4...................................
+.gD224TCAFE..################............
+...:02F.g....#..............#............
.............#..Channel..1..#............
...8C4.......#..Octave.234..#............
-.4D234TCAFE..#..Notes.CAFE..#............
-...:03E.4....#..............#............
+.4D204TCAFE..#..Notes.CAFE..#............
+...:03C.4....#..............#............
.............################............
...4C4...................................
-.1D434TCAFE..............................
-...:04E.2................................
+.1D414TCAFE..............................
+...:04A.2................................
.........................................
.........................................
.........................................
\ No newline at end of file
| 7 |
diff --git a/src/strategies/latency.js b/src/strategies/latency.js @@ -58,7 +58,7 @@ class LatencyStrategy extends BaseStrategy {
//this.broker.logger.debug("Latency: We are MASTER");
this.broker.localBus.on("$node.latencyMaster", function() {});
this.broker.localBus.on("$node.pong", this.processPong.bind(this));
- this.pingTimer();
+ this.broker.localBus.on("$broker.started", this.sendPing.bind(this));
} else {
//this.broker.logger.debug("Latency: We are SLAVE");
}
@@ -68,18 +68,13 @@ class LatencyStrategy extends BaseStrategy {
}
// Master
- ping() {
+ sendPing() {
//this.broker.logger.debug("Latency: Sending ping");
this.broker.transit.sendPing().then(function() {
- setTimeout(this.ping.bind(this), 1000 * this.opts.pingInterval);
+ setTimeout(this.sendPing.bind(this), 1000 * this.opts.pingInterval);
}.bind(this));
}
- // Master
- pingTimer() {
- this.broker.localBus.on("$broker.started", this.ping.bind(this));
- }
-
// Master
processPong(payload) {
let nodeID = payload.nodeID;
| 10 |
diff --git a/src/cli/domain/package-server-script/bundle/config/externalDependenciesHandlers.js b/src/cli/domain/package-server-script/bundle/config/externalDependenciesHandlers.js *
*/
'use strict';
-
+var format = require('stringformat');
var _ = require('underscore');
+var strings = require('../../../../../resources');
module.exports = function externalDependenciesHandlers(dependencies){
- dependencies = dependencies || {}
+ var deps = dependencies || {}
var missingExternalDependecy = function(dep, dependencies) {
return !_.contains(_.keys(dependencies), dep);
}
return [
- function(context, request, callback) {
- console.log(request)
- if (/^[a-z@][a-z\-\/0-9]+$/.test(request)) {
- if(missingExternalDependecy(request, dependencies)) {
- console.log('BOOM, ' + request + ' doesnt exist on package.json')
- } else {
- console.log('coool')
+ function(context, req, callback) {
+ if (/^[a-z@][a-z\-\/0-9]+$/.test(req)) {
+ var dependencyName = req;
+ if (/\//g.test(dependencyName)) {
+ dependencyName = dependencyName.substring(0, dependencyName.indexOf("/"));
+ }
+ if (missingExternalDependecy(dependencyName, deps)) {
+ return callback(new Error(format(strings.errors.cli.SERVERJS_DEPENDENCY_NOT_DECLARED, JSON.stringify(dependencyName))));
}
-
}
callback()
},
/^[a-z@][a-z\-\/0-9]+$/
]
};
+
+
| 9 |
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml @@ -40,21 +40,14 @@ jobs:
run: |
jq --argjson icons "{\"16\": \"icons/dev/16x16.png\",\"48\": \"icons/dev/48x48.png\",\"128\": \"icons/dev/128x128.png\"}" '.icons = $icons | .browser_action.default_icon = $icons | .name = "Liquality Wallet - Dev"' ./src/manifest.json > ./src/manifest.tmp
mv ./src/manifest.tmp ./src/manifest.json
+ - name: Set build mode sufix for dev-staging
+ if: steps.semvers.outputs.v_patch == steps.get_current_tag.outputs.tag
+ env:
+ BUILD_MODE: ':staging'
- run: |
npm ci
npm run lint
- - name: Set build Mode Staging
- if: steps.semvers.outputs.v_patch == steps.get_current_tag.outputs.tag
- run: |
- npm run build:staging
- - name: Set build Mode Prod for Minor
- if: steps.semvers.outputs.v_minor == steps.get_current_tag.outputs.tag
- run: |
- npm run build
- - name: Set build Mode Prod for Major
- if: steps.semvers.outputs.v_major == steps.get_current_tag.outputs.tag
- run: |
- npm run build
+ npm run build${{ $BUILD_MODE }}
- name: Create Release
id: create_release
uses: actions/create-release@v1
| 3 |
diff --git a/ui/src/components/infinite-scroll/QInfiniteScroll.js b/ui/src/components/infinite-scroll/QInfiniteScroll.js @@ -141,7 +141,8 @@ export default defineComponent({
// expose public methods
const vm = getCurrentInstance()
Object.assign(vm.proxy, {
- poll: immediatePoll, trigger, stop, reset, resume, setIndex
+ poll: () => poll.apply(null, arguments),
+ trigger, stop, reset, resume, setIndex
})
function setDebounce (val) {
@@ -149,12 +150,9 @@ export default defineComponent({
const oldPoll = poll
- if (val <= 0) {
- poll = immediatePoll
- }
- else {
- poll = debounce(immediatePoll, isNaN(val) === true ? 100 : val)
- }
+ poll = val <= 0
+ ? immediatePoll
+ : debounce(immediatePoll, isNaN(val) === true ? 100 : val)
if (localScrollTarget && isWorking === true) {
if (oldPoll !== void 0) {
| 1 |
diff --git a/web/src/WallpaperModal.js b/web/src/WallpaperModal.js @@ -29,6 +29,11 @@ const getImagePromises = (pkg, colors, width, height) => {
export default class WallpaperModal extends PureComponent {
state = { image: null };
+ escListener = evt => {
+ if (evt.key === 'Escape') {
+ this.props.onClose();
+ }
+ }
async componentDidMount() {
try {
const { devicePixelRatio } = window;
@@ -47,6 +52,10 @@ export default class WallpaperModal extends PureComponent {
} catch {
this.setState({ image: 'none' });
}
+ window.document.addEventListener('keydown', this.escListener);
+ }
+ componentWillUnmount() {
+ window.document.removeEventListener('keydown', this.escListener);
}
render() {
return (
| 11 |
diff --git a/assets/js/googlesitekit/datastore/user/permissions.js b/assets/js/googlesitekit/datastore/user/permissions.js @@ -29,6 +29,7 @@ import Data from 'googlesitekit-data';
import { CORE_USER, PERMISSION_READ_SHARED_MODULE_DATA } from './constants';
import { CORE_MODULES } from '../../modules/datastore/constants';
import { getMetaCapabilityPropertyName } from '../util/permissions';
+import { createFetchStore } from '../../data/create-fetch-store';
const { createRegistrySelector } = Data;
// Actions
@@ -36,12 +37,21 @@ const CLEAR_PERMISSION_SCOPE_ERROR = 'CLEAR_PERMISSION_SCOPE_ERROR';
const SET_PERMISSION_SCOPE_ERROR = 'SET_PERMISSION_SCOPE_ERROR';
const RECEIVE_CAPABILITIES = 'RECEIVE_CAPABILITIES';
-export const initialState = {
+const fetchRefreshCapabilitiesStore = createFetchStore( {
+ baseName: 'refreshCapabilities',
+ controlCallback: () => {
+ return API.get( 'core', 'user', 'permissions', undefined, {
+ useCache: false,
+ } );
+ },
+} );
+
+const baseInitialState = {
permissionError: null,
capabilities: undefined,
};
-export const actions = {
+const baseActions = {
/**
* Clears the permission scope error, if one was previously set.
*
@@ -101,23 +111,21 @@ export const actions = {
*refreshCapabilities() {
const { dispatch } = yield Data.commonActions.getRegistry();
- const newCapabilities = yield API.get(
- 'core',
- 'user',
- 'permissions',
- undefined,
- { useCache: false }
- );
+ const {
+ response,
+ } = yield fetchRefreshCapabilitiesStore.actions.fetchRefreshCapabilities();
- global._googlesitekitUserData.permissions = newCapabilities;
+ global._googlesitekitUserData = {
+ permissions: response,
+ };
- return dispatch( CORE_USER ).receiveCapabilities( newCapabilities );
+ return dispatch( CORE_USER ).receiveCapabilities( response );
},
};
-export const controls = {};
+const baseControls = {};
-export const reducer = ( state, { type, payload } ) => {
+const baseReducer = ( state, { type, payload } ) => {
switch ( type ) {
case CLEAR_PERMISSION_SCOPE_ERROR: {
return {
@@ -150,7 +158,7 @@ export const reducer = ( state, { type, payload } ) => {
}
};
-export const resolvers = {
+const baseResolvers = {
*getCapabilities() {
const registry = yield Data.commonActions.getRegistry();
@@ -168,7 +176,7 @@ export const resolvers = {
},
};
-export const selectors = {
+const baseSelectors = {
/**
* Gets the most recent permission error encountered by this user.
*
@@ -285,11 +293,20 @@ export const selectors = {
),
};
-export default {
- initialState,
- actions,
- controls,
- reducer,
- resolvers,
- selectors,
-};
+const store = Data.combineStores( fetchRefreshCapabilitiesStore, {
+ initialState: baseInitialState,
+ actions: baseActions,
+ controls: baseControls,
+ reducer: baseReducer,
+ resolvers: baseResolvers,
+ selectors: baseSelectors,
+} );
+
+export const initialState = store.initialState;
+export const actions = store.actions;
+export const controls = store.controls;
+export const reducer = store.reducer;
+export const resolvers = store.resolvers;
+export const selectors = store.selectors;
+
+export default store;
| 4 |
diff --git a/src/adapters/scene.js b/src/adapters/scene.js @@ -304,6 +304,10 @@ Scene.prototype.addMarker = function(poi) {
const { className, subClassName, type } = poi;
const element = createIcon({ className, subClassName, type });
+ element.onclick = function(e) {
+ // click event should not be propagated to the map itself;
+ e.stopPropagation();
+ };
if (this.currentMarker !== null) {
this.currentMarker.remove();
| 8 |
diff --git a/README.md b/README.md @@ -190,6 +190,7 @@ Note that `{{ title }}` above outputs the `title` data value (this can come from
// the path to the original source file for the template
inputPath: "/current/page/file.md",
+ // New in Eleventy v0.3.4
// mapped from inputPath, useful for clean permalinks
fileSlug: "file"
| 0 |
diff --git a/app/main/main.dev.js b/app/main/main.dev.js @@ -227,7 +227,13 @@ const disableSigningRequests = () => {
});
};
-// Allow for configuration of signing requests from the UI
+// Allow ESR Requests from the UI
+ipcMain.on('openUri', (event, data) => {
+ pHandler.webContents.send('openUri', data);
+ pHandler.show();
+});
+
+// Allow for configuration of ESR from the UI
ipcMain.on('enableSigningRequests', enableSigningRequests);
ipcMain.on('disableSigningRequests', disableSigningRequests);
| 11 |
diff --git a/README.md b/README.md @@ -110,6 +110,11 @@ Get technical informations, open an issue/pull request or join the (amazing) com
> Many other browsers may work, but are not extensively tested.
+## Maintainers
+Since 2019, mojs ecosystem is **maintained and developed** by:
+- [Xavier Foucrier](https://github.com/xavierfoucrier)
+- [Jonas Sandstedt](https://github.com/Sandstedt)
+
## Kudos
Meet some of the outstanding guys that support mojs on [Patreon](https://patreon.com/user?u=3219311&utm_medium=social&utm_source=twitter&utm_campaign=creatorshare):
| 0 |
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js @@ -130,7 +130,6 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
element: dragger,
gd: gd,
plotinfo: plotinfo,
- doubleclick: doubleClick,
prepFn: function(e, startX, startY) {
var dragModeNow = gd._fullLayout.dragmode;
| 2 |
diff --git a/token-metadata/0x7D29A64504629172a429e64183D6673b9dAcbFCe/metadata.json b/token-metadata/0x7D29A64504629172a429e64183D6673b9dAcbFCe/metadata.json "symbol": "VXV",
"address": "0x7D29A64504629172a429e64183D6673b9dAcbFCe",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/tests/mocha/xml_test.js b/tests/mocha/xml_test.js @@ -451,30 +451,6 @@ suite('XML', function() {
suite('domToBlock', function() {
setup(function() {
this.workspace = new Blockly.Workspace();
- Blockly.defineBlocksWithJsonArray([{
- "type": "variables_get",
- "message0": "%1",
- "args0": [
- {
- "type": "field_variable",
- "name": "VAR"
- }
- ]
- },
- {
- "type": "variables_set",
- "message0": "%1 %2",
- "args0": [
- {
- "type": "field_variable",
- "name": "VAR"
- },
- {
- "type": "input_value",
- "name": "VALUE"
- }
- ]
- }]);
});
teardown(function() {
workspaceTeardown.call(this, this.workspace);
| 2 |
diff --git a/functions/db/publicTasks/onWrite.f.js b/functions/db/publicTasks/onWrite.f.js @@ -3,6 +3,6 @@ const counting = require('../../utils/counting')
exports = module.exports = functions.database.ref('/public_tasks/{taskUid}').onWrite((data, context) => {
return Promise.all([
- counting.handleListChange(data.after, context, 'public_tasks_count')
+ counting.handleListChange(data, context, 'public_tasks_count')
])
})
| 1 |
diff --git a/source/jquery.flot.navigate.js b/source/jquery.flot.navigate.js @@ -38,7 +38,9 @@ The plugin supports these options:
axisZoom: true, //zoom axis when mouse over it is allowed
plotZoom: true, //zoom axis is allowed for plot zoom
axisPan: true, //pan axis when mouse over it is allowed
- plotPan: true //pan axis is allowed for plot pan
+ plotPan: true, //pan axis is allowed for plot pan
+ panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+ zoomRange: [undefined, undefined], // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
}
yaxis: {
@@ -46,6 +48,8 @@ The plugin supports these options:
plotZoom: true, //zoom axis is allowed for plot zoom
axisPan: true, //pan axis when mouse over it is allowed
plotPan: true //pan axis is allowed for plot pan
+ panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+ zoomRange: [undefined, undefined], // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
}
```
**interactive** enables the built-in drag/click behaviour. If you enable
@@ -124,13 +128,17 @@ can set the default in the options.
axisZoom: true, //zoom axis when mouse over it is allowed
plotZoom: true, //zoom axis is allowed for plot zoom
axisPan: true, //pan axis when mouse over it is allowed
- plotPan: true //pan axis is allowed for plot pan
+ plotPan: true, //pan axis is allowed for plot pan
+ panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+ zoomRange: [undefined, undefined], // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
},
yaxis: {
axisZoom: true,
plotZoom: true,
axisPan: true,
- plotPan: true
+ plotPan: true,
+ panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+ zoomRange: [undefined, undefined], // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
}
};
@@ -534,12 +542,12 @@ can set the default in the options.
}
// calc min delta (revealing left edge of plot)
- var minD = axis.p2c(opts.panRange[0])-axis.p2c(axis.min);
+ var minD = p+axis.p2c(opts.panRange[0])-axis.p2c(axis.min);
// calc max delta (revealing right edge of plot)
- var maxD = axis.p2c(opts.panRange[1])-axis.p2c(axis.max);
- // limit delta to min or max
- if (d>=maxD) d = maxD;
- if (d<=minD) d = minD;
+ var maxD = p+axis.p2c(opts.panRange[1])-axis.p2c(axis.max);
+ // limit delta to min or max if enabled
+ if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
+ if (opts.panRange[1] !== undefined && d<=minD) d = minD;
if (d !== 0) {
var navigationOffsetBelow = saturated.saturate(axis.c2p(axis.p2c(axis.min) + d) - axis.min),
@@ -699,9 +707,9 @@ can set the default in the options.
var minD = p+axis.p2c(opts.panRange[0])-axis.p2c(axisMin);
// calc max delta (revealing right edge of plot)
var maxD = p+axis.p2c(opts.panRange[1])-axis.p2c(axisMax);
- // limit delta to min or max
- if (d>=maxD) d = maxD;
- if (d<=minD) d = minD;
+ // limit delta to min or max if enabled
+ if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
+ if (opts.panRange[1] !== undefined && d<=minD) d = minD;
if (d !== 0) {
var navigationOffsetBelow = saturated.saturate(axis.c2p(axis.p2c(axisMin) - (p - d)) - axisMin),
| 12 |
diff --git a/source/views/controls/AbstractInputView.js b/source/views/controls/AbstractInputView.js @@ -136,28 +136,21 @@ const AbstractInputView = Class({
return el('p', [description]);
},
- /**
- Method: O.AbstractInputView#draw
+ drawHelp() {
+ const description = this.get('description');
+ return description ? this.drawDescription(description) : null;
+ },
- Overridden to set properties and add label. See <O.View#draw>.
- */
draw(layer) {
- const control = this.drawControl();
-
- let label = this.get('label');
- if (label) {
- label = this.drawLabel(label);
- }
-
- let description = this.get('description');
- if (description) {
- description = this.drawDescription(description);
- }
+ const controlEl = this.drawControl();
+ const label = this.get('label');
+ const labelEl = label ? this.drawLabel(label) : null;
+ const descriptionEl = this.drawHelp();
this.redrawInputAttributes(layer);
this.redrawTabIndex(layer);
- return [label, control, description];
+ return [labelEl, controlEl, descriptionEl];
},
// --- Keep render in sync with state ---
| 7 |
diff --git a/src/commands/prompts/common/noFeedsFound.js b/src/commands/prompts/common/noFeedsFound.js const LocalizedPrompt = require('./utils/LocalizedPrompt.js')
const Translator = require('../../../structs/Translator.js')
-
+const { MessageVisual } = require('discord.js-prompts')
/**
* @typedef {Object} Data
* @property {import('../../../structs/db/Profile.js')} [profile]
@@ -12,9 +12,7 @@ const Translator = require('../../../structs/Translator.js')
*/
function noFeedsFoundVisual (data) {
const { locale } = data.profile || {}
- return {
- text: Translator.translate('structs.FeedSelector.noFeeds', locale)
- }
+ return new MessageVisual(Translator.translate('structs.FeedSelector.noFeeds', locale))
}
const prompt = new LocalizedPrompt(noFeedsFoundVisual)
| 1 |
diff --git a/netlify.toml b/netlify.toml @@ -57,7 +57,7 @@ REACT_APP_SERVER_URL = "https://good-server.herokuapp.com/"
REACT_APP_GUN_PUBLIC_URL = "https://goodgun-dev.herokuapp.com/gun"
REACT_APP_NETWORK = "fuse"
REACT_APP_SKIP_EMAIL_VERIFICATION = "true"
-REACT_APP_MARKET_URL = "https://www.facebook.com/groups/gooddollarmarketplace"
+REACT_APP_MARKET_URL = "https://gooddollarmarketplace.sharetribe.com/en"
REACT_APP_ETORO = "false"
# REACT_APP_ZOOM_LICENSE_KEY=""
# REACT_APP_AMPLITUDE_API_KEY = ""
| 3 |
diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js @@ -6,6 +6,7 @@ import Avatar from './Avatar';
import Tooltip from './Tooltip';
import Text from './Text';
import SubscriptAvatar from './SubscriptAvatar';
+import * as Expensicons from './Icon/Expensicons';
const propTypes = {
/** Array of avatar URL */
@@ -73,6 +74,7 @@ const MultipleAvatars = (props) => {
<SubscriptAvatar
avatarImageURLs={props.avatarImageURLs}
avatarTooltips={props.avatarTooltips}
+ defaultSubscriptIcon={() => Expensicons.Workspace}
/>
);
}
| 12 |
diff --git a/layouts/partials/fragments/list.html b/layouts/partials/fragments/list.html {{- if $self.Params.tiled }}
<div class="card-title">
{{- end }}
- <div class="col-12 pl-0
+ <div class="col-12 pl-0 pb-1
{{- partial "helpers/text-color.html" (dict "self" $self.self) -}}
">
<div
</div>
</div>
{{- if or (and $self.Params.tiled $self.Params.display_date) (and (ne $self.Params.display_categories false) .Params.categories) -}}
- <div class="col-12 pb-1 px-0">
+ <div class="col-12 pb-2 px-0">
{{- if and $self.Params.tiled $self.Params.display_date -}}
{{- range $content_page -}}
{{- partial "helpers/publish-date.html" (dict "root" . "background" $bg) -}}
{{- $file_path := strings.TrimSuffix ".md" (replace .File.Path "/index.md" "") -}}
{{- $page_scratch := $.page_scratch -}}
{{- $root := (dict "page" (dict "file_path" $file_path) "page_scratch" $page_scratch "page" $page) }}
- <div class="col-12
+ <div class="col-12 mt-1
{{- printf " p%s-0" (cond (eq $self.Params.tiled true) "x" "l") -}}
">
<img
src="{{ partial "helpers/image.html" (dict "root" $root "asset" .Params.asset) }}"
alt="{{ .Params.subtitle | default $page_title }}"
- class="img-fluid mb-4">
+ class="img-fluid mb-2">
</div>
{{- end -}}
{{- end -}}
{{- if $display_summary }}
- <div class="col-12 pl-0
+ <div class="col-12 pl-0 mt-2
{{- partial "helpers/text-color.html" (dict "self" $self.self "light" "secondary") -}}
">
{{- range $content_page }}
| 0 |
diff --git a/closure/goog/testing/testcase.js b/closure/goog/testing/testcase.js @@ -821,7 +821,7 @@ goog.testing.TestCase.prototype.runNextTest_ = function() {
*/
goog.testing.TestCase.prototype.safeSetUp_ = function() {
var setUps =
- this.curTest_.setUps.length ? this.curTest_.setUps : [this.setUp];
+ this.curTest_.setUps.length ? this.curTest_.setUps.slice() : [this.setUp];
return this.safeSetUpHelper_(setUps).call(this);
};
@@ -862,7 +862,8 @@ goog.testing.TestCase.prototype.safeTearDown_ = function(opt_error) {
if (arguments.length == 1) {
this.doError(this.curTest_, opt_error);
}
- var tearDowns = this.curTest_.tearDowns.length ? this.curTest_.tearDowns :
+ var tearDowns = this.curTest_.tearDowns.length ?
+ this.curTest_.tearDowns.slice() :
[this.tearDown];
return this.safeTearDownHelper_(tearDowns).call(this);
};
| 11 |
diff --git a/htdocs/js/ui/notebook_merger/merger_view.js b/htdocs/js/ui/notebook_merger/merger_view.js @@ -308,12 +308,14 @@ RCloudNotebookMerger.view = (function(model) {
let content_area = this._compare_stage.find(`div[data-filetype="${args.fileType}"][data-filename="${filename}"]`);
let panel_loader = content_area.closest('.panel').find('.diffLoader');
+ // Resizing of the Monaco editor panel.
let sizeDiffPanel = (panelContent, lineCount, changesCount, editorConfiguration) => {
- /*
- Set size of panel body explicitly so Monaco editor displays correctly
- */
- let computedWidth = panelContent.innerWidth();
- panelContent.css('width', computedWidth + 'px');
+
+ // The following sits the editor panel over the top of the margin (numbers).
+ panelContent.css('left', 0 + 'px');
+ panelContent.css('right', 0 + 'px');
+
+ // Calculates the height needed for the Monaco editor depending on the changes present.
let height = (lineCount + changesCount) * editorConfiguration.lineHeight;
panelContent.css('height', height + 'px');
};
@@ -350,6 +352,11 @@ RCloudNotebookMerger.view = (function(model) {
// Layout
sizeDiffPanel(editor_container, editor_model.getLineCount(), diff.modifiedLineInfo.length, this._editors[filename].editor.getConfiguration());
+ // Hide the default Monaco decorations.
+ $('.monaco-scrollable-element').each(function() {
+ this.style.left = '0px';
+ this.style.width = '110%';
+ })
this._editors[filename].editor.layout();
@@ -399,6 +406,12 @@ RCloudNotebookMerger.view = (function(model) {
// Layout
sizeDiffPanel(editor_container, editor_model.getLineCount(), 0, this._editors[filename].editor.getConfiguration());
+ // Hide the default Monaco decorations.
+ $('.monaco-scrollable-element').each(function() {
+ this.style.left = '0px';
+ this.style.width = '110%';
+ })
+
this._editors[filename].editor.layout();
panel_loader.remove();
| 5 |
diff --git a/particle-system.js b/particle-system.js @@ -64,7 +64,7 @@ const _makeGeometry = maxParticles => {
const geometry = planeGeometry.clone();
geometry.setAttribute('p', new THREE.InstancedBufferAttribute(new Float32Array(maxParticles * 3), 3));
// geometry.setAttribute('q', new THREE.InstancedBufferAttribute(new Float32Array(maxParticles * 4), 4));
- geometry.setAttribute('t', new THREE.InstancedBufferAttribute(new Float32Array(maxParticles * 2), 2));
+ geometry.setAttribute('t', new THREE.InstancedBufferAttribute(new Float32Array(maxParticles * 3), 3));
geometry.setAttribute('textureIndex', new THREE.InstancedBufferAttribute(new Int32Array(maxParticles), 1));
return geometry;
};
@@ -76,7 +76,7 @@ precision highp int;
uniform float uTime;
uniform vec4 cameraBillboardQuaternion;
attribute vec3 p;
-attribute vec2 t;
+attribute vec3 t;
varying vec2 vUv;
varying float vTimeDiff;
@@ -124,9 +124,11 @@ void main() {
float startTime = t.x;
float endTime = t.y;
- float timeDiff = (uTime - startTime) / (endTime - startTime);
- vTimeDiff = timeDiff;
- // vPosition = position;
+ float loop = t.z;
+ vTimeDiff = (uTime - startTime) / (endTime - startTime);
+ if (loop > 0.5) {
+ vTimeDiff = mod(vTimeDiff, 1.);
+ }
vTextureIndex = textureIndex;
}
@@ -182,8 +184,7 @@ vec2 getUv(float numFrames) {
float frame = floor(f * numFrames);
float x = mod(frame, rowSize);
float y = floor(frame / rowSize);
- vec2 uv = vec2(x / rowSize, y / rowSize) + vUv / rowSize;
- // vec4 alphaColor = texture2D(uTex, vec2(0.));
+ vec2 uv = vec2(x / rowSize, y / rowSize) + vec2(vUv.x, 1. - vUv.y) / rowSize;
return uv;
}
@@ -284,13 +285,14 @@ const _makeMaterial = maxNumTextures => {
}
class Particle extends THREE.Object3D {
- constructor(index, textureIndex, startTime, endTime, parent) {
+ constructor(index, textureIndex, startTime, endTime, loop, parent) {
super();
this.index = index;
this.textureIndex = textureIndex;
this.startTime = startTime;
this.endTime = endTime;
+ this.loop = loop;
this.parent = parent;
}
update() {
@@ -326,6 +328,7 @@ class ParticleSystem extends THREE.InstancedMesh {
addParticle(name, {
offsetTime = 0,
duration = 1000,
+ loop = false,
} = {}) {
const textureIndex = name ? this.#getParticleTextureIndex(name) : -1;
if (textureIndex !== -1) {
@@ -335,7 +338,7 @@ class ParticleSystem extends THREE.InstancedMesh {
for (let i = 0; i < this.particles.length; i++) {
let particle = this.particles[i];
if (particle === null) {
- particle = new Particle(i, textureIndex, startTime, endTime, this);
+ particle = new Particle(i, textureIndex, startTime, endTime, loop, this);
this.particles[i] = particle;
this.needsUpdate = true;
return particle;
@@ -370,8 +373,9 @@ class ParticleSystem extends THREE.InstancedMesh {
this.geometry.attributes.p.array[index*3 + 1] = particle.position.y;
this.geometry.attributes.p.array[index*3 + 2] = particle.position.z;
- this.geometry.attributes.t.array[index*2 + 0] = particle.startTime;
- this.geometry.attributes.t.array[index*2 + 1] = particle.endTime;
+ this.geometry.attributes.t.array[index*3 + 0] = particle.startTime;
+ this.geometry.attributes.t.array[index*3 + 1] = particle.endTime;
+ this.geometry.attributes.t.array[index*3 + 2] = particle.loop ? 1 : 0;
this.geometry.attributes.textureIndex.array[index] = particle.textureIndex;
@@ -382,7 +386,7 @@ class ParticleSystem extends THREE.InstancedMesh {
this.geometry.attributes.p.updateRange.count = index * 3;
this.geometry.attributes.p.needsUpdate = true;
- this.geometry.attributes.t.updateRange.count = index * 2;
+ this.geometry.attributes.t.updateRange.count = index * 3;
this.geometry.attributes.t.needsUpdate = true;
this.geometry.attributes.textureIndex.updateRange.count = index;
| 0 |
diff --git a/spec/realtime/auth.test.js b/spec/realtime/auth.test.js @@ -424,14 +424,17 @@ define(['ably', 'shared_helper', 'async'], function(Ably, helper, async) {
*/
function authCallback_failures(realtimeOptions, expectFailure) {
return function(test) {
- test.expect(3);
-
var realtime = helper.AblyRealtime(realtimeOptions);
realtime.connection.on(function(stateChange) {
if(stateChange.previous !== 'initialized') {
+ if (helper.bestTransport === 'jsonp') {
+ test.expect(1);
+ } else {
+ test.expect(3);
test.equal(stateChange.current, expectFailure ? 'failed' : 'disconnected', 'Check connection goes to the expected state');
- test.equal(stateChange.reason.code, 80019, 'Check correct error code');
test.equal(stateChange.reason.statusCode, expectFailure ? 403 : 401, 'Check correct cause error code');
+ }
+ test.equal(stateChange.reason.code, 80019, 'Check correct error code');
realtime.connection.off();
closeAndFinish(test, realtime);
}
@@ -483,7 +486,7 @@ define(['ably', 'shared_helper', 'async'], function(Ably, helper, async) {
/* 403 should cause the connection to go to failed, unlike the others */
exports.authUrl_403 = authCallback_failures({
authUrl: echoServer + '/respondwith?status=403'
- }, /* expectFailed: */ true);
+ }, true); /* expectFailed: */
/*
* Check state change reason is propogated during a disconnect
| 1 |
diff --git a/src/components/select/Select.js b/src/components/select/Select.js @@ -32,7 +32,7 @@ export default class SelectComponent extends Field {
template: '<span>{{ item.label }}</span>',
selectFields: '',
searchThreshold: 0.3,
- uniqueValues: false,
+ uniqueOptions: false,
tableView: true,
fuseOptions: {
include: 'score',
| 14 |
diff --git a/app/components/Information/News.js b/app/components/Information/News.js @@ -8,18 +8,17 @@ import messages from './messages';
const News = () => {
return (
<div>
- <h3>Happy first birthday EOS !!!</h3>
+ <h3>
+ <FormattedMessage {...messages.multiChainHeader} />
+ </h3>
<h4>
- Team GenerEOS has compiled a birthday video message from the EOS community - for the EOS community.
- We received so many amazing video submissions from around the world and it was fun putting it all together.
- Now watch for yourself! <a href="https://twitter.com/GenerEOSAus/status/1134685685216993280" target="new">
- [Twitter announcement]
- </a><br/>
- <br/>
- <iframe width="560" height="315" src="https://www.youtube.com/embed/nqSSZ_cftj8" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+ <FormattedMessage {...messages.multiChain1} />
+ <a href="/networks" target="_self">
+ [Change Network]
+ </a>
+ <FormattedMessage {...messages.multiChain2} />
</h4>
-
<h3>Thank you contributers !!!!</h3>
<h4>
The eostoolkit was the first open source tool built by the community - for the community.
@@ -36,22 +35,12 @@ const News = () => {
</a>
</h4>
- <h3>
- <FormattedMessage {...messages.multiChainHeader} />
- </h3>
- <h4>
- <FormattedMessage {...messages.multiChain1} />
- <a href="/networks" target="_self">
- [Change Network]
- </a>
- <FormattedMessage {...messages.multiChain2} />
- </h4>
- <h6 color="grey">
+ <h5 color="grey">
<FormattedMessage {...messages.multiChain3} />
<a href="https://github.com/eostoolkit/eos-networks/blob/master/networks.json" target="new">
here
</a>
- </h6>
+ </h5>
</div>
);
};
| 2 |
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -210,6 +210,8 @@ class Blocks extends React.Component {
const dynamicBlocksXML = this.props.vm.runtime.getBlocksXML();
const toolboxXML = makeToolboxXML(dynamicBlocksXML);
this.props.onExtensionAdded(toolboxXML);
+ const categoryName = blocksInfo[0].json.category;
+ this.workspace.toolbox_.setSelectedCategoryByName(categoryName);
}
setBlocks (blocks) {
this.blocks = blocks;
| 12 |
diff --git a/packages/gallery/src/components/item/imageItem.js b/packages/gallery/src/components/item/imageItem.js @@ -207,7 +207,7 @@ class ImageItem extends React.Component {
const shouldRenderHighResImages = !this.props.isPrerenderMode;
let src = "";
- if (options.stylingParams?.itemResolutionMode === 'FULL') {
+ if (options.stylingParams?.itemResolutionMode === GALLERY_CONSTS.itemResolutionMode.FULL) {
src = createUrl(
GALLERY_CONSTS.urlSizes.FULL,
GALLERY_CONSTS.urlTypes.HIGH_RES
| 14 |
diff --git a/package-lock.json b/package-lock.json },
"ini": {
"version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
- "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+ "resolved": "",
"dev": true
},
"is-fullwidth-code-point": {
| 13 |
diff --git a/src/index.js b/src/index.js @@ -311,7 +311,7 @@ class Offline {
const apiKeys = this.service.provider.apiKeys;
const protectedRoutes = [];
- if (['nodejs', 'nodejs4.3', 'babel'].indexOf(serviceRuntime) === -1) {
+ if (['nodejs', 'nodejs4.3', 'nodejs6.10', 'babel'].indexOf(serviceRuntime) === -1) {
this.printBlankLine();
this.serverlessLog(`Warning: found unsupported runtime '${serviceRuntime}'`);
| 0 |
diff --git a/src/encoded/types/biosample.py b/src/encoded/types/biosample.py @@ -116,60 +116,27 @@ class Biosample(Item, CalculatedBiosampleSlims, CalculatedBiosampleSynonyms):
'donor.mutated_gene',
'donor.organism',
'donor.characterizations',
- 'donor.characterizations.award',
- 'donor.characterizations.lab',
- 'donor.characterizations.submitted_by',
'donor.donor_documents',
- 'donor.donor_documents.award',
- 'donor.donor_documents.lab',
- 'donor.donor_documents.submitted_by',
'donor.references',
'model_organism_donor_constructs',
- 'model_organism_donor_constructs.submitted_by',
'model_organism_donor_constructs.target',
'model_organism_donor_constructs.documents',
- 'model_organism_donor_constructs.documents.award',
- 'model_organism_donor_constructs.documents.lab',
- 'model_organism_donor_constructs.documents.submitted_by',
'submitted_by',
'lab',
'award',
- 'award.pi.lab',
'source',
'treatments',
- 'treatments.documents.submitted_by',
- 'treatments.documents.lab',
- 'treatments.documents.award',
'constructs',
- 'constructs.documents.submitted_by',
- 'constructs.documents.award',
- 'constructs.documents.lab',
'constructs.target',
- 'documents.lab',
- 'documents.award',
- 'documents.submitted_by',
'derived_from',
'pooled_from',
- 'characterizations.submitted_by',
- 'characterizations.award',
- 'characterizations.lab',
'rnais',
'rnais.target',
'rnais.target.organism',
'rnais.source',
- 'rnais.documents.submitted_by',
- 'rnais.documents.award',
- 'rnais.documents.lab',
'organism',
'references',
- 'talens',
- 'talens.documents',
- 'talens.documents.award',
- 'talens.documents.lab',
- 'talens.documents.submitted_by',
'genetic_modifications',
- 'genetic_modifications.award',
- 'genetic_modifications.lab',
'genetic_modifications.modification_techniques',
'genetic_modifications.treatments',
'genetic_modifications.target'
| 2 |
diff --git a/admin-base/materialize/custom/_navbar.scss b/admin-base/materialize/custom/_navbar.scss nav {
&.nav-extended {
-
+ position: relative;
+ z-index: 1;
}
.nav-wrapper {
.brand-logo {
@@ -33,19 +34,22 @@ nav {
padding: 4px 0;
> span {
display: inline-block;
- padding: 0 0.75rem;
- float: right;
+ padding-right: 10px;
+ vertical-align: middle;
.material-icons {
line-height: 40px;
height: 100%;
}
+ &:only-of-type {
+ margin-left: 50px;
+ }
}
.pathfield {
display: inline-block;
padding-left: 0.75rem;
line-height: 20px;
- width: calc(100% - 122px);
- position: relative;
+ width: calc(100% - 100px);
+ vertical-align: middle;
> span {
display: inline-block;
height: 100%;
| 11 |
diff --git a/common/lib/types/devicedetails.ts b/common/lib/types/devicedetails.ts @@ -23,8 +23,8 @@ type DevicePushState = 'ACTIVE' | 'FAILING' | 'FAILED';
type DevicePushDetails = {
error?: ErrorInfo;
- recipient: object;
- state: DevicePushState;
+ recipient?: string;
+ state?: DevicePushState;
metadata?: string;
}
@@ -35,10 +35,10 @@ class DeviceDetails {
formFactor?: DeviceFormFactor;
platform?: DevicePlatform;
push?: DevicePushDetails;
- metadata?: object;
+ metadata?: string;
deviceIdentityToken?: string;
- toJSON() {
+ toJSON(): DeviceDetails {
return {
id: this.id,
deviceSecret: this.deviceSecret,
@@ -52,10 +52,10 @@ class DeviceDetails {
state: this.push?.state,
error: this.push?.error
}
- };
+ } as DeviceDetails;
}
- toString() {
+ toString(): string {
let result = '[DeviceDetails';
if(this.id)
result += '; id=' + this.id;
@@ -83,7 +83,7 @@ class DeviceDetails {
static toRequestBody = encodeBody;
- static fromResponseBody(body: Array<Record<string, unknown>> | Record<string, unknown>, format: Format) {
+ static fromResponseBody(body: Array<Record<string, unknown>> | Record<string, unknown>, format?: Format): DeviceDetails | DeviceDetails[] {
if(format) {
body = decodeBody(body, format);
}
@@ -95,12 +95,12 @@ class DeviceDetails {
}
}
- static fromValues(values: Record<string, unknown>) {
+ static fromValues(values: Record<string, unknown>): DeviceDetails {
values.error = values.error && ErrorInfo.fromValues(values.error as Error);
return Object.assign(new DeviceDetails(), values);
}
- static fromValuesArray(values: Array<Record<string, unknown>>) {
+ static fromValuesArray(values: Array<Record<string, unknown>>): DeviceDetails[] {
const count = values.length, result = new Array(count);
for(let i = 0; i < count; i++) result[i] = DeviceDetails.fromValues(values[i]);
return result
| 7 |
diff --git a/src/sdk/conference/client.js b/src/sdk/conference/client.js @@ -117,7 +117,7 @@ export const ConferenceClient = function(config, signalingImpl) {
} else if (data.status === 'remove') {
fireStreamRemoved(data);
} else if (data.status === 'update') {
- // Boardcast audio/video update status to channel so specific events can be fired on publication or subscription.
+ // Broadcast audio/video update status to channel so specific events can be fired on publication or subscription.
if (data.data.field === 'audio.status' || data.data.field ===
'video.status') {
channels.forEach(c => {
@@ -127,6 +127,8 @@ export const ConferenceClient = function(config, signalingImpl) {
fireActiveAudioInputChange(data);
} else if (data.data.field === 'video.layout') {
fireLayoutChange(data);
+ } else if (data.data.field === '.') {
+ updateRemoteStream(data.data.value);
} else {
Logger.warning('Unknown stream event from MCU.');
}
@@ -221,6 +223,19 @@ export const ConferenceClient = function(config, signalingImpl) {
stream.dispatchEvent(streamEvent);
}
+ function updateRemoteStream(streamInfo) {
+ if (!remoteStreams.has(streamInfo.id)) {
+ Logger.warning('Cannot find specific remote stream.');
+ return;
+ }
+ const stream = remoteStreams.get(streamInfo.id);
+ stream.settings = StreamUtilsModule.convertToPublicationSettings(streamInfo
+ .media);
+ stream.capabilities = StreamUtilsModule.convertToSubscriptionCapabilities(
+ streamInfo.media);
+ const streamEvent = new EventModule.IcsEvent('update');
+ stream.dispatchEvent(streamEvent);
+ }
function createRemoteStream(streamInfo) {
if (streamInfo.type === 'mixed') {
@@ -238,7 +253,7 @@ export const ConferenceClient = function(config, signalingImpl) {
videoSourceInfo), streamInfo.info.attributes);
stream.settings = StreamUtilsModule.convertToPublicationSettings(
streamInfo.media);
- stream.capabilities = new StreamUtilsModule.convertToSubscriptionCapabilities(
+ stream.capabilities = StreamUtilsModule.convertToSubscriptionCapabilities(
streamInfo.media);
return stream;
}
| 9 |
diff --git a/src/encoded/audit/file.py b/src/encoded/audit/file.py @@ -148,8 +148,8 @@ def audit_file_assembly(value, system):
if 'derived_from' not in value:
return
for f in value['derived_from']:
- if 'assembly' in f:
- if f['assembly'] != value['assembly']:
+ if f.get('assembly') and value.get('assembly') and \
+ f.get('assembly') != value.get('assembly'):
detail = 'Processed file {} '.format(value['@id']) + \
'assembly {} '.format(value['assembly']) + \
'does not match assembly {} of the file {} '.format(
| 1 |
diff --git a/src/components/common/CollectionList.js b/src/components/common/CollectionList.js @@ -8,11 +8,13 @@ import FilledStarIcon from './icons/FilledStarIcon';
import { isCollectionTagSet } from '../../lib/tagUtil';
import { DownloadButton } from '../common/IconButton';
import messages from '../../resources/messages';
+import { getUserRoles, hasPermissions, PERMISSION_MEDIA_EDIT } from '../../lib/auth';
const CollectionList = (props) => {
- const { title, intro, collections, handleClick, onDownload, helpButton } = props;
+ const { title, intro, collections, handleClick, onDownload, helpButton, user } = props;
const { formatMessage } = props.intl;
- const validCollections = collections.filter(c => (isCollectionTagSet(c.tag_sets_id) && c.show_on_media === 1));
+ const canSeePrivateCollections = hasPermissions(getUserRoles(user), PERMISSION_MEDIA_EDIT);
+ const validCollections = collections.filter(c => (isCollectionTagSet(c.tag_sets_id) && (c.show_on_media === 1 || canSeePrivateCollections)));
let actions = null;
if (onDownload) {
actions = (
@@ -49,8 +51,13 @@ CollectionList.propTypes = {
handleClick: React.PropTypes.func.isRequired,
// from compositional chain
intl: React.PropTypes.object.isRequired,
+ user: React.PropTypes.object,
};
+const mapStateToProps = state => ({
+ user: state.user,
+});
+
const mapDispatchToProps = (dispatch, ownProps) => ({
handleClick: (collectionId) => {
if (ownProps.linkToFullUrl) {
@@ -63,7 +70,7 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
export default
injectIntl(
- connect(null, mapDispatchToProps)(
+ connect(mapStateToProps, mapDispatchToProps)(
CollectionList
)
);
| 11 |
diff --git a/gitactions/publish/a11y-toolkit-baselines.sh b/gitactions/publish/a11y-toolkit-baselines.sh @@ -4,4 +4,4 @@ cd a11y-rule-benchmark
echo "Installing achecker"
npm install --save-dev accessibility-checker
echo "Scanning list of urls from listofUls.txt with baselines"
-npx achecker --baslineFolder /baselines listofUls.txt
\ No newline at end of file
+npx achecker --ruleArchive preview --baslineFolder /baselines listofUls.txt
\ No newline at end of file
| 3 |
diff --git a/src/css/pui-variables.scss b/src/css/pui-variables.scss @@ -3,8 +3,8 @@ $base-unit: 8px;
$black: #000000;
$dark-gray: #253640;
$gray: #647882;
-$gray_btn--onLite: #5C6D76;
-$gray_btn--onDark: #919FA8;
+$gray--onLite: #5C6D76;
+$gray--onDark: #919FA8;
$accent-gray: #89969f;
$light-gray: #eaedef;
$white: #ffffff;
@@ -12,20 +12,20 @@ $white: #ffffff;
$light-blue: #c2e7ff;
$accent-blue: #1a98ff;
$blue: #0070ec;
-$blue_btn--onLite: #0065d5;
-$blue_btn--onDark: #5FABFF;
+$blue--onLite: #0065d5;
+$blue--onDark: #5FABFF;
$dark-blue: #004379;
$light-teal: #b2f1e8;
$accent-teal: #01a78f;
$teal: #008673;
-$teal_btn--onLite: #007968;
-$teal_btn--onDark: #00b8a0;
+$teal--onLite: #007968;
+$teal--onDark: #00b8a0;
$light-red: #fed9db;
$red: #e71123;
-$red_btn--onLite: #d90012;
-$red_btn--onDark: #FF6E6E;
+$red--onLite: #d90012;
+$red--onDark: #FF6E6E;
$dark-red: #971922;
$light-green: #b9ecac;
| 10 |
diff --git a/includes/Core/Assets/Assets.php b/includes/Core/Assets/Assets.php @@ -459,7 +459,6 @@ final class Assets {
json_encode( $cache->get_current_cache_data() ) : // phpcs:ignore WordPress.WP.AlternativeFunctions.json_encode_json_encode
false,
'timestamp' => time(),
- 'debug' => ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ),
'currentScreen' => is_admin() ? get_current_screen() : null,
'currentAdminPage' => ( is_admin() && isset( $_GET['page'] ) ) ? sanitize_key( $_GET['page'] ) : null, // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
'resetSession' => isset( $_GET['googlesitekit_reset_session'] ), // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
| 2 |
diff --git a/spec/support/factories/users.rb b/spec/support/factories/users.rb @@ -86,7 +86,6 @@ module CartoDB
user = new_user(attributes)
raise "User not valid: #{user.errors}" unless user.valid?
# INFO: avoiding enable_remote_db_user
- Cartodb.config[:signups] = nil
user.save
load_user_functions(user)
user
@@ -96,7 +95,6 @@ module CartoDB
def create_validated_user(attributes = {})
user = new_user(attributes)
# INFO: avoiding enable_remote_db_user
- Cartodb.config[:signups] = nil
user.save
if user.valid?
load_user_functions(user)
| 2 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -1797,6 +1797,7 @@ class Avatar {
// idleWalkFactor,
k,
lerpFn,
+ isPosition,
target
) => {
// WALK
@@ -1905,6 +1906,11 @@ class Avatar {
const src3 = idleAnimation.interpolants[k];
const v3 = src3.evaluate(t3);
+ if (isPosition) {
+ localQuaternion4.x = 0;
+ localQuaternion4.z = 0;
+ }
+
lerpFn
.call(
target.fromArray(v3),
@@ -2003,7 +2009,7 @@ class Avatar {
}
this.lastBackwardFactor = mirrorFactor;
- const _getHorizontalBlend = (k, lerpFn, target) => {
+ const _getHorizontalBlend = (k, lerpFn, isPosition, target) => {
_get7wayBlend(
keyWalkAnimationAngles,
keyWalkAnimationAnglesMirror,
@@ -2016,6 +2022,7 @@ class Avatar {
// idleWalkFactor,
k,
lerpFn,
+ isPosition,
localQuaternion
);
_get7wayBlend(
@@ -2030,6 +2037,7 @@ class Avatar {
// idleWalkFactor,
k,
lerpFn,
+ isPosition,
localQuaternion2
);
@@ -2044,13 +2052,12 @@ class Avatar {
};
const _getApplyFn = () => {
-
if (this.jumpState) {
return spec => {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
} = spec;
// console.log('JumpState', spec)
@@ -2066,7 +2073,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
} = spec;
const sitAnimation = sitAnimations[this.sitAnimation || defaultSitAnimation];
@@ -2081,7 +2088,8 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
+ isPosition,
} = spec;
const narutoRunAnimation = narutoRunAnimations[defaultNarutoRunAnimation];
@@ -2090,6 +2098,11 @@ class Avatar {
const v2 = src2.evaluate(t2);
dst.fromArray(v2);
+
+ if (isPosition) {
+ dst.x = 0;
+ dst.z = 0;
+ }
};
}
@@ -2098,10 +2111,9 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
} = spec;
-
const danceAnimation = danceAnimations[this.danceAnimation || defaultDanceAnimation];
const src2 = danceAnimation.interpolants[k];
const t2 = (this.danceTime/1000) % danceAnimation.duration;
@@ -2161,7 +2173,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
} = spec;
const t2 = (this.fallLoopTime/1000) ;
@@ -2192,7 +2204,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
} = spec;
@@ -2210,7 +2222,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
} = spec;
const throwAnimation = throwAnimations[this.throwAnimation || defaultThrowAnimation];
@@ -2225,11 +2237,12 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
lerpFn,
+ isPosition,
} = spec;
- _getHorizontalBlend(k, lerpFn, dst);
+ _getHorizontalBlend(k, lerpFn, isPosition, dst);
};
// console.log('got aim time', this.useAnimation, this.useTime, this.aimAnimation, this.aimTime);
if (this.useAnimation) {
@@ -2332,7 +2345,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
lerpFn,
} = spec;
@@ -2355,7 +2368,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
lerpFn,
} = spec;
@@ -2389,7 +2402,7 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
isPosition,
} = spec;
@@ -2399,15 +2412,13 @@ class Avatar {
// ignore all animation position except y
if (isPosition) {
- dst.x = 0;
if (!this.jumpState) {
// animations position is height-relative
- dst.y *= this.height;
+ dst.y *= this.height; // XXX this could be made perfect by measuring from foot to hips instead
} else {
// force height in the jump case to overide the animation
dst.y = this.height * 0.55;
}
- dst.z = 0;
}
}
};
| 4 |
diff --git a/js/webcomponents/bisweb_dicomimportelement.js b/js/webcomponents/bisweb_dicomimportelement.js @@ -86,7 +86,7 @@ class DicomImportElement extends HTMLElement {
let splitName = jsonFileName.split('/');
splitName.pop();
let outputFolderName = splitName.join('/');
- this.filetreepanel.importFiles(outputFolderName);
+ this.filetreepanel.importFilesFromDirectory(outputFolderName);
this.filetreepanel.showTreePanel();
});
}).catch( () => {
| 1 |
diff --git a/embark-ui/src/components/TextEditor.js b/embark-ui/src/components/TextEditor.js @@ -2,11 +2,11 @@ import React from 'react';
import MonacoEditor from 'react-monaco-editor';
import PropTypes from 'prop-types';
-const SUPPORTED_LANGUAGES = ['css', 'sol', 'html', 'json'];
+const SUPPORTED_LANGUAGES = ['css', 'sol', 'html'];
const DEFAULT_LANGUAGE = 'javascript';
class TextEditor extends React.Component {
- language() {
+ getLanguage() {
const extension = this.props.file.name.split('.').pop();
return SUPPORTED_LANGUAGES[SUPPORTED_LANGUAGES.indexOf(extension)] || DEFAULT_LANGUAGE;
}
@@ -33,6 +33,13 @@ class TextEditor extends React.Component {
};
});
this.state.monaco.editor.setModelMarkers(this.state.editor.getModel(), 'test', markers);
+
+ const newLanguage = this.getLanguage();
+ const currentLanguage = this.state.editor.getModel().getModeId();
+
+ if (newLanguage !== currentLanguage) {
+ this.state.monaco.editor.setModelLanguage(this.state.editor.getModel(), newLanguage);
+ }
}
editorDidMount(editor, monaco) {
@@ -44,7 +51,6 @@ class TextEditor extends React.Component {
<MonacoEditor
width="800"
height="600"
- language={this.language()}
theme="vs-dark"
value={this.props.file.content}
onChange={this.props.onFileContentChange}
| 2 |
diff --git a/script/cibuild b/script/cibuild #!/bin/bash
set -e # halt script on error
+echo "Travis Branch: $TRAVIS_BRANCH"
+echo "Travis Pull Reques: $TRAVIS_PULL_REQUEST"
+
# Pull requests and commits to other branches shouldn't try to deploy, just build to verify
if [ "$TRAVIS_PULL_REQUEST" == "true" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
echo "Skipping deploy; just doing a build."
- bundle exec jekyll build
+ bundle exec jekyll build --verbose
exit 0
fi
@@ -19,7 +22,7 @@ mkdir _site
git clone https://${DEPLOY_TOKEN}@${GITHUB_REPO} --branch ${DEPLOY_BRANCH} _site
bundle exec jekyll algolia push
-bundle exec jekyll build
+bundle exec jekyll build --verbose
# Jekyll's output folder
cd _site
| 0 |
diff --git a/lib/assets/core/javascripts/cartodb3/data/camshaft-reference.js b/lib/assets/core/javascripts/cartodb3/data/camshaft-reference.js @@ -127,7 +127,6 @@ module.exports = {
' marker-line-color: <%= point.stroke.color.fixed %>;',
' marker-line-width: <%= point.stroke.size.fixed %>;',
' marker-line-opacity: <%= point.stroke.color.opacity %>;',
- ' marker-placement: point;',
' marker-type: ellipse;',
' marker-allow-overlap: true;',
'}',
| 2 |
diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js @@ -795,6 +795,10 @@ describe('#AirParser', () => {
expect(fareQuote.index).to.be.a('number');
expect(fareQuote.pricingInfos).to.be.an('array').and.to.have.length.above(0);
+ if (fareQuote.tourCode) {
+ expect(fareQuote.tourCode).to.match(/^[A-Z0-9]+/);
+ }
+
if (fareQuote.endorsement) {
expect(fareQuote.endorsement).to.match(/^[A-Z0-9\.\-\s\/]+$/);
}
| 0 |
diff --git a/src/components/views/EngineControl/core.js b/src/components/views/EngineControl/core.js @@ -125,6 +125,8 @@ class EngineCoreView extends Component {
{this.getCurrentSpeed()} -{" "}
{this.props.data.engines &&
this.props.data.engines[0] &&
+ this.props.data.engines[0].velocity &&
+ this.props.data.engines[0].velocity.toLocaleString &&
`${this.props.data.engines[0].velocity.toLocaleString()} km/s`}
</Col>
</Row>
| 1 |
diff --git a/publish/deployed/mainnet/feeds.json b/publish/deployed/mainnet/feeds.json "feed": "0x2c1d072e956AFFC0D435Cb7AC38EF18d24d9127c"
},
"EOS": {"asset": "EOS", "feed": "0x10a43289895eAff840E8d45995BBa89f9115ECEe"},
- "BCH": {"asset": "BCH", "feed": "0x9F0F69428F923D6c95B781F89E165C9b2df9789D"},
"ETC": {"asset": "ETC", "feed": "0xaEA2808407B7319A31A383B6F8B60f04BCa23cE2"},
"DASH": {
"asset": "DASH",
| 2 |
diff --git a/html/tests/tabs.tests.js b/html/tests/tabs.tests.js @@ -138,7 +138,7 @@ describe('tabs UI Events tests', () => {
});
it('should activate the last tab when End is pressed', () => {
- event = new window.Event('keydown');
+ event = new Event('keydown');
event.keyCode = 35;
expect(tab3.classList.contains('sprk-c-Tabs__button--active')).toBe(false);
tabContainer.dispatchEvent(event);
@@ -146,22 +146,24 @@ describe('tabs UI Events tests', () => {
});
it('should activate the corresponding content when tab is pressed', () => {
- event = new window.Event('keydown');
+ event = new Event('keydown');
event.keyCode = 9;
tab1.click();
- expect(document.activeElement).toEqual(tab1);
+ expect(tab1.classList.contains('sprk-c-Tabs__button--active')).toBe(true);
tabContainer.dispatchEvent(event);
- expect(document.activeElement).toEqual(panel1);
+ expect(panel1.classList.contains('sprk-u-HideWhenJs')).toBe(false);
+ expect(panel2.classList.contains('sprk-u-HideWhenJs')).toBe(true);
+ expect(panel3.classList.contains('sprk-u-HideWhenJs')).toBe(true);
});
it(`should do nothing when a key is pressed that isnt home, end, or an arrow
key`, () => {
- event = new window.Event('keydown');
+ event = new Event('keydown');
event.keyCode = 8;
tab2.click();
- expect(document.activeElement).toEqual(tab2);
+ expect(tab2.classList.contains('sprk-c-Tabs__button--active')).toBe(true);
tabContainer.dispatchEvent(event);
- expect(document.activeElement).toEqual(tab2);
+ expect(tab2.classList.contains('sprk-c-Tabs__button--active')).toBe(true);
});
});
| 1 |
diff --git a/NEWS.md b/NEWS.md @@ -12,6 +12,7 @@ This release changes the way Google ouath login works. If you are using it, you
to the oauth.google_plus section of the configuration file.
### Features
+* Back button support (#13115)
* Account static view (#12749)
* Force UTF-8 encoding in the Compass task
* Trigger error when interactivity request fails (#13093)
| 3 |
diff --git a/articles/migrations/index.md b/articles/migrations/index.md @@ -88,13 +88,31 @@ If you are currently using [/delegation](/api/authentication#delegation) to prov
If you have any questions, create a ticket in our [Support Center](${env.DOMAIN_URL_SUPPORT}).
-### Deprecating the Usage of ID Tokens on the Auth0 Management API
+### Deprecating the usage of ID Tokens on the Auth0 Management API
| Severity | Grace Period Start | Mandatory Opt-In|
| --- | --- | --- |
| Medium | 2017-12-21 | 2018-06-01 |
-We are deprecating the usage of [ID Tokens](/tokens/id-token) when calling [/users](/api/management/v2#!/Users/get_users_by_id) and [/device-credentials](/api/management/v2#!/Device_Credentials/get_device_credentials). We have moved to regular [Management APIv2 Tokens](/api/management/v2/tokens). This is available now. Applications must be updated by June 1, 2018, when the ability to use ID Tokens will become unavailable. Migration guides will be available by February 2018.
+We are deprecating the usage of [ID Tokens](/tokens/id-token) as credentials when calling the [Management API](/api/management/v2#!/Users/post_identities). This was used by the [/users](/api/management/v2#!/Users/get_users_by_id) and [/device-credentials](/api/management/v2#!/Device_Credentials/get_device_credentials) endpoints. In more detail, the affected endpoints are:
+- [GET /api/v2/users/{id}](/api/management/v2#!/Users/get_users_by_id)
+- [GET /api/v2/users/{id}/enrollments](/api/management/v2#!/Users/get_enrollments)
+- [PATCH /api/v2/users/{id}](/api/management/v2#!/Users/patch_users_by_id)
+- [DELETE /api/v2/users/{id}/multifactor/{provider}](/api/management/v2#!/Users/delete_multifactor_by_provider)
+- [POST /api/v2/device-credentials](/api/management/v2#!/Device_Credentials/post_device_credentials)
+- [DELETE /api/v2/device-credentials/{id}](/api/management/v2#!/Device_Credentials/delete_device_credentials_by_id)
+- [POST/api/v2/users/{id}/identities](/api/management/v2#!/Users/post_identities) (used for [Account Linking](/link-accounts), see warning panel below)
+- [DELETE /api/v2/users/{id}/identities/{provider}/{user_id}](/api/management/v2#!/Users/delete_provider_by_user_id)
+
+These endpoints will now accept regular [Access Tokens](/access-token). This functionality is available now.
+
+To get a valid Access Token for these endpoints during authorization, you have to set the **audience** parameter to `https://${account.namespace}/api/v2/`, and the **scope** parameter to the scopes required by each endpoint. For example, the [GET /api/v2/users/{id} endpoint](/api/management/v2#!/Users/get_users_by_id) requires two scopes: `read:users` and `read:user_idp_tokens`. For detailed steps and code samples, see [How to get an Access Token](/tokens/access-token#how-to-get-an-access-token).
+
+:::panel-warning Account Linking exception
+There are two ways of invoking the [POST/api/v2/users/{id}/identities](/api/management/v2#!/Users/post_identities) endpoint (follow the link for details). The use case where we send the **user_id** to link with, as part of the payload **will not available for Access Tokens issued to end users**. This use case requires a Dashboard Admin token. The other use case, where the second identity is established by attaching an ID Token, can be used with a valid Access Token, as described above.
+:::
+
+Applications must be updated by June 1, 2018, when the ability to use ID Tokens will be disabled. Migration guides will be available by February 2018.
#### Am I affected by the change?
| 3 |
diff --git a/components/graph/git-graph-actions.js b/components/graph/git-graph-actions.js @@ -83,7 +83,8 @@ GraphActions.Reset = function(graph, node) {
var context = self.graph.currentActionContext();
if (context.node() != self.node) return false;
var remoteRef = context.getRemoteRef(self.graph.currentRemote());
- return remoteRef &&
+ return remoteRef && remoteRef.node() &&
+ context && context.node() &&
remoteRef.node() != context.node() &&
remoteRef.node().date < context.node().date;
});
| 1 |
diff --git a/src/components/layout.js b/src/components/layout.js @@ -2,7 +2,7 @@ import React, { useRef, useState, useEffect } from 'react';
import { Link } from 'gatsby';
import { AboutModal } from './modal';
import { rhythm, scale } from '../utils/typography';
-import { Divider } from 'semantic-ui-react';
+import { Divider, Card } from 'semantic-ui-react';
import GitHubButton from 'react-github-btn';
import { clearAllPersistedAnswer } from '../utils/persistAnswers';
import {
@@ -105,7 +105,67 @@ const Layout = props => {
</button>
<footer style={{ fontSize: '14px' }}>
<Divider />
- <LearnMore />
+ <Card fluid>
+ <Card.Content>
+ <Card.Header>
+ <h2 style={{ margin: '20px 0' }}>
+ <i aria-hidden="true" class="mail icon"></i>{' '}
+ Mailing List!
+ </h2>
+ </Card.Header>
+ <Card.Description>
+ If you're learning a lot taking these quizzes,
+ consider signing up for my mailing list, where
+ I send ~weekly tips and lessons on JavaScript
+ right to your inbox!
+ </Card.Description>
+ <form
+ action="https://buttondown.email/api/emails/embed-subscribe/typeofnan"
+ method="post"
+ target="popupwindow"
+ onSubmit="window.open('https://buttondown.email/typeofnan', 'popupwindow')"
+ className="embeddable-buttondown-form"
+ >
+ <div style={{ margin: '20px 0' }}>
+ <i
+ aria-hidden="true"
+ class="check icon"
+ ></i>{' '}
+ Weekly tips
+ <br />
+ <i
+ aria-hidden="true"
+ class="check icon"
+ ></i>{' '}
+ No spam
+ <br />
+ <i
+ aria-hidden="true"
+ class="check icon"
+ ></i>{' '}
+ Unsubscribe any time
+ </div>
+ <label htmlFor="email">Email Address:</label>
+ <br />
+ <div className="ui icon input">
+ <input
+ type="email"
+ name="email"
+ id="bd-email"
+ required
+ />
+ </div>
+ <input type="hidden" value="1" name="embed" />
+ <button
+ className="ui green button"
+ style={{ marginLeft: '10px' }}
+ >
+ Subscribe!
+ </button>
+ </form>
+ </Card.Content>
+ </Card>
+ <Divider />
<p>
<GitHubButton
href="https://github.com/nas5w/typeofnan-javascript-quizzes"
| 0 |
diff --git a/validation_utils.js b/validation_utils.js @@ -82,8 +82,13 @@ function isValidBase64(b64, len){
}
function isValidHexadecimal(hex, len){
+ try {
return (typeof hex === "string" && (!len || hex.length === len) && hex === (new Buffer(hex, "hex")).toString("hex"));
}
+ catch (e) {
+ return false;
+ }
+}
function isValidEmail(str) {
return (typeof str === "string" && /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(str));
| 9 |
diff --git a/server/views/sources/source.py b/server/views/sources/source.py @@ -70,11 +70,11 @@ def source_get_stats(media_id):
# geography tags
geoRes = user_mc.sentenceFieldCount(media_query, '', field='tags_id_stories', tag_sets_id=TAG_SET_GEOCODER_VERSION, sample_size=GEO_SAMPLE_SIZE)
- ratio_geo_tagged_count = float(geoRes[0]['count']) * 100 / float(total_story_count)
+ ratio_geo_tagged_count = float(geoRes[0]['count']) * 100 / float(total_story_count) if len(geoRes) > 0 else 0
results['geoPct'] = ratio_geo_tagged_count
# nyt theme
nytRes = user_mc.sentenceFieldCount(media_query, '', field='tags_id_stories', tag_sets_id=TAG_SET_NYT_LABELS_VERSION, sample_size=GEO_SAMPLE_SIZE)
- ratio_nyt_tagged_count = float(nytRes[0]['count']) * 100 / float(total_story_count)
+ ratio_nyt_tagged_count = float(nytRes[0]['count']) * 100 / float(total_story_count) if len(nytRes) > 0 else 0
results['nytPct'] = ratio_nyt_tagged_count
return jsonify(results)
| 9 |
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js @@ -204,10 +204,16 @@ angular.module('copayApp.services')
storage.get('profile', function(getErr, getStr) {
if (getErr) {
cb(getErr, null);
- } else {
+ return;
+ }
+
+ if (!getStr) {
+ cb(null, null);
+ return;
+ }
+
profile = Profile.fromString(getStr);
cb(null, profile);
- }
});
};
| 9 |
diff --git a/features/support/env_capybara_screenshot.rb b/features/support/env_capybara_screenshot.rb @@ -2,7 +2,7 @@ require 'capybara-screenshot'
require 'capybara-screenshot/cucumber'
require 'mime-types'
-Capybara.save_path = "features/screenshots"
+Capybara.save_and_open_page_path = "features/screenshots"
module Screenshots
def self.upload(path)
| 13 |
diff --git a/src/domain/session/room/timeline/deserialize.js b/src/domain/session/room/timeline/deserialize.js @@ -22,10 +22,13 @@ class Deserializer {
}
parseLink(node, children) {
- // TODO Not equivalent to `node.href`!
- // Add another HTMLParseResult method?
const href = this.result.getAttributeValue(node, "href");
- const pillData = href && parsePillLink(href);
+ if (!href || !href.match(/^[a-z]+:[\/]{2}/i)) {
+ // Invalid or missing URLs are not turned into links
+ // We throw away relative links, too.
+ return new FormatPart("span", children);
+ }
+ const pillData = parsePillLink(href);
if (pillData && pillData.userId) {
return new PillPart(pillData.userId, href, children);
}
| 8 |
diff --git a/libs/encryption.py b/libs/encryption.py @@ -141,9 +141,17 @@ class DeviceDataDecryptor():
except (TypeError, PaddingException, Base64LengthException) as decode_error:
raise DecryptionKeyInvalidError(f"Invalid decryption key: {decode_error}")
- # run RSA decryption
+ # Run RSA decryption
try:
- base64_key: bytes = self.private_key_cipher.decrypt(decoded_key)
+ # PyCryptodome deprecated the old PyCrypto method RSA.decrypt() which could decrypt
+ # textbook/raw RSA without key padding, which is what the Android & iOS apps write.
+ # This (github.com/Legrandin/pycryptodome/issues/434#issuecomment-660701725) presents
+ # a plain-math implementation of RSA.decrypt(), which we use instead.
+ ciphertext_int = int.from_bytes(decoded_key, 'big')
+ plaintext_int = pow(ciphertext_int, self.private_key_cipher.d, self.private_key_cipher.n)
+ base64_key: bytes = plaintext_int.to_bytes(
+ self.private_key_cipher.size_in_bytes(), 'big'
+ ).lstrip(b'\x00')
decrypted_key: bytes = decode_base64(base64_key)
if not decrypted_key:
raise TypeError(f"decoded key was '{decrypted_key}'")
| 14 |
diff --git a/projects/ngx-extended-pdf-viewer/package.json b/projects/ngx-extended-pdf-viewer/package.json {
"name": "ngx-extended-pdf-viewer",
- "version": "0.9.36",
+ "version": "0.9.37",
"license": "Apache-2.0",
"repository": {
"url": "https://github.com/stephanrauh/ngx-extended-pdf-viewer"
| 13 |
diff --git a/articles/tokens/id-token.md b/articles/tokens/id-token.md @@ -71,7 +71,17 @@ The `id_token` will contain only the claims specified as the value of the `scope
If you are using [OAuth 2.0 API Authorization](/api-auth), you can add arbitrary claims to the `id_token` using [Rules](/rules), with the following format: `context.idToken['http://my-namespace/claim-name'] = 'claim-value'`.
-Additionally, you can add custom claims for user metadata: `context.idToken['http://my-namespace/preferred_contact'] = user.user_metadata.preferred_contact`.
+Additionally, you can add custom claims for metadata: `context.idToken['http://my-namespace/preferred_contact'] = user.user_metadata.preferred_contact`.
+
+```js
+function (user, context, callback) {
+ const namespace = 'https://my-namespace/';
+ context.idToken[namespace + 'claim-name'] = 'claim-value'
+ context.idToken[namespace + 'favorite_color'] = user.favorite_color;
+ context.idToken[namespace + 'preferred_contact'] = user.user_metadata.preferred_contact;
+ callback(null, user, context);
+}
+```
## Token Lifetime
| 0 |
diff --git a/src/pages/using-spark/components/input.mdx b/src/pages/using-spark/components/input.mdx @@ -236,7 +236,7 @@ the Huge Text Input style:
- Date Picker
<ComponentPreview
- componentName="input-input-text--huge-text-input"
+ componentName="input-text--huge-text-input"
hasReact
hasAngular
hasHTML
| 3 |
diff --git a/src/ed.js b/src/ed.js },
SetHighlightLine(line, hadErr) {
const w = this;
- w.hl(line + 1);
+ w.me_ready.then(() => w.hl(line + 1));
hadErr < 0 && w.focus();
w.HIGHLIGHT_LINE = line + 1;
},
| 12 |
diff --git a/src/botPage/view/TradeInfoPanel/index.js b/src/botPage/view/TradeInfoPanel/index.js @@ -12,7 +12,7 @@ const resetAnimation = () => {
$('.line')
.removeClass('active')
.removeClass('complete');
- $('.stage-tooltip').removeClass('active');
+ $('.stage-tooltip:not(.top)').removeClass('active');
};
const activateStage = index => {
@@ -27,18 +27,21 @@ const activateStage = index => {
class AnimateTrade extends Component {
constructor() {
super();
- this.state = { stopMessage: `${translate('Bot is stopped')}.` };
+ this.state = { stopMessage: `${translate('Bot is not running')}.` };
}
componentWillMount() {
globalObserver.register('bot.stop', () => {
- this.setState({ stopMessage: `${translate('Bot is stopped')}.` });
+ $('.stage-tooltip.top:eq(0)').removeClass('running');
+ this.setState({ stopMessage: `${translate('Bot has stopped')}.` });
});
$('#stopButton').click(() => {
- $('.stage-tooltip.top:eq(0)').addClass('active');
+ $('.stage-tooltip.top:eq(0)').removeClass('running');
+ this.setState({ stopMessage: `${translate('Bot is stopping')}...` });
});
$('#runButton').click(() => {
- $('.stage-tooltip.top:eq(0)').removeClass('active');
resetAnimation();
+ $('.stage-tooltip.top:eq(0)').addClass('running');
+ this.setState({ stopMessage: `${translate('Bot is running')}...` });
globalObserver.register('contract.status', contractStatus => {
this.animateStage(contractStatus);
});
@@ -46,7 +49,6 @@ class AnimateTrade extends Component {
}
animateStage(contractStatus) {
if (contractStatus.id === 'contract.purchase_sent') {
- this.setState({ stopMessage: `${translate('Bot is stopping')}...` });
resetAnimation();
activateStage(0);
this.setState({ buy_price: contractStatus.data });
@@ -82,7 +84,7 @@ class AnimateTrade extends Component {
</div>
</span>
<span className="stage">
- <div className="stage-tooltip top">
+ <div className="stage-tooltip top active">
<p>{this.state.stopMessage}</p>
</div>
<div className="stage-label">{translate('Buy succeeded')}</div>
| 12 |
diff --git a/app/math-editor.js b/app/math-editor.js @@ -103,7 +103,7 @@ function initMathEditor() {
}
function insertNewEquation(optionalMarkup) {
- window.document.execCommand('insertHTML', false, (optionalMarkup ? optionalMarkup : '') + '<img data-js="new" style="display: none"/>');
+ window.document.execCommand('insertHTML', false, (optionalMarkup ? optionalMarkup : '') + '<img data-js="new" style="display: none"/>')
const $addedEquationImage = $('[data-js="new"]')
$addedEquationImage
.removeAttr('data-js')
@@ -293,7 +293,7 @@ const makeRichText = (element, options, onValueChanged = () => { }) => {
const clipboardDataAsHtml = clipboardData.getData('text/html')
if (clipboardDataAsHtml) {
e.preventDefault()
- window.document.execCommand('insertHTML', false, sanitizeHtml(clipboardDataAsHtml, sanitizeOpts));
+ window.document.execCommand('insertHTML', false, sanitizeHtml(clipboardDataAsHtml, sanitizeOpts))
setTimeout(()=> persistInlineImages($currentEditor, saver), 0)
} else {
setTimeout(()=> persistInlineImages($currentEditor, saver), 0)
| 2 |
diff --git a/src/pages/EnablePayments/index.js b/src/pages/EnablePayments/index.js @@ -32,7 +32,8 @@ class EnablePaymentsPage extends React.Component {
return <FullScreenLoadingIndicator />;
}
- const currentStep = this.props.userWallet.currentStep || CONST.WALLET.STEP.ONFIDO;
+ // TODO: revert the default step back to CONST.WALLET.STEP.ONFIDO
+ const currentStep = this.props.userWallet.currentStep || CONST.WALLET.STEP.TERMS;
return (
<ScreenWrapper>
{currentStep === CONST.WALLET.STEP.ONFIDO && <OnfidoStep />}
| 12 |
diff --git a/server/game/gamesteps/conflict/conflictflow.js b/server/game/gamesteps/conflict/conflictflow.js @@ -30,7 +30,7 @@ class ConflictFlow extends BaseStepWithPipeline {
new SimpleStep(this.game, () => this.announceAttackerSkill()),
new SimpleStep(this.game, () => this.promptForDefenders()),
new SimpleStep(this.game, () => this.announceDefenderSkill()),
- new ConflictActionWindow(this.game, 'Conflict Action Window', this.conflict),
+ new SimpleStep(this.game, () => this.openConflictActionWindow()),
new SimpleStep(this.game, () => this.determineWinner()),
new SimpleStep(this.game, () => this.applyKeywords()),
new SimpleStep(this.game, () => this.applyUnopposed()),
@@ -168,6 +168,13 @@ class ConflictFlow extends BaseStepWithPipeline {
this.game.raiseEvent('onDefendersDeclared', { conflict: this.conflict });
}
+ openConflictActionWindow() {
+ if(this.conflict.cancelled) {
+ return;
+ }
+ this.queueStep(new ConflictActionWindow(this.game, 'Conflict Action Window', this.conflict));
+ }
+
determineWinner() {
if(this.conflict.cancelled) {
return;
| 2 |
diff --git a/_config.yml b/_config.yml @@ -31,7 +31,7 @@ google_analytics: UA-96140462-1
# Github importer
github_api_url: https://api.github.com
github_folder: github
-github_projects_prefix: ['spid-','anpr-','daf-','dati-','pianotriennale-','lg-','design-','pulse','security-']
+github_projects_prefix: ['spid-','anpr-','daf-','dati-','pianotriennale-','lg-','design-','security-','cie-']
github_access_token: ENV_GITHUB_ACCESS_TOKEN
github_blacklist_repos: []
github_issues_types: ['bug','enhancement','new project']
| 7 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -49,6 +49,9 @@ class LocalPlayer extends Player {
constructor() {
super();
}
+ setAvatar(app) {
+ rigManager.setLocalAvatar(app);
+ }
wear(app) {
const wearComponent = app.getComponent('wear');
if (wearComponent) {
| 0 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/navigation/MapService.js b/public/javascripts/SVLabel/src/SVLabel/navigation/MapService.js @@ -1431,7 +1431,7 @@ function MapService (canvas, neighborhoodModel, uiMap, params) {
function setViewControlLayerCursor(type) {
switch(type) {
case 'ZoomOut':
- uiMap.viewControlLayer.css("cursor", "url(" + svl.rootDirectory + "img/cursors/Cursor_ZoomOut.png) 4 4, move");
+ uiMap.viewControlLayer.css("cursor", "url(" + svl.rootDirectory + "img/cursors/ZoomOut.png) 4 4, move");
break;
case 'OpenHand':
uiMap.viewControlLayer.css("cursor", "url(" + svl.rootDirectory + "img/cursors/openhand.cur) 4 4, move");
| 14 |
diff --git a/app/views/admin/shared/_trial_notification.html.erb b/app/views/admin/shared/_trial_notification.html.erb <% if current_user.has_feature_flag?('no_free_tier') && current_user.account_type == 'PERSONAL30' %>
<div class="CDB-Text FlashMessage FlashMessage--main">
<div class="u-inner">
- <div class="FlashMessage-info FlashMessage--main u-flex u-justifySpace u-alignCenter" style="width: 100%; flex-direction: row;">
+ <div class="FlashMessage FlashMessage-info FlashMessage--main u-flex u-justifySpace u-alignCenter">
<p class="u-flex">You're currently under your 30-day Trial Period. Add your billing info to keep using our platform.</p>
<p class="u-flex">
- <a href="#" class="CDB-Button CDB-Button--secondary CDB-Button--big" style="background-color: #fff">
+ <a href="#" class="CDB-Button CDB-Button--secondary CDB-Button--secondary--background CDB-Button--big">
<span class="CDB-Button-Text CDB-Text is-semibold CDB-Size-medium u-upperCase">Add payment method</span>
</a>
</p>
| 4 |
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js @@ -47,25 +47,16 @@ const defaultProps = {
account: {},
};
-class ResendValidationForm extends React.Component {
- constructor(props) {
- super(props);
-
- if (this.props.account.errors || this.props.account.message) {
- Session.clearAccountMessages();
- }
- }
-
- render() {
- const isSMSLogin = Str.isSMSLogin(this.props.credentials.login);
- const login = isSMSLogin ? this.props.toLocalPhone(Str.removeSMSDomain(this.props.credentials.login)) : this.props.credentials.login;
- const loginType = (isSMSLogin ? this.props.translate('common.phone') : this.props.translate('common.email')).toLowerCase();
+const ResendValidationForm = (props) => {
+ const isSMSLogin = Str.isSMSLogin(props.credentials.login);
+ const login = isSMSLogin ? props.toLocalPhone(Str.removeSMSDomain(props.credentials.login)) : props.credentials.login;
+ const loginType = (isSMSLogin ? props.translate('common.phone') : props.translate('common.email')).toLowerCase();
return (
<>
<View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
<Avatar
- source={ReportUtils.getDefaultAvatar(this.props.credentials.login)}
+ source={ReportUtils.getDefaultAvatar(props.credentials.login)}
imageStyles={[styles.mr2]}
/>
<View style={[styles.flex1]}>
@@ -76,40 +67,40 @@ class ResendValidationForm extends React.Component {
</View>
<View style={[styles.mv5]}>
<Text>
- {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {login, loginType})}
+ {props.translate('resendValidationForm.weSentYouMagicSignInLink', {login, loginType})}
</Text>
</View>
- {!_.isEmpty(this.props.account.message) && (
+ {!_.isEmpty(props.account.message) && (
// DotIndicatorMessage mostly expects onyxData errors so we need to mock an object so that the messages looks similar to prop.account.errors
- <DotIndicatorMessage style={[styles.mb5]} type="success" messages={{0: this.props.account.message}} />
+ <DotIndicatorMessage style={[styles.mb5]} type="success" messages={{0: props.account.message}} />
)}
- {!_.isEmpty(this.props.account.errors) && (
- <DotIndicatorMessage style={[styles.mb5]} type="error" messages={this.props.account.errors} />
+ {!_.isEmpty(props.account.errors) && (
+ <DotIndicatorMessage style={[styles.mb5]} type="error" messages={props.account.errors} />
)}
<View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
<TouchableOpacity onPress={() => redirectToSignIn()}>
<Text>
- {this.props.translate('common.back')}
+ {props.translate('common.back')}
</Text>
</TouchableOpacity>
<Button
medium
success
- text={this.props.translate('resendValidationForm.resendLink')}
- isLoading={this.props.account.isLoading}
- onPress={() => (this.props.account.validated ? Session.resendResetPassword() : Session.resendValidationLink())}
- isDisabled={this.props.network.isOffline}
+ text={props.translate('resendValidationForm.resendLink')}
+ isLoading={props.account.isLoading}
+ onPress={() => (props.account.validated ? Session.resendResetPassword() : Session.resendValidationLink())}
+ isDisabled={props.network.isOffline}
/>
</View>
<OfflineIndicator containerStyles={[styles.mv1]} />
</>
);
- }
-}
+};
ResendValidationForm.propTypes = propTypes;
ResendValidationForm.defaultProps = defaultProps;
+ResendValidationForm.displayName = 'ResendValidationForm';
export default compose(
withLocalize,
| 13 |
diff --git a/lib/determine-basal/determine-basal.js b/lib/determine-basal/determine-basal.js @@ -108,9 +108,10 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
if (profile.temptargetSet) {
console.error("Temp Target set, not adjusting with autosens");
} else {
- min_bg = round((min_bg - 60) / autosens_data.ratio) + 60;
- max_bg = round((max_bg - 60) / autosens_data.ratio) + 60;
- new_target_bg = round((target_bg - 60) / autosens_data.ratio) + 60;
+ // with a target of 100, default 0.7-1.2 autosens min/max range would allow a 90-126 target range
+ min_bg = round((min_bg - 40) / autosens_data.ratio) + 40;
+ max_bg = round((max_bg - 40) / autosens_data.ratio) + 40;
+ new_target_bg = round((target_bg - 40) / autosens_data.ratio) + 40;
if (target_bg == new_target_bg) {
console.error("target_bg unchanged:", new_target_bg);
} else {
| 11 |
diff --git a/plugins/plugin-postcss/plugin.js b/plugins/plugin-postcss/plugin.js @@ -37,7 +37,7 @@ module.exports = function postcssPlugin(snowpackConfig, options) {
const encodedResult = await worker.transformAsync(contents, {
config,
- filepath: srcPath,
+ filepath: srcPath || id, // note: srcPath will be undefined in [email protected] and older
cwd: snowpackConfig.root || process.cwd(),
map:
snowpackConfig.buildOptions && snowpackConfig.buildOptions.sourceMaps
| 11 |
diff --git a/src/matrix/room/timeline/Timeline.js b/src/matrix/room/timeline/Timeline.js @@ -145,6 +145,17 @@ export class Timeline {
}
_addLocalRelationsToNewRemoteEntries(entries) {
+ // because it is not safe to iterate a derived observable collection
+ // before it has any subscriptions, we bail out if this isn't
+ // the case yet. This can happen when sync adds or replaces entries
+ // before load has finished and the view has subscribed to the timeline.
+ //
+ // Once the subscription is setup, MappedList will set up the local
+ // relations as needed with _applyAndEmitLocalRelationChange,
+ // so we're not missing anything by bailing out.
+ if (!this._localEntries.hasSubscriptions) {
+ return;
+ }
// find any local relations to this new remote event
for (const pee of this._localEntries) {
// this will work because we set relatedEventId when removing remote echos
| 1 |
diff --git a/css/style.css b/css/style.css @@ -797,10 +797,10 @@ input[type='number'] {
}
.fa-instagram:hover {
- /* color: #bc2a8d; */
- background: #d6249f;
background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 45%,#d6249f 60%,#285AEB 90%);
- border-radius: 10%;
+ border-radius: 28%;
+ background-clip: padding-box;
+
}
.fa-linkedin:hover {
| 3 |
diff --git a/src/components/WhatWeDo/WhatWeDo.js b/src/components/WhatWeDo/WhatWeDo.js @@ -51,41 +51,15 @@ const WhatWeDo = forwardRef((props, ref) => {
`}
>
<h3 css={smSectionHead}>What We Do</h3>
+ <h4 css={headingCss}>
+ <a href='/capabilities#technology'>Technology</a>
+ </h4>
<h4 css={headingCss}>
<a href='/capabilities#strategy'>Strategy</a>
</h4>
<h4 css={headingCss}>
<a href='/capabilities#creative'>Creative</a>
</h4>
- <h4
- css={[
- headingCss,
- css`
- text-align: center;
- `,
- ]}
- >
- <a href='/capabilities#technology'>
- Technology
- <h3
- css={css`
- text-align: center;
- margin-bottom: 5px;
- margin-top: -5px;
- `}
- >
- Holy S%#*! that was fast.
- </h3>
- <h3
- css={css`
- text-align: center;
- `}
- >
- (With Gatsby its all fire, no waiting)
- </h3>
- </a>
- </h4>
-
<Button onClick={() => navigate(`/capabilities/`)}>
Our Capabilities
</Button>
| 13 |
diff --git a/docs/install.md b/docs/install.md @@ -135,6 +135,11 @@ You can now download your deployment ZIP using `scp` and upload it to Lambda. Be
* [gulp-responsive](https://www.npmjs.com/package/gulp-responsive)
* [grunt-sharp](https://www.npmjs.com/package/grunt-sharp)
+
+### CLI tools
+
+* [sharp-cli](https://www.npmjs.com/package/sharp-cli)
+
### Security
Many users of this module process untrusted, user-supplied images,
| 0 |
diff --git a/assets/js/components/DashboardEntityApp.js b/assets/js/components/DashboardEntityApp.js @@ -43,7 +43,6 @@ import {
ANCHOR_ID_SPEED,
ANCHOR_ID_TRAFFIC,
} from '../googlesitekit/constants';
-import BannerNotifications from './notifications/BannerNotifications';
import { CORE_SITE } from '../googlesitekit/datastore/site/constants';
import Link from './Link';
import VisuallyHidden from './VisuallyHidden';
@@ -135,7 +134,7 @@ function DashboardEntityApp() {
}
return (
<Fragment>
- <Header subHeader={ <BannerNotifications /> } showNavigation>
+ <Header showNavigation>
<EntitySearchInput />
<DateRangeSelector />
<HelpMenu />
| 2 |
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js @@ -47,38 +47,6 @@ function evaluateInputValue(value, type, node) {
return redUtil.evaluateNodeProperty(value, type, node, null, null);
}
-/**
- * Compose information object for env var
- */
-function composeInfo(info, val) {
- var result = {
- name: info.name,
- type: info.type,
- value: val,
- };
- if (info.ui) {
- var ui = info.ui;
- result.ui = {
- hasUI: ui.hasUI,
- icon: ui.icon,
- labels: ui.labels,
- type: ui.type
- };
- var retUI = result.ui;
- if (ui.type === "input") {
- retUI.inputTypes = ui.inputTypes;
- }
- if (ui.type === "select") {
- retUI.menu = ui.menu;
- }
- if (ui.type === "spinner") {
- retUI.spinner = ui.spinner;
- }
- }
- return result;
-}
-
-
/**
* This class represents a subflow - which is handled as a special type of Flow
*/
@@ -349,15 +317,8 @@ class Subflow extends Flow {
getSetting(name) {
if (!/^\$parent\./.test(name)) {
var env = this.env;
- var is_info = name.endsWith("_info");
- var is_type = name.endsWith("_type");
- var ename = (is_info || is_type) ? name.substring(0, name.length -5) : name; // 5 = length of "_info"/"_type"
-
- if (env && env.hasOwnProperty(ename)) {
- var val = env[ename];
- if (is_type) {
- return val ? val.type : undefined;
- }
+ if (env && env.hasOwnProperty(name)) {
+ var val = env[name];
// If this is an env type property we need to be careful not
// to get into lookup loops.
// 1. if the value to lookup is the same as this one, go straight to parent
@@ -371,11 +332,7 @@ class Subflow extends Flow {
value = value.replace(new RegExp("\\${"+name+"}","g"),"${$parent."+name+"}");
}
try {
- var ret = evaluateInputValue(value, type, this.node);
- if (is_info) {
- return composeInfo(val, ret);
- }
- return ret;
+ return evaluateInputValue(value, type, this.node);
}
catch (e) {
this.error(e);
| 2 |
diff --git a/lib/GoogleHome.js b/lib/GoogleHome.js @@ -460,6 +460,7 @@ class GoogleHome {
} else {
if (obj.common &&
obj.common.smartName &&
+ obj.common.smartName !== true &&
obj.common.smartName !== 'ignore') {
name = obj.common.smartName;
}
@@ -1316,6 +1317,7 @@ class GoogleHome {
}
} catch (e) {
this.adapter.log.error('[GHOME] Cannot process "' + id + '": ' + e);
+ this.adapter.log.error('[GHOME] ' + e.stack);
}
return;
| 9 |
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json },
{
"instanceof": "RegExp"
+ },
+ {
+ "items": {
+ "type": "string",
+ "absolutePath": true
+ },
+ "minItems": 1,
+ "type": "array"
+ },
+ {
+ "type": "string",
+ "absolutePath": true
}
]
},
| 11 |
diff --git a/primus.d.ts b/primus.d.ts -declare module 'primus' {
import * as http from 'http';
import { Socket } from 'net';
- module e {
- interface Primus {
- socket: Socket;
- library(): void;
- open(): void;
- write(data: any): void;
- on(event: string, cb: (spark: ISpark) => void): void;
- end(): void;
- destroy(): void;
- emits(event: string, parser: (next: any, parser: any) => void): void; // might be better tied to a TSD for https://github.com/primus/emits
- id(cb: (id: any) => void): void;
- createSocket(options?: IPrimusOptions): Socket;
+export declare class Primus {
+ constructor(server: http.Server, options?: IPrimusOptions);
authorize(req: http.ClientRequest, done: () => void): void;
- forEach(cb: (spark: ISpark, id: string, connections: any) => void): void;
before(event: string, cb: () => void): void;
- before(event: string, cb: (req: http.ClientRequest, res: http.ServerResponse) => void): void;
before(event: string, cb: (req: http.ClientRequest, res: http.ServerResponse, next: any) => void): void;
- remove(name: string): void;
- enable(name: string): void;
+ before(event: string, cb: (req: http.ClientRequest, res: http.ServerResponse) => void): void;
+ destroy(): void;
disable(name: string): void;
- use(name: string, plugin: Object): void;
+ emits(event: string, parser: (next: any, parser: any) => void): void; // might be better tied to a TSD for https://github.com/primus/emits
+ enable(name: string): void;
+ end(): void;
+ forEach(cb: (spark: ISpark, id: string, connections: any) => void): void;
+ id(cb: (id: any) => void): void;
+ library(): void;
+ on(event: string, cb: (spark: ISpark) => void): void;
+ open(): void;
+ remove(name: string): void;
+ socket: Socket;
+ static createSocket(options?: IPrimusOptions): Socket;
transform(event: string, cb: (packet: any) => void): void;
transforms(event: string, parser: (packet: any, next: any) => void): void; // might be better tied to a TSD for https://github.com/primus/emits
+ use(name: string, plugin: Object): void;
+ write(data: any): void;
}
- interface IPrimusOptions {
+export interface IPrimusOptions {
authorization?: Function;
- pathname?: string;
- parser?: string;
- transformer?: string;
- plugin?: Object;
- timeout?: number;
- global?: string;
compression?: boolean;
- origins?: string;
- methods?: string;
credentials?: boolean;
- maxAge?: string;
- headers?: boolean;
exposed?: boolean;
+ global?: string;
+ headers?: boolean;
+ maxAge?: string;
+ methods?: string;
+ origins?: string;
+ parser?: string;
+ pathname?: string;
+ plugin?: Object;
strategy?: any;
+ timeout?: number;
+ transformer?: string;
}
- interface IPrimusConnectOptions {
+export interface IPrimusConnectOptions {
timeout?: number;
ping?: number;
pong?: number;
@@ -63,7 +62,7 @@ declare module 'primus' {
};
}
- interface ISpark {
+export interface ISpark {
headers: any[];
address: string;
query: string;
@@ -75,15 +74,3 @@ declare module 'primus' {
emits(event: string, parser: (next: any, parser: any) => void): void; // might be better tied to a TSD for https://github.com/primus/emits
on(event: string, cb: (data: any) => void): void;
}
-
- interface IPrimusStatic {
- new(): Primus;
- new(server: http.Server, options?: IPrimusOptions): Primus;
- connect(url: string, options?: IPrimusConnectOptions): Primus;
- }
- }
-
- var e: e.IPrimusStatic;
-
- export = e;
-}
| 3 |
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,32 +7,20 @@ assignees: ''
---
-**Describe the bug**
-A clear and concise description of what the bug is.
+### Description
+A clear and concise description of what the issue is about.
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+### Screenshots
+
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+### Files
+A list of relevant files for this issue. This will help people navigate the project and offer some clues of where to start.
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+### To Reproduce
+If this issue is describing a bug, include some steps to reproduce the behavior.
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
+### Tasks
+Include specific tasks in the order they need to be done in. Include links to specific lines of code where the task should happen at.
+- [ ] Task 1
+- [ ] Task 2
+- [ ] Task 3
| 14 |
diff --git a/app/src/store.js b/app/src/store.js @@ -91,7 +91,8 @@ if (process.env.REACT_APP_DEBUG === '*' || process.env.NODE_ENV !== 'production'
{
const LOG_IGNORE = [
'SET_PEER_VOLUME',
- 'SET_ROOM_ACTIVE_SPEAKER'
+ 'SET_ROOM_ACTIVE_SPEAKER',
+ 'ADD_TRANSPORT_STATS'
];
const reduxLogger = createLogger(
| 8 |
diff --git a/docs/introduction/device-and-platform-support.md b/docs/introduction/device-and-platform-support.md @@ -38,7 +38,7 @@ A-Frame currently supports [`6DoF`][6dof] controllers using Brandon Jones' 4/24/
For the Oculus Rift and HTC Vive, we defer to the [Rift recommended
requirements](https://www.oculus.com/en-us/oculus-ready-pcs/) and the [Vive
-recommended requirements](https://www.htcvive.com/us/product-optimized/).
+recommended requirements](https://www.vive.com/us/ready/).
For mobile, we recommend at least an *iPhone 6 for iOS* and at least a *Galaxy
S6 for Android*.
| 1 |
diff --git a/source/views/RootView.js b/source/views/RootView.js -/*global window */
-
import { Class } from '../core/Core';
import '../foundation/EventTarget'; // For Function#on
import '../foundation/RunLoop'; // For Function#invokeInRunLoop
@@ -105,10 +103,6 @@ const RootView = Class({
}
}.on( 'touchmove' ) : null,
- hideAddressBar () {
- window.scrollTo( 0, 0 );
- },
-
focus () {
const layer = this.get( 'layer' );
const activeElement = layer.ownerDocument.activeElement;
@@ -136,8 +130,6 @@ const RootView = Class({
break;
// Window resize events: just notify parent has resized.
case 'orientationchange':
- this.hideAddressBar();
- /* falls through */
case 'resize':
this.didResize();
return;
| 2 |
diff --git a/articles/libraries/auth0js/v8/index.md b/articles/libraries/auth0js/v8/index.md @@ -254,7 +254,7 @@ The `passwordlessVerify` method requires several paramters to be sent in its `op
Note that, as with `passwordlessStart`, exactly _one_ of the optional `phoneNumber` and `email` parameters must be sent in order to verify the Passwordless transaction.
-::: panel passwordlessVerify required WebAuth options
+::: note
In order to use `passwordlessVerify`, the options `redirectUri` and `responseType: 'token'` must be specified when first initializing WebAuth.
:::
@@ -281,7 +281,7 @@ The `parseHash` method takes an `options` object that contains the following par
| `nonce` | optional | (String) Used to verify the `id_token`
| `hash` | optional | (String) The URL hash (if not provided, `window.location.hash` will be used by default) |
-::: panel RS256 Requirement
+::: note
This method requires that your tokens are signed with RS256 rather than HS256. For more information about this, check the [Auth0.js v8 Migration Guide](/libraries/auth0js/migration-guide#the-parsehash-method).
:::
@@ -353,8 +353,7 @@ To log out a user, use the `logout` method. This method accepts an options objec
| `federated` | optional | (Querystring parameter) Add this querystring parameter to the logout URL, to log the user out of their identity provider, as well: `https://${account.namespace}/v2/logout?federated`. |
::: panel returnTo parameter
-Note that if the `clientID` parameter _is_ included, the `returnTo` URL that is provided must be listed in the Client's **Allowed Logout URLs** in the [Auth0 dashboard](${manage_url}).
-However, if the `clientID` parameter _is not_ included, the `returnTo` URL must be listed in the **Allowed Logout URLs** at the *account level* in the [Auth0 dashboard](${manage_url}).
+Note that if the `clientID` parameter is included, the `returnTo` URL that is provided must be listed in the Client's **Allowed Logout URLs** in the [Auth0 dashboard](${manage_url}). However, if the `clientID` parameter _is not_ included, the `returnTo` URL must be listed in the **Allowed Logout URLs** at the *account level* in the [Auth0 dashboard](${manage_url}).
:::
```js
| 14 |
diff --git a/structs/Client.js b/structs/Client.js @@ -91,7 +91,7 @@ class Client {
login (token) {
if (this.bot) return log.general.error('Cannot login when already logged in')
- if (token instanceof Discord.Client) return this._defineBot(token) // May also be the client
+ if (token instanceof Discord.Client) return this._defineBot(token, true) // May also be the client
else if (token instanceof Discord.ShardingManager) return new ClientSharded(token)
else if (typeof token === 'string') {
const client = new Discord.Client({ disabledEvents: DISABLED_EVENTS })
@@ -108,7 +108,8 @@ class Client {
} else throw new TypeError('Argument must be a Discord.Client, Discord.ShardingManager, or a string')
}
- _defineBot (bot) {
+ _defineBot (bot, predefinedClient) {
+ if (!predefinedClient) this.configOverrides.setPresence = true
this.bot = bot
this.SHARD_PREFIX = bot.shard && bot.shard.count > 0 ? `SH ${bot.shard.id} ` : ''
if (this.customSchedules && bot && bot.shard && bot.shard.count > 0 && bot.shard.id === 0) process.send({ _drss: true, type: 'customSchedules', customSchedules: this.customSchedules })
| 11 |
diff --git a/client/src/views/header/index.js b/client/src/views/header/index.js @@ -166,6 +166,8 @@ class Header extends Component {
Charts
</Button>
+ { menus }
+
<Button
href='https://www.advancedalgos.net/documentation-quick-start.shtml'
color='inherit'
@@ -192,7 +194,7 @@ class Header extends Component {
</IconButton>
</React.Fragment>
}
- { (width === 'xs' || width === 'sm') ? mobileMenusButton : menus }
+ { (width === 'xs' || width === 'sm') ? mobileMenusButton : '' }
{ (width === 'xs' || width === 'sm') && this.state.mobileOpen ? menus : '' }
</Toolbar>
</AppBar>
| 14 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.