code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/article/editor/styles/_toc.css b/src/article/editor/styles/_toc.css font-weight: 500;
font-family: 'Avenir Next', Helvetica;
display: block;
- padding: 2px 0px;
- line-height: 30px;
+ padding: 6px 0px;
+ line-height: 20px;
position: relative;
}
.sc-toc .se-toc-entries .se-toc-entry.sm-active { color: #111; /*text-decoration: underline;*/ }
| 12 |
diff --git a/sparta_main_build.go b/sparta_main_build.go @@ -261,9 +261,8 @@ func MainEx(serviceName string,
CommandLineOptions.Describe.RunE = func(cmd *cobra.Command, args []string) error {
validateErr := validate.Struct(optionsDescribe)
if nil != validateErr {
- return validateErr
+ return errors.Wrapf(validateErr, "Failed to validate `describe` options")
}
-
fileWriter, fileWriterErr := os.Create(optionsDescribe.OutputFile)
if fileWriterErr != nil {
return fileWriterErr
| 0 |
diff --git a/admin.js b/admin.js -import {resolveContractSource} from './blockchain.js';
+import {resolveContractSource, hexToWordList} from './blockchain.js';
import {accountsHost} from './constants.js';
import {uint8Array2hex} from './util.js';
@@ -21,6 +21,7 @@ const _createAccount = async () => {
method: 'POST',
});
const j = await res.json();
+ j.key = j.mnemonic + ' ' + hexToWordList(j.address);
return j;
};
const _bakeContract = async (contractKeys, contractSource) => {
| 0 |
diff --git a/js/whitebit.js b/js/whitebit.js @@ -192,6 +192,8 @@ module.exports = class whitebit extends Exchange {
},
'broad': {
'Given amount is less than min amount': InvalidOrder, // {"code":0,"message":"Validation failed","errors":{"amount":["Given amount is less than min amount 200000"],"total":["Total is less than 5.05"]}}
+ 'Total is less than': InvalidOrder, // {"code":0,"message":"Validation failed","errors":{"amount":["Given amount is less than min amount 200000"],"total":["Total is less than 5.05"]}}
+ 'Total amount + fee must be no less than': InvalidOrder, // {"code":0,"message":"Validation failed","errors":{"amount":["Given amount is less than min amount 200000"],"total":["Total is less than 5.05"]}}
},
},
});
@@ -1209,7 +1211,7 @@ module.exports = class whitebit extends Exchange {
}
}
this.throwExactlyMatchedException (this.exceptions['exact'], errorInfo, feedback);
- this.throwBroadlyMatchedException (this.exceptions['broad'], errorInfo, feedback);
+ this.throwBroadlyMatchedException (this.exceptions['broad'], body, feedback);
throw new ExchangeError (feedback);
}
}
| 9 |
diff --git a/tests/e2e/config/bootstrap.js b/tests/e2e/config/bootstrap.js @@ -168,7 +168,8 @@ function observeConsoleLogging() {
text.startsWith( 'OTS parsing error:' ) ||
text.includes( 'Download the React DevTools for a better development experience' ) ||
text.includes( 'Can\'t perform a React state update on an unmounted component' ) ||
- text.includes( 'https://fb.me/react-unsafe-component-lifecycles' )
+ text.includes( 'https://fb.me/react-unsafe-component-lifecycles' ) ||
+ text.includes( 'https://fb.me/react-strict-mode-' )
) {
return;
}
| 8 |
diff --git a/src/hooks/getSceneNavigationContext/extendSceneNavigationContext.js b/src/hooks/getSceneNavigationContext/extendSceneNavigationContext.js @@ -93,6 +93,14 @@ const collectSceneData = (scene) => {
move: wall.move,
sense: wall.sense,
})),
+ //
+ drawings: scene.data.drawings,
+ weather: scene.data.weather,
+ // lights
+ darkness: scene.data.darkness,
+ tokenVision: scene.data.tokenVision,
+ globalLight: scene.data.globalLight,
+ globalLightThreshold: scene.data.globalLightThreshold,
lights: scene.data.lights.map((light) => ({
angle: light.angle,
bright: light.bright,
| 7 |
diff --git a/app/src/js/consts/utils.js b/app/src/js/consts/utils.js @@ -99,8 +99,7 @@ export const timeSince = (date) => {
const seconds = Math.floor((new Date() - date) / 1000);
let interval = seconds / 2592000;
if (interval > 1) {
- const nd = new Date(date);
- return `${nd.getDate()}/${nd.getMonth()}/${nd.getYear().toString().substring(1)}`;
+ return new Date(date).toLocaleDateString('en-GB', { year: '2-digit', month: 'numeric', day: 'numeric' });
}
interval = seconds / 86400;
if (interval > 1) {
| 14 |
diff --git a/server/game/cardaction.js b/server/game/cardaction.js @@ -185,6 +185,10 @@ class CardAction extends BaseAbility {
return true;
}
+ if(location.includes('deck')) {
+ return false;
+ }
+
let type = this.card.getType();
if(type === 'character' || type === 'attachment') {
return (location === 'play area');
| 11 |
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-accordion-item/sprk-accordion-item.component.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-accordion-item/sprk-accordion-item.component.ts @@ -79,9 +79,9 @@ export class SparkAccordionItemComponent implements OnInit {
? (this.iconType = 'chevron-down') // todo: add fall icons "chevron-down-circle"
: (this.iconType = 'chevron-down');
- this.isOpen === true
- ? (this.iconStateClass = 'sprk-c-Icon--open')
- : (this.iconStateClass = '');
+ this.isOpen === false
+ ? (this.iconStateClass = '')
+ : (this.iconStateClass = 'sprk-c-Icon--open');
}
toggleAccordion(event): void {
| 3 |
diff --git a/.github/workflows/ci-app-prod.yml b/.github/workflows/ci-app-prod.yml @@ -3,8 +3,7 @@ name: Node CI for app production
on:
push:
branches:
- # - master
- - support/apply-nextjs-2
+ - master
paths:
- .github/workflows/ci-app-prod.yml
- .github/workflows/reusable-app-prod.yml
@@ -21,8 +20,7 @@ on:
- packages/plugin-**
pull_request:
branches:
- # - master
- - support/apply-nextjs-2
+ - master
types: [opened, reopened, synchronize]
paths:
- .github/workflows/ci-app-prod.yml
@@ -42,8 +40,7 @@ on:
jobs:
test-prod-node14:
- # uses: weseek/growi/.github/workflows/reusable-app-prod.yml@support/master
- uses: weseek/growi/.github/workflows/reusable-app-prod.yml@support/apply-nextjs-2
+ uses: weseek/growi/.github/workflows/reusable-app-prod.yml@support/master
with:
node-version: 14.x
skip-cypress: true
@@ -52,8 +49,7 @@ jobs:
test-prod-node16:
- # uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
- uses: weseek/growi/.github/workflows/reusable-app-prod.yml@support/apply-nextjs-2
+ uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
with:
node-version: 16.x
# skip-cypress: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) && contains( github.event.pull_request.labels.*.name, 'github_actions' ) }}
@@ -63,19 +59,19 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
- # run-reg-suit-node16:
- # needs: [test-prod-node16]
+ run-reg-suit-node16:
+ needs: [test-prod-node16]
- # uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@master
+ uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@master
- # if: always()
+ if: always()
- # with:
- # node-version: 16.x
- # skip-reg-suit: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) && contains( github.event.pull_request.labels.*.name, 'github_actions' ) }}
- # cypress-report-artifact-name: Cypress report
- # secrets:
- # REG_NOTIFY_GITHUB_PLUGIN_CLIENTID: ${{ secrets.REG_NOTIFY_GITHUB_PLUGIN_CLIENTID }}
- # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
- # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+ with:
+ node-version: 16.x
+ skip-reg-suit: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) && contains( github.event.pull_request.labels.*.name, 'github_actions' ) }}
+ cypress-report-artifact-name: Cypress report
+ secrets:
+ REG_NOTIFY_GITHUB_PLUGIN_CLIENTID: ${{ secrets.REG_NOTIFY_GITHUB_PLUGIN_CLIENTID }}
+ AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+ AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
| 13 |
diff --git a/packages/cx/src/ui/layout/FirstVisibleChildLayout.spec.js b/packages/cx/src/ui/layout/FirstVisibleChildLayout.spec.js @@ -6,6 +6,8 @@ import {Store} from '../../data/Store';
import renderer from 'react-test-renderer';
import assert from 'assert';
import {FirstVisibleChildLayout} from "./FirstVisibleChildLayout";
+import {UseParentLayout} from "./UseParentLayout";
+import {PureContainer} from "../PureContainer";
describe('FirstVisibleChildLayout', () => {
@@ -58,5 +60,32 @@ describe('FirstVisibleChildLayout', () => {
}
)
});
+
+ it.skip('skips pure containers which use parent layouts', () => {
+
+ let widget = <cx>
+ <div layout={FirstVisibleChildLayout}>
+ <PureContainer layout={UseParentLayout}>
+ <header visible={false}></header>
+ </PureContainer>
+ <main></main>
+ <footer></footer>
+ </div>
+ </cx>;
+
+ let store = new Store();
+
+ const component = renderer.create(
+ <Cx widget={widget} store={store} subscribe immediate/>
+ );
+
+ let tree = component.toJSON();
+ assert.deepEqual(tree, {
+ type: 'div',
+ props: {},
+ children: [{type: 'main', props: {}, children: null}]
+ }
+ )
+ });
});
| 0 |
diff --git a/src/commands.js b/src/commands.js const { plugman } = require('cordova-lib');
module.exports = {
- 'install': function (cli_opts) {
+ install (cli_opts) {
if (!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
return console.log(plugman.help());
}
@@ -35,6 +35,7 @@ module.exports = {
if (/^[\w-_]+$/.test(key)) cli_variables[key] = tokens.join('=');
});
}
+
var opts = {
subdir: '.',
cli_variables: cli_variables,
@@ -55,7 +56,8 @@ module.exports = {
return p;
},
- 'uninstall': function (cli_opts) {
+
+ uninstall (cli_opts) {
if (!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
return console.log(plugman.help());
}
@@ -74,7 +76,8 @@ module.exports = {
return p;
},
- 'create': function (cli_opts) {
+
+ create (cli_opts) {
if (!cli_opts.name || !cli_opts.plugin_id || !cli_opts.plugin_version) {
return console.log(plugman.help());
}
@@ -88,14 +91,16 @@ module.exports = {
}
plugman.create(cli_opts.name, cli_opts.plugin_id, cli_opts.plugin_version, cli_opts.path || '.', cli_variables);
},
- 'platform': function (cli_opts) {
+
+ platform (cli_opts) {
var operation = cli_opts.argv.remain[ 0 ] || '';
if ((operation !== 'add' && operation !== 'remove') || !cli_opts.platform_name) {
return console.log(plugman.help());
}
plugman.platform({ operation: operation, platform_name: cli_opts.platform_name });
},
- 'createpackagejson': function (cli_opts) {
+
+ createpackagejson (cli_opts) {
var plugin_path = cli_opts.argv.remain[0];
if (!plugin_path) {
return console.log(plugman.help());
| 7 |
diff --git a/token-metadata/0x7461C43bb1E96863233D72A09191008ee9217Ee8/metadata.json b/token-metadata/0x7461C43bb1E96863233D72A09191008ee9217Ee8/metadata.json "symbol": "SBX",
"address": "0x7461C43bb1E96863233D72A09191008ee9217Ee8",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/main/helpers.js b/src/main/helpers.js @@ -131,8 +131,8 @@ export function isValidDomain(host) {
if (host[0] === '_' || host.substr(-1) === '_') {
return false
}
- // Host cannot start or end with a '.'
- if (host[0] === '.' || host.substr(-1) === '.') {
+ // Host cannot start with a '.'
+ if (host[0] === '.') {
return false
}
var alphaNumerics = '`~!@#$%^&*()+={}[]|\\"\';:><?/'.split('')
| 11 |
diff --git a/src/consumer/connection.spec.js b/src/consumer/connection.spec.js @@ -24,16 +24,10 @@ describe('Consumer', () => {
await createTopic({ topic: topicName })
cluster = createCluster()
- producer = createProducer({
- cluster,
- createPartitioner: createModPartitioner,
- logger: newLogger(),
- })
})
afterEach(async () => {
await consumer.disconnect()
- await producer.disconnect()
})
test('support SSL connections', async () => {
@@ -77,17 +71,40 @@ describe('Consumer', () => {
maxWaitTimeInMs: 1,
maxBytesPerPartition: 180,
logger: newLogger({ level: DEBUG }),
+ retry: { retries: 3 },
+ })
+
+ producer = createProducer({
+ cluster: createCluster(),
+ createPartitioner: createModPartitioner,
+ logger: newLogger(),
})
await consumer.connect()
await producer.connect()
- await consumer.subscribe({ topic: topicName })
- await consumer.run({ eachMessage: async () => {} })
+ await consumer.subscribe({ topic: topicName, fromBeginning: true })
+
+ let messages = []
+ await consumer.run({
+ eachMessage: async ({ message }) => {
+ messages.push(message)
+ },
+ })
expect(cluster.isConnected()).toEqual(true)
await cluster.disconnect()
expect(cluster.isConnected()).toEqual(false)
- await expect(waitFor(() => cluster.isConnected())).resolves.toBeTruthy()
+ try {
+ await producer.send({
+ topic: topicName,
+ messages: [{ key: `key-${secureRandom()}`, value: `value-${secureRandom()}` }],
+ })
+ } finally {
+ await producer.disconnect()
+ }
+
+ await waitFor(() => cluster.isConnected())
+ await expect(waitFor(() => messages.length > 0)).resolves.toBeTruthy()
})
})
| 7 |
diff --git a/src/js/components/RadioButtonGroup/__tests__/RadioButtonGroup-test.js b/src/js/components/RadioButtonGroup/__tests__/RadioButtonGroup-test.js @@ -5,7 +5,7 @@ import 'jest-axe/extend-expect';
import 'regenerator-runtime/runtime';
import { axe } from 'jest-axe';
-import { cleanup, render } from '@testing-library/react';
+import { cleanup, render, fireEvent, wait } from '@testing-library/react';
import { Grommet } from '../../Grommet';
import { Box } from '../../Box';
import { RadioButtonGroup } from '..';
@@ -135,4 +135,122 @@ describe('RadioButtonGroup', () => {
const tree = component.toJSON();
expect(tree).toMatchSnapshot();
});
+
+ test('onChange fires with event when passed from props', () => {
+ const radioGroupOptions = [
+ {
+ id: 'ONE',
+ value: '1',
+ 'data-testid': 'testid-1',
+ },
+ {
+ id: 'TWO',
+ value: '2',
+ 'data-testid': 'testid-2',
+ },
+ ];
+
+ const onChange = jest.fn(event => {
+ expect(event).toBeDefined();
+ expect(event).toHaveProperty(['target', 'value']);
+
+ const { target } = event;
+ const option = radioGroupOptions.find(
+ optn => target.value === optn.value,
+ );
+
+ expect(option).not.toBeNull();
+ expect(target.value).toEqual(option.value);
+ });
+
+ const { getByTestId } = render(
+ <Grommet>
+ <RadioButtonGroup
+ name="test"
+ options={radioGroupOptions}
+ onChange={onChange}
+ />
+ </Grommet>,
+ );
+
+ // Select first radio button
+ fireEvent.click(getByTestId('testid-1'));
+ expect(onChange).toBeCalledTimes(1);
+
+ // Select first radio button again - should not trigger onChange
+ fireEvent.click(getByTestId('testid-1'));
+ expect(onChange).toBeCalledTimes(1);
+
+ // Select second radio button
+ fireEvent.click(getByTestId('testid-2'));
+ expect(onChange).toBeCalledTimes(2);
+ });
+
+ test('Works with keyboard', async () => {
+ const onChange = jest.fn();
+
+ const { getByTestId } = render(
+ <Grommet>
+ <RadioButtonGroup
+ name="test"
+ value="2"
+ options={[
+ {
+ id: 'ONE',
+ value: '1',
+ 'data-testid': 'testid-1',
+ },
+ {
+ id: 'TWO',
+ value: '2',
+ 'data-testid': 'testid-2',
+ },
+ {
+ id: 'THREE',
+ value: '3',
+ 'data-testid': 'testid-3',
+ },
+ ]}
+ onChange={onChange}
+ />
+ </Grommet>,
+ );
+
+ // Focus radio '2' button and simulate ArrowDown key
+ // should result in selecting radio '3'
+ const middleRadioBtn = getByTestId('testid-2');
+ middleRadioBtn.focus();
+
+ // focusing the radio button results in internal state update
+ // so we wait (`act`) after focusing
+
+ await wait(() => getByTestId('testid-2'));
+ fireEvent.keyDown(middleRadioBtn, {
+ key: 'ArrowDown',
+ keyCode: 40,
+ which: 40,
+ bubbles: true,
+ cancelable: true,
+ });
+ await wait(() => expect(onChange).toBeCalledTimes(1));
+ expect(onChange).toHaveBeenLastCalledWith(
+ expect.objectContaining({ target: { value: '3' } }),
+ );
+
+ // Focus radio '2' button and simulate ArrowUp key
+ // should result in selecting radio '1'
+ middleRadioBtn.focus();
+ await wait(() => getByTestId('testid-2'));
+ fireEvent.keyDown(middleRadioBtn, {
+ key: 'ArrowUp',
+ keyCode: 38,
+ which: 38,
+ bubbles: true,
+ cancelable: true,
+ });
+ await wait(() => expect(onChange).toBeCalledTimes(2));
+ expect(onChange).toHaveBeenLastCalledWith(
+ expect.objectContaining({ target: { value: '1' } }),
+ );
+ });
});
| 7 |
diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js @@ -224,6 +224,9 @@ define([
* Possible values are {@link TextureMinificationFilter.LINEAR} (the default)
* and {@link TextureMinificationFilter.NEAREST}.
*
+ * To take effect, this property must be set immediately after adding the imagery layer.
+ * Once a texture is loaded it won't be possible to change the texture filter used.
+ *
* @type {TextureMinificationFilter}
* @default {@link ImageryLayer.DEFAULT_MINIFICATION_FILTER}
*/
@@ -234,6 +237,9 @@ define([
* Possible values are {@link TextureMagnificationFilter.LINEAR} (the default)
* and {@link TextureMagnificationFilter.NEAREST}.
*
+ * To take effect, this property must be set immediately after adding the imagery layer.
+ * Once a texture is loaded it won't be possible to change the texture filter used.
+ *
* @type {TextureMagnificationFilter}
* @default {@link ImageryLayer.DEFAULT_MAGNIFICATION_FILTER}
*/
| 3 |
diff --git a/src/components/Eth2Articles.js b/src/components/Eth2Articles.js @@ -82,8 +82,7 @@ const benArticles = [
},
]
-const Eth2Articles = () => {
- return (
+const Eth2Articles = () => (
<Container>
<LeftColumn>
<h4>Danny Ryan (Ethereum Foundation)</h4>
@@ -95,6 +94,5 @@ const Eth2Articles = () => {
</RightColumn>
</Container>
)
-}
export default Eth2Articles
| 7 |
diff --git a/app/stylesheets/builtin-pages/start.less b/app/stylesheets/builtin-pages/start.less @@ -85,7 +85,7 @@ body {
text-align: center;
background: #fff;
border: 3px solid #fff;
- border-radius: 4px;
+ border-radius: 2px;
box-shadow: 0 1px 0 rgba(0,0,0,.15);
border: 1px solid rgba(0,0,0,.1);
| 4 |
diff --git a/components/Feed/index.js b/components/Feed/index.js @@ -29,6 +29,7 @@ const query = gql`
}
documents: search(
filters: [
+ { key: "template", not: true, value: "section" }
{ key: "template", not: true, value: "format" }
{ key: "template", not: true, value: "front" }
]
| 8 |
diff --git a/app/models/user/db_service.rb b/app/models/user/db_service.rb @@ -22,7 +22,7 @@ module CartoDB
SCHEMA_GEOCODING = 'cdb'.freeze
SCHEMA_CDB_DATASERVICES_API = 'cdb_dataservices_client'.freeze
SCHEMA_AGGREGATION_TABLES = 'aggregation'.freeze
- CDB_DATASERVICES_CLIENT_VERSION = '0.17.0'.freeze
+ CDB_DATASERVICES_CLIENT_VERSION = '0.18.0'.freeze
ODBC_FDW_VERSION = '0.2.0'.freeze
def initialize(user)
| 4 |
diff --git a/physx.js b/physx.js @@ -2178,6 +2178,8 @@ const physxWorker = (() => {
allocator.freeAll()
}
+ //
+
w.marchingCubes = (dims, potential, shift, scale) => {
let allocator = new Allocator()
@@ -2225,6 +2227,12 @@ const physxWorker = (() => {
}
}
+ //
+
+ w.setChunkSize = (chunkSize) => {
+ moduleInstance._setChunkSize(chunkSize)
+ };
+
w.generateChunkDataDualContouring = (x, y, z) => {
moduleInstance._generateChunkDataDualContouring(x, y, z)
}
| 0 |
diff --git a/src/controllers/botapi/broadcast.ts b/src/controllers/botapi/broadcast.ts @@ -6,17 +6,18 @@ import * as jsonUtils from '../../utils/json'
import * as socket from '../../utils/socket'
import constants from '../../constants'
import { getTribeOwnersChatByUUID } from '../../utils/tribes'
+import { sphinxLogger } from '../../utils/logger'
export default async function broadcast(a: any) {
const { amount, content, bot_name, chat_uuid, msg_uuid, reply_uuid } = a
- console.log('=> BOT BROADCAST')
- if (!content) return console.log('no content')
- if (!chat_uuid) return console.log('no chat_uuid')
+ sphinxLogger.info(`=> BOT BROADCAST`)
+ if (!content) return sphinxLogger.error(`no content`)
+ if (!chat_uuid) return sphinxLogger.error(`no chat_uuid`)
const theChat = await getTribeOwnersChatByUUID(chat_uuid)
- if (!(theChat && theChat.id)) return console.log('no chat')
+ if (!(theChat && theChat.id)) return sphinxLogger.error(`no chat`)
if (theChat.type !== constants.chat_types.tribe)
- return console.log('not a tribe')
+ return sphinxLogger.error(`not a tribe`)
const owner = await models.Contact.findOne({
where: { id: theChat.tenant },
})
@@ -73,7 +74,7 @@ export default async function broadcast(a: any) {
type: constants.message_types.bot_res,
success: () => ({ success: true }),
failure: (e) => {
- return console.log(e)
+ return sphinxLogger.error(e)
},
isForwarded: true,
})
| 3 |
diff --git a/src/DOM.js b/src/DOM.js @@ -1846,7 +1846,7 @@ class HTMLIFrameElement extends HTMLSrcableElement {
const browser = new GlobalContext.nativeBrowser.Browser(context, context.canvas.ownerDocument.defaultView.innerWidth, context.canvas.ownerDocument.defaultView.innerHeight, url);
this.browser = browser;
- let done = false, err = null, loadedUrl = url;
+ let done = false, err = null;
const _makeLoadError = () => new Error('failed to load page');
this.browser.onloadend = () => {
done = true;
@@ -1858,16 +1858,29 @@ class HTMLIFrameElement extends HTMLSrcableElement {
this.browser.onconsole = (message, source, line) => {
this.onconsole && this.onconsole(message, source, line);
};
- let onmessage = null, setAttribute = this.setAttribute.bind(this);
+ await new Promise((accept, reject) => {
+ if (!done) {
+ this.browser.onloadend = (_url) => {
+ this.contentWindow.location.href = _url;
+ accept();
+ };
+ this.browser.onloaderror = () => {
+ reject(_makeLoadError());
+ };
+ } else {
+ if (!err) {
+ accept();
+ } else {
+ reject(err);
+ }
+ }
+ });
+
+ let onmessage = null;
this.contentWindow = {
location:{
- get href() {
- return loadedUrl;
- },
- set href(_url) {
- return setAttribute('src',_url);
- },
- },
+ href:url
+ }
postMessage(m) {
browser.postMessage(JSON.stringify(m));
},
@@ -1883,30 +1896,11 @@ class HTMLIFrameElement extends HTMLSrcableElement {
} : null;
},
};
-
this.contentDocument = {};
- await new Promise((accept, reject) => {
- if (!done) {
- this.browser.onloadend = (_url) => {
- loadedUrl = _url;
-
this.readyState = 'complete';
this.dispatchEvent(new Event('load', {target: this}));
- accept();
- };
- this.browser.onloaderror = () => {
- reject(_makeLoadError());
- };
- } else {
- if (!err) {
- accept();
- } else {
- reject(err);
- }
- }
- });
cb();
} else {
| 13 |
diff --git a/token-metadata/0x322124122DF407b0d0D902cB713B3714FB2e2E1F/metadata.json b/token-metadata/0x322124122DF407b0d0D902cB713B3714FB2e2E1F/metadata.json "symbol": "SYFI",
"address": "0x322124122DF407b0d0D902cB713B3714FB2e2E1F",
"decimals": 9,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade @@ -82,7 +82,6 @@ template(name="editChecklistItemForm")
a.fa.fa-times-thin.js-close-inlined-form
span(title=createdAt) {{ moment createdAt }}
if canModifyCard
- if currentUser.isBoardAdmin
a.js-delete-checklist-item {{_ "delete"}}...
template(name="checklistItems")
| 11 |
diff --git a/tests/playgrounds/advanced_playground.html b/tests/playgrounds/advanced_playground.html <meta charset="utf-8">
<title>Advanced Blockly Playground</title>
<script src="../../blockly_uncompressed.js"></script>
-<script src="../../generators/javascript.js"></script>
-<script src="../../generators/javascript/logic.js"></script>
-<script src="../../generators/javascript/loops.js"></script>
-<script src="../../generators/javascript/math.js"></script>
-<script src="../../generators/javascript/text.js"></script>
-<script src="../../generators/javascript/lists.js"></script>
-<script src="../../generators/javascript/colour.js"></script>
-<script src="../../generators/javascript/variables.js"></script>
-<script src="../../generators/javascript/variables_dynamic.js"></script>
-<script src="../../generators/javascript/procedures.js"></script>
-<script src="../../generators/python.js"></script>
-<script src="../../generators/python/logic.js"></script>
-<script src="../../generators/python/loops.js"></script>
-<script src="../../generators/python/math.js"></script>
-<script src="../../generators/python/text.js"></script>
-<script src="../../generators/python/lists.js"></script>
-<script src="../../generators/python/colour.js"></script>
-<script src="../../generators/python/variables.js"></script>
-<script src="../../generators/python/variables_dynamic.js"></script>
-<script src="../../generators/python/procedures.js"></script>
-<script src="../../generators/php.js"></script>
-<script src="../../generators/php/logic.js"></script>
-<script src="../../generators/php/loops.js"></script>
-<script src="../../generators/php/math.js"></script>
-<script src="../../generators/php/text.js"></script>
-<script src="../../generators/php/lists.js"></script>
-<script src="../../generators/php/colour.js"></script>
-<script src="../../generators/php/variables.js"></script>
-<script src="../../generators/php/variables_dynamic.js"></script>
-<script src="../../generators/php/procedures.js"></script>
-<script src="../../generators/lua.js"></script>
-<script src="../../generators/lua/logic.js"></script>
-<script src="../../generators/lua/loops.js"></script>
-<script src="../../generators/lua/math.js"></script>
-<script src="../../generators/lua/text.js"></script>
-<script src="../../generators/lua/lists.js"></script>
-<script src="../../generators/lua/colour.js"></script>
-<script src="../../generators/lua/variables.js"></script>
-<script src="../../generators/lua/variables_dynamic.js"></script>
-<script src="../../generators/lua/procedures.js"></script>
-<script src="../../generators/dart.js"></script>
-<script src="../../generators/dart/logic.js"></script>
-<script src="../../generators/dart/loops.js"></script>
-<script src="../../generators/dart/math.js"></script>
-<script src="../../generators/dart/text.js"></script>
-<script src="../../generators/dart/lists.js"></script>
-<script src="../../generators/dart/colour.js"></script>
-<script src="../../generators/dart/variables.js"></script>
-<script src="../../generators/dart/variables_dynamic.js"></script>
-<script src="../../generators/dart/procedures.js"></script>
<script src="../../msg/messages.js"></script>
-<script src="../../blocks/logic.js"></script>
-<script src="../../blocks/loops.js"></script>
-<script src="../../blocks/math.js"></script>
-<script src="../../blocks/text.js"></script>
-<script src="../../blocks/lists.js"></script>
-<script src="../../blocks/colour.js"></script>
-<script src="../../blocks/variables.js"></script>
-<script src="../../blocks/variables_dynamic.js"></script>
-<script src="../../blocks/procedures.js"></script>
<script src="../themes/test_themes.js"></script>
<script src="./screenshot.js"></script>
<script src="../../node_modules/@blockly/dev-tools/dist/index.js"></script>
@@ -77,6 +18,12 @@ goog.require('Blockly.Themes.Zelos');
// Other.
goog.require('Blockly.WorkspaceCommentSvg');
+goog.require('Blockly.Dart.all');
+goog.require('Blockly.JavaScript.all');
+goog.require('Blockly.Lua.all');
+goog.require('Blockly.PHP.all');
+goog.require('Blockly.Python.all');
+goog.require('Blockly.blocks.all');
</script>
<script>
'use strict';
| 1 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -607,7 +607,7 @@ def check_file(config, session, url, job):
upload_url = job['upload_url']
local_path = os.path.join(config['mirror'], upload_url[len('s3://'):])
- local_file_flag = False
+ is_local_bed_present = False # boolean standing for local .bed file creation
if item['file_format'] == 'bed':
unzipped_modified_bed_path = local_path[-18:-7] + '_modified.bed'
@@ -684,7 +684,7 @@ def check_file(config, session, url, job):
# remove the comments and create modified.bed to give validateFiles scritp
# not forget to remove the modified.bed after finishing
try:
- local_file_flag = True
+ is_local_bed_present = True
subprocess.check_output(
'set -o pipefail; gunzip --stdout {} | grep -v \'^#\' > {}'.format(
local_path,
@@ -698,7 +698,7 @@ def check_file(config, session, url, job):
errors='replace').rstrip('\n')
if not errors:
- if local_file_flag:
+ if is_local_bed_present:
check_format(config['encValData'], job, unzipped_modified_bed_path)
remove_local_file(unzipped_modified_bed_path, errors)
else:
| 10 |
diff --git a/articles/connections/social/oauth2.md b/articles/connections/social/oauth2.md @@ -12,7 +12,7 @@ The most common [identity providers](/identityproviders) are readily available o
-## The fetchUserProfile script
+## The `fetchUserProfile` script
A custom `fetchUserProfile` script will be called after the user has logged in with the OAuth2 provider. Auth0 will execute this script to call the OAuth2 provider API and get the user profile:
@@ -74,11 +74,11 @@ https://${account.namespace}/authorize
To add a custom connection in Lock, you can add a custom button by following the instructions at [Adding custom connections to lock](/libraries/lock/v9/ui-customization#adding-a-new-ui-element-using-javascript) and using this link as the button `href`.
-## Passing provider-specific parameters
+## Pass provider-specific parameters
You can pass provider-specific parameters to the Authorization endpoint of an OAuth 2.0 providers. These can be either static or dynamic.
-### Passing static parameters
+### Pass static parameters
To pass any static parameters, you can use the `authParams` element of the `options` when configuring an OAuth 2.0 connection via the [Management API](/api/management/v2#!/Connections/patch_connections_by_id).
@@ -100,9 +100,9 @@ Using the Management API, you can configure the WordPress connection to always p
}
```
-### Passing dynamic parameters
+### Pass dynamic parameters
-There are certain circumstances where you may want to pass a dynamic value to OAuth 2.0 Identity Provider. In this case you can use the `authParamsMap` element of the `options` to specify a mapping between one of the existing additional parameters which are accepted by [the Auth0 `/authorize` endpoint](/api/authentication#social), to the parameter accepted by the Identity Provider.
+There are certain circumstances where you may want to pass a dynamic value to OAuth 2.0 Identity Provider. In this case you can use the `authParamsMap` element of the `options` to specify a mapping between one of the existing additional parameters accepted by [the Auth0 `/authorize` endpoint](/api/authentication#social) to the parameter accepted by the Identity Provider.
Using the same example of WordPress above, let's assume that you want to pass the `blog` parameter to WordPress, but you want to specify the actual value of the parameter when calling the Auth0 `/authorize` endpoint.
| 2 |
diff --git a/articles/migrations/guides/extensibility-node12.md b/articles/migrations/guides/extensibility-node12.md @@ -67,7 +67,7 @@ Changing the runtime may break your existing Rules, Hooks, and Custom Database/S
## Whitelist the new URLs
-The [Authorization Extension](/extensions/authorization), the [Delegated Administration Extension](/extensions/delegated-admin) and the [Single Sign-on (SSO) Dashboard Extension](/extensions/sso-dashboard) require whitelisting the URLs used to access extensions and custom webtasks. When you upgrade to Node 12, the URLs you use to access extensions and custom webtasks will change. This is a breaking change for these extensions.
+The [Delegated Administration Extension](/extensions/delegated-admin) and the [Single Sign-on (SSO) Dashboard Extension](/extensions/sso-dashboard) require whitelisting the URLs used to access extensions and custom webtasks. When you upgrade to Node 12, the URLs you use to access extensions and custom webtasks will change. This is a breaking change for these extensions.
If you use any of these extensions, **you must whitelist the new URLs** both as Allowed <dfn data-key="callback">Callback</dfn> and as Allowed Logout URLs.
| 2 |
diff --git a/tests/phpunit/integration/Core/Modules/Module_Sharing_SettingsTest.php b/tests/phpunit/integration/Core/Modules/Module_Sharing_SettingsTest.php @@ -105,7 +105,6 @@ class Module_Sharing_SettingsTest extends SettingsTestCase {
),
);
$settings->set( $test_sharing_settings );
- // Use get_option() instead of $settings->get() to test sanitization and set() in isolation.
$this->assertEquals( $expected, $settings->get() );
}
| 2 |
diff --git a/src/util/os_utils.js b/src/util/os_utils.js @@ -458,7 +458,7 @@ function set_dns_server(servers, search_domains) {
commands_to_exec.push("sed -i 's/.*NooBaa Configured Secondary DNS Server.*/#NooBaa Configured Secondary DNS Server/' /etc/resolv.conf");
}
- if (search_domains.length) {
+ if (search_domains && search_domains.length) {
commands_to_exec.push("sed -i 's/.*NooBaa Configured Search.*/search " +
search_domains + " #NooBaa Configured Search/' /etc/resolv.conf");
} else {
| 9 |
diff --git a/app-template/config-template.xml b/app-template/config-template.xml </plugin>
<plugin name="cordova-custom-config" spec="3.0.14" />
<plugin name="cordova-plugin-queries-schemes" spec="0.1.5" />
- <plugin name="cordova-plugin-firebase" spec="https://github.com/arnesson/cordova-plugin-firebase.git#1.0.5" />
+ <plugin name="cordova-plugin-firebase" spec="1.0.5" />
<plugin name="cordova-plugin-wkwebview-inputfocusfix" spec="https://github.com/onderceylan/cordova-plugin-wkwebview-inputfocusfix.git" />
<plugin name="cordova-plugin-media-fork" spec="5.0.3">
<variable name="KEEP_AVAUDIOSESSION_ALWAYS_ACTIVE" value="NO" />
| 1 |
diff --git a/package.json b/package.json "name": "find-and-replace",
"main": "./lib/find",
"description": "Find and replace within buffers and across the project.",
- "version": "0.212.3",
+ "version": "0.212.4",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/src/ApiGatewayWebSocket.js b/src/ApiGatewayWebSocket.js @@ -183,7 +183,7 @@ module.exports = class ApiGatewayWebSocket {
this._server.route({
method: 'POST',
path: '/',
- config: {
+ options: {
payload: {
allow: 'application/json',
output: 'data',
@@ -301,13 +301,13 @@ module.exports = class ApiGatewayWebSocket {
});
this._server.route({
- config: {
+ method: 'POST',
+ path: '/@connections/{connectionId}',
+ options: {
payload: {
parse: false,
},
},
- method: 'POST',
- path: '/@connections/{connectionId}',
handler: (request, h) => {
debugLog(`got POST to ${request.url}`);
@@ -336,7 +336,7 @@ module.exports = class ApiGatewayWebSocket {
});
this._server.route({
- config: {
+ options: {
payload: {
parse: false,
},
| 10 |
diff --git a/token-metadata/0x3A92bD396aEf82af98EbC0Aa9030D25a23B11C6b/metadata.json b/token-metadata/0x3A92bD396aEf82af98EbC0Aa9030D25a23B11C6b/metadata.json "symbol": "TBX",
"address": "0x3A92bD396aEf82af98EbC0Aa9030D25a23B11C6b",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -569,7 +569,7 @@ class FunctionsCustomServerTest extends Scope
], $this->getHeaders()));
$this->assertEquals(200, $function['headers']['status-code']);
- $this->assertGreaterThan(0, $function['body']['buildTime']);
+ $this->assertEquals(0, $function['body']['buildTime']);
/**
* Test for FAILURE
| 13 |
diff --git a/content/guides/references/legacy-configuration.md b/content/guides/references/legacy-configuration.md @@ -73,6 +73,7 @@ you should understand well. The default values listed here are meaningful.
| `fileServerFolder` | root project folder | Path to folder where application files will attempt to be served from |
| `fixturesFolder` | `cypress/fixtures` | Path to folder containing fixture files (Pass `false` to disable) |
| `ignoreTestFiles` | `*.hot-update.js` | A String or Array of glob patterns used to ignore test files that would otherwise be shown in your list of tests. Cypress uses `minimatch` with the options: `{dot: true, matchBase: true}`. We suggest using [https://globster.xyz](https://globster.xyz) to test what files would match. |
+| `integrationFolder` | `cypress/integration` | Path to folder containing integration test files |
| `pluginsFile` | `cypress/plugins/index.js` | Path to plugins file. (Pass `false` to disable) |
| `screenshotsFolder` | `cypress/screenshots` | Path to folder where screenshots will be saved from [`cy.screenshot()`](/api/commands/screenshot) command or after a test fails during `cypress run` |
| `supportFile` | `cypress/support/index.js` | Path to file to load before test files load. This file is compiled and bundled. (Pass `false` to disable) |
| 13 |
diff --git a/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs @@ -31,7 +31,7 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
import tech.jhipster.config.JHipsterProperties;
import io.jsonwebtoken.*;
@@ -59,7 +59,7 @@ public class TokenProvider {
public TokenProvider(JHipsterProperties jHipsterProperties) {
byte[] keyBytes;
String secret = jHipsterProperties.getSecurity().getAuthentication().getJwt().getSecret();
- if (!StringUtils.isEmpty(secret)) {
+ if (!ObjectUtils.isEmpty(secret)) {
log.warn("Warning: the JWT key used is not Base64-encoded. " +
"We recommend using the `jhipster.security.authentication.jwt.base64-secret` key for optimum security.");
keyBytes = secret.getBytes(StandardCharsets.UTF_8);
| 14 |
diff --git a/articles/libraries/lock/v11/migration-v10-v11.md b/articles/libraries/lock/v11/migration-v10-v11.md @@ -7,6 +7,8 @@ toc: true
# Migrating from Lock.js v10 to v11
+This guide includes all the information you need to update your Lock 10 installation to Lock 11.
+
## Migration Steps
<%= include('../../_includes/_get_lock_latest_version') %>
@@ -22,4 +24,3 @@ toc: true
<%= include('../../_includes/_last_logged_in_window') %>
<%= include('../../_includes/_ip_ranges') %>
<%= include('../../_includes/_default_values_lock') %>
-
| 0 |
diff --git a/src/components/Link.js b/src/components/Link.js @@ -4,18 +4,19 @@ import { Link as ChakraLink, useTheme } from '@chakra-ui/core';
import { Link as GatsbyLink } from 'gatsby';
function getLinkStyles(theme, variant) {
+ const linkOpacityStates = theme.links[variant].opacity || {};
return {
fontFamily: theme.links.font,
textDecoration: 'underline',
color: theme.links[variant].color.default,
- opacity: theme.links[variant].opacity.default,
+ opacity: linkOpacityStates.default || 1,
_hover: {
color: theme.links[variant].color.hover,
- opacity: theme.links[variant].opacity.hover || 1,
+ opacity: linkOpacityStates.hover || 1,
},
_focus: {
color: theme.links[variant].color.focus,
- opacity: theme.links[variant].opacity.focus || 1,
+ opacity: linkOpacityStates.focus || 1,
},
};
}
| 11 |
diff --git a/app/controllers/application.js b/app/controllers/application.js import Controller from '@ember/controller';
import { infoLinks } from 'ember-styleguide/constants/es-footer';
-import styleguideLinks from 'ember-styleguide/constants/links';
+import headerLinks from 'ember-website/utils/header-links';
import replaceLinks from 'ember-website/utils/replace-links';
export default class ApplicationController extends Controller {
- links = replaceLinks(styleguideLinks);
+ links = replaceLinks(headerLinks);
infoLinks = replaceLinks(infoLinks);
}
| 14 |
diff --git a/tests/phpunit/integration/Core/REST_API/REST_RoutesTest.php b/tests/phpunit/integration/Core/REST_API/REST_RoutesTest.php @@ -48,7 +48,6 @@ class REST_RoutesTest extends TestCase {
'/' . REST_Routes::REST_ROOT . '/core/modules/data/info',
'/' . REST_Routes::REST_ROOT . '/core/modules/data/activation',
'/' . REST_Routes::REST_ROOT . '/modules/(?P<slug>[a-z0-9\\-]+)/data/(?P<datapoint>[a-z\\-]+)',
- '/' . REST_Routes::REST_ROOT . '/data',
'/' . REST_Routes::REST_ROOT . '/modules/(?P<slug>[a-z0-9\\-]+)/data/notifications',
'/' . REST_Routes::REST_ROOT . '/modules/(?P<slug>[a-z0-9\\-]+)/data/settings',
'/' . REST_Routes::REST_ROOT . '/core/search/data/post-search',
| 2 |
diff --git a/package.json b/package.json "homepage": "https://getstream.io/docs?language=js",
"email": "[email protected]",
"license": "BSD-3-Clause",
- "version": "3.19.0",
+ "version": "3.18.0",
"scripts": {
"dtslint": "dtslint types/getstream",
"test": "npm run test-unit-node",
| 13 |
diff --git a/examples/canvasTiles/canvasTiles.html b/examples/canvasTiles/canvasTiles.html 'attribution': 'Data @ OpenStreetMap contributors, ODbL'
});
- let cnv = document.createElement("canvas");
- let ctx = cnv.getContext("2d");
- cnv.width = 256;
- cnv.height = 256;
-
const tg = new CanvasTiles("Tile grid", {
visibility: true,
isBaseLayer: false,
drawTile: function (material, applyCanvas) {
+ //
+ // This is important create canvas here!
+ //
+ let cnv = document.createElement("canvas");
+ let ctx = cnv.getContext("2d");
+ cnv.width = 256;
+ cnv.height = 256;
+
//Clear canvas
ctx.clearRect(0, 0, cnv.width, cnv.height);
| 3 |
diff --git a/readme.md b/readme.md @@ -12,7 +12,7 @@ and rendering dom nodes.
## Documentation
-To get started with Imba, we recommend reading through the [official guide](http://imba.io/guide). If you just want to get going, clone [hello-world-imba](https://github.com/somebee/hello-world-imba) and follow the readme.
+To get started with Imba, we recommend reading through the [official guide](http://imba.io/guides). If you just want to get going, clone [hello-world-imba](https://github.com/somebee/hello-world-imba) and follow the readme.
## Questions
| 1 |
diff --git a/src/core/resolver.js b/src/core/resolver.js @@ -40,6 +40,15 @@ const resolver = module.exports = {
return item.replace(/^\\@/, '@');
}
+ if (_.isString(item) && _.startsWith(item, '@@')) {
+ const entity = source.find(item.substring(1));
+ const fullRenderedComponent = source.engine().render(entity.viewPath, entity.content, entity.context, {
+ self: entity.toJSON(),
+ env: {},
+ });
+ return fullRenderedComponent;
+ }
+
if (_.isString(item) && _.startsWith(item, '@')) {
const parts = item.split('.');
const handle = parts.shift();
| 11 |
diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js @@ -73,12 +73,12 @@ describe('Test MathJax:', function() {
}
var longCats = ['aaaaaaaaa', 'bbbbbbbbb', 'cccccccc'];
- var texTitle = '$$f(x) = \\int_0^\\infty \\psi(t) dt$$';
- var texCats = ['$$\\phi$$', '$$\\nabla \\cdot \\vec{F}$$', '$$\\frac{\\partial x}{\\partial y}$$'];
+ var texTitle = '$f(x) = \\int_0^\\infty \\psi(t) dt$';
+ var texCats = ['$\\phi$', '$\\nabla \\cdot \\vec{F}$', '$\\frac{\\partial x}{\\partial y}$'];
var longTexCats = [
- '$$\\int_0^\\infty \\psi(t) dt$$',
- '$$\\alpha \\int_0^\\infty \\eta(t) dt$$',
- '$$\\int_0^\\infty \\zeta(t) dt$$'
+ '$\\int_0^\\infty \\psi(t) dt$',
+ '$\\alpha \\int_0^\\infty \\eta(t) dt$',
+ '$\\int_0^\\infty \\zeta(t) dt$'
];
it('should scoot x-axis title below x-axis ticks', function(done) {
| 4 |
diff --git a/ui/util/saved-passwords.js b/ui/util/saved-passwords.js @@ -17,7 +17,13 @@ function setCookie(name, value, expirationDaysOnWeb) {
expires = `expires=${IS_WEB ? date.toUTCString() : maxExpiration};`;
}
- let cookie = `${name}=${value || ''}; ${expires} path=/; SameSite=None;`;
+ let cookie = `${name}=${value || ''}; ${expires} path=/;`;
+ if (isProduction) {
+ cookie += ` SameSite=None;`;
+ }
+ if (!isProduction) {
+ cookie += ` SameSite=Lax;`;
+ }
if (isProduction) {
cookie += ` domain=${domain}; Secure;`;
}
| 11 |
diff --git a/src/og/entity/Polyline.js b/src/og/entity/Polyline.js @@ -1608,6 +1608,31 @@ class Polyline {
//...
}
+ setColorHTML(htmlColor) {
+ let color = utils.htmlColorToRgba(htmlColor),
+ p = this._pathColors;
+
+ for (let i = 0, len = p.length; i < len; i++) {
+ let s = p[i];
+ for (let j = 0, slen = s.length; j < slen; j++) {
+ s[j][0] = color.x;
+ s[j][1] = color.y;
+ s[j][2] = color.z;
+ s[j][3] = color.w;
+ }
+ }
+
+ let c = this._colors;
+ for (let i = 0, len = c.length; i < len; i += 4) {
+ c[i] = color.x;
+ c[i + 1] = color.y;
+ c[i + 2] = color.z;
+ c[i + 3] = color.w;
+ }
+
+ this._changedBuffers[COLORS_BUFFER] = true;
+ }
+
/**
* Sets geodetic coordinates.
* @public
| 0 |
diff --git a/source/wrapper/test/unit.js b/source/wrapper/test/unit.js @@ -6,6 +6,7 @@ const {
} = require('@airswap/utils')
const { ethers, waffle } = require('hardhat')
const { deployMockContract } = waffle
+const { ADDRESS_ZERO } = require('@airswap/constants')
const IERC20 = require('@openzeppelin/contracts/build/contracts/IERC20.json')
const IERC721 = require('@openzeppelin/contracts/build/contracts/IERC721.json')
@@ -100,6 +101,24 @@ describe('Wrapper Unit Tests', () => {
await wrapper.deployed()
})
+ describe('revert deploy', async () => {
+ it('zero swap contract address reverts', async () => {
+ await expect(
+ (
+ await ethers.getContractFactory('Wrapper')
+ ).deploy(ADDRESS_ZERO, wethToken.address)
+ ).to.be.revertedWith('INVALID_CONTRACT')
+ })
+
+ it('zero weth contract address reverts', async () => {
+ await expect(
+ (
+ await ethers.getContractFactory('Wrapper')
+ ).deploy(swap.address, ADDRESS_ZERO)
+ ).to.be.revertedWith('INVALID_WETH_CONTRACT')
+ })
+ })
+
describe('Test swap config', async () => {
it('test changing swap contract by non-owner', async () => {
await expect(
@@ -112,6 +131,12 @@ describe('Wrapper Unit Tests', () => {
const storedSwapContract = await wrapper.swapContract()
expect(await storedSwapContract).to.equal(newSwap.address)
})
+
+ it('reverts when set swap contract address is zero', async () => {
+ await expect(
+ wrapper.connect(deployer).setSwapContract(ADDRESS_ZERO)
+ ).to.be.revertedWith('INVALID_CONTRACT')
+ })
})
describe('Test wraps', async () => {
@@ -156,6 +181,20 @@ describe('Wrapper Unit Tests', () => {
)
await wrapper.connect(sender).swap(...order, { value: DEFAULT_AMOUNT })
})
+ it('test that unwrap fails', async () => {
+ const order = await createSignedOrder(
+ {
+ signerToken: wethToken.address,
+ senderWallet: wrapper.address,
+ senderAmount: DEFAULT_AMOUNT,
+ },
+ signer
+ )
+
+ await expect(wrapper.connect(sender).swap(...order)).to.be.revertedWith(
+ 'ETH_RETURN_FAILED'
+ )
+ })
it('Test fallback function revert', async () => {
await expect(
deployer.sendTransaction({
| 7 |
diff --git a/README.md b/README.md @@ -134,6 +134,7 @@ Element `hello-kitty`
set icon // on element
// default to html attribute
( value = this.getAttribute `icon` )
+ // set html attribute to new value
{ this.setAttribute (`icon`, value) }
get icon () // from element
| 12 |
diff --git a/components/datasets/form/steps/Step1.js b/components/datasets/form/steps/Step1.js @@ -171,14 +171,13 @@ class Step1 extends React.Component {
{Select}
</Field>
- {this.state.form.type === 'tabular' &&
<Field
ref={(c) => { if (c) FORM_ELEMENTS.elements.geoInfo = c; }}
onChange={value => this.props.onChange({ geoInfo: value.checked })}
validations={['required']}
properties={{
name: 'geoInfo',
- label: 'Does this dataset contain geographical features such as points, polygons or lines?',
+ label: 'Does this dataset contains geographical information?',
value: 'geoInfo',
defaultChecked: this.props.form.geoInfo,
checked: this.props.form.geoInfo
@@ -186,7 +185,6 @@ class Step1 extends React.Component {
>
{Checkbox}
</Field>
- }
<Field
ref={(c) => { if (c) FORM_ELEMENTS.elements.provider = c; }}
| 11 |
diff --git a/_pages/en/contacts.md b/_pages/en/contacts.md @@ -26,7 +26,7 @@ If you want to file a bug related to this website, you can open an issue on [Git
url: 'https://forum.italia.it/'
---
-Developers Italia is a project in collaboration between [AGID](https://www.agid.gov.it/en) and the [Digital Transformation Team](https://teamdigitale.governo.it/en) which administers it.
+Developers Italia is a project developed in collaboration between [AGID](https://www.agid.gov.it/en) and the [Digital Transformation Team](https://teamdigitale.governo.it/en) which administers it.
This website was born in order to improve and simplify the relationship between
developers and the Public Administration, fostering the development of
@@ -43,7 +43,7 @@ Further information about the project goals may be found in the [launch Medium p
### Contacts
-We are reachable via [Slack](https://slack.developers.italia.it/) or at the address [[email protected]](mailto:[email protected]).
+We are reachable via [Slack](https://slack.developers.italia.it/) or through the [[email protected]](mailto:[email protected]) address.
### Team
| 1 |
diff --git a/docs/specs/data-types.yaml b/docs/specs/data-types.yaml @@ -19,17 +19,18 @@ paths:
type: object
properties:
age:
- description: Person Age
+ description: Person's **Age** (age must be bold)
type: integer
fullName:
- description: Person Full name
+ description: Person's Full name
type: object
properties:
firstName:
- description: First name
+ description: _First name_ (First name should be italics)
type: string
lastName:
- description: Last name
+ description: |
+ `Last name` (last name must be monospaced)
type: string
dependentIds:
type: array
| 7 |
diff --git a/src/apps.json b/src/apps.json 22
],
"headers": {
- "X-Powered-By": "^Phusion Passenger ?([\\d.]+)?\\;version:\\1",
+ "X-Powered-By": "Phusion Passenger ?([\\d.]+)?\\;version:\\1",
"Server": "Phusion Passenger ([\\d.]+)\\;version:\\1"
},
"icon": "Phusion Passenger.png",
| 7 |
diff --git a/src/mavo.js b/src/mavo.js @@ -1008,7 +1008,7 @@ _.containers = {
// mv-list without mv-list-item child
$$("[mv-list]").forEach(list => {
- if (!$("[mv-list-item]", list)) {
+ if (!$(":scope > [mv-list-item]", list)) {
if (list.children === 1 && !list.children[0].matches("[property]")) {
// A single non-Mavo node child, make that the list item
list.children[0].setAttribute("mv-list-item", "");
| 1 |
diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js @@ -28,6 +28,7 @@ for (const key in saved_settings) {
settings[key] = saved_settings[key]
}
+var lock_input = false;
/************
* Assets
@@ -189,6 +190,9 @@ menu.forEach((menuItm, x) => {
// immedeately after redraw...
item.hide();
+ // After drawing the item, we enable inputs again...
+ lock_input = false;
+
var info = item.get();
drawMenuItem(info.text, info.img);
}
@@ -335,6 +339,7 @@ function drawMenuAndTime(){
}
// Draw item if needed
+ lock_input = true;
var item = menuEntry.items[settings.menuPosY-1];
item.show();
}
@@ -420,6 +425,10 @@ Bangle.on('touch', function(btn, e){
var is_right = e.x > right && !is_upper && !is_lower;
var is_center = !is_upper && !is_lower && !is_left && !is_right;
+ if(lock_input){
+ return;
+ }
+
if(is_lower){
Bangle.buzz(40, 0.6);
settings.menuPosY = (settings.menuPosY+1) % (menu[settings.menuPosX].items.length+1);
| 7 |
diff --git a/modules/connectivity/ParticipantConnectionStatus.js b/modules/connectivity/ParticipantConnectionStatus.js @@ -142,7 +142,7 @@ export default class ParticipantConnectionStatusHandler {
/**
* In P2P mode we don't care about any values coming from the JVB and
- * the connection status can be only active or inactive.
+ * the connection status can be only active or interrupted.
* @param {boolean} isVideoMuted the user if video muted
* @param {boolean} isVideoTrackFrozen true if the video track for
* the remote user is currently frozen. If the current browser does not
@@ -159,7 +159,7 @@ export default class ParticipantConnectionStatusHandler {
return isVideoMuted || !isVideoTrackFrozen
? ParticipantConnectionStatus.ACTIVE
- : ParticipantConnectionStatus.INACTIVE;
+ : ParticipantConnectionStatus.INTERRUPTED;
}
/**
| 1 |
diff --git a/gulpfile.js b/gulpfile.js @@ -29,7 +29,6 @@ var options = minimist(process.argv.slice(2), knownOptions);
const browsers = [];
let configBrowsers = options.browsers || process.env['MAPTALKS_BROWSERS'] || '';
-console.log('configBrowsers', configBrowsers);
configBrowsers.split(',').forEach(name => {
if (!name || name.length < 2) {
return;
| 3 |
diff --git a/CHANGES.md b/CHANGES.md @@ -4,7 +4,7 @@ Change Log
### 1.43 - 2018-03-01
##### Fixes :wrench:
-* Fixed bug where AxisAlignedBoundingBox did not copy over center value when cloning an undefined result.
+* Fixed bug where AxisAlignedBoundingBox did not copy over center value when cloning an undefined result. [#6183](https://github.com/AnalyticalGraphicsInc/cesium/pull/6183)
### 1.42.1 - 2018-02-01
_This is an npm-only release to fix an issue with using Cesium in Node.js.__
| 3 |
diff --git a/design-tokens/core/core.alias.yml b/design-tokens/core/core.alias.yml FONT_FAMILY_MONOSPACE: "monospace"
FONT_WEIGHT_NORMAL: 400
FONT_WEIGHT_BOLD: 700
- FONT_SIZE_BASE: "14px"
+ FONT_SIZE_BASE: "14"
# Box shadow
BOX_SHADOW_COLOR: "rgba(0, 0, 0, 0.2)"
| 13 |
diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js @@ -156,7 +156,7 @@ export const settingsAPIs = {
contact: "telegram:BrianZhang"
},
{
- url: "wss://api.weaccount.cn",
+ url: "wss://api.bts.btspp.io:10100",
region: "Eastern Asia",
country: "China",
location: "Hangzhou",
| 14 |
diff --git a/src/components/manage/utils.js b/src/components/manage/utils.js @@ -269,19 +269,6 @@ export const processTier = (crowdsaleAddress, crowdsaleNum) => {
newTier.rate = (contractStore.contractType === WHITELIST_WITH_CAP) ? tokensPerETHTiers : tokensPerETHStandard
- if (crowdsaleNum === 0) {
- tierStore.emptyList()
- tierStore.addTier(newTier)
- tierStore.setTierProperty(newTier.tier, 'tier', crowdsaleNum)
- tierStore.setTierProperty(newTier.walletAddress, 'walletAddress', crowdsaleNum)
- tierStore.setTierProperty(newTier.rate, 'rate', crowdsaleNum)
- tierStore.setTierProperty(newTier.supply, 'supply', crowdsaleNum)
- tierStore.setTierProperty(newTier.startTime, 'startTime', crowdsaleNum)
- tierStore.setTierProperty(newTier.endTime, 'endTime', crowdsaleNum)
- tierStore.setTierProperty(newTier.updatable, 'updatable', crowdsaleNum)
- tierStore.validateTiers('rate', crowdsaleNum)
- tierStore.validateTiers('supply', crowdsaleNum)
- } else {
tierStore.addTier(newTier)
tierStore.addTierValidations({
tier: VALID,
@@ -292,7 +279,6 @@ export const processTier = (crowdsaleAddress, crowdsaleNum) => {
endTime: VALID,
updatable: VALID
})
- }
const whitelist = newTier.whitelist.slice()
const whitelistElements = newTier.whitelistElements.slice()
| 2 |
diff --git a/token-metadata/0x5f75112bBB4E1aF516fBE3e21528C63DA2B6a1A5/metadata.json b/token-metadata/0x5f75112bBB4E1aF516fBE3e21528C63DA2B6a1A5/metadata.json "symbol": "CHESS",
"address": "0x5f75112bBB4E1aF516fBE3e21528C63DA2B6a1A5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/libraries/auth0js/v8/migration-guide.md b/articles/libraries/auth0js/v8/migration-guide.md @@ -7,7 +7,7 @@ description: How to migrate from auth0.js v7 to auth0.js v8
The following instructions assume you are migrating from **auth0.js v7** to **auth0.js v8**.
-The goal of this migration guide is to provide you with all of the information you would need to update Auth0.js in your application. Of course, your first step is to include the latest version of auth0.js. Beyond that, take a careful look at each of the areas on this page. You will need to change your implementation of auth0.js to reflect the new changes. Note that we especially recommend migrating to auth0.js v8 if you have [enabled the new API Authorization flows](/api-auth/tutorials/configuring-tenant-for-api-auth).
+The goal of this migration guide is to provide you with all of the information you would need to update Auth0.js in your application. Of course, your first step is to include the latest version of auth0.js. Beyond that, take a careful look at each of the areas on this page. You will need to change your implementation of auth0.js to reflect the new changes.
Take a look below for more information about changes and additions to auth0.js in version 8!
| 2 |
diff --git a/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs b/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs @@ -88,7 +88,7 @@ public class LoggingAspect {
if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
logger(joinPoint)
.error(
- "Exception in {}() with cause = \'{}\' and exception = \'{}\'",
+ "Exception in {}() with cause = '{}' and exception = '{}'",
joinPoint.getSignature().getName(),
e.getCause() != null ? e.getCause() : "NULL",
e.getMessage(),
| 2 |
diff --git a/src/scss/grommet-core/_objects.box.scss b/src/scss/grommet-core/_objects.box.scss @mixin spaced-flex-basis ($pad-space) {
&.#{$grommet-namespace}box--pad-between-thirds {
> .#{$grommet-namespace}box--basis-1-3 {
- max-width: calc(33.33% - #{$pad-space * (2/3)});
+ // max-width: calc(33.33% - #{$pad-space * (2/3)});
flex-basis: calc(33.33% - #{$pad-space * (2/3)});
@include media-query (palm) {
}
> .#{$grommet-namespace}box--basis-1-2 {
- max-width: calc(50% - #{$pad-space * 0.5});
+ // max-width: calc(50% - #{$pad-space * 0.5});
flex-basis: calc(50% - #{$pad-space * 0.5});
}
> .#{$grommet-namespace}box--basis-1-3 {
- max-width: calc(33.33% - #{$pad-space * 0.5});
+ // max-width: calc(33.33% - #{$pad-space * 0.5});
flex-basis: calc(33.33% - #{$pad-space * 0.5});
}
> .#{$grommet-namespace}box--basis-2-3 {
- max-width: calc(66.66% - #{$pad-space * 0.5});
+ // max-width: calc(66.66% - #{$pad-space * 0.5});
flex-basis: calc(66.66% - #{$pad-space * 0.5});
}
> .#{$grommet-namespace}box--basis-1-4 {
- max-width: calc(25% - #{$pad-space * 0.75});
+ // max-width: calc(25% - #{$pad-space * 0.75});
flex-basis: calc(25% - #{$pad-space * 0.75});
@include media-query(portable) {
margin-right: 0px;
}
- max-width: calc(50% - #{$pad-space * 0.5});
+ // max-width: calc(50% - #{$pad-space * 0.5});
flex-basis: calc(50% - #{$pad-space * 0.5});
}
}
> .#{$grommet-namespace}box--basis-3-4 {
- max-width: calc(75% - #{$pad-space * 0.75});
+ // max-width: calc(75% - #{$pad-space * 0.75});
flex-basis: calc(75% - #{$pad-space * 0.75});
}
// flex-basis
.#{$grommet-namespace}box--basis-xsmall {
- max-width: $size-xsmall;
+ // max-width: $size-xsmall;
flex-basis: $size-xsmall;
}
.#{$grommet-namespace}box--basis-small {
- max-width: $size-small;
+ // max-width: $size-small;
flex-basis: $size-small;
}
.#{$grommet-namespace}box--basis-medium {
- max-width: $size-medium;
+ // max-width: $size-medium;
flex-basis: $size-medium;
}
.#{$grommet-namespace}box--basis-large {
- max-width: $size-large;
+ // max-width: $size-large;
flex-basis: $size-large;
}
.#{$grommet-namespace}box--basis-xlarge {
- max-width: $size-xlarge;
+ // max-width: $size-xlarge;
flex-basis: $size-xlarge;
}
.#{$grommet-namespace}box--basis-xxlarge {
- max-width: $size-xxlarge;
+ // max-width: $size-xxlarge;
flex-basis: $size-xxlarge;
}
.#{$grommet-namespace}box--basis-full {
- max-width: 100%;
+ // max-width: 100%;
flex-basis: 100%;
}
.#{$grommet-namespace}box--basis-1-2 {
- max-width: 50%;
+ // max-width: 50%;
flex-basis: 50%;
}
.#{$grommet-namespace}box--basis-1-3 {
- max-width: 33.33%;
+ // max-width: 33.33%;
flex-basis: 33.33%;
}
.#{$grommet-namespace}box--basis-2-3 {
- max-width: 66.66%;
+ // max-width: 66.66%;
flex-basis: 66.66%;
}
.#{$grommet-namespace}box--basis-1-4 {
- max-width: 25%;
+ // max-width: 25%;
flex-basis: 25%;
@include media-query(portable) { // needed?
- max-width: 50%;
+ // max-width: 50%;
flex-basis: 50%;
}
}
.#{$grommet-namespace}box--basis-3-4 {
- max-width: 75%;
+ // max-width: 75%;
flex-basis: 75%;
}
| 13 |
diff --git a/index.html b/index.html <h4 id="gcd1ans"></h4>
</div>
-<div class="collapse" id="lns">
- <h1 style="color: white;font-family:mathfont">Ln Calculator</h2><p> </p>
- <input style="color: white; font-family:mathfont" type="text"id="ln1" placeholder="Enter the input number" class="form__field"><p> </p>
- <button class="btn btn-dark" onclick="lnfind()">FInd</button><p> </p>
- <p style="font-family:mathfont" id="lnans1"></p><br>
- <p style="font-family:mathfont" id="lnans"></p><br>
+<div class="collapse" id="lns" style="text-align: center;">
+ <div class="container">
+ <h1 style="color: white;font-family:mathfont;text-align: center;">Ln Calculator</h2>
+ <br>
+ <p>The natural logarithm of x is the base e logarithm of x:<br>
+ ln x = log<sub>e</sub> x = y</p>
+ <br>
+ <form action="">
+ <div class="form-group">
+ <input style="color: white; font-family:mathfont" type="number" id="ln1" placeholder="Enter the input number" class="form__field">
+ </div>
+ <div class="form-group">
+ <button type="button" class="btn btn-light" onclick="lnfind()">Find</button>
+ <button type="button" class="btn btn-light" onclick="this.form.reset();">
+ Reset
+ </button>
+ </div>
+ </form>
+ <br>
+ <div class="form-group text-center">
+ <p class="stopwrap" style="color:white;" id="lnans1"></p><br>
+ <p class="stopwrap" style="color:white;" id="lnans"></p><br>
+ </div>
+ </div>
</div>
<div class="collapse" id="vects">
| 7 |
diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js @@ -87,7 +87,7 @@ const rankedAggregationQueryTpl = ctx => `
WHERE rank < ${ctx.limit}
UNION ALL
SELECT
- 'Other' category,
+ null category,
${ctx.aggregation !== 'count' ? ctx.aggregation : 'sum'}(value) as value,
true as agg,
nulls_count,
@@ -292,7 +292,13 @@ module.exports = class Aggregation extends BaseDataview {
min: min_val,
max: max_val,
categoriesCount: categories_count,
- categories: result.rows.map(({ category, value, agg }) => ({ category, value, agg }))
+ categories: result.rows.map(({ category, value, agg }) => {
+ return {
+ category: agg ? 'Others' : category,
+ value,
+ agg
+ };
+ })
};
}
| 5 |
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js @@ -71,6 +71,16 @@ const humanReadableTemplateList = `${validTemplates
.map(template => `"${template}"`)
.join(', ')} and "${validTemplates.slice(-1)}"`;
+const handleServiceCreationError = error => {
+ if (error.code !== 'EACCESS') throw error;
+ const errorMessage = [
+ 'Error unable to create a service in this directory. ',
+ 'Please check that you have the required permissions to write to the directory',
+ ].join('');
+
+ throw new this.serverless.classes.Error(errorMessage);
+};
+
class Create {
constructor(serverless, options) {
this.serverless = serverless;
@@ -222,9 +232,20 @@ class Create {
});
}
- if (notPlugin) {
- this.serverless.config.update({ servicePath: process.cwd() });
+ if (!notPlugin) {
+ return BbPromise.try(() => {
+ try {
+ fse.copySync(
+ path.join(__dirname, '../../../lib/plugins/create/templates', this.options.template),
+ process.cwd()
+ );
+ } catch (error) {
+ handleServiceCreationError(error);
}
+ });
+ }
+
+ this.serverless.config.update({ servicePath: process.cwd() });
return createFromTemplate(this.options.template, process.cwd()).then(
() => {
@@ -251,15 +272,7 @@ class Create {
);
}
},
- error => {
- if (error.code !== 'EACCESS') throw error;
- const errorMessage = [
- 'Error unable to create a service in this directory. ',
- 'Please check that you have the required permissions to write to the directory',
- ].join('');
-
- throw new this.serverless.classes.Error(errorMessage);
- }
+ handleServiceCreationError
);
}
}
| 9 |
diff --git a/src/js/simplemde.js b/src/js/simplemde.js @@ -1354,7 +1354,7 @@ function SimpleMDE(options) {
// Merging the promptTexts, with the given options
- options.promptTexts = promptTexts;
+ options.promptTexts = extend({}, promptTexts, options.promptTexts || {});
// Merging the blockStyles, with the given options
| 11 |
diff --git a/lib/flash.es b/lib/flash.es @@ -36,6 +36,13 @@ for (const flashPath of flashPaths) {
try {
fs.accessSync(flashPath, fs.R_OK)
app.commandLine.appendSwitch('ppapi-flash-path', flashPath)
+ let flashVersion = '27.0.0.187'
+ try {
+ flashVersion = require(path.join(path.dirname(flashPath), 'manifest.json')).version
+ } catch (e) {
+ warn('Get flash metadata failed.')
+ }
+ app.commandLine.appendSwitch('ppapi-flash-version', flashVersion)
break
} catch (e) {
warn(`Flash in ${flashPath} not found.`)
| 12 |
diff --git a/assets/js/modules/analytics/datastore/properties.js b/assets/js/modules/analytics/datastore/properties.js @@ -388,7 +388,7 @@ export const reducer = ( state, { type, payload } ) => {
export const resolvers = {
*getProperties( accountID ) {
if ( ! isValidAccountID( accountID ) ) {
- return undefined;
+ return;
}
const registry = yield Data.commonActions.getRegistry();
| 2 |
diff --git a/src/server/node_services/nodes_monitor.js b/src/server/node_services/nodes_monitor.js @@ -2280,13 +2280,6 @@ class NodesMonitor extends EventEmitter {
_consolidate_host(host_nodes) {
host_nodes.forEach(item => this._update_status(item));
- host_nodes = host_nodes.filter(item => {
- if (item.node.node_type === 'BLOCK_STORE_FS' && (!item.node.drives || !item.node.drives.length)) {
- dbg.error('found a storage node without a storage drive. will be filtered out in UI.', item.node.name);
- return false;
- }
- return true;
- });
const [s3_nodes, storage_nodes] = _.partition(host_nodes, item => item.node.node_type === 'ENDPOINT_S3');
// for now we take the first storage node, and use it as the host_item, with some modifications
// TODO: once we have better understanding of what the host status should be
@@ -2969,12 +2962,10 @@ class NodesMonitor extends EventEmitter {
'wait_reason');
}
info.storage = this._node_storage_info(item);
- if (node.drives && node.drives.length) {
info.drive = {
- mount: node.drives[0].mount,
- drive_id: node.drives[0].drive_id,
+ mount: _.get(node, 'drives[0].mount', '[Unknown Mount]'),
+ drive_id: _.get(node, 'drives[0].drive_id', '[Unknown Drive]'),
};
- }
info.os_info = _.defaults({}, node.os_info);
if (info.os_info.uptime) {
info.os_info.uptime = new Date(info.os_info.uptime).getTime();
| 2 |
diff --git a/README.md b/README.md @@ -83,7 +83,9 @@ GET https://api.spacexdata.com/v1/launches/latest
See the [Contribution](https://github.com/r-spacex/SpaceX-API/blob/master/CONTRIBUTING.md) guide for detailed steps
## Technical Details
-* Uses [Travis CI](https://travis-ci.org/) for testing + deployment
+* API is using [Node.js](https://nodejs.org/en/) with the [Express.js](https://expressjs.com/) framework
+* Uses the [Jest](https://facebook.github.io/jest/) testing framework
+* Uses [Travis CI](https://travis-ci.org/) continuous integration/delivery
* All data stored in a [MongoDB Atlas](https://www.mongodb.com/cloud/atlas) 3 node replica set cluster
* Latest database dump included under [releases](https://github.com/r-spacex/SpaceX-API/releases)
* API deployed on a [Heroku](https://www.heroku.com/) pipeline with pull request, staging and production servers
| 3 |
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html </button>
</div>
<img src="" alt="" class="img-fluid">
- <div class="modal-body p-2">
+ <div class="modal-body p-3">
<div class="content"></div>
</div>
</div>
| 1 |
diff --git a/package.json b/package.json "Orteil"
],
"scripts": {
- "copy-file": "cp dist/CookieMonster.js CookieMonster.js",
"eslint-src": "eslint src test",
- "build": "run-s eslint-src pack-prod remove-comment copy-file test",
+ "build": "run-s eslint-src pack-prod remove-comment test",
"build-test": "run-s pack-dev",
"pack-prod": "webpack --env production",
"pack-dev": "webpack",
| 2 |
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb @@ -105,7 +105,7 @@ class SessionsController < ApplicationController
saml_email = warden.env['warden.options'][:saml_email]
username = CartoDB::UserAccountCreator.email_to_username(saml_email)
- unique_username = Carto::UsernameFinder.find_unique_username(username)
+ unique_username = Carto::UsernameFinder.find_unique(username)
organization_id = warden.env['warden.options'][:organization_id]
created_via = Carto::UserCreation::CREATED_VIA_SAML
| 4 |
diff --git a/src/simplebar.js b/src/simplebar.js @@ -69,6 +69,8 @@ export default class SimpleBar {
mutations.forEach(mutation => {
Array.from(mutation.addedNodes).forEach(addedNode => {
if (addedNode.nodeType === 1) {
+ if (addedNode.SimpleBar) return;
+
if (addedNode.hasAttribute('data-simplebar')) {
new SimpleBar(addedNode, SimpleBar.getElOptions(addedNode));
} else {
| 1 |
diff --git a/src/commands/Rooms/Create.js b/src/commands/Rooms/Create.js @@ -94,7 +94,7 @@ class Create extends Command {
const voiceChannel = await message.guild.createChannel(name, 'voice');
// set up listener to delete channels if inactive for more than 5 minutes
// set up overwrites
- this.setOverwrites(textChannel, voiceChannel, users, message.guild.id);
+ this.setOverwrites(textChannel, voiceChannel, users, message.guild.id, message.author);
// add channel to listenedChannels
await this.bot.settings.addPrivateRoom(message.guild, textChannel, voiceChannel);
// send users invite link to new rooms
@@ -157,7 +157,7 @@ class Create extends Command {
* @param {Array.<User>} users Array of users for whom to allow into channels
* @param {string} everyoneId Snowflake id for the everyone role
*/
- setOverwrites(textChannel, voiceChannel, users, everyoneId) {
+ setOverwrites(textChannel, voiceChannel, users, everyoneId, author) {
// create overwrites
const overwritePromises = [];
// create text channel perms
@@ -202,6 +202,19 @@ class Create extends Command {
}));
});
+ overwritePromises.push(textChannel.overwritePermissions(author.id, {
+ VIEW_CHANNEL: true,
+ SEND_MESSAGES: true,
+ MANAGE_CHANNELS: true,
+ }));
+ overwritePromises.push(voiceChannel.overwritePermissions(user.id, {
+ VIEW_CHANNEL: true,
+ CONNECT: true,
+ SPEAK: true,
+ USE_VAD: true,
+ MANAGE_CHANNELS: true,
+ }));
+
overwritePromises.forEach(promise => promise.catch(this.logger.error));
}
| 11 |
diff --git a/lib/Backend/BackwardPass.cpp b/lib/Backend/BackwardPass.cpp @@ -2979,7 +2979,7 @@ BackwardPass::ProcessBlock(BasicBlock * block)
break;
case IR::OpndKind::OpndKindReg:
// If it's not type-specialized, we may dereference it.
- if (!(opnd->GetValueType().IsNotObject()))
+ if (!(opnd->GetValueType().IsNotObject()) && !opnd->AsRegOpnd()->m_sym->IsTypeSpec())
{
bv->Set(opnd->AsRegOpnd()->m_sym->m_id);
}
@@ -3017,7 +3017,7 @@ BackwardPass::ProcessBlock(BasicBlock * block)
for (int iter = 0; iter < list->Count(); iter++)
{
// should be the same as OpndKindReg, since ListOpndType is RegOpnd
- if (!(list->Item(iter)->GetValueType().IsNotObject()))
+ if (!(list->Item(iter)->GetValueType().IsNotObject()) && !opnd->AsRegOpnd()->m_sym->IsTypeSpec())
{
bv->Set(list->Item(iter)->m_sym->m_id);
}
| 8 |
diff --git a/src/commands/Settings/SetPing.js b/src/commands/Settings/SetPing.js @@ -24,7 +24,7 @@ class SetPing extends Command {
this.messagemanager.reply(message, 'Operator, you can\'t do that privately, it\'s the same as directly messaging you anyway!');
} else if (match) {
const trackables = trackFunctions.trackablesFromParameters(match[1].trim());
- const eventsAndItems = [].concat(trackables.events).concat(trackables.itesm);
+ const eventsAndItems = [].concat(trackables.events).concat(trackables.items);
const pingString = match[2] ? match[2].trim() : undefined;
const promises = [];
@@ -36,14 +36,12 @@ class SetPing extends Command {
return;
} else if (!pingString) {
eventsAndItems.forEach(eventOrItem => {
- console.log(`Remove : ${eventOrItem}`);
if(eventOrItem) {
promises.push(this.bot.settings.removePing(message.guild, eventOrItem));
}
});
} else {
eventsAndItems.forEach((eventOrItem) => {
- console.log(`Set : ${eventOrItem}`);
if(eventOrItem) {
promises.push(this.bot.settings.setPing(message.guild, eventOrItem, pingString));
}
| 2 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js b/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js @@ -65,25 +65,6 @@ module.exports = CoreView.extend({
var self = this;
var infoboxSstates = [
{
- state: 'georeference',
- createContentView: function () {
- var name = this._layerDefinitionModel ? this._layerDefinitionModel.getTableName() : '';
- var body = [
- _t('editor.tab-pane.layers.georeference.body', { name: name }),
- _t('editor.layers.georeference.manually-add')
- ].join(' ');
-
- return Infobox.createWithAction({
- type: 'alert',
- title: _t('editor.tab-pane.layers.georeference.title'),
- body: body,
- mainAction: {
- label: _t('editor.layers.georeference.georeference-button')
- }
- });
- },
- mainAction: self._onGeoreferenceClicked.bind(self)
- }, {
state: 'layer-hidden',
createContentView: function () {
return Infobox.createWithAction({
@@ -166,9 +147,6 @@ module.exports = CoreView.extend({
if (this._isLayerHidden()) {
this._infoboxModel.set({ state: 'layer-hidden' });
this._overlayModel.set({ visible: true });
- } else if (this._layerDefinitionModel.canBeGeoreferenced() && this._analysisFormsCollection.isEmpty()) {
- this._infoboxModel.set({ state: 'georeference' });
- this._overlayModel.set({ visible: false });
} else {
this._infoboxModel.set({ state: '' });
this._overlayModel.set({ visible: false });
| 2 |
diff --git a/src/middleware/index.js b/src/middleware/index.js @@ -69,7 +69,7 @@ const analyticsMiddleware = store => next => action => {
timestamp: new Date(),
account_id: wallet.accountId
})
- mixpanel.people.set_once({
+ mixpanel.people.set({
network_id: networkId,
stake: 0
})
| 1 |
diff --git a/sirepo/sim_data/flash.py b/sirepo/sim_data/flash.py @@ -90,6 +90,8 @@ class SimData(sirepo.sim_data.SimDataBase):
if v == '1':
c.append(f'{k}=TRUE')
continue
+ if k not in s.model.setupArguments:
+ continue
t = s.model.setupArguments[k][1]
if t == 'SetupArgumentDimension':
# always include the setup dimension
| 8 |
diff --git a/platform/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html b/platform/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html <!--suppress CssUnknownTarget -->
<div class="login-image"></div>
<div class="login-form-wrapper">
- <form id="loginform" method="POST" action="${requestContextPath}/j_security_check"
+ <form id="loginform" method="POST" action="${contextPath}/j_security_check"
enctype="multipart/form-data" accept-charset="UTF-8">
<input type="hidden" name="_charset_" value="UTF-8"/>
| 10 |
diff --git a/app/OAuthManager.js b/app/OAuthManager.js @@ -57,7 +57,7 @@ class OAuthManager {
const y = screenBounds.y + ((screenBounds.height - 580) / 2);
const window = new BrowserWindow({
- width: constants.WINDOW_WIDTH,
+ width: 380,
height: constants.WINDOW_HEIGHT,
x,
y,
| 14 |
diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js -var _ = require('underscore');
var BaseWidget = require('./base');
var debug = require('debug')('windshaft:widget:aggregation');
@@ -153,11 +152,13 @@ const TYPE = 'aggregation';
}
*/
function Aggregation(query, options, queries) {
- if (!_.isString(options.column)) {
+ options = options || {};
+
+ if (typeof options.column !== 'string') {
throw new Error('Aggregation expects `column` in widget options');
}
- if (!_.isString(options.aggregation)) {
+ if (typeof options.aggregation !== 'string') {
throw new Error('Aggregation expects `aggregation` operation in widget options');
}
@@ -166,7 +167,8 @@ function Aggregation(query, options, queries) {
}
var requiredOptions = VALID_OPERATIONS[options.aggregation];
- var missingOptions = _.difference(requiredOptions, Object.keys(options));
+ var missingOptions = requiredOptions.filter(requiredOption => !options.hasOwnProperty(requiredOption));
+
if (missingOptions.length > 0) {
throw new Error(
"Aggregation '" + options.aggregation + "' is missing some options: " + missingOptions.join(',')
@@ -315,11 +317,7 @@ Aggregation.prototype.format = function(result) {
minValue = firstRow.min_val;
maxValue = firstRow.max_val;
categoriesCount = firstRow.categories_count;
-
- result.rows.forEach(function(row) {
- categories.push(_.omit(row, 'count', 'nulls_count', 'min_val',
- 'max_val', 'categories_count', 'nans_count', 'infinities_count'));
- });
+ categories = result.rows.map(({ category, value, agg }) => ({ category, value, agg }));
}
return {
| 14 |
diff --git a/token-metadata/0x7533D63A2558965472398Ef473908e1320520AE2/metadata.json b/token-metadata/0x7533D63A2558965472398Ef473908e1320520AE2/metadata.json "symbol": "INTX",
"address": "0x7533D63A2558965472398Ef473908e1320520AE2",
"decimals": 9,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs @@ -396,20 +396,21 @@ public class CacheConfiguration<% if (cacheProvider === 'hazelcast') { %> implem
if (this.registration == null) { // if registry is not defined, use native discovery
log.warn("No discovery service is set up, Infinispan will use default discovery for cluster formation");
return () -> GlobalConfigurationBuilder
- .defaultClusteredBuilder().transport().defaultTransport()
+ .defaultClusteredBuilder().defaultCacheName("infinispan-<%=baseName%>-cluster-cache").transport().defaultTransport()
.addProperty("configurationFile", jHipsterProperties.getCache().getInfinispan().getConfigFile())
.clusterName("infinispan-<%=baseName%>-cluster").globalJmxStatistics()
.enabled(jHipsterProperties.getCache().getInfinispan().isStatsEnabled())
.allowDuplicateDomains(true).build();
}
return () -> GlobalConfigurationBuilder
- .defaultClusteredBuilder().transport().transport(new JGroupsTransport(getTransportChannel()))
+ .defaultClusteredBuilder().defaultCacheName("infinispan-<%=baseName%>-cluster-cache").transport()
+ .transport(new JGroupsTransport(getTransportChannel()))
.clusterName("infinispan-<%=baseName%>-cluster").globalJmxStatistics()
.enabled(jHipsterProperties.getCache().getInfinispan().isStatsEnabled())
.allowDuplicateDomains(true).build();
<%_ } else { _%>
return () -> GlobalConfigurationBuilder
- .defaultClusteredBuilder().transport().defaultTransport()
+ .defaultClusteredBuilder().defaultCacheName("infinispan-<%=baseName%>-cluster-cache").transport().defaultTransport()
.addProperty("configurationFile", jHipsterProperties.getCache().getInfinispan().getConfigFile())
.clusterName("infinispan-<%=baseName%>-cluster").globalJmxStatistics()
.enabled(jHipsterProperties.getCache().getInfinispan().isStatsEnabled())
@@ -529,7 +530,7 @@ public class CacheConfiguration<% if (cacheProvider === 'hazelcast') { %> implem
cacheManager.getCache("oAuth2Authentication").getAdvancedCache(), this,
ConfigurationAdapter.create()));
<%_ } _%>
- <%_ if (!skipUserManagement || (authenticationType === 'oauth2' && applicationType !== 'microservice')) { _%>
+ <%_ if (!skipUserManagement || (authenticationType === 'oauth2')) { _%>
registerPredefinedCache(<%=packageName%>.repository.UserRepository.USERS_BY_LOGIN_CACHE, new JCache<Object, Object>(
cacheManager.getCache(<%=packageName%>.repository.UserRepository.USERS_BY_LOGIN_CACHE).getAdvancedCache(), this,
ConfigurationAdapter.create()));
@@ -573,8 +574,8 @@ public class CacheConfiguration<% if (cacheProvider === 'hazelcast') { %> implem
* MPING multicast is replaced with TCPPING with the host details discovered
* from registry and sends only unicast messages to the host list.
*/
- private Channel getTransportChannel() {
- JChannel channel = new JChannel(false);
+ private JChannel getTransportChannel() {
+ JChannel channel = null;
List<PhysicalAddress> initialHosts = new ArrayList<>();
try {
for (ServiceInstance instance : discoveryClient.getInstances(registration.getServiceId())) {
@@ -587,12 +588,7 @@ public class CacheConfiguration<% if (cacheProvider === 'hazelcast') { %> implem
tcp.setBindPort(7800);
tcp.setThreadPoolMinThreads(2);
tcp.setThreadPoolMaxThreads(30);
- tcp.setThreadPoolQueueEnabled(false);
tcp.setThreadPoolKeepAliveTime(60000);
- tcp.setOOBThreadPoolMinThreads(2);
- tcp.setOOBThreadPoolMaxThreads(200);
- tcp.setOOBThreadPoolKeepAliveTime(60000);
- tcp.setOOBThreadPoolQueueEnabled(false);
TCPPING tcpping = new TCPPING();
initialHosts.add(new IpAddress(InetAddress.getLocalHost(), 7800));
@@ -629,7 +625,7 @@ public class CacheConfiguration<% if (cacheProvider === 'hazelcast') { %> implem
.addProtocol(new GMS())
.addProtocol(new MFC())
.addProtocol(new FRAG2());
- channel.setProtocolStack(stack);
+ channel = new JChannel(stack);
stack.init();
} catch (Exception e) {
throw new BeanInitializationException("Cache (Infinispan protocol stack) configuration failed", e);
| 3 |
diff --git a/tests/mocha-reporter.js b/tests/mocha-reporter.js @@ -24,7 +24,7 @@ const { join } = require('path');
const os = require('os');
const Spec = require('mocha/lib/reporters/spec');
const Runner = require('mocha/lib/runner');
-const { mkdirsSync, removeSync } = require('fs-extra');
+const { ensureDirSync, removeSync } = require('fs-extra');
const { tmpDirCommonPath } = require('../tests/utils/fs');
// Ensure faster tests propagation
@@ -50,7 +50,7 @@ os.homedir = () => tmpDirCommonPath;
if (process.env.USERPROFILE) process.env.USERPROFILE = tmpDirCommonPath;
if (process.env.HOME) process.env.HOME = tmpDirCommonPath;
-mkdirsSync(tmpDirCommonPath); // Ensure temporary homedir exists
+ensureDirSync(tmpDirCommonPath); // Ensure temporary homedir exists
module.exports = class ServerlessSpec extends Spec {
constructor(runner) {
| 4 |
diff --git a/generators/server/templates/src/test/java/package/web/rest/AuditResourceIntTest.java.ejs b/generators/server/templates/src/test/java/package/web/rest/AuditResourceIntTest.java.ejs @@ -176,11 +176,11 @@ public class AuditResourceIntTest {
public void testPersistentAuditEventEquals() throws Exception {
TestUtil.equalsVerifier(PersistentAuditEvent.class);
PersistentAuditEvent auditEvent1 = new PersistentAuditEvent();
- auditEvent1.setId(<% if (databaseType === 'sql' && authenticationType !== 'oauth2') { %>1L<% } else { %>"id1"<% } %>);
+ auditEvent1.setId(<% if (databaseType === 'sql') { %>1L<% } else { %>"id1"<% } %>);
PersistentAuditEvent auditEvent2 = new PersistentAuditEvent();
auditEvent2.setId(auditEvent1.getId());
assertThat(auditEvent1).isEqualTo(auditEvent2);
- auditEvent2.setId(<% if (databaseType === 'sql' && authenticationType !== 'oauth2') { %>2L<% } else { %>"id2"<% } %>);
+ auditEvent2.setId(<% if (databaseType === 'sql') { %>2L<% } else { %>"id2"<% } %>);
assertThat(auditEvent1).isNotEqualTo(auditEvent2);
auditEvent1.setId(null);
assertThat(auditEvent1).isNotEqualTo(auditEvent2);
| 2 |
diff --git a/src/js/modules/validate.js b/src/js/modules/validate.js @@ -203,7 +203,7 @@ Validate.prototype.validators = {
//must have a value
required:function(cell, value, parameters){
- return value !== "" & value !== null && typeof value !== "undefined";
+ return value !== "" && value !== null && typeof value !== "undefined";
},
};
| 14 |
diff --git a/docs/clients.md b/docs/clients.md @@ -10,7 +10,7 @@ NOTE: Clients are grouped by API version(s) supported
|:---|:---|:---|:---|
| Oddity | .NET | Tearth | [GitHub](https://github.com/Tearth/Oddity) |
| SpaceX-Async-Wrapper | Python | Ryu JuHeon | [GitHub](https://github.com/SaidBySolo/SpaceX-Async-Wrapper) |
-| KSBSpacexKit | Swift | SaiBalaji22 | [GitHub](https://github.com/SaiBalaji22/KSBSpacexKit) |
+| KSBSpacexKit | Swift | SaiBalaji K| [GitHub](https://github.com/SaiBalaji22/KSBSpacexKit) |
| Marsy | C++ | AzuxDario | [GitHub](https://github.com/AzuxDario/Marsy) |
### V3, V2, V1 (Deprecated)
| 3 |
diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js @@ -307,6 +307,9 @@ const render = function(id, _txt, cb, container) {
)} !important; }`;
} else {
// console.log('classes[className].styles', classes[className].styles, cnf.htmlLabels);
+ userStyles += `\n.${className} path { ${classes[className].styles.join(
+ ' !important; '
+ )} !important; }`;
userStyles += `\n.${className} rect { ${classes[className].styles.join(
' !important; '
)} !important; }`;
| 9 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,13 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.52.1] -- 2020-01-13
+
+### Fixed
+- Fix handling of `geo.visible` false edge case in order to
+ override `template.layout.geo.show*` attributes [#4483]
+
+
## [1.52.0] -- 2020-01-08
### Added
| 3 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -981,7 +981,7 @@ def run(out, err, url, username, password, encValData, mirror, search_query, fil
except multiprocessing.NotImplmentedError:
nprocesses = 1
- version = '1.16'
+ version = '1.17'
try:
ip_output = subprocess.check_output(
| 3 |
diff --git a/app/containers/NetworkClient/sagas/fetchers.js b/app/containers/NetworkClient/sagas/fetchers.js @@ -24,16 +24,17 @@ import {
export function* fetchNetworks(filter) {
let defaultNetwork = 'eos'
let defaultType = 'mainnet'
- if(filter.has('network')){
- defaultNetwork = filter.get('network')
-
- }else if(filter.has('type')){
- defaultType = filter.get('type')
+ let defaultName = 'Greymass'
+ if(filter.filter.has('network') && filter.filter.has('type') && filter.filter.has('api')){
+ defaultNetwork = filter.filter.get('network')
+ defaultType = filter.filter.get('type')
+ defaultName = filter.filter.get('api')
}
console.log('tam network', defaultNetwork)
console.log('tam type', defaultType)
+ console.log('tam api', defaultName )
try {
// fetch the remote network list
@@ -55,11 +56,11 @@ export function* fetchNetworks(filter) {
};
});
- console.log('tam', networks)
-
// get default
- const network = networks.find(n => n.network === 'eos' && n.type === 'mainnet');
- const endpoint = network.endpoints.find(e => e.name === 'Greymass');
+ const network = networks.find(n => n.network === defaultNetwork && n.type === defaultType);
+ const endpoint = network.endpoints.find(e => e.name === defaultName);
+
+ console.log('tam network', networks)
// build activeNetwork
const activeNetwork = {
| 0 |
diff --git a/packages/project-disaster-trail/src/components/Game/Orb.js b/packages/project-disaster-trail/src/components/Game/Orb.js @@ -67,7 +67,7 @@ class Orb extends Component {
window.cancelAnimationFrame(animationFrame);
clearTimeout(pressTimeout);
/* We keep setState() in a conditional in case of a mouseLeave when the orb had not been pressed to avoid unnecessary setState() calls */
- this.setState(() => defaultState);
+ this.setState(defaultState);
}
};
@@ -79,12 +79,12 @@ class Orb extends Component {
});
const pressTimeout = setTimeout(this.handleOrbRelease, durationRequired);
- this.setState(() => ({
+ this.setState({
animationState: "pressing",
pressedStart: new Date(),
animationFrame: newAnimationFrame,
pressTimeout
- }));
+ });
};
doFullDurationAnimation = () => {
| 2 |
Subsets and Splits