code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/index.d.ts b/index.d.ts @@ -1303,7 +1303,7 @@ declare module "mongoose" {
alias?: string;
/** Function or object describing how to validate this schematype. See [validation docs](https://mongoosejs.com/docs/validation.html). */
- validate?: RegExp | [RegExp, string] | Function | [Function , string] | ValidateOpts<T>;
+ validate?: RegExp | [RegExp, string] | Function | [Function , string] | ValidateOpts<T> | ValidateOpts<T>[];
/** Allows overriding casting logic for this individual path. If a string, the given string overwrites Mongoose's default cast error message. */
cast?: string;
| 11 |
diff --git a/docs/clustering.rst b/docs/clustering.rst @@ -20,6 +20,8 @@ In this example, we include the classes that are specific to clustering. For a
For some of the clustering components, like ConfigSync and failoverAddress, you can use JSON pointers to reference objects/properties in declarations.
+.. NOTE:: The DeviceTrust and DeviceGroup sections in both declarations should be identical. For DeviceTrust, if the remoteHost matches the management IP or one of the self IPs of the host on which it is running, that DeviceTrust section is ignored. If it does not match, then the device processing the declaration will send a request to the remote host to be added to trust. There is similar logic regarding the DeviceGroup owner. The owning device just creates the group, the other device requests to be added to the group.
+
The following declaration snippet could continue after the :ref:`route-class` in the standalone BIG-IP example.
.. code-block:: javascript
@@ -134,8 +136,6 @@ Device Group class
The next class specific to clustering is the device group class. A device group is a collection of BIG-IP devices that trust each other and can synchronize (and fail over if you choose sync-failover), their BIG-IP configuration data.
For more information on Device Groups on the BIG-IP, see |group|. In this example, for the *owner* parameter, we are using a JSON pointer. The value in the example means that the first object in the *members* array.
-.. NOTE:: The DeviceTrust and DeviceGroup sections in both declarations should be identical. For DeviceTrust, if the remoteHost matches the management IP or one of the self IPs of the host on which it is running, that DeviceTrust section is ignored. If it does not match, then the device processing the declaration will send a request to the remote host to be added to trust. There is similar logic regarding the DeviceGroup owner. The owning device just creates the group, the other device requests to be added to the group.
-
**Important**: You cannot use *autoSync* and *fullLoadOnSync* together.
.. code-block:: javascript
| 5 |
diff --git a/edit.js b/edit.js @@ -78,14 +78,6 @@ function mod(a, b) {
roomName: 'lol',
});
}
- if (q.b) { // base
- const mesh = await runtime.loadFile({
- name: q.b,
- url: q.b,
- });
- mesh.run && mesh.run();
- scene.add(mesh);
- }
if (q.o) { // object
world.addObject(q.o);
}
| 2 |
diff --git a/js/index.js b/js/index.js @@ -244,7 +244,7 @@ function refreshLibrary() {
tab.setAttribute("data-badge", appJSON.length);
//github icon onClick
htmlToArray(panelbody.getElementsByClassName("link-github")).forEach(link => {
- link.addEventListener("click",event => {
+
var username = window.location.href;
var url = "https://github.com/espruino/BangleApps/tree/master/apps/"+link.getAttribute("appid");
if(!username.startsWith("https://banglejs.com/apps")){
@@ -255,8 +255,8 @@ function refreshLibrary() {
username = username.substr(0,username.lastIndexOf("."));
url = "https://github.com/"+username+"/BangleApps/tree/master/apps/"+link.getAttribute("appid");
}
- window.open(url);
- });
+ link.href=url;
+
});
htmlToArray(panelbody.getElementsByTagName("button")).forEach(button => {
button.addEventListener("click",event => {
| 12 |
diff --git a/packages/insomnia/src/ui/hooks/use-vcs.ts b/packages/insomnia/src/ui/hooks/use-vcs.ts @@ -7,12 +7,14 @@ import { type MergeConflict } from '../../sync/types';
import { VCS } from '../../sync/vcs/vcs';
import { showModal } from '../components/modals/index';
import { SyncMergeModal } from '../components/modals/sync-merge-modal';
+
+let vcsInstance: VCS | null = null;
+
export function useVCS({
workspaceId,
}: {
workspaceId?: string;
}) {
- const vcsInstanceRef = useRef<VCS | null>(null);
const [vcs, setVCS] = useState<VCS | null>(null);
const updateVCSLock = useRef<boolean | string>(false);
@@ -24,10 +26,11 @@ export function useVCS({
// Set vcs to null while we update it
setVCS(null);
- if (!vcsInstanceRef.current) {
+ async function updateVCS() {
+ if (!vcsInstance) {
const driver = FileSystemDriver.create(getDataDirectory());
- vcsInstanceRef.current = new VCS(driver, async conflicts => {
+ vcsInstance = new VCS(driver, async conflicts => {
return new Promise(resolve => {
showModal(SyncMergeModal, {
conflicts,
@@ -38,15 +41,18 @@ export function useVCS({
}
if (workspaceId) {
- vcsInstanceRef.current.switchProject(workspaceId);
+ await vcsInstance.switchProject(workspaceId);
} else {
- vcsInstanceRef.current.clearBackendProject();
+ await vcsInstance.clearBackendProject();
}
// Prevent a potential race-condition when _updateVCS() gets called for different workspaces in rapid succession
if (updateVCSLock.current === lock) {
- setVCS(vcsInstanceRef.current);
+ setVCS(vcsInstance);
}
+ }
+
+ updateVCS();
}, [workspaceId]);
return vcs;
| 3 |
diff --git a/src/DevChatter.Bot.Web/wwwroot/js/wasteful-game/wasteful.js b/src/DevChatter.Bot.Web/wwwroot/js/wasteful-game/wasteful.js @@ -106,9 +106,10 @@ export class Wasteful {
/**
* @public
- * @param {string} direction
+ * @param {string} direction direction to move player
+ * @param {number} moveNumber number of spaces to move
*/
- movePlayer(direction, moveNumber) {
+ movePlayer(direction, moveNumber = 1) {
if (moveNumber > 0) {
this._player.getComponent(MovableComponent).move(direction);
| 1 |
diff --git a/docs/src/pages/vue-components/time.md b/docs/src/pages/vue-components/time.md @@ -53,7 +53,7 @@ Clicking on the "Now" button sets time to current user time:
### Using with QInput
<doc-example title="Input" file="QTime/Input" />
-More info: [QInput](/vue-components/input), [QInput](/vue-components/input).
+More info: [QInput](/vue-components/input).
## QTime API
<doc-api file="QTime" />
| 3 |
diff --git a/src/selectize.js b/src/selectize.js @@ -2055,7 +2055,7 @@ Object.assign(Selectize.prototype, {
if (option_select) {
let option = self.getOption(option_select);
if( option ){
- self.setActiveOption(option_select);
+ self.setActiveOption(option);
}
}
| 12 |
diff --git a/src/components/views/Viewscreen/manager.js b/src/components/views/Viewscreen/manager.js @@ -152,9 +152,9 @@ class ViewscreenCore extends Component {
configData
} = this.state;
const LayoutComponent =
- Layouts[this.props.simulator.layout + "Viewscreen"] ||
- Layouts[this.props.simulator.layout] ||
- (({ children }) => <div>{children}</div>);
+ // Layouts[this.props.simulator.layout + "Viewscreen"] ||
+ //Layouts[this.props.simulator.layout] ||
+ ({ children }) => <div>{children}</div>;
if (!viewscreens) return <div>No Viewscreens</div>;
return (
<div className="viewscreen-core">
| 2 |
diff --git a/tools/markdown/equation-element/lib/render.js b/tools/markdown/equation-element/lib/render.js @@ -21,6 +21,7 @@ var escapeHTML = require( './escape_html.js' );
* </div>
* ```
*
+* @private
* @param {Options} opts - render options
* @param {string} opts.className - element class name
* @param {string} opts.align - element alignment
| 12 |
diff --git a/src/components/draftListItem/view/draftListItemView.js b/src/components/draftListItem/view/draftListItemView.js import React, { useRef, useState, useEffect, Fragment } from 'react';
-import ActionSheet from 'react-native-actionsheet';
import { View, Text, TouchableOpacity, Dimensions } from 'react-native';
import { injectIntl } from 'react-intl';
import ImageSize from 'react-native-image-size';
@@ -11,6 +10,7 @@ import { getTimeFromNow } from '../../../utils/time';
import { PostHeaderDescription } from '../../postElements';
import { IconButton } from '../../iconButton';
import ProgressiveImage from '../../progressiveImage';
+import { OptionsModal } from '../../atoms';
// Styles
import styles from './draftListItemStyles';
@@ -95,7 +95,7 @@ const DraftListItemView = ({
</View>
</View>
- <ActionSheet
+ <OptionsModal
ref={actionSheet}
options={[
intl.formatMessage({ id: 'alert.delete' }),
| 14 |
diff --git a/package.json b/package.json "hamljs": "^0.6.2",
"handlebars": "^4.1.1",
"javascript-stringify": "^2.0.0",
- "liquidjs": "^6.2.0",
+ "liquidjs": "^6.4.3",
"lodash": "^4.17.11",
"luxon": "^1.12.0",
"markdown-it": "^8.4.2",
| 3 |
diff --git a/src/extras/module-types.js b/src/extras/module-types.js +import { resolveUrl } from '../common.js';
+
/*
* Loads JSON, CSS, Wasm module types based on file extension
* filters and content type verifications
if (cssContentType.test(contentType))
return res.text()
.then(function (source) {
+ source = source.replace(/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g, function (match, quotes, relUrl1, relUrl2) {
+ return 'url(' + quotes + resolveUrl(relUrl1 || relUrl2, url) + quotes + ')';
+ });
return new Response(new Blob([
'System.register([],function(e){return{execute:function(){var s=new CSSStyleSheet();s.replaceSync(' + JSON.stringify(source) + ');e("default",s)}}})'
], {
| 1 |
diff --git a/test/unit/config/config.test.js b/test/unit/config/config.test.js @@ -1350,25 +1350,27 @@ describe('the agent configuration', function() {
const createSampleConfig = (filename) => {
CONFIG_PATH = path.join(DESTDIR, filename)
- var config = fs.readFileSync(
- path.join(__dirname, '../../../lib/config/default.js')
- )
+ const config = {
+ app_name: filename
+ }
- fs.writeFileSync(CONFIG_PATH, config)
+ fs.writeFileSync(CONFIG_PATH, `exports.config = ${JSON.stringify(config)}`)
}
it('should load the default newrelic.js config file', function() {
- createSampleConfig("newrelic.js")
+ const filename = "newrelic.js"
+ createSampleConfig(filename)
const configuration = Config.initialize()
- expect(configuration.newrelic_home).equal(DESTDIR)
+ expect(configuration.app_name).equal(filename)
})
it('should load the default newrelic.cjs config file', function() {
- createSampleConfig("newrelic.cjs")
+ const filename = "newrelic.cjs"
+ createSampleConfig(filename)
const configuration = Config.initialize()
- expect(configuration.newrelic_home).equal(DESTDIR)
+ expect(configuration.app_name).equal(filename)
})
it('should load config when overriding the default with NEW_RELIC_CONFIG_FILENAME', function() {
@@ -1377,7 +1379,7 @@ describe('the agent configuration', function() {
createSampleConfig(filename)
const configuration = Config.initialize()
- expect(configuration.newrelic_home).equal(DESTDIR)
+ expect(configuration.app_name).equal(filename)
})
})
| 7 |
diff --git a/token-metadata/0x26E43759551333e57F073bb0772F50329A957b30/metadata.json b/token-metadata/0x26E43759551333e57F073bb0772F50329A957b30/metadata.json "symbol": "DGVC",
"address": "0x26E43759551333e57F073bb0772F50329A957b30",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/screens/transfer/screen/addressScreen.js b/src/screens/transfer/screen/addressScreen.js -import React, { Fragment, Component } from 'react';
-import { Text, View, ScrollView, TouchableOpacity } from 'react-native';
-import { WebView } from 'react-native-webview';
-import ActionSheet from 'react-native-actionsheet';
+import React, { Fragment } from 'react';
+import { Text, View, ScrollView } from 'react-native';
import { injectIntl } from 'react-intl';
-import get from 'lodash/get';
import QRCode from 'react-native-qrcode-svg';
-import { connect, useDispatch } from 'react-redux';
-
-import { hsOptions } from '../../../constants/hsOptions';
-import AUTH_TYPE from '../../../constants/authType';
-import { encryptKey, decryptKey } from '../../../utils/crypto';
-
-import { BasicHeader, MainButton } from '../../../components';
+import { connect } from 'react-redux';
+import { BasicHeader } from '../../../components';
import styles from './transferStyles';
| 14 |
diff --git a/lib/monitor.js b/lib/monitor.js @@ -29,13 +29,13 @@ CommandHistory.prototype.getNextCommand = function(cmd) {
};
function Dashboard(options) {
- var title = options && options.title || "Embark 2.0";
+ var title = (options && options.title) || "Embark 2.3.0";
this.env = options.env;
this.console = options.console;
this.history = new CommandHistory();
- this.color = options && options.color || "green";
- this.minimal = options && options.minimal || false;
+ this.color = (options && options.color) || "green";
+ this.minimal = (options && options.minimal) || false;
this.screen = blessed.screen({
smartCSR: true,
@@ -45,10 +45,10 @@ function Dashboard(options) {
autoPadding: true
});
- this.layoutLog.call(this);
- this.layoutStatus.call(this);
- this.layoutModules.call(this);
- this.layoutCmd.call(this);
+ this.layoutLog();
+ this.layoutStatus();
+ this.layoutModules();
+ this.layoutCmd();
this.screen.key(["C-c"], function() {
process.exit(0);
| 2 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.js b/lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-number/input-number-content-view.js @@ -11,6 +11,7 @@ module.exports = CoreView.extend({
render: function () {
this.clearSubViews();
+ this._removeForm();
this.$el.empty();
this.$el.append(template({
@@ -103,6 +104,10 @@ module.exports = CoreView.extend({
this.$('.js-content').append(this._formView.render().$el);
},
+ _removeForm: function () {
+ this._formView && this._formView.remove();
+ },
+
_onClickBack: function (e) {
this.killEvent(e);
this.trigger('back', this);
@@ -120,7 +125,7 @@ module.exports = CoreView.extend({
clean: function () {
// Backbone.Form removes the view with the following method
- this._formView.remove();
+ this._removeForm();
CoreView.prototype.clean.call(this);
}
});
| 2 |
diff --git a/app/assets/src/components/views/samples/constants.js b/app/assets/src/components/views/samples/constants.js @@ -33,7 +33,7 @@ export const SAMPLE_TABLE_COLUMNS_V2 = {
},
duplicateCompressionRatio: {
tooltip: `Duplicate Compression Ratio is the ratio of the total number of
- sequences present prior to running idseq-dedup (duplicate identification) vs
+ sequences present prior to running czid-dedup (duplicate identification) vs
the number of unique sequences.`,
link:
DOC_BASE_LINK +
| 10 |
diff --git a/layouts/partials/helpers/text-color.html b/layouts/partials/helpers/text-color.html {{- $bg := .self.Scratch.Get "bg" }}
+{{ printf "-- logging -- overwrite %s -- bg %s -- light %s -- dark %s -- end of logging --" .overwrite $bg .light .dark }}
{{- $text_muted := cond (.muted | default false) "text-muted " "" -}}
-{{- $text_dark := cond (.dark | default false) (printf "text-%s" (.dark | default "dark")) "" -}}
-{{- $text_light := cond (.light | default false) (printf "text-%s" (.light | default "light")) "" -}}
+{{- $text_dark := cond (isset . "dark") (cond (eq .dark "") "" (printf "text-%s" .dark)) "text-dark" -}}
+{{- $text_light := cond (isset . "light") (cond (eq .light "") "" (printf "text-%s" .light)) "text-light" -}}
{{- if .overwrite -}}
{{- printf " text-%s" .overwrite -}}
{{- else -}}
| 1 |
diff --git a/web/components/pages/OrganisationSettingsPage.js b/web/components/pages/OrganisationSettingsPage.js @@ -151,7 +151,9 @@ const OrganisationSettingsPage = class extends Component {
/>);
};
- drawChart = data => (
+ drawChart = (data) => {
+ if (data && data.hasOwnProperty && data.hasOwnProperty('length')) { // protect against influx setup incorrectly
+ return (
<ResponsiveContainer height={400} width="100%">
<BarChart data={data}>
<CartesianGrid strokeDasharray="3 5"/>
@@ -165,6 +167,9 @@ const OrganisationSettingsPage = class extends Component {
</BarChart>
</ResponsiveContainer>
);
+ }
+ return null;
+ }
render() {
const { hasFeature, getValue } = this.props;
| 9 |
diff --git a/runtime.js b/runtime.js @@ -47,7 +47,7 @@ const startMonetization = (instanceId, monetizationPointer, ownerAddress) => {
let monetization = document[`monetization${instanceId}`];
if (!monetization) {
- document[`monetization${instanceId}`] = document.createElement('eventTarget');
+ document[`monetization${instanceId}`] = new EventTarget();
monetization = document[`monetization${instanceId}`];
}
@@ -549,7 +549,7 @@ const _loadScript = async (file, {files = null, parentUrl = null, instanceId = n
if (instanceId) {
script = script.replace(/document\.monetization/g, `document.monetization${instanceId}`);
script = `
- document.monetization${instanceId} = document.createElement('eventTarget');
+ document.monetization${instanceId} = new EventTarget();
` + script;
}
return script;
| 4 |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml @@ -52,6 +52,9 @@ jobs:
git config --global user.name 'semrush-ci-whale'
git config --global user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.BOT_ACCOUNT_GITHUB_TOKEN }}@github.com/semrush/intergalactic
+ - name: NPM setup
+ run: |
+ echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ".npmrc"
- name: Lint
run: yarn lint
- name: Test
| 0 |
diff --git a/cypress/support/commands.js b/cypress/support/commands.js @@ -36,6 +36,7 @@ function getCenter(el) {
Cypress.Commands.add("dragBetween", (dragSelector, dropSelector) => {
const getOrWrap = isString(dragSelector) ? cy.get : cy.wrap;
+ cy.clock();
getOrWrap(dragSelector).then(el => {
let dragSelectDomEl = el.get(0);
getOrWrap(dropSelector).then(el2 => {
@@ -53,7 +54,7 @@ Cypress.Commands.add("dragBetween", (dragSelector, dropSelector) => {
},
{ force: true }
)
- .wait(10);
+ .tick(1000);
// drag events test for button: 0 and also use the clientX and clientY values - the clientX and clientY values will be specific to your system
getOrWrap(dragSelector)
.trigger(
@@ -66,7 +67,7 @@ Cypress.Commands.add("dragBetween", (dragSelector, dropSelector) => {
},
{ force: true }
) // We perform a small move event of > 5 pixels this means we don't get dismissed by the sloppy click detection
- .wait(150); // react-beautiful-dnd has a minimum 150ms timeout before starting a drag operation, so wait at least this long.
+ .tick(5000); // react-beautiful-dnd has a minimum 150ms timeout before starting a drag operation, so wait at least this long.
cy.get("html") // now we perform drags on the whole screen, not just the draggable
.trigger(
@@ -79,7 +80,7 @@ Cypress.Commands.add("dragBetween", (dragSelector, dropSelector) => {
},
{ force: true }
)
- .wait(10);
+ .tick(5000);
cy.get("html").trigger(
"mouseup",
{
| 13 |
diff --git a/src/pages/ProjectLoader/ProjectLoader.jsx b/src/pages/ProjectLoader/ProjectLoader.jsx @@ -5,9 +5,6 @@ import OpenFolder from '../../components/OpenFolder/OpenFolderButton';
import { Button, TextField } from '@material-ui/core';
import LoginGithub from 'react-login-github';
-
-require('dotenv').config();
-
const ProjectLoader = () => {
const [{ isFileDirectoryOpen }, dispatchToGlobal] = useContext(GlobalContext);
@@ -87,12 +84,11 @@ const ProjectLoader = () => {
.catch((err) => console.log(err));
};
- const onSuccess = response => {
+ const handleGithubLogin = (response) => {
logout();
fetch('/github/' + response.code)
.then((res) => res.json())
.then((data) => {
- console.log(data);
if (data.ssid) {
setIsLoggedIn(true);
} else if (typeof data === 'string') {
@@ -102,11 +98,9 @@ const ProjectLoader = () => {
.catch((err) => console.log(err));
};
- const onFailure = response => console.error(response);
+ const onFailure = (response) => console.error(response);
const renderLogin = () => (
-
-
<div className={styles.contentBox}>
<form onSubmit={handleLogin}>
<TextField
@@ -142,12 +136,12 @@ const ProjectLoader = () => {
</form>
<Button variant='primary' id={styles.gitButton}>
<LoginGithub
- clientId="7dc8c4f030f9201bf917"
+ clientId='7dc8c4f030f9201bf917'
className={styles.gitLogin}
- onSuccess={onSuccess}
+ onSuccess={handleGithubLogin}
onFailure={onFailure}
/>
- <i class="fab fa-github"></i>
+ <i class='fab fa-github'></i>
</Button>
</div>
);
@@ -172,7 +166,6 @@ const ProjectLoader = () => {
<section id={styles.lowerPart}>
<div id={styles.appBox}>
-
{/* Open Project Directory If User is Logged In */}
{!isLoggedIn ? (
renderLogin()
| 10 |
diff --git a/desktop/sources/scripts/commander.js b/desktop/sources/scripts/commander.js @@ -25,7 +25,7 @@ function Commander (terminal) {
this.write = function (key) {
if (key.length !== 1) { return }
- this.query += key.toLowerCase()
+ this.query += key
this.preview()
}
| 11 |
diff --git a/docs/articles/documentation/test-api/actions/take-screenshot.md b/docs/articles/documentation/test-api/actions/take-screenshot.md @@ -16,7 +16,7 @@ t.takeScreenshot( [path] )
Parameter | Type | Description | Default
------------------- | ------ | ----------------------------------------------------------------------------------------------------- | ----------
-`path` *(optional)* | String | A relative path to the folder where screenshots should be saved. Resolved from the *screenshot directory* specified by using the [runner.screenshots](../../using-testcafe/programming-interface/runner.md#screenshots) API method or the [screenshots-path](../../using-testcafe/command-line-interface.md#-s-path---screenshots-path) command line option. | The screenshot directory specified by using [runner.screenshots](../../using-testcafe/programming-interface/runner.md#screenshots) or [screenshots-path](../../using-testcafe/command-line-interface.md#-s-path---screenshots-path).
+`path` *(optional)* | String | The relative path and the name of the screenshot file to be created. Resolved from the *screenshot directory* specified by using the [runner.screenshots](../../using-testcafe/programming-interface/runner.md#screenshots) API method or the [screenshots-path](../../using-testcafe/command-line-interface.md#-s-path---screenshots-path) command line option. | `{currentDate}\test-{testIndex}\{userAgent}\{screenshotIndex}.png`; `{currentDate}\test-{testIndex}\run-{quarantineAttempt}\{userAgent}\{screenshotIndex}.png` if quarantine mode is enabled.
> Important! If the screenshot directory is not specified with the [runner.screenshots](../../using-testcafe/programming-interface/runner.md#screenshots) API method or the [screenshots-path](../../using-testcafe/command-line-interface.md#-s-path---screenshots-path) command line option,
> the `t.takeScreenshot` action is ignored.
@@ -32,6 +32,6 @@ test('Take a screenshot of my new avatar', async t => {
.click('#change-avatar')
.setFilesToUpload('#upload-input', 'img/portrait.jpg')
.click('#submit')
- .takeScreenshot();
+ .takeScreenshot('my-fixture/test1.png');
});
```
| 1 |
diff --git a/src/index.js.flow b/src/index.js.flow @@ -37,35 +37,35 @@ import type { IsSubmittingInterface } from './selectors/isSubmitting.types'
import type { Config as ValuesConfig } from './values.types'
import type { ActionTypes } from './actionTypes.types'
import type {
- ArrayInsertAction,
- ArrayMoveAction,
- ArrayPopAction,
- ArrayPushAction,
- ArrayRemoveAction,
- ArrayRemoveAllAction,
- ArrayShiftAction,
- ArraySpliceAction,
- ArraySwapAction,
- ArrayUnshiftAction,
- AutofillAction,
- BlurAction,
- ChangeAction,
- ClearSubmitErrorsAction,
- DestroyAction,
- FocusAction,
- InitializeAction,
- RegisterFieldAction,
- ResetAction,
- SetSubmitFailedAction,
- SetSubmitSucceededAction,
- StartAsyncValidationAction,
- StartSubmitAction,
- StopAsyncValidationAction,
- StopSubmitAction,
- SubmitAction,
- TouchAction,
- UnregisterFieldAction,
- UntouchAction
+ ArrayInsert,
+ ArrayMove,
+ ArrayPop,
+ ArrayPush,
+ ArrayRemove,
+ ArrayRemoveAll,
+ ArrayShift,
+ ArraySplice,
+ ArraySwap,
+ ArrayUnshift,
+ Autofill,
+ Blur,
+ Change,
+ ClearSubmitErrors,
+ Destroy,
+ Focus,
+ Initialize,
+ RegisterField,
+ Reset,
+ SetSubmitFailed,
+ SetSubmitSucceeded,
+ StartAsyncValidation,
+ StartSubmit,
+ StopAsyncValidation,
+ StopSubmit,
+ Submit,
+ Touch,
+ UnregisterField,
+ Untouch
} from './actions.types'
type StructureMap = Object
@@ -206,32 +206,32 @@ declare export function values(
): { (ComponentClass<*, *>): ComponentClass<*, *> }
// Action creators
-declare export var arrayInsert: ArrayInsertAction
-declare export var arrayMove: ArrayMoveAction
-declare export var arrayPop: ArrayPopAction
-declare export var arrayPush: ArrayPushAction
-declare export var arrayRemove: ArrayRemoveAction
-declare export var arrayRemoveAll: ArrayRemoveAllAction
-declare export var arrayShift: ArrayShiftAction
-declare export var arraySplice: ArraySpliceAction
-declare export var arraySwap: ArraySwapAction
-declare export var arrayUnshift: ArrayUnshiftAction
-declare export var autofill: AutofillAction
-declare export var blur: BlurAction
-declare export var change: ChangeAction
-declare export var clearSubmitErrors: ClearSubmitErrorsAction
-declare export var destroy: DestroyAction
-declare export var focus: FocusAction
-declare export var initialize: InitializeAction
-declare export var registerField: RegisterFieldAction
-declare export var reset: ResetAction
-declare export var setSubmitFailed: SetSubmitFailedAction
-declare export var setSubmitSucceeded: SetSubmitSucceededAction
-declare export var startAsyncValidation: StartAsyncValidationAction
-declare export var startSubmit: StartSubmitAction
-declare export var stopAsyncValidation: StopAsyncValidationAction
-declare export var stopSubmit: StopSubmitAction
-declare export var submit: SubmitAction
-declare export var touch: TouchAction
-declare export var unregisterField: UnregisterFieldAction
-declare export var untouch: UntouchAction
+declare export var arrayInsert: ArrayInsert
+declare export var arrayMove: ArrayMove
+declare export var arrayPop: ArrayPop
+declare export var arrayPush: ArrayPush
+declare export var arrayRemove: ArrayRemove
+declare export var arrayRemoveAll: ArrayRemoveAll
+declare export var arrayShift: ArrayShift
+declare export var arraySplice: ArraySplice
+declare export var arraySwap: ArraySwap
+declare export var arrayUnshift: ArrayUnshift
+declare export var autofill: Autofill
+declare export var blur: Blur
+declare export var change: Change
+declare export var clearSubmitErrors: ClearSubmitErrors
+declare export var destroy: Destroy
+declare export var focus: Focus
+declare export var initialize: Initialize
+declare export var registerField: RegisterField
+declare export var reset: Reset
+declare export var setSubmitFailed: SetSubmitFailed
+declare export var setSubmitSucceeded: SetSubmitSucceeded
+declare export var startAsyncValidation: StartAsyncValidation
+declare export var startSubmit: StartSubmit
+declare export var stopAsyncValidation: StopAsyncValidation
+declare export var stopSubmit: StopSubmit
+declare export var submit: Submit
+declare export var touch: Touch
+declare export var unregisterField: UnregisterField
+declare export var untouch: Untouch
| 1 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## Unreleased
+## 1.62.0
- Extend API: Offer various getters to inquire about details of the currently actice span (trace ID, span ID and other attributes).
- Improve generated IDs (span ID, trace ID).
+- Fix: Make sure timeouts created by instana-nodejs-sensor do not prevent the process from terminating.
## 1.61.2
- Fix for GRPC instrumentation: Add original attributes to shimmed client method.
| 6 |
diff --git a/src/sdk/conference/conference.js b/src/sdk/conference/conference.js } else if (typeof options !== 'object' || options === null) {
options = {};
}
+ if (options.recorderId && (options.audioCodec || options.videoCodec)) {
+ safeCall(onFailure,
+ 'Cannot set codec when updating existing recorder.');
+ return;
+ }
let mediaSubOptions = {};
if (options.audioStreamId === null || options.videoStreamId === null) {
safeCall(onFailure, 'Invalid audio and video stream ID.');
| 12 |
diff --git a/src/lib/wallet/GoodWallet.js b/src/lib/wallet/GoodWallet.js @@ -441,7 +441,7 @@ export class GoodWallet {
//https://github.com/trufflesuite/ganache-core/issues/417
const gas: number = 200000 //Math.floor((await transferAndCall.estimateGas().catch(this.handleError)) * 2)
- log.debug('generateLiknk:', { amount })
+ log.debug('generateLink:', { amount })
const sendLink = generateShareLink('send', {
receiveLink: generatedString,
@@ -464,15 +464,27 @@ export class GoodWallet {
return sha3(otlCode)
}
+ /**
+ * checks against oneTimeLink contract, if the specified link has already been used or not.
+ * @param {string} link
+ */
async isWithdrawLinkUsed(link: string) {
const { isLinkUsed } = this.oneTimePaymentLinksContract.methods
return await isLinkUsed(link).call()
}
+ /**
+ * Checks if getWithdrawAvailablePayment returned a valid payment (BN handle)
+ * @param {*} payment
+ */
isWithdrawPaymentAvailable(payment: any) {
return payment.lte(ZERO)
}
+ /**
+ * @returns the amount of GoodDollars resides in the oneTimeLink contract under the specified link, in BN representation.
+ * @param {string} link
+ */
getWithdrawAvailablePayment(link: string) {
const { payments } = this.oneTimePaymentLinksContract.methods
const { toBN } = this.wallet.utils
@@ -496,7 +508,10 @@ export class GoodWallet {
return 'Pending'
}
- //FIXME: what's this for? why does it read events from block0
+ /**
+ * verifies otlCode link has not been used, and payment available. If yes for both, returns the original payment sender address and the amount of GoodDollars payment.
+ * @param {string} otlCode - the payment identifier in OneTimePaymentLink contract
+ */
async canWithdraw(otlCode: string) {
const { senders } = this.oneTimePaymentLinksContract.methods
@@ -517,12 +532,21 @@ export class GoodWallet {
}
}
+ /**
+ * withdraws the payment received in the link to the current wallet holder
+ * @param {string} otlCode
+ * @param {PromiEvents} promiEvents
+ */
async withdraw(otlCode: string, promiEvents: ?PromiEvents) {
const withdrawCall = this.oneTimePaymentLinksContract.methods.withdraw(otlCode)
log.info('withdrawCall', withdrawCall)
return await this.sendTransaction(withdrawCall, { ...defaultPromiEvents, ...promiEvents })
}
+ /**
+ * cancels payment link and return the money to the sender (if not been withdrawn already)
+ * @param {string} otlCode
+ */
async cancelOtl(otlCode: string) {
const cancelOtlCall = this.oneTimePaymentLinksContract.methods.cancel(otlCode)
log.info('cancelOtlCall', cancelOtlCall)
| 0 |
diff --git a/src/components/core/loop/loopFix.js b/src/components/core/loop/loopFix.js export default function () {
const swiper = this;
+
+ swiper.emit('beforeLoopFix');
+
const {
activeIndex, slides, loopedSlides, allowSlidePrev, allowSlideNext, snapGrid, rtlTranslate: rtl,
} = swiper;
@@ -10,7 +13,6 @@ export default function () {
const snapTranslate = -snapGrid[activeIndex];
const diff = snapTranslate - swiper.getTranslate();
-
// Fix For Negative Oversliding
if (activeIndex < loopedSlides) {
newIndex = (slides.length - (loopedSlides * 3)) + activeIndex;
@@ -30,4 +32,6 @@ export default function () {
}
swiper.allowSlidePrev = allowSlidePrev;
swiper.allowSlideNext = allowSlideNext;
+
+ swiper.emit('loopFix');
}
| 0 |
diff --git a/deployment-scripts/docker-compose.yml b/deployment-scripts/docker-compose.yml @@ -326,10 +326,11 @@ services:
image: ${IMAGE_REPOSITORY:-deepfenceio}/deepfence_vulnerability_mapper_ce:${DF_IMG_TAG:-1.2.0}
ulimits:
core: 0
- restart: "no"
+ restart: always
networks:
- deepfence_net
- entrypoint: /bin/true
+ entrypoint: tail
+ command: ["-f","/dev/null"]
logging:
driver: "json-file"
options:
| 12 |
diff --git a/desktop/src/main.js b/desktop/src/main.js @@ -63,13 +63,14 @@ function createWindow() {
mainWindow.on('closed', () => {
win = null;
+ mainWindow = null;
});
// if main window is ready to show, then destroy the splash window and show up the main window
mainWindow.once('ready-to-show', () => {
splash.destroy();
- mainWindow.maximize();
- mainWindow.show();
+ mainWindow && mainWindow.maximize();
+ mainWindow && mainWindow.show();
});
}
@@ -90,7 +91,7 @@ app.on('window-all-closed', () => {
app.on('activate', () => {
// On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
- if (mainWindow === null) {
+ if (win === null && mainWindow === null) {
createWindow();
}
});
| 11 |
diff --git a/lib/jsdom/living/xmlhttprequest.js b/lib/jsdom/living/xmlhttprequest.js @@ -87,8 +87,6 @@ const XMLHttpRequestResponseType = new Set([
const simpleHeaders = xhrUtils.simpleHeaders;
-const redirectStatuses = new Set([301, 302, 303, 307, 308]);
-
module.exports = function createXMLHttpRequest(window) {
const Event = window.Event;
const ProgressEvent = window.ProgressEvent;
@@ -706,13 +704,6 @@ module.exports = function createXMLHttpRequest(window) {
client.on("response", res => receiveResponse(this, res));
client.on("redirect", () => {
- if (flag.preflight) {
- properties.error = "Redirect after preflight forbidden";
- dispatchError(this);
- client.abort();
- return;
- }
-
const response = client.response;
const destUrlObj = new URL(response.request.headers.Referer);
@@ -853,12 +844,6 @@ module.exports = function createXMLHttpRequest(window) {
const statusCode = response.statusCode;
- if (flag.preflight && redirectStatuses.has(statusCode)) {
- properties.error = "Redirect after preflight forbidden";
- dispatchError(this);
- return;
- }
-
let byteOffset = 0;
const headers = {};
| 11 |
diff --git a/localization/strings.pot b/localization/strings.pot @@ -2045,33 +2045,6 @@ msgstr ""
msgid "Layout type"
msgstr ""
-msgid "ar"
-msgstr ""
-
-msgid "bg_BG"
-msgstr ""
-
-msgid "hr"
-msgstr ""
-
-msgid "hu_HU"
-msgstr ""
-
-msgid "id"
-msgstr ""
-
-msgid "lv"
-msgstr ""
-
-msgid "ro_RO"
-msgstr ""
-
-msgid "sv"
-msgstr ""
-
-msgid "uk"
-msgstr ""
-
msgid "Merge this product with another one"
msgstr ""
| 2 |
diff --git a/source/color/Color.js b/source/color/Color.js @@ -402,6 +402,47 @@ const cssColorNames = {
whitesmoke: 0xf5f5f5,
yellow: 0xffff00,
yellowgreen: 0x9acd32,
+ // System colors
+ // https://developer.mozilla.org/en-US/docs/Web/CSS/color_value
+ // Values taken from Chrome on macOS, but probably pretty standard
+ ActiveText: 0xff0000,
+ ButtonFace: 0xdddddd,
+ ButtonText: 0x000000,
+ Canvas: 0xffffff,
+ CanvasText: 0x000000,
+ Field: 0xffffff,
+ FieldText: 0x000000,
+ GrayText: 0x808080,
+ Highlight: 0xb5d5ff,
+ HighlightText: 0x000000,
+ LinkText: 0x0000ee,
+ VisitedText: 0x551a8b,
+ // Deprecated system colors
+ // https://developer.mozilla.org/en-US/docs/Web/CSS/color_value
+ // Values taken from Chrome on macOS, but probably pretty standard
+ ActiveBorder: 0xffffff,
+ ActiveCaption: 0xcccccc,
+ AppWorkspace: 0xffffff,
+ Background: 0x6363ce,
+ ButtonHighlight: 0xdddddd,
+ ButtonShadow: 0x888888,
+ CaptionText: 0x000000,
+ InactiveBorder: 0xffffff,
+ InactiveCaption: 0xffffff,
+ InactiveCaptionText: 0x7f7f7f,
+ InfoBackground: 0xfbfcc5,
+ InfoText: 0x000000,
+ Menu: 0xf7f7f7,
+ MenuText: 0x000000,
+ Scrollbar: 0xffffff,
+ ThreeDDarkShadow: 0x666666,
+ ThreeDFace: 0xc0c0c0,
+ ThreeDHighlight: 0xdddddd,
+ ThreeDLightShadow: 0xc0c0c0,
+ ThreeDShadow: 0x888888,
+ Window: 0xffffff,
+ WindowFrame: 0xcccccc,
+ WindowText: 0x000000,
};
const cssColorRegEx = new RegExp(
| 0 |
diff --git a/lxc/execute b/lxc/execute @@ -27,7 +27,7 @@ exec 200>&-
# prevent users from spying on each other
lxc-attach --clear-env -n piston -- \
- /bin/bash -l -c "
+ /bin/bash -c "
chown runner$runner: -R /tmp/$id
chmod 700 /tmp/$id
" > /dev/null 2>&1
@@ -35,12 +35,12 @@ lxc-attach --clear-env -n piston -- \
# runner
timeout -s KILL 20 \
lxc-attach --clear-env -n piston -- \
- /bin/bash -l -c "runuser runner$runner /exec/$language $id"
+ /bin/bash -c "runuser runner$runner /exec/$language $id"
# process janitor
lxc-attach --clear-env -n piston -- \
- /bin/bash -l -c "
- for i in {1..100}
+ /bin/bash -c "
+ while pgrep -u runner$runner > /dev/null
do
pkill -u runner$runner --signal SIGKILL
done
| 14 |
diff --git a/src/components/LMarker.vue b/src/components/LMarker.vue @@ -5,6 +5,7 @@ import debounce from '../utils/debounce.js';
import { optionsMerger } from '../utils/optionsUtils.js';
import Layer from '../mixins/Layer.js';
import Options from '../mixins/Options.js';
+import { latLng } from 'leaflet';
export default {
name: 'LMarker',
@@ -67,11 +68,8 @@ export default {
}
if (this.mapObject) {
- let oldLatLng = this.mapObject.getLatLng();
- let newLatLng = {
- lat: newVal[0] || newVal.lat,
- lng: newVal[1] || newVal.lng
- };
+ const oldLatLng = this.mapObject.getLatLng();
+ const newLatLng = latLng(newVal);
if (newLatLng.lat !== oldLatLng.lat || newLatLng.lng !== oldLatLng.lng) {
this.mapObject.setLatLng(newLatLng);
}
| 1 |
diff --git a/templates/workflow/add_project_modal.html b/templates/workflow/add_project_modal.html theme: 'bootstrap',
dropdownParent: $('#addProjectModal'),
});
+
+
+ // show the modal if project modal is set to true
+ const url = new URL(window.location.href);
+ if (url.searchParams.get('project-modal')) {
+ $('#addProjectModal').modal('show');
+ }
});
- $(() => {
- $('#submitProject').click(e => {
+
+ var saveProject = (buttonId) => {
+ $(`#${buttonId}`).click(e => {
e.preventDefault();
const formValue = $('#addProjectForm').serializeArray();
});
const data = { ...obj, program: $('#program').val() };
-
$.ajax({
url: '{% url "add-level2" %}',
type: 'POST',
.select('val', '')
.trigger('change');
+ const urlWithoutQueryString = window.location.href.split('?')[0];
+ if (buttonId === 'submitProjectAndNew') {
+ window.location.replace(`${urlWithoutQueryString}?project-modal=true`);
+ } else {
setTimeout(() => {
- window.location.reload();
+ window.location.replace(urlWithoutQueryString);
}, 2000);
+ }
},
error: function (xhr, status, error) {
toastr.error(error, 'Failed');
},
});
});
+ }
+
+ $(function () {
+ saveProject('submitProject');
+ saveProject('submitProjectAndNew');
});
</script>
<!-- Modal -->
-<div
- class="modal fade"
- id="addProjectModal"
- tabindex="-1"
- role="dialog"
- aria-labelledby="addProjectModalLabel"
->
+<div class="modal fade" id="addProjectModal" tabindex="-1" role="dialog" aria-labelledby="addProjectModalLabel">
<div class="modal-dialog" role="form">
<div class="modal-content">
<div class="modal-header">
- <button
- type="button"
- class="close"
- data-dismiss="modal"
- aria-label="Close"
- >
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title" id="addProjectModalLabel">
</div>
<form id="addProjectForm" action="" method="POST">
- <div class="modal-body">
{% csrf_token %}
-
+ <div class="modal-body">
<div class="form-group">
<label for="project_name">{{request.user.activity_user.organization.level_2_label}} Name</label>
- <input
- type="text"
- name="project_name"
- required=""
- id="id_project_name"
- class="textinput textInput form-control"
- maxlength="255"
- placeholder="{{request.user.activity_user.organization.level_2_label}} Name"
- />
+ <input type="text" name="project_name" required="" id="id_project_name"
+ class="textinput textInput form-control" maxlength="255"
+ placeholder="{{request.user.activity_user.organization.level_2_label}} Name" />
</div>
<div class="form-group">
<button type="reset" class="btn btn-close" data-dismiss="modal">
Close
</button>
- <button type="submit" class="btn btn-success" id="submitProject">
+ <button type="button" class="btn btn-outline-success" id="submitProjectAndNew">
+ Save & New
+ </button>
+
+ <button type="button" class="btn btn-success" id="submitProject">
Save
</button>
</div>
| 0 |
diff --git a/src/components/nodes/manualTask/index.js b/src/components/nodes/manualTask/index.js @@ -20,6 +20,7 @@ export default {
definition(moddle, $t) {
return moddle.create('bpmn:ManualTask', {
name: $t(defaultNames[id]),
+ assignment: 'requester',
loopCharacteristics: null,
ioSpecification: null,
});
| 12 |
diff --git a/js/base/store.es6.js b/js/base/store.es6.js // TODO: README at js/base directory level, point to it from main README
// TODO: create a state injector for test mocks
-const minidux = require('minidux');
+// const minidux = require('minidux');
const deepFreeze = require('deep-freeze');
const reducers = require('./reducers.es6.js');
const EventEmitter2 = require('eventemitter2');
@@ -30,7 +30,7 @@ function register (modelName) {
const combinedReducers = reducers.combine();
if (!_store) {
- _store = minidux.createStore(combinedReducers, {});
+ _store = _createStore(combinedReducers);
_store.subscribe((state) => {
state = deepFreeze(state); // make state immutable before publishing
_publishChange(state); // publish changes to subscribers
@@ -104,3 +104,66 @@ module.exports = {
subscribe: _publisher,
remove: remove
};
+
+
+
+
+
+const isPlainObject = require('is-plain-object');
+
+function _createStore (reducer) {
+ if (!reducer || typeof reducer !== 'function') throw new Error('reducer must be a function')
+
+ // if (typeof initialState === 'function' && typeof enhancer === 'undefined') {
+ // enhancer = initialState
+ // initialState = undefined
+ // }
+
+ // if (typeof enhancer !== 'undefined') {
+ // if (typeof enhancer !== 'function') {
+ // throw new Error('enhancer must be a function.')
+ // }
+
+ // return enhancer(createStore)(reducer, initialState)
+ // }
+
+ var initialState = initialState || {}
+ var state = initialState
+ var listener = null
+ var isEmitting = false
+
+ function dispatch (action) {
+ if (!action || !isPlainObject(action)) throw new Error('action parameter is required and must be a plain object')
+ if (!action.type || typeof action.type !== 'string') throw new Error('type property of action is required and must be a string')
+ if (isEmitting) throw new Error('modifiers may not emit actions')
+
+ isEmitting = true
+ state = reducer(state, action)
+ if (listener) listener(state)
+ isEmitting = false
+ return action
+ }
+
+ function subscribe (cb) {
+ if (!cb || typeof cb !== 'function') throw new Error('listener must be a function')
+ listener = cb
+ }
+
+ function replaceReducer (next) {
+ if (typeof next !== 'function') throw new Error('new reducer must be a function')
+ reducer = next
+ }
+
+ // function getState () {
+ // return state
+ // }
+
+ dispatch({ type: '@@createStore/INIT' })
+
+ return {
+ dispatch: dispatch,
+ subscribe: subscribe,
+ // getState: getState,
+ replaceReducer: replaceReducer
+ }
+}
| 2 |
diff --git a/lib/global-admin/addon/mixins/authentication.js b/lib/global-admin/addon/mixins/authentication.js @@ -70,9 +70,7 @@ export default Mixin.create({
});
model.doAction('disable').then(() => {
- model.save().then( () => {
this.send('waitAndRefresh');
- });
}).catch((err) => {
this.send('gotError', err);
}).finally(() => {
| 2 |
diff --git a/docs/concepts/index.html b/docs/concepts/index.html @@ -1826,7 +1826,7 @@ sparta.Main(stackName,
<h2 id="lambda-function">Lambda Function</h2>
-<p>A Sparta-compatible lambda is a standard <a href="https://docs.aws.amazon.com/lambda/latest/dg/go-programming-model-handler-types.html/">AWS Lambda Go</a> function. The following function signatures are supported:</p>
+<p>A Sparta-compatible lambda is a standard <a href="https://docs.aws.amazon.com/lambda/latest/dg/go-programming-model-handler-types.html">AWS Lambda Go</a> function. The following function signatures are supported:</p>
<ul>
<li><code>func ()</code></li>
| 1 |
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js @@ -1386,8 +1386,7 @@ function _restyle(gd, aobj, traces) {
// for the undo / redo queue
var redoit = {},
undoit = {},
- axlist,
- flagAxForDelete = {};
+ axlist;
// make a new empty vals array for undoit
function a0() { return traces.map(function() { return undefined; }); }
@@ -1530,9 +1529,6 @@ function _restyle(gd, aobj, traces) {
} else if(Registry.traceIs(cont, 'cartesian')) {
Lib.nestedProperty(cont, 'marker.colors')
.set(Lib.nestedProperty(cont, 'marker.color').get());
- // look for axes that are no longer in use and delete them
- flagAxForDelete[cont.xaxis || 'x'] = true;
- flagAxForDelete[cont.yaxis || 'y'] = true;
}
}
| 2 |
diff --git a/src/components/appNavigation/TabsView.js b/src/components/appNavigation/TabsView.js @@ -13,7 +13,7 @@ import logger from '../../lib/logger/pino-logger'
import Icon from '../../components/common/view/Icon'
import useSideMenu from '../../lib/hooks/useSideMenu'
-const { isEToro, market, marketUrl, showInvite, showRewards, web3SiteUrl } = config
+const { isEToro, market, marketUrl, showInvite, showRewards } = config
const styles = {
marketIconBackground: {
@@ -171,12 +171,11 @@ const TabsView = React.memo(({ navigation }) => {
}, [])
const goToRewards = useCallback(() => {
- if (isIOS) {
- const src = `${web3SiteUrl}?token=${token}&purpose=iframe`
- window.open(src, '_blank')
- } else {
+ // if (isIOS) {
+ // const src = `${web3SiteUrl}?token=${token}&purpose=iframe`
+ // return window.open(src, '_blank')
+ // }
navigation.navigate('Rewards')
- }
}, [navigation, token])
const goToSupport = useCallback(() => {
| 1 |
diff --git a/spec/e2e/text-editing.spec.js b/spec/e2e/text-editing.spec.js @@ -397,7 +397,15 @@ describe('Text block', function() {
.then(function() { return getBlockData(1); })
.then(function(data) {
expect(data.data.listItems[0].content).toBe("T<b>w</b>o");
- expect(data.data.listItems[1].content).toBe("T<b>hre</b>e");
+ return expect(data.data.listItems[1].content).toBe("T<b>hre</b>e");
+ })
+ .then(function() { return getBlockData(3); })
+ .then(function(data) {
+ return expect(data.data.text).toBe("<p><br></p>");
+ })
+ .then(function() { return getBlockData(2); })
+ .then(function(data) {
+ expect(data.data.text).toBe("<p>F<b>ou</b>r</p>");
done();
});
});
| 7 |
diff --git a/Bundle/WidgetBundle/Controller/WidgetController.php b/Bundle/WidgetBundle/Controller/WidgetController.php @@ -90,14 +90,14 @@ class WidgetController extends Controller
* @param string $type The type of the widget we edit
* @param int $viewReference The view reference where attach the widget
* @param string $slot The slot where attach the widget
- * @param null $quantum The quantum number used to avoid same form name
+ * @param string $quantum The quantum letter used to avoid same form name
*
* @throws Exception
*
* @return JsonResponse
- * @Route("/victoire-dcms/widget/new/{type}/{viewReference}/{slot}/{quantum}", name="victoire_core_widget_new", defaults={"slot":null, "quantum":0}, options={"expose"=true})
+ * @Route("/victoire-dcms/widget/new/{type}/{viewReference}/{slot}/{quantum}", name="victoire_core_widget_new", defaults={"slot":null, "quantum":"a"}, options={"expose"=true})
*/
- public function newAction(Request $request, $type, $viewReference, $slot = null, $quantum = 0)
+ public function newAction(Request $request, $type, $viewReference, $slot = null, $quantum = 'a')
{
try {
$view = $this->getViewByReferenceId($viewReference);
@@ -142,8 +142,8 @@ class WidgetController extends Controller
* @param string $businessEntityId The BusinessEntity::id (can be null if the submitted form is in static mode)
*
* @return JsonResponse
- * @Route("/victoire-dcms/widget/create/static/{type}/{viewReference}/{slot}/{quantum}/{position}/{parentWidgetMap}", name="victoire_core_widget_create_static", defaults={"mode":"static", "slot":null, "businessEntityId":null, "position":null, "parentWidgetMap":null, "_format": "json", "quantum":0})
- * @Route("/victoire-dcms/widget/create/{mode}/{type}/{viewReference}/{slot}/{quantum}/{businessEntityId}/{position}/{parentWidgetMap}", name="victoire_core_widget_create", defaults={"slot":null, "businessEntityId":null, "position":null, "parentWidgetMap":null, "_format": "json", "quantum":0})
+ * @Route("/victoire-dcms/widget/create/static/{type}/{viewReference}/{slot}/{quantum}/{position}/{parentWidgetMap}", name="victoire_core_widget_create_static", defaults={"mode":"static", "slot":null, "businessEntityId":null, "position":null, "parentWidgetMap":null, "_format": "json", "quantum":"a"})
+ * @Route("/victoire-dcms/widget/create/{mode}/{type}/{viewReference}/{slot}/{quantum}/{businessEntityId}/{position}/{parentWidgetMap}", name="victoire_core_widget_create", defaults={"slot":null, "businessEntityId":null, "position":null, "parentWidgetMap":null, "_format": "json", "quantum":"a"})
* @Template()
*/
public function createAction($mode, $type, $viewReference, $slot = null, $position = null, $parentWidgetMap = null, $businessEntityId = null, $quantum = null)
@@ -194,7 +194,7 @@ class WidgetController extends Controller
*
* @return JsonResponse
*
- * @Route("/victoire-dcms/widget/edit/{id}/{viewReference}/{mode}/{businessEntityId}", name="victoire_core_widget_edit", options={"expose"=true}, defaults={"quantum":0, "mode": "static"})
+ * @Route("/victoire-dcms/widget/edit/{id}/{viewReference}/{mode}/{businessEntityId}", name="victoire_core_widget_edit", options={"expose"=true}, defaults={"quantum":"a", "mode": "static"})
* @Route("/victoire-dcms/widget/update/{id}/{viewReference}/{mode}/{quantum}/{businessEntityId}", name="victoire_core_widget_update", defaults={"businessEntityId": null, "mode": "static"})
* @Template()
*/
| 12 |
diff --git a/app/styles/components/_button.scss b/app/styles/components/_button.scss @@ -87,12 +87,6 @@ button,
vertical-align: middle;
}
}
-//dropdown button
-button + .dropdown-menu {
- left: -210px;
- position: absolute;
- border-radius: 0;
-}
.dropdown-menu {
max-width: 200px;
| 2 |
diff --git a/src/lambda/routes/invoke-async/invokeAsyncRoute.js b/src/lambda/routes/invoke-async/invokeAsyncRoute.js @@ -27,6 +27,6 @@ export default function invokeRoute(lambda) {
},
tags: ['api'],
},
- path: '/{apiVersion}/functions/{functionName}/invoke-async/',
+ path: '/2014-11-13/functions/{functionName}/invoke-async/',
}
}
| 0 |
diff --git a/contribs/gmf/src/controllers/desktop.scss b/contribs/gmf/src/controllers/desktop.scss @@ -257,6 +257,15 @@ gmf-search {
z-index: 3;
}
+.ui-resizable-helper {
+ border: 2px;
+ border-color: $brand-secondary-dark;
+ border-color: var(--brand-secondary);
+ background-color: $brand-secondary;
+ background-color: var(--brand-secondary);
+ opacity: .4;
+}
+
.gmf-app-data-panel {
display: block;
float: left;
| 12 |
diff --git a/src/plugins/StatusBar/index.js b/src/plugins/StatusBar/index.js @@ -47,7 +47,7 @@ module.exports = class StatusBar extends Plugin {
hideUploadButton: false,
showProgressDetails: false,
locale: defaultLocale,
- hideAfterFinish: false
+ hideAfterFinish: true
}
// merge default options with the ones set by user
| 12 |
diff --git a/.travis.yml b/.travis.yml @@ -79,7 +79,6 @@ script:
--browser-arg tunnel-identifier "$TRAVIS_JOB_NUMBER" \
--browser-arg-int build "$TRAVIS_BUILD_NUMBER" \
--browser-arg-int idleTimeout 300 \
- --browser-arg chromedriverVersion "2.33" \
--browser-arg name "$TRAVIS_REPO_SLUG $TRAVIS_BRANCH $TRAVIS_COMMIT" \
--browser-arg browser "$BROWSER"
fi
| 2 |
diff --git a/accessibility-checker-engine/help/Valerie_Frame_SrcHtml.mdx b/accessibility-checker-engine/help/Valerie_Frame_SrcHtml.mdx @@ -17,7 +17,7 @@ import { Tag } from "carbon-components-react";
## Why is this important?
-If the content of a `<frame>` is not HTML, it may not be accessible. For example, if the source of the `<frame>` element is an image file, assistive technology cannot read the content because you cannot add `"alt"` text to the image in the `<frame>` source. The user opens the frame and hears nothing or perhaps the name of the image file. The `<frame>` element is obsolete and ideally should not be used. When used, the frame source must be accessible.
+If the content of a `<frame>` is not HTML, it may not be accessible. For example, if the source of the `<frame>` element is an image file, assistive technology cannot read the content because you cannot add `alt` text to the image in the `<frame>` source. The user opens the frame and hears nothing or perhaps the name of the image file. The `<frame>` element is obsolete and ideally should not be used. When used, the frame source must be accessible.
</Column>
<Column colLg={11} colMd={5} colSm={4} className="toolMain">
| 2 |
diff --git a/shared/scss/popup.scss b/shared/scss/popup.scss @@ -188,21 +188,6 @@ body {
margin-left: 12px;
}
- .site-info__tosdr-status {
- padding: 15px 20px 0px 20px
- }
-
- .site-info__tosdr-msg {
- color: $color--grey;
- font-size: 13px;
- padding: 7.5px 20px 15px 20px;
-
- a {
- padding: 0px;
- color: $color--grey;
- }
- }
-
.site-info__li--toggle {
background-color: $color--medium-slate;
color: $color--white;
| 2 |
diff --git a/source/views/menu/MenuFilterView.js b/source/views/menu/MenuFilterView.js @@ -26,6 +26,7 @@ const MenuFilterView = Class({
const controller = this.get( 'controller' );
const searchTextView = this._input = new SearchTextView({
shortcut: this.get( 'shortcut' ),
+ placeholder: this.get( 'placeholder' ),
tabIndex: -1,
blurOnKeys: {},
value: bindTwoWay( controller, 'search' ),
| 0 |
diff --git a/js/igv-utils.js b/js/igv-utils.js @@ -578,7 +578,7 @@ var igv = (function (igv) {
oauth: config.oauth
};
- return _.extend(defaultOptions, options);
+ return options ? Object.assign(defaultOptions, options): defaultOptions;
};
return igv;
| 11 |
diff --git a/src/components/common/modal/ModalPaymentStatus.js b/src/components/common/modal/ModalPaymentStatus.js import React from 'react'
-import { View } from 'react-native'
+import { StyleSheet, View } from 'react-native'
import Text from '../view/Text'
const statusLabel = {
@@ -10,11 +10,20 @@ const statusLabel = {
const PaymentStatus = ({ item }) =>
item.displayType in statusLabel && (
- <View style={{ marginVertical: '10vh' }}>
+ <View style={styles.titleStyle}>
<Text color="primary" fontSize={22} fontWeight="500">
{statusLabel[item.displayType]}
</Text>
</View>
)
+const styles = StyleSheet.create({
+ titleStyle: {
+ height: 110,
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ },
+})
+
export default PaymentStatus
| 0 |
diff --git a/src/pages/hideout/index.js b/src/pages/hideout/index.js @@ -40,7 +40,7 @@ const stations = [
];
function Hideout() {
- const [selectedStation, setSelectedStation] = useStateWithLocalStorage('selectedStation', 'all');
+ const [selectedStation, setSelectedStation] = useStateWithLocalStorage('selectedHideoutStation', 'all');
const {t} = useTranslation();
const dispatch = useDispatch();
const hideout = useSelector(selectAllHideoutModules);
| 1 |
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js @@ -58,7 +58,7 @@ class ReportActionCompose extends React.Component {
super(props);
// The horizontal and vertical position (relative to the screen) where the popover will display.
- this.popoverAnchorPosition = {
+ this.emojiPopoverAnchorPosition = {
horizontal: 0,
vertical: 0,
};
@@ -78,7 +78,7 @@ class ReportActionCompose extends React.Component {
isFocused: false,
textInputShouldClear: false,
isCommentEmpty: props.comment.length === 0,
- isPickerVisible: false,
+ isEmojiPickerVisible: false,
isMenuVisible: false,
};
}
@@ -174,18 +174,6 @@ class ReportActionCompose extends React.Component {
}
}
- /**
- * Save the location of a native press event.
- *
- * @param {Object} nativeEvent
- */
- capturePressLocation(nativeEvent) {
- this.popoverAnchorPosition = {
- horizontal: nativeEvent.pageX,
- vertical: nativeEvent.pageY,
- };
- }
-
/**
* Show the ReportActionContextMenu modal popover.
*
@@ -193,15 +181,18 @@ class ReportActionCompose extends React.Component {
*/
showEmojiPicker(event) {
const nativeEvent = event.nativeEvent || {};
- this.capturePressLocation(nativeEvent);
- this.setState({isPickerVisible: true});
+ this.emojiPopoverAnchorPosition = {
+ horizontal: nativeEvent.pageX,
+ vertical: nativeEvent.pageY,
+ };
+ this.setState({isEmojiPickerVisible: true});
}
/**
* Hide the ReportActionContextMenu modal popover.
*/
hideEmojiPicker() {
- this.setState({isPickerVisible: false});
+ this.setState({isEmojiPickerVisible: false});
}
addEmojiToTextBox(emoji) {
@@ -339,16 +330,14 @@ class ReportActionCompose extends React.Component {
)}
</AttachmentModal>
<PopoverWithMeasuredContent
- isVisible={this.state.isPickerVisible}
+ isVisible={this.state.isEmojiPickerVisible}
onClose={this.hideEmojiPicker}
- anchorPosition={this.popoverAnchorPosition}
+ anchorPosition={this.emojiPopoverAnchorPosition}
animationIn="fadeIn"
- anchorOrigin={
- {
+ anchorOrigin={{
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
- }
- }
+ }}
measureContent={() => (
<EmojiPickerMenu
isVisible
@@ -357,7 +346,7 @@ class ReportActionCompose extends React.Component {
)}
>
<EmojiPickerMenu
- isVisible={this.state.isPickerVisible}
+ isVisible={this.state.isEmojiPickerVisible}
addEmojiToTextBox={this.addEmojiToTextBox}
/>
</PopoverWithMeasuredContent>
| 10 |
diff --git a/src/main/resources/public/js/src/launches/logLevel/LogItemInfoView.js b/src/main/resources/public/js/src/launches/logLevel/LogItemInfoView.js @@ -63,8 +63,8 @@ define(function (require) {
computeds: {
isDisabledSendIssue: {
get: function () {
- return !(this.viewModel.collection.length > 1) || !(this.viewModel.get('status') === 'FAILED') ||
- !(this.viewModel.collection.models[this.viewModel.collection.models.length - 1].get('status') === 'FAILED');
+ return !(this.viewModel.collection.length > 1) || _.isEmpty(this.viewModel.getIssue()) ||
+ _.isEmpty(this.viewModel.collection.models[this.viewModel.collection.models.length - 1].getIssue());
}
},
isVisibleSendIssue: {
@@ -74,13 +74,13 @@ define(function (require) {
},
isDisabledReceiveIssue: {
get: function () {
- var hasFailedItems = false;
+ var hasDefectiveItems = false;
_.each(this.viewModel.collection.models, function (model, key) {
- if ((key !== (this.viewModel.collection.models.length - 1)) && (model.get('status') === 'FAILED')) {
- hasFailedItems = true;
+ if ((key !== (this.viewModel.collection.models.length - 1)) && !_.isEmpty(model.getIssue())) {
+ hasDefectiveItems = true;
}
}.bind(this));
- return !(this.viewModel.collection.length > 1) || !(this.viewModel.get('status') === 'FAILED') || !hasFailedItems;
+ return !(this.viewModel.collection.length > 1) || _.isEmpty(this.viewModel.getIssue()) || !hasDefectiveItems;
}
},
isVisibleReceiveIssue: {
@@ -269,24 +269,24 @@ define(function (require) {
}.bind(this));
},
onClickReceiveIssue: function () {
- var previousFailedItemModel;
- var previousFailedItemIssue;
+ var previousDefectiveItemModel;
+ var previousDefectiveItemIssue;
var data;
_.each(this.viewModel.collection.models, function (model, key) {
- if ((key !== (this.viewModel.collection.models.length - 1)) && (model.get('status') === 'FAILED')) {
- previousFailedItemModel = model;
+ if ((key !== (this.viewModel.collection.models.length - 1)) && !_.isEmpty(model.getIssue())) {
+ previousDefectiveItemModel = model;
}
}.bind(this));
- previousFailedItemIssue = previousFailedItemModel.getIssue();
+ previousDefectiveItemIssue = previousDefectiveItemModel.getIssue();
data = {
issues: [{
test_item_id: this.viewModel.get('id'),
issue: {
autoAnalyzed: this.viewModel.get('autoAnalyzed'),
ignoreAnalyzer: this.viewModel.get('ignoreAnalyzer'),
- issue_type: previousFailedItemIssue.issue_type,
- comment: previousFailedItemIssue.comment || '',
- externalSystemIssues: previousFailedItemIssue.externalSystemIssues || []
+ issue_type: previousDefectiveItemIssue.issue_type,
+ comment: previousDefectiveItemIssue.comment || '',
+ externalSystemIssues: previousDefectiveItemIssue.externalSystemIssues || []
}
}]
};
@@ -306,20 +306,20 @@ define(function (require) {
}.bind(this));
},
render: function () {
- var previousFailedLaunchNumber;
- var lastFailedLaunchNumber = this.viewModel.collection.models[this.viewModel.collection.models.length - 1].get('launchNumber');
+ var previousDefectiveLaunchNumber;
+ var lastDefectiveLaunchNumber = this.viewModel.collection.models[this.viewModel.collection.models.length - 1].get('launchNumber');
var sendDefectBtnText;
var copyDefectBtnText;
_.each(this.viewModel.collection.models, function (model, key) {
- if ((key !== (this.viewModel.collection.models.length - 1)) && (model.get('status') === 'FAILED')) {
- previousFailedLaunchNumber = model.get('launchNumber');
+ if ((key !== (this.viewModel.collection.models.length - 1)) && !_.isEmpty(model.getIssue())) {
+ previousDefectiveLaunchNumber = model.get('launchNumber');
}
}.bind(this));
- copyDefectBtnText = (previousFailedLaunchNumber ?
- Localization.launches.copyDefect + ' ' + Localization.ui.from + ' #' + previousFailedLaunchNumber :
+ copyDefectBtnText = (previousDefectiveLaunchNumber ?
+ Localization.launches.copyDefect + ' ' + Localization.ui.from + ' #' + previousDefectiveLaunchNumber :
Localization.launches.copyDefect);
- sendDefectBtnText = (lastFailedLaunchNumber ?
- Localization.launches.sendDefect + ' ' + Localization.ui.to + ' #' + lastFailedLaunchNumber :
+ sendDefectBtnText = (lastDefectiveLaunchNumber ?
+ Localization.launches.sendDefect + ' ' + Localization.ui.to + ' #' + lastDefectiveLaunchNumber :
Localization.launches.sendDefect);
this.$el.html(Util.templates(this.template, {
context: this.context,
| 7 |
diff --git a/assets/js/components/dashboard-sharing/DashboardSharingSettings/Module.js b/assets/js/components/dashboard-sharing/DashboardSharingSettings/Module.js @@ -34,6 +34,7 @@ import { Icon, info } from '@wordpress/icons';
import {
createInterpolateElement,
useCallback,
+ useEffect,
useState,
} from '@wordpress/element';
@@ -45,6 +46,8 @@ import ModuleIcon from '../../ModuleIcon';
import { Select } from '../../../material-components';
import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
import { CORE_SITE } from '../../../googlesitekit/datastore/site/constants';
+// import UserRoleSelect from '../UserRoleSelect';
+
const { useSelect } = Data;
const viewAccessOptions = [
@@ -58,8 +61,14 @@ const viewAccessOptions = [
},
];
-export default function Module( { moduleSlug, moduleName } ) {
- const [ manageViewAccess, setManageViewAccess ] = useState( 'owner' );
+export default function Module( {
+ moduleSlug,
+ moduleName,
+ management,
+ ownerUsername,
+ sharedOwnershipModule,
+} ) {
+ const [ manageViewAccess, setManageViewAccess ] = useState( '' );
const module = useSelect( ( select ) =>
select( CORE_MODULES ).getModule( moduleSlug )
);
@@ -67,6 +76,10 @@ export default function Module( { moduleSlug, moduleName } ) {
select( CORE_SITE ).hasMultipleAdmins()
);
+ useEffect( () => {
+ setManageViewAccess( management );
+ }, [ management ] );
+
const handleOnChange = useCallback(
( event ) => {
setManageViewAccess( event.target.value );
@@ -104,6 +117,7 @@ export default function Module( { moduleSlug, moduleName } ) {
options={ viewAccessOptions }
onChange={ handleOnChange }
onClick={ handleOnChange }
+ disabled={ sharedOwnershipModule }
outlined
/>
@@ -117,7 +131,7 @@ export default function Module( { moduleSlug, moduleName } ) {
'<span>Managed by </span> <strong>%s</strong>',
'google-site-kit'
),
- 'Admin 1'
+ ownerUsername
),
{
span: <span />,
@@ -132,7 +146,7 @@ export default function Module( { moduleSlug, moduleName } ) {
'%s has connected this and given managing permissions to all admins. You can change who can view this on the dashboard.',
'google-site-kit'
),
- 'Admin 1'
+ ownerUsername
) }
classes={ {
popper: 'googlesitekit-tooltip-popper',
@@ -154,4 +168,7 @@ export default function Module( { moduleSlug, moduleName } ) {
Module.propTypes = {
moduleSlug: PropTypes.string.isRequired,
moduleName: PropTypes.string.isRequired,
+ management: PropTypes.string,
+ ownerUsername: PropTypes.string,
+ sharedOwnershipModule: PropTypes.bool.isRequired,
};
| 12 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -1660,10 +1660,15 @@ class Avatar {
this.jumpTime = NaN;
this.flyState = false;
this.flyTime = NaN;
+
this.useTime = NaN;
this.useAnimation = null;
this.useAnimationCombo = [];
this.useAnimationEnvelope = [];
+ this.unuseAnimation = null;
+ this.unuseTime = -1;
+ this.used = false;
+
this.sitState = false;
this.sitAnimation = null;
// this.activateState = false;
| 0 |
diff --git a/apps.json b/apps.json "version":"0.01",
"description": "This is the classic game for masterminds",
"type": "game",
- "tags": "mastermind, game, classic",
+ "tags": "game,app",
"readme":"README.md",
"supports": ["BANGLEJS2"],
"allow_emulator": true,
| 3 |
diff --git a/lib/assets/core/javascripts/cartodb/organization/organization_notification/organization_notification_view.js b/lib/assets/core/javascripts/cartodb/organization/organization_notification/organization_notification_view.js @@ -71,11 +71,5 @@ module.exports = cdb.core.View.extend({
});
this.remove_notification_dialog.appendToBody();
this.addView(this.remove_notification_dialog);
- },
-
- clean: function () {
- this.sendButton.unbind('submitForm');
-
- cdb.core.View.prototype.clean.call(this);
}
});
| 2 |
diff --git a/src/components/dashboard/FaceRecognition/FaceRecognition.web.js b/src/components/dashboard/FaceRecognition/FaceRecognition.web.js @@ -148,10 +148,10 @@ class FaceRecognition extends React.Component<FaceRecognitionProps, State> {
try {
if (res.enrollResult.enrollmentIdentifier)
await userStorage.setProfileField('zoomEnrollmentId', res.enrollResult.enrollmentIdentifier, 'private')
- this.setState({ loadingFaceRecognition: false, loadingText: '' })
+ this.props.screenProps.pop({ isValid: true })
} catch (e) {
log.error('failed to save facemap') // TODO: handle what happens if the facemap was not saved successfully to the user storage
- this.setState({ loadingFaceRecognition: false, loadingText: '' })
+ this.props.screenProps.pop({ isValid: false })
}
}
| 0 |
diff --git a/src/viewer.js b/src/viewer.js @@ -44,10 +44,10 @@ class gltfViewer
this.hideSpinner();
}
- this.defaultCamera = new UserCamera();
+ this.userCamera = new UserCamera();
this.currentlyRendering = false;
- this.renderer = new gltfRenderer(canvas, this.defaultCamera, this.renderingParameters);
+ this.renderer = new gltfRenderer(canvas, this.userCamera, this.renderingParameters);
this.render(); // Starts a rendering loop.
}
@@ -60,16 +60,16 @@ class gltfViewer
{
this.cameraIndex = -1; // force use default camera
- this.defaultCamera.target = jsToGl(target);
- this.defaultCamera.up = jsToGl(up);
- this.defaultCamera.position = jsToGl(eye);
- this.defaultCamera.type = type;
- this.defaultCamera.znear = znear;
- this.defaultCamera.zfar = zfar;
- this.defaultCamera.yfov = yfov;
- this.defaultCamera.aspectRatio = aspectRatio;
- this.defaultCamera.xmag = xmag;
- this.defaultCamera.ymag = ymag;
+ this.userCamera.target = jsToGl(target);
+ this.userCamera.up = jsToGl(up);
+ this.userCamera.position = jsToGl(eye);
+ this.userCamera.type = type;
+ this.userCamera.znear = znear;
+ this.userCamera.zfar = zfar;
+ this.userCamera.yfov = yfov;
+ this.userCamera.aspectRatio = aspectRatio;
+ this.userCamera.xmag = xmag;
+ this.userCamera.ymag = ymag;
}
load(gltfFile, basePath = "")
@@ -129,7 +129,7 @@ class gltfViewer
const scene = self.gltf.scenes[self.sceneIndex];
scene.applyTransformHierarchy(self.gltf)
- self.defaultCamera.fitViewToAsset(self.gltf);
+ self.userCamera.fitViewToAsset(self.gltf);
self.currentlyRendering = true;
});
@@ -168,7 +168,7 @@ class gltfViewer
{
if(self.headless == false)
{
- self.defaultCamera.updatePosition();
+ self.userCamera.updatePosition();
}
const scene = self.gltf.scenes[self.sceneIndex];
@@ -226,7 +226,7 @@ class gltfViewer
onMouseWheel(event)
{
event.preventDefault();
- this.defaultCamera.zoomIn(event.deltaY);
+ this.userCamera.zoomIn(event.deltaY);
canvas.style.cursor = "none";
}
@@ -247,7 +247,7 @@ class gltfViewer
this.lastMouseX = newX;
this.lastMouseY = newY;
- this.defaultCamera.rotate(deltaX, deltaY);
+ this.userCamera.rotate(deltaX, deltaY);
}
onTouchStart(event)
@@ -278,7 +278,7 @@ class gltfViewer
this.lastTouchX = newX;
this.lastTouchY = newY;
- this.defaultCamera.rotate(deltaX, deltaY);
+ this.userCamera.rotate(deltaX, deltaY);
}
initUserInterface(modelIndex)
| 10 |
diff --git a/viewer/js/config/identify.js b/viewer/js/config/identify.js define([
'dojo/i18n!./nls/main',
- 'dojo/_base/lang'
-], function (i18n, lang) {
+ 'dojo/_base/lang',
+ 'dojo/number'
+], function (i18n, lang, number) {
var linkTemplate = '<a href="{url}" target="_blank">{text}</a>';
function directionsFormatter (noValue, attributes) {
@@ -11,23 +12,6 @@ define([
});
}
- /**
- * A simple number formatter that adds commas to a number
- * @param {number} num The number to commafy
- * @return {String} The formatted number
- */
- function commafy (num) {
- var str = num.toString().split('.');
- if (str[0].length >= 5) {
- str[0] = str[0].replace(/(\d)(?=(\d{3})+$)/g, '$1,');
- }
- if (str[1] && str[1].length >= 5) {
- str[1] = str[1].replace(/(\d{3})/g, '$1 ');
- }
- return str.join('.');
- }
-
-
return {
map: true,
mapClickMode: true,
@@ -62,7 +46,9 @@ define([
visible: true,
fieldName: 'POP',
label: 'Population',
- formatter: commafy
+ formatter: function (value) {
+ return number.format(value);
+ }
}]
}
},
| 14 |
diff --git a/package.json b/package.json "dev": "cross-env concurrently --kill-others \"npm run start-server\" \"npm run start\"",
"electron-dev": "cross-env concurrently \"BROWSER=none npm run start-server\" & electron .",
"electron": "cross-env electron .",
- "electron-debug": "cross-env electron --inspect=9229 --remote-debugging-port=9222 .",
+ "electron-debug": "cross-env REACT_APP_ELECTRON_DEBUG='true' electron --inspect=9229 --remote-debugging-port=9222 .",
"pack": "cross-env ./node_modules/.bin/electron-builder --dir",
"deploy": "npm run build && cross-env electron-builder build -c.extraMetadata.main=build/electron.js -lwm --publish always",
"build-all": "npm run build && cross-env electron-builder build -c.extraMetadata.main=build/electron.js -lwm --publish never",
| 3 |
diff --git a/source/components/NumericInput.js b/source/components/NumericInput.js @@ -180,7 +180,7 @@ class NumericInputBase extends Component<Props, State> {
return {
value: null,
caretPosition: 1,
- fallbackInputValue: valueToProcess, // render standalone minus sign
+ fallbackInputValue: '-',
minimumFractionDigits: 0,
};
}
@@ -231,8 +231,18 @@ class NumericInputBase extends Component<Props, State> {
);
const newNumber = getValueAsNumber(newValue, maximumFractionDigits);
- // Case: Dot was added at the beginning of number
+ // Case: Just a dot was entered
+ if (valueToProcess === '.') {
+ const hasMinFractions = dynamicMinimumFractionDigits > 0;
+ return {
+ value: hasMinFractions ? 0 : null,
+ caretPosition: 2,
+ fallbackInputValue: hasMinFractions ? '' : '0.',
+ minimumFractionDigits: dynamicMinimumFractionDigits,
+ };
+ }
+ // Case: Dot was added at the beginning of number
if (newValue.charAt(0) === '.') {
return {
value: null,
| 9 |
diff --git a/composer.json b/composer.json "require": {
"php": ">=5.4",
"google/apiclient": "^2.0",
- "guzzlehttp/guzzle": "~5.3.3",
- "johnpbloch/wordpress-core": "^5.1"
+ "guzzlehttp/guzzle": "~5.3.3"
},
"autoload": {
"psr-4": {
| 2 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -810,9 +810,9 @@ export default () => {
iframeContainer,
};
},
- useRigManagerInternal() {
+ /* useRigManagerInternal() {
return rigManager;
- },
+ }, */
useAvatarInternal() {
return Avatar;
},
| 2 |
diff --git a/source/views/collections/ToolbarView.js b/source/views/collections/ToolbarView.js @@ -338,7 +338,7 @@ const ToolbarView = Class({
parent.removeView( view );
}
this.insertView( view, container );
- } else {
+ } else if ( view ) {
container.appendChild( view );
}
}
| 8 |
diff --git a/token-metadata/0xB2279B6769CFBa691416F00609b16244c0cF4b20/metadata.json b/token-metadata/0xB2279B6769CFBa691416F00609b16244c0cF4b20/metadata.json "symbol": "WAIF",
"address": "0xB2279B6769CFBa691416F00609b16244c0cF4b20",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/plugins/auth/public/auth-oauth2/callback.html b/plugins/auth/public/auth-oauth2/callback.html <head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<script type="text/javascript">
- var tokenLifetimeDays = 7;
+ const tokenLifetimeDays = 7;
/**
* get query parameter from url
* var baz = getParameterByName('baz'); // "" (present with no value)
* var qux = getParameterByName('qux'); // null (absent)
*/
- var getParameterByName = function(name, url) {
+ const getParameterByName = (name, url) => {
if (!url) url = encodeURIComponent(window.location.href);
name = name.replace(/[\[\]]/g, '\\$&');
- var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
+ const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, ' '));
};
- var setAuthData = function(data) {
- var storageType = getParameterByName('storageType') || 'localStorage';
+ const setAuthData = data => {
+ const storageType = getParameterByName('storageType') || 'localStorage';
switch (storageType) {
case 'localStorage':
case 'sessionStorage':
}
};
- var getHashParams = function() {
- let hash = encodeURIComponent(window.location.hash.replace('#', ''));
+ const getHashParams = () => {
+ const hash = encodeURIComponent(window.location.hash.replace('#', ''));
return decodeURIComponent(hash)
.split('&')
.reduce(function(result, item) {
}, {});
};
- var processExpDate = function(expiresInString) {
- var expirationDate;
- var expiresIn = Number(expiresInString);
+ const processExpDate = expiresInString => {
+ let expirationDate;
+ const expiresIn = Number(expiresInString);
if (!isNaN(expiresIn) && expiresIn > 0) {
- var nsToMsMultiplier = 1000;
+ const nsToMsMultiplier = 1000;
expirationDate =
Number(new Date()) +
nsToMsMultiplier * (expiresIn - tokenLifetimeDays);
}
return expirationDate;
};
+
+ const parseJwt = token => {
+ const base64Url = token.split('.')[1];
+ const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+ const jsonPayload = decodeURIComponent(
+ atob(base64)
+ .split('')
+ .map(function(c) {
+ return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+ })
+ .join('')
+ );
+
+ return JSON.parse(jsonPayload);
+ };
</script>
</head>
<body>
<script type="text/javascript">
- var uri = encodeURIComponent(window.location.href);
- var hashParams = getHashParams(uri);
- if (hashParams && (hashParams['access_token'] || hashParams['error'])) {
- var error = hashParams['error'];
+ const uri = encodeURIComponent(window.location.href);
+ const hashParams = getHashParams(uri);
+ const token = hashParams['access_token'] || hashParams['id_token'];
+ if (hashParams && (token || hashParams['error'])) {
+ const error = hashParams['error'];
+ const { exp } = parseJwt(hashParams['id_token']);
+ const expires_in = hashParams['expires_in'] || exp;
if (!error) {
- var data = {
- accessToken: hashParams['access_token'],
- accessTokenExpirationDate: processExpDate(hashParams['expires_in']),
+ const data = {
+ accessToken: token,
+ accessTokenExpirationDate: processExpDate(expires_in),
scope: hashParams['scope'],
idToken: hashParams['id_token']
};
setAuthData(data);
- var decodedState = atob(
+ const decodedState = atob(
decodeURIComponent(hashParams['state'])
).split('_luigiNonce=');
- var appState = decodeURI(decodedState[0] || '');
- var nonce = decodedState[1];
+ const appState = decodeURI(decodedState[0] || '');
+ const nonce = decodedState[1];
if (nonce !== sessionStorage.getItem('luigi.nonceValue')) {
document.getElementsByTagName('body')[0].innerHTML =
window.location.href = appState;
} else {
// else tree only applies to idtoken auths, I guess
- var errorDescription = hashParams['error_description'];
+ const errorDescription = hashParams['error_description'];
console.error('error', errorDescription);
window.location.href =
'/?error=' + error + '&errorDescription=' + errorDescription;
| 7 |
diff --git a/src/immer.d.ts b/src/immer.d.ts @@ -58,8 +58,8 @@ type FromNothing<T> = Nothing extends T ? Exclude<T, Nothing> | undefined : T
/** The inferred return type of `produce` */
type Produced<T, Return> = 1 extends HasVoidLike<Return>
? 1 extends IsVoidLike<Return>
- ? Immutable<T>
- : Immutable<T> | FromNothing<Exclude<Return, void>>
+ ? T
+ : T | FromNothing<Exclude<Return, void>>
: FromNothing<Return>
type ImmutableTuple<T extends ReadonlyArray<any>> = {
| 13 |
diff --git a/client/src/utils/ajax.js b/client/src/utils/ajax.js @@ -9,7 +9,7 @@ const tokens = new Tokens();
// TODO: test on staging. Do we need 'include' everywhere?
const defaultOptions = {
- credentials: environment === 'development' ? 'include' : 'same-origin'
+ credentials: environment === 'development' ? 'include' : 'same-site'
};
// _csrf is passed to the client as a cookie. Tokens are sent back to the server
| 13 |
diff --git a/layouts/partials/content.html b/layouts/partials/content.html {{ $in = "<img ([^>]*) ?src=\"./([^\"]+)\" ?([^/>]*) */?>" }}
{{ $out = "<img $1 src=\"../$2\" $3 />" }}
{{ $content = $content | replaceRE $in $out | safeHTML }}
+
+ {{ $in = "<a ([^>]*) ?href=\"../([^\"]+)\" ?([^/>]*) *>" }}
+ {{ $out = "<a $1 href=\"../../$2\" $3 />" }}
+ {{ $content = $content | replaceRE $in $out | safeHTML }}
+
+ {{ $in = "<a ([^>]*) ?href=\"./([^\"]+)\" ?([^/>]*) *>" }}
+ {{ $out = "<a $1 href=\"../$2\" $3 />" }}
+ {{ $content = $content | replaceRE $in $out | safeHTML }}
{{ end }}
<!-- replace all single images paragraph in content with figures, using alt for caption -->
| 7 |
diff --git a/test/safe/typescript-typings.test.ts b/test/safe/typescript-typings.test.ts @@ -11,6 +11,12 @@ class Cat {
}
}
+class AsyncCat {
+ async mewConcurrently (): Promise<string> {
+ return 'meow! meow!'
+ }
+}
+
function sum (first: number, second: number): number {
return first + second
}
@@ -83,6 +89,9 @@ export = {
td.when(f(td.matchers.not(true))).thenResolve('value1', 'value2')
td.when(f(td.matchers.not(false))).thenReject(new Error('rejected'))
+ const asyncCat = td.instance(AsyncCat)
+ td.when(asyncCat.mewConcurrently()).thenReturn(Promise.resolve("purr"), Promise.reject("hiss!"))
+
const fakeSum = td.function(sum)
td.when(fakeSum(1, 2)).thenReturn(3)
| 3 |
diff --git a/src/components/ProductList.js b/src/components/ProductList.js @@ -3,6 +3,7 @@ import styled from "styled-components"
import Img from "gatsby-image"
import ButtonLink from "./ButtonLink"
+import Translation from "./Translation"
const Product = styled.div`
width: 100%;
@@ -91,7 +92,7 @@ const ProductList = ({ content, category }) => {
</LeftContainer>
{link && (
<StyledButton isSecondary to={link}>
- Go
+ <Translation id="page-dapps-ready-button" />
</StyledButton>
)}
</TextContent>
| 12 |
diff --git a/packages/frontend/src/redux/slices/transactions/index.js b/packages/frontend/src/redux/slices/transactions/index.js import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import set from 'lodash-es/set';
import { createSelector } from 'reselect';
+import { getTransactions, transactionExtraInfo } from '../../../utils/explorer-api';
import createParameterSelector from '../../createParameterSelector';
const SLICE_NAME = 'transactions';
@@ -79,7 +81,12 @@ const transactionsSlice = createSlice({
}
},
extraReducers: ((builder) => {
-
+ builder.addCase(fetchTransactions.pending, (state) => {
+ set(state, ['status', 'loading'], true);
+ });
+ builder.addCase(fetchTransactions.fulfilled, (state) => {
+ set(state, ['status', 'loading'], false);
+ });
})
});
| 9 |
diff --git a/lti_launch.php b/lti_launch.php @@ -31,6 +31,7 @@ use \Tsugi\Util\Net;
use \Tsugi\Grades\GradeUtil;
global $tsugi_enabled;
+global $xapi_enabled;
global $lti_enabled;
global $xerte_toolkits_site;
@@ -121,16 +122,16 @@ if(is_numeric($id) || $id == null)
{
die("template_id not found");
}
- if ($row['tsugi_xapi_useglobal'])
- {
+ if ($row['tsugi_xapi_enabled'] == '1') {
+ $xapi_enabled = true;
+ if ($row['tsugi_xapi_useglobal']) {
$q = "select LRS_Endpoint, LRS_Key, LRS_Secret from {$prefix}sitedetails where site_id=1";
$globalrow = db_query_one($q);
$lrs = array('lrsendpoint' => $globalrow['LRS_Endpoint'],
'lrskey' => $globalrow['LRS_Key'],
'lrssecret' => $globalrow['LRS_Secret'],
);
- }
- else{
+ } else {
$lrs = array('lrsendpoint' => $row['tsugi_xapi_endpoint'],
'lrskey' => $row['tsugi_xapi_key'],
'lrssecret' => $row['tsugi_xapi_secret'],
@@ -139,6 +140,7 @@ if(is_numeric($id) || $id == null)
$lrs = CheckLearningLocker($lrs);
$_SESSION['XAPI_PROXY'] = $lrs;
+ }
require("play.php");
| 11 |
diff --git a/config/bis_gulputils.js b/config/bis_gulputils.js @@ -257,8 +257,6 @@ var getWebpackCommand=function(source,internal,external,out,indir,minify,outdir,
if (tmpout==='bislib.js')
cmd+=' --bisinternal '+internal+' --bisexternal '+external;
- else
-
if (watch!==0)
cmd+=" --watch";
| 1 |
diff --git a/src/components/forms/validation-message.scss b/src/components/forms/validation-message.scss .validation-info {
background-color: $ui-blue;
+ box-shadow: 0 0 4px 2px rgba(0, 0, 0, .15);
+ font-weight: 500;
&:before {
background-color: $ui-blue;
| 12 |
diff --git a/articles/libraries/auth0js/v7/index.md b/articles/libraries/auth0js/v7/index.md @@ -5,7 +5,7 @@ description: How to install, initialize and use auth0.js v7
url: /libraries/auth0js/v7
---
-# Auth0.js Reference
+# Auth0.js v7 Reference
Auth0.js is a client-side library for [Auth0](http://auth0.com), for use in your web apps. It allows you to trigger the authentication process and parse the [JSON Web Token](http://openid.net/specs/draft-jones-json-web-token-07.html) (JWT) with just the Auth0 `clientID`. Once you have the JWT, you can use it to authenticate requests to your HTTP API and validate the JWT in your server-side logic with the `clientSecret`.
| 0 |
diff --git a/src/components/DataCollector/index.js b/src/components/DataCollector/index.js @@ -13,6 +13,8 @@ governing permissions and limitations under the License.
import createRequest from "../../core/createRequest";
import createEvent from "../../core/createEvent";
+const VIEW_START_EVENT = "viewstart";
+
const createDataCollector = ({ config }) => {
let lifecycle;
@@ -26,8 +28,10 @@ const createDataCollector = ({ config }) => {
);
};
- const createEventHandler = isViewStart => options => {
+ const createEventHandler = options => {
const event = createEvent();
+ const isViewStart = options.type && options.type === VIEW_START_EVENT;
+
event.mergeData(options.data);
lifecycle.onBeforeEvent(event, isViewStart).then(() => {
makeServerCall([event]);
@@ -41,8 +45,7 @@ const createDataCollector = ({ config }) => {
}
},
commands: {
- viewStart: createEventHandler(true),
- event: createEventHandler(false)
+ event: createEventHandler
}
};
};
| 2 |
diff --git a/js/ui/views/top-blocked-truncated.es6.js b/js/ui/views/top-blocked-truncated.es6.js const Parent = window.DDG.base.View
-const animateGraphBars = require('./mixins/animate-graph-bars.es6.js')
const TopBlockedFullView = require('./top-blocked.es6.js')
const topBlockedFullTemplate = require('./../templates/top-blocked.es6.js')
@@ -20,7 +19,6 @@ function TruncatedTopBlocked (ops) {
TruncatedTopBlocked.prototype = $.extend({},
Parent.prototype,
- //animateGraphBars,
{
_seeAllClick: function () {
@@ -40,7 +38,6 @@ TruncatedTopBlocked.prototype = $.extend({},
rerenderList: function () {
this._rerender()
this._setup()
- // this.animateGraphBars()
},
handleBackgroundMsg: function (message) {
| 2 |
diff --git a/package.json b/package.json "resize-observer-polyfill": "^1.5.0"
},
"peerDependencies": {
- "react": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0",
- "react-dom": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0"
+ "react": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+ "react-dom": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0"
},
"jest": {
"setupFiles": [
| 0 |
diff --git a/packages/field/src/FormControlMixin.js b/packages/field/src/FormControlMixin.js -import { html, css, nothing, dedupeMixin } from '@lion/core';
+import { html, css, nothing, dedupeMixin, SlotMixin } from '@lion/core';
import { ObserverMixin } from '@lion/core/src/ObserverMixin.js';
/**
@@ -14,7 +14,7 @@ import { ObserverMixin } from '@lion/core/src/ObserverMixin.js';
export const FormControlMixin = dedupeMixin(
superclass =>
// eslint-disable-next-line no-shadow, no-unused-vars
- class FormControlMixin extends ObserverMixin(superclass) {
+ class FormControlMixin extends ObserverMixin(SlotMixin(superclass)) {
static get properties() {
return {
...super.properties,
@@ -75,8 +75,21 @@ export const FormControlMixin = dedupeMixin(
};
}
+ /** @deprecated will be this._inputNode in next breaking release */
get inputElement() {
- return (this.$$slot && this.$$slot('input')) || this.querySelector('[slot=input]'); // eslint-disable-line
+ return this.__getDirectSlotChild('input');
+ }
+
+ get _labelNode() {
+ return this.__getDirectSlotChild('label');
+ }
+
+ get _helpTextNode() {
+ return this.__getDirectSlotChild('help-text');
+ }
+
+ get _feedbackNode() {
+ return this.__getDirectSlotChild('feedback');
}
constructor() {
@@ -107,29 +120,31 @@ export const FormControlMixin = dedupeMixin(
}
_enhanceLightDomA11y() {
- if (this.inputElement) {
- this.inputElement.id = this.inputElement.id || this._inputId;
+ const { inputElement, _labelNode, _helpTextNode, _feedbackNode } = this;
+
+ if (inputElement) {
+ inputElement.id = inputElement.id || this._inputId;
}
- if (this.$$slot('label')) {
- this.$$slot('label').setAttribute('for', this._inputId);
- this.$$slot('label').id = this.$$slot('label').id || `label-${this._inputId}`;
- const labelledById = ` ${this.$$slot('label').id}`;
+ if (_labelNode) {
+ _labelNode.setAttribute('for', this._inputId);
+ _labelNode.id = _labelNode.id || `label-${this._inputId}`;
+ const labelledById = ` ${_labelNode.id}`;
if (this._ariaLabelledby.indexOf(labelledById) === -1) {
- this._ariaLabelledby += ` ${this.$$slot('label').id}`;
+ this._ariaLabelledby += ` ${_labelNode.id}`;
}
}
- if (this.$$slot('help-text')) {
- this.$$slot('help-text').id = this.$$slot('help-text').id || `help-text-${this._inputId}`;
- const describeIdHelpText = ` ${this.$$slot('help-text').id}`;
+ if (_helpTextNode) {
+ _helpTextNode.id = _helpTextNode.id || `help-text-${this._inputId}`;
+ const describeIdHelpText = ` ${_helpTextNode.id}`;
if (this._ariaDescribedby.indexOf(describeIdHelpText) === -1) {
- this._ariaDescribedby += ` ${this.$$slot('help-text').id}`;
+ this._ariaDescribedby += ` ${_helpTextNode.id}`;
}
}
- if (this.$$slot('feedback')) {
- this.$$slot('feedback').id = this.$$slot('feedback').id || `feedback-${this._inputId}`;
- const describeIdFeedback = ` ${this.$$slot('feedback').id}`;
+ if (_feedbackNode) {
+ _feedbackNode.id = _feedbackNode.id || `feedback-${this._inputId}`;
+ const describeIdFeedback = ` ${_feedbackNode.id}`;
if (this._ariaDescribedby.indexOf(describeIdFeedback) === -1) {
- this._ariaDescribedby += ` ${this.$$slot('feedback').id}`;
+ this._ariaDescribedby += ` ${_feedbackNode.id}`;
}
}
this._enhanceLightDomA11yForAdditionalSlots();
@@ -181,7 +196,7 @@ export const FormControlMixin = dedupeMixin(
additionalSlots = ['prefix', 'suffix', 'before', 'after'],
) {
additionalSlots.forEach(additionalSlot => {
- const element = this.$$slot(additionalSlot);
+ const element = this.__getDirectSlotChild(additionalSlot);
if (element) {
element.id = element.id || `${additionalSlot}-${this._inputId}`;
if (element.hasAttribute('data-label') === true) {
@@ -218,14 +233,14 @@ export const FormControlMixin = dedupeMixin(
}
_onLabelChanged({ label }) {
- if (this.$$slot && this.$$slot('label')) {
- this.$$slot('label').textContent = label;
+ if (this._labelNode) {
+ this._labelNode.textContent = label;
}
}
_onHelpTextChanged({ helpText }) {
- if (this.$$slot && this.$$slot('help-text')) {
- this.$$slot('help-text').textContent = helpText;
+ if (this._helpTextNode) {
+ this._helpTextNode.textContent = helpText;
}
}
@@ -552,7 +567,7 @@ export const FormControlMixin = dedupeMixin(
// Returns dom references to all elements that should be referred to by field(s)
_getAriaDescriptionElements() {
- return [this.$$slot('help-text'), this.$$slot('feedback')];
+ return [this._helpTextNode, this._feedbackNode];
}
/**
@@ -574,5 +589,9 @@ export const FormControlMixin = dedupeMixin(
addToAriaDescription(id) {
this._ariaDescribedby += ` ${id}`;
}
+
+ __getDirectSlotChild(slotName) {
+ return [...this.children].find(el => el.slot === slotName);
+ }
},
);
| 1 |
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js @@ -1005,19 +1005,14 @@ module.exports = function(RED) {
node.on('close', function(done) {
node.disconnect(function() {
- if(node.client) {
- node._clientRemoveListeners();
- }
done();
});
});
- // Helper functions to track the event listners we add to the
- // client. The mqtt client also uses it own set of listeners
- // so we can't use removeAllListeners() wothout breaking it
-
/**
- * Add an event handler to the MQTT.js client
+ * Add event handlers to the MQTT.js client and track them so that
+ * we do not remove any handlers that the MQTT client uses internally.
+ * Use {@link node._clientRemoveListeners `node._clientRemoveListeners`} to remove handlers
* @param {string} event The name of the event
* @param {function} handler The handler for this event
*/
| 2 |
diff --git a/generators/client/templates/react/package.json.ejs b/generators/client/templates/react/package.json.ejs @@ -47,9 +47,9 @@ limitations under the License.
"react-redux": "7.2.0",
"react-redux-loading-bar": "4.6.0",
"react-router-dom": "5.1.2",
- "react-toastify": "4.5.2",
- "react-transition-group": "2.7.0",
- "reactstrap": "7.1.0",
+ "react-toastify": "5.5.0",
+ "react-transition-group": "4.3.0",
+ "reactstrap": "8.4.1",
"redux": "4.0.5",
"redux-devtools": "3.5.0",
"redux-devtools-dock-monitor": "1.1.3",
@@ -64,7 +64,7 @@ limitations under the License.
"sonar-scanner": "3.1.0",
<%_ } _%>
"tslib": "1.11.1",
- "uuid": "3.3.3"<% if (websocket === 'spring-websocket') { %>,
+ "uuid": "7.0.3"<% if (websocket === 'spring-websocket') { %>,
"webstomp-client": "1.2.6"
<%_ } _%>
},
| 3 |
diff --git a/app/features/selectable.js b/app/features/selectable.js @@ -467,7 +467,7 @@ export function Selectable(visbug) {
hover_state.target = el
hover_state.element = no_hover
- ? createCorners(el)
+ ? null
: createHover(el)
hover_state.label = no_label
| 13 |
diff --git a/inventory.js b/inventory.js @@ -2,6 +2,7 @@ import * as THREE from './three.module.js';
import Avatar from './avatars/avatars.js';
import {RigAux} from './rig-aux.js';
import runtime from './runtime.js';
+import {addDefaultLights} from './util.js';
const inventorySpecs = [
{
@@ -178,6 +179,7 @@ const inventoryAvatarRenderer = (() => {
return renderer;
})();
+addDefaultLights(inventoryAvatarScene);
// XXX
let avatarMesh = null;
| 0 |
diff --git a/src/lib/login/LoginService.js b/src/lib/login/LoginService.js @@ -139,18 +139,19 @@ class LoginService {
const decoded = jsonwebtoken.decode(jwt, { json: true })
const token = { jwt, decoded }
+ const { exp, aud } = decoded || {}
log.debug('JWT found, validating', token)
// new format of jwt should contain aud, used with realmdb
- if (!decoded.aud) {
+ if (!aud) {
token.jwt = null
log.debug('JWT have old format', token)
return token
}
- if (!decoded.exp || Date.now() >= decoded.exp * 1000) {
+ if (!exp || Date.now() >= exp * 1000) {
log.debug('JWT has been expired', EMPTY_TOKEN)
return EMPTY_TOKEN
}
| 0 |
diff --git a/src/resources/frames.json b/src/resources/frames.json "location": "Mutalist Alad V",
"color": 13344533
}, {
- "regex": "mirage",
- "name": "Mirage",
+ "regex": "mirage(\\sprime)?",
+ "name": "Mirage (Prime)",
"url": "https://youtu.be/3U8mcBd6yE0",
"mr": "0",
"health": "80/240",
"info": "http://warframe.wikia.com/wiki/Mirage",
"thumbnail": "https://vignette1.wikia.nocookie.net/warframe/images/3/31/MirageNewLook.png/revision/latest?cb=20141124023203",
"location": "Hidden Messages",
- "color": 7682369
+ "color": 7682369,
+ "prime_mr": "8",
+ "prime_health": "",
+ "prime_shield": "110/330",
+ "prime_armor": "130",
+ "prime_power": "",
+ "prime_speed": "",
+ "prime_conclave": "",
+ "prime_polarities": ["<:vazarin:319586146269003778>", "<:vazarin:319586146269003778>", "<:madurai:319586146499690496>", "<:naramon:319586146478850048>"],
+ "prime_aura": ""
}, {
"regex": "nekros(\\sprime)?",
"name": "Nekros(Prime)",
| 3 |
diff --git a/README.md b/README.md [](https://codeclimate.com/github/moleculerjs/moleculer/maintainability)
[](https://david-dm.org/moleculerjs/moleculer)
[](https://snyk.io/test/github/moleculerjs/moleculer)
-[](https://gitter.im/ice-services/moleculer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](https://gitter.im/moleculerjs/moleculer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[](https://www.npmjs.com/package/moleculer)
[](https://app.fossa.io/projects/git%2Bgithub.com%2Fmoleculerjs%2Fmoleculer?ref=badge_shield)
| 3 |
diff --git a/lib/transaction/trace/aggregator.js b/lib/transaction/trace/aggregator.js @@ -126,7 +126,7 @@ TraceAggregator.prototype.isBetter = function isBetter(name, duration, apdexT) {
var isOverThreshold
if (config &&
- config.transaction_threshold &&
+ config.transaction_threshold != null &&
config.transaction_threshold !== 'apdex_f' &&
typeof config.transaction_threshold === 'number') {
isOverThreshold = duration > config.transaction_threshold * TO_MILLIS
| 11 |
diff --git a/apps/pokeclk/app.js b/apps/pokeclk/app.js @@ -42,7 +42,7 @@ function time() {
var day = d.getDate();
var time = require("locale").time(d,1);
var date = require("locale").date(d);
- var mo = require("date_utils").month(d.getMonth()+1,0);
+ var mo = require("date_utils").month(d.getMonth()+1,1);
require("Font4x5").add(Graphics); // time
isDark();
@@ -50,7 +50,7 @@ function time() {
g.setFont("4x5",7.5).drawString(time, width/2, height/2);
g.setFontAlign(1,1);
- g.setFont("4x5",2).drawString(mo+" "+day, width-15, height-35);
+ g.setFont("4x5",3).drawString(mo+" "+day, width-15, height-35);
}
function draw() { //poketch background
| 3 |
diff --git a/js/igv-color.js b/js/igv-color.js @@ -226,7 +226,8 @@ const IGVColor = {
var isHex = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(color);
if (color.startsWith("rgba")) {
- return color; // TODO -- should replace current alpha with new one
+ const idx = color.lastIndexOf(",");
+ return color.substring(0, idx+1) + alpha.toString() + ")";
}
if (isHex) {
| 14 |
diff --git a/docs/index.md b/docs/index.md @@ -344,12 +344,7 @@ For more information, see the Mozilla Developer Network [xhr.responseType docs](
### Response text
- The `res.text` property contains the unparsed response body string. This
- property is always present for the client API, and only when the mime type
- matches "text/*", "*/json", or "x-www-form-urlencoded" by default for node. The
- reasoning is to conserve memory, as buffering text of large bodies such as multipart files or images is extremely inefficient.
-
- To force buffering see the "Buffering responses" section.
+The `res.text` property contains the unparsed response body string. This property is always present for the client API, and only when the mime type matches "text/*", "*/json", or "x-www-form-urlencoded" by default for node. The reasoning is to conserve memory, as buffering text of large bodies such as multipart files or images is extremely inefficient. To force buffering see the "Buffering responses" section.
### Response body
@@ -506,18 +501,15 @@ Timeout errors have a `.timeout` property.
## Buffering responses
- To force buffering of response bodies as `res.text` you may invoke `req.buffer()`. To undo the default of buffering for text responses such
- as "text/plain", "text/html" etc you may invoke `req.buffer(false)`.
+To force buffering of response bodies as `res.text` you may invoke `req.buffer()`. To undo the default of buffering for text responses such as "text/plain", "text/html" etc you may invoke `req.buffer(false)`.
- When buffered the `res.buffered` flag is provided, you may use this to
- handle both buffered and unbuffered responses in the same callback.
+When buffered the `res.buffered` flag is provided, you may use this to handle both buffered and unbuffered responses in the same callback.
## CORS
For security reasons, browsers will block cross-origin requests unless the server opts-in using CORS headers. Browsers will also make extra __OPTIONS__ requests to check what HTTP headers and methods are allowed by the server. [Read more about CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS).
- The `.withCredentials()` method enables the ability to send cookies
- from the origin, however only when `Access-Control-Allow-Origin` is _not_ a wildcard ("*"), and `Access-Control-Allow-Credentials` is "true".
+The `.withCredentials()` method enables the ability to send cookies from the origin, however only when `Access-Control-Allow-Origin` is _not_ a wildcard ("*"), and `Access-Control-Allow-Credentials` is "true".
request
.get('http://api.example.com:4001/')
@@ -552,9 +544,7 @@ An "error" event is also emitted, with you can listen for:
Network failures, timeouts, and other errors that produce no response will contain no `err.status` or `err.response` fields.
- If you wish to handle 404 or other HTTP error responses, you can query the `err.status` property.
- When an HTTP error occurs (4xx or 5xx response) the `res.error` property is an `Error` object,
- this allows you to perform checks such as:
+If you wish to handle 404 or other HTTP error responses, you can query the `err.status` property. When an HTTP error occurs (4xx or 5xx response) the `res.error` property is an `Error` object, this allows you to perform checks such as:
if (err && err.status === 404) {
alert('oh no ' + res.body.message);
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.