code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/internal/ButtonBase.spec.js b/src/internal/ButtonBase.spec.js @@ -468,4 +468,20 @@ describe('<ButtonBase />', () => {
});
});
});
+
+ describe('focus()', () => {
+ let instance;
+
+ before(() => {
+ instance = mount(<ButtonBase component="span">Hello</ButtonBase>).instance();
+ instance.button = {
+ focus: spy(),
+ };
+ });
+
+ it('should call the focus on the instance.button', () => {
+ instance.focus();
+ assert.strictEqual(instance.button.focus.callCount, 1);
+ });
+ });
});
| 0 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -553,7 +553,7 @@ const _countCharacters = (name, regex) => {
}
return result;
};
-const _findHips = skeleton => skeleton.bones.find(bone => /hip/i.test(bone.name));
+const _findHips = skeleton => skeleton.bones.find(bone => /hip|rootx/i.test(bone.name));
const _findHead = tailBones => {
const headBones = tailBones.map(tailBone => {
const headBone = _findFurthestParentBone(tailBone, bone => /head/i.test(bone.name));
| 0 |
diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js @@ -20,7 +20,7 @@ import * as ReimbursementAccountUtils from '../../libs/ReimbursementAccountUtils
import * as ValidationUtils from '../../libs/ValidationUtils';
import EnableStep from './EnableStep';
import reimbursementAccountPropTypes from './reimbursementAccountPropTypes';
-import ReimbursementAccountForm from './ReimbursementAccountForm';
+import Form from '../../components/Form';
import * as Expensicons from '../../components/Icon/Expensicons';
import * as Illustrations from '../../components/Icon/Illustrations';
import Section from '../../components/Section';
@@ -71,6 +71,10 @@ class ValidationStep extends React.Component {
this.clearError = inputKey => ReimbursementAccountUtils.clearError(this.props, inputKey);
}
+ componentWillUnmount() {
+ BankAccounts.resetReimbursementAccount();
+ }
+
/**
* @param {Object} value
*/
@@ -163,6 +167,12 @@ class ValidationStep extends React.Component {
const maxAttemptsReached = lodashGet(this.props, 'reimbursementAccount.maxAttemptsReached');
const isVerifying = !maxAttemptsReached && state === BankAccount.STATE.VERIFYING;
+ const currentStep = lodashGet(
+ this.props,
+ 'reimbursementAccount.achData.currentStep',
+ CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT,
+ );
+
return (
<View style={[styles.flex1, styles.justifyContentBetween]}>
<HeaderWithCloseButton
@@ -190,9 +200,10 @@ class ValidationStep extends React.Component {
</View>
)}
{!maxAttemptsReached && state === BankAccount.STATE.PENDING && (
- <ReimbursementAccountForm
- reimbursementAccount={this.props.reimbursementAccount}
+ <Form
+ submitButtonText={currentStep === CONST.BANK_ACCOUNT.STEP.VALIDATION ? this.props.translate('validationStep.buttonText') : this.props.translate('common.saveAndContinue')}
onSubmit={this.submit}
+ style={[styles.mh5, styles.mb5]}
>
<View style={[styles.mb2]}>
<Text style={[styles.mb5]}>
@@ -228,7 +239,7 @@ class ValidationStep extends React.Component {
errorText={this.getErrorText('amount3')}
/>
</View>
- </ReimbursementAccountForm>
+ </Form>
)}
{isVerifying && (
<View style={[styles.flex1]}>
| 14 |
diff --git a/lambda/cfn-lambda-layer/package-lock.json b/lambda/cfn-lambda-layer/package-lock.json }
},
"node_modules/archiver/node_modules/async": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
- "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
"dependencies": {
"lodash": "^4.17.14"
}
},
"dependencies": {
"async": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
- "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
"requires": {
"lodash": "^4.17.14"
}
| 3 |
diff --git a/lib/taiko.js b/lib/taiko.js @@ -28,7 +28,7 @@ const { getPlugins } = require('./plugins');
const EventEmiter = require('events').EventEmitter;
const xhrEvent = new EventEmiter();
const descEvent = new EventEmiter();
-let chromeProcess, temporaryUserDataDir, page, network, runtime, input, client, dom, emulation, overlay, criTarget, currentPort, currentHost,
+let chromeProcess, temporaryUserDataDir, page, network, runtime, input, _client, dom, emulation, overlay, criTarget, currentPort, currentHost,
headful, security, ignoreSSLErrors, observe, browser, device;
let xhrEventProxy;
let clientProxy;
@@ -42,9 +42,9 @@ const connect_to_cri = async (target) => {
if (process.env.LOCAL_PROTOCOL) {
localProtocol = true;
}
- if (client) {
+ if (_client) {
await network.setRequestInterception({ patterns: [] });
- client.removeAllListeners();
+ _client.removeAllListeners();
}
return new Promise(async function connect(resolve) {
try {
@@ -54,8 +54,8 @@ const connect_to_cri = async (target) => {
target = browserTargets.filter((target) => target.type === 'page')[0];
}
await cri({ target, local: localProtocol }, async (c) => {
- client = c;
- clientProxy = getEventProxy(client);
+ _client = c;
+ clientProxy = getEventProxy(_client);
page = c.Page;
network = c.Network;
runtime = c.Runtime;
@@ -74,17 +74,17 @@ const connect_to_cri = async (target) => {
await browserHandler.setBrowser(browser);
await emulationHandler.setEmulation(emulation);
await pageHandler.setPage(page, xhrEvent, logEvent, async function () {
- if (!client) return;
+ if (!_client) return;
logEvent('DOMContentLoaded');
await dom.getDocument();
});
await Promise.all([runtime.enable(), network.enable(), page.enable(), dom.enable(), overlay.enable(), security.enable()]);
await setDOM(domHandler);
if (ignoreSSLErrors) security.setIgnoreCertificateErrors({ ignore: true });
- client.on('disconnect', reconnect);
+ _client.on('disconnect', reconnect);
device = process.env.TAIKO_EMULATE_DEVICE;
if (device) emulateDevice(device);
- xhrEvent.emit('createdSession', client);
+ xhrEvent.emit('createdSession', _client);
resolve();
});
} catch (e) {
@@ -97,8 +97,8 @@ const connect_to_cri = async (target) => {
async function reconnect() {
try {
xhrEvent.emit('reconnecting');
- client.removeAllListeners();
- client = null;
+ _client.removeAllListeners();
+ _client = null;
const browserTargets = await cri.List({ host: currentHost, port: currentPort });
const pages = browserTargets.filter((target) => {
return target.type === 'page';
@@ -214,11 +214,11 @@ module.exports.closeBrowser = async () => {
};
const _closeBrowser = async () => {
- if (client) {
- await client.removeAllListeners();
+ if (_client) {
+ await _client.removeAllListeners();
await page.close();
- await client.close();
- client = null;
+ await _client.close();
+ _client = null;
}
chromeProcess.kill('SIGTERM');
const waitForChromeToClose = new Promise((fulfill) => {
@@ -380,8 +380,8 @@ module.exports.closeTab = async (targetUrl) => {
descEvent.emit('success', 'Closing last target and browser.');
return;
}
- client.removeAllListeners();
- client = null;
+ _client.removeAllListeners();
+ _client = null;
await cri.Close({ host: currentHost, port: currentPort, id: target.id });
await connect_to_cri(targetHandler.constructCriTarget(targetToConnect));
await dom.getDocument();
| 10 |
diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js @@ -353,7 +353,6 @@ async function loadPluginConfig(fileInfo) {
*/
function loadNodeSet(node) {
if (!node.enabled) {
- console.log("BAIL ON",node.id)
return Promise.resolve(node);
} else {
}
| 2 |
diff --git a/src/views/preview/project-view.jsx b/src/views/preview/project-view.jsx @@ -126,7 +126,6 @@ class Preview extends React.Component {
showUsernameBlockAlert: false,
showEmailConfirmationModal: false,
projectId: parts[1] === 'editor' ? '0' : parts[1],
- isNewProject: parts[1] === 'editor',
reportOpen: false,
singleCommentId: singleCommentId,
greenFlagRecorded: false
@@ -150,7 +149,6 @@ class Preview extends React.Component {
}
}
if (this.state.projectId === '0' && this.state.projectId !== prevState.projectId) {
- this.setState({isNewProject: true}); // eslint-disable-line react/no-did-update-set-state
this.props.resetProject();
if (this.state.justRemixed || this.state.justShared) {
this.setState({ // eslint-disable-line react/no-did-update-set-state
@@ -835,7 +833,7 @@ class Preview extends React.Component {
/>
</Page> :
<React.Fragment>
- {(this.state.isNewProject || this.state.isProjectLoaded ||
+ {(!this.state.projectId || this.state.projectId === '0' || this.state.isProjectLoaded ||
(this.props.projectInfo && this.props.projectInfo.project_token)) &&
(
<IntlGUI
| 14 |
diff --git a/ui/component/cardVerify/view.jsx b/ui/component/cardVerify/view.jsx @@ -37,6 +37,7 @@ class CardVerify extends React.Component {
super(props);
this.state = {
open: false,
+ scriptFailedToLoad: false,
};
}
@@ -117,7 +118,7 @@ class CardVerify extends React.Component {
};
onScriptError = (...args) => {
- throw new Error('Unable to load credit validation script.');
+ this.setState({ scriptFailedToLoad: true });
};
onClosed = () => {
@@ -159,13 +160,21 @@ class CardVerify extends React.Component {
};
render() {
+ const { scriptFailedToLoad } = this.props;
+
return (
+ <div>
+ {scriptFailedToLoad && (
+ <div className="error-text">There was an error connecting to Stripe. Please try again later.</div>
+ )}
+
<Button
button="primary"
label={this.props.label}
disabled={this.props.disabled || this.state.open || this.hasPendingClick}
onClick={this.onClick.bind(this)}
/>
+ </div>
);
}
}
| 9 |
diff --git a/src/graphics/viewport.js b/src/graphics/viewport.js @@ -568,8 +568,8 @@ Crafty.extend({
* @comp Crafty.stage
* @kind Method
*
- * @sign public void Crafty.viewport.init([Number width, Number height, String stage_elem])
- * @sign public void Crafty.viewport.init([Number width, Number height, HTMLElement stage_elem])
+ * @sign public void Crafty.viewport.init([Number width, Number height][, String stage_elem])
+ * @sign public void Crafty.viewport.init([Number width, Number height][, HTMLElement stage_elem])
* @param Number width - Width of the viewport
* @param Number height - Height of the viewport
* @param String or HTMLElement stage_elem - the element to use as the stage (either its id or the actual element).
@@ -583,6 +583,14 @@ Crafty.extend({
* @see Crafty.device, Crafty.domHelper, Crafty.stage, Crafty.viewport.reload
*/
init: function (w, h, stage_elem) {
+ // Handle specifying stage_elem without w & h
+ if (typeof(stage_elem) === 'undefined' && typeof(h) === 'undefined' &&
+ typeof(w) !=='undefined' && typeof(w) !== 'number') {
+ stage_elem = w;
+ w = window.innerWidth;
+ h = window.innerHeight;
+ }
+
// Define default graphics layers with default z-layers
Crafty.createLayer("DefaultCanvasLayer", "Canvas", {z: 20});
Crafty.createLayer("DefaultDOMLayer", "DOM", {z: 30});
| 9 |
diff --git a/assets/js/components/data/index.js b/assets/js/components/data/index.js @@ -226,9 +226,7 @@ const dataAPI = {
// Resolve any returned data requests, then re-request the remainder after a pause.
} ).catch( ( err ) => {
// Handle the error and give up trying.
- if ( ! err._logged ) {
console.warn( 'Error caught during combinedGet', err ); // eslint-disable-line no-console
- }
} );
},
@@ -268,13 +266,6 @@ const dataAPI = {
return count + addedNoticeCount;
} );
}
-
- // Ensure error is still thrown to let consumers handle the error.
- // Throw a copy of the error to not mutate the original.
- throw {
- _logged: true, // Prevent double logging.
- ...error,
- };
},
/**
| 2 |
diff --git a/package.json b/package.json {
- "name": "@sveltech/routify",
- "version": "1.999.999",
+ "name": "@roxi/routify",
+ "version": "2.0.0-next-major",
"description": "Routes for Svelte, automated by your file structure",
"main": "lib/index.js",
"svelte": "runtime/index.js",
| 12 |
diff --git a/articles/connections/social/instagram.md b/articles/connections/social/instagram.md @@ -4,13 +4,19 @@ connection: Instagram
index: 4
image: /media/connections/instagram.png
seo_alias: instagram
-description: This page shows you how to connect your Auth0 app to Instagram. You will need to generate keys, copy these into your Auth0 settings, and enable the connection.
+description: This article shows you how to connect your Auth0 app to Instagram. You will need to generate keys, copy these into your Auth0 settings, and enable the connection.
toc: true
---
-
# Connect your app to Instagram
-To connect your Auth0 app to Instagram, you will need to generate a **Client ID** and **Client Secret** in an Instagram app, copy these keys into your Auth0 settings, and enable the connection.
+This article describes how to add login with Instagram to your app. It also discusses how you can get an access token in order to access the Instagram API.
+
+First you need to connect your Auth0 client to Instagram. This is summarized in the following steps:
+
+- Register a client at the Instagram Developer Portal
+- Get the **Client ID** and **Client Secret**
+- Copy these keys into your Auth0 settings
+- Enable the Instagram social connection in Auth0
## 1. Log into the developer portal
@@ -42,7 +48,7 @@ Click **Register**.
-## 4. Get your **Client ID** and **Client Secret**
+## 4. Get your Client ID and Client Secret
Once your app is registered, you will be navigated to the **Manage Clients** page. Click on the **Manage** button for your new client.
@@ -92,5 +98,18 @@ If you have configured everything correctly, you will see the **It works!!!** pa
[Click here to learn more about authentication with Instagram](https://www.instagram.com/developer/authentication/)
-<%= include('../_quickstart-links.md') %>
+## 8. Access Instagram API
+
+Once you successfully authenticate a user, Instagram includes an [access token](/tokens/access-token) in the user profile it returns to Auth0.
+You can then use this token to call their API.
+
+In order to get a Instagram access token, you have to retrieve the full user's profile, using the Auth0 Management API, and extrach the access token from the response. For detailed steps refer to [Call an Identity Provider API](/connections/calling-an-external-idp-api).
+
+Once you have the token you can call the API, following Instagram's documentation.
+
+::: note
+For more information on these tokens, refer to [Identity Provider Access Tokens](/tokens/idp).
+:::
+
+<%= include('../_quickstart-links.md') %>
| 0 |
diff --git a/lib/carto/bounding_box_service.rb b/lib/carto/bounding_box_service.rb @@ -14,10 +14,10 @@ class Carto::BoundingBoxService
result = current_bbox_using_stats(table_name)
return nil unless result
{
- maxx: BoundingBoxUtils.bound_for(result[:max][0].to_f, :minx, :maxx),
- maxy: BoundingBoxUtils.bound_for(result[:max][1].to_f, :miny, :maxy),
- minx: BoundingBoxUtils.bound_for(result[:min][0].to_f, :minx, :maxx),
- miny: BoundingBoxUtils.bound_for(result[:min][1].to_f, :miny, :maxy)
+ maxx: Carto::BoundingBoxUtils.bound_for(result[:max][0].to_f, :minx, :maxx),
+ maxy: Carto::BoundingBoxUtils.bound_for(result[:max][1].to_f, :miny, :maxy),
+ minx: Carto::BoundingBoxUtils.bound_for(result[:min][0].to_f, :minx, :maxx),
+ miny: Carto::BoundingBoxUtils.bound_for(result[:min][1].to_f, :miny, :maxy)
}
end
@@ -29,7 +29,7 @@ class Carto::BoundingBoxService
return nil unless table_name.present?
# (lon,lat) as comes from postgis
- JSON.parse(@user.service.execute_in_user_database(%{
+ JSON.parse(@user.db_service.execute_in_user_database(%{
SELECT _postgis_stats ('#{table_name}', 'the_geom');
}).first['_postgis_stats'])['extent'].symbolize_keys
rescue => e
@@ -61,7 +61,7 @@ class Carto::BoundingBoxService
end
def get_bbox_values(table_name, column_name)
- result = @user.service.execute_in_user_database(%{
+ result = @user.db_service.execute_in_user_database(%{
SELECT
ST_XMin(ST_Extent(#{column_name})) AS minx,
ST_YMin(ST_Extent(#{column_name})) AS miny,
| 4 |
diff --git a/rig-aux.js b/rig-aux.js @@ -258,6 +258,29 @@ export class RigAux {
avatarScene.remove(pet.model);
this.pets.splice(this.pets.indexOf(pet), 1);
}
+ decapitate() {
+ for (const wearable of this.wearables) {
+ if (wearable.component.bone === 'Head') {
+ wearable.model.traverse(o => {
+ if (o.isMesh) {
+ o.savedVisible = o.visible;
+ o.visible = false;
+ }
+ });
+ }
+ }
+ }
+ undecapitate() {
+ for (const wearable of this.wearables) {
+ if (wearable.component.bone === 'Head') {
+ wearable.model.traverse(o => {
+ if (o.isMesh) {
+ o.visible = o.savedVisible;
+ }
+ });
+ }
+ }
+ }
update(timeDiff) {
for (const wearable of this.wearables) {
wearable.update(timeDiff);
| 0 |
diff --git a/src/intl/en.json b/src/intl/en.json "page-bugbountypoints-loading": "Loading data...",
"page-bugbountypoints-usd": "2 USD",
"page-bugbountypoints-payout-desc": " The Ethereum Foundation will pay out the value of USD in ETH or DAI.",
- "page-bugbountypoints-rights-desc": "The Ethereum Foundation reserves the right to change this without prior notice."
+ "page-bugbountypoints-rights-desc": "The Ethereum Foundation reserves the right to change this without prior notice.",
+ "page-calltocontribute-title": "Help us with this page",
+ "page-calltocontribute-desc-1": "If you're an expert on the topic and want to contribute, edit this page and sprinkle it with your wisdom.",
+ "page-calltocontribute-desc-2": "You'll be credited and you'll be helping the Ethereum community!",
+ "page-calltocontribute-desc-3": "Use this flexible",
+ "page-calltocontribute-link": "documentation template",
+ "page-calltocontribute-desc-4": "Questions? Ask us in the #content channel on our",
+ "page-calltocontribute-link-2": "Discord server",
+ "page-calltocontribute-span": "Edit page"
}
| 12 |
diff --git a/packages/app/test/integration/service/pagev5.test.ts b/packages/app/test/integration/service/pagev5.test.ts @@ -231,6 +231,46 @@ describe('PageService page operations with only public pages', () => {
},
]);
+
+ const pageIdForRevert1 = new mongoose.Types.ObjectId();
+ const revisionIdForRevert1 = new mongoose.Types.ObjectId();
+
+ await Page.insertMany([
+ {
+ _id: pageIdForRevert1,
+ path: '/trash/v5_revert1',
+ grant: Page.GRANT_PUBLIC,
+ creator: dummyUser1,
+ lastUpdateUser: dummyUser1._id,
+ parent: rootPage._id,
+ revision: revisionIdForRevert1,
+ status: Page.STATUS_DELETED,
+ },
+ ]);
+
+ await Revision.insertMany([
+ {
+ _id: revisionIdForRevert1,
+ pageId: pageIdForRevert1,
+ body: 'revert1',
+ format: 'comment',
+ author: dummyUser1,
+ },
+ ]);
+
+ const tagIdRevert1 = new mongoose.Types.ObjectId();
+ await Tag.insertMany([
+ { _id: tagIdRevert1, name: 'revertTag1' },
+ ]);
+
+ await PageTagRelation.insertMany([
+ {
+ relatedPage: pageIdForRevert1,
+ relatedTag: tagIdRevert1,
+ isPageTrashed: true,
+ },
+ ]);
+
});
describe('Rename', () => {
@@ -385,8 +425,49 @@ describe('PageService page operations with only public pages', () => {
expect(isThrown).toBe(true);
});
});
+
+ describe('revert', () => {
+ const revertDeletedPage = async(page, user, options = {}, isRecursively = false) => {
+ // mock return value
+ const mockedResumableRevertDeletedDescendants = jest.spyOn(crowi.pageService, 'resumableRevertDeletedDescendants').mockReturnValue(null);
+
+ const updatedPage = await crowi.pageService.revertDeletedPage(page, user, options, isRecursively);
+
+ // retrieve the arguments passed when calling method resumableRenameDescendants inside renamePage method
+ const argsForResumableRevertDeletedDescendants = mockedResumableRevertDeletedDescendants.mock.calls[0];
+
+ // restores the original implementation
+ mockedResumableRevertDeletedDescendants.mockRestore();
+
+ // revert descendants
+ if (isRecursively) {
+ await crowi.pageService.resumableRevertDeletedDescendants(...argsForResumableRevertDeletedDescendants);
+ }
+
+ return updatedPage;
+ };
+
+ test('revert single deleted page', async() => {
+ const deletedPage = await Page.findOne({ path: '/trash/v5_revert1' });
+ const revision = await Revision.findOne({ pageId: deletedPage._id });
+ const tag = await Tag.findOne({ name: 'revertTag1' });
+ const deletedPageTagRelation = await PageTagRelation.findOne({ relatedPage: deletedPage._id, relatedTag: tag._id });
+
+ expectAllToBeTruthy([deletedPage, revision, tag, deletedPageTagRelation]);
+ expect(deletedPage.status).toBe(Page.STATUS_DELETED);
+ expect(deletedPageTagRelation.isPageTrashed).toBe(true);
+
+ const revertedPage = await revertDeletedPage(deletedPage, dummyUser1, {}, false);
+ const pageTagRelation = await PageTagRelation.findOne({ relatedPage: deletedPage._id, relatedTag: tag._id });
+
+ expect(revertedPage.path).toBe('/v5_revert1');
+ expect(revertedPage.status).toBe(Page.STATUS_PUBLISHED);
+ expect(pageTagRelation.isPageTrashed).toBe(false);
+
+ });
});
+});
describe('PageService page operations with non-public pages', () => {
// TODO: write test code
});
| 13 |
diff --git a/src/upgrade/upgrade_wrapper.js b/src/upgrade/upgrade_wrapper.js @@ -177,6 +177,12 @@ function post_upgrade() {
ignore_rc: false,
return_stdout: true,
trim_stdout: true
+ }),
+ // eslint-disable-next-line no-useless-escape
+ promise_utils.exec(`sed -i "s:^.*ActionFileDefaultTemplate.*::" /etc/rsyslog.conf`, {
+ ignore_rc: true,
+ return_stdout: true,
+ trim_stdout: true
})
)
.spread((res_curmd, res_prevmd) => {
| 2 |
diff --git a/packages/cx/src/widgets/form/Slider.js b/packages/cx/src/widgets/form/Slider.js @@ -140,9 +140,7 @@ class SliderComponent extends VDOM.Component {
style={data.style}
id={data.id}
onClick={(e) => this.onClick(e)}
- ref={(el) => {
- this.subscribeOnWheel(el);
- }}
+ ref={(el) => (this.dom.el = el)}
onMouseMove={(e) => tooltipMouseMove(e, ...getFieldTooltip(instance))}
onMouseLeave={(e) => tooltipMouseLeave(e, ...getFieldTooltip(instance))}
>
@@ -200,6 +198,7 @@ class SliderComponent extends VDOM.Component {
componentWillUnmount() {
tooltipParentWillUnmount(this.props.instance);
+ this.unsubscribeOnWheel();
}
componentDidMount() {
@@ -207,6 +206,10 @@ class SliderComponent extends VDOM.Component {
let { widget } = instance;
tooltipParentDidMount(this.dom.to, instance, widget.toTooltip, { tooltipName: "toTooltip" });
tooltipParentDidMount(this.dom.from, instance, widget.fromTooltip, { tooltipName: "fromTooltip" });
+
+ this.unsubscribeOnWheel = addEventListenerWithOptions(this.dom.el, "wheel", (e) => this.onWheel(e), {
+ passive: false,
+ });
}
onHandleMouseLeave(e, handle) {
@@ -311,21 +314,6 @@ class SliderComponent extends VDOM.Component {
}
}
- subscribeOnWheel(el) {
- // el will be passed as null when the component is unmounted
- let { instance } = this.props;
-
- if (instance.unsubscribeOnWheel) {
- instance.unsubscribeOnWheel();
- instance.unsubscribeOnWheel = null;
- }
- if (el) {
- instance.unsubscribeOnWheel = addEventListenerWithOptions(el, "wheel", (e) => this.onWheel(e), {
- passive: false,
- });
- }
- }
-
onWheel(e) {
let { instance } = this.props;
let { data, widget } = instance;
| 5 |
diff --git a/src/encoded/audit/experiment.py b/src/encoded/audit/experiment.py @@ -2932,14 +2932,6 @@ def audit_experiment_assay(value, system):
if value['status'] == 'deleted':
return
- if 'assay_term_id' is None:
- # This means we need to add an assay to the enum list. It should not happen
- # though since the term enum list is limited.
- detail = 'Experiment {} is missing assay_term_id'.format(value['@id'])
- yield AuditFailure('missing assay information', detail, level='ERROR')
- return
-
- ontology = system['registry']['ontology']
term_id = value.get('assay_term_id')
term_name = value.get('assay_term_name')
@@ -2947,35 +2939,6 @@ def audit_experiment_assay(value, system):
detail = 'Assay_term_id is a New Term Request ({} - {})'.format(term_id, term_name)
yield AuditFailure('NTR assay', detail, level='INTERNAL_ACTION')
- if NTR_assay_lookup.get(term_id):
- if term_name != NTR_assay_lookup[term_id]:
- detail = 'Experiment has a mismatch between ' + \
- 'assay_term_name "{}" and assay_term_id "{}"'.format(
- term_name,
- term_id)
- yield AuditFailure('mismatched assay_term_name', detail, level='INTERNAL_ACTION')
- return
- else:
- detail = 'Assay term id {} not in NTR lookup table'.format(term_id)
- yield AuditFailure('not updated NTR lookup table', detail, level='INTERNAL_ACTION')
- return
-
- elif term_id not in ontology:
- detail = 'Assay_term_id {} is not found in cached version of ontology'.format(term_id)
- yield AuditFailure('assay_term_id not in ontology', term_id, level='INTERNAL_ACTION')
- return
-
- ontology_term_name = ontology[term_id]['name']
- modifed_term_name = term_name + ' assay'
- if (ontology_term_name != term_name and term_name not in ontology[term_id]['synonyms']) and \
- (ontology_term_name != modifed_term_name and
- modifed_term_name not in ontology[term_id]['synonyms']):
- detail = 'Experiment has a mismatch between assay_term_name "{}" and assay_term_id "{}"'.format(
- term_name,
- term_id,
- )
- yield AuditFailure('mismatched assay_term_name', detail, level='INTERNAL_ACTION')
- return
@audit_checker('experiment', frame=['replicates.antibody', 'target', 'replicates.antibody.targets'])
| 2 |
diff --git a/physx.js b/physx.js @@ -1293,7 +1293,7 @@ const physxWorker = (() => {
dimsTypedArray.byteOffset,
potentialTypedArray.byteOffset,
shiftTypedArray.byteOffset,
- shiftTypedArray.byteOffset
+ scaleTypedArray.byteOffset
);
allocator.freeAll();
| 1 |
diff --git a/core/ui/fields/field_colour.js b/core/ui/fields/field_colour.js @@ -34,13 +34,24 @@ goog.require('goog.ui.ColorPicker');
* @param {string} colour The initial colour in '#rrggbb' format.
* @param {Function} opt_changeHandler A function that is executed when a new
* option is selected.
+ * @param {Object} opt_options
+ * @param {Array} opt_options.colours A list of field colors.
+ * @param {Number} opt_options.columns Number of columns in the color picker.
* @extends {Blockly.Field}
* @constructor
*/
-Blockly.FieldColour = function(colour, opt_changeHandler) {
+Blockly.FieldColour = function(colour, opt_changeHandler, opt_options = {}) {
Blockly.FieldColour.superClass_.constructor.call(this, '\u00A0\u00A0\u00A0');
this.changeHandler_ = opt_changeHandler;
+
+ // Unfortunately, the code-dot-org repo violates encapsulation by modifying
+ // Blockly.FieldColour.COLOURS and Blockly.FieldColour.COLUMNS directly.
+ // Therefore, wait to read these values until we need to pass them to the
+ // ColorPicker, rather than using them as default values here.
+ this.colours_ = opt_options.colours;
+ this.columns_ = opt_options.columns;
+
this.borderRect_.style.fillOpacity = 1;
// Set the initial state.
this.setValue(colour);
@@ -81,7 +92,7 @@ Blockly.FieldColour.prototype.setValue = function(colour) {
};
/**
- * An array of colour strings for the palette.
+ * Default array of colour strings for the palette.
* See bottom of this page for the default:
* http://docs.closure-library.googlecode.com/git/closure_goog_ui_colorpicker.js.source.html
* @type {!Array.<string>}
@@ -89,7 +100,7 @@ Blockly.FieldColour.prototype.setValue = function(colour) {
Blockly.FieldColour.COLOURS = goog.ui.ColorPicker.SIMPLE_GRID_COLORS;
/**
- * Number of columns in the palette.
+ * Default number of columns in the palette.
*/
Blockly.FieldColour.COLUMNS = 7;
@@ -102,8 +113,8 @@ Blockly.FieldColour.prototype.showEditor_ = function() {
var div = Blockly.WidgetDiv.DIV;
// Create the palette using Closure.
var picker = new goog.ui.ColorPicker();
- picker.setSize(Blockly.FieldColour.COLUMNS);
- picker.setColors(Blockly.FieldColour.COLOURS);
+ picker.setSize(this.columns_ || Blockly.FieldColour.COLUMNS);
+ picker.setColors(this.colours_ || Blockly.FieldColour.COLOURS);
picker.render(div);
picker.setSelectedColor(this.getValue());
| 11 |
diff --git a/src/components/Match/Purchases/index.jsx b/src/components/Match/Purchases/index.jsx @@ -5,6 +5,17 @@ import Toggle from 'material-ui/Toggle';
import TeamTable from '../TeamTable';
import mcs from '../matchColumns';
+const toggleStyle = {
+ width: '30px',
+ float: 'right',
+ position: 'relative',
+ right: '10px',
+ top: '15px',
+ border: '1px solid rgba(179, 179, 179, 0.1)',
+ padding: '2px',
+ backgroundColor: 'rgba(0, 0, 0, 0.6)',
+};
+
class Purchases extends React.Component {
static propTypes = {
match: PropTypes.shape({}),
@@ -31,13 +42,14 @@ class Purchases extends React.Component {
const { purchaseTimesColumns } = mcs(strings);
return (
<div>
- <div style={{ width: '190px', margin: '10px' }}>
<Toggle
label={strings.show_consumables_items}
- labelStyle={{ color: '#5d6683' }}
+ labelStyle={{ color: '#b3b3b3', lineHeight: '13px', fontSize: '14px' }}
+ style={toggleStyle}
onToggle={this.change}
+ thumbStyle={{ backgroundColor: 'rgb(179, 179, 179)', marginTop: '2px' }}
+ trackStyle={{ position: 'absolute', marginTop: '2px' }}
/>
- </div>
<TeamTable
players={match.players}
columns={purchaseTimesColumns(match, this.state.showConsumables)}
| 7 |
diff --git a/src/registry/middleware/index.js b/src/registry/middleware/index.js @@ -33,7 +33,7 @@ module.exports.bind = function(app, options){
app.set('views', path.join(__dirname, '../views'));
app.set('view engine', 'jade');
- app.set('view cache', false);
+ app.set('view cache', true);
if(!!options.verbosity){
app.use(morgan('dev'));
| 13 |
diff --git a/src/__experimental__/components/fieldset/fieldset.stories.js b/src/__experimental__/components/fieldset/fieldset.stories.js @@ -22,31 +22,37 @@ storiesOf('Experimental/Fieldset', module)
label='First Name'
labelInline
labelAlign='right'
+ inputWidth={ 70 }
/>
<Textbox
label='Last Name'
labelInline
labelAlign='right'
+ inputWidth={ 70 }
/>
<Textbox
label='Address'
labelInline
labelAlign='right'
+ inputWidth={ 70 }
/>
<Textbox
label='City'
labelInline
labelAlign='right'
+ inputWidth={ 70 }
/>
<Textbox
label='Country'
labelInline
labelAlign='right'
+ inputWidth={ 70 }
/>
<Textbox
label='Telephone'
labelInline
labelAlign='right'
+ inputWidth={ 70 }
/>
</Fieldset>
);
| 12 |
diff --git a/rssServer.js b/rssServer.js @@ -8,7 +8,7 @@ if (config.logging.logDates) require('./util/logDates.js')();
if (!config.botSettings.token) throw 'Warning! Vital config missing: token undefined in config.';
else if (!config.botSettings.prefix) throw 'Warning! Vital config missing: prefix undefined in config';
else if (!config.feedManagement.databaseName) throw 'Warning! Vital config missing: databaseName undefined in config.';
-else if (!config.feedManagement.sqlType || typeof config.feedManagement.sqlType !== 'string' || (config.feedManagement.sqlType !== 'mysql' && config.feedManagement !== 'sqlite3')) throw 'Warning! Vital config missing: sqlType incorrectly defined in config.';
+else if (!config.feedManagement.sqlType || typeof config.feedManagement.sqlType !== 'string' || (config.feedManagement.sqlType !== 'mysql' && config.feedManagement.sqlType !== 'sqlite3')) throw 'Warning! Vital config missing: sqlType incorrectly defined in config.';
else if (!config.feedSettings.defaultMessage) throw 'Warning! Vital config missing: defaultMssage undefined in config.';
// Ease the pains of having to rewrite a function every time to check an empty object
| 1 |
diff --git a/packages/core/src/sheet.js b/packages/core/src/sheet.js /** @type {RuleGroupNames} */
export const names = ['themed', 'global', 'styled', 'onevar', 'resonevar', 'allvar', 'inline']
+const isSheetAccessible = (/** @type {CSSStyleSheet} */ sheet) => {
+ if (sheet.href && !sheet.href.startsWith(location.origin)) {
+ return false
+ }
+
+ try {
+ sheet.cssRules
+ return true
+ } catch (e) {
+ return false
+ }
+}
+
export const createSheet = (/** @type {DocumentOrShadowRoot} */ root) => {
/** @type {SheetGroup} Object hosting the hydrated stylesheet. */
let groupSheet
@@ -39,7 +52,7 @@ export const createSheet = (/** @type {DocumentOrShadowRoot} */ root) => {
// iterate all stylesheets until a hydratable stylesheet is found
for (const sheet of sheets) {
- if (sheet.href && !sheet.href.startsWith(location.origin)) continue
+ if (!isSheetAccessible(sheet)) continue
for (let index = 0, rules = sheet.cssRules; rules[index]; ++index) {
/** @type {CSSStyleRule} Possible indicator rule. */
@@ -87,7 +100,10 @@ export const createSheet = (/** @type {DocumentOrShadowRoot} */ root) => {
type,
cssRules: [],
insertRule(cssText, index) {
- this.cssRules.splice(index, 0, createCSSMediaRule(cssText, { import: 3, undefined: 1 }[(cssText.toLowerCase().match(/^@([a-z]+)/) || [])[1]] || 4))
+ this.cssRules.splice(index, 0, createCSSMediaRule(cssText, {
+ import: 3,
+ undefined: 1
+ }[(cssText.toLowerCase().match(/^@([a-z]+)/) || [])[1]] || 4))
},
get cssText() {
return sourceCssText === '@media{}' ? `@media{${[].map.call(this.cssRules, (cssRule) => cssRule.cssText).join('')}}` : sourceCssText
| 7 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -1471,10 +1471,24 @@ RED.view = (function() {
}
function copySelection() {
- if (moving_set.length > 0) {
+ var nodes = [];
+ var selection = RED.workspaces.selection();
+ if (selection.length > 0) {
+ nodes = [];
+ selection.forEach(function(n) {
+ if (n.type === 'tab') {
+ nodes.push(n);
+ nodes = nodes.concat(RED.nodes.filterNodes({z:n.id}));
+ }
+ });
+ } else if (moving_set.length > 0) {
+ nodes = moving_set.map(function(n) { return n.n });
+ }
+
+ if (nodes.length > 0) {
var nns = [];
- for (var n=0;n<moving_set.length;n++) {
- var node = moving_set[n].n;
+ for (var n=0;n<nodes.length;n++) {
+ var node = nodes[n];
// The only time a node.type == subflow can be selected is the
// input/output "proxy" nodes. They cannot be copied.
if (node.type != "subflow") {
| 11 |
diff --git a/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg b/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg -<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"><path d="M25 16h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zM8 28h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 39 4 37.375 4 35.416V4.582C4 2.622 5.625 1 7.584 1h24.832C34.376 1 36 2.623 36 4.582v30.834C36 37.376 34.375 39 32.416 39zM32 27H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16V4.582c0-.35-.235-.582-.584-.582H7.584C7.234 4 7 4.233 7 4.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4z" color="#000" fill="#333"/></svg>
\ No newline at end of file
+<svg width="40" height="40" viewBox="0, 0, 40, 40" xmlns="http://www.w3.org/2000/svg"><path d="M25 16h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zM8 28h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 39 4 37.375 4 35.416V4.582C4 2.622 5.625 1 7.584 1h24.832C34.376 1 36 2.623 36 4.582v30.834C36 37.376 34.375 39 32.416 39zM32 27H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16V4.582c0-.35-.235-.582-.584-.582H7.584C7.234 4 7 4.233 7 4.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4z" color="#000" fill="#333"/></svg>
| 1 |
diff --git a/includes/Core/Authentication/Authentication.php b/includes/Core/Authentication/Authentication.php @@ -274,7 +274,6 @@ final class Authentication {
$this->initial_version->register();
if ( Feature_Flags::enabled( 'userInput' ) ) {
$this->user_input->register();
- $this->user_input_state->register();
}
add_filter( 'allowed_redirect_hosts', $this->get_method_proxy( 'allowed_redirect_hosts' ) );
| 2 |
diff --git a/src/components/DataCollector/validateApplyResponse.js b/src/components/DataCollector/validateApplyResponse.js @@ -16,7 +16,7 @@ export default ({ options }) => {
objectOf({
type: string().required(),
payload: anything().required()
- }).noUnknownFields()
+ })
).required()
})
.required()
| 3 |
diff --git a/guide/english/java/basic-operations/index.md b/guide/english/java/basic-operations/index.md @@ -19,7 +19,6 @@ Java supports the following operations on variables:
* __Others__: `Conditional/Ternary(?:)`, `instanceof`
**Ternary because it work on the functionality of If Then Else i.e If condition is right then first alternative anotherwise the second one **
While most of the operations are self-explanatory, the Conditional (Ternary) Operator works as follows:
-
`expression that results in boolean output ? return this value if true : return this value if false;`
The Assignment operators (`+=`, `-=`, `*=`, `/=`, `%=`, `<<=`, `>>=`, `&=`, `^=`, `|=`) are just a short form which can be extended.
@@ -32,7 +31,6 @@ True Condition:
```java
int x = 10;
int y = (x == 10) ? 5 : 9; // y will equal 5 since the expression x == 10 evaluates to true
-
```
False Condition:
@@ -53,8 +51,8 @@ Here is a program to illustrate the `instanceof` operator:
// As obj is of type person, it is not an
// instance of Boy or interface
System.out.println("obj1 instanceof Person: " + (obj1 instanceof Person)); /*it returns true since obj1 is an instance of person */
-
-
```
-
+# More Information
+- [Java Operators](https://docs.oracle.com/javase/tutorial/java/nutsandbolts/operators.html)
+- [Summary of Operators](https://docs.oracle.com/javase/tutorial/java/nutsandbolts/opsummary.html)
| 7 |
diff --git a/handlebars/munch.hbs b/handlebars/munch.hbs <div class="form-description"></div>
<div>
<h4>Tools.</h4>
+ <p>
Compendium folder migration can take a while against big compendiums.
+ It needs the <a href="https://foundryvtt.com/packages/compendium-folders">Compendium Folders module</a>.
+ </p>
</div>
<div class="form-group">
<h3><label for="compendium-folder-style-monster">Monster Compendium Folder Style</label></h3>
| 7 |
diff --git a/libs/events.js b/libs/events.js @@ -1894,8 +1894,8 @@ control.prototype.jumpHero = function (ex, ey, time, callback) {
core.clearMap('hero', drawX()-core.bigmap.offsetX, drawY()-height+32-core.bigmap.offsetY, 32, height);
updateJump();
var nowx = drawX(), nowy = drawY();
- core.bigmap.offsetX = core.clamp(nowx - 32*6, 0, 32*core.bigmap.width-416);
- core.bigmap.offsetY = core.clamp(nowy - 32*6, 0, 32*core.bigmap.height-416);
+ core.bigmap.offsetX = core.clamp(nowx - 32*core.__HALF_SIZE__, 0, 32*core.bigmap.width-core.__PIXELS__);
+ core.bigmap.offsetY = core.clamp(nowy - 32*core.__HALF_SIZE__, 0, 32*core.bigmap.height-core.__PIXELS__);
core.control.updateViewport();
core.drawImage('hero', core.material.images.hero, heroIcon[status] * 32, heroIcon.loc * height, 32, height,
nowx - core.bigmap.offsetX, nowy + 32-height - core.bigmap.offsetY, 32, height);
| 14 |
diff --git a/src/lime/utils/Assets.hx b/src/lime/utils/Assets.hx @@ -515,6 +515,11 @@ class Assets
public static function unloadLibrary(name:String):Void
{
#if (tools && !display)
+ if (name == null || name == "")
+ {
+ name = "default";
+ }
+
var library = libraries.get(name);
if (library != null)
| 11 |
diff --git a/test/nodes/core/hardware/36-rpi-gpio_spec.js b/test/nodes/core/hardware/36-rpi-gpio_spec.js @@ -132,7 +132,12 @@ describe('RPI GPIO Node', function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
var n3 = helper.getNode("n3");
+ var count = 0;
n3.on("input", function(msg) {
+ // Only check the first status message received as it may get a
+ // 'closed' status as the test is tidied up.
+ if (count === 0) {
+ count++;
try {
msg.should.have.property('status');
msg.status.should.have.property('text', "rpi-gpio.status.na");
@@ -140,6 +145,7 @@ describe('RPI GPIO Node', function() {
} catch(err) {
done(err);
}
+ }
});
n1.receive({payload:"1"});
});
| 9 |
diff --git a/src/selectors/dataSelectors.js b/src/selectors/dataSelectors.js @@ -271,6 +271,14 @@ export const cellValueSelector = (state, props) => {
}
};
+/** Gets the row render properties
+ */
+export const rowPropertiesSelector = (state) => {
+ const row = state.getIn(['renderProperties', 'rowProperties']);
+
+ return (row && row.toJSON()) || {};
+};
+
/** Gets the column render properties for the specified columnId
*/
export const cellPropertiesSelector = (state, { columnId }) => {
| 0 |
diff --git a/ui/src/viewers/CsvStreamViewer.jsx b/ui/src/viewers/CsvStreamViewer.jsx @@ -30,7 +30,7 @@ class CSVStreamViewer extends React.Component {
// If we are scrolling to the end. Time to load more rows.
if ((row.rowIndexEnd + 50) > this.state.requestedRow) {
const { document } = this.props;
- const rowCount = parseInt(document.getProperty('rowCount')[0], 10);
+ const rowCount = parseInt(document.getFirst('rowCount'), 10);
// Max row count should not exceed the number of rows in the csv file
let requestedRow = Math.min(rowCount, this.state.requestedRow + 100);
if (requestedRow !== this.state.requestedRow) {
@@ -54,6 +54,10 @@ class CSVStreamViewer extends React.Component {
Papa.RemoteChunkSize = 1024 * 500;
Papa.parse(url, {
download: true,
+ delimiter: ',',
+ newline: '\n',
+ encoding: 'utf-8',
+ // header: true,
chunk: (results, parser) => {
this.parser = parser;
this.setState((previousState) => {
@@ -92,12 +96,12 @@ class CSVStreamViewer extends React.Component {
if (document.id === undefined) {
return null;
}
- const columnsJson = document.getProperty('columns').toString();
+ const columnsJson = document.getFirst('columns');
const columns = columnsJson ? JSON.parse(columnsJson) : [];
return (
<div className="TableViewer">
<Table
- numRows={this.state.requestedRow}
+ numRows={document.getFirst('rowCount')}
enableGhostCells
enableRowHeader
onVisibleCellsChange={this.onVisibleCellsChange}
| 12 |
diff --git a/phpcs.xml b/phpcs.xml <exclude-pattern>tests/*</exclude-pattern>
</rule>
- <exclude-pattern>*/phpunit.xml*</exclude-pattern>
- <exclude-pattern>*/languages/*</exclude-pattern>
-
<!-- Third-party code -->
- <exclude-pattern>*/bower-components/*</exclude-pattern>
<exclude-pattern>*/node_modules/*</exclude-pattern>
<exclude-pattern>*/third-party/*</exclude-pattern>
<exclude-pattern>*/vendor/*</exclude-pattern>
| 2 |
diff --git a/demo/doc-versioning/doc_versioning/gui/document.html b/demo/doc-versioning/doc_versioning/gui/document.html <button class="button-primary" onclick="window.location.replace(`/`);">Home</button>
<h1>"{{ name }}"</h1>
{% if diffs|count > 0 %}
- <hr />
<h4>Revisions</h4>
<table class="u-full-width">
<!-- <table width="30%"> -->
</tbody>
</table>
{% endif %}
- <hr />
<h4>Versions</h4>
<table class="u-full-width">
<tbody>
| 2 |
diff --git a/InitMaster/script.json b/InitMaster/script.json "authors": "Richard E.",
"roll20userid": "6497708",
"useroptions": [],
- "dependencies": ["RoundMaster.js"],
+ "dependencies": ["RoundMaster"],
"modifies": {
"state.initMaster": "read,write",
"player.id": "read",
| 3 |
diff --git a/docs/en/Plugin.md b/docs/en/Plugin.md @@ -144,6 +144,17 @@ List of added formats:
| `BBBB` | 2561 | Full BE Year (Year + 543) |
| `BB` | 61 | 2-digit of BE Year |
+### WeekOfYear
+ - WeekOfYear adds `.week()` API to returns a `number` indicating the `Dayjs`'s week of the year.
+
+```javascript
+import weekOfYear from 'dayjs/plugin/weekOfYear'
+
+dayjs.extend(weekOfYear)
+
+dayjs('06/27/2018').week() // 26
+```
+
## Customize
You could build your own Day.js plugin to meet different needs.
| 3 |
diff --git a/tests/e2e/specs/plugin-reset.test.js b/tests/e2e/specs/plugin-reset.test.js /**
* WordPress dependencies
*/
-import { deactivatePlugin, activatePlugin, visitAdminPage } from '@wordpress/e2e-test-utils';
+import { visitAdminPage } from '@wordpress/e2e-test-utils';
+
+/**
+ * Internal dependencies
+ */
+import {
+ setAuthToken,
+ setClientConfig,
+ setSearchConsoleProperty,
+ setSiteVerification,
+} from '../utils';
describe( 'Plugin Reset', () => {
beforeAll( async() => {
- await activatePlugin( 'e2e-tests-auth-plugin' );
- await activatePlugin( 'e2e-tests-site-verification-plugin' );
- } );
-
- afterAll( async() => {
- await deactivatePlugin( 'e2e-tests-auth-plugin' );
- await deactivatePlugin( 'e2e-tests-site-verification-plugin' );
+ await setClientConfig();
+ await setAuthToken();
+ await setSiteVerification();
+ await setSearchConsoleProperty();
} );
beforeEach( async() => {
@@ -43,10 +50,13 @@ describe( 'Plugin Reset', () => {
it( 'disconnects Site Kit by clicking the "Reset" button in the confirmation dialog', async() => {
await expect( page ).toClick( 'button.googlesitekit-cta-link', { text: 'Reset Site Kit' } );
await page.waitForSelector( '.mdc-dialog--open .mdc-button' );
- await expect( page ).toClick( '.mdc-dialog--open .mdc-button', { text: 'Reset' } );
- await visitAdminPage( 'admin.php', 'page=googlesitekit-dashboard' );
+ await Promise.all( [
+ page.waitForNavigation(),
+ expect( page ).toClick( '.mdc-dialog--open .mdc-button', { text: 'Reset' } ),
+ ] );
- await expect( page ).toMatchElement( '.googlesitekit-wizard' );
+ await page.waitForSelector( '.googlesitekit-wizard-step--one' );
+ await expect( page ).toMatchElement( '.googlesitekit-wizard-step__title', { text: /Welcome to Site Kit beta for developers/i } );
} );
} );
| 3 |
diff --git a/src/views/bots.ejs b/src/views/bots.ejs <%- include('partials/header', {
-title: "Bots | The Best Discord Bot List",
-desc: "Find the next bot for your server!",
+title: (req.params.q?)`Find Bots Related to ${req.params.q} on The Best Discord List!`:"Bots | The Best Discord Bot List",
+desc: (req.params.q)?`Showing Bots for the search term "${req.params.q}" !`:"Find the Next Bot to use on The Best Discord Bot List",
img: "https://discord.rovelstars.com/assets/img/bot/logo-512.png",
theme,
imglink: undefined
| 3 |
diff --git a/stories/module-adsense-components.stories.js b/stories/module-adsense-components.stories.js @@ -221,53 +221,4 @@ generateReportBasedWidgetStories( {
] ),
Component: ModuleOverviewWidget,
wrapWidget: false,
- additionalVariants: {
- 'Gathering Data': {
- data: [],
- options: [
- {
- metrics: [
- 'ESTIMATED_EARNINGS',
- 'PAGE_VIEWS_RPM',
- 'IMPRESSIONS',
- 'PAGE_VIEWS_CTR',
- ],
- startDate: '2020-10-29',
- endDate: '2020-11-25',
- },
- {
- dimensions: [ 'DATE' ],
- metrics: [
- 'ESTIMATED_EARNINGS',
- 'PAGE_VIEWS_RPM',
- 'IMPRESSIONS',
- 'PAGE_VIEWS_CTR',
- ],
- startDate: '2020-10-29',
- endDate: '2020-11-25',
- },
- {
- metrics: [
- 'ESTIMATED_EARNINGS',
- 'PAGE_VIEWS_RPM',
- 'IMPRESSIONS',
- 'PAGE_VIEWS_CTR',
- ],
- startDate: '2020-10-01',
- endDate: '2020-10-28',
- },
- {
- dimensions: [ 'DATE' ],
- metrics: [
- 'ESTIMATED_EARNINGS',
- 'PAGE_VIEWS_RPM',
- 'IMPRESSIONS',
- 'PAGE_VIEWS_CTR',
- ],
- startDate: '2020-10-01',
- endDate: '2020-10-28',
- },
- ],
- },
- },
} );
| 2 |
diff --git a/app/views/users/friendship_users.html.haml b/app/views/users/friendship_users.html.haml - content_for(:title) do
- = @title = params.has_key?('following') ? t(:people_user_follows, user: @user.login) : t(:people_following_user, user: @user.login )
+ = @title = action_name == "following" ? t(:people_user_follows, user: @user.login) : t(:people_following_user, user: @user.login )
.container
.row
.col-xs-12
| 1 |
diff --git a/webpack.config.js b/webpack.config.js @@ -12,8 +12,8 @@ const common = {
output: {
path: path.resolve(__dirname, "dist"),
- //dev: specify a full path including protocol
- //production: specify full path excluding protocol
+ //dev: specify a full path _including_ protocol, e.g. http://localhost:8080/dist
+ //production: specify full path _excluding_ protocol, e.g. //mydomain.org/headstart/dist
publicPath: "http://path/to/dist/",
filename: 'bundle.js'
},
| 7 |
diff --git a/src/components/dashboard/DashboardDetail.js b/src/components/dashboard/DashboardDetail.js @@ -2,7 +2,10 @@ import React, { Component, Fragment } from 'react'
import { connect } from 'react-redux'
import { Translate } from 'react-localize-redux'
import { withRouter } from 'react-router-dom'
-import { getAccessKeys, getTransactions, getTransactionStatus } from '../../actions/account'
+
+import { getAccessKeys } from '../../actions/account'
+import { getTransactions, getTransactionStatus } from '../../actions/transactions'
+
import DashboardSection from './DashboardSection'
import DashboardActivity from './DashboardActivity'
import PageContainer from '../common/PageContainer'
@@ -136,8 +139,9 @@ const mapDispatchToProps = {
getTransactionStatus
}
-const mapStateToProps = ({ account }) => ({
- ...account
+const mapStateToProps = ({ account, transactions }) => ({
+ ...account,
+ transactions: transactions[account.accountId] || []
})
export default connect(
| 4 |
diff --git a/common/lib/types/pushchannelsubscription.ts b/common/lib/types/pushchannelsubscription.ts import { decodeBody, encodeBody, Format } from "../util/encoding";
import isArray from "../util/isArray";
+type PushChannelSubscriptionObject = {
+ channel?: string,
+ deviceId?: string,
+ clientId?: string,
+}
+
class PushChannelSubscription {
channel?: string;
deviceId?: string;
@@ -10,7 +16,7 @@ class PushChannelSubscription {
* Overload toJSON() to intercept JSON.stringify()
* @return {*}
*/
- toJSON() {
+ toJSON(): PushChannelSubscriptionObject {
return {
channel: this.channel,
deviceId: this.deviceId,
@@ -18,7 +24,7 @@ class PushChannelSubscription {
};
}
- toString() {
+ toString(): string {
let result = '[PushChannelSubscription';
if(this.channel)
result += '; channel=' + this.channel;
@@ -32,9 +38,9 @@ class PushChannelSubscription {
static toRequestBody = encodeBody;
- static fromResponseBody(body: Array<Record<string, unknown>> | Record<string, unknown>, format: Format) {
+ static fromResponseBody(body: Array<Record<string, unknown>> | Record<string, unknown>, format?: Format): PushChannelSubscription | PushChannelSubscription[] {
if(format) {
- body = decodeBody(body, format);
+ body = decodeBody(body, format) as Record<string, unknown>;
}
if(isArray(body)) {
@@ -44,11 +50,11 @@ class PushChannelSubscription {
}
}
- static fromValues(values: Record<string, unknown>) {
+ static fromValues(values: Record<string, unknown>): PushChannelSubscription {
return Object.assign(new PushChannelSubscription(), values);
}
- static fromValuesArray(values: Array<Record<string, unknown>>) {
+ static fromValuesArray(values: Array<Record<string, unknown>>): PushChannelSubscription[] {
const count = values.length, result = new Array(count);
for(let i = 0; i < count; i++) result[i] = PushChannelSubscription.fromValues(values[i]);
return result;
| 7 |
diff --git a/src/template.json b/src/template.json "damage": {
"parts": []
},
- "save": {}
+ "save": {
+ "type": "",
+ "dc": null,
+ "descriptor": ""
+ }
},
"mod": {
"templates": ["itemDescription", "modifiers"],
| 0 |
diff --git a/bin/validator-parameter-base.js b/bin/validator-parameter-base.js @@ -35,7 +35,7 @@ module.exports = data => {
enum: ['array', 'boolean', 'integer', 'number', 'string']
},
collectionFormat: {
- allowed: ({ parent }) => parent.value.type === 'array',
+ allowed: ({ parent }) => parent.definition.type === 'array',
enum: ['csv', 'ssv', 'tsv', 'pipes'],
default: 'csv'
},
@@ -45,10 +45,9 @@ module.exports = data => {
exclusiveMinimum: schema.properties.exclusiveMinimum,
format: schema.properties.format,
items: {
- component: ItemsEnforcer,
type: 'object',
- allowed: ({ parent }) => parent.value.type === 'array',
- required: ({ parent }) => parent.value.type === 'array',
+ allowed: ({ parent }) => parent.definition.type === 'array',
+ required: ({ parent }) => parent.definition.type === 'array',
properties: result.properties,
errors: result.errors
},
@@ -69,8 +68,8 @@ module.exports = data => {
content: {
type: 'object',
additionalProperties: EnforcerRef('MediaType'),
- errors: ({exception, value}) => {
- const keys = Object.keys(value);
+ errors: ({exception, definition}) => {
+ const keys = Object.keys(definition);
if (keys.length !== 1) {
exception('Value must have exactly one key. Received: ' + keys.join(', '));
}
| 10 |
diff --git a/brands/shop/butcher.json b/brands/shop/butcher.json }
},
"shop/butcher|Renmans": {
- "locationSet": {"include": ["001"]},
+ "locationSet": {"include": ["be"]},
"tags": {
"brand": "Renmans",
+ "brand:wikidata": "Q63184410",
"name": "Renmans",
"shop": "butcher"
}
| 7 |
diff --git a/assets/js/core-home.js b/assets/js/core-home.js var currentLang = 'en',
snippets = [];
- function updateSnippets () {
+ function createSnippets () {
var i;
moment.locale(currentLang);
}
}
+ function updateSnippets () {
+ var i;
+
+ moment.locale(currentLang);
+
+ for (i = 0; i < snippets.length; i++) {
+ snippets[i].update();
+ }
+ }
+
function updateClock(){
var now = moment(),
second = now.seconds() * 6,
this.el.html(output.join('\n'));
};
+ Snippet.prototype.update = function () {
+ var i,
+ comments = [];
+
+ if (!this.comments) {
+ for (i = 0; i < this.el[0].childNodes.length; i++) {
+ if ('comment' === this.el[0].childNodes[i].className) {
+ comments.push($(this.el[0].childNodes[i]));
+ }
+ }
+ this.comments = comments;
+ }
+
+ for (i = 0; i < this.comments.length; i++) {
+ this.comments[i].text(' // ' + this.evals[i]());
+ }
+ }
function timedUpdate () {
updateClock();
snippets.push(new Snippet($(this)));
});
+ createSnippets();
timedUpdate();
$(document).on('click', '[data-locale]', function(){
| 11 |
diff --git a/server/handlers/datasets.js b/server/handlers/datasets.js @@ -48,6 +48,7 @@ export default {
let datasetNumber = bidsId.decodeId(datasetId).slice(2)
let versionId = datasetNumber + '-' + versionNumber
+ delete req.headers['accept-encoding']
request.post(
config.scitran.url +
'snapshots/projects/' +
@@ -68,6 +69,7 @@ export default {
*/
share(req, res) {
// proxy add permission request to scitran to avoid extra permissions checks
+ delete req.headers['accept-encoding']
request.post(
config.scitran.url + 'projects/' + req.params.datasetId + '/permissions',
{
| 1 |
diff --git a/README.md b/README.md 
-### Version 3.5 Out Now!
+### Version 4.0 Out Now!
-An easy to use interactive table generation plugin for JQuery UI
+An easy to use interactive table generation JavaScript library
Full documentation & demos can be found at: [http://tabulator.info](http://tabulator.info)
***
@@ -12,7 +12,7 @@ Features
================================
Tabulator allows you to create interactive tables in seconds from any HTML Table, Javascript Array or JSON formatted data.
-Simply include the library and the css in your JQuery UI project and you're away!
+Simply include the library and the css in your project and you're away!
Tabulator is packed with useful features including:
@@ -35,7 +35,7 @@ Create an element to hold the table
Turn the element into a tabulator with some simple javascript
```js
-$("#example-table").tabulator();
+var table = new Tabulator("#example-table", {});
```
@@ -48,14 +48,14 @@ bower install tabulator --save
### NPM Installation
To get Tabulator via the NPM package manager, open a terminal in your project directory and run the following commmand:
```
-npm install jquery.tabulator --save
+npm install tabulator-tables --save
```
### CDNJS
To access Tabulator directly from the CDNJS CDN servers, include the following two lines at the start of your project, instead of the localy hosted versions:
```html
-<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.5.3/css/tabulator.min.css" rel="stylesheet">
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.5.3/js/tabulator.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/4.0.0/css/tabulator.min.css" rel="stylesheet">
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/4.0.0/js/tabulator.min.js"></script>
```
Coming Soon
@@ -65,9 +65,7 @@ Tabulator is actively under development and I plan to have even more useful feat
- Data Reactivity
- Custom Row Templates
- Additional Editors and Formatters
-- Copy to Clipboard
- Print Styling
-- Drag Rows Between Tables
- Multi Cell Editing
- Cell Selection
| 3 |
diff --git a/src/components/layouts/Layout.js b/src/components/layouts/Layout.js @@ -78,12 +78,11 @@ const Layout = ({ children, initialContext, hasSideBar, location }) => {
</div>
<div className="sprk-u-BackgroundColor--black sprk-u-AbsoluteCenter sprk-u-pam">
<p className="sprk-u-Color--white">
- <span className="sprk-u-FontWeight--bold sprk-u-mrs">
- Designs launching before July 14, 2021
- </span>
- should reference
+ Designs launching
+ <span className="sprk-u-FontWeight--bold sprk-u-mas">before</span>
+ July 14, 2021, please reference
<a
- href="https://sparkdesignsystem.com/"
+ href="https://v13--spark-design-system.netlify.app/"
className="docs-c-Banner--link sprk-u-mls"
>
version 13 of Spark
| 3 |
diff --git a/assets/js/modules/adsense/datastore/adblocker.js b/assets/js/modules/adsense/datastore/adblocker.js import invariant from 'invariant';
import { detectAnyAdblocker } from 'just-detect-adblock';
-/**
- * WordPress dependencies
- */
-import { addQueryArgs } from '@wordpress/url';
-
/**
* Internal dependencies
*/
@@ -67,17 +62,16 @@ export const controls = {
// additional stuff in the query string to (hopefully) trigger a filter.
// If this throws, then the fetch request failed completely and we'll assume it was blocked.
try {
- await fetch(
- addQueryArgs(
- '/favicon.ico',
- {
+ const params = [
// The name of the parameter here doesn't really matter
// since adblockers look at the URL as a whole.
- 'google-site-kit': '/adsense/pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+ // Note: this value must not be URL-encoded.
+ 'google-site-kit=/adsense/pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
// Add a timestamp for cache-busting.
- timestamp: Date.now(),
- }
- ),
+ `timestamp=${ Date.now() }`,
+ ];
+ await fetch(
+ `/favicon.ico?${ params.join( '&' ) }`,
{
credentials: 'omit',
// Don't follow any redirects; we only care about this request being blocked or not.
| 2 |
diff --git a/README.md b/README.md @@ -45,6 +45,7 @@ Alternatively clone this repository (the `release` branch always references the
- PHP 8.1 (with SQLite 3.34.0+)
- Required PHP extensions: `fileinfo`, `pdo_sqlite`, `gd`, `ctype`, `json`, `intl`, `zlib`, `mbstring`
+- _Recommendation: Benchmark tests showed that e.g. unit conversion handling is up to 5 times faster when using a more recent (3.39.4+) SQLite version._
## How to run using Docker
| 0 |
diff --git a/packages/build/src/log/stack.js b/packages/build/src/log/stack.js @@ -46,16 +46,14 @@ const cleanStackLine = function(lines, line) {
const STACK_LINE_REGEXP = /^\s+at /
const isUselessStack = function(line) {
- return USELESS_STACK_REGEXP.test(line)
+ return line.includes('<anonymous')
}
-const USELESS_STACK_REGEXP = /^\s+at <anonymous>/
-
const isInternalStack = function(line) {
// This is only needed for local builds
return INTERNAL_STACK_REGEXP.test(line)
}
-const INTERNAL_STACK_REGEXP = /packages[/\\]build[/\\]src[/\\]/
+const INTERNAL_STACK_REGEXP = /packages[/\\]build[/\\](src|node_modules)[/\\]/
module.exports = { cleanStacks }
| 7 |
diff --git a/src/patterns/components/inputs/collection.yaml b/src/patterns/components/inputs/collection.yaml @@ -157,7 +157,7 @@ variableTable:
default: $sprk-text-input-outline
description: The outline applied to select elements.
$sprk-select-padding:
- default: 12px 45px 12px 13px
+ default: 14px 45px 14px 13px
description: The padding applied to select elements.
$sprk-select-arrow-offset-y:
default: -37px
| 3 |
diff --git a/blocks/init/src/Blocks/components/head/head.php b/blocks/init/src/Blocks/components/head/head.php */
$icon = $attributes['icon'] ?? '';
-$charset = $attributes['charset'] ?? \bloginfo('charset');
-$name = $attributes['name'] ?? \bloginfo('name');
+$charset = $attributes['charset'] ?? \get_bloginfo('charset');
+$name = $attributes['name'] ?? \get_bloginfo('name');
?>
<meta charset="<?php echo \esc_attr($charset); ?>" />
| 14 |
diff --git a/src/templates/items/ammunition.html b/src/templates/items/ammunition.html <nav class="sheet-navigation tabs" data-group="primary">
<a class="item active" data-tab="description">{{ localize "SFRPG.Description" }}</a>
<a class="item" data-tab="details">{{ localize "SFRPG.Details" }}</a>
- <a class="item" data-tab="modifiers">{{ localize "SFRPG.Modifiers" }}</a>
</nav>
{{!-- Item Sheet Body --}}
| 2 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js that._addSubtree(that._topList,container,item,0);
}
};
+ if (this.options.header) {
+ topListOptions.header = this.options.header;
+ }
if (this.options.rootSortable !== false && !!this.options.sortable) {
topListOptions.sortable = this.options.sortable;
topListOptions.connectWith = '.red-ui-treeList-sortable';
| 11 |
diff --git a/src/components/Match/TargetsBreakdown.jsx b/src/components/Match/TargetsBreakdown.jsx @@ -47,7 +47,7 @@ const processCasts = (uses, targets) => {
const field = {};
Object.keys(uses).forEach(((ability) => {
if (targets[ability]) {
- field[ability] = targets[ability];
+ field[ability] = { ...targets[ability], totalCasts: uses[ability] };
} else {
field[ability] = { null: uses[ability] };
}
@@ -113,11 +113,12 @@ const TargetsBreakdown = ({ field, abilityUses = null }) => {
}
const r = [];
Object.keys(f).forEach((inflictor) => {
+ const valueOverall = f[inflictor].totalCasts ? f[inflictor].totalCasts : sumValues(f[inflictor]);
r.push((
<div style={{ display: 'flex' }}>
{
<StyledDmgTargetInflictor id="target">
- {inflictorWithValue(inflictor, abbreviateNumber(sumValues(f[inflictor])))}
+ {inflictorWithValue(inflictor, abbreviateNumber(valueOverall))}
</StyledDmgTargetInflictor>
}
{<NavigationArrowForward style={arrowStyle} />}
| 1 |
diff --git a/packages/app/src/server/routes/apiv3/personal-setting.js b/packages/app/src/server/routes/apiv3/personal-setting.js @@ -102,14 +102,7 @@ module.exports = (crowi) => {
body('accountId').isString().not().isEmpty(),
],
editorSettings: [
- checkSchema({
- textlintSettings: {
- isTextlintEnabled: { isBoolean: true },
- textlintRules: [
- { name: { isString: true }, options: { isString: true }, isEnabled: { isBoolean: true } },
- ],
- },
- }),
+ body('isTextlintEnabled').isBoolean(),
],
};
| 13 |
diff --git a/src/components/tests/button.spec.js b/src/components/tests/button.spec.js @@ -21,9 +21,17 @@ function setup(props = defaultProps) {
describe('Components::Button', () => {
it('should render correctly', () => {
- const { link, icon } = setup();
+ let { link, icon } = setup();
expect(link.text()).toBe('Save');
expect(icon.node).toBeFalsy();
+
+ link = setup({
+ ...defaultProps,
+ type: 'create',
+ active: false,
+ block: true,
+ }).link;
+ expect(link.text()).toBe('Create');
});
it('should have correct class names', () => {
@@ -40,8 +48,15 @@ describe('Components::Button', () => {
});
it('should render triggered text', () => {
- const { link } = setup({ ...defaultProps, triggered: true });
+ let { link } = setup({ ...defaultProps, triggered: true });
expect(link.text()).toBe('Saved');
+
+ link = setup({
+ ...defaultProps,
+ type: 'view-toggle',
+ triggered: true,
+ }).link;
+ expect(link.text()).toBe('Switch View to Raw Editor');
});
it('should render icon', () => {
| 7 |
diff --git a/sirepo/package_data/template/srw/default-data.json b/sirepo/package_data/template/srw/default-data.json "rotateAngle": 0,
"rotateReshape": "1",
"sampleFactor": 1,
- "samplingMethod": 1,
+ "samplingMethod": 2,
"verticalPointCount": 100,
"verticalPosition": 0,
"verticalRange": "0.6"
| 12 |
diff --git a/versions/3.0.md b/versions/3.0.md @@ -717,7 +717,7 @@ This object can be extended with [Specification Extensions](#specificationExtens
"items": {
"type": "string"
},
- "style": "commaDelimited"
+ "style": "simple"
}
]
}
@@ -749,7 +749,7 @@ parameters:
description: ID of pet to use
required: true
type: array
- format: form
+ style: simple
items:
type: string
```
@@ -1016,7 +1016,7 @@ A header parameter with an array of 64 bit integer numbers:
"format": "int64"
}
},
- "style": "commaDelimited"
+ "style": "simple"
}
```
@@ -1030,7 +1030,7 @@ schema:
items:
type: integer
format: int64
-style: commaDelimited
+style: simple
```
A path parameter of a string value:
| 14 |
diff --git a/packages/app/src/server/routes/login-passport.js b/packages/app/src/server/routes/login-passport.js @@ -222,15 +222,16 @@ module.exports = function(crowi, app) {
let externalAccount;
try {
externalAccount = await getOrCreateUser(req, res, userInfo, providerId);
-
- if (externalAccount == null) { // just in case the returned value is null or undefined
- throw Error('message.external_account_not_exist');
- }
}
catch (error) {
return next(error);
}
+ // just in case the returned value is null or undefined
+ if (externalAccount == null) {
+ return next(Error('message.external_account_not_exist'));
+ }
+
const user = await externalAccount.getPopulatedUser();
// login
| 5 |
diff --git a/content/en/docs/Getting started/_index.md b/content/en/docs/Getting started/_index.md @@ -369,21 +369,23 @@ Run `hugo server --i18n-warnings` when doing translation work, as it will give y
### Content
-For `content`, each language can have its own language configuration and configured each its own content root, e.g. `content/en`. See the [Hugo Docs](https://gohugo.io/content-management/multilingual) on this for more information.
+For `content`, each language can have its own language configuration and its own content root, e.g. `content/en`. See the [Hugo Docs](https://gohugo.io/content-management/multilingual) on multi-language support for more information.
## Add your logo
-Add it to `assets/icons/logo.svg` in your project.
+Add your project logo to `assets/icons/logo.svg` in your project.
## Add your favicons
-The easiest is to create a set of favicons via http://cthedot.de/icongen and put them inside `static/favicons` in your Hugo project.
+The easiest way to do this is to create a set of favicons via http://cthedot.de/icongen (which lets you create a huge range of icon sizes and options from a single image) and/or https://favicon.io/, and put them in your site project's `static/favicons` directory. This will override the default favicons from the theme.
-If you have special requirements, you can create your own `layouts/partials/favicons.html` with your links.
+Note that https://favicon.io/ doesn't create as wide a range of sizes as Icongen but *does* let you quickly create favicons from text: if you want to create text favicons you can use this site to generate them, then use Icongen to create more sizes (if necessary) from your generated `.png` file.
+
+If you have special favicon requirements, you can create your own `layouts/partials/favicons.html` with your links.
## Configure search
-1. Add you Google Custom Search Engine ID to the site params in `config.toml`. You can add different values per language if needed.
+1. Add your Google Custom Search Engine ID to the site params in `config.toml`. You can add different values per language if needed.
2. Add a content file in `content/en/search.md` (and one per other languages if needed). It only needs a title and `layout: search.
| 7 |
diff --git a/src/display/canvas.js b/src/display/canvas.js @@ -2112,8 +2112,9 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var heightScale = Math.max(Math.sqrt(c * c + d * d), 1);
var imgToPaint, tmpCanvas;
- // instanceof HTMLElement does not work in jsdom node.js module
- if (imgData instanceof HTMLElement || !imgData.data) {
+ // typeof check is needed due to node.js support, see issue #8489
+ if ((typeof HTMLElement === 'function' &&
+ imgData instanceof HTMLElement) || !imgData.data) {
imgToPaint = imgData;
} else {
tmpCanvas = this.cachedCanvases.getCanvas('inlineImage',
| 7 |
diff --git a/lib/services/throttler-stream.js b/lib/services/throttler-stream.js @@ -24,15 +24,15 @@ module.exports = class Throttler extends Transform {
this.bytesPerSecondHistory.shift();
}
- const doesNotReachThreshold = [];
+ let doesNotReachThreshold = 0;
for (const bytesPerSecond of this.bytesPerSecondHistory) {
if (bytesPerSecond <= this.minimunBytesPerSecondThershold) {
- doesNotReachThreshold.push(true);
+ doesNotReachThreshold += 1;
}
}
- if (doesNotReachThreshold.length >= this.sampleLength) {
+ if (doesNotReachThreshold >= this.sampleLength) {
clearInterval(this._interval);
this.pgstream.emit('error', new Error('Connection closed by server: input data too slow'));
}
| 14 |
diff --git a/userscript.user.js b/userscript.user.js @@ -32791,7 +32791,11 @@ var $$IMU_EXPORT$$;
if (domain === "img.blick.ch") {
// https://img.blick.ch/incoming/7040030-v5-file6v0ev8lnk1h15jshehfk.jpg?imwidth=1000&ratio=FREE&x=0&y=0&width=541&height=800
// https://img.blick.ch/incoming/7040030-v5-file6v0ev8lnk1h15jshehfk.jpg?ratio=FREE
- return src.replace(/\?.*/, "?ratio=FREE");
+ // thanks to carozzz on github: https://github.com/qsniyg/maxurl/issues/194
+ // https://img.blick.ch/incoming/2998379-v4-teaserbildenergyair.jpg?imwidth=1000&ratio=FREE&x=0&y=293&width=4256&height=2397
+ // https://img.blick.ch/incoming/2998379-v4-teaserbildenergyair.jpg?ratio=FREE -- 2000x1331
+ // https://img.blick.ch/incoming/2998379-v4-teaserbildenergyair.jpg?ratio=FREE&x=0&y=0 -- 4256x2832
+ return src.replace(/\?.*/, "?ratio=FREE&x=0&y=0");
}
if (domain_nowww === "mixnews.lv") {
| 7 |
diff --git a/client/app/components/group/_storeList/storeList.html b/client/app/components/group/_storeList/storeList.html <store-map store-list="$ctrl.storeList" ng-if="$ctrl.$mdMedia('gt-sm')"></store-map>
-<md-list layout-padding>
+<md-list>
<div layout="row">
<md-button class="md-primary" aria-label="Create Store" ui-sref="group.storeCreate">
<i style="font-size: 1.2em;" class="fa fa-plus-circle"></i>
<span translate="BUTTON.CREATE"></span>
</md-button>
- <search-bar search-query="$ctrl.searchQuery"></search-bar>
+ <search-bar ng-hide="$ctrl.showMap" search-query="$ctrl.searchQuery"></search-bar>
<div ng-if="!$ctrl.$mdMedia('gt-sm')" flex></div>
- <md-button ng-if="!$ctrl.$mdMedia('gt-sm')" class="md-primary" ng-click="$ctrl.toggleMap()" aria-label="Toggle map" >
+ <md-button ng-if="!$ctrl.$mdMedia('gt-sm')" class="md-primary md-icon-button" ng-click="$ctrl.toggleMap()" aria-label="Toggle map">
<i style="font-size: 1.2em;" class="fa fa-map" ng-class="$ctrl.showMap ? 'fa-list' : 'fa-map'"></i>
</md-button>
</div>
| 7 |
diff --git a/main.go b/main.go @@ -59,13 +59,14 @@ func main() {
},
},
Action: func(c *cli.Context) error {
- err := validate(c, c.String("i"), c.Bool("c"))
-
+ if err := validate(c, c.String("i"), c.Bool("c")); err != nil {
if strings.Contains(err.Error(), "read failed") {
return xerrors.Cause(err)
}
io.WriteString(c.App.Writer, err.Error())
+ }
+
return nil
},
},
| 9 |
diff --git a/src/patterns/components/pagination/react/info/default.hbs b/src/patterns/components/pagination/react/info/default.hbs Screenreader text for the "next page" arrow. Defaults to "Next Page".
</td>
</tr>
+ <tr>
+ <td class="sprk-u-FontWeight--bold">
+ nextIcon
+ </td>
+ <td>string</td>
+ <td>
+ Icon name for the "next page" arrow. Defaults to "chevron-right".
+ </td>
+ </tr>
<tr>
<td class="sprk-u-FontWeight--bold">
Screenreader text for the "previous page" arrow. Defaults to "Previous Page".
</td>
</tr>
+ <tr>
+ <td class="sprk-u-FontWeight--bold">
+ prevIcon
+ </td>
+ <td>string</td>
+ <td>
+ Icon name for the "previous page" arrow. Defaults to "chevron-left".
+ </td>
+ </tr>
<tr>
<td class="sprk-u-FontWeight--bold">
| 3 |
diff --git a/src/screens/EventDetailsScreen/component.js b/src/screens/EventDetailsScreen/component.js @@ -135,6 +135,9 @@ class EventDetailsScreen extends PureComponent<Props> {
locale={locale}
/>
)}
+ {(event.fields.accessibilityDetails ||
+ event.fields.email ||
+ event.fields.phone) && (
<ContentPadding>
<LayoutColumn spacing={20}>
{event.fields.accessibilityDetails && <SectionDivider />}
@@ -152,6 +155,7 @@ class EventDetailsScreen extends PureComponent<Props> {
)}
</LayoutColumn>
</ContentPadding>
+ )}
</LayoutColumn>
</View>
</ShadowedScrollView>
| 2 |
diff --git a/models/cards.js b/models/cards.js @@ -2003,8 +2003,15 @@ if (Meteor.isServer) {
req,
res,
) {
- Authentication.checkUserId(req.userId);
+ // Check user is logged in
+ Authentication.checkLoggedIn(req.userId);
const paramBoardId = req.params.boardId;
+ // Check user has permission to add card to the board
+ const board = Boards.findOne({
+ _id: paramBoardId
+ });
+ const addPermission = allowIsBoardMemberCommentOnly(req.userId, board);
+ Authentication.checkAdminOrCondition(req.userId, addPermission);
const paramListId = req.params.listId;
const paramParentId = req.params.parentId;
const currentCards = Cards.find(
| 11 |
diff --git a/userscript.user.js b/userscript.user.js @@ -35722,9 +35722,13 @@ var $$IMU_EXPORT$$;
// https://www.famitsu.com/images/000/124/494/t_5874c086779f9.jpg
// https://www.famitsu.com/images/000/124/494/5874c086779f9.jpg -- 250x140
// https://www.famitsu.com/images/000/124/494/l_5874c086779f9.jpg -- 640x360, y/z don't work
+ // https://www.famitsu.com/images/000/181/637/5d5a8379e4e00.jpg
+ // https://www.famitsu.com/images/000/181/637/z_5d5a8379e4e00.jpg
// others:
// https://www.famitsu.com/images/000/124/494/5874c0867b874.jpg -- 3000x4500
+ // https://www.famitsu.com/images/000/124/494/l_5874c0867b874.jpg -- 426x640
regex = /(\/images\/+(?:[0-9]{3}\/+){3})[tly]_([0-9a-f]+\.[^/.]*)(?:[?#].*)?$/;
+ if (regex.test(src)) {
return [
src.replace(regex, "$1z_$2"),
src.replace(regex, "$1y_$2"),
@@ -35732,6 +35736,16 @@ var $$IMU_EXPORT$$;
];
}
+ // thanks again to fireattack:
+ // https://www.famitsu.com/serial/gameiscool/201908/25181637.html
+ // https://www.famitsu.com/serial/gameiscool/images/s00000028s.jpg
+ // https://www.famitsu.com/serial/gameiscool/images/s00000028o.jpg
+ // doesn't work:
+ // https://www.famitsu.com/serial/gameiscool/images/s00000028a.jpg
+ // https://www.famitsu.com/serial/gameiscool/images/s00000028o.jpg -- different image
+ return src.replace(/(\/images\/+s[0-9]{6,})s(\.[^/.]*)(?:[?#].*)?$/, "$1o$2");
+ }
+
if (domain_nowww === "sexiestpicture.com") {
// https://www.sexiestpicture.com/upload/Pictures/thumbs/Selena-Gomez-sexy-selena-gomez-sexy-minidress-legs-paparazzi_big.jpg
// https://www.sexiestpicture.com/upload/Pictures/storage/Selena-Gomez-sexy-selena-gomez-sexy-minidress-legs-paparazzi.jpg
@@ -37336,6 +37350,22 @@ var $$IMU_EXPORT$$;
return src.replace(/\/themes\/+latest\/+ssd\/+small\/+([0-9]+)\/+small-/, "/themes/latest/uploads4/pixsense/big/$1/");
}
+ if (false && domain === "image.sportsseoul.com") {
+ // wip
+ // http://image.sportsseoul.com/2019/06/20/news/20190620090902_ma.jpg -- 2362x2953
+ // http://www.sportsseoul.com/news/read/762497
+ // http://image.sportsseoul.com/2019/05/14/news/20190514080743_04.jpg -- 2130x3149
+ // http://image.sportsseoul.com/2019/07/15/news/20190715153127_b2.jpg -- 1167x1750
+ // http://www.sportsseoul.com/news/read/812656
+ // http://image.sportsseoul.com/2019/08/31/edit/20190831091040_1-5.jpg
+ // http://image.sportsseoul.com/2019/08/31/news/20190831085925_1-2.jpg
+ }
+
+ if (domain === "hosted.foxes.com") {
+ // http://hosted.foxes.com/0-sites/FOXES/fhgs/FYMXQKZUO1/t/Noel-Monique_01.jpg
+ // http://hosted.foxes.com/0-sites/FOXES/fhgs/FYMXQKZUO1/o/Noel-Monique_01.jpg
+ return src.replace(/(\/fhgs\/+[^/]*\/+)t\/+/, "$1o/");
+ }
| 7 |
diff --git a/articles/user-profile/user-data-storage.md b/articles/user-profile/user-data-storage.md ---
title: User Data Storage Guidance
-description: Demonstrating the best practices in using Auth0 storage mechanisms through the scenario of a native Swift app with a Node API backend.
+description: Demonstrates the best practices in using Auth0 storage mechanisms through the scenario of a native Swift app with a Node API backend
toc: true
---
# User Data Storage Guidance
-Auth0 provides multiple places to store data used to authenticate a Client's users. This document covers best practices on how to store your data securely and efficiently. Additionally, this document uses a sample Client (a mobile music application) that reflects the end-to-end user experience of using Auth0 with an external database to illustrate specific topics.
+Auth0 provides multiple places to store data used to authenticate a Client's users. This document covers best practices on how to store your data securely and efficiently. It uses a sample Client (a mobile music application) that reflects the end-to-end user experience of using Auth0 with an external database to illustrate specific topics.
-:::panel Example: Mobile Music Application
-The sample Client is a basic iOS app utilizing the [Auth0 iOS seed project](/quickstart/native/ios-swift). The backend uses the [Node.js API](/quickstart/backend/nodejs). See the [Mobile + API architecture scenario](/architecture-scenarios/application/mobile-api) for a visualization of the Client's overall structure.
-:::
+The sample Client is a basic iOS app utilizing the [Auth0 iOS seed project](/quickstart/native/ios-swift). The backend uses the [Node.js API](/quickstart/backend/nodejs). For a visualization of the client's overall structure, see the [Mobile + API architecture scenario](/architecture-scenarios/application/mobile-api).
## Where should I store my authentication data?
@@ -30,7 +28,7 @@ Any data you store in Auth0 that's *not* already a part of the user profile shou
These fields contain JSON snippets and can be used during the Auth0 authentication process.
-### App Metadata
+### App metadata
You can store data points that are read-only to the user in `app_metadata`. Three common types of data for the `app_metadata` field:
@@ -40,7 +38,7 @@ You can store data points that are read-only to the user in `app_metadata`. Thre
For a list of fields that *cannot* be stored within `app_metadata`, please see the [metadata overview page](/metadata#metadata-restrictions).
-#### Example: `app_metadata` for a Mobile Music Application
+#### Example: App metadata for a mobile music application
The following data points from our mobile music application appropriate to store in `app_metadata`:
@@ -132,7 +130,7 @@ After we've implemented these two rules, the app recognizes whether the user is
-### User Metadata
+### User metadata
The following data points from our mobile music application are appropriate to store in `user_metadata`:
@@ -142,7 +140,7 @@ The following data points from our mobile music application are appropriate to s
Note that, unlike the data points for `app_metadata`, the user can easily and readily change those stored in `user_metadata`.
-#### Example: `user_metadata` for a Mobile Music Application
+#### Example: User metadata for a mobile music application
We can let the user change their `displayName`, which is the name the user sees upon logging in and is displayed to other users of the app.
@@ -185,12 +183,12 @@ This is followed by a call to the [Update a User](/api/management/v2#!/Users/pat
```har
{
"method": "PATCH",
- "url": "https://YOURACCOUNT.auth0.com/api/v2/users/user_id",
+ "url": "https://${account.namespace}/api/v2/users/user_id",
"httpVersion": "HTTP/1.1",
"cookies": [],
"headers": [{
"name": "Authorization",
- "value": "Bearer ABCD"
+ "value": "Bearer YOUR_ACCESS_TOKEN"
}, {
"name": "Content-Type",
"value": "application/json"
@@ -206,6 +204,8 @@ This is followed by a call to the [Update a User](/api/management/v2#!/Users/pat
}
```
+You must replace `YOUR_ACCESS_TOKEN` with a [Management API Access Token](/api/management/v2/tokens).
+
## Why shouldn't I put all my Client's data in the Auth0 data store?
Because the Auth0 data store is customized for authentication data, storing anything beyond the default user information should be done only in limited cases. Here's why:
| 3 |
diff --git a/src/serialize/window.js b/src/serialize/window.js @@ -67,12 +67,12 @@ function getSerializedWindow(winPromise : ZalgoPromise<CrossDomainWindowType>, {
return isWindowClosed(win);
}),
setLocation: (href) => winPromise.then(win => {
- if (!href.match(/^(\/|https?:\/\/)/)) {
- throw new Error(`Expected url to be http or https url, or absolute path, got ${ JSON.stringify(href) }`);
- }
+ const domain = `${ window.location.protocol }//${ window.location.host }`;
if (href.indexOf('/') === 0) {
- href = `${ window.location.protocol }//${ window.location.host }${ href }`;
+ href = `${ domain }${ href }`;
+ } else if (!href.match(/^https?:\/\//) && href.indexOf(domain) !== 0) {
+ throw new Error(`Expected url to be http or https url, or absolute path, got ${ JSON.stringify(href) }`);
}
if (isSameDomain(win)) {
| 11 |
diff --git a/Source/DataSources/PathVisualizer.js b/Source/DataSources/PathVisualizer.js @@ -452,7 +452,7 @@ PolylineUpdater.prototype.updateObject = function (time, item) {
var showProperty = pathGraphics._show;
var polyline = item.polyline;
var show =
- entity.isShowing && (!defined(showProperty) || showProperty.getValue(time));
+ entity.isShowing && entity.isAvailable(time) && (!defined(showProperty) || showProperty.getValue(time));
//While we want to show the path, there may not actually be anything to show
//depending on lead/trail settings. Compute the interval of the path to
| 4 |
diff --git a/packages/@uppy/core/src/index.test.js b/packages/@uppy/core/src/index.test.js @@ -240,15 +240,33 @@ describe('src/Core', () => {
})
})
- it('should clear all uploads on cancelAll()', () => {
+ it('should clear all uploads and files on cancelAll()', () => {
const core = new Core()
- const id = core._createUpload([ 'a', 'b' ])
+
+ core.addFile({
+ source: 'jest',
+ name: 'foo1.jpg',
+ type: 'image/jpeg',
+ data: new File([sampleImage], { type: 'image/jpeg' })
+ })
+
+ core.addFile({
+ source: 'jest',
+ name: 'foo2.jpg',
+ type: 'image/jpeg',
+ data: new File([sampleImage], { type: 'image/jpeg' })
+ })
+
+ const fileIDs = Object.keys(core.getState().files)
+ const id = core._createUpload(fileIDs)
expect(core.getState().currentUploads[id]).toBeDefined()
+ expect(Object.keys(core.getState().files).length).toEqual(2)
core.cancelAll()
expect(core.getState().currentUploads[id]).toBeUndefined()
+ expect(Object.keys(core.getState().files).length).toEqual(0)
})
it('should close, reset and uninstall when the close method is called', () => {
| 3 |
diff --git a/package.json b/package.json "natsort": "^1.0.6",
"octicons": "^5.0.1",
"pikaday": "~1.4.0",
- "preact": "^8.1.0"
+ "preact": "^8.1.0",
+ "recursive-copy": "^2.0.6",
+ "uuid": "^3.0.1"
},
"devDependencies": {
"electron": "1.6.9",
| 9 |
diff --git a/GLTF1Loader.js b/GLTF1Loader.js @@ -846,6 +846,7 @@ const GLTFLoader = ( function () {
// loader object cache
this.cache = new GLTFRegistry();
+ this.manager = THREE.DefaultLoadingManager;
}
GLTFParser.prototype._withDependencies = function ( dependencies ) {
@@ -1081,6 +1082,7 @@ const GLTFLoader = ( function () {
var json = this.json;
var extensions = this.extensions;
var options = this.options;
+ const manager = this.manager;
return this._withDependencies( [
@@ -1103,7 +1105,7 @@ const GLTFLoader = ( function () {
}
- var textureLoader = THREE.Loader.Handlers.get( sourceUri );
+ var textureLoader = manager.getHandler( sourceUri );
if ( textureLoader === null ) {
| 0 |
diff --git a/native/navigation-setup.js b/native/navigation-setup.js @@ -59,7 +59,8 @@ import {
ChatRouteName,
} from './chat/chat.react';
import { ChatThreadListRouteName } from './chat/chat-thread-list.react';
-import More from './more/more.react';
+import { MoreRouteName, More } from './more/more.react';
+import { MoreScreenRouteName } from './more/more-screen.react';
import {
LoggedOutModal,
LoggedOutModalRouteName,
@@ -104,7 +105,7 @@ const AppNavigator = TabNavigator(
{
[CalendarRouteName]: { screen: Calendar },
[ChatRouteName]: { screen: Chat },
- More: { screen: More },
+ [MoreRouteName]: { screen: More },
},
{
initialRouteName: CalendarRouteName,
@@ -207,7 +208,14 @@ const defaultNavigationState = {
{ key: 'ChatThreadList', routeName: ChatThreadListRouteName },
],
},
- { key: 'More', routeName: 'More' },
+ {
+ key: 'More',
+ routeName: MoreRouteName,
+ index: 0,
+ routes: [
+ { key: 'MoreScreen', routeName: MoreScreenRouteName },
+ ],
+ },
],
},
{ key: 'LoggedOutModal', routeName: LoggedOutModalRouteName },
| 0 |
diff --git a/src/js/core/Utils.js b/src/js/core/Utils.js @@ -104,11 +104,17 @@ var Utils = {
* @returns {byteArray}
*
* @example
- * // returns "['a', 0, 0, 0]"
+ * // returns ["a", 0, 0, 0]
* Utils.padBytesRight("a", 4);
*
- * // returns "['a', 1, 1, 1]"
+ * // returns ["a", 1, 1, 1]
* Utils.padBytesRight("a", 4, 1);
+ *
+ * // returns ["t", "e", "s", "t", 0, 0, 0, 0]
+ * Utils.padBytesRight("test", 8);
+ *
+ * // returns ["t", "e", "s", "t", 1, 1, 1, 1]
+ * Utils.padBytesRight("test", 8, 1);
*/
padBytesRight: function(arr, numBytes, padByte) {
padByte = padByte || 0;
| 7 |
diff --git a/test/versioned/express/package.json b/test/versioned/express/package.json "dependencies": {
"express": ">=4.6.0",
"express-enrouten": "1.1",
- "ejs": "2.5"
+ "ejs": "2.5.9"
},
"files": [
"app-use.tap.js",
| 12 |
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js @@ -10,11 +10,16 @@ module.exports = async ( { config } ) => {
const siteKitPackageAliases = mapValues(
mainConfig.siteKitExternals,
( [ global, api ] ) => {
- // Revert "@wordpress/i18n: [ googlesitekit, i18n ]" external back to the original @wordpress/i18n.
if ( global === 'googlesitekit' ) {
+ // Revert "@wordpress/i18n: [ googlesitekit, i18n ]" external back to the original @wordpress/i18n.
if ( api === 'i18n' ) {
return require.resolve( '@wordpress/i18n' );
}
+
+ // Revert "@wordpress/element: [ googlesitekit, element ]" external back to the original @wordpress/element.
+ if ( api === 'element' ) {
+ return require.resolve( '@wordpress/element' );
+ }
}
return path.resolve( `assets/js/${ global }-${ api }.js` );
| 12 |
diff --git a/scripts/generateHeadingIDs.js b/scripts/generateHeadingIDs.js @@ -32,7 +32,7 @@ function addHeaderID(line, slugger, write = false) {
return line;
}
// check if it already has an id
- if (/\{#[^}]+\}/.test(line) && !write) {
+ if (/\{#[^}]+\}/.test(line)) {
return line;
}
const headingText = line.slice(line.indexOf(' ')).replace(/\{#[^}]+\}/, '').trim();
@@ -52,10 +52,10 @@ function addHeaderID(line, slugger, write = false) {
} else {
if (headerNumber in toc) {
slug = toc[headerNumber].slug;
- console.log("write heading ID", headerNumber, headingText, "==>", slug);
+ console.log("\twrite heading ID", headerNumber, headingText, "==>", slug);
return `${headingLevel} ${headingText} {#${slug}}`;
} else {
- console.log("headerNumber not found", headerNumber, headingText, "==>", slug);
+ console.log("\theaderNumber not found", headerNumber, headingText, "==>", slug);
return line;
}
}
@@ -90,6 +90,7 @@ function traverseHeaders(path, doc = "", write = false) {
return;
}
+ console.log(`>>> processing ${file}`)
curLevel = [0, 0, 0];
const content = fs.readFileSync(file, 'utf8');
const lines = content.split('\n');
| 7 |
diff --git a/assets/js/modules/analytics/setup.js b/assets/js/modules/analytics/setup.js @@ -53,7 +53,6 @@ class AnalyticsSetup extends Component {
} = googlesitekit.modules.analytics.settings;
this.state = {
- setupNewAccount: false,
isLoading: true,
isSaving: false,
propertiesLoading: false,
@@ -148,20 +147,11 @@ class AnalyticsSetup extends Component {
}
// The selected value is string.
- if ( '-1' === selectValue ) {
- this.setState( {
- selectedAccount: selectValue,
- setupNewAccount: true,
- } );
- return;
- }
-
if ( '0' === selectValue ) {
this.setState( {
selectedAccount: selectValue,
selectedProperty: '-1',
selectedProfile: '-1',
- setupNewAccount: false,
properties: [ {
id: '-1',
name: __( 'Select an account', 'google-site-kit' )
@@ -178,7 +168,6 @@ class AnalyticsSetup extends Component {
propertiesLoading: true,
profilesLoading: true,
selectedAccount: selectValue,
- setupNewAccount: false,
} );
// Track selection.
@@ -766,7 +755,6 @@ class AnalyticsSetup extends Component {
selectedProperty,
selectedProfile,
useSnippet,
- setupNewAccount,
existingTag,
} = this.state;
@@ -794,9 +782,6 @@ class AnalyticsSetup extends Component {
if ( ! setupComplete || isEditing ) {
return (
<Fragment>
- { ( setupNewAccount && 1 < accounts.length ) &&
- <div className="googlesitekit-setup-module__inputs">{ this.accountsDropdown() }</div>
- }
<div className="googlesitekit-setup-module__action">
<Button onClick={ AnalyticsSetup.createNewAccount }>{ __( 'Create an account', 'google-site-kit' ) }</Button>
| 2 |
diff --git a/public/js/office.web.js b/public/js/office.web.js @@ -159,7 +159,7 @@ $(() => {
}
function getRoomName(roomId){
- return $("[room-id="+roomId+"]").attr("room-name")
+ return $(`[room-id="${roomId}"]`).attr("room-name")
}
function getLastRoom(matrixProfile){
@@ -204,7 +204,7 @@ $(() => {
}
function confirmRoomEnter(user,roomId, officeEvents){
- const isConfirmed = confirm(user.name +" is calling you to join in "+ getRoomName(roomId));
+ const isConfirmed = confirm(`${user.name} is calling you to join in ${getRoomName(roomId)}`);
if (isConfirmed) {
officeEvents.enterInRoom(roomId);
startVideoConference(roomId, getRoomName(roomId),officeEvents);
| 7 |
diff --git a/assets/js/components/settings/SettingsRenderer.js b/assets/js/components/settings/SettingsRenderer.js @@ -29,7 +29,7 @@ import { STORE_NAME as CORE_MODULES } from '../../googlesitekit/modules/datastor
const { useSelect, useDispatch } = Data;
const nullComponent = () => null;
-export default function SettingsMain( { slug, isOpen, isEditing } ) {
+export default function SettingsRenderer( { slug, isOpen, isEditing } ) {
const storeName = `modules/${ slug }`;
const isDoingSubmitChanges = useSelect( ( select ) => select( storeName ).isDoingSubmitChanges() );
const haveSettingsChanged = useSelect( ( select ) => select( storeName ).haveSettingsChanged() );
| 10 |
diff --git a/src/components/common/view/AddWebApp.web.js b/src/components/common/view/AddWebApp.web.js @@ -97,6 +97,10 @@ const AddWebApp = props => {
log.debug('showExplanationDialog')
showDialog({
content: <ExplanationDialog />,
+ onDismiss: () => {
+ const date = new Date()
+ AsyncStorage.setItem('AddWebAppLastCheck', date.toISOString())
+ },
})
}
| 0 |
diff --git a/test/run_tests_docker.sh b/test/run_tests_docker.sh @@ -24,14 +24,18 @@ if [ "$NODEJS_VERSION" = "nodejs10" ];
then
echo "npm version on install:"
npm -v
+ mv npm-shrinkwrap.json npm-shrinkwrap.json.backup
npm ci
npm ls
+ mv npm-shrinkwrap.json.backup npm-shrinkwrap.json
elif [ "$NODEJS_VERSION" = "nodejs6" ];
then
echo "npm version on install:"
npm -v
+ mv package-lock.json package-lock.json.backup
npm i
npm ls
+ mv package-lock.json.backup package-lock.json
else
usage
fi
| 10 |
diff --git a/configs/todc-bootstrap.json b/configs/todc-bootstrap.json {
"index_name": "todc-bootstrap",
"start_urls": [
- {
- "url": "https://todc.github.io/todc-bootstrap/docs/(?P<version>.*?)/",
- "variables": {
- "version": [
- "3.4",
- "4.1"
- ]
- }
- },
- {
- "url": "http://todc.github.io/todc-bootstrap/docs/(?P<version>.*?)/",
- "variables": {
- "version": [
- "3.4",
- "4.1"
- ]
- }
- }
+ "https://todc.github.io/todc-bootstrap/docs/",
+ "http://todc.github.io/todc-bootstrap/docs/"
],
"stop_urls": [
"/examples/.+"
"selectors_exclude": [
".bd-example"
],
+ "custom_settings": {
+ "attributesForFaceting": [
+ "version",
+ "language"
+ ]
+ },
"nb_hits": 5040
}
\ No newline at end of file
| 4 |
diff --git a/index.js b/index.js @@ -535,7 +535,8 @@ SocketCluster.prototype._workerClusterReadyHandler = function () {
warningMessage = 'Master received SIGUSR2 signal - Shutting down all workers gracefully within processTermTimeout limit';
}
- var warning = new ProcessExitError(warningMessage);
+ var warning = new ProcessExitError(warningMessage, null);
+ warning.signal = 'SIGUSR2';
self.emitWarning(warning, {
type: 'Master',
@@ -600,11 +601,17 @@ SocketCluster.prototype._handleWorkerClusterExit = function (errorCode, signal)
this.emit(this.EVENT_WORKER_CLUSTER_EXIT, workerClusterInfo);
- var message = 'WorkerCluster exited with code: ' + errorCode;
+ var message = 'WorkerCluster exited with code ' + errorCode;
+ if (signal != null) {
+ message += ' and signal ' + signal;
+ }
if (errorCode == 0) {
this.log(message);
} else {
var error = new ProcessExitError(message, errorCode);
+ if (signal != null) {
+ error.signal = signal;
+ }
this.emitFail(error, {
type: 'WorkerCluster',
pid: wcPid
| 7 |
diff --git a/js/webcomponents/bisweb_filetreepanel.js b/js/webcomponents/bisweb_filetreepanel.js @@ -396,12 +396,54 @@ class FileTreePanel extends HTMLElement {
initialCallback: () => { return this.getDefaultFilename(); },
});
+ let importTaskButton = bis_webfileutil.createFileButton({
+ 'type' : 'info',
+ 'name' : 'Import task file',
+ 'callback' : (f) => {
+ this.loadStudyTaskData(f);
+ },
+ },
+ {
+ 'title': 'Import task file',
+ 'filters': [
+ { 'name': 'Task Files', extensions: ['json'] }
+ ],
+ 'suffix': 'json',
+ 'save': false,
+ });
+
+ let clearTaskButton = bis_webutil.createbutton({ 'name' : 'Clear tasks', 'type' : 'primary' });
+ console.log('clear task button', clearTaskButton);
+ clearTaskButton.on('click', () => {
+ bootbox.confirm({
+ 'message' : 'Clear loaded task data?',
+ 'buttons' : {
+ 'confirm' : {
+ 'label' : 'Yes',
+ 'className' : 'btn-success'
+ },
+ 'cancel': {
+ 'label' : 'No',
+ 'className' : 'btn-danger'
+ }
+ },
+ 'callback' : (result) => {
+ console.log('result', result);
+ if (result) { this.graphelement.taskdata = null; }
+ }
+ });
+ this.graphelement.taskdata = null;
+ });
+
+
saveStudyButton.addClass('save-study-button');
saveStudyButton.prop('disabled', 'true');
topButtonBar.append(loadStudyDirectoryButton);
topButtonBar.append(loadStudyJSONButton);
+ bottomButtonBar.append(importTaskButton);
+ bottomButtonBar.append(clearTaskButton);
bottomButtonBar.append(saveStudyButton);
listElement.append(buttonGroupDisplay);
@@ -489,7 +531,7 @@ class FileTreePanel extends HTMLElement {
});
}
- if (type === 'ParavisionJob') {
+ /*if (type === 'ParavisionJob') {
newSettings = Object.assign(newSettings, {
'LoadTask': {
'separator_before': false,
@@ -500,7 +542,7 @@ class FileTreePanel extends HTMLElement {
}
}
});
- }
+ }*/
return newSettings;
}
@@ -515,14 +557,8 @@ class FileTreePanel extends HTMLElement {
this.viewerapplication.loadImage(nodeName, viewer);
}
- loadStudyTaskData() {
+ loadStudyTaskData(name) {
let lowRange = -1, highRange = -1;
- bis_webfileutil.webFileCallback({
- 'title' : 'Load Settings',
- 'filters': [
- { 'name': 'Settings Files', extensions: ['json'] }
- ]
- }, (name) => {
bis_genericio.read(name, false).then((obj) => {
//parse raw task data
@@ -561,7 +597,6 @@ class FileTreePanel extends HTMLElement {
console.log('An error occured while parsing the task file', e);
}
});
- });
function parseEntry(entry) {
| 5 |
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile @@ -31,8 +31,26 @@ platform :android do
desc "Build a new version for the Google Play"
lane :build do
+
+ # Not sure it's the best way to retrieve resolved config...
+ # but Supply.config is not initialized here
+ supply_config = FastlaneCore::Configuration.create(Supply::Options.available_options, {})
+
+ default_package_name = CredentialsManager::AppfileConfig.try_fetch_value(:package_name)
+ package_name = supply_config[:package_name]
+
+ gradle_task = "bundleOfficialRelease"
+ artifact_filepath = "officialRelease/app-official-release"
+
+ if package_name != default_package_name
+ generate_icons
+ rename_app
+ gradle_task = "bundleInstanceRelease"
+ artifact_filepath = "instanceRelease/app-instance-release"
+ end
+
gradle(
- task: "clean bundleOfficialRelease",
+ task: "clean #{gradle_task}",
properties: {
"android.injected.signing.store.file" => ENV["ANDROID_STORE_FILE"],
"android.injected.signing.store.password" => ENV["ANDROID_STORE_PASSWORD"],
@@ -45,8 +63,8 @@ platform :android do
ks_password: ENV["ANDROID_STORE_PASSWORD"],
ks_key_alias: ENV["ANDROID_KEY_ALIAS"],
ks_key_alias_password: ENV["ANDROID_KEY_PASSWORD"],
- aab_path: "app/build/outputs/bundle/officialRelease/app-official-release.aab",
- apk_output_path: "app/build/outputs/apk/officialRelease/app-official-release.apk",
+ aab_path: "app/build/outputs/bundle/#{artifact_filepath}.aab",
+ apk_output_path: "app/build/outputs/apk/#{artifact_filepath}.apk",
verbose: true
)
end
| 10 |
diff --git a/app/stylesheets/builtin-pages/library.less b/app/stylesheets/builtin-pages/library.less .revision {
border-bottom: 0;
list-style: none;
- margin-bottom: 10px;
+ margin-bottom: 15px;
.revision-header {
cursor: pointer;
| 4 |
diff --git a/token-metadata/0x270D09cb4be817c98e84fEffdE03D5CD45e30a27/metadata.json b/token-metadata/0x270D09cb4be817c98e84fEffdE03D5CD45e30a27/metadata.json "symbol": "MAKI",
"address": "0x270D09cb4be817c98e84fEffdE03D5CD45e30a27",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.