code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/docs/content/intro/StepByStep.js b/docs/content/intro/StepByStep.js @@ -64,7 +64,7 @@ export const StepByStep = <cx>
follow the recommended Cx source layout) and it will create an initial `project.json`
file for our application.
- Next, we need to install prerequisite packages, by running `npm install` commands.
+ Next, we need to install prerequisite packages, by running `npm install` command.
Alternatevly, if you already cloned the project from github, just run the `npm install` command
without any other parameters.
<Content name="code">
@@ -75,10 +75,7 @@ export const StepByStep = <cx>
npm install cx cx-react --save
- npm install webpack@beta webpack-dev-server@beta babel-core babel-loader
- babel-plugin-syntax-jsx babel-preset-cx-env css-loader
- extract-text-webpack-plugin@beta file-loader html-webpack-plugin
- json-loader node-sass sass-loader style-loader --save-dev
+ npm install webpack webpack-dev-server babel-core babel-loader babel-plugin-syntax-jsx babel-preset-cx-env css-loader extract-text-webpack-plugin file-loader html-webpack-plugin json-loader node-sass sass-loader style-loader --save-dev
`}</CodeSnippet>
</Content>
| 3 |
diff --git a/README.md b/README.md @@ -64,9 +64,9 @@ You can use as many operations as you like in simple or complex ways. Some examp
- Highlighting
- When you highlight text in the input or output, the offset and length values will be displayed and, if possible, the corresponding data will be highlighted in the output or input respectively (example: [highlight the word 'question' in the input to see where it appears in the output][10]).
- Save to file and load from file
- - You can save the output to a file at any time or load a file by dragging and dropping it into the input field (note that files larger than about 500kb may cause your browser to hang or even crash due to the way that browsers handle large amounts of textual data).
+ - You can save the output to a file at any time or load a file by dragging and dropping it into the input field. Files up to around 500MB are supported (depending on your browser), however some operations may take a very long time to run over this much data.
- CyberChef is entirely client-side
- - It should be noted that none of your input or recipe configuration is ever sent to the CyberChef web server - all processing is carried out within your browser, on your own computer.
+ - It should be noted that none of your recipe configuration or input (either text or files) is ever sent to the CyberChef web server - all processing is carried out within your browser, on your own computer.
- Due to this feature, CyberChef can be compiled into a single HTML file. You can download this file and drop it into a virtual machine, share it with other people, or use it independently on your desktop.
| 3 |
diff --git a/src/basic_crawler.js b/src/basic_crawler.js @@ -260,7 +260,21 @@ class BasicCrawler {
await source.markRequestHandled(request);
this.handledRequestsCount++;
} catch (err) {
+ try {
+ // TODO Errors thrown from within the error handler will in most cases terminate
+ // the crawler because runTaskFunction errors kill autoscaled pool
+ // which is correct, since in this case, RequestQueue is probably in an unknown
+ // state. However, it's also troublesome when RequestQueue is overloaded
+ // since it may actually cause the crawlers to crash.
await this._requestFunctionErrorHandler(err, request, source);
+ } catch (secondaryError) {
+ log.exception(secondaryError, 'BasicCrawler: runTaskFunction error handler threw an exception. '
+ + 'This places the RequestQueue into an unknown state and crawling will be terminated. '
+ + 'This most likely happened due to RequestQueue being overloaded and unable to handle '
+ + 'Request updates even after exponential backoff. Try limiting the concurrency '
+ + 'of the run by using the maxConcurrency option.');
+ throw secondaryError;
+ }
}
}
| 7 |
diff --git a/utils/helper.js b/utils/helper.js @@ -5,6 +5,12 @@ var crypto = require('crypto');
module.exports = function (config_filename, logger) {
var helper = {};
+
+ // default config file name
+ if (!config_filename) {
+ config_filename = "marbles1.json";
+ }
+
var config_path = path.join(__dirname, '../config/' + config_filename);
helper.config = require(config_path);
var creds_path = path.join(__dirname, '../config/' + helper.config.cred_filename);
| 4 |
diff --git a/lib/node_modules/@stdlib/error/tools/database/test/test.js b/lib/node_modules/@stdlib/error/tools/database/test/test.js // MODULES //
var tape = require( 'tape' );
+var objectKeys = require( '@stdlib/utils/keys' );
var isPlainObject = require( '@stdlib/assert/is-plain-object' );
-var image = require( './../lib' );
+var database = require( './../lib' );
// TESTS //
tape( 'main export is a function', function test( t ) {
t.ok( true, __filename );
- t.equal( typeof image, 'function', 'main export is a function' );
+ t.equal( typeof database, 'function', 'main export is a function' );
t.end();
});
tape( 'the function returns an object mappping error codes to error messages', function test( t ) {
- var data = image();
+ var data = database();
+ var keys = objectKeys( data );
t.equal( isPlainObject( data ), true, 'returns a plain object' );
+ t.equal( keys.length > 0, true, 'the returned object has keys' );
t.end();
});
| 10 |
diff --git a/src/lib/sharedUtils.js b/src/lib/sharedUtils.js @@ -64,6 +64,7 @@ let locale = require(`date-fns/locale/${(process.env.LOCALE || 'en_US').replace(
)}`);
// Svelte fix: babel interprets default automatically, but svelte doesn't.
+/* istanbul ignore next */
locale = locale.default ? locale.default : locale;
export function format(date, format = 'Pp', config = {}) {
| 8 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -123,13 +123,14 @@ class App extends THREE.Object3D {
use: true,
});
}
- hit(damage) {
+ /* hit(damage) {
+ console.log('hit', new Error().stack);
this.dispatchEvent({
type: 'hit',
hp: 100,
totalHp: 100,
});
- }
+ } */
willDieFrom(damage) {
return false;
}
| 2 |
diff --git a/requirements.txt b/requirements.txt asn1crypto==0.24.0
astroid==1.6.0
certifi==2018.1.18
-cffi==1.11.5
+cffi==1.14.2
chardet==3.0.4
coverage==4.5.1
cryptography==2.5
@@ -24,7 +24,7 @@ lazy-object-proxy==1.3.1
mccabe==0.6.1
packaging==16.8
Paste==2.0.3
-psycopg2==2.7.3.2
+psycopg2==2.8.6
pycodestyle==2.3.1
pycparser==2.18
pycryptodomex==3.4.7
| 3 |
diff --git a/learn/configuration/settings.md b/learn/configuration/settings.md @@ -12,7 +12,7 @@ This page describes the **index-level settings** available in Meilisearch and ho
| **[sortableAttributes](/learn/configuration/settings.md#sortable-attributes)** | [Strings] | Attributes to use when [sorting](/learn/advanced/sorting.md) search results | `[]` |
| **[stopWords](/learn/configuration/settings.md#stop-words)** | List of words ignored by Meilisearch when present in search queries | `[]` |
| **[synonyms](/learn/configuration/settings.md#synonyms)** | List of associated words treated similarly | `{}` |
-| **[typoTolerance](/learn/configuration/settings.md#typo-tolerance)** |Typo tolerance settings | `{}` |
+| **[typoTolerance](/learn/configuration/settings.md#typo-tolerance)** | Object containing typo tolerance settings | `{}` |
## Displayed attributes
| 7 |
diff --git a/site/man/rabbitmqctl.8.html b/site/man/rabbitmqctl.8.html </tr>
</table>
<h2 class="Sh" title="Sh" id="DESCRIPTION"><a class="selflink" href="#DESCRIPTION">DESCRIPTION</a></h2>
-RabbitMQ is an implementation of AMQP, the emerging standard for high
- performance enterprise messaging. The RabbitMQ Server is a robust and scalable
- implementation of an AMQP broker.
+RabbitMQ is a multi-protocol open source messaging broker.
<div class="Pp"></div>
<b class="Nm" title="Nm">rabbitmqctl</b> is a command line tool for managing a
RabbitMQ broker. It performs all actions by connecting to one of the broker's
| 4 |
diff --git a/tests/js/jest.config.js b/tests/js/jest.config.js @@ -43,11 +43,6 @@ module.exports = {
moduleNameMapper: {
// New (JSR) modules.
'^googlesitekit-(.+)$': '<rootDir>assets/js/googlesitekit-$1',
- // Old aliases.
- '^SiteKitCore/(.*)$': '<rootDir>assets/js/$1',
- '^GoogleComponents/(.*)$': '<rootDir>assets/js/components/$1',
- '^GoogleUtil/(.*)$': '<rootDir>assets/js/util/$1',
- '^GoogleModules/(.*)$': '<rootDir>assets/js/modules/$1',
// Specific to our tests; makes importing our test utils easier.
'^test-utils$': '<rootDir>tests/js/test-utils',
},
| 2 |
diff --git a/views/components/settings/assets/settings.css b/views/components/settings/assets/settings.css flex-wrap: wrap;
}
#SettingsView #poi-others .desc-buttons > button {
+ margin-top: .25ex;
+ margin-bottom: .25ex;
margin-right: 1em;
}
#SettingsView #poi-others .contributors {
| 14 |
diff --git a/app/src/scripts/nav/navbar.navmenu.jsx b/app/src/scripts/nav/navbar.navmenu.jsx @@ -84,7 +84,7 @@ const NavMenu = ({ profile, scitran, isLoggedIn, loading }) => {
NavMenu.propTypes = {
profile: PropTypes.object,
scitran: PropTypes.object,
- isLoggedIn: PropTypes.object,
+ isLoggedIn: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]),
loading: PropTypes.bool,
}
| 1 |
diff --git a/packages/app/src/components/Page.tsx b/packages/app/src/components/Page.tsx @@ -10,6 +10,7 @@ import dynamic from 'next/dynamic';
import { HtmlElementNode } from 'rehype-toc';
+import { toastSuccess, toastError } from '~/client/util/apiNotification';
import { getOptionsToSave } from '~/client/util/editor';
import {
useIsGuestUser, useCurrentPageTocNode, useShareLinkId,
@@ -124,11 +125,12 @@ class PageSubstance extends React.Component<PageSubstanceProps> {
// const { page, tags } = await pageContainer.save(newMarkdown, this.props.editorMode, optionsToSave);
// logger.debug('success to save');
- // pageContainer.showSuccessToastr();
+ // // Todo: add translation
+ // toastSuccess(t(''));
// }
// catch (error) {
// logger.error('failed to save', error);
- // pageContainer.showErrorToastr(error);
+ // toastError(error);
// }
// finally {
// this.setState({ currentTargetTableArea: null });
@@ -156,11 +158,12 @@ class PageSubstance extends React.Component<PageSubstanceProps> {
// const { page, tags } = await pageContainer.save(newMarkdown, this.props.editorMode, optionsToSave);
// logger.debug('success to save');
- // pageContainer.showSuccessToastr();
+ // // Todo: add translation
+ // toastSuccess(t(''));
// }
// catch (error) {
// logger.error('failed to save', error);
- // pageContainer.showErrorToastr(error);
+ // toastError(error);
// }
// finally {
// this.setState({ currentTargetDrawioArea: null });
| 14 |
diff --git a/common/lib/types/stats.ts b/common/lib/types/stats.ts @@ -233,7 +233,7 @@ class PushStats {
constructor(values?: PushValues) {
this.messages = (values && values.messages) || 0;
- let notifications = values && values.notifications;
+ const notifications = values && values.notifications;
this.notifications = {
invalid: notifications && notifications.invalid || 0,
attempted: notifications && notifications.attempted || 0,
@@ -300,7 +300,7 @@ class Stats extends MessageDirections {
this.intervalId = (values && values.intervalId) || undefined;
}
- static fromValues(values: StatsValues) {
+ static fromValues(values: StatsValues): Stats {
return new Stats(values);
}
}
| 7 |
diff --git a/lib/build/files/webpack_files.js b/lib/build/files/webpack_files.js @@ -132,16 +132,27 @@ var files = {
account: {
page: 'account',
stylesheets: [
- '/stylesheets/common_new.css',
- '/stylesheets/header.css'
+ '/stylesheets/common_new.css'
],
scripts: [
'/javascripts/common.js',
'/javascripts/common_vendor.js',
- '/javascripts/account.js',
- '/javascripts/header.js'
+ ],
+ feature_flags: {
+ 'new-dashboard-feature': {
+ stylesheets: [
+ '/stylesheets/header.css',
+ '/stylesheets/common_new.css'
+ ],
+ scripts: [
+ '/javascripts/header.js',
+ '/javascripts/common.js',
+ '/javascripts/common_vendor.js',
+ '/javascripts/account.js'
]
}
+ }
+ }
};
module.exports = files;
| 12 |
diff --git a/example/src/components/YoYo.js b/example/src/components/YoYo.js @@ -34,18 +34,19 @@ class YoYo extends React.Component {
this.state = {
zoomLevel: 12,
};
-
- this.onUpdateZoomLevel = this.onUpdateZoomLevel.bind(this);
}
componentDidMount () {
- this.map.zoomTo(this.state.zoomLevel, 8000);
+ this.cameraLoop();
}
- onUpdateZoomLevel () {
- const nextZoomLevel = this.state.zoomLevel === 12 ? 1 : 12;
+ cameraLoop () {
+ requestAnimationFrame(async () => {
+ await this.map.zoomTo(this.state.zoomLevel, 8000);
+ const nextZoomLevel = this.state.zoomLevel === 12 ? 2 : 12;
this.setState({ zoomLevel: nextZoomLevel });
- this.map.zoomTo(nextZoomLevel, 8000);
+ this.cameraLoop();
+ });
}
render () {
@@ -54,7 +55,6 @@ class YoYo extends React.Component {
<MapboxGL.MapView
zoomLevel={2}
centerCoordinate={SF_OFFICE_COORDINATE}
- onSetCameraComplete={this.onUpdateZoomLevel}
ref={(ref) => this.map = ref}
style={sheet.matchParent}
styleURL={MapboxGL.StyleURL.Dark}>
| 3 |
diff --git a/engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/BitmapText.java b/engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/BitmapText.java package com.codingame.gameengine.module.entities;
+import java.util.Objects;
+
/**
* Represents a label on screen, you can use any bitmap font in your asset folder as it's font.
*/
@@ -32,8 +34,11 @@ public class BitmapText extends TextBasedEntity<BitmapText> {
* @param fontFamily
* the size for the font of this <code>BitmapText</code>.
* @return this <code>BitmapText</code>.
+ * @exception NullPointerException
+ * if fontFamily is null.
*/
public BitmapText setFont(String fontFamily) {
+ Objects.requireNonNull(fontFamily);
this.font = fontFamily;
set("fontFamily", fontFamily, null);
return this;
| 1 |
diff --git a/ui/component/uriIndicator/view.jsx b/ui/component/uriIndicator/view.jsx // @flow
+import type { Node } from 'react';
import React from 'react';
import Button from 'component/button';
import Tooltip from 'component/common/tooltip';
@@ -14,6 +15,8 @@ type Props = {
// Possibly because the resolve function is an arrow function that is passed in props?
resolveUri: string => void,
uri: string,
+ // to allow for other elements to be nested within the UriIndicator
+ children: ?Node,
};
class UriIndicator extends React.PureComponent<Props> {
@@ -38,7 +41,7 @@ class UriIndicator extends React.PureComponent<Props> {
};
render() {
- const { link, isResolvingUri, claim, addTooltip } = this.props;
+ const { link, isResolvingUri, claim, addTooltip, children } = this.props;
if (!claim) {
return <span className="empty">{isResolvingUri ? 'Validating...' : 'Unused'}</span>;
@@ -67,10 +70,11 @@ class UriIndicator extends React.PureComponent<Props> {
<Tooltip label={<ClaimPreview uri={channelLink} type="tooltip" placeholder={false} />}>{children}</Tooltip>
)
: 'span';
-
+ /* to wrap the UriIndicator element around other DOM nodes as a button */
+ const content = children ? children : (<Wrapper>{inner}</Wrapper>);
return (
<Button className="button--uri-indicator" navigate={channelLink}>
- <Wrapper>{inner}</Wrapper>
+ {content}
</Button>
);
} else {
| 11 |
diff --git a/tests/phpunit/integration/Modules/Analytics_4Test.php b/tests/phpunit/integration/Modules/Analytics_4Test.php @@ -767,9 +767,9 @@ class Analytics_4Test extends TestCase {
}
);
- $analytics = $this->setup_report( true );
+ $this->enable_shared_credentials();
- $data = $analytics->get_data(
+ $data = $this->analytics->get_data(
'report',
array(
// Note, metrics is a required parameter.
@@ -818,9 +818,9 @@ class Analytics_4Test extends TestCase {
}
);
- $analytics = $this->setup_report( true );
+ $this->enable_shared_credentials();
- $data = $analytics->get_data(
+ $data = $this->analytics->get_data(
'report',
array(
// Note, metrics is a required parameter.
@@ -911,20 +911,9 @@ class Analytics_4Test extends TestCase {
}
/**
- * Sets up a mock Analytics 4 instance in preparation for retrieving a report.
- *
- * This is a helper method to avoid duplicating the same code in multiple tests.
- * It also allows us to mock the HTTP client to verify the request parameters.
- *
- * @since n.e.x.t
- *
- * @param boolean [enable_validation] Whether to enable validation of the metrics and dimensions. Default false.
- * @return Analytics_4 The Analytics 4 instance.
+ * Metrics and dimensions are only validated when using shared credentials. This helper method sets up the shared credentials scenario.
*/
- protected function setup_report( $enable_validation = false ) {
- if ( $enable_validation ) {
- // Metrics and dimensions are only validated when using shared credentials; this block of code sets up the shared credentials scenario.
-
+ protected function enable_shared_credentials() {
// Ensure the user is authenticated.
$this->authentication->get_oauth_client()->set_token(
array(
@@ -958,9 +947,6 @@ class Analytics_4Test extends TestCase {
);
}
- return $this->analytics;
- }
-
/**
* @return Module_With_Scopes
*/
| 14 |
diff --git a/token-metadata/0x83d60E7aED59c6829fb251229061a55F35432c4d/metadata.json b/token-metadata/0x83d60E7aED59c6829fb251229061a55F35432c4d/metadata.json "symbol": "INFT",
"address": "0x83d60E7aED59c6829fb251229061a55F35432c4d",
"decimals": 6,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package-lock.json b/package-lock.json "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000861.tgz",
"integrity": "sha512-aeEQ4kyd41qCl8XFbCjWgVBI3EOd66M9sC43MFn0kuD/vcrNqvoIAlKon4xdp8yMCYvVjdCltI3lgArj8I6cNA=="
},
- "canvas": {
- "version": "1.6.11",
- "resolved": "https://registry.npmjs.org/canvas/-/canvas-1.6.11.tgz",
- "integrity": "sha512-ElVw5Uk8PReGpzXfDg6PDa+wntnZLGWWfdSHI0Pc8GyXiFbW13drSTzWU6C4E5QylHe+FnLqI7ngMRlp3eGZIQ==",
- "dev": true,
- "requires": {
- "nan": "^2.10.0"
- }
- },
"capitalize": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/capitalize/-/capitalize-1.0.0.tgz",
| 2 |
diff --git a/src/parsers/GmlSeekData.hx b/src/parsers/GmlSeekData.hx @@ -110,13 +110,10 @@ class GmlSeekData {
// comp:
for (c in prev.compList) {
- if (!next.compMap.exists(c.name)) GmlAPI.gmlComp.remove(c);
+ GmlAPI.gmlComp.remove(c);
}
for (c1 in next.compList) {
- var c0 = prev.compMap[c1.name];
- if (c0 != null) {
- c0.setTo(c1);
- } else GmlAPI.gmlComp.push(c1);
+ GmlAPI.gmlComp.push(c1);
}
// enums:
| 1 |
diff --git a/src/angular/src/app/spark-core-angular/directives/inputs/sprk-datepicker/sprk-datepicker.directive.ts b/src/angular/src/app/spark-core-angular/directives/inputs/sprk-datepicker/sprk-datepicker.directive.ts @@ -17,7 +17,7 @@ export class SprkDatepickerDirective implements OnInit {
ngOnInit(): void {
let input = this.ref.nativeElement;
if(this.TinyDatePicker) {
- const dp = this.TinyDatePicker(input, {
+ this.TinyDatePicker(input, {
mode: 'dp-below',
min: this.minDate,
max: this.maxDate,
| 3 |
diff --git a/ui/src/css/variables.styl b/ui/src/css/variables.styl @@ -474,12 +474,6 @@ $blue-grey-12 ?= #b0bec5
$blue-grey-13 ?= #78909c
$blue-grey-14 ?= #455a64
-max(value1, value2)
- if value1 <= value2
- value2
- else
- value1
-
$ios-statusbar-height ?= 20px
$z-fab ?= 990
@@ -495,7 +489,7 @@ $z-max ?= 9998
$shadow-color ?= black
$shadow-transition ?= box-shadow .28s cubic-bezier(.4, 0, .2, 1)
-$inset-shadow ?= 0 7px 9px -7px alpha($shadow-color, .7) inset
+$inset-shadow ?= 0 7px 9px -7px rgba($shadow-color, .7) inset
$elevation-umbra ?= rgba($shadow-color, .2)
$elevation-penumbra ?= rgba($shadow-color, .14)
| 2 |
diff --git a/lib/request.js b/lib/request.js @@ -309,7 +309,7 @@ module.exports = {
// 2xx or 304 as per rfc2616 14.26
if ((s >= 200 && s < 300) || 304 == s) {
- return fresh(this.header, this.ctx.response.header);
+ return fresh(this.header, this.response.header);
}
return false;
| 4 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js @@ -1048,7 +1048,7 @@ RED.subflow = (function() {
}
langs.forEach(function(l) {
var row = $('<div>').appendTo(content);
- $('<span>').css({display:"inline-block",width:"50px"}).text(l+(l===currentLocale?"*":"")).appendTo(row);
+ $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row);
$('<span>').text(ui.label[l]||"").appendTo(row);
});
return content;
| 1 |
diff --git a/server/game/cards/22-BtB/TheGreatPyramid.js b/server/game/cards/22-BtB/TheGreatPyramid.js const DrawCard = require('../../drawcard.js');
const GenericTracker = require('../../EventTrackers/GenericTracker');
+const GameActions = require('../../GameActions');
class TheGreatPyramid extends DrawCard {
setupCardAbilities(ability) {
@@ -64,7 +65,7 @@ class TheGreatPyramid extends DrawCard {
removeCardsUnderneathFromGame(card, context) {
if(card.location === 'underneath' && context.source.childCards.some(childCard => childCard === card)) {
- context.source.controller.discardCard(card);
+ context.game.resolveGameAction(GameActions.removeFromGame({ card, player: this }));
context.game.addMessage('{0} removes {1} from the game from under {2}',
context.source.controller, card, context.source);
| 1 |
diff --git a/src/Navbar.js b/src/Navbar.js @@ -28,7 +28,8 @@ class Navbar extends Component {
fixed,
alignLinks,
centerLogo,
- search
+ search,
+ sidenav
} = this.props;
const brandClasses = cx({
@@ -74,6 +75,8 @@ class Navbar extends Component {
navbar = <div className="navbar-fixed">{navbar}</div>;
}
+ const sidenavLinks = sidenav ? sidenav : links;
+
return (
<Fragment>
{navbar}
@@ -85,7 +88,7 @@ class Navbar extends Component {
this._sidenav = ul;
}}
>
- {links}
+ {sidenavLinks}
</ul>
</Fragment>
);
@@ -98,6 +101,7 @@ Navbar.propTypes = {
className: PropTypes.string,
extendWith: PropTypes.node,
search: PropTypes.bool,
+ sidenav: PropTypes.node,
/**
* left makes the navbar links left aligned, right makes them right aligned
*/
| 11 |
diff --git a/src/components/core/update/updateSlides.js b/src/components/core/update/updateSlides.js @@ -108,9 +108,13 @@ export default function () {
if (params.slidesPerView === 'auto') {
const slideStyles = window.getComputedStyle(slide[0], null);
const currentTransform = slide[0].style.transform;
+ const currentWebKitTransform = slide[0].style.webkitTransform;
if (currentTransform) {
slide[0].style.transform = 'none';
}
+ if (currentWebKitTransform) {
+ slide[0].style.webkitTransform = 'none';
+ }
if (swiper.isHorizontal()) {
slideSize = slide[0].getBoundingClientRect().width +
parseFloat(slideStyles.getPropertyValue('margin-left')) +
@@ -123,6 +127,9 @@ export default function () {
if (currentTransform) {
slide[0].style.transform = currentTransform;
}
+ if (currentWebKitTransform) {
+ slide[0].style.webkitTransform = currentWebKitTransform;
+ }
if (params.roundLengths) slideSize = Math.floor(slideSize);
} else {
slideSize = (swiperSize - ((params.slidesPerView - 1) * spaceBetween)) / params.slidesPerView;
| 0 |
diff --git a/lib/plugins/input/aws-ecs.js b/lib/plugins/input/aws-ecs.js @@ -93,8 +93,10 @@ class AwsEcs {
if (docs && docs.length > 0) {
for (let i = 0; i < docs.length; i++) {
const log = docs[i]
- log['@timestamp'] = new Date(log.timestamp)
- delete log.timestamp
+ log['@timestamp'] = new Date()
+ delete log.date
+ log.message = log.log
+ delete log.log
self.emitEvent(log, token)
}
| 10 |
diff --git a/token-metadata/0x5228a22e72ccC52d415EcFd199F99D0665E7733b/metadata.json b/token-metadata/0x5228a22e72ccC52d415EcFd199F99D0665E7733b/metadata.json "symbol": "PBTC",
"address": "0x5228a22e72ccC52d415EcFd199F99D0665E7733b",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/CodeModal.js b/src/components/CodeModal.js @@ -74,15 +74,13 @@ const ModalCloseIcon = styled(Icon)`
margin: 1rem;
`
-const Overlay = ({ isActive }) => {
- return (
+const Overlay = ({ isActive }) => (
<StyledOverlay
initial={false}
animate={{ opacity: isActive ? 1 : 0, zIndex: isActive ? 1001 : -1 }}
transition={{ duration: 0.2 }}
/>
)
-}
const CodeModal = ({ children, className, isOpen, setIsOpen, title }) => {
const ref = useRef()
| 7 |
diff --git a/src/index.js b/src/index.js @@ -3,7 +3,7 @@ const bs = require("browser-sync")
const Output = require('./generators/output')
const self = module.exports = {
- render: async (html, options) => Output.toString(html, options).catch(err => console.error(err)),
+ render: async (html, options) => Output.toString(html, options),
build: async env => {
env = env || 'local'
let start = new Date()
| 2 |
diff --git a/src/browser/CordovaGoogleMaps.js b/src/browser/CordovaGoogleMaps.js -
var utils = require('cordova/utils');
var PluginMap = require('cordova-plugin-googlemaps.PluginMap'),
PluginMarker = require('cordova-plugin-googlemaps.PluginMarker'),
@@ -22,11 +21,6 @@ document.addEventListener("load_googlemaps", function() {
flag = true;
// Get API key from config.xml
var API_KEY_FOR_BROWSER = configs.getPreferenceValue("API_KEY_FOR_BROWSER");
- API_KEY_FOR_BROWSER = "AIzaSyBzTWTKaMEeABaeBSa3_E6ZMxseK4xXl4k";
- if (!API_KEY_FOR_BROWSER) {
- alert("Google Maps API key is required.");
- return;
- }
// API_LOADED = true;
// var maps = Object.values(MAPS);
@@ -36,8 +30,12 @@ document.addEventListener("load_googlemaps", function() {
// return;
var secureStripeScript = document.createElement('script');
+ if (API_KEY_FOR_BROWSER) {
secureStripeScript.setAttribute('src','https://maps.googleapis.com/maps/api/js?key=' + API_KEY_FOR_BROWSER);
- //secureStripeScript.setAttribute('src','https://maps.googleapis.com/maps/api/js');
+ } else {
+ // for development only
+ secureStripeScript.setAttribute('src','https://maps.googleapis.com/maps/api/js');
+ }
secureStripeScript.addEventListener("load", function() {
API_LOADED = true;
| 4 |
diff --git a/lib/node_modules/@stdlib/repl/lib/process_line.js b/lib/node_modules/@stdlib/repl/lib/process_line.js @@ -38,6 +38,7 @@ var debug = logger( 'repl:line' );
var hasMultilineError = Parser.extend( multilinePlugin ).hasMultilineError;
var RE_WHITESPACE = /^\s*$/;
var RE_SINGLE_LINE_COMMENT = /^\s*\/\//;
+var RE_MULTI_LINE_COMMENT = /^\s*\/\*.*\*\/$/;
// MAIN //
@@ -65,7 +66,7 @@ function processLine( repl, line ) {
displayPrompt( repl, false );
return;
}
- if ( RE_SINGLE_LINE_COMMENT.test( cmd ) ) {
+ if ( RE_SINGLE_LINE_COMMENT.test( cmd ) || RE_MULTI_LINE_COMMENT.test( cmd ) ) { // eslint-disable-line max-len
displayPrompt( repl, false );
return;
}
| 9 |
diff --git a/src/components/nodes/task/shape.js b/src/components/nodes/task/shape.js @@ -18,7 +18,7 @@ export default joint.shapes.standard.Rectangle.extend({
type: 'processmaker.components.nodes.task.Shape',
size: { width: 100, height: 60 },
attrs: {
- 'image': { 'ref-x': 2, 'ref-y': 2, ref: 'rect', width: 16, height: 16 },
+ 'image': { 'ref-x': 4, 'ref-y': 4, ref: 'rect', width: 16, height: 16 },
},
}, joint.shapes.standard.Rectangle.prototype.defaults),
| 5 |
diff --git a/server/preprocessing/other-scripts/openaire.R b/server/preprocessing/other-scripts/openaire.R @@ -32,28 +32,32 @@ get_papers <- function(query, params, limit=NULL) {
project_id <- params$project_id
funder <- params$funder
- tryCatch({
+ pubs_metadata <- tryCatch({
response <- roa_pubs(project_id = project_id,
funder = funder,
format = 'xml')
pubs_metadata <- parse_response(response)
pubs_metadata <- fill_dois(pubs_metadata)
- }, error = function(err){
- print(err)
- pubs_metadata <- data.frame(matrix(nrow=1))
+ },
+ error = function(err){
+ print(paste0("publications: ", err))
+ pubs_metadata <- data.frame()
+ return (data.frame())
})
- tryCatch({
+ datasets_metadata <- tryCatch({
response <- roa_datasets(project_id = project_id,
funder = funder,
format = 'xml')
datasets_metadata <- parse_response(response)
- }, error = function(err) {
- print(err)
- datasets_metadata <- data.frame(matrix(nrow=1))
+ },
+ error = function(err){
+ print(paste0("datasets: ", err))
+ datasets_metadata <-
+ return (data.frame())
})
- tryCatch({
+ all_artifacts <- tryCatch({
all_artifacts <- rbind.fill(pubs_metadata, datasets_metadata)
}, error = function(err){
print(err)
@@ -62,8 +66,9 @@ get_papers <- function(query, params, limit=NULL) {
} else if (nrow(datasets_metadata) > 0){
all_artifacts <- datasets_metadata
} else {
- all_artifacts <- data.frame(matrix(nrow=1))
+ all_artifacts <- data.frame()
}
+ return (data.frame())
})
tryCatch({
| 7 |
diff --git a/app/src/renderer/vuex/modules/themes.js b/app/src/renderer/vuex/modules/themes.js @@ -4,7 +4,7 @@ import dark from "../json/theme-dark.json"
function setCssVars(theme) {
const isWin = navigator.platform.toUpperCase().indexOf("WIN") >= 0
if (isWin) {
- document.documentElement.style.setProperty(`--font-weight`, 300)
+ document.documentElement.style.setProperty(`--font-weight`, 400)
}
for (let key in theme) {
document.documentElement.style.setProperty(`--${key}`, theme[key])
| 12 |
diff --git a/components/system/components/Buttons.js b/components/system/components/Buttons.js @@ -271,7 +271,6 @@ const STYLES_BUTTON_WARNING = css`
cursor: pointer;
color: ${Constants.system.white};
background-color: ${Constants.system.red};
- box-shadow: 0 0 0 1px ${Constants.system.bgGray} inset;
:hover {
background-color: #b51111;
| 2 |
diff --git a/src/renderable/container.js b/src/renderable/container.js @@ -28,13 +28,13 @@ class Container extends Renderable {
* @param {number} [width=game.viewport.width] width of the container
* @param {number} [height=game.viewport.height] height of the container
*/
- constructor(x = 0, y = 0, width = Infinity, height = Infinity, root = false) {
+ constructor(x = 0, y = 0, width, height, root = false) {
// call the super constructor
super(
x, y,
- typeof game.viewport !== "undefined" ? game.viewport.width : width,
- typeof game.viewport !== "undefined" ? game.viewport.height : height
+ typeof width === "undefined" ? (typeof game.viewport !== "undefined" ? game.viewport.width : Infinity) : width,
+ typeof height === "undefined" ? (typeof game.viewport !== "undefined" ? game.viewport.height : Infinity) : height
);
/**
| 1 |
diff --git a/package.json b/package.json {
"name": "pg-promise",
- "version": "10.4.0",
+ "version": "10.3.2",
"description": "PostgreSQL interface for Node.js",
"main": "lib/index.js",
"typings": "typescript/pg-promise.d.ts",
"dependencies": {
"assert-options": "0.6.0",
"manakin": "0.5.2",
- "pg": "7.15.1",
+ "pg": "7.14.0",
"pg-minify": "1.5.1",
"spex": "3.0.0"
},
| 13 |
diff --git a/src/apps.json b/src/apps.json "html": [
"href=\"enter_bug\\.cgi\">",
"<main id=\"bugzilla-body\"",
+ "<a href=\"https?://www\\.bugzilla\\.org/docs/([0-9.]+)/[^>]+>Help<\\;version:\\1",
"<span id=\"information\" class=\"header_addl_info\">version ([\\d.]+)<\\;version:\\1"
],
"cookies": {
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ### Bugfix
+## 7.4.1
+
+### Bugfix
+
- Ensure a non-zero exit status code when build has errors ([#1451](https://github.com/react-static/react-static/pull/1451))
- Updated browser support docs for IE11 support ([#1461](https://github.com/react-static/react-static/pull/1461))
| 6 |
diff --git a/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js b/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js @@ -431,7 +431,15 @@ function publish( pkg, clbk ) {
badges += '[![dependencies][dependencies-image]][dependencies-url]';
readme = replace( readme, /\n>/, '\n'+badges+'\n\n>' );
readme = replace( readme, '\'@stdlib/'+pkg, '\'@stdlib/'+distPkg );
+ if ( contains( readme, '<section class="links">' ) ) {
readme = replace( readme, '<section class="links">', mainRepoSection( customLicense ) );
+ } else {
+ readme += mainRepoSection( customLicense );
+ readme += '\n\n';
+ readme += '</section>';
+ readme += '\n\n';
+ readme += '<!-- /.links -->';
+ }
readme = replace( readme, '<pkg>', distPkg );
writeFileSync( readmePath, readme );
| 9 |
diff --git a/packages/app/src/components/MaintenanceModeContent.tsx b/packages/app/src/components/MaintenanceModeContent.tsx @@ -25,10 +25,15 @@ const MaintenanceModeContent = () => {
return (
<div className="text-left">
+ {currentUser?.admin
+ && (
<p>
<i className="icon-arrow-right"></i>
<a className="btn btn-link" href="/admin">{ t('maintenance_mode.admin_page') }</a>
</p>
+ )
+
+ }
{currentUser != null
? (
<p>
| 7 |
diff --git a/src/electron.js b/src/electron.js @@ -473,7 +473,7 @@ function getLocalization() {
// Get default localization file
try {
- const defaultFile = fs.readFileSync(path.join(__dirname, `/localization/default.json`))
+ const defaultFile = fs.readFileSync(path.join(__dirname, `/localization/en.json`))
localization.default = JSON.parse(defaultFile)
} catch (e) {
console.error("Couldn't read default langauge file!")
| 12 |
diff --git a/tls_socket.js b/tls_socket.js @@ -174,6 +174,9 @@ if (ocsp) {
if (err) {
return cb2(err);
}
+ if (uri === null) { // not working OCSP server
+ return cb2();
+ }
var req = ocsp.request.generate(cert, issuer);
var options = {
| 9 |
diff --git a/src/js/demo/components/App.jsx b/src/js/demo/components/App.jsx @@ -77,7 +77,7 @@ export default class App extends Component {
sourceType: "script",
ecmaFeatures: {}
},
- rules: rules.reduce((result, rule, ruleId) => {
+ rules: [...rules.entries()].reduce((result, [ruleId, rule]) => {
if (rule.meta.docs.recommended) {
result[ruleId] = 2;
}
| 1 |
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-18.04
strategy:
matrix:
- test-name: ['boostPayment', 'botCreation', 'chatPayment', 'cleanup', 'clearAllChats', 'clearAllContacts', 'contacts', 'images', 'latestTest', 'lsats', 'paidMeet', 'paidTribeImages', 'queryRoutes', 'self', 'sphinxPeople', 'streamPayment', 'tribe', 'tribe3Escrow', 'tribe3Messages', 'tribe3Private', 'tribe3Profile', 'tribeEdit', 'tribeImages', 'messageLength', 'transportToken']
+ test-name: ['boostPayment', 'botCreation', 'chatPayment', 'cleanup', 'clearAllChats', 'clearAllContacts', 'contacts', 'images', 'latestTest', 'lsats', 'paidMeet', 'paidTribeImages', 'queryRoutes', 'self', 'sphinxPeople', 'streamPayment', 'tribe', 'tribe3Escrow', 'tribe3Messages', 'tribe3Private', 'tribe3Profile', 'tribeEdit', 'tribeImages', 'messageLength', 'transportToken', 'hmac']
steps:
- name: Enable docker.host.internal for Ubuntu
run: |
| 0 |
diff --git a/src/js/createTippy.js b/src/js/createTippy.js @@ -127,9 +127,9 @@ export default function createTippy(reference, collectionProps) {
}
/**
- * Listener for the `followCursor` prop
+ * Positions the virtual reference near the mouse cursor
*/
- function followCursorListener(event) {
+ function positionVirtualReferenceNearCursor(event) {
const { clientX, clientY } = (lastMouseMoveEvent = event)
if (!tip.popperInstance) {
@@ -201,7 +201,7 @@ export default function createTippy(reference, collectionProps) {
if (popperChildren.arrow) {
popperChildren.arrow.style.margin = '0'
}
- document.addEventListener('mousemove', followCursorListener)
+ document.addEventListener('mousemove', positionVirtualReferenceNearCursor)
}
const delay = getValue(tip.props.delay, 0, Defaults.delay)
@@ -763,7 +763,7 @@ export default function createTippy(reference, collectionProps) {
tip.popperInstance.disableEventListeners()
const delay = getValue(tip.props.delay, 0, Defaults.delay)
if (lastTriggerEvent.type) {
- followCursorListener(
+ positionVirtualReferenceNearCursor(
delay && lastMouseMoveEvent ? lastMouseMoveEvent : lastTriggerEvent
)
}
@@ -855,7 +855,10 @@ export default function createTippy(reference, collectionProps) {
onTransitionedOut(duration, () => {
if (!isPreparingToShow) {
- document.removeEventListener('mousemove', followCursorListener)
+ document.removeEventListener(
+ 'mousemove',
+ positionVirtualReferenceNearCursor
+ )
lastMouseMoveEvent = null
}
| 10 |
diff --git a/website/src/docs/robodog.md b/website/src/docs/robodog.md @@ -25,14 +25,12 @@ Then, with a bundler such as [webpack][webpack] or [Browserify][browserify], do:
const transloadit = require('@uppy/robodog')
```
-<!--
If you are not using a bundler, you can also import the Robodog using an HTML script tag.
```html
-<link rel="stylesheet" href="https://transloadit.edgly.net/releases/robodog/v1.0.0/dist/style.min.css">
-<script src="https://transloadit.edgly.net/releases/robodog/v1.0.0/dist/transloadit.min.js"></script>
+<link rel="stylesheet" href="https://transloadit.edgly.net/releases/uppy/v0.30.2/robodog.min.css">
+<script src="https://transloadit.edgly.net/releases/uppy/v0.30.2/robodog.min.js"></script>
```
--->
## Methods
| 0 |
diff --git a/lib/node_modules/@stdlib/process/umask/lib/main.js b/lib/node_modules/@stdlib/process/umask/lib/main.js @@ -26,6 +26,7 @@ var fromSymbolic = require( './from_symbolic.js' );
* @param {boolean} [options.symbolic] - boolean indicating whether to return a mask using symbolic notation
* @throws {TypeError} must provide either a string, nonnegative integer, or an options object
* @throws {TypeError} must provide valid options
+* @throws {Error} must provide a parseable expression mask
* @returns {(NonNegativeInteger|string)} process mask
*
* @example
@@ -48,6 +49,9 @@ function umask() {
if ( nargs === 1 ) {
if ( isString( arg ) ) {
mask = fromSymbolic( process.umask(), arg );
+ if ( mask instanceof Error ) {
+ throw mask;
+ }
return process.umask( mask );
}
if ( isNonNegativeInteger( arg ) ) {
@@ -81,6 +85,9 @@ function umask() {
}
if ( isString( arg ) ) {
mask = fromSymbolic( process.mask(), arg );
+ if ( mask instanceof Error ) {
+ throw mask;
+ }
} else if ( !isNonNegativeInteger( arg ) ) {
throw new TypeError( 'invalid input argument. First argument must be either a string or nonnegative integer. Value: `' + arg + '`.' );
}
| 9 |
diff --git a/bin/logagent.js b/bin/logagent.js @@ -44,6 +44,7 @@ var moduleAlias = {
// input filters
grep: '../lib/plugins/input-filter/grep.js',
+ 'grok': 'logagent-input-filter-grok',
// output filters
sql: '../lib/plugins/output-filter/sql.js',
'access-watch': '../lib/plugins/output-filter/access-watch.js',
| 5 |
diff --git a/src/server/controller/user.js b/src/server/controller/user.js @@ -27,17 +27,19 @@ function checkReturnTo(req, res, next) {
scope.push('admin:org_hook');
req.session.requiredScope = 'org_admin';
}
- var returnTo = req.query.public === 'true' ? req.session.next : '/';
- if (returnTo) {
- req.session.returnTo = returnTo;
- }
- passport.authenticate('github', {scope: scope})(req, res, next);
+
+ req.session.returnTo = req.query.public === 'true' ? req.session.next || req.headers.referer : '/';
+
+ passport.authenticate('github', {
+ scope: scope
+ })(req, res, next);
}
router.get('/auth/github', checkReturnTo);
-// router.get('/auth/github/callback', passport.authenticate('github', { successReturnToOrRedirect: '/', failureRedirect: '/' }));
-router.get('/auth/github/callback', passport.authenticate('github', { failureRedirect: '/' }),
+router.get('/auth/github/callback', passport.authenticate('github', {
+ failureRedirect: '/'
+ }),
function (req, res) {
function couldBeAdmin(username) {
return config.server.github.admin_users.length === 0 || config.server.github.admin_users.indexOf(username) >= 0;
@@ -45,7 +47,7 @@ router.get('/auth/github/callback', passport.authenticate('github', { failureRed
if (req.user && req.session.requiredScope != 'public' && couldBeAdmin(req.user.login) && (!req.user.scope || req.user.scope.indexOf('write:repo_hook') < 0)) {
return res.redirect('/auth/github?admin=true');
}
- res.redirect(req.session.returnTo || '/');
+ res.redirect(req.session.returnTo || req.headers.referer || '/');
req.session.next = null;
});
| 7 |
diff --git a/form/index.js b/form/index.js @@ -45,17 +45,23 @@ class TonicForm extends Tonic {
validate () {
const elements = this.getElements()
+ let isValid = true
for (const el of elements) {
if (!el.setInvalid) continue
if (el.setValid) el.setValid()
for (const key in el.validity) {
- if (!el.validity[key]) el.setInvalid(key)
+ if (!el.validity[key]) {
+ el.setInvalid(key)
+ isValid = false
}
}
}
+ return isValid
+ }
+
setData (data) {
this.value = data
}
| 7 |
diff --git a/lib/components/tabs.vue b/lib/components/tabs.vue <template>
<div class="tabs">
- <div v-if="!bottom" :class="['tab-content',{'card-block': card}]" ref="tabsContainer">
+ <div v-if="bottom" :class="['tab-content',{'card-block': card}]" ref="tabsContainer">
<slot></slot>
<slot name="empty" v-if="!tabs || !tabs.length"></slot>
</div>
</ul>
</div>
- <div v-if="bottom" :class="['tab-content',{'card-block': card}]" ref="tabsContainer">
+ <div v-if="!bottom" :class="['tab-content',{'card-block': card}]" ref="tabsContainer">
<slot></slot>
<slot name="empty" v-if="!tabs || !tabs.length"></slot>
</div>
| 1 |
diff --git a/src/functionHelper.js b/src/functionHelper.js const { fork, spawn } = require('child_process')
const { join, resolve } = require('path')
-const objectFromEntries = require('object.fromentries')
const trimNewlines = require('trim-newlines')
const debugLog = require('./debugLog.js')
const { createUniqueId, splitHandlerPathAndName } = require('./utils/index.js')
-objectFromEntries.shim()
-
const { parse, stringify } = JSON
const { keys, values } = Object
| 2 |
diff --git a/scenes/shadows.scn b/scenes/shadows.scn },
{
"position": [
- -6,
- 1,
- 15
+ 20,
+ -1,
+ -4
],
"quaternion": [
0,
0,
1
],
- "scale": [
- 0.5,
- 0.5,
- 0.5
- ],
- "start_url": "https://webaverse.github.io/potion/"
+ "start_url": "https://webaverse.github.io/pistol/"
}
]
}
\ No newline at end of file
| 0 |
diff --git a/app/http.php b/app/http.php @@ -20,7 +20,7 @@ ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
-$http = new Server("0.0.0.0", 80);
+$http = new Server("0.0.0.0", App::getEnv('PORT', 80));
$payloadSize = max(4000000 /* 4mb */, App::getEnv('_APP_STORAGE_LIMIT', 10000000 /* 10mb */));
| 12 |
diff --git a/source/gltf/image.js b/source/gltf/image.js @@ -20,10 +20,6 @@ class gltfImage extends GltfObject
this.bufferView = bufferView;
this.mimeType = mimeType;
this.image = image; // javascript image
- if (this.image !== undefined)
- {
- this.image.crossOrigin = "";
- }
this.name = name;
this.type = type; // nonstandard
this.miplevel = miplevel; // nonstandard
| 2 |
diff --git a/src/Route.js b/src/Route.js @@ -368,7 +368,13 @@ export default class Route {
return _config._errorHandler(err, req, res);
}
- res.status(err.status || err.code || 400, true);
+ if (typeof err.status === 'number' && err.status !== 200) {
+ res.status(err.status);
+ } else if (typeof err.code === 'number' && err.code !== 200) {
+ res.status(err.code);
+ } else if (res.rawStatusCode === 200) {
+ res.status(400);
+ }
res.writeStatus(res.statusCode);
res.end(
| 1 |
diff --git a/src/Item.js b/src/Item.js @@ -23,6 +23,9 @@ const Player = require('./Player');
* @property {string} script A custom script for this item
* @property {ItemType|string} type
* @property {string} uuid UUID differentiating all instances of this item
+ * @property {boolean} closed Whether this item is closed
+ * @property {boolean} locked Whether this item is locked
+ * @property {entityReference} lockedBy Item that locks/unlocks this item
*/
class Item extends EventEmitter {
constructor (area, item) {
@@ -61,6 +64,9 @@ class Item extends EventEmitter {
this.slot = item.slot || null;
this.type = typeof item.type === 'string' ? ItemType[item.type] : (item.type || ItemType.OBJECT);
this.uuid = item.uuid || uuid.v4();
+ this.closed = def.closed || false;
+ this.locked = def.locked || false;
+ this.lockedBy = def.lockedBy || null;
}
hasKeyword(keyword) {
@@ -133,6 +139,9 @@ class Item extends EventEmitter {
}
}
+ /**
+ * TODO: move to bundles
+ */
get qualityColors() {
return ({
poor: ['bold', 'black'],
@@ -154,6 +163,7 @@ class Item extends EventEmitter {
/**
* Colorize the given string according to this item's quality
+ * TODO: move to bundles
* @param {string} string
* @return string
*/
@@ -183,6 +193,69 @@ class Item extends EventEmitter {
return found;
}
+ /**
+ * Open a container-like object
+ *
+ * @fires Item#opened
+ */
+ open() {
+ if (!this.closed) {
+ return;
+ }
+
+ /**
+ * @event Item#opened
+ */
+ this.emit('opened');
+ this.closed = false;
+ }
+
+ /**
+ * @fires Item#closed
+ */
+ close() {
+ if (this.closed) {
+ return;
+ }
+
+ /**
+ * @event Item#closed
+ */
+ this.emit('closed');
+ this.closed = true;
+ }
+
+ /**
+ * @fires Item#locked
+ */
+ lock() {
+ if (this.locked) {
+ return;
+ }
+
+ this.close();
+ /**
+ * @event Item#locked
+ */
+ this.emit('locked');
+ this.locked = true;
+ }
+
+ /**
+ * @fires Item#unlocked
+ */
+ unlock() {
+ if (!this.locked) {
+ return;
+ }
+
+ /**
+ * @event Item#unlocked
+ */
+ this.emit('unlocked');
+ this.locked = false;
+ }
+
hydrate(state, serialized = {}) {
if (typeof this.area === 'string') {
this.area = state.AreaManager.getArea(this.area);
| 11 |
diff --git a/public/app/js/cbus-data.js b/public/app/js/cbus-data.js @@ -143,26 +143,38 @@ cbus.data.getEpisodeData = function(options) {
var result = null;
if (options.id) {
- var filteredListA = cbus.data.episodes.filter(function(episode) {
- return episode.id === options.id;
- });
+ var filteredA;
+ for (let i = 0, l = cbus.data.episodes.length; i < l; i++) {
+ if (cbus.data.episodes[i].id === options.id) {
+ filteredA = cbus.data.episodes[i];
+ break;
+ }
+ }
- if (filteredListA.length !== 0) {
- result = filteredListA[0];
+ if (filteredA) {
+ result = filteredA;
} else { // if nothing found, try episodesCache (contains only episodes from podcast-detail)
- var filteredListB = cbus.data.episodesCache.filter(function(episode) {
- return episode.id === options.id;
- });
+ var filteredB;
+ for (let i = 0, l = cbus.data.episodesCache.length; i < l; i++) {
+ if (cbus.data.episodesCache[i].id === options.id) {
+ filteredB = cbus.data.episodesCache[i];
+ break;
+ }
+ }
- if (filteredListB.length !== 0) {
- result = filteredListB[0];
+ if (filteredB) {
+ result = filteredB;
} else { // if still nothing found, try episodesUnsubbed (contains only episodes from unsubscribed podcasts)
- var filteredListC = cbus.data.episodesUnsubbed.filter(function(episode) {
- return episode.id === options.id;
- });
+ var filteredC;
+ for (let i = 0, l = cbus.data.episodesUnsubbed.length; i < l; i++) {
+ if (cbus.data.episodesUnsubbed[i].id === options.id) {
+ filteredC = cbus.data.episodesUnsubbed[i];
+ break;
+ }
+ }
- if (filteredListC.length !== 0) {
- result = filteredListC[0];
+ if (filteredC) {
+ result = filteredC;
} // else: return null
}
}
@@ -180,45 +192,51 @@ cbus.data.getEpisodeData = function(options) {
};
cbus.data.getFeedData = function(options) {
- if ((typeof options.index !== "undefined" && options.index !== null)) {
- var data = null;
-
- data = cbus.data.feeds[options.index];
-
- return data;
+ if (typeof options.index !== "undefined" && options.index !== null) {
+ return cbus.data.feeds[options.index];
}
- if ((typeof options.url !== "undefined" && options.url !== null)) {
- // console.log("trying cbus.data.feeds")
- var matches = cbus.data.feeds.filter(function(data) {
- return (data.url === options.url)
- });
+ if (typeof options.url !== "undefined" && options.url !== null) {
+ var matchedFeed;
+ for (let i = 0, l = cbus.data.feeds.length; i < l; i++) {
+ if (cbus.data.feeds[i].url === options.url) {
+ matchedFeed = cbus.data.feeds[i];
+ break;
+ }
+ }
- if (matches.length > 0) {
+ if (matchedFeed) {
// console.log(matches)
- return matches[0];
+ return matchedFeed;
} else {
// try again with feedsCache
// console.log("trying cbus.data.feedsCache")
- var matchesFromCache = cbus.data.feedsCache.filter(function(data) {
- return (data.url === options.url)
- });
+ var matchedFeedFromCache;
+ for (let i = 0, l = cbus.data.feedsCache.length; i < l; i++) {
+ if (cbus.data.feedsCache[i].url === options.url) {
+ matchedFeedFromCache = cbus.data.feedsCache[i];
+ break;
+ }
+ }
- if (matchesFromCache.length > 0) {
+ if (matchedFeedFromCache) {
// console.log(matchesFromCache)
- return matchesFromCache[0];
+ return matchedFeedFromCache;
} else {
// try again with cbus_feeds_qnp
// console.log("trying cbus.data.feedsQNP")
- var matchesFromUnsubbedFeeds = cbus.data.feedsQNP.filter(function(data) {
- // console.log(data.url, options.url, data.url === options.url)
- return (data.url === options.url)
- });
+ var matchedFeedFromUnsubbed;
+ for (let i = 0, l = cbus.data.feedsQNP.length; i < l; i++) {
+ if (cbus.data.feedsQNP[i].url === options.url) {
+ matchedFeedFromUnsubbed = cbus.data.feedsQNP[i];
+ break;
+ }
+ }
// console.log(matchesFromUnsubbedFeeds, matchesFromUnsubbedFeeds.length)
- if (matchesFromUnsubbedFeeds.length > 0) {
- var matched = matchesFromUnsubbedFeeds[0]
+ if (matchedFeedFromUnsubbed) {
+ let matched = matchedFeedFromUnsubbed
matched.isUnsubscribed = true
return matched
} else {
| 7 |
diff --git a/src/sections/Community/community.style.js b/src/sections/Community/community.style.js @@ -155,7 +155,6 @@ const CommunitySectionWrapper = styled.div`
.newcomers-section {
background: ${props => props.theme.secondaryLightColor};
- width:100%;
margin-top: 5rem;
margin-bottom: 5rem;
padding-top: 4rem;
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -24927,12 +24927,6 @@ var $$IMU_EXPORT$$;
// https://cdn1.coppel.com/images/catalog/pr/1126002-1.jpg?iresize=width:300,height:240
// https://cdn1.coppel.com/images/catalog/pr/1094552-1.jpg?iresize=width:300,height:240
(domain_nosub === "coppel.com" && /^cdn[0-9]*\./.test(domain) && /\/images\//.test(src)) ||
- // thanks to SlugMan336 on github: https://github.com/qsniyg/maxurl/issues/475
- // https://i8.amplience.net/i/jpl/jd_146327_b?qlt=92&w=600&h=765&v=1
- (((domain_nosub === "amplience.net" && /^i[0-9]*\./.test(domain)) ||
- // thanks to Slugman336 on github: https://github.com/qsniyg/maxurl/issues/476
- // https://media.jdsports.com/i/jdsports/1361945_001_M4?$default$&w=1000&h=1000&bg=rgb(237,237,237)
- domain === "media.jdsports.com") && /:\/\/[^/]+\/+i\//.test(src)) ||
// thanks to ambler on discord for reporting
// https://dynamicmedia.livenationinternational.com/Media/k/d/r/c2c71d8c-46eb-4212-a40a-6d8c5ae622b2.jpg?auto=webp&width=408
(domain === "dynamicmedia.livenationinternational.com" && /:\/\/[^/]+\/+media\//i.test(src)) ||
@@ -88422,6 +88416,27 @@ var $$IMU_EXPORT$$;
if (newsrc) return newsrc;
}
+ if ((domain_nosub === "amplience.net" && /^i[0-9]*\./.test(domain)) ||
+ // thanks to Slugman336 on github: https://github.com/qsniyg/maxurl/issues/476
+ // https://media.jdsports.com/i/jdsports/1361945_001_M4?$default$&w=1000&h=1000&bg=rgb(237,237,237)
+ domain === "media.jdsports.com") {
+ // thanks to SlugMan336 on github: https://github.com/qsniyg/maxurl/issues/475
+ // https://i8.amplience.net/i/jpl/jd_146327_b?qlt=92&w=600&h=765&v=1
+ // https://i8.amplience.net/i/jpl/jd_146327_b
+
+ // thanks to GoblinLegislator on github: https://github.com/qsniyg/maxurl/issues/613
+ // https://i8.amplience.net/t/jpl/jd_product_list?plu=jd_146327_bl&qlt=92&w=363&h=363&v=1&fmt=webp
+ // https://i8.amplience.net/i/jpl/jd_146327_bl
+ if (/\/t\/+jpl\/+jd_product_list\?/.test(src)) {
+ var queries = get_queries(src);
+ if (queries.plu) {
+ return urljoin(src, "/i/jpl/" + queries.plu, true);
+ }
+ } else {
+ return src.replace(/\?.*/, "");
+ }
+ }
+
@@ -88946,6 +88961,9 @@ var $$IMU_EXPORT$$;
// https://dyn.media.forbiddenplanet.com/_k-r4_QqqHsO2hkzbxuzwoJvmno=/fit-in/600x600/filters:format(webp):fill(white)/https://media.forbiddenplanet.com/products/20/9c/781b87caf25189d66f6f0014dfdc77bdb045.jpg
// https://media.forbiddenplanet.com/products/20/9c/781b87caf25189d66f6f0014dfdc77bdb045.jpg
domain === "dyn.media.forbiddenplanet.com" ||
+ // https://image.goxip.com/eesuNX6sp_mHWuneSBPYOWHqRcI=/fit-in/400x400/filters:fill(white):format(jpeg):quality(80)/https:%2F%2Fi8.amplience.net%2Fi%2Foffice%2F3173008293_sd1.jpg%3F$newpicture$
+ // https://i8.amplience.net/i/office/3173008293_sd1.jpg
+ domain === "image.goxip.com" ||
src.match(/:\/\/[^/]*\/thumbor\/[^/]*=\//) ||
// https://www.orlandosentinel.com/resizer/tREpzmUU7LJX1cbkAN-unm7wL0Y=/fit-in/800x600/top/filters:fill(black)/arc-anglerfish-arc2-prod-tronc.s3.amazonaws.com/public/XC6HBG2I4VHTJGGCOYVPLBGVSM.jpg
// http://arc-anglerfish-arc2-prod-tronc.s3.amazonaws.com/public/XC6HBG2I4VHTJGGCOYVPLBGVSM.jpg
@@ -88984,7 +89002,7 @@ var $$IMU_EXPORT$$;
if (newsrc !== src)
return decodeuri_ifneeded(newsrc);
- newsrc = src.replace(/.*?\/(?:[-_A-Za-z0-9]+=|unsafe)\/(?:(?:full-)?fit-in\/)?(?:[0-9x:]+\/)?(?:[0-9x:]+\/)?(?:(?:smart|top|center|middle)\/)?(?:(?:smart|top|center|middle)\/)?(?:filters(?::|%3A)[^/]*\/)?(?:v[0-9]+\/)?((?:https?(?::\/\/|%3[aA]%2[fF]%2[fF]))?[^/%]*\..*)/, "$1");
+ newsrc = src.replace(/.*?\/(?:[-_A-Za-z0-9]+=|unsafe)\/(?:(?:full-)?fit-in\/)?(?:[0-9x:]+\/)?(?:[0-9x:]+\/)?(?:(?:smart|top|center|middle)\/)?(?:(?:smart|top|center|middle)\/)?(?:filters(?::|%3A)[^/]*\/)?(?:v[0-9]+\/)?((?:https?(?::|%3[aA])(?:\/\/|%2[fF]%2[fF]))?[^/%]*\..*)/, "$1");
if (newsrc.match(/^[^/]*%2/))
newsrc = decodeURIComponent(newsrc);
| 7 |
diff --git a/docs/content/concepts/Store.js b/docs/content/concepts/Store.js @@ -5,13 +5,13 @@ import {CodeSnippet} from 'docs/components/CodeSnippet';
import {Controller, LabelsTopLayout, LabelsLeftLayout} from 'cx/ui';
import {ImportPath} from 'docs/components/ImportPath';
import {MethodTable} from '../../components/MethodTable';
-import {computable, updateArray, merge} from 'cx/data';
+import {computable, updateArray} from 'cx/data';
class PageController extends Controller {
onInit() {
this.store.init('$page', {
name: 'Jane',
- disable: true,
+ disabled: true,
todoList: [
{id: 1, text: 'Learn Cx', done: true},
{id: 2, text: "Feed the cat", done: false},
@@ -157,7 +157,7 @@ export const Store = <cx>
Otherwise it saves the `value` and returns `true`.
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="fMy6p8FB">{`
class PageController extends Controller {
onInit() {
this.store.init('$page', {
@@ -229,7 +229,7 @@ export const Store = <cx>
button text, depending on the `$page.disabled` value.
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="RzBoFq52">{`
<div layout={LabelsTopLayout} >
<TextField label="Name" value:bind="$page.name" disabled:bind="$page.disabled" />
<Button onClick={(e, instance) => {
@@ -267,7 +267,7 @@ export const Store = <cx>
You can also make the code more compact by doing destructuring right inside the function declaration.
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="tBnXbiZo">{`
<div layout={LabelsTopLayout} >
<TextField label="Name" value:bind="$page.name" disabled:bind="$page.disabled" />
<Button onClick={(e, {store}) => {
@@ -301,7 +301,7 @@ export const Store = <cx>
</div>
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="d8JViIoe">{`
<div layout={LabelsTopLayout}>
<TextField value:bind="$page.name" label="Name" />
<Button onClick={(e, {store}) =>
@@ -335,7 +335,7 @@ export const Store = <cx>
</div>
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="vKZrbYe4">{`
<div layout={LabelsTopLayout}>
<TextField label="Origin" value:bind="$page.name" />
<TextField label="Destination" value:bind="$page.copyDestination" placeholder="click Copy" />
@@ -367,7 +367,7 @@ export const Store = <cx>
</div>
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="E4BOtF4S">{`
<div layout={LabelsTopLayout}>
<TextField label="Origin" value:bind="$page.name" />
<TextField label="Destination" value:bind="$page.moveDestination" placeholder="click Move" />
@@ -412,7 +412,7 @@ export const Store = <cx>
should be a pure function, without any side effects, e.g. direct object or array mutations.
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="t5fbQpxq">{`
<div layout={LabelsTopLayout}>
<NumberField label="Count" value:bind="$page.count" style="width: 50px"/>
<Button onClick={(e, {store}) => {
@@ -466,7 +466,7 @@ export const Store = <cx>
</div>
<Content name="code">
- <CodeSnippet>{`
+ <CodeSnippet fiddle="u89Crydo">{`
<div class="widgets">
<div layout={LabelsLeftLayout}>
<strong>Todo List</strong>
| 0 |
diff --git a/src/serialize/window.js b/src/serialize/window.js @@ -151,6 +151,19 @@ export class ProxyWindow {
win.focus();
}),
setLocation: (href) => ZalgoPromise.try(() => {
+ // $FlowFixMe
+ if (isSameDomain(win)) {
+ try {
+ if (win.location && typeof win.location.replace === 'function') {
+ // $FlowFixMe
+ win.location.replace(href);
+ return;
+ }
+ } catch (err) {
+ // pass
+ }
+ }
+
// $FlowFixMe
win.location = href;
}),
| 14 |
diff --git a/createTokens.js b/createTokens.js @@ -7,10 +7,10 @@ const notInList = JSON.parse(fs.readFileSync(notInListPath));
const api = 'https://api.coingecko.com/api/v3/coins/ethereum/contract';
const networks = {
eth: 'https://nodes.mewapi.io/rpc/eth',
- rop: 'wss://nodes.mewapi.io/rpc/rop',
- kov: 'wss://nodes.mewapi.io/rpc/kovan',
- bsc: 'wss://nodes.mewapi.io/rpc/bsc',
- matic: 'wss://nodes.mewapi.io/rpc/matic'
+ rop: 'https://nodes.mewapi.io/rpc/rop',
+ kov: 'https://nodes.mewapi.io/rpc/kovan',
+ bsc: 'https://nodes.mewapi.io/rpc/bsc',
+ matic: 'https://nodes.mewapi.io/rpc/matic'
};
const abi = [
{
| 14 |
diff --git a/src/redux/Dispatch/reducers.js b/src/redux/Dispatch/reducers.js @@ -291,6 +291,15 @@ export default (state = initialState, action = {}) => {
unassignedTasks: removeItem(state.unassignedTasks, data.task),
taskLists: replaceTaskLists(state.taskLists, data.task),
}
+
+ case 'task:done':
+ case 'task:failed':
+
+ return {
+ ...state,
+ unassignedTasks: replaceItem(state.unassignedTasks, data.task),
+ taskLists: replaceTaskLists(state.taskLists, data.task),
+ }
}
}
| 9 |
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html if (val === "_custom_") {
val = $(this).val();
}
- var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
+ var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/\.].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
fvar.val(varName);
fvar.trigger("change");
| 2 |
diff --git a/README.md b/README.md @@ -53,6 +53,11 @@ See the [Wiki](https://github.com/r-spacex/SpaceX-API/wiki) for API Documentatio
"landing_vehicle": null,
"links": {
"mission_patch": "http://i.imgur.com/8URp6ea.png",
+ "reddit_campaign": "https://www.reddit.com/r/spacex/comments/6fw4yy/",
+ "reddit_launch": "https://www.reddit.com/r/spacex/comments/6kt2re/",
+ "reddit_recovery": null,
+ "reddit_media": "https://www.reddit.com/r/spacex/comments/6kt3fe/",
+ "presskit": "http://www.spacex.com/sites/spacex/files/intelsat35epresskit.pdf",
"article_link": "https://en.wikipedia.org/wiki/Intelsat_35e",
"video_link": "https://www.youtube.com/watch?v=MIHVPCj25Z0"
},
| 3 |
diff --git a/src/network/receive.ts b/src/network/receive.ts @@ -259,7 +259,7 @@ async function onReceive(payload: Payload, dest: string) {
},
})) as MessageRecord[]
const contact = (await models.Contact.findOne({
- where: { publicKey: payload.sender.pub_key },
+ where: { publicKey: payload.sender.pub_key, tenant },
})) as ContactRecord
if (allMsg.length === 0 || allMsg[0].sender !== contact.id) {
await sender.update({
| 3 |
diff --git a/userscript.user.js b/userscript.user.js @@ -1209,7 +1209,8 @@ var $$IMU_EXPORT$$;
"<li><code>google.com/**/test</code> will block https://google.com/abc/test, https://google.com/abc/def/test, https://google.com/abc/def/ghi/test, etc. but not https://google.com/test</li>",
"<li><code>g??gle.com</code> will block https://google.com/, https://gaagle.com/, https://goagle.com/, etc.</li>",
"<li><code>google.{com,co.uk}</code> will block https://google.com/ and https://google.co.uk/</li>",
- "<li><code>g[oa]gle.com</code> will block https://google.com/ and https://gaogle.com/</li>",
+ "<li><code>g[oau]ogle.com</code> will block https://google.com/, https://gaogle.com/, and http://www.guogle.com/</li>",
+ "<li><code>g[0-9]ogle.com</code> will block https://g0ogle.com/, https://g1ogle.com/, etc. (up to https://g9ogle.com/)</li>",
"</ul>"
].join("\n")
}
| 7 |
diff --git a/app/modules/main/containers/Sections/Home.js b/app/modules/main/containers/Sections/Home.js @@ -63,7 +63,7 @@ class HomeContainer extends Component<Props> {
wallets.length > 0
&& settings.walletHash
&& wallets.filter((w) => w.version === 1).length > 0
- && !storage.data
+ && !storage.keys
);
let interrupt;
if (esrPromptReady) {
| 1 |
diff --git a/index.html b/index.html @@ -19,7 +19,7 @@ layout: landing
<div class="ui medium inverted header">
To contribute all you need is a <a href="https://www.google.ch/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0ahUKEwig3Zb8wMTVAhUPmbQKHU31DbwQFggoMAA&url=https%3A%2F%2Fgithub.com%2Fjoin&usg=AFQjCNF6nezHQWX1hKwEFQVYRrUheS9_Ig">GitHub account!</a>
</div>
- <a href="/about/diybiosphere/"><button class="ui inverted big button">LEARN MORE</button></a>
+ <a href="/about/diybiosphere"><button class="ui inverted big button">LEARN MORE</button></a>
</div>
</div>
</div>
| 1 |
diff --git a/appjs/complexlogic.js b/appjs/complexlogic.js @@ -609,12 +609,12 @@ document.getElementById("stressans").innerHTML=ans;
function arcal()
{
- var a=document.getElementById("ang").value;
+ var a=document.getElementById("ang12").value;
var b=document.getElementById("rad").value;
var y=document.getElementById("radit").value;
var d=document.getElementById("angit").value;
var ans="";
- if(a==""||b=="")
+ if(a == "" && b == "")
{
ans="Error: All values are required to obtain answer";
}
| 1 |
diff --git a/src/layouts/index.js b/src/layouts/index.js @@ -21,7 +21,7 @@ const HeaderWrapper = styled(Header)`
`};
`;
-const TemplateWrapper = ({ data, children }) => (
+const TemplateWrapper = ({ data, children, location }) => (
<div>
<Helmet
title={data.site.siteMetadata.title}
| 1 |
diff --git a/templates/actor-sheet-gcs.html b/templates/actor-sheet-gcs.html <div>
{{#if useCI}}
<div id='combat-hit' class='conditional-injury'>
- {{#with data.conditionalinjury}}
<div class='header major-heading'>Injury</div>
<div class="tracked-resource no-border">
<div class="header minor-heading">Severity</div>
<div class='spinner'>
<button class='decrement' data-operation='ci-severity-dec'><i class="fas fa-minus"></i></button>
-
<input class="gcs-attr-input" name="data.conditionalinjury.injury.severity" type="text"
- value="{{data.conditionalinjury.injury.severity}}" data-dtype="String"
+ value="{{data.conditionalinjury.injury.severity}}" placeholder="" data-dtype="String"
data-operation="ci-severity-set" />
-
<button class='increment' data-operation='ci-severity-inc'><i class="fas fa-plus"></i></button>
<button class='reset' data-operation='ci-reset'><i class="fas fa-undo"></i></button>
</div>
<div class="header minor-heading">Time to Heal</div>
<div class='spinner'>
<button class='decrement' data-operation='ci-days-dec'><i class="fas fa-minus"></i></button>
- <input class="gcs-attr-input" name="injury.daystoheal" type="text" value="{{injury.daystoheal}}"
- placeholder="" data-dtype="Number" data-operation="ci-days-set" />
+ <input class="gcs-attr-input" name="data.conditionalinjury.injury.daystoheal" type="text"
+ value="{{data.conditionalinjury.injury.daystoheal}}" placeholder="" data-dtype="Number"
+ data-operation="ci-days-set" />
<button class='increment' data-operation='ci-days-inc'><i class="fas fa-plus"></i></button>
<div style='font-size: 85%;'> Days</div>
</div>
<div class='condition-block'>
<div class='tooltip-wrapper'>
- <div class='tooltip condition {{ciCurrentGrossEffects injury.severity "style"}}'>
- {{ciCurrentGrossEffects injury.severity "label"}}
+ <div
+ class='tooltip condition {{ciCurrentGrossEffects data.conditionalinjury.injury.severity "style"}}'>
+ {{ciCurrentGrossEffects data.conditionalinjury.injury.severity "label"}}
<span class="tooltiptext">
<div class="fieldblock">
{{#ciSeveritiesTooltip}}
</div>
</div>
<div class='basic-value fieldblock3'>
- <div class="points">[{{#if RT.points}}{{RT.points}}{{else}}{{../data.HP.points}}{{/if}}]</div>
- <div class='field'>{{RT.value}} RT</div>
- <div class='label'>{{../data.HP.max}} HP</div>
+ <div class="points">[{{#if
+ data.conditionalinjury.injury.RT.points}}{{data.conditionalinjury.injury.RT.points}}{{else}}{{data.HP.points}}{{/if}}]
+ </div>
+ <div class='field'>{{data.conditionalinjury.injuryRT.value}} RT</div>
+ <div class='label'>{{data.HP.max}} HP</div>
</div>
</div>
</div>
- {{/with}}
</div>
{{else}}
<div id='combat-hit' class='tracked-resource' data-gurps-resource='HP'>
| 1 |
diff --git a/app/hotels/src/map/allHotels/HotelSwipeList.js b/app/hotels/src/map/allHotels/HotelSwipeList.js @@ -59,7 +59,9 @@ class HotelSwipeList extends React.Component<Props, State> {
carouselRef: React.ElementRef<typeof Carousel>;
componentDidUpdate = () => {
+ if (this.carouselRef) {
this.carouselRef.snapToItem(this.props.selectedIndex, false);
+ }
};
getSelectedAddress = () => {
| 0 |
diff --git a/src/ApiGateway.js b/src/ApiGateway.js @@ -318,23 +318,23 @@ module.exports = class ApiGateway {
const { requestTemplates } = endpoint
// Prefix must start and end with '/' BUT path must not end with '/'
- let fullPath =
+ let hapiPath =
this._options.prefix + (epath.startsWith('/') ? epath.slice(1) : epath)
- if (fullPath !== '/' && fullPath.endsWith('/')) {
- fullPath = fullPath.slice(0, -1)
+ if (hapiPath !== '/' && hapiPath.endsWith('/')) {
+ hapiPath = hapiPath.slice(0, -1)
}
- fullPath = fullPath.replace(/\+}/g, '*}')
+ hapiPath = hapiPath.replace(/\+}/g, '*}')
const protectedRoutes = []
if (http.private) {
- protectedRoutes.push(`${method}#${fullPath}`)
+ protectedRoutes.push(`${method}#${hapiPath}`)
}
if (!isLambdaInvokeRoute) {
const { host, httpsProtocol, port } = this._options
const server = `${httpsProtocol ? 'https' : 'http'}://${host}:${port}`
- serverlessLog.logRoute(method, server, fullPath)
+ serverlessLog.logRoute(method, server, hapiPath)
}
// If the endpoint has an authorization function, create an authStrategy for the route
@@ -360,7 +360,7 @@ module.exports = class ApiGateway {
}
// Route creation
- const routeMethod = method === 'ANY' ? '*' : method
+ const hapiMethod = method === 'ANY' ? '*' : method
const state = this._options.disableCookieValidation
? {
@@ -372,7 +372,7 @@ module.exports = class ApiGateway {
parse: true,
}
- const routeOptions = {
+ const hapiOptions = {
auth: authStrategyName,
cors,
state,
@@ -381,7 +381,7 @@ module.exports = class ApiGateway {
// skip HEAD routes as hapi will fail with 'Method name not allowed: HEAD ...'
// for more details, check https://github.com/dherault/serverless-offline/issues/204
- if (routeMethod === 'HEAD') {
+ if (hapiMethod === 'HEAD') {
serverlessLog(
'HEAD method event detected. Skipping HAPI server route mapping ...',
)
@@ -389,10 +389,10 @@ module.exports = class ApiGateway {
return
}
- if (routeMethod !== 'HEAD' && routeMethod !== 'GET') {
+ if (hapiMethod !== 'HEAD' && hapiMethod !== 'GET') {
// maxBytes: Increase request size from 1MB default limit to 10MB.
// Cf AWS API GW payload limits.
- routeOptions.payload = {
+ hapiOptions.payload = {
maxBytes: 1024 * 1024 * 10,
parse: false,
}
@@ -408,7 +408,7 @@ module.exports = class ApiGateway {
)
if (!isLambdaInvokeRoute) {
- routeOptions.tags = ['api']
+ hapiOptions.tags = ['api']
}
const hapiHandler = async (request, h) => {
@@ -437,8 +437,8 @@ module.exports = class ApiGateway {
// Check for APIKey
if (
- (protectedRoutes.includes(`${routeMethod}#${fullPath}`) ||
- protectedRoutes.includes(`ANY#${fullPath}`)) &&
+ (protectedRoutes.includes(`${hapiMethod}#${hapiPath}`) ||
+ protectedRoutes.includes(`ANY#${hapiPath}`)) &&
!this._options.noAuth
) {
const errorResponse = () =>
@@ -892,9 +892,9 @@ module.exports = class ApiGateway {
this._server.route({
handler: hapiHandler,
- method: routeMethod,
- options: routeOptions,
- path: fullPath,
+ method: hapiMethod,
+ options: hapiOptions,
+ path: hapiPath,
})
}
@@ -953,12 +953,12 @@ module.exports = class ApiGateway {
)
}
- let fullPath =
+ let hapiPath =
this._options.prefix +
(pathResource.startsWith('/') ? pathResource.slice(1) : pathResource)
- if (fullPath !== '/' && fullPath.endsWith('/'))
- fullPath = fullPath.slice(0, -1)
- fullPath = fullPath.replace(/\+}/g, '*}')
+ if (hapiPath !== '/' && hapiPath.endsWith('/'))
+ hapiPath = hapiPath.slice(0, -1)
+ hapiPath = hapiPath.replace(/\+}/g, '*}')
const proxyUriOverwrite = resourceRoutesOptions[methodId] || {}
const proxyUriInUse = proxyUriOverwrite.Uri || proxyUri
@@ -969,12 +969,12 @@ module.exports = class ApiGateway {
)
}
- const routeMethod = method === 'ANY' ? '*' : method
- const routeOptions = { cors: this._options.corsConfig }
+ const hapiMethod = method === 'ANY' ? '*' : method
+ const hapiOptions = { cors: this._options.corsConfig }
// skip HEAD routes as hapi will fail with 'Method name not allowed: HEAD ...'
// for more details, check https://github.com/dherault/serverless-offline/issues/204
- if (routeMethod === 'HEAD') {
+ if (hapiMethod === 'HEAD') {
serverlessLog(
'HEAD method event detected. Skipping HAPI server route mapping ...',
)
@@ -982,13 +982,13 @@ module.exports = class ApiGateway {
return
}
- if (routeMethod !== 'HEAD' && routeMethod !== 'GET') {
- routeOptions.payload = { parse: false }
+ if (hapiMethod !== 'HEAD' && hapiMethod !== 'GET') {
+ hapiOptions.payload = { parse: false }
}
- serverlessLog(`${method} ${fullPath} -> ${proxyUriInUse}`)
+ serverlessLog(`${method} ${hapiPath} -> ${proxyUriInUse}`)
- // routeOptions.tags = ['api']
+ // hapiOptions.tags = ['api']
const hapiHandler = (request, h) => {
const { params } = request
@@ -1014,9 +1014,9 @@ module.exports = class ApiGateway {
this._server.route({
handler: hapiHandler,
- method: routeMethod,
- options: routeOptions,
- path: fullPath,
+ method: hapiMethod,
+ options: hapiOptions,
+ path: hapiPath,
})
})
}
| 10 |
diff --git a/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs b/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs return null;
};
const axiosConfig = {
- headers: { timeout: 5000, Authorization: getBearerToken() },
+ timeout: 5000,
+ headers: { Authorization: getBearerToken() },
};
<%_ } _%>
urls = (
await Promise.allSettled(
services.map(async service => {
- const response = await axios.get(`/services/${service}/management/jhiopenapigroups`, axiosConfig);
+ return axios.get(`/services/${service}/management/jhiopenapigroups`, axiosConfig).then(response => {
if (Array.isArray(response.data)) {
return response.data.map(({ group, description }) => ({
name: description,
}));
}
return undefined;
+ }).catch(() => {
+ return axios
+ .get(`/services/${service}${baseUrl}`, axiosConfig)
+ .then(() => [{ url: `/services/${service}${baseUrl}`, name: `${service} (default)` }]);
+ });
})
)
)
.map(settled => settled.value)
.filter(Array.isArray)
.flat();
- } else {
+ }
+ if (urls.length === 0) {
const response = await axios.get('/management/jhiopenapigroups', axiosConfig);
if (Array.isArray(response.data)) {
urls = response.data.map(({ group, description }) => ({ name: description, url: `${baseUrl}/${group}` }));
| 7 |
diff --git a/src/Model.d.ts b/src/Model.d.ts @@ -177,29 +177,29 @@ export class Paged<T> extends Array {
export type AnyModel = {
constructor(table: any, name: string, options?: ModelConstructorOptions): AnyModel;
create(properties: OneProperties, params?: OneParams): Promise<AnyEntity>;
- find(properties?: OneProperties, params?: OneParams): Promise<Paged<AnyEntity[]>>;
+ find(properties?: OneProperties, params?: OneParams): Promise<Paged<AnyEntity>>;
get(properties: OneProperties, params?: OneParams): Promise<AnyEntity>;
init(properties?: OneProperties, params?: OneParams): AnyEntity;
remove(properties: OneProperties, params?: OneParams): Promise<void>;
- scan(properties?: OneProperties, params?: OneParams): Promise<Paged<AnyEntity[]>>;
+ scan(properties?: OneProperties, params?: OneParams): Promise<Paged<AnyEntity>>;
update(properties: OneProperties, params?: OneParams): Promise<AnyEntity>;
// deleteItem(properties: OneProperties, params?: OneParams): Promise<void>;
// getItem(properties: OneProperties, params?: OneParams): Promise<AnyEntity>;
// initItem(properties?: OneProperties, params?: OneParams): AnyEntity;
// putItem(properties: OneProperties, params?: OneParams): Promise<AnyEntity>;
- // queryItems(properties: OneProperties, params?: OneParams): Promise<Paged<AnyEntity[]>>;
- // scanItems(properties?: OneProperties, params?: OneParams): Promise<Paged<AnyEntity[]>>;
+ // queryItems(properties: OneProperties, params?: OneParams): Promise<Paged<AnyEntity>>;
+ // scanItems(properties?: OneProperties, params?: OneParams): Promise<Paged<AnyEntity>>;
// updateItem(properties: OneProperties, params?: OneParams): Promise<AnyEntity>;
};
export class Model<T> {
constructor(table: any, name: string, options?: ModelConstructorOptions);
create(properties: T, params?: OneParams): Promise<T>;
- find(properties?: T, params?: OneParams): Promise<Paged<T[]>>;
+ find(properties?: T, params?: OneParams): Promise<Paged<T>>;
get(properties: T, params?: OneParams): Promise<T>;
init(properties?: T, params?: OneParams): T;
remove(properties: T, params?: OneParams): Promise<void>;
- scan(properties?: T, params?: OneParams): Promise<Paged<T[]>>;
+ scan(properties?: T, params?: OneParams): Promise<Paged<T>>;
update(properties: T, params?: OneParams): Promise<T>;
}
| 1 |
diff --git a/js/webcomponents/bisweb_orthogonalviewerelement.js b/js/webcomponents/bisweb_orthogonalviewerelement.js @@ -1151,7 +1151,10 @@ class OrthogonalViewerElement extends BaseViewerElement {
// The middle -- set the parameters
try {
let ind=this.internal.displaymodes.indexOf(sanedata['displaymode']);
+ if (ind>=0) {
+ this.internal.datgui.data.displaymode=this.internal.displaymodes[ind];
this.setrendermode(ind);
+ }
this.internal.showdecorations=sanedata['decorations'];
| 3 |
diff --git a/packages/diffhtml/lib/tasks/patch-node.js b/packages/diffhtml/lib/tasks/patch-node.js -import patchNode from '../node/patch';
+import patch from '../node/patch';
import Transaction from '../transaction';
import { CreateNodeHookCache, VTree } from '../util/types';
import globalThis from '../util/global';
@@ -9,7 +9,7 @@ import globalThis from '../util/global';
* @param {Transaction} transaction
* @return {void}
*/
-export default function patch(transaction) {
+export default function patchNode(transaction) {
const { mount, state, patches } = transaction;
const { mutationObserver, measure, scriptsToExecute } = state;
@@ -37,7 +37,7 @@ export default function patch(transaction) {
// Skip patching completely if we aren't in a DOM environment.
if (state.ownerDocument) {
- promises.push(...patchNode(patches, state));
+ promises.push(...patch(patches, state));
}
CreateNodeHookCache.delete(collectScripts);
| 10 |
diff --git a/UserReviewBanHelper.user.js b/UserReviewBanHelper.user.js // @description Display users' prior review bans in review, Insert review ban button in user review ban history page, Load ban form for user if user ID passed via hash
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 3.13.2
+// @version 3.13.3
//
// @include */review/close*
// @include */review/reopen*
return ax < bx ? -1 : 1;
}).appendTo('.js-review-instructions');
- debugger;
-
// Add review-ban button for users who selected "requires editing"
$(`<button class="mt16">Review ban "Requires Editing"</button>`).appendTo('.reviewable-post-stats')
.click(function() {
| 2 |
diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js @@ -35,7 +35,7 @@ function allowsChild(parent, child) {
return type === "room" || type === "rooms" || type === "settings";
case "rooms":
// downside of the approach: both of these will control which tile is selected
- return type === "room" || type === "empty-grid-tile";
+ return type === "room" || type === "empty-grid-tile" || type === "details";
case "room":
return type === "lightbox" || type === "details";
default:
| 11 |
diff --git a/includes/Core/Authentication/Authentication.php b/includes/Core/Authentication/Authentication.php @@ -391,7 +391,6 @@ final class Authentication {
// Handles Direct OAuth client request.
if ( filter_input( INPUT_GET, 'oauth2callback' ) ) {
$auth_client->authorize_user();
- exit;
}
if ( ! is_admin() ) {
| 2 |
diff --git a/quasar/dev/components/components/list-expansion-item.vue b/quasar/dev/components/components/list-expansion-item.vue <p class="caption">On dark Background</p>
<q-expansion-item dark class="bg-black" icon="shopping_cart" label="Toggle me">
- <q-card dark>
+ <q-card dark class="bg-black">
<q-card-section>
{{ lorem }}
</q-card-section>
| 1 |
diff --git a/.vscode/settings.json b/.vscode/settings.json "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
- "javascript.format.placeOpenBraceOnNewLineForFunctions": false,
- "javascript.format.placeOpenBraceOnNewLineForControlBlocks": false
+ "javascript.format.placeOpenBraceOnNewLineForFunctions": true,
+ "javascript.format.placeOpenBraceOnNewLineForControlBlocks": true
}
| 3 |
diff --git a/app/controllers/carto/api/visualization_presenter.rb b/app/controllers/carto/api/visualization_presenter.rb @@ -16,7 +16,7 @@ module Carto
@context = context
@related = related
- @related_canonical_visualizations = related_canonical_visualizations
+ @load_related_canonical_visualizations = related_canonical_visualizations
@show_stats = show_stats
@show_likes = show_likes
@show_liked = show_liked
@@ -71,7 +71,7 @@ module Carto
}
poro[:related_tables] = related_tables if related
- poro[:related_canonical_visualizations] = related_canonical_visualizations if @related_canonical_visualizations
+ poro[:related_canonical_visualizations] = related_canonicals if load_related_canonical_visualizations
poro[:likes] = @visualization.likes_count if show_likes
poro[:liked] = @current_viewer ? @visualization.liked_by?(@current_viewer.id) : false if show_liked
poro[:table] = user_table_presentation if show_table
@@ -126,7 +126,7 @@ module Carto
private
- attr_reader :related,
+ attr_reader :related, :load_related_canonical_visualizations,
:show_stats, :show_likes, :show_liked, :show_table,
:show_permission, :show_synchronization, :show_uses_builder_features,
:show_table_size_and_row_count
@@ -170,7 +170,7 @@ module Carto
end
end
- def related_canonical_visualizations
+ def related_canonicals
@visualization.related_canonical_visualizations.map { |v| self.class.new(v, @current_viewer, @context).to_poro }
end
| 10 |
diff --git a/addon/components/paper-button.js b/addon/components/paper-button.js @@ -33,7 +33,8 @@ export default Component.extend(FocusableMixin, RippleMixin, ColorMixin, Proxiab
'type',
'href',
'target',
- 'title'
+ 'title',
+ 'download'
],
classNameBindings: [
'raised:md-raised',
| 11 |
diff --git a/src/article/JATS4R.rng b/src/article/JATS4R.rng <optional><ref name="article-title"/></optional>
<optional><ref name="chapter-title"/></optional>
<optional><ref name="comment"/></optional>
+ <optional><ref name="collab"/></optional>
<optional><ref name="edition"/></optional>
<optional><ref name="elocation-id"/></optional>
<optional><ref name="fpage"/></optional>
| 11 |
diff --git a/src/config/config.js b/src/config/config.js -import { once } from 'lodash'
+import { noop, once } from 'lodash'
import moment from 'moment'
import { version as contractsVersion } from '../../node_modules/@gooddollar/goodcontracts/package.json'
import { version } from '../../package.json'
@@ -13,7 +13,9 @@ import env from './env'
//import { isE2ERunning } from '../lib/utils/platform'
const { search: qs = '' } = isWeb ? window.location : {}
-const forceLogLevel = qs.match(/level=(.*?)($|&)/)
+const webStorage = isWeb ? window.localStorage : { getItem: noop }
+
+const forceLogLevel = qs.match(/level=(.*?)($|&)/) || webStorage.getItem('GD_LogLevel')
const forcePeer = qs.match(/gun=(.*?)($|&)/)
const phase = env.REACT_APP_RELEASE_PHASE || 1
| 0 |
diff --git a/scenes/treehouse.scn b/scenes/treehouse.scn "start_url": "/avatars/gear.vrm",
"dynamic": true
},
+ {
+ "position": [
+ 4,
+ 0,
+ 3
+ ],
+ "quaternion": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "physics": false,
+ "start_url": "https://webaverse.github.io/infinifruit/",
+ "dynamic": true
+ },
{
"position": [
-13,
| 0 |
diff --git a/src/routes.json b/src/routes.json "title": "Microworlds"
},
{
- "name": "preview",
- "pattern": "^/preview(/editor|(/\\d+(/editor|/fullscreen)?)?)?/?(\\?.*)?$",
- "routeAlias": "/preview/?$",
+ "name": "projects",
+ "pattern": "^/projects(/editor|(/\\d+(/editor|/fullscreen)?)?)?/?(\\?.*)?$",
+ "routeAlias": "/projects/?$",
"view": "preview/preview",
- "title": "Scratch 3.0 Preview"
+ "title": "Scratch Project"
},
{
"name": "3faq",
| 10 |
diff --git a/plugins/debug/debugPanel.js b/plugins/debug/debugPanel.js // patch timer.js
me.plugin.patch(me.timer, "update", function (dt) {
// call the original me.timer.update function
- this._patched(dt);
+ this._patched.apply(this, arguments);
// call the FPS counter
me.timer.countFPS();
me.plugin.patch(me.game, "update", function (dt) {
var frameUpdateStartTime = window.performance.now();
- this._patched(dt);
+ this._patched.apply(this, arguments);
// calculate the update time
_this.frameUpdateTime = window.performance.now() - frameUpdateStartTime;
_this.counters.reset();
- this._patched();
+ this._patched.apply(this, arguments);
// calculate the drawing time
_this.frameDrawTime = window.performance.now() - frameDrawStartTime;
// patch font.js
me.plugin.patch(me.Font, "draw", function (renderer, text, x, y) {
// call the original me.Sprite.draw function
- this._patched(renderer, text, x, y);
+ this._patched.apply(this, arguments);
// draw the font rectangle
if (me.debug.renderHitBox) {
// patch font.js
me.plugin.patch(me.Font, "drawStroke", function (renderer, text, x, y) {
// call the original me.Sprite.draw function
- this._patched(renderer, text, x, y);
+ this._patched.apply(this, arguments);
// draw the font rectangle
if (me.debug.renderHitBox) {
}
}
// call the original me.Entity.postDraw function
- this._patched(renderer);
+ this._patched.apply(this, arguments);
});
// patch container.js
me.plugin.patch(me.Container, "draw", function (renderer, rect) {
// call the original me.Container.draw function
- this._patched(renderer, rect);
+ this._patched.apply(this, arguments);
// check if debug mode is enabled
if (!_this.visible) {
| 1 |
diff --git a/rules.json b/rules.json ".validate": "newData.hasChildren(['type', 'content'])",
// Make sure the type is text
"type": {
- ".validate": "newData.val() === 'text' || newData.val() === 'media'"
- },
- "content": {
- ".validate": "newData.exists()"
+ ".validate": "newData.val() === 'text' || newData.val() === 'media' || newData.val() === 'draft-js'"
}
}
}
| 11 |
diff --git a/pages/release notes/TypeScript 3.7.md b/pages/release notes/TypeScript 3.7.md * [Assertion Functions](#assertion-functions)
* [Better Support for `never`-Returning Functions](#better-support-for-never-returning-functions)
* [(More) Recursive Type Aliases](#more-recursive-type-aliases)
-* [`--declaration` and `--allowJs`](#--declaration-and--allowjs)
+* [`--declaration` and `--allowJs`](#--declaration-and---allowjs)
* [The `useDefineForClassFields` Flag and The `declare` Property Modifier](#the-usedefineforclassfields-flag-and-the-declare-property-modifier)
* [Build-Free Editing with Project References](#build-free-editing-with-project-references)
* [Uncalled Function Checks](#uncalled-function-checks)
-* [`// @ts-nocheck` in TypeScript Files](#ts-nocheck-in-typescript-files)
+* [`// @ts-nocheck` in TypeScript Files](#-ts-nocheck-in-typescript-files)
* [Semicolon Formatter Option](#semicolon-formatter-option)
* [Breaking Changes](#breaking-Changes)
* [DOM Changes](#dom-changes)
| 1 |
diff --git a/renderer/components/UI/Button.js b/renderer/components/UI/Button.js @@ -81,7 +81,7 @@ const Button = React.forwardRef((props, ref) => {
>
{isProcessing || Icon ? (
<Flex alignItems="center" justifyContent="center">
- {isProcessing ? <Spinner /> : Icon && <Icon />}
+ {isProcessing ? <Spinner height="0.8em" width="0.8em" /> : Icon && <Icon />}
<Box fontSize={fontSize} fontWeight={fontWeight} ml={2}>
{children}
</Box>
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.