code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lambda/export/test/automateSyncTest.js b/lambda/export/test/automateSyncTest.js @@ -43,9 +43,9 @@ async function test_create_faq() {
faq_index_id:'e1c23860-e5c8-4409-ae26-b05bd6ced00a',
csv_path:parseJSONparams.output_path,
csv_name:parseJSONparams.csv_name,
- s3_bucket:'qna-dev-dev-dev-master-2-exportbucket-nwlyflasajwe',
+ s3_bucket:'qna-dev-dev-dev-master-4-exportbucket-o5r0tsjifuu9',
s3_key:"kendra_csv" + "/" + parseJSONparams.csv_name,
- kendra_s3_access_role:'arn:aws:iam::425742325899:role/QNA-dev-dev-dev-master-2-ExportStac-KendraSyncRole-1G3IEI1JF7L3S',
+ kendra_s3_access_role:'arn:aws:iam::425742325899:role/QNA-dev-dev-dev-master-4-ExportStack-KendraS3Role-1D5W35EQT8OCX',
region:'us-east-1'
}
return create.handler(createFAQparams);
@@ -57,9 +57,9 @@ async function test_performSync() {
const event = require('./syncEvent.json');
var context = undefined;
var cb = undefined;
- process.env.OUTPUT_S3_BUCKET = 'qna-dev-dev-dev-master-3-exportbucket-1nvhu6nwzea5j'
+ process.env.OUTPUT_S3_BUCKET = 'qna-dev-dev-dev-master-4-exportbucket-o5r0tsjifuu9'
process.env.KENDRA_INDEX = 'e1c23860-e5c8-4409-ae26-b05bd6ced00a';
- process.env.KENDRA_ROLE = 'arn:aws:iam::425742325899:role/QNA-dev-dev-dev-master-3-ExportStac-KendraSyncRole-1RN4NKGMDFRNH'
+ process.env.KENDRA_ROLE = 'arn:aws:iam::425742325899:role/QNA-dev-dev-dev-master-4-ExportStack-KendraS3Role-1D5W35EQT8OCX'
return kendraSync.performSync(event, context, cb);
}
| 3 |
diff --git a/src/actor.js b/src/actor.js @@ -156,12 +156,15 @@ export const getEnv = () => {
};
/**
- * Runs the main user function that performs the job of the actor.
+ * Runs the main user function that performs the job of the actor
+ * and terminates the process when the user function finishes.
*
- * `Apify.main()` is especially useful when you're running your code in an actor on the Apify platform.
- * Note that its use is optional - the function is provided merely for your convenience.
+ * *The `Apify.main()` function is optional* and is provided merely for your convenience.
+ * It is especially useful when you're running your code as an actor on the [Apify platform](https://apify.com/actors).
+ * However, if you want to use Apify SDK tools directly inside your existing projects or outside of Apify platform,
+ * it's probably better to avoid it since it terminates the main process.
*
- * The function performs the following actions:
+ * The `Apify.main()` function performs the following actions:
*
* <ol>
* <li>When running on the Apify platform (i.e. <code>APIFY_IS_AT_HOME</code> environment variable is set),
| 7 |
diff --git a/src/traces/sankey/plot.js b/src/traces/sankey/plot.js @@ -131,8 +131,8 @@ module.exports = function plot(gd, calcData) {
var hoverCenterY = boundingBox.top + boundingBox.height / 2;
var tooltip = Fx.loneHover({
- x: hoverCenterX - rootBBox.left + window.scrollX,
- y: hoverCenterY - rootBBox.top + window.scrollY,
+ x: hoverCenterX - rootBBox.left,
+ y: hoverCenterY - rootBBox.top,
name: d3.format(d.valueFormat)(d.link.value) + d.valueSuffix,
text: [
d.link.label,
@@ -181,9 +181,9 @@ module.exports = function plot(gd, calcData) {
var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;
var tooltip = Fx.loneHover({
- x0: hoverCenterX0 + window.scrollX,
- x1: hoverCenterX1 + window.scrollX,
- y: hoverCenterY + window.scrollY,
+ x0: hoverCenterX0,
+ x1: hoverCenterX1,
+ y: hoverCenterY,
name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
text: [
d.node.label,
| 2 |
diff --git a/API.md b/API.md @@ -241,8 +241,8 @@ var regl = require('regl')(require('gl')(256, 256))
| Options | Meaning |
| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `gl` | A reference to a WebGL rendering context. (Default created from canvas) |
-| `canvas` | A reference to an HTML canvas element. (Default created and appending to container) |
-| `container` | A container element which regl inserts a canvas into. (Default `document.body`) |
+| `canvas` | A reference to an HTML canvas element. (Default created and appended to container) |
+| `container` | A container element into which regl inserts a canvas. (Default `document.body`) |
| `attributes` | The [context creation attributes](https://www.khronos.org/registry/webgl/specs/1.0/#WEBGLCONTEXTATTRIBUTES) passed to the WebGL context constructor. See below for defaults. |
| `pixelRatio` | A multiplier which is used to scale the canvas size relative to the container. (Default `window.devicePixelRatio`) |
| `extensions` | A list of extensions that must be supported by WebGL context. Default `[]` |
| 7 |
diff --git a/src/internal/sagaHelpers.js b/src/internal/sagaHelpers.js @@ -82,7 +82,7 @@ export function throttleHelper(delayLength, pattern, worker, ...args) {
let action, channel
const yActionChannel = {done: false, value: actionChannel(pattern, buffers.sliding(1))}
- const yTake = () => ({done: false, value: take(channel, pattern)})
+ const yTake = () => ({done: false, value: take(channel)})
const yFork = ac => ({done: false, value: fork(worker, ...args, ac)})
const yDelay = {done: false, value: call(delay, delayLength)}
| 2 |
diff --git a/src/sdk/conference/conference.js b/src/sdk/conference/conference.js function mixOrUnmix(verb, socket, stream, targetStreams, onSuccess,
onFailure) {
- if (!(stream instanceof Woogeen.Stream)) {
+ if (!(stream instanceof Woogeen.Stream) &&
+ !(stream instanceof Woogeen.ExternalStream)) {
return safeCall(onFailure, 'Invalid stream');
}
if (!Array.isArray(targetStreams)) {
* @instance
* @desc This function tells server to add published LocalStream to mix stream.
* @memberOf Woogeen.ConferenceClient
- * @param {LocalStream or ExternalStream} stream LocalStream or ExternalStream instance; it should be published before this call.
+ * @param {WoogeenStream or ExternalStream} stream WoogeenStream or ExternalStream instance; it should be published before this call.
* @param {an array of RemoteMixedStreams} targetStream The mixed streams that |stream| will be mixed to.
* @param {function} onSuccess() (optional) Success callback.
* @param {function} onFailure(err) (optional) Failure callback.
* @instance
* @desc This function tells server to remove published LocalStream from mix stream.
* @memberOf Woogeen.ConferenceClient
- * @param {stream} stream LocalStream instance; it should be published before this call.
+ * @param {WoogeenStream or ExternalStream} stream WoogeenStream or ExternalStream instance; it should be published before this call.
* @param {an array of RemoteMixedStreams} targetStream The mixed streams that |stream| will be unmixed from.
* @param {function} onSuccess() (optional) Success callback.
* @param {function} onFailure(err) (optional) Failure callback.
| 11 |
diff --git a/package.json b/package.json {
"name": "broadcast-channel",
"version": "2.2.0",
- "description": "A BroadcastChannel shim/polyfill that works in New Browsers, Old Browsers, WebWorkers and NodeJs",
+ "description": "A BroadcastChannel that works in New Browsers, Old Browsers, WebWorkers and NodeJs",
"homepage": "https://github.com/pubkey/broadcast-channel#readme",
"keywords": [
"broadcast-channel",
| 1 |
diff --git a/packages/react-router/docs/guides/migrating.md b/packages/react-router/docs/guides/migrating.md @@ -10,6 +10,7 @@ React Router v4 is a complete rewrite, so there is not a simple migration path.
* [on* properties](#on-properties)
* [Switch](#switch)
* [Redirect](#redirect)
+* [PatternUtils](#patternutils)
## The Router
@@ -169,3 +170,29 @@ In v4, you can achieve the same functionality using `<Redirect>`.
</Switch>
```
+
+## PatternUtils
+
+### matchPattern(pattern, pathname)
+In v3, you could use the same matching code used internally to check if a path matched a pattern. In v4 this has been replaced by [matchPath](/packages/react-router/docs/api/matchPath.md) which is powered by the [path-to-regexp](https://github.com/pillarjs/path-to-regexp) library.
+
+### formatPattern(pattern, params)
+In v3, you could use PatternUtils.formatPattern to generate a valid path from a path pattern (perhaps in a constant or in your central routing config) and an object containing the names parameters:
+
+```js
+// v3
+const THING_PATH = '/thing/:id';
+
+<Link to={PatternUtils.formatPattern(THING_PATH, {id: 1})}>A thing</Link>
+```
+
+In v4, you can achieve the same functionality using the [compile](https://github.com/pillarjs/path-to-regexp#compile-reverse-path-to-regexp) function in [path-to-regexp](https://github.com/pillarjs/path-to-regexp).
+
+```js
+// v4
+const THING_PATH = '/thing/:id';
+
+const thingPath = pathToRegexp.compile(THING_PATH);
+
+<Link to={thingPath({id: 1})}>A thing</Link>
+```
| 0 |
diff --git a/src/Services/Air/AirFormat.js b/src/Services/Air/AirFormat.js @@ -90,6 +90,7 @@ function formatLowFaresSearch(searchRequest, searchResult) {
serviceClass: segmentInfo.CabinClass,
bookingClass: segmentInfo.BookingCode,
baggage: [getBaggage(fareInfo['air:BaggageAllowance'])],
+ fareBasisCode: fareInfo.FareBasis,
},
seatsAvailable ? { seatsAvailable } : null,
);
| 0 |
diff --git a/source/views/controls/ButtonView.js b/source/views/controls/ButtonView.js @@ -167,6 +167,11 @@ const ButtonView = Class({
*/
draw(layer) {
this._domControl = layer;
+ // This stops the button acting as a submit button when inside a <form>;
+ // this fixes some weird behaviour where the browser can simulate a
+ // click on the button when the user hits enter on another field inside
+ // the form.
+ layer.type = 'button';
let icon = this.get('icon');
if (!icon) {
| 12 |
diff --git a/js/containers/addWizardColumns.js b/js/containers/addWizardColumns.js @@ -43,7 +43,7 @@ function getValueType(dataset, features, fields) {
return 'float';
}
-function getFieldType(dataset, features, fields, probes) {
+function getFieldType(dataset, features, fields, probes, pos) {
if (dataset.type === 'mutationVector') {
return dataset.dataSubType.search(/SV|structural/i) !== -1 ? 'SV' : 'mutation';
}
@@ -53,7 +53,8 @@ function getFieldType(dataset, features, fields, probes) {
if (dataset.type === 'clinicalMatrix') {
return 'clinical';
}
- return probes ? 'probes' : (fields.length > 1 ? 'genes' : 'geneProbes');
+ // We treat probes in chrom view (pos) as geneProbes
+ return probes ? 'probes' : ((fields.length > 1 && !pos) ? 'genes' : 'geneProbes');
}
function sigFields(fields, {genes, weights}) {
@@ -69,7 +70,7 @@ function columnSettings(datasets, features, dsID, input, fields, probes) {
var meta = datasets[dsID],
pos = parsePos(input.trim(), meta.assembly),
sig = parseGeneSignature(input.trim()),
- fieldType = getFieldType(meta, features[dsID], fields, probes),
+ fieldType = getFieldType(meta, features[dsID], fields, probes, pos),
fieldsInput = sig ? sig.genes : parseInput(input),
normalizedFields = (
pos ? [`${pos.chrom}:${pos.baseStart}-${pos.baseEnd}`] :
| 11 |
diff --git a/shared/js/ui/templates/site.es6.js b/shared/js/ui/templates/site.es6.js @@ -71,14 +71,14 @@ module.exports = function () {
let count = 0
if (tn && tn.length) count = tn.length
const isActive = !isWhitelisted ? 'is-active' : ''
- const foundOrBlocked = isWhitelisted || count === 0 ? 'found' : 'blocked'
+ const foundOrBlocked = isWhitelisted || count === 0 ? 'Found' : 'Blocked'
return bel`<h2 class="site-info__trackers bold">
<span class="site-info__trackers-status__icon
is-blocking--${!isWhitelisted}">
</span>
- Tracker networks ${foundOrBlocked}
- <div class="float-right uppercase ${isActive}">${count}</div>
+ <span class="${isActive}">${count} Tracker Networks ${foundOrBlocked}</span>
+ <span class="icon icon__arrow pull-right"></span>
</h2>`
}
}
| 3 |
diff --git a/batch/maintenance/remove-old-batch-jobs.js b/batch/maintenance/remove-old-batch-jobs.js 'use strict';
+// jshint ignore:start
+
const debug = require('debug')('>');
debug.enabled = true;
const { promisify } = require('util');
@@ -127,3 +129,5 @@ async function main () {
}
main().then(() => process.exit(0));
+
+// jshint ignore:end
| 8 |
diff --git a/src/web/stylesheets/layout/_io.css b/src/web/stylesheets/layout/_io.css #btn-next-input-tab,
-#btn-go-to-input-tab,
+#btn-input-tab-dropdown,
#btn-next-output-tab,
#btn-go-to-output-tab {
float: right;
#magic svg path {
fill: var(--primary-font-colour);
}
+
+#input-search-results {
+ list-style: none;
+ width: fit-content;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#input-search-results li {
+ padding-left: 5px;
+ padding-right: 5px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ text-align: center;
+ transition: 0.25s ease all;
+ width: 100%;
+ background: var(--secondary-background-colour);
+}
+
+#input-search-results li:hover {
+ cursor: pointer;
+ background: var(--primary-background-colour);
+}
| 0 |
diff --git a/src/cli/domain/watch.js b/src/cli/domain/watch.js @@ -14,8 +14,9 @@ module.exports = function(dirs, baseDir, changed) {
(fileName, currentStat, previousStat) => {
if (!!currentStat || !!previousStat) {
if (
- /node_modules|package.tar.gz|_package|\.sw[op]/gi.test(fileName) ===
- false
+ /node_modules|package\.tar\.gz|_package|\.sw[op]|\.git/gi.test(
+ fileName
+ ) === false
) {
changed(null, fileName);
}
| 8 |
diff --git a/.storybook/addons.js b/.storybook/addons.js import '@storybook/addon-actions/register';
import '@storybook/addon-knobs/register';
import '@storybook/addon-notes/register';
-import '@storybook/addon-viewport/register';
\ No newline at end of file
+import '@storybook/addon-viewport/manager';
\ No newline at end of file
| 14 |
diff --git a/README.md b/README.md @@ -130,7 +130,7 @@ sagaMiddleware.run(mySaga)
There is also a **umd** build of `redux-saga` available in the `dist/` folder. When using the umd build `redux-saga` is available as `ReduxSaga` in the window object.
-The umd version is useful if you don't use Webpack or Browserify. You can access it directly from [unpkg](unpkg.com).
+The umd version is useful if you don't use Webpack or Browserify. You can access it directly from [unpkg](https://unpkg.com/).
The following builds are available:
| 1 |
diff --git a/angular/jest-config.js b/angular/jest-config.js @@ -16,5 +16,5 @@ module.exports = {
"^.+\\.(ts|js|html)$": "ts-jest"
},
coveragePathIgnorePatterns: ["/node_modules/"],
- coverageDirectory: '../coverage/spark-angular'
+ coverageDirectory: '<rootDir>/coverage/spark-angular'
};
| 3 |
diff --git a/scalene/scalene_profiler.py b/scalene/scalene_profiler.py @@ -348,20 +348,21 @@ class Scalene:
assert False, "ITIMER_PROF is not currently supported."
@staticmethod
- def start_signal_threads() -> None:
+ def start_signal_queues() -> None:
+ """Starts the signal processing queues (i.e., their threads)"""
Scalene.__cpu_sigq.start()
Scalene.__alloc_sigq.start()
Scalene.__memcpy_sigq.start()
@staticmethod
- def stop_signal_threads() -> None:
- """Stops the signal processing threads."""
+ def stop_signal_queues() -> None:
+ """Stops the signal processing queues (i.e., their threads)"""
Scalene.__cpu_sigq.stop()
Scalene.__alloc_sigq.stop()
Scalene.__memcpy_sigq.stop()
@staticmethod
- def malloc_signal_dispatcher(
+ def malloc_signal_handler(
signum: Union[
Callable[[Signals, FrameType], None], int, Handlers, None
],
@@ -370,7 +371,7 @@ class Scalene:
Scalene.__alloc_sigq.put((signum, this_frame))
@staticmethod
- def free_signal_dispatcher(
+ def free_signal_handler(
signum: Union[
Callable[[Signals, FrameType], None], int, Handlers, None
],
@@ -379,7 +380,7 @@ class Scalene:
Scalene.__alloc_sigq.put((signum, this_frame))
@staticmethod
- def memcpy_signal_dispatcher(
+ def memcpy_signal_handler(
signum: Union[
Callable[[Signals, FrameType], None], int, Handlers, None
],
@@ -402,17 +403,17 @@ class Scalene:
t = threading.Thread(target=Scalene.timer_thang)
t.start()
return
- Scalene.start_signal_threads()
+ Scalene.start_signal_queues()
# Set signal handlers for memory allocation and memcpy events.
signal.signal(
- ScaleneSignals.malloc_signal, Scalene.malloc_signal_dispatcher
+ ScaleneSignals.malloc_signal, Scalene.malloc_signal_handler
)
signal.signal(
- ScaleneSignals.free_signal, Scalene.free_signal_dispatcher
+ ScaleneSignals.free_signal, Scalene.free_signal_handler
)
signal.signal(
ScaleneSignals.memcpy_signal,
- Scalene.memcpy_signal_dispatcher,
+ Scalene.memcpy_signal_handler,
)
# Set every signal to restart interrupted system calls.
signal.siginterrupt(ScaleneSignals.cpu_signal, False)
@@ -448,12 +449,12 @@ class Scalene:
import scalene.replacement_fork
Scalene.__args = cast(ScaleneArguments, arguments)
- Scalene.__cpu_sigq = ScaleneSigQueue(Scalene.cpu_signal_handler_helper)
+ Scalene.__cpu_sigq = ScaleneSigQueue(Scalene.cpu_sigqueue_processor)
Scalene.__alloc_sigq = ScaleneSigQueue(
- Scalene.allocation_signal_handler_helper
+ Scalene.alloc_sigqueue_processor
)
Scalene.__memcpy_sigq = ScaleneSigQueue(
- Scalene.memcpy_signal_handler_helper
+ Scalene.memcpy_sigqueue_processor
)
Scalene.set_timer_signals()
@@ -587,7 +588,7 @@ class Scalene:
return False
@staticmethod
- def cpu_signal_handler_helper(
+ def cpu_sigqueue_processor(
_signum: Union[
Callable[[Signals, FrameType], None], int, Handlers, None
],
@@ -862,7 +863,7 @@ class Scalene:
stats.firstline_map[fn_name] = LineNumber(firstline)
@staticmethod
- def allocation_signal_handler_helper(
+ def alloc_sigqueue_processor(
signum: Union[
Callable[[Signals, FrameType], None], int, Handlers, None
],
@@ -1036,13 +1037,13 @@ class Scalene:
@staticmethod
def before_fork() -> None:
"""Executed just before a fork."""
- Scalene.stop_signal_threads()
+ Scalene.stop_signal_queues()
@staticmethod
def after_fork_in_parent(childPid: int) -> None:
"""Executed by the parent process after a fork."""
Scalene.add_child_pid(childPid)
- Scalene.start_signal_threads()
+ Scalene.start_signal_queues()
@staticmethod
def after_fork_in_child() -> None:
@@ -1061,7 +1062,7 @@ class Scalene:
Scalene.enable_signals()
@staticmethod
- def memcpy_signal_handler_helper(
+ def memcpy_sigqueue_processor(
signum: Union[
Callable[[Signals, FrameType], None], int, Handlers, None
],
@@ -1216,7 +1217,7 @@ class Scalene:
signal.signal(ScaleneSignals.malloc_signal, signal.SIG_IGN)
signal.signal(ScaleneSignals.free_signal, signal.SIG_IGN)
signal.signal(ScaleneSignals.memcpy_signal, signal.SIG_IGN)
- Scalene.stop_signal_threads()
+ Scalene.stop_signal_queues()
except BaseException:
# Retry just in case we get interrupted by one of our own signals.
Scalene.disable_signals() # FIXME this could loop with an error
| 10 |
diff --git a/devices/aurora_lighting.js b/devices/aurora_lighting.js @@ -5,6 +5,31 @@ const reporting = require('../lib/reporting');
const extend = require('../lib/extend');
const e = exposes.presets;
+const batteryRotaryDimmer = (...endpointsIds) => ({
+ fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_step, fz.command_step_color_temperature],
+ toZigbee: [],
+ exposes: [e.battery(), e.action([
+ 'on', 'off', 'brightness_step_up', 'brightness_step_down', 'color_temperature_step_up', 'color_temperature_step_down'])],
+ configure: async (device, coordinatorEndpoint, logger) => {
+ const endpoints = endpointsIds.map((endpoint) => device.getEndpoint(endpoint));
+
+ // Battery level is only reported on first endpoint
+ await reporting.batteryVoltage(endpoints[0]);
+
+ for await (const endpoint of endpoints) {
+ logger.debug(`processing endpoint ${endpoint.ID}`);
+ await reporting.bind(endpoint, coordinatorEndpoint,
+ ['genIdentify', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl']);
+
+ // The default is for the device to also report the on/off and
+ // brightness at the same time as sending on/off and step commands.
+ // Disable the reporting by setting the max interval to 0xFFFF.
+ await reporting.brightness(endpoint, {max: 0xFFFF});
+ await reporting.onOff(endpoint, {max: 0xFFFF});
+ }
+ },
+});
+
module.exports = [
{
zigbeeModel: ['TWGU10Bulb50AU'],
@@ -167,38 +192,20 @@ module.exports = [
model: 'AU-A1ZBR1GW',
vendor: 'Aurora Lighting',
description: 'AOne one gang wireless battery rotary dimmer',
- fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_step, fz.command_step_color_temperature],
- toZigbee: [],
- exposes: [e.battery(), e.action([
- 'on', 'off', 'brightness_step_up', 'brightness_step_down', 'color_temperature_step_up', 'color_temperature_step_down'])],
meta: {battery: {voltageToPercentage: '3V_2100'}},
- configure: async (device, coordinatorEndpoint, logger) => {
- const endpoint1 = device.getEndpoint(1);
- await reporting.bind(endpoint1, coordinatorEndpoint,
- ['genIdentify', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl', 'genPowerCfg']);
- await reporting.batteryVoltage(endpoint1);
- },
+ // One gang battery rotary dimmer with endpoint ID 1
+ ...batteryRotaryDimmer(1),
},
{
zigbeeModel: ['2GBatteryDimmer50AU'],
model: 'AU-A1ZBR2GW',
vendor: 'Aurora Lighting',
description: 'AOne two gang wireless battery rotary dimmer',
- fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_step, fz.command_step_color_temperature],
- toZigbee: [],
- exposes: [e.battery(), e.action([
- 'on', 'off', 'brightness_step_up', 'brightness_step_down', 'color_temperature_step_up', 'color_temperature_step_down'])],
meta: {multiEndpoint: true, battery: {voltageToPercentage: '3V_2100'}},
endpoint: (device) => {
return {'right': 1, 'left': 2};
},
- configure: async (device, coordinatorEndpoint, logger) => {
- const endpoint1 = device.getEndpoint(1);
- await reporting.bind(endpoint1, coordinatorEndpoint,
- ['genIdentify', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl', 'genPowerCfg']);
- await reporting.batteryVoltage(endpoint1);
- const endpoint2 = device.getEndpoint(2);
- await reporting.bind(endpoint2, coordinatorEndpoint, ['genIdentify', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl']);
- },
+ // Two gang battery rotary dimmer with endpoint IDs 1 and 2
+ ...batteryRotaryDimmer(1, 2),
},
];
| 7 |
diff --git a/articles/hooks/index.md b/articles/hooks/index.md @@ -20,7 +20,7 @@ Hooks allow you to customize the behavior of Auth0 using Node.js code that is ex
### Hooks vs. Rules
-Hooks will eventually replace Rules, the current Auth0 extensibility method. Currently, you can use both Hooks and Rules, but Auth0 will implement new functionality in Hooks.
+Hooks will eventually replace [Rules](/rules), the current Auth0 extensibility method. Currently, you can use both Hooks and Rules, but Auth0 will implement new functionality in Hooks.
If you created your Hook early on during the beta testing period, your Webtask Editor window might not populate with the schema required to successfully use the Test Runner. If that is the case, you'll need to save the Hook's code, delete the Hook, and create a new Hook using your existing code.
| 0 |
diff --git a/src/userscript.ts b/src/userscript.ts @@ -62678,12 +62678,17 @@ var $$IMU_EXPORT$$;
if ((domain_nosub === "1zoom.ru" ||
// http://s1.1zoom.me/big0/733/363283-sepik.jpg
// http://s1.1zoom.me/big3/733/363283-sepik.jpg
+ // https://s1.1zoom.me/prev2/610/Iceland_Crag_Canyon_609321_300x200.jpg -- 300x199
+ // https://s1.1zoom.me/prev/610/Iceland_Crag_Canyon_609321_300x200.jpg -- 600x399
+ // https://s1.1zoom.me/big3/207/Iceland_Crag_Canyon_609321_1280x853.jpg -- 3840x2559
domain_nosub === "1zoom.me") &&
domain.match(/^s[0-9]*\./)) {
// https://s1.1zoom.ru/big0/639/363168-commander06.jpg -- 1280x800
// https://s1.1zoom.ru/big3/639/363168-commander06.jpg -- 3000x1875
// https://s1.1zoom.ru/b5050/363168-commander06_300x188.jpg -- 300x188
- return src.replace(/(:\/\/[^/]*\/)big[0-9]*\//, "$1big3/");
+ return src
+ .replace(/(:\/\/[^/]*\/)prev2\//, "$1prev/")
+ .replace(/(:\/\/[^/]*\/)big[0-9]*\//, "$1big3/");
}
if (domain === "st-gdefon.gallery.world" ||
| 7 |
diff --git a/packages/concerto-core/lib/introspect/metamodel.js b/packages/concerto-core/lib/introspect/metamodel.js @@ -77,14 +77,10 @@ concept IdentifiedBy extends Identified {
o String name
}
-@FormEditor("defaultSubclass","concerto.metamodel.ClassDeclaration")
-abstract concept Declaration {
+concept EnumDeclaration {
// TODO use regex /^(?!null|true|false)(\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\p{Mn}|\\p{Mc}|\\p{Nd}|\\p{Pc}|\\u200C|\\u200D)*/u
- @FormEditor("title", "Name")
+ @FormEditor("title", "Enum Name")
o String name default="ClassName" // regex=/^(?!null|true|false)(\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\S|\\u200C|\\u200D)*$/
-}
-
-concept EnumDeclaration extends Declaration {
o EnumFieldDeclaration[] fields
}
@@ -98,7 +94,10 @@ concept EnumFieldDeclaration {
}
@FormEditor("defaultSubclass","concerto.metamodel.ConceptDeclaration")
-abstract concept ClassDeclaration extends Declaration {
+abstract concept ClassDeclaration {
+ // TODO use regex /^(?!null|true|false)(\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\p{Mn}|\\p{Mc}|\\p{Nd}|\\p{Pc}|\\u200C|\\u200D)*/u
+ @FormEditor("title", "Class Name")
+ o String name default="ClassName" // regex=/^(?!null|true|false)(\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\S|\\u200C|\\u200D)*$/
@FormEditor("hide", true)
o Decorator[] decorators optional
o Boolean isAbstract default=false
| 1 |
diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js @@ -37,6 +37,7 @@ type Props = {
index: number,
isDragging: boolean,
moveCard: (string, number) => void,
+ onChange: () => void,
patternEdited: boolean,
patternStop: PatternStop,
removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
| 1 |
diff --git a/src/components/layout.js b/src/components/layout.js @@ -86,7 +86,10 @@ const Layout = props => {
>
Mailing List
</a>{' '}
- | <a href="https://typeofnan.dev">Blog</a>
+ | <a href="https://typeofnan.dev">Blog</a> |{' '}
+ <a href="https://youtube.com/c/typeofnan">
+ Tutorial Videos
+ </a>
<header>{header}</header>
<main ref={headerRef}>{children}</main>
<button
| 0 |
diff --git a/.travis.yml b/.travis.yml @@ -38,12 +38,12 @@ branches:
# Before install, failures in this section will result in build status 'errored'
before_install:
- |
- if [[ "$JS" == "1" ]] || [[ "$E2E" == "1" ]] || [[ "$SNIFF" == "1" ]]; then
+ if [[ "$JS" == "1" ]] || [[ "$SNIFF" == "1" ]]; then
nvm install
npm ci
fi
- |
- if [[ "$PHP" == "1" ]] || [[ "$E2E" == "1" ]] || [[ "$SNIFF" == "1" ]]; then
+ if [[ "$PHP" == "1" ]] || [[ "$SNIFF" == "1" ]]; then
docker run --rm -v "$PWD:/app" -v "$HOME/.cache/composer:/tmp/cache" composer install
fi
- |
@@ -72,19 +72,11 @@ script:
if [[ "$PHP" == "1" ]]; then
composer test || exit 1
fi
- - |
- if [[ "$E2E" == "1" ]]; then
- npm run build:test || exit 1 # Build for tests.
- docker run --rm -v "$PWD:/app" -v "$HOME/.cache/composer:/tmp/cache" composer install
- npm run env:start || exit 1
- npm run test:e2e:ci || exit 1 # E2E tests.
- fi
jobs:
fast_finish: true
allow_failures:
- env: PHP=1 WP_VERSION=nightly
- - env: E2E=1 WP_VERSION=nightly
include:
- name: Lint
php: 7.4
@@ -104,14 +96,6 @@ jobs:
- name: JS Tests
php: 7.4
env: JS=1 WP_VERSION=latest PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
- - name: E2E Tests (WordPress latest)
- env: E2E=1
- - name: E2E Tests (WordPress nightly)
- env: E2E=1 WP_VERSION=nightly
- - name: E2E Tests (WordPress 4.7)
- env: E2E=1 WP_VERSION=4.7.13 AMP_VERSION=1.5.5
- - name: E2E Tests (WordPress 4.9, Gutenberg 4.9)
- env: E2E=1 WP_VERSION=4.9.10 GUTENBERG_VERSION=4.9.0
services:
- docker
| 2 |
diff --git a/packages/lib-panoptes-js/src/resources/subjects/helpers.js b/packages/lib-panoptes-js/src/resources/subjects/helpers.js @@ -6,7 +6,7 @@ function getRandomID (min, max) {
}
function buildQueuedSubjectResource () {
- const randomId = getRandomID(0, 100)
+ const randomId = getRandomID(1, 100)
return {
already_seen: false,
| 12 |
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js @@ -1059,8 +1059,9 @@ function createHoverText(hoverData, opts, gd) {
legendDraw(gd, mockLegend);
// Position the hover
- var ly = Lib.mean(hoverData.map(function(c) {return (c.y0 + c.y1) / 2;}));
- var lx = Lib.mean(hoverData.map(function(c) {return (c.x0 + c.x1) / 2;}));
+ var winningPoint = hoverData[0];
+ var ly = (winningPoint.y0 + winningPoint.y1) / 2;
+ var lx = (winningPoint.x0 + winningPoint.x1) / 2;
var legendContainer = container.select('g.legend');
var tbb = legendContainer.node().getBoundingClientRect();
lx += xa._offset;
| 4 |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -702,22 +702,32 @@ inttest:registryAuth:
fi
done
script: |
- apk add --update postgresql-client sed curl
+ apk add --update postgresql-client sed curl pwgen
curl -Lo /usr/local/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND}/kind-$(uname)-amd64 -C -
chmod +x /usr/local/bin/kind
curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL}/bin/linux/amd64/kubectl -C -
chmod +x /usr/local/bin/kubectl
curl -L https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz -C - | tar -xzO linux-amd64/helm > /usr/local/bin/helm
chmod +x /usr/local/bin/helm
+
+ # create k8s cluster
kind create cluster --config=./kind-config.yaml --wait 20m --image kindest/node:v1.16.15@sha256:83067ed51bf2a3395b24687094e283a7c7c865ccc12a8b1d7aa673ba0c5e8861
+
# Set up KUBECONFIG that links to kind - we use sed to edit it so it's pointing to gitlab's docker host
kind get kubeconfig | sed -E -e 's/localhost|0\.0\.0\.0/docker/g' > ./kubeconfig
+
export KUBECONFIG="$(pwd)/kubeconfig"
export JWT_SECRET=udIsbcYaKs1G4n6AdiMSIvPx5KpxQAy8FA2aIcD46iCipNAZvds4jeXFLZKhVvSJZvhYb5Pvgvmtonk7UFfhGnYcd3DXM7KzHG7gBmGO8PCsOZ4t7icqZoJbpdDqYWMmd9XnrVXtJhR6HVFBmEmbk9AmFJ1Gz9ipYPGYLoFcavPs9iZ63KPXgdt4aBdWQcmICkGPYiY8CQOvqOoiU7hUhKDTkJgRRTSaax6UQDOveTQvQnd5uyXuV4os0tlahzRX
kubectl create ns test2
echo "{ \"apiVersion\": \"v1\", \"kind\": \"Secret\", \"metadata\": {\"name\": \"auth-secrets\"}, \"type\": \"Opaque\", \"data\": {\"jwt-secret\": \"dWRJc2JjWWFLczFHNG42QWRpTVNJdlB4NUtweFFBeThGQTJhSWNENDZpQ2lwTkFadmRzNGplWEZMWktoVnZTSlp2aFliNVB2Z3ZtdG9uazdVRmZoR25ZY2QzRFhNN0t6SEc3Z0JtR084UENzT1o0dDdpY3Fab0picGREcVlXTW1kOVhuclZYdEpoUjZIVkZCbUVtYms5QW1GSjFHejlpcFlQR1lMb0ZjYXZQczlpWjYzS1BYZ2R0NGFCZFdRY21JQ2tHUFlpWThDUU92cU9vaVU3aFVoS0RUa0pnUlJUU2FheDZVUURPdmVUUXZRbmQ1dXlYdVY0b3MwdGxhaHpSWA==\"}}" | kubectl apply --namespace test2 -f -
echo "{ \"apiVersion\": \"v1\", \"kind\": \"Secret\", \"metadata\": {\"name\": \"regcred\"}, \"type\": \"kubernetes.io/dockerconfigjson\", \"data\": { \".dockerconfigjson\": \"$DOCKERCONFIGJSON\" }}" | kubectl apply --namespace test2 -f -
+
+ # Create DB password secret
+ PGPASSWORD="${DB_PASSWORD:-$(pwgen 16 1)}"
+ kubectl create secret generic db-main-account-secret --from-literal=postgresql-password=$PGPASSWORD --namespace test2
+
helm upgrade test2 deploy/helm/local-auth-test-deployment --debug --namespace test2 --install --timeout 1200s --set global.image.repository=registry.gitlab.com/magda-data/magda/data61,global.image.tag=$CI_COMMIT_REF_SLUG,magda-core.combined-db.magda-postgres.postgresql.image.registry=registry.gitlab.com,magda-core.combined-db.magda-postgres.postgresql.image.repository=magda-data/magda/data61/magda-postgres,magda-core.combined-db.magda-postgres.postgresql.image.tag=$CI_COMMIT_REF_SLUG
+
# Forward local ports to kind
kubectl port-forward combined-db-postgresql-0 5432 --namespace test2 >/dev/null 2>&1 < /dev/null &
kubectl port-forward deployment/authorization-api 6104:80 --namespace test2 >/dev/null 2>&1 < /dev/null &
| 12 |
diff --git a/README.md b/README.md @@ -12,10 +12,11 @@ This is a clone of the [Hack Oregon Starter kit](https://github.com/hackoregon/h
#### Using the [Component Library](https://github.com/hackoregon/component-library) in your project
-The component libary has been installed as a dependency from the npm build version 0.0.6 (https://www.npmjs.com/package/@hackoregon/component-library)
+The component libary has been installed as a dependency from an npm build, make sure the version in package.json matches the latest version in the component library repo to have access to all the latest components.
+(https://www.npmjs.com/package/@hackoregon/component-library)
-To use a component in your project, import the component from its source in the lib folder
+To use a component in your project, import the precompiled component from the lib folder
-Example: importing the Header compoenent from the component library
+Example: importing the Header component from the component library
`import Header from '@hackoregon/component-library/lib/Navigation/Header';`
| 3 |
diff --git a/shared/js/ui/models/feedback-form.es6.js b/shared/js/ui/models/feedback-form.es6.js @@ -30,7 +30,7 @@ FeedbackForm.prototype = window.$.extend({},
$.ajax('https://andrey.duckduckgo.com/feedback.js?type=extension-feedback', {
method: 'POST',
data: {
- broken: this.isBrokenSite ? 1 : 0,
+ reason: this.isBrokenSite ? 'broken_site' : 'general',
url: this.url || '',
comment: this.message || '',
browser: this.browser || '',
| 3 |
diff --git a/src/components/dashboard/Receive.js b/src/components/dashboard/Receive.js // @flow
+import QRCode from 'qrcode.react'
import React, { useCallback, useMemo } from 'react'
import { Clipboard, View } from 'react-native'
-import QRCode from 'qrcode.react'
-import goodWallet from '../../lib/wallet/GoodWallet'
import logger from '../../lib/logger/pino-logger'
import { generateCode } from '../../lib/share'
-import { Address, Section, Wrapper } from '../common'
-import { receiveStyles as styles } from './styles'
+import goodWallet from '../../lib/wallet/GoodWallet'
import { PushButton } from '../appNavigation/stackNavigation'
+import { Address, Section, Wrapper } from '../common'
+import ScanQRButton from '../common/ScanQRButton'
import TopBar from '../common/TopBar'
import ShareQR from './ShareQR'
+import { receiveStyles as styles } from './styles'
export type ReceiveProps = {
screenProps: any,
@@ -34,7 +35,9 @@ const Receive = ({ screenProps }: ReceiveProps) => {
return (
<Wrapper style={styles.wrapper}>
- <TopBar hideBalance={true} push={screenProps.push} />
+ <TopBar hideBalance={false} push={screenProps.push}>
+ <ScanQRButton onPress={() => screenProps.push('ScanQR')} />
+ </TopBar>
<Section style={styles.section}>
<Section.Row style={styles.sectionRow}>
<View style={styles.qrCode}>
| 0 |
diff --git a/publish.sh b/publish.sh @@ -7,7 +7,11 @@ PACKAGE_NAME=`node -pe "($(cat package.json)).productName"`
APP_NAME=$(node -e "console.log($(cat package.json).name)") # "ride30" or similar
VERSION="${BASE_VERSION%%.0}.`git rev-list HEAD --count`" # "%%.0" strips trailing ".0"
-echo $JOB_NAME
+JOB_NAME=${JOB_NAME#*/*/}
+if [ "${JOB_NAME:0:2}" = "PR" ]; then
+ GIT_BRANCH=$JOB_NAME
+fi
+
if ! [ "$GIT_BRANCH" ]; then
GIT_BRANCH=`git symbolic-ref --short HEAD`
fi
| 12 |
diff --git a/docs/content/widgets/Grids.js b/docs/content/widgets/Grids.js @@ -113,6 +113,7 @@ export const Grids = <cx>
- [Infinite scrolling](~/examples/grid/infinite-scrolling)
- [Row Expanding](~/examples/grid/row-expanding)
- [Column Resizing](~/examples/grid/column-resizing)
+ - [Column Reordering (Drag & Drop)](~/examples/grid/column-reordering)
- [Fixed Columns](~/examples/grid/fixed-columns)
## Configuration
| 0 |
diff --git a/articles/client-auth/v2/mobile-desktop.md b/articles/client-auth/v2/mobile-desktop.md @@ -116,3 +116,25 @@ Note the authorization code included at the end of the included URL.
### Step 3: Obtain an ID Token
Using the authorization code obtained in step 2, you can obtain the ID token by making the appropriate `POST` call to the [tokens endpoint](api/authentication#authorization-code-pkce-).
+
+```har
+{
+ "method": "POST",
+ "url": "https://${account.namespace}/oauth/token",
+ "headers": [
+ { "name": "Content-Type", "value": "application/json" }
+ ],
+ "postData": {
+ "mimeType": "application/json",
+ "text": "{\"grant_type\":\"authorization_code\",\"client_id\": \"${account.clientId}\",\"code_verifier\": \"YOUR_GENERATED_CODE_VERIFIER\",\"code\": \"YOUR_AUTHORIZATION_CODE\",\"redirect_uri\": \"com.myclientapp://myclientapp.com/callback\", }"
+ }
+}
+```
+
+Request Parameters:
+
+* `grant_type`: Set this field to `authorization_code`
+* `client_id`: Your application's Client ID
+* `code_verifier`: The cryptographically random key used to generate the `code_challenge` passed to the `/authorize` endpoint
+* `code`: The authorization code received from the initial `authorize` call
+* `redirect_uri`: the `redirect_uri` passed to `/authorize` (these two values must match exactly)
| 0 |
diff --git a/app/workers/database.php b/app/workers/database.php @@ -120,24 +120,53 @@ class DatabaseV1 extends Worker
$dbForInternal->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'failed'));
}
- // the underlying database removes/rebuilds indexes when attribute is removed
- // update indexes table with changes
+ // The underlying database removes/rebuilds indexes when attribute is removed
+ // Update indexes table with changes
/** @var Document[] $indexes */
$indexes = $collection->getAttribute('indexes', []);
foreach ($indexes as $index) {
/** @var string[] $attributes */
$attributes = $index->getAttribute('attributes');
- $found = array_search($key, $attributes);
+ $lengths = $index->getAttribute('lengths');
+ $orders = $index->getAttribute('orders');
+
+ $found = \array_search($key, $attributes);
if ($found !== false) {
- $remove = [$attributes[$found]];
- $attributes = array_diff($attributes, $remove); // remove attribute from array
+ // If found, remove entry from attributes, lengths, and orders
+ // array_values wraps array_diff to reindex array keys
+ // when found attribute is removed from array
+ $attributes = \array_values(\array_diff($attributes, [$attributes[$found]]));
+ $lengths = \array_values(\array_diff($lengths, [$lengths[$found]]));
+ $orders = \array_values(\array_diff($orders, [$orders[$found]]));
if (empty($attributes)) {
$dbForInternal->deleteDocument('indexes', $index->getId());
} else {
- $dbForInternal->updateDocument('indexes', $index->getId(), $index->setAttribute('attributes', $attributes, Document::SET_TYPE_ASSIGN));
+ $index
+ ->setAttribute('attributes', $attributes, Document::SET_TYPE_ASSIGN)
+ ->setAttribute('lengths', $lengths, Document::SET_TYPE_ASSIGN)
+ ->setAttribute('orders', $orders, Document::SET_TYPE_ASSIGN)
+ ;
+
+ // Check if an index exists with the same attributes and orders
+ $exists = false;
+ foreach ($indexes as $existing) {
+ if ($existing->getAttribute('key') !== $index->getAttribute('key') // Ignore itself
+ && $existing->getAttribute('attributes') === $index->getAttribute('attributes')
+ && $existing->getAttribute('orders') === $index->getAttribute('orders')
+ ) {
+ $exists = true;
+ break;
+ }
+ }
+
+ if ($exists) { // Delete the duplicate if created, else update in db
+ $this->deleteIndex($collection, $index, $projectId);
+ } else {
+ $dbForInternal->updateDocument('indexes', $index->getId(), $index);
+ }
}
}
}
@@ -190,7 +219,7 @@ class DatabaseV1 extends Worker
try {
if(!$dbForExternal->deleteIndex($collectionId, $key)) {
- throw new Exception('Failed to delete Attribute');
+ throw new Exception('Failed to delete index');
}
$dbForInternal->deleteDocument('indexes', $index->getId());
| 9 |
diff --git a/packages/api-logs/index.jsx b/packages/api-logs/index.jsx @@ -145,7 +145,7 @@ class Logs extends React.Component {
visitLogItem(log) {
const { baseUrl } = this.props;
- window.open(`${baseUrl}logs/${log._id}`);
+ window.open(`${baseUrl}/logs/${log._id}`);
}
renderLogs() {
| 1 |
diff --git a/static/star-75.svg b/static/star-75.svg -<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M12.1744 17.7643L11.9729 17.6359L11.7714 17.7643L6.3805 21.1984L7.81459 14.6842L7.86109 14.4729L7.70153 14.3269L2.85265 9.88945L9.22174 9.31203L9.45038 9.29131L9.53589 9.07825L11.9729 3.00672L14.4099 9.07825L14.4954 9.29131L14.7241 9.31203L21.0931 9.88945L16.2443 14.3269L16.0847 14.4729L16.1312 14.6842L17.5653 21.1984L12.1744 17.7643Z" fill="#F9F8F6" stroke="#BD7B2D" stroke-width="0.75"/>
- <path d="M8.23125 14.3532L3.64978 10.1568L9.68773 9.60764L11.9729 3.91833L14.258 9.6103V18.7978L11.9757 17.2303L6.88225 20.5089L8.23125 14.3532Z" fill="#FFD280"/>
- <path d="M14.0201 9.18207L14.0201 19.0141" stroke="#BD7B2D" stroke-width="0.75"/>
- <path d="M14.3948 9.37474H13.9952L11.97 4.3423L9.79589 9.76077L4.01172 10.2823L8.40741 14.292L7.12052 20.1371L11.97 17.0486L13.8259 18.2204" stroke="#BD7B2D" stroke-width="1.75"/>
+<svg viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.1744 15.838L10.9729 15.7097L10.7714 15.838L5.3805 19.2721L6.81459 12.7579L6.86109 12.5467L6.70153 12.4007L1.85265 7.96318L8.22174 7.38577L8.45038 7.36504L8.53589 7.15198L10.9729 1.08045L13.4099 7.15198L13.4954 7.36504L13.7241 7.38577L20.0931 7.96318L15.2443 12.4007L15.0847 12.5467L15.1312 12.7579L16.5653 19.2721L11.1744 15.838Z" fill="#F9F8F6" stroke="#BD7B2D" stroke-width="0.75"/>
+<path d="M7.23125 12.427L2.64978 8.23054L8.68773 7.68137L10.9729 1.99207L12.6077 6.15858V16.8969L10.9757 15.304L5.88225 18.5827L7.23125 12.427Z" fill="#FFD280"/>
+<path d="M12.8591 7.23724L12.8591 16.9072" stroke="#BD7B2D" stroke-width="0.75"/>
+<path d="M13.1941 7.77738H13.0888L10.97 2.41602L8.79589 7.83449L3.01172 8.35604L7.40741 12.3657L6.12052 18.2108L10.97 15.1223L12.786 16.2732" stroke="#BD7B2D" stroke-width="1.75"/>
</svg>
| 14 |
diff --git a/js/node/bis_basefileserver.js b/js/node/bis_basefileserver.js @@ -214,7 +214,7 @@ class BaseFileServer {
* @param {Object} control - Parsed WebSocket header for the file request.
*/
- handleTextRequest(rawText, socket, control) {
+ handleTextRequest(rawText, socket, control=null) {
let parsedText = this.parseClientJSON(rawText);
parsedText=parsedText || -1;
if (this.opts.verbose)
@@ -285,17 +285,12 @@ class BaseFileServer {
*
* @param {String} rawText - Unparsed JSON denoting the file or series of files to read.
* @param {Net.Socket} socket - WebSocket over which the communication is currently taking place.
- * @param {Object} control - Parsed WebSocket header for the file request.
*/
- readFileAndSendToClient(parsedText, socket, control) {
+ readFileAndSendToClient(parsedText, socket) {
let filename = parsedText.filename;
let isbinary = parsedText.isbinary;
let id=parsedText.id;
- /*let pkgformat='binary';
- if (!isbinary)
- pkgformat='text';*/
-
if (!this.validateFilename(filename)) {
this.handleBadRequestFromClient(socket,
'filename '+filename+' is not valid',
@@ -776,6 +771,7 @@ class BaseFileServer {
}
}
}
+ if (this.opts.verbose)
console.log('..... Validating '+name+' directory list=',lst.join(','),'-->\n.....\t ' , newlist.join(','));
return newlist;
}
| 2 |
diff --git a/assets/src/models/Book.test.js b/assets/src/models/Book.test.js @@ -37,6 +37,11 @@ describe('Book model', () => {
const book = someBook([ { id: 5, user: {} }, { id: 6, user: {} }]);
expect(book.getAvailableCopyID()).toBeNull();
});
+
+ it('should return the number of available copies', () => {
+ const book = someBook([ { id: 5, user: null }, { id: 6, user: {} }, { id: 7, user: null }]);
+ expect(book.getCountBookCopiesAvailable()).toEqual(2);
+ });
});
describe('checking if the user owns a copy of the book', () => {
| 0 |
diff --git a/app/styles/components/_forms.scss b/app/styles/components/_forms.scss @@ -94,13 +94,6 @@ select {
width: 100%;
color: $input-color;
- // firefox quirk, options were not inheriting there parents color styles
- option,
- optgroup {
- color: $label-color;
- background: $input-bg;
- }
-
&[size] {
display: inline-block;
width: auto;
| 2 |
diff --git a/assets/js/modules/analytics-4/datastore/api.test.js b/assets/js/modules/analytics-4/datastore/api.test.js @@ -46,80 +46,6 @@ describe( 'modules/analytics-4 properties', () => {
describe( 'selectors', () => {
describe( 'isAdminAPIWorking', () => {
- // TODO - REMOVE
- it( 'should return false TODO AS PER SPEC', async () => {
- const isAdminAPIWorking = registry.select( STORE_NAME ).isAdminAPIWorking( );
-
- expect( isAdminAPIWorking ).toBe( undefined );
- } );
-
- // TODO - REMOVE
- it( 'should return true if both exist', async () => {
- // NOTE - selector does not work for receiveGetProperty. assuming that IB knows this!
- registry.dispatch( STORE_NAME ).receiveGetProperties( [
- {
- _id: '1000',
- _accountID: '100',
- name: 'properties/1000',
- createTime: '2014-10-02T15:01:23Z',
- updateTime: '2014-10-02T15:01:23Z',
- parent: 'accounts/100',
- displayName: 'Test GA4 Property',
- industryCategory: 'TECHNOLOGY',
- timeZone: 'America/Los_Angeles',
- currencyCode: 'USD',
- deleted: false,
- },
- ],
- { accountID: 'foo-bar' },
- );
-
- registry.dispatch( STORE_NAME ).receiveGetWebDataStreams(
- [
- {
- _id: '2000',
- _propertyID: '1000',
- name: 'properties/1000/webDataStreams/2000',
- // eslint-disable-next-line sitekit/acronym-case
- measurementId: '1A2BCD345E',
- // eslint-disable-next-line sitekit/acronym-case
- firebaseAppId: '',
- createTime: '2014-10-02T15:01:23Z',
- updateTime: '2014-10-02T15:01:23Z',
- defaultUri: 'http://example.com',
- displayName: 'Test GA4 WebDataStream',
- },
- ],
- { propertyID: 'foo-bar' }
- );
-
- const isAdminAPIWorking = registry.select( STORE_NAME ).isAdminAPIWorking( );
-
- expect( isAdminAPIWorking ).toBe( true );
- } );
-
- // TODO - REMOVE
- it( 'should return false if has at least one error with key starting with getProperties', async () => {
- registry.dispatch( STORE_NAME ).receiveError(
- new Error( 'foo' ), 'getProperties', [ 'foo', 'bar' ]
- );
-
- const isAdminAPIWorking = registry.select( STORE_NAME ).isAdminAPIWorking( );
-
- expect( isAdminAPIWorking ).toBe( false );
- } );
-
- // TODO - REMOVE
- it( 'should return false if has at least one error with key starting with getWebDataStreams', async () => {
- registry.dispatch( STORE_NAME ).receiveError(
- new Error( 'foo' ), 'getWebDataStreams', [ 'foo', 'bar' ]
- );
-
- const isAdminAPIWorking = registry.select( STORE_NAME ).isAdminAPIWorking( );
-
- expect( isAdminAPIWorking ).toBe( false );
- } );
-
test.each`
property | webData | errorProperty | errorWebData | expected
${ true } | ${ true } | ${ false } | ${ false } | ${ true }
| 2 |
diff --git a/package.json b/package.json {
"name": "@liquid-carrot/carrot",
"version": "0.0.39",
- "description": "A Node.js Neural Network Library",
+ "description": "A Simple Node.js AI Library for Neural Network",
"main": "src/index.js",
"scripts": {
"build": "./node_modules/.bin/documentation build src/** -f md > DOCUMENTATION.md",
| 7 |
diff --git a/packages/medusa/src/api/routes/admin/orders/list-orders.js b/packages/medusa/src/api/routes/admin/orders/list-orders.js @@ -42,18 +42,6 @@ export default async (req, res) => {
selector.q = req.query.q
}
- if ("payment_status" in req.query) {
- selector.payment_status = req.query.payment_status
- }
-
- if ("status" in req.query) {
- selector.status = req.query.status
- }
-
- if ("fulfillment_status" in req.query) {
- selector.fulfillment_status = req.query.fulfillment_status
- }
-
let includeFields = []
if ("fields" in req.query) {
includeFields = req.query.fields.split(",")
| 4 |
diff --git a/src/components/macros/showViewscreenTactical.js b/src/components/macros/showViewscreenTactical.js @@ -29,7 +29,7 @@ class TacticalMapConfig extends Component {
<div className="tacticalmap-config">
<SubscriptionHelper
subscribe={() =>
- this.props.data.subscribeToMore({
+ tacticalData.subscribeToMore({
document: TACTICALMAP_SUB,
updateQuery: (previousResult, { subscriptionData }) => {
return Object.assign({}, previousResult, {
| 1 |
diff --git a/lib/zbDeviceAvailability.js b/lib/zbDeviceAvailability.js @@ -166,13 +166,11 @@ class DeviceAvailability extends BaseExtension {
return;
}
- if (!this.isPingable(device)) {
- this.debug(`Device is not pingable ${device.ieeeAddr}`);
- }
-
+ if (this.isPingable(device)) {
// When a zigbee message from a device is received we know the device is still alive.
// => reset the timer.
this.setTimerPingable(device);
+ }
const online = this.state.hasOwnProperty(device.ieeeAddr) && this.state[device.ieeeAddr];
const offline = this.state.hasOwnProperty(device.ieeeAddr) && !this.state[device.ieeeAddr];
| 12 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/canvas/ContextMenu.js b/public/javascripts/SVLabel/src/SVLabel/canvas/ContextMenu.js @@ -76,7 +76,7 @@ function ContextMenu (uiContextMenu) {
}; //handles both key down and key up events
function checkRadioButton (value) {
- uiContextMenu.radioButtons.filter(function() {return this.value == value}).prop("checked", true).trigger("change");
+ uiContextMenu.radioButtons.filter(function() {return this.value == value}).prop("checked", true).trigger("click", {lowLevelLogging: false});
}
function getContextMenuUI(){
| 13 |
diff --git a/accessibility-checker-extension/src/ts/devtools/Header.tsx b/accessibility-checker-extension/src/ts/devtools/Header.tsx @@ -194,6 +194,7 @@ export default class Header extends React.Component<IHeaderProps, IHeaderState>
<OverflowMenu
className="rendered-icon svg"
style={{backgroundColor: "black", height:"32px", width:"32px"}}
+ iconDescription="Open and close report scan options"
renderIcon={ChevronDown16}
ariaLabel="Report menu"
// size="xl"
| 3 |
diff --git a/lib/utils/logger.js b/lib/utils/logger.js @@ -24,7 +24,7 @@ module.exports = class Logger {
return { levelname: label };
}
},
- messageKey: 'message',
+ messageKey: 'event_message',
timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
serializers: {
client_request: requestSerializer,
| 10 |
diff --git a/src/components/_classes/component/Component.js b/src/components/_classes/component/Component.js @@ -2379,11 +2379,12 @@ export default class Component extends Element {
}
// Calculate the new value.
- const calculatedValue = this.evaluate(this.component.calculateValue, {
+ var calculatedValue = this.evaluate(this.component.calculateValue, {
value: dataValue,
data,
row: row || this.data
- }, 'value') || this.emptyValue;
+ }, 'value');
+ if (calculatedValue === undefined || calculatedValue === null) calculatedValue = this.emptyValue;
// reassigning calculated value to the right one if rows(for ex. dataGrid rows) were reordered
if (flags.isReordered && allowOverride) {
| 11 |
diff --git a/packages/babel-plugin-transform-raptor-class/src/index.js b/packages/babel-plugin-transform-raptor-class/src/index.js @@ -97,7 +97,7 @@ module.exports = function (babel) {
// Throw if we find `this`. (needs refinement)
prop.traverse({
ThisExpression() {
- throw new Error('Reference to the instance is now allowed in class properties');
+ throw new Error('Reference to the instance is not allowed in class properties');
}
});
| 1 |
diff --git a/token-metadata/0x95dAaaB98046846bF4B2853e23cba236fa394A31/metadata.json b/token-metadata/0x95dAaaB98046846bF4B2853e23cba236fa394A31/metadata.json "symbol": "EMONT",
"address": "0x95dAaaB98046846bF4B2853e23cba236fa394A31",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/sandbox/public/index.html b/sandbox/public/index.html viewStart: true,
xdm: {
_myorg: {
- // Using a promise to demonstrate they are supported.
- type: Promise.resolve("page-view"),
url: location.href,
name: location.pathname.substring(1) || "home"
},
| 2 |
diff --git a/_pages/en/gsoc-ideas.md b/_pages/en/gsoc-ideas.md @@ -67,7 +67,7 @@ And, if possible, an *easy, medium or hard* rating of each project.
<td tabindex="0">DAF</td>
<td>
<b>Create an analysis based on open data</b><br /> Data & Analytics Framework (DAF in short) is an infrastructure to consume and distribute many different kind of datasets coming from many different sources.
- By leveraging the <a href="https://github.com/teamdigitale/nteract/tree/feature/daf-dataset-toolbar-search">daf-dataset-toolbar-search</a> capabilities, the student should ingest some dataset, elaborate it and extract a reasonable output. We have several mentors available, with different expertises, so make sure you discuss with your mentor.
+ By leveraging the <a href="https://github.com/teamdigitale/nteract/tree/daf-develop">daf-dataset-toolbar-search</a> capabilities, the student should ingest some dataset, elaborate it and extract a reasonable output. We have several mentors available, with different expertises, so make sure you discuss with your mentor.
<br />
<b>Mentor:</b> Ask on the #daf channel on our slack once you start having a basic idea.
<br />
| 1 |
diff --git a/src/gltf.js b/src/gltf.js @@ -69,6 +69,7 @@ class glTF extends GltfObject
this.animations = objectsFromJsons(json.animations, gltfAnimation);
this.skins = objectsFromJsons(json.skins, gltfSkin);
this.variants = objectsFromJsons(getJsonVariantsFromExtension(json.extensions), gltfVariant);
+ this.variants = enforceVariantsUniqueness(this.variants);
this.materials.push(gltfMaterial.createDefault());
this.samplers.push(gltfSampler.createDefault());
@@ -126,4 +127,22 @@ function getJsonVariantsFromExtension(extensions)
return extensions.KHR_materials_variants.variants;
}
+function enforceVariantsUniqueness(variants)
+{
+ for(let i=0;i<variants.length;i++)
+ {
+ const name = variants[i].name;
+ for(let j=i+1;j<variants.length;j++)
+ {
+ if(variants[j].name == name)
+ {
+ variants[j].name += "0"; // Add random character to duplicates
+ }
+ }
+ }
+
+
+ return variants;
+}
+
export { glTF };
| 9 |
diff --git a/frontend/lost/src/components/SIA/Annotation/Node.js b/frontend/lost/src/components/SIA/Annotation/Node.js @@ -89,7 +89,8 @@ class Node extends Component{
this.props.onMouseDown(e, this.props.idx, this.state.anno)
}
}
- onMouseEnter(e: Event){
+ onMouseOver(e: Event){
+ console.log('Mouse over node')
if (this.props.isSelected){
this.turnHaloOn()
}
@@ -164,7 +165,7 @@ class Node extends Component{
r={5} fill="red"
style={this.props.style}
className={this.props.className}
- onMouseOver={e => this.onMouseEnter(e)}
+ onMouseOver={e => this.onMouseOver(e)}
/>
</g>
)
| 10 |
diff --git a/source/getCORSCss.js b/source/getCORSCss.js @@ -42,7 +42,7 @@ const promiseMap = new Map();
*/
function enableCrossOriginOnLinkAsync(document, link) {
if (!promiseMap.has(link) && !isCrossOriginEnabledForLink(document, link)) {
- const linkPromise = new Promise((resolve) => {
+ const linkPromise = new Promise((resolve, reject) => {
const newLink = document.createElement('link');
newLink.rel = 'stylesheet';
newLink.href = link;
@@ -53,6 +53,10 @@ function enableCrossOriginOnLinkAsync(document, link) {
linkBundle.node.remove();
resolve();
};
+ newLink.onerror = function() {
+ window.console.log('error link');
+ reject();
+ };
linkBundle.parentNode.insertBefore(newLink, linkBundle.node);
});
promiseMap.set(link, linkPromise);
@@ -61,30 +65,11 @@ function enableCrossOriginOnLinkAsync(document, link) {
return promiseMap.get(link);
}
-/**
- * Create a new link element which is CORS and set crossOrigin attribute on Safari.
- * Safari will create the new link and load ready synchronously.
- * @param {Object} document which is current document element.
- * @param {String} link A href string which not set "crossOrigin" attr and is CORS compared to current domain.
- */
-function enableSafariCrossOriginOnLinkAsync(document, link) {
- if (!isCrossOriginEnabledForLink(document, link)) {
- const newLink = document.createElement('link');
- newLink.rel = 'stylesheet';
- newLink.href = link;
- newLink.crossOrigin = 'anonymous';
- const linkBundle = getCrossOriginLinkAndParent(document, link);
- linkBundle.parentNode.insertBefore(newLink, linkBundle.node);
- linkBundle.node.remove();
- }
-}
-
export const getCrossDomainCSSRules = async function(document) {
const rulesList = [];
for (let i = 0; i < document.styleSheets.length; i++) {
// in Chrome, the external CSS files are empty when the page is directly loaded from disk
let rules = [];
- let isSafari = false;
try {
rules = document.styleSheets[i].cssRules;
if (rules === null
@@ -92,15 +77,10 @@ export const getCrossDomainCSSRules = async function(document) {
&& !document.styleSheets[i].href.includes(document.styleSheets[i].ownerNode.baseURI)
&& !document.styleSheets[i].ownerNode.crossOrigin) {
rules = [];
- isSafari = true;
throw new TypeError('on Safari, the CORS cssRule Exception will be ignored and return null, which should be an error');
}
} catch (err) {
- if (isSafari) {
- enableSafariCrossOriginOnLinkAsync(document, document.styleSheets[i].href);
- } else {
await enableCrossOriginOnLinkAsync(document, document.styleSheets[i].href);
- }
i--;
}
for (let j = 0; j < rules.length; j++) {
| 4 |
diff --git a/debian/jitsi-meet-prosody.postinst b/debian/jitsi-meet-prosody.postinst @@ -113,7 +113,8 @@ case "$1" in
if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
# prosodyctl takes care for the permissions
- prosodyctl cert generate $JVB_HOSTNAME
+ # echo for using all default values
+ echo | prosodyctl cert generate $JVB_HOSTNAME
ln -sf /var/lib/prosody/$JVB_HOSTNAME.key /etc/prosody/certs/$JVB_HOSTNAME.key
ln -sf /var/lib/prosody/$JVB_HOSTNAME.crt /etc/prosody/certs/$JVB_HOSTNAME.crt
@@ -121,7 +122,8 @@ case "$1" in
if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then
# prosodyctl takes care for the permissions
- prosodyctl cert generate $JICOFO_AUTH_DOMAIN
+ # echo for using all default values
+ echo | prosodyctl cert generate $JICOFO_AUTH_DOMAIN
ln -sf /var/lib/prosody/$JICOFO_AUTH_DOMAIN.key /etc/prosody/certs/$JICOFO_AUTH_DOMAIN.key
ln -sf /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt /etc/prosody/certs/$JICOFO_AUTH_DOMAIN.crt
| 4 |
diff --git a/js/passwordManager/passwordManager.js b/js/passwordManager/passwordManager.js @@ -44,7 +44,12 @@ class Bitwarden {
// obtain a valid Bitwarden-CLI tool path.
async checkIfConfigured() {
this.path = await this._getToolPath()
- return this.path != null
+ if (this.path == null) {
+ return false
+ }
+
+ isCommandValid = await this._checkCommand(this.path)
+ return isCommandValid
}
// Returns current Bitwarden-CLI status. If we have a session key, then
| 7 |
diff --git a/src/utils/staking.js b/src/utils/staking.js @@ -121,9 +121,7 @@ export class Staking {
if (lockupAccount) {
state.accounts.push(lockupAccount)
}
- state.currentAccount = currentAccountId === accountId ? account : lockupAccount
-
- console.log('staking', state)
+ state.currentAccount = (currentAccountId !== accountId && lockupAccount) ? lockupAccount : account
return state
}
| 9 |
diff --git a/app/components/post_list/more_messages/more_messages.tsx b/app/components/post_list/more_messages/more_messages.tsx // See LICENSE.txt for license information.
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {ActivityIndicator, DeviceEventEmitter, Platform, View, ViewToken} from 'react-native';
+import {ActivityIndicator, DeviceEventEmitter, View, ViewToken} from 'react-native';
import Animated, {interpolate, useAnimatedStyle, useSharedValue, withSpring} from 'react-native-reanimated';
+import {useSafeAreaInsets} from 'react-native-safe-area-context';
import {resetMessageCount} from '@actions/local/channel';
import CompassIcon from '@components/compass_icon';
@@ -36,7 +37,7 @@ type Props = {
}
const HIDDEN_TOP = -60;
-const SHOWN_TOP = Platform.select({ios: 50, default: 5});
+const SHOWN_TOP = 5;
const MIN_INPUT = 0;
const MAX_INPUT = 1;
@@ -112,6 +113,7 @@ const MoreMessages = ({
}: Props) => {
const serverUrl = useServerUrl();
const isTablet = useIsTablet();
+ const insets = useSafeAreaInsets();
const pressed = useRef(false);
const resetting = useRef(false);
const initialScroll = useRef(false);
@@ -120,9 +122,11 @@ const MoreMessages = ({
const underlayColor = useMemo(() => `hsl(${hexToHue(theme.buttonBg)}, 50%, 38%)`, [theme]);
const top = useSharedValue(0);
const adjustedShownTop = SHOWN_TOP + (currentCallBarVisible ? CURRENT_CALL_BAR_HEIGHT : 0) + (joinCallBannerVisible ? JOIN_CALL_BAR_HEIGHT : 0);
- const shownTop = isTablet || (isCRTEnabled && rootId) ? 5 : adjustedShownTop;
+ const adjustTop = isTablet || (isCRTEnabled && rootId);
+ const shownTop = adjustTop ? SHOWN_TOP : adjustedShownTop;
const BARS_FACTOR = Math.abs((1) / (HIDDEN_TOP - SHOWN_TOP));
const styles = getStyleSheet(theme);
+
const animatedStyle = useAnimatedStyle(() => ({
transform: [{
translateY: withSpring(interpolate(
@@ -136,13 +140,13 @@ const MoreMessages = ({
[
HIDDEN_TOP,
HIDDEN_TOP,
- shownTop,
- shownTop,
+ shownTop + (adjustTop ? 0 : insets.top),
+ shownTop + (adjustTop ? 0 : insets.top),
],
Animated.Extrapolate.CLAMP,
), {damping: 15}),
}],
- }), [isTablet, shownTop]);
+ }), [shownTop, insets.top, adjustTop]);
// Due to the implementation differences "unreadCount" gets updated for a channel on reset but not for a thread.
// So we maintain a localUnreadCount to hide the indicator when the count is reset.
| 1 |
diff --git a/bin/mb b/bin/mb @@ -97,10 +97,11 @@ function getConfig (options) {
// usage: stringify(includeFile)
// note: Trying to make this backwards compatible. However, the intent is to change
// the signature to just require `includeFile`.
-function stringify (filename, includeFile) {
+function stringify (filename, includeFile, data) {
const resolvedPath = makePathInABackwardsCompatibleWay(filename, includeFile);
const contents = fs.readFileSync(resolvedPath, 'utf8'),
rendered = ejs.render(contents, {
+ data: data,
filename: CONFIG_FILE_PATH,
stringify: stringify,
inject: stringify // backwards compatibility
| 11 |
diff --git a/src/views/Accounts/HardwareWallet/Connect.vue b/src/views/Accounts/HardwareWallet/Connect.vue <div class="options-text">
Select the same asset here
</div>
- <div class="dropdown asset-list"
- v-click-away="hideAssetList">
- <button class="btn dropdown-toggle"
- @click="toogleAssetList">
+ <div class="dropdown" v-click-away="hideAssetList">
+ <button class="btn dropdown-toggle" @click="toogleAssetList">
<div class="form" v-if="selectedAsset">
<div class="input-group">
<img
</span>
</div>
</div>
- <ChevronUpIcon v-if="assetsDropdownOpen" />
- <ChevronDownIcon v-else />
+ <ChevronRightIcon :class="{ open: assetsDropdownOpen }" />
</button>
<ul class="dropdown-menu" :class="{ show: assetsDropdownOpen }">
<li v-for="asset in assetList" :key="asset.name">
- <a class="dropdown-item"
- href="#"
- @click="selectAsset(asset)">
- <div class="dropdown-item-asset-item">
+ <a class="dropdown-item" href="#" @click="selectAsset(asset)">
+ <div class="form">
+ <div class="input-group">
<img
:src="getAssetIcon(asset.name)"
class="asset-icon"
/>
- {{ asset }}
+ <span class="input-group-text">
+ {{ asset.label }}
+ </span>
+ </div>
</div>
</a>
</li>
</template>
<script>
import SpinnerIcon from '@/assets/icons/spinner.svg'
-import ChevronDownIcon from '@/assets/icons/chevron_down.svg'
-import ChevronUpIcon from '@/assets/icons/chevron_up.svg'
+import ChevronRightIcon from '@/assets/icons/chevron_right_gray.svg'
import LedgerIcon from '@/assets/icons/ledger_icon.svg'
import { LEDGER_OPTIONS } from '@/utils/ledger-bridge-provider'
import clickAway from '@/directives/clickAway'
@@ -91,8 +89,7 @@ export default {
components: {
SpinnerIcon,
LedgerIcon,
- ChevronDownIcon,
- ChevronUpIcon
+ ChevronRightIcon
},
props: ['selectedAsset', 'loading'],
data () {
@@ -111,7 +108,8 @@ export default {
this.$router.replace('/wallet')
},
selectAsset (asset) {
- this.selectedAsset = asset
+ this.$emit('on-select-asset', asset)
+ this.hideAssetList()
},
toogleAssetList () {
this.assetsDropdownOpen = !this.assetsDropdownOpen
@@ -122,17 +120,17 @@ export default {
},
computed: {
assetList () {
- return LEDGER_OPTIONS
+ return LEDGER_OPTIONS.filter(i => i.name !== this.selectedAsset?.name)
}
}
}
</script>
<style lang="scss">
-
.account-container {
+
.dropdown-toggle {
- padding-left: 0 !important;
+ padding-left: 13px !important;
padding-right: 0 !important;
font-weight: 300;
display: flex;
@@ -147,8 +145,43 @@ export default {
}
svg {
- width: 16px;
margin-left: 4px;
+ height: 16px;
+ &.open {
+ transform: rotate(90deg);
+ }
+ }
+ }
+
+ .dropdown-menu {
+ width: 125px !important;
+ min-width: 0;
+ margin: 0;
+ padding-left: 0 !important;
+ padding-right: 0 !important;
+ overflow: auto;
+ border-radius: 0;
+ padding-bottom: 0;
+ padding-top: 0;
+ border: 1px solid #d9dfe5;
+ box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+
+ .dropdown-item {
+ padding-left: 15px !important;
+ padding-right: 0 !important;
+ font-weight: 300;
+ display: flex;
+ align-items: center;
+ border-bottom: 1px solid $hr-border-color;
+ .input-group-text {
+ margin-left: 5px;
+ }
+
+ &:hover,
+ &.active {
+ background-color: #f0f7f9;
+ color: $color-text-primary;
+ }
}
}
}
| 3 |
diff --git a/examples/search_repos/search_openaire_projects.js b/examples/search_repos/search_openaire_projects.js @@ -117,12 +117,20 @@ function getFunding(foo) {
}
function getOrganisations(project) {
- return deepGet(project, ['rels', 'rel']).map(function (entry) {
+ var rel = deepGet(project, ['rels', 'rel'], [])
+ if (Array.isArray(rel)) {
+ return rel.map(function (entry) {
return {
name: deepGet(entry, ['legalshortname', '$']),
url: deepGet(entry, ['websiteurl', '$'])
}
})
+ } else {
+ return {
+ name: deepGet(rel, ['legalshortname', '$']),
+ url: deepGet(rel, ['websiteurl', '$'])
+ }
+ }
}
function getFundingLevels (result) {
| 1 |
diff --git a/docs/articles/documentation/test-api/built-in-waiting-mechanisms.md b/docs/articles/documentation/test-api/built-in-waiting-mechanisms.md @@ -130,7 +130,7 @@ const emptyLabel = Selector('p').withText('No Data').with({ visibilityCheck: tru
await t.click('#fetch-data');
// Wait with an assertion.
-await t.expect(emptyLabel.exists, '', { timeout: 10000 });
+await t.expect(emptyLabel.exists).ok('', { timeout: 10000 });
// Wait with a selector.
const labelSnapshot = await emptyLabel.with({ timeout: 10000 });
| 1 |
diff --git a/react/src/components/modals/SprkModal.stories.js b/react/src/components/modals/SprkModal.stories.js @@ -12,6 +12,10 @@ export default {
story => <div className="sprk-o-Box">{story()}</div>
],
parameters: {
+ docs: {
+ inlineStories: false,
+ iframeHeight: 450
+ },
subcomponents: {
Mask,
ModalFooter,
| 12 |
diff --git a/lib/ag-solo/chain-cosmos-sdk.js b/lib/ag-solo/chain-cosmos-sdk.js @@ -6,6 +6,8 @@ import djson from 'deterministic-json';
import { createHash } from 'crypto';
import connect from 'lotion-connect';
+const AGORIC_CHAIN_ID = 'agoric';
+
export async function connectToChain(basedir, GCI, rpcAddresses, myAddr, inbound) {
// Each time we read our mailbox from the chain's state, and each time we
// send an outbound message to the chain, we shell out to a one-shot copy
@@ -35,7 +37,7 @@ export async function connectToChain(basedir, GCI, rpcAddresses, myAddr, inbound
function getMailbox() {
const args = ['query', 'swingset', 'mailbox', myAddr,
- '--chain-id', 'agchain', '--output', 'json',
+ '--chain-id', AGORIC_CHAIN_ID, '--output', 'json',
'--home', helperDir,
];
const stdout = execFileSync('ag-cosmos-helper', args);
@@ -105,7 +107,7 @@ export async function connectToChain(basedir, GCI, rpcAddresses, myAddr, inbound
const args = ['tx', 'swingset', 'deliver', myAddr,
JSON.stringify([newMessages, acknum]),
'--from', 'ag-solo', '--yes',
- '--chain-id', 'agchain',
+ '--chain-id', AGORIC_CHAIN_ID,
'--home', helperDir,
];
const password = 'mmmmmmmm\n';
| 4 |
diff --git a/src/helperComponents/SelectDialog.js b/src/helperComponents/SelectDialog.js @@ -70,8 +70,8 @@ export default compose(
} = this.props;
const selectionLength = getRangeLength(
{
- start: from,
- end: to
+ start: Number(from),
+ end: Number(to)
},
sequenceLength
);
@@ -117,7 +117,7 @@ export default compose(
});
}
hideModal();
- tryToRefocusEditor()
+ tryToRefocusEditor();
}}
text="Cancel"
/>
@@ -125,7 +125,7 @@ export default compose(
onClick={handleSubmit(data => {
if (onSubmit) onSubmit(data);
hideModal();
- tryToRefocusEditor()
+ tryToRefocusEditor();
})}
intent={Intent.PRIMARY}
text={`Select ${invalid ? 0 : selectionLength} ${
| 12 |
diff --git a/token-metadata/0xCf8f9555D55CE45a3A33a81D6eF99a2a2E71Dee2/metadata.json b/token-metadata/0xCf8f9555D55CE45a3A33a81D6eF99a2a2E71Dee2/metadata.json "symbol": "CBIX7",
"address": "0xCf8f9555D55CE45a3A33a81D6eF99a2a2E71Dee2",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/challenge/DiscussChallenge.js b/src/components/challenge/DiscussChallenge.js import React from 'react'
import styled from 'styled-components'
-import { Container, Card, Icon, Box, Flex, Text } from '@hackclub/design-system'
+import { Box, Flex, Text } from '@hackclub/design-system'
+import Icon from '@hackclub/icons'
import Sheet from 'components/Sheet'
import DiscussOnSlack from 'components/DiscussOnSlack'
@@ -10,10 +11,10 @@ const Root = styled(Sheet)`
`
const DiscussChallenge = () => (
- <Root maxWidth={36} mt={[3, 4]} p={[2, 3]} bg="pink.0">
+ <Root maxWidth={36} mt={[3, 4]} p={[2, 3]} bg="pink.0" color="pink.6">
<Flex align="center" flex="1 1 auto" mb={[3, 0]}>
- <Icon name="forum" size={48} mr={[2, 3]} color="pink.5" />
- <Box align="left" color="pink.6">
+ <Icon glyph="message-fill" size={48} />
+ <Box align="left" color="pink.6" ml={[2, 3]}>
<Text f={2}>Join the conversation</Text>
<Text f={3} bold>
#challenges
| 14 |
diff --git a/articles/connections/social/line.md b/articles/connections/social/line.md @@ -6,7 +6,6 @@ image: /media/connections/line.png
seo_alias: line
description: Learn how to add login functionality to your app with Line. You will need to generate keys, copy these into your Auth0 settings, and enable the connection.
toc: true
-beta: true
topics:
- authentication
- connections
| 2 |
diff --git a/packages/@uppy/dashboard/src/style.scss b/packages/@uppy/dashboard/src/style.scss .uppy-Dashboard-note {
font-size: 13px;
- line-height: 1.2;
+ line-height: 1.25;
text-align: center;
color: rgba($color-asphalt-gray, 0.8);
- // position: absolute;
- // bottom: 45px;
- // left: 0;
- width: 100%;
+ max-width: 80%;
+ margin: auto;
.uppy-size--md & {
font-size: 16px;
+ line-height: 1.3;
+ max-width: 90%;
}
}
position: relative;
top: 1px;
opacity: 0.9;
+ vertical-align: text-top;
}
.uppy-DashboardItem {
| 1 |
diff --git a/data.js b/data.js @@ -5363,6 +5363,13 @@ module.exports = [
source: "https://raw.githubusercontent.com/reduardo7/xPrototype/master/xprototype.js"
},
{
+ name: "microdi",
+ github: "yavorskiy/microdi",
+ tags: ["dependency", "injection", "di", "es6"],
+ description: "Micro helper for JavaScript dependency injection (DI).",
+ url: "https://github.com/yavorskiy/microdi",
+ source: "https://raw.githubusercontent.com/yavorskiy/microdi/master/index.js"
+ }, {
name: "SkateJS",
github: "skatejs/skatejs",
tags: ["javascript", "web", "component", "components", "custom", "elements", "shadow", "dom", "html", "virtual", "vdom", "jsx", "frp", "functional", "reactive", "programming"],
| 0 |
diff --git a/packages/components/providers/supermap/SuperMapImageryProvider.ts b/packages/components/providers/supermap/SuperMapImageryProvider.ts @@ -165,7 +165,7 @@ class SuperMapImageryProvider {
}
get readyPromise() {
- return this._readyPromise
+ return this._readyPromise.promise
}
get ratio() {
| 1 |
diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php @@ -286,22 +286,20 @@ final class Analytics_4 extends Module
}
return function() use ( $data ) {
- $restore_defer = $this->with_client_defer( true );
- $service = $this->get_service( 'analyticsadmin' );
- $batch = $service->createBatch();
- $datastreams = $service->properties_webDataStreams; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ $requests = array();
foreach ( $data['propertyIDs'] as $property_id ) {
- $batch->add(
- $datastreams->listPropertiesWebDataStreams( self::normalize_property_id( $property_id ) ),
+ $requests[] = new Data_Request(
+ 'GET',
+ 'modules',
+ self::MODULE_SLUG,
+ 'webdatastreams',
+ array( 'propertyID' => $property_id ),
$property_id
);
}
- $restore_defer();
- $results = $batch->execute();
-
- return $results;
+ return $this->get_batch_data( $requests );
};
}
@@ -332,16 +330,6 @@ final class Analytics_4 extends Module
return self::filter_property_with_ids( $response );
case 'GET:webdatastreams':
return array_map( array( self::class, 'filter_webdatastream_with_ids' ), $response->getWebDataStreams() );
- case 'GET:webdatastreams-batch':
- $results = array();
- foreach ( $response as $key => $datastreams ) {
- $property_id = str_replace( 'response-', '', $key );
- $results[ $property_id ] = array_map(
- array( self::class, 'filter_webdatastream_with_ids' ),
- $datastreams->getWebDataStreams()
- );
- }
- return $results;
}
return parent::parse_data_response( $data, $response );
| 14 |
diff --git a/ccxt.browser.js b/ccxt.browser.js browserify --debug ./ccxt.browser.js > ./dist/ccxt.browser.js
*/
-// var adds variables to the global window scope
-// window.ccxt should be defined after this line
-var ccxt = require ('./ccxt')
+// self works in webworkers too
+self.ccxt = require ('./ccxt')
| 1 |
diff --git a/scripts/compile-sounds.sh b/scripts/compile-sounds.sh @@ -15,7 +15,7 @@ rm -f sounds.mp3
clean
-ls {walk,run,jump,land,narutoRun,sonicBoom,food,combat,spells,ui}/*.wav | sort -n >sound-files.txt
+ls {walk,run,jump,land,narutoRun,sonicBoom,food,combat,spells,ui,navi}/*.wav | sort -n >sound-files.txt
set --
while IFS='' read -r item; do
| 0 |
diff --git a/lib/determine-basal/determine-basal.js b/lib/determine-basal/determine-basal.js @@ -108,10 +108,10 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
if (profile.temptargetSet) {
process.stderr.write("Temp Target set, not adjusting with autosens; ");
} else {
- // 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;
+ // with a target of 100, default 0.7-1.2 autosens min/max range would allow a 93-117 target range
+ 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;
if (target_bg == new_target_bg) {
process.stderr.write("target_bg unchanged: "+new_target_bg+"; ");
} else {
| 13 |
diff --git a/packages/openneuro-app/src/scripts/refactor_2021/dataset/mutations/delete-file.jsx b/packages/openneuro-app/src/scripts/refactor_2021/dataset/mutations/delete-file.jsx @@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import { gql } from '@apollo/client'
import { Mutation } from '@apollo/client/react/components'
-import WarnButton from '../../../common/forms/warn-button.jsx'
+import { WarnButton } from '@openneuro/components/warn-button'
const DELETE_FILE = gql`
mutation deleteFiles($datasetId: ID!, $files: [DeleteFile]) {
@@ -17,9 +17,8 @@ const DeleteFile = ({ datasetId, path, filename }) => (
<WarnButton
message=""
icon="fa-trash"
- warn={true}
className="edit-file"
- action={cb => {
+ onConfirmedClick={cb => {
deleteFiles({
variables: { datasetId, files: [{ path, filename }] },
}).then(() => {
| 4 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
This project mirrors major Elm versions. So version 0.18.\* of this project will
be compatible with Elm 0.18.\*.
+## 0.19.1-revision4 - 2020-09-18
+
+### Fixed
+
+- The `--compiler` command line flag now correctly finds elm executables on your PATH (see [#438](https://github.com/rtfeldman/node-test-runner/pull/438)).
+- We have hugely slimmed down the reproduction instructions so that the test runner no longer prints hundreds of test file paths to the console (see issue [#431](https://github.com/rtfeldman/node-test-runner/issues/431) and fix [#432](https://github.com/rtfeldman/node-test-runner/pull/432)).
+
+### Performance
+
+- A whole host of spring cleaning that streamlines the test runner. (see [#425](https://github.com/rtfeldman/node-test-runner/pull/425)).
+
## 0.19.1-revision3 - 2021-01-10
### Fixed
| 3 |
diff --git a/src/components/Cluster/KubernetesTableShow/index.js b/src/components/Cluster/KubernetesTableShow/index.js @@ -363,7 +363,6 @@ export default class KubernetesClusterShow extends PureComponent {
disabled:
record.state !== 'running' ||
linkedClusters.get(record.cluster_id) ||
- record.rainbond_init ||
(record.parameters && record.parameters.DisableRainbondInit), // Column configuration not to be checked
name: record.name,
title: record.parameters && record.parameters.Message
| 1 |
diff --git a/public/javascripts/LabelMap.js b/public/javascripts/LabelMap.js @@ -108,10 +108,10 @@ function LabelMap(_, $) {
*/
function initializeNeighborhoodPolygons(map) {
var neighborhoodPolygonStyle = {
- color: 'red',
- weight: 3,
- opacity: 0.25,
- fillColor: "#ccc",
+ color: '#888',
+ weight: 2,
+ opacity: 0.80,
+ fillColor: "#808080",
fillOpacity: 0.1
},
layers = [],
| 3 |
diff --git a/OurUmbraco.Site/Views/Textpage.cshtml b/OurUmbraco.Site/Views/Textpage.cshtml @{
Layout = "~/Views/Master.cshtml";
- var isCommunityTextPage = Model.Content.AncestorOrSelf(2).DocumentTypeAlias == "Community2";
+ var isCommunityTextPage = Model.Content.AncestorOrSelf(2).DocumentTypeAlias == "communityHub";
}
| 4 |
diff --git a/tests/e2e/specs/modules/analytics/setup-with-account-no-tag.test.js b/tests/e2e/specs/modules/analytics/setup-with-account-no-tag.test.js @@ -175,19 +175,19 @@ describe( 'setting up the Analytics module with an existing account and no exist
await expect( page ).toMatchElement( 'button[disabled]', { text: /configure analytics/i } );
// Select Test Account A
+ await step(
+ 'select account A',
+ async () => {
await expect( page ).toClick( '.googlesitekit-analytics__select-account .mdc-select__selected-text' );
await expect( page ).toClick( '.mdc-menu-surface--open .mdc-list-item', { text: /test account a/i } );
// See the selects populate
await expect( page ).toMatchElement( '.mdc-select__selected-text', { text: /test account a/i } );
- await expect( page ).toMatchElement( '.mdc-select__selected-text', { text: /test property x/i } );
- await expect( page ).toMatchElement( '.mdc-select__selected-text', { text: /test profile x/i } );
-
- await expect( page ).toClick( '.mdc-select', { text: /test property x/i } );
- await expect( page ).toClick( '.mdc-menu-surface--open .mdc-list-item', { text: /set up a new property/i } );
-
+ // Property and profile dropdowns should select "Set up a new property/view" options because there is no property associated with the current reference URL.
await expect( page ).toMatchElement( '.mdc-select__selected-text', { text: /set up a new property/i } );
await expect( page ).toMatchElement( '.mdc-select__selected-text', { text: /set up a new view/i } );
+ },
+ );
// Intentionally does not submit to trigger property & profile creation requests.
} );
| 1 |
diff --git a/src/client/js/components/Admin/Customize/CustomizeFunctionSetting.jsx b/src/client/js/components/Admin/Customize/CustomizeFunctionSetting.jsx @@ -125,10 +125,10 @@ class CustomizeFunctionSetting extends React.Component {
<span className="float-left">{value.pageLimitation}</span>
</DropdownToggle>
<DropdownMenu className="dropdown-menu" role="menu">
- {value.dropdownMenu.map((v) => {
+ {value.dropdownMenu.map((num) => {
return (
- <DropdownItem key={v} role="presentation" onClick={() => { value.switchPageListLimitation(v) }}>
- <a role="menuitem">{v}</a>
+ <DropdownItem key={num} role="presentation" onClick={() => { value.switchPageListLimitation(num) }}>
+ <a role="menuitem">{num}</a>
</DropdownItem>
);
})}
| 10 |
diff --git a/src/components/appNavigation/stackNavigation.js b/src/components/appNavigation/stackNavigation.js @@ -4,11 +4,13 @@ import { ScrollView } from 'react-native'
import { Button } from 'react-native-paper'
import { createNavigator, SwitchRouter, SceneView, Route } from '@react-navigation/core'
import { Helmet } from 'react-helmet'
-
+import logger from '../../lib/logger/pino-logger'
import NavBar from './NavBar'
import { CustomButton, type ButtonProps } from '../common'
import { scrollableContainer } from '../common/styles'
+const log = logger.child({ from: 'stackNavigation' })
+
/**
* getComponent gets the component and props and returns the same component except when
* shouldNavigateToComponent is present in component and not complaining
@@ -45,13 +47,16 @@ class AppView extends Component<{ descriptors: any, navigation: any, navigationC
* Pops from stack
* If there is no screen on the stack navigates to initial screen on stack (goToRoot)
* If we are currently in the first screen go to ths screen that created the stack (goToParent)
+ * we can use this to navigate back to previous screen with adding new params
+ *
+ * @param {object} params new params to add to previous screen screenState
*/
- pop = () => {
+ pop = (params?: any) => {
const { navigation } = this.props
const nextRoute = this.state.stack.pop()
if (nextRoute) {
this.setState(state => {
- return { currentState: nextRoute.state }
+ return { currentState: { ...nextRoute.state, ...params, route: nextRoute.route } }
})
navigation.navigate(nextRoute.route)
} else if (navigation.state.index !== 0) {
@@ -78,7 +83,7 @@ class AppView extends Component<{ descriptors: any, navigation: any, navigationC
state: state.currentState
}
],
- currentState: params
+ currentState: { ...params, route }
}
},
state => navigation.navigate(nextRoute)
@@ -128,6 +133,12 @@ class AppView extends Component<{ descriptors: any, navigation: any, navigationC
this.setState(state => ({ currentState: { ...state.currentState, ...data } }))
}
+ // shouldComponentUpdate(nextProps: any, nextState: any) {
+ // return (
+ // this.props.navigation.state.index !== nextProps.navigation.state.index ||
+ // this.state.currentState.route !== nextState.currentState.route
+ // )
+ // }
render() {
const { descriptors, navigation, navigationConfig, screenProps: incomingScreenProps } = this.props
const activeKey = navigation.state.routes[navigation.state.index].key
@@ -144,6 +155,7 @@ class AppView extends Component<{ descriptors: any, navigation: any, navigationC
screenState: this.state.currentState,
setScreenState: this.setScreenState
}
+ log.info('stackNavigation Render: FIXME rerender', activeKey, this.props, this.state)
const Component = getComponent(descriptor.getComponent(), { screenProps })
const pageTitle = title || activeKey
return (
| 0 |
diff --git a/Projects/Contributions/UI/Spaces/Contributions-Space/ContributionsPage.js b/Projects/Contributions/UI/Spaces/Contributions-Space/ContributionsPage.js @@ -89,7 +89,7 @@ function newContributionsContributionsPage() {
}
if (thisObject.githubToken === undefined) {
- thisObject.githubUsername = "Enter your Github Token here"
+ thisObject.githubToken = "Enter your Github Token here"
}
document.getElementById('username-input').value = thisObject.githubUsername
document.getElementById('token-input').value = thisObject.githubToken
@@ -291,6 +291,12 @@ function newContributionsContributionsPage() {
messageArray.set(repoName, messageToSend)
}
+ // Make sure Github credentials have been filled out
+ if (thisObject.githubUsername === "Enter your Github Username here" || thisObject.githubToken === "Enter your Github Token here") {
+ setCommandStatus("No Github Credentials! Please add them and try again.")
+ return
+ }
+
setCommandStatus("Contributing all changes....")
httpRequest(
undefined,
@@ -331,6 +337,12 @@ function newContributionsContributionsPage() {
messageToSend = "This is my contribution to Superalgos"
}
+ // Make sure Github credentials have been filled out
+ if (thisObject.githubUsername === "Enter your Github Username here" || thisObject.githubToken === "Enter your Github Token here") {
+ setCommandStatus("No Github Credentials! Please add them and try again.")
+ return
+ }
+
setCommandStatus("Contributing changes....")
httpRequest(
undefined,
| 9 |
diff --git a/packages/api-explorer/src/lib/get-auth.js b/packages/api-explorer/src/lib/get-auth.js @@ -10,7 +10,7 @@ function getKey(user, scheme) {
}
}
-function getAuth(user, scheme, selectedApp = false) {
+function getSingle(user, scheme = {}, selectedApp = false) {
if (user.keys) {
if (selectedApp) return getKey(user.keys.find(key => key.name === selectedApp), scheme);
return getKey(user.keys[0], scheme);
| 10 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.59.0",
+ "version": "0.60.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/test/unit/specs/store/user.spec.js b/test/unit/specs/store/user.spec.js @@ -13,8 +13,7 @@ describe(`Module: User`, () => {
let accounts = [
{
address: `tb1zg69v7yszg69v7yszg69v7yszg69v7ysd8ep6q`,
- name: `ACTIVE_ACCOUNT`,
- password: `1234567890`
+ name: `ACTIVE_ACCOUNT`
}
]
@@ -26,7 +25,6 @@ describe(`Module: User`, () => {
it(`should default to signed out state`, () => {
expect(store.state.user.signedIn).toBe(false)
- expect(store.state.user.password).toBe(null)
expect(store.state.user.account).toBe(null)
expect(store.state.user.address).toBe(null)
})
@@ -153,7 +151,6 @@ describe(`Module: User`, () => {
await store.dispatch(`signIn`, { password, account })
store.dispatch(`signOut`)
expect(store.state.user.account).toBe(null)
- expect(store.state.user.password).toBe(null)
expect(store.state.user.signedIn).toBe(false)
// hide login
| 3 |
diff --git a/src/scripts/interactive-video.js b/src/scripts/interactive-video.js @@ -2056,6 +2056,13 @@ InteractiveVideo.prototype.resizeMobileView = function () {
// Close dialog because we can not know if it will turn into a poster
if (this.dnb && this.dnb.dialog && !this.hasUncompletedRequiredInteractions()) {
this.dnb.dialog.close(true);
+
+ // Reset the image width and height so that it can scale when container is resized
+ var $img = $('.h5p-dialog', this.$container).find('img');
+ $img.css({
+ width: '',
+ height: ''
+ });
}
this.$container.removeClass('mobile');
this.isMobileView = false;
| 9 |
diff --git a/viewer/js/config/viewer.js b/viewer/js/config/viewer.js @@ -167,7 +167,7 @@ define([
// 3 'mode' options: MODE_SNAPSHOT = 0, MODE_ONDEMAND = 1, MODE_SELECTION = 2
operationalLayers: [{
type: 'feature',
- url: 'https://services1.arcgis.com/6bXbLtkf4y11TosO/arcgis/rest/services/Restaurants/FeatureServer/0',
+ url: 'https://services.arcgis.com/doC3DvW5p9jGtDST/arcgis/rest/services/RestaurantInspections_April2018/FeatureServer/0/',
title: i18n.viewer.operationalLayers.restaurants,
options: {
id: 'restaurants',
@@ -176,7 +176,7 @@ define([
outFields: ['*'],
featureReduction: has('phone') ? null : {
type: 'cluster',
- clusterRadius: 60
+ clusterRadius: 10
},
mode: 0
},
| 14 |
diff --git a/src/components/general/world-objects-list/ComponentEditor.jsx b/src/components/general/world-objects-list/ComponentEditor.jsx @@ -29,7 +29,7 @@ export const ComponentEditor = () => {
if ( typeof component.value === 'number' ) type = 'number';
if ( typeof component.value === 'boolean' ) type = 'bool';
- newComponents.push({ key: component.key, value: ( type === 'json' ? JSON.stringify( component.value ) : component.value ), type: component.type ?? type, error: component.error });
+ newComponents.push({ key: component.key, value: ( type === 'json' ? JSON.stringify( component.value ) : component.value ), type: component.type ?? type, _componentEditorError: component._componentEditorError });
});
@@ -37,12 +37,18 @@ export const ComponentEditor = () => {
};
+ const cleanUp = () => {
+ selectedApp.components.forEach( ( component ) => {
+ delete component._componentEditorError;
+ });
+ }
+
const validateValues = () => {
for ( let i = 0; i < selectedApp.components.length; i ++ ) {
const value = components[ i ].value;
- selectedApp.components[ i ].error = false;
+ selectedApp.components[ i ]._componentEditorError = false;
switch(components[i].type) {
case 'number':
@@ -50,7 +56,7 @@ export const ComponentEditor = () => {
const parsedValue = parseFloat( components[ i ].value );
if ( isNaN(parsedValue) ) {
- components[ i ].error = true;
+ components[ i ]._componentEditorError = true;
continue;
}
@@ -68,7 +74,7 @@ export const ComponentEditor = () => {
selectedApp.components[ i ].value = JSON.parse( value );
} catch ( err ) {
selectedApp.components[ i ].value = value;
- selectedApp.components[ i ].error = true;
+ selectedApp.components[ i ]._componentEditorError = true;
}
break;
@@ -134,8 +140,6 @@ export const ComponentEditor = () => {
const handleCheckboxChange = ( key, value ) => {
- console.log("change checkbox", key, value)
-
for ( let i = 0; i < selectedApp.components.length; i ++ ) {
if ( selectedApp.components[ i ].key !== key ) continue;
@@ -208,8 +212,20 @@ export const ComponentEditor = () => {
syncComponentsList();
+ return () => {
+ // cleanup the object being edited when the app is switched
+ cleanUp();
+ }
+
}, [ selectedApp ] );
+ useEffect(()=>{
+ return ()=>{
+ // cleanup the object being edited when the editior is closed
+ cleanUp();
+ }
+ },[]);
+
//
return (
@@ -239,10 +255,10 @@ export const ComponentEditor = () => {
}
{
{
- 'number': <input type="number" className={ classNames( styles.itemValue, ( isEditable && component.error ? styles.valueError : null ) ) } disabled={ ! isEditable } value={ component.value } onChange={ handleValueInputChange.bind( this, component.key ) } />,
- 'bool': <input type="checkbox" defaultChecked={!!component.value} className={ classNames( styles.itemValue, ( isEditable && component.error ? styles.valueError : null ) ) } disabled={ ! isEditable } onChange={ (e)=>handleCheckboxChange(component.key, e.target.checked ? true : false) } />,
- 'string': <input type="text" className={ classNames( styles.itemValue, ( isEditable && component.error ? styles.valueError : null ) ) } disabled={ ! isEditable } value={ component.value } onChange={ handleValueInputChange.bind( this, component.key ) } />,
- 'json': <input type="text" className={ classNames( styles.itemValue, ( isEditable && component.error ? styles.valueError : null ) ) } disabled={ ! isEditable } value={ component.value } onChange={ handleValueInputChange.bind( this, component.key ) } />
+ 'number': <input type="number" className={ classNames( styles.itemValue, ( isEditable && component._componentEditorError ? styles.valueError : null ) ) } disabled={ ! isEditable } value={ component.value } onChange={ handleValueInputChange.bind( this, component.key ) } />,
+ 'bool': <input type="checkbox" defaultChecked={!!component.value} className={ classNames( styles.itemValue, ( isEditable && component._componentEditorError ? styles.valueError : null ) ) } disabled={ ! isEditable } onChange={ (e)=>handleCheckboxChange(component.key, e.target.checked ? true : false) } />,
+ 'string': <input type="text" className={ classNames( styles.itemValue, ( isEditable && component._componentEditorError ? styles.valueError : null ) ) } disabled={ ! isEditable } value={ component.value } onChange={ handleValueInputChange.bind( this, component.key ) } />,
+ 'json': <input type="text" className={ classNames( styles.itemValue, ( isEditable && component._componentEditorError ? styles.valueError : null ) ) } disabled={ ! isEditable } value={ component.value } onChange={ handleValueInputChange.bind( this, component.key ) } />
}[component.type]
}
{
| 2 |
diff --git a/package.json b/package.json "colors": "^1.1.2",
"csv-parse": "1.1.7",
"express": "^4.13.4",
- "hospitalrun": "0.9.17",
+ "hospitalrun": "0.9.18",
"hospitalrun-dblisteners": "0.9.6",
"hospitalrun-server-routes": "0.9.10",
"moment": "^2.15.2",
| 3 |
diff --git a/src/sass/App.scss b/src/sass/App.scss @@ -118,6 +118,13 @@ body {
&:hover {
background-color: #4a4f52;
}
+
+ &:focus {
+ z-index: 1;
+ outline: 0 none;
+ transition: box-shadow .3s;
+ box-shadow: inset 0 0 0 0.2em #00c4e8;
+ }
}
> ul {
@@ -172,6 +179,13 @@ body {
cursor: pointer;
}
+ &:focus {
+ z-index: 1;
+ outline: 0 none;
+ transition: box-shadow .3s;
+ box-shadow: inset 0 0 0 0.2em #00c4e8;
+ }
+
img {
width: 32px;
vertical-align: middle;
@@ -240,7 +254,7 @@ body {
cursor: pointer;
user-select: none;
text-align: left;
- margin: 0;
+ margin: 0 0 0.2em 0;
border: none;
border-top: solid 1px #e3e9ea;
cursor: pointer;
@@ -249,6 +263,13 @@ body {
background-color: #eeeeee;
}
+ &:focus {
+ z-index: 1;
+ outline: 0 none;
+ transition: box-shadow .3s;
+ box-shadow: 0 0 0 0.2em #00c4e8;
+ }
+
span {
font-size: 16px;
vertical-align: middle;
@@ -335,6 +356,13 @@ body {
background-color: #eeeeee;
}
+ &:focus {
+ z-index: 1;
+ outline: 0 none;
+ transition: box-shadow .3s;
+ box-shadow: 0 0 0 0.2em #00c4e8;
+ }
+
.menuitem-badge {
background: #00b09b; /* fallback for old browsers */
background: -webkit-linear-gradient(to bottom, #96c93d, #00b09b); /* Chrome 10-25, Safari 5.1-6 */
| 7 |
diff --git a/browsers/duckduckgo.safariextension/Info.plist b/browsers/duckduckgo.safariextension/Info.plist <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleShortVersionString</key>
- <string>2018.7.18</string>
+ <string>2018.8.9</string>
<key>CFBundleVersion</key>
- <string>51</string>
+ <string>52</string>
<key>Chrome</key>
<dict>
<key>Database Quota</key>
| 3 |
diff --git a/src/client/js/components/Admin/Users/UserInviteModal.jsx b/src/client/js/components/Admin/Users/UserInviteModal.jsx @@ -124,7 +124,7 @@ class UserInviteModal extends React.Component {
{userList.map((user) => {
const copyText = `Email:${user.email} Password:${user.password} `;
return (
- <CopyToClipboard text={copyText} onCopy={this.showToaster}>
+ <CopyToClipboard key={user.email} text={copyText} onCopy={this.showToaster}>
<li key={user.email} className="btn">Email: <strong className="mr-3">{user.email}</strong> Password: <strong>{user.password}</strong></li>
</CopyToClipboard>
);
| 12 |
diff --git a/module/actor-sheet.js b/module/actor-sheet.js @@ -1118,41 +1118,30 @@ export class GurpsActorSheet extends ActorSheet {
let otf = event.currentTarget.dataset.otf
if (isDamageRoll) {
- if (isGM) {
- this.resolveDamageRoll(event, otf)
- }
+ this.resolveDamageRoll(event, otf, isGM)
} else {
GURPS.whisperOtfToOwner(event.currentTarget.dataset.otf, event, !isDamageRoll, this.actor) // Can't blind roll damages (yet)
}
}
- async resolveDamageRoll(event, otf) {
+ async resolveDamageRoll(event, otf, isGM) {
let title = game.i18n.localize('GURPS.RESOLVEDAMAGETitle')
let prompt = game.i18n.localize('GURPS.RESOLVEDAMAGEPrompt')
let quantity = game.i18n.localize('GURPS.RESOLVEDAMAGEQuantity')
let sendTo = game.i18n.localize('GURPS.RESOLVEDAMAGESendTo')
let multiple = game.i18n.localize('GURPS.RESOLVEDAMAGEMultiple')
- let dlg = new Dialog({
- title: `${title}`,
- content: `
- <div style='display: flex; flex-flow: column nowrap; place-items: center;'>
- <p style='font-size: large;'><strong>${otf}</strong></p>
- <p>${prompt}</p>
- <div style='display: inline-grid; grid-template-columns: auto 1fr; place-items: center; gap: 4px'>
- <label>${quantity}</label>
- <input type='text' id='number-rolls' class='digits-only' style='text-align: center;' value='1'>
- </div>
- <p/>
- </div>
- `,
- buttons: {
- send: {
+ let buttons = {}
+
+ if (isGM) {
+ buttons.send = {
icon: '<i class="fas fa-paper-plane"></i>',
label: `${sendTo}`,
callback: () => GURPS.whisperOtfToOwner(event.currentTarget.dataset.otf, event, !isDamageRoll, this.actor) // Can't blind roll damages (yet)
- },
- multiple: {
+ }
+ }
+
+ buttons.multiple = {
icon: '<i class="fas fa-clone"></i>',
label: `${multiple}`,
callback: html => {
@@ -1165,7 +1154,21 @@ export class GurpsActorSheet extends ActorSheet {
this._onClickRoll(event, targets)
}
}
- },
+
+ let dlg = new Dialog({
+ title: `${title}`,
+ content: `
+ <div style='display: flex; flex-flow: column nowrap; place-items: center;'>
+ <p style='font-size: large;'><strong>${otf}</strong></p>
+ <p>${prompt}</p>
+ <div style='display: inline-grid; grid-template-columns: auto 1fr; place-items: center; gap: 4px'>
+ <label>${quantity}</label>
+ <input type='text' id='number-rolls' class='digits-only' style='text-align: center;' value='1'>
+ </div>
+ <p/>
+ </div>
+ `,
+ buttons: buttons,
default: 'send'
})
dlg.render(true)
| 11 |
diff --git a/physics-manager.js b/physics-manager.js @@ -166,6 +166,12 @@ physicsManager.addCookedConvexGeometry = (buffer, position, quaternion, scale) =
physicsManager.getGeometryForPhysicsId = physicsId => physx.physxWorker.getGeometryPhysics(physx.physics, physicsId);
physicsManager.getBoundingBoxForPhysicsId = (physicsId, box) => physx.physxWorker.getBoundsPhysics(physx.physics, physicsId, box);
+physicsManager.enableActor = physicsObject => {
+ physx.physxWorker.enableActorPhysics(physx.physics, physicsObject.physicsId);
+};
+physicsManager.disableActor = physicsObject => {
+ physx.physxWorker.disableActorPhysics(physx.physics, physicsObject.physicsId);
+};
physicsManager.disableGeometry = physicsObject => {
physx.physxWorker.disableGeometryPhysics(physx.physics, physicsObject.physicsId);
};
| 0 |
diff --git a/physics-manager.js b/physics-manager.js @@ -37,7 +37,7 @@ const _makePhysicsObject = (physicsId, position, quaternion, scale) => {
physicsObject.scale.copy(scale);
physicsObject.updateMatrixWorld();
physicsObject.physicsId = physicsId;
- physicsObject.detached = false;
+ physicsObject.detached = false; // detached physics objects do not get updated when the owning app moves
physicsObject.collided = false;
physicsObject.grounded = false;
return physicsObject;
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.