code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js @@ -92,15 +92,15 @@ class AttachmentModal extends PureComponent {
/**
* If our attachment is a PDF, return the unswipeable Modal type.
- * @param {String} source
+ * @param {String} sourceURL
* @param {Object} file
* @returns {String}
*/
- getModalType(source, file) {
+ getModalType(sourceURL, file) {
return (
- source
+ sourceURL
&& (
- Str.isPDF(source)
+ Str.isPDF(sourceURL)
|| (
file
&& Str.isPDF(file.name || this.props.translate('attachmentView.unknownFilename'))
@@ -112,10 +112,10 @@ class AttachmentModal extends PureComponent {
}
/**
- * @param {String} source
+ * @param {String} sourceURL
*/
- downloadAttachment(source) {
- fileDownload(source, this.props.originalFileName);
+ downloadAttachment(sourceURL) {
+ fileDownload(sourceURL, this.props.originalFileName);
// At ios, if the keyboard is open while opening the attachment, then after downloading
// the attachment keyboard will show up. So, to fix it we need to dismiss the keyboard.
| 10 |
diff --git a/imports/both/i18n/en/categories.json b/imports/both/i18n/en/categories.json [
{ "name" : "Meet me for Action!", "color":"red", "default":true },
{ "name" : "Global Flash Mobs", "color" : "#38a80d" },
- { "name" : "<a href='https://news.focallocal.org/free-hugs/' target='_blank'>Free Hugs</a>
-", "color" : "#f82d2d" },
+ { "name" : "Free Hugs", "color" : "#f82d2d" },
{ "name" : "Pillow Fight 4Connection", "color" : "#48a80d" },
{ "name" : "Give a Bubble", "color" : "#0ea575" },
{ "name" : "Take a Smile", "color" : "#0e77a3" },
| 13 |
diff --git a/index.d.ts b/index.d.ts @@ -804,7 +804,7 @@ declare namespace Moleculer {
static mergeSchemaUnknown(src: GenericObject, target: GenericObject): GenericObject;
}
- type CheckRetryable = (err: Error) => boolean;
+ type CheckRetryable = (err: Errors.MoleculerError) => boolean;
interface BrokerCircuitBreakerOptions {
enabled?: boolean;
| 3 |
diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx const React = require('react');
const render = require('../../lib/render.jsx');
-const FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
const FormattedMessage = require('react-intl').FormattedMessage;
const injectIntl = require('react-intl').injectIntl;
const Avatar = require('../../components/avatar/avatar.jsx');
@@ -23,7 +22,7 @@ const Credits = () => (
<div className="midHeader">
<h2>MIT Scratch Team</h2>
<p>
- <FormattedHTMLMessage id="credits.developers" />
+ <FormattedMessage id="credits.developers" />
</p>
</div>
<ul>
@@ -49,10 +48,10 @@ const Credits = () => (
<div className="supporters">
<div className="midHeader">
<h2>
- <FormattedHTMLMessage id="credits.currentSponsors" />
+ <FormattedMessage id="credits.currentSponsors" />
</h2>
<p>
- <FormattedHTMLMessage id="credits.currentFinancialSupport" />
+ <FormattedMessage id="credits.currentFinancialSupport" />
</p>
</div>
<div className="logoGrid">
@@ -80,29 +79,38 @@ const Credits = () => (
</div>
<div className="acknowledgeContent">
<h2>
- <FormattedHTMLMessage id="credits.translationsTitle" />
+ <FormattedMessage id="credits.translationsTitle" />
</h2>
<p>
- <FormattedHTMLMessage id="credits.acknowledgementsTranslators" />
+ <FormattedMessage
+ id="credits.acknowledgementsTranslators"
+ values={{
+ translatorsLink: (
+ <a href="http://wiki.scratch.mit.edu/wiki/Translators">
+ <FormattedMessage id="credits.acknowledgementsTranslatorsLinkText" />
+ </a>
+ )
+ }}
+ />
</p>
<h2>
- <FormattedHTMLMessage id="credits.illustrationsTitle" />
+ <FormattedMessage id="credits.illustrationsTitle" />
</h2>
<p>
- <FormattedHTMLMessage id="credits.acknowledgementsIllustrations" />
+ <FormattedMessage id="credits.acknowledgementsIllustrations" />
</p>
<p>
Natalie Rosalinda Hall, Wren McDonald, Andrew Rae, Daria Skrybchenko,
Robert Hunter, Alex Eben Meyer, Ding Ding Hu, Owen Davey.
</p>
<h2>
- <FormattedHTMLMessage id="credits.pastContributors" />
+ <FormattedMessage id="credits.pastContributors" />
</h2>
<p>
- <FormattedHTMLMessage id="credits.pastContributorsThanks" />
+ <FormattedMessage id="credits.pastContributorsThanks" />
</p>
<p>
- <FormattedHTMLMessage id="credits.otherContributors" />
+ <FormattedMessage id="credits.otherContributors" />
{' '}
Ben Berg, Amos Blanton, Karen Brennan, Juanita Buitrago, Leo Burd,
Gaia Carini, Kasia Chmielinski, Michelle Chung, Shane Clements,
@@ -114,22 +122,45 @@ const Credits = () => (
Urrea, Oren Zuckerman.
</p>
<p>
- <FormattedHTMLMessage id="credits.partnersBody" />
+ <FormattedMessage id="credits.partnersBody" />
</p>
<h2>
- <FormattedHTMLMessage id="credits.researchersTitle" />
+ <FormattedMessage id="credits.researchersTitle" />
</h2>
<p>
- <FormattedHTMLMessage id="credits.researchersBody" />
+ <FormattedMessage
+ id="credits.researchersBody"
+ values={{
+ scratchResearchLink: (
+ <a href="https://scratch.mit.edu/info/research/">
+ <FormattedMessage id="credits.researchLinkText" />
+ </a>
+ )
+ }}
+ />
</p>
<p>
- <FormattedHTMLMessage id="credits.researchersContributors" />
+ <FormattedMessage
+ id="credits.researchersContributors"
+ values={{
+ nsfLink: (
+ <a href="http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828">
+ <FormattedMessage id="credits.researchNSFLinkText" />
+ </a>
+ ),
+ scratchEdLink: (
+ <a href="http://scratched.gse.harvard.edu/">
+ <FormattedMessage id="credits.researchScratchEdLinkText" />
+ </a>
+ )
+ }}
+ />
</p>
<h2>
- <FormattedHTMLMessage id="credits.acknowledgementsTitle" />
+ <FormattedMessage id="credits.acknowledgementsTitle" />
</h2>
<p>
- <FormattedHTMLMessage id="credits.acknowledgementsContributors" />
+ <FormattedMessage id="credits.acknowledgementsContributors" />
</p>
<p>
Susan Abend, Robbie Berg, Lauren Bessen, Keith Braadfladt,
@@ -146,10 +177,10 @@ const Credits = () => (
Vladimir Vuksan, Han Xu.
</p>
<p>
- <FormattedHTMLMessage id="credits.acknowledgementsInfluencers" />
+ <FormattedMessage id="credits.acknowledgementsInfluencers" />
</p>
<p>
- <FormattedHTMLMessage id="credits.acknowledgementsCommunity" />
+ <FormattedMessage id="credits.acknowledgementsCommunity" />
</p>
</div>
</div>
| 14 |
diff --git a/gulpfile.babel.js b/gulpfile.babel.js @@ -91,10 +91,6 @@ gulp.task( 'default', () => {
);
} );
-gulp.task( 'jest', function() {
- execSync( 'npm run test:js', { stdio: [ 0, 1, 2 ] } );
-} );
-
gulp.task( 'phpunit', function() {
gulp.src( '' )
.pipe( phpunit( './vendor/bin/phpunit' ) );
| 1 |
diff --git a/css/tabBar.css b/css/tabBar.css @@ -318,12 +318,36 @@ body.dark-mode #overlay {
/* permission request buttons */
.tab-item .tab-icon.permission-request-icon {
- border: 1px currentColor solid;
- border-radius: 0.5em;
+ border: 1px rgba(0, 0, 0, 0.3) solid;
+ padding: 0.16em;
+ margin-right: 0.66em;
+ margin-top: -0.2em;
+ border-radius: 0.75em;
+}
+.tab-item .tab-icon.permission-request-icon i {
+ margin: 0 0.15em;
+ vertical-align: bottom;
+}
+.dark-theme .tab-item .tab-icon.permission-request-icon {
+ border-color: rgba(255, 255, 255, 0.5);
+}
+.tab-item .tab-icon.permission-request-icon:hover {
+ background-color: rgba(0, 0, 0, 0.075);
+}
+.dark-theme .tab-item .tab-icon.permission-request-icon:hover {
+ background-color: rgba(255, 255, 255, 0.15);
}
.tab-item .tab-icon.permission-request-icon.active {
- background-color: red;
+ background-color: rgba(0, 0, 0, 0.66);
+ border-color: transparent;
+ color: white;
+}
+.dark-theme .tab-item .tab-icon.permission-request-icon.active {
+ background-color: rgba(255,255,255,0.9);
+ border-color: transparent;
+ color: black;
}
+
.tab-item:not(.active) .permission-request-icon:not(.active) {
display: none;
}
| 7 |
diff --git a/tests/test_oracle_integration.py b/tests/test_oracle_integration.py @@ -26,17 +26,21 @@ def set_oracle(PriceFeedsMoC, BZRX, PriceFeeds, WRBTC, accounts, sovryn, swapsIm
@pytest.fixture()
-def pice_feed_moc_mockup(PriceFeedsMoCMockup):
- price_feeds_moc_mockup = PriceFeedsMoCMockup
+def pice_feed_moc_mockup(accounts, PriceFeedsMoCMockup):
+ price_feeds_moc_mockup = accounts[0].deploy(PriceFeedsMoCMockup)
price_feeds_moc_mockup.setHas(True)
- price_feeds_moc_mockup.setValue()
+ price_feeds_moc_mockup.setValue(1e22)
+ return price_feeds_moc_mockup
-def test_moc_oracle_integration(set_oracle, BZRX, WRBTC):
- price_feeds, _ = set_oracle()
+def test_moc_oracle_integration(set_oracle, BZRX, WRBTC, pice_feed_moc_mockup):
+ price_feeds, price_feeds_moc = set_oracle(pice_feed_moc_mockup.address)
res = price_feeds.queryPrecision(BZRX.address, WRBTC.address)
- assert(res > 0)
+ assert(res == 1e18)
+
+ res = price_feeds_moc.latestAnswer()
+ assert(res == 1e22)
def test_set_moc_oracle_address(set_oracle, accounts, BZRX):
| 7 |
diff --git a/app/components/PrivateKeyView.jsx b/app/components/PrivateKeyView.jsx import React, {Component} from "react";
-import BaseModal from "./Modal/BaseModal";
-import ZfApi from "react-foundation-apps/src/utils/foundation-api";
import WalletUnlockActions from "actions/WalletUnlockActions";
import WalletDb from "stores/WalletDb";
import Translate from "react-translate-component";
import PrivateKeyStore from "stores/PrivateKeyStore";
import QrcodeModal from "./Modal/QrcodeModal";
+import counterpart from "counterpart";
import PropTypes from "prop-types";
+import {Modal, Button} from "bitshares-ui-style-guide";
export default class PrivateKeyView extends Component {
static propTypes = {
@@ -16,21 +16,32 @@ export default class PrivateKeyView extends Component {
constructor() {
super();
this.state = this._getInitialState();
+
+ this.showModal = this.showModal.bind(this);
+ this.hideModal = this.hideModal.bind(this);
+ this.onClose = this.onClose.bind(this);
}
_getInitialState() {
- return {wif: null};
+ return {
+ isModalVisible: false,
+ wif: null
+ };
}
reset() {
this.setState(this._getInitialState());
}
- componentDidMount() {
- var modalId = "key_view_modal" + this.props.pubkey;
- ZfApi.subscribe(modalId, (name, msg) => {
- if (name !== modalId) return;
- if (msg === "close") this.reset();
+ hideModal() {
+ this.setState({
+ isModalVisible: false
+ });
+ }
+
+ showModal() {
+ this.setState({
+ isModalVisible: true
});
}
@@ -41,18 +52,24 @@ export default class PrivateKeyView extends Component {
var has_private = keys.has(this.props.pubkey);
if (!has_private) return <span>{this.props.children}</span>;
var key = keys.get(this.props.pubkey);
+
+ const footer = [
+ <Button key="cancel" onClick={this.onClose}>
+ {counterpart.translate("transfer.close")}
+ </Button>
+ ];
+
return (
<span>
<a onClick={this.onOpen.bind(this)}>{this.props.children}</a>
- <BaseModal
+ <Modal
+ visible={this.state.isModalVisible}
+ title={counterpart.translate("account.perm.key_viewer")}
ref={modalId}
id={modalId}
- overlay={true}
- overlayClose={false}
+ onCancel={this.onClose}
+ footer={footer}
>
- <h3>
- <Translate content="account.perm.key_viewer" />
- </h3>
<div className="grid-block vertical">
<div className="content-block">
<div className="grid-content">
@@ -131,29 +148,19 @@ export default class PrivateKeyView extends Component {
) : null}
</div>
</div>
- <div className="button-group">
- <div
- onClick={this.onClose.bind(this)}
- className=" button"
- >
- <Translate content="transfer.close" />
- </div>
- </div>
- </BaseModal>
+ </Modal>
<QrcodeModal ref="qrmodal" keyValue={this.state.wif} />
</span>
);
}
onOpen() {
- var modalId = "key_view_modal" + this.props.pubkey;
- ZfApi.publish(modalId, "open");
+ this.showModal();
}
onClose() {
this.reset();
- var modalId = "key_view_modal" + this.props.pubkey;
- ZfApi.publish(modalId, "close");
+ this.hideModal();
}
onShow() {
| 14 |
diff --git a/backend/lost/logic/jobs/jobs.py b/backend/lost/logic/jobs/jobs.py @@ -48,6 +48,13 @@ def get_args():
return config.LOSTConfig()
+def _unlock_anno(anno):
+ if anno.state == state.Anno.LABELED_LOCKED:
+ anno.state = state.Anno.LABELED
+ else:
+ anno.state = state.Anno.UNLOCKED
+ return anno
+
def force_anno_release(dbm, anno_task_id):
'''Force a release of all annotations that are currently locked by a user for annotation
@@ -58,11 +65,11 @@ def force_anno_release(dbm, anno_task_id):
c_imgs = 0
c_2dannos = 0
for anno in dbm.get_locked_img_annos(anno_task_id):
- anno.state = state.Anno.UNLOCKED
+ anno = _unlock_anno(anno)
dbm.add(anno)
c_imgs += 1
for anno in dbm.get_locked_two_d_annos(anno_task_id):
- anno.state = state.Anno.UNLOCKED
+ anno = _unlock_anno(anno)
dbm.add(anno)
c_2dannos += 1
dbm.commit()
@@ -83,13 +90,13 @@ def release_annos_by_timeout(dbm, timeout):
for anno in dbm.get_locked_img_annos(anno_task.idx):
if anno.timestamp_lock is not None:
if anno.timestamp_lock < unlock_time:
- anno.state = state.Anno.UNLOCKED
+ anno = _unlock_anno(anno)
dbm.add(anno)
c_imgs += 1
for anno in dbm.get_locked_two_d_annos(anno_task.idx):
if anno.timestamp_lock is not None:
if anno.timestamp_lock < unlock_time:
- anno.state = state.Anno.UNLOCKED
+ anno = _unlock_anno(anno)
dbm.add(anno)
c_2dannos += 1
dbm.commit()
@@ -112,7 +119,7 @@ def release_user_annos(dbm, user_id):
locked_user_annos = [anno for anno in locked_annos if anno.user_id == user_id]
# print(locked_user_annos)
for anno in locked_user_annos:
- anno.state = state.Anno.UNLOCKED
+ anno = _unlock_anno(anno)
dbm.add(anno)
locked_annos = dbm.get_locked_two_d_annos(anno_task.idx)
@@ -123,7 +130,7 @@ def release_user_annos(dbm, user_id):
locked_user_annos = [anno for anno in locked_annos if anno.user_id == user_id]
# print(locked_user_annos)
for anno in locked_user_annos:
- anno.state = state.Anno.UNLOCKED
+ anno = _unlock_anno(anno)
dbm.add(anno)
dbm.commit()
| 12 |
diff --git a/includes/Modules/Search_Console.php b/includes/Modules/Search_Console.php @@ -399,7 +399,7 @@ final class Search_Console extends Module implements Module_With_Screen, Module_
// Go thru results, any impressions means the URL has data.
foreach ( $responses['sc-site-analytics'] as $key => $response ) {
- if ( is_wp_error( $response ) || empty( $response ) || ! isset( $response ) ) {
+ if ( is_wp_error( $response ) || empty( $response ) || ! isset( $response->impressions ) ) {
continue;
}
| 1 |
diff --git a/conf/evolutions/default/129.sql b/conf/evolutions/default/129.sql @@ -24,7 +24,6 @@ WHERE tag.label_type_id = label_type.label_type_id
-- Delete everything else that can be associated with the labels created with the label types we remove here.
TRUNCATE TABLE global_clustering_session CASCADE;
TRUNCATE TABLE user_clustering_session CASCADE;
-TRUNCATE TABLE user_stat;
DELETE FROM validation_task_comment
USING mission, label_type
| 1 |
diff --git a/auth.js b/auth.js const inflight = require('inflight')
const google = require('googleapis')
-
-const auth = require('./.auth.json')
+const auth = require(process.env.AUTH_PATH || './.auth.json')
let authClient = null
// only public method, returns the authClient that can be used for making other requests
| 11 |
diff --git a/assets/js/modules/analytics/components/dashboard/AnalyticsAdSenseDashboardWidgetTopPagesTable.js b/assets/js/modules/analytics/components/dashboard/AnalyticsAdSenseDashboardWidgetTopPagesTable.js * limitations under the License.
*/
-/**
- * External dependencies
- */
-import { map } from 'lodash';
-
/**
* WordPress dependencies
*/
@@ -34,40 +29,15 @@ import { getTimeInSeconds, numberFormat, getModulesData } from '../../../../util
import withData from '../../../../components/higherorder/withdata';
import { TYPE_MODULES } from '../../../../components/data';
import { getDataTableFromData, TableOverflowContainer } from '../../../../components/data-table';
-import Layout from '../../../../components/layout/layout';
import PreviewTable from '../../../../components/preview-table';
import ctaWrapper from '../../../../components/notifications/cta-wrapper';
import AdSenseLinkCTA from '../common/AdSenseLinkCTA';
import { analyticsAdsenseReportDataDefaults, isDataZeroForReporting } from '../../util';
import { STORE_NAME } from '../../datastore/constants';
-import { STORE_NAME as ADSENSE_STORE } from '../../../adsense/datastore/constants';
-import { STORE_NAME as SEARCH_CONSOLE_STORE } from '../../../search-console/datastore/constants';
+import AnalyticsAdSenseDashboardWidgetLayout from './AnalyticsAdSenseDashboardWidgetLayout';
const { useSelect } = Data;
-const RenderLayout = ( { children } ) => {
- const adSenseAccountID = useSelect( ( select ) => select( ADSENSE_STORE ).getAccountID() );
- const propertyURL = useSelect( ( select ) => select( SEARCH_CONSOLE_STORE ).getPropertyID() );
- const accountURL = useSelect( ( select ) => select( ADSENSE_STORE ).getServiceURL(
- {
- path: `/${ adSenseAccountID }/home`,
- query: {
- source: 'site-kit',
- url: propertyURL,
- },
- }
- ) );
- return (
- <Layout
- header
- title={ __( 'Performance over previous 28 days', 'google-site-kit' ) }
- headerCtaLabel={ __( 'Advanced Settings', 'google-site-kit' ) }
- headerCtaLink={ accountURL }>
- { children }
- </Layout>
- );
-};
-
const AnalyticsAdSenseDashboardWidgetTopPagesTable = ( { data } ) => {
const accountID = useSelect( ( select ) => select( STORE_NAME ).getAccountID() );
const profileID = useSelect( ( select ) => select( STORE_NAME ).getProfileID() );
@@ -102,7 +72,7 @@ const AnalyticsAdSenseDashboardWidgetTopPagesTable = ( { data } ) => {
},
];
- const dataMapped = map( data[ 0 ].data.rows, ( row ) => {
+ const dataMapped = data[ 0 ].data.rows.map( ( row ) => {
/**
* dimensions[0] = ga:pageTitle
* dimensions[1] = ga:pagePath
@@ -119,7 +89,7 @@ const AnalyticsAdSenseDashboardWidgetTopPagesTable = ( { data } ) => {
];
} );
- const linksMapped = map( data[ 0 ].data.rows, ( row ) => {
+ const linksMapped = data[ 0 ].data.rows.map( ( row ) => {
const pagePath = row.dimensions[ 1 ].replace( /\//g, '~2F' );
return adsenseDeepLink + pagePath;
} );
@@ -133,11 +103,11 @@ const AnalyticsAdSenseDashboardWidgetTopPagesTable = ( { data } ) => {
const dataTable = getDataTableFromData( dataMapped, headers, options );
return (
- <RenderLayout>
+ <AnalyticsAdSenseDashboardWidgetLayout>
<TableOverflowContainer>
{ dataTable }
</TableOverflowContainer>
- </RenderLayout>
+ </AnalyticsAdSenseDashboardWidgetLayout>
);
};
@@ -156,7 +126,7 @@ const getDataError = ( data ) => {
if ( data.code && data.message && data.data && data.data.status ) {
// Specifically looking for string "badRequest"
if ( 'badRequest' === data.data.reason ) {
- return <RenderLayout>{ ctaWrapper( <AdSenseLinkCTA />, false, false, true ) }</RenderLayout>;
+ return <AnalyticsAdSenseDashboardWidgetLayout>{ ctaWrapper( <AdSenseLinkCTA />, false, false, true ) }</AnalyticsAdSenseDashboardWidgetLayout>;
}
return data.message;
@@ -196,7 +166,7 @@ export default withData(
context: 'Single',
},
],
- <RenderLayout><PreviewTable padding /></RenderLayout>,
+ <AnalyticsAdSenseDashboardWidgetLayout><PreviewTable padding /></AnalyticsAdSenseDashboardWidgetLayout>,
{ createGrid: true },
// Force isDataZero to false since it is handled within the component.
() => false,
| 2 |
diff --git a/outbound/client_pool.js b/outbound/client_pool.js @@ -30,11 +30,11 @@ function _create_socket (port, host, local_addr, is_unix_socket, callback) {
if (server.notes.pool && server.notes.pool[name]) {
delete server.notes.pool[name];
}
- callback("Outbound connection error: " + err, null);
+ callback(`Outbound connection error: ${err}`, null);
});
socket.once('timeout', function () {
socket.end();
- callback("Outbound connection timed out to " + host + ":" + port, null);
+ callback(`Outbound connection timed out to ${host}:${port}`, null);
});
}
@@ -56,7 +56,7 @@ function get_pool (port, host, local_addr, is_unix_socket, max) {
return socket.writable;
},
destroy: function (socket) {
- logger.logdebug('[outbound] destroying pool entry for ' + host + ':' + port);
+ logger.logdebug(`[outbound] destroying pool entry for ${host}:${port}`);
// Remove pool object from server notes once empty
const size = pool.getPoolSize();
if (size === 0) {
@@ -64,7 +64,7 @@ function get_pool (port, host, local_addr, is_unix_socket, max) {
}
socket.removeAllListeners();
socket.once('error', function (err) {
- logger.logwarn("[outbound] Socket got an error while shutting down: " + err);
+ logger.logwarn(`[outbound] Socket got an error while shutting down: ${err}`);
});
socket.once('end', function () {
logger.loginfo("[outbound] Remote end half closed during destroy()");
@@ -76,7 +76,7 @@ function get_pool (port, host, local_addr, is_unix_socket, max) {
socket.end(); // half close
socket.once('line', function (line) {
// Just assume this is a valid response
- logger.logprotocol("[outbound] S: " + line);
+ logger.logprotocol(`[outbound] S: ${line}`);
socket.destroy();
});
},
@@ -85,7 +85,7 @@ function get_pool (port, host, local_addr, is_unix_socket, max) {
log: function (str, level) {
if (/this._availableObjects.length=/.test(str)) return;
level = (level === 'verbose') ? 'debug' : level;
- logger['log' + level]('[outbound] [' + name + '] ' + str);
+ logger[`log${level}`](`[outbound] [${name}] ${str}`);
}
});
server.notes.pool[name] = pool;
@@ -111,7 +111,7 @@ exports.get_client = function (port, host, local_addr, is_unix_socket, callback)
}
exports.release_client = function (socket, port, host, local_addr, error) {
- logger.logdebug("[outbound] release_client: " + host + ":" + port + " to " + local_addr);
+ logger.logdebug(`[outbound] release_client: ${host}:${port} to ${local_addr}`);
const pool_timeout = cfg.pool_timeout;
const name = `outbound::${port}:${host}:${local_addr}:${pool_timeout}`;
@@ -121,18 +121,18 @@ exports.release_client = function (socket, port, host, local_addr, error) {
}
if (!socket.__acquired) {
- logger.logerror("Release an un-acquired socket. Stack: " + (new Error()).stack);
+ logger.logerror(`Release an un-acquired socket. Stack: ${(new Error()).stack}`);
return;
}
socket.__acquired = false;
if (!(server.notes && server.notes.pool)) {
- logger.logcrit("[outbound] Releasing a pool (" + name + ") that doesn't exist!");
+ logger.logcrit(`[outbound] Releasing a pool (${name}) that doesn't exist!`);
return;
}
const pool = server.notes.pool[name];
if (!pool) {
- logger.logcrit("[outbound] Releasing a pool (" + name + ") that doesn't exist!");
+ logger.logcrit(`[outbound] Releasing a pool (${name}) that doesn't exist!`);
return;
}
@@ -154,12 +154,12 @@ exports.release_client = function (socket, port, host, local_addr, error) {
socket.__fromPool = true;
socket.once('error', function (err) {
- logger.logwarn("[outbound] Socket [" + name + "] in pool got an error: " + err);
+ logger.logwarn(`[outbound] Socket [${name}] in pool got an error: ${err}`);
sockend();
});
socket.once('end', function () {
- logger.logwarn("[outbound] Socket [" + name + "] in pool got FIN");
+ logger.logwarn(`[outbound] Socket [${name}] in pool got FIN`);
socket.writable = false;
sockend();
});
@@ -180,7 +180,7 @@ exports.drain_pools = function () {
return logger.logdebug("[outbound] Drain pools: No pools available");
}
Object.keys(server.notes.pool).forEach(function (p) {
- logger.logdebug("[outbound] Drain pools: Draining SMTP connection pool " + p);
+ logger.logdebug(`[outbound] Drain pools: Draining SMTP connection pool ${p}`);
server.notes.pool[p].drain(function () {
if (!server.notes.pool[p]) return;
server.notes.pool[p].destroyAllNow();
| 14 |
diff --git a/test/jasmine/tests/waterfall_test.js b/test/jasmine/tests/waterfall_test.js @@ -993,6 +993,38 @@ describe('A waterfall plot', function() {
.then(done);
});
+ it('should be able to add/remove connector nodes on restyle', function(done) {
+ function _assertNumberOfWaterfallConnectorNodes(cnt) {
+ var sel = d3.select(gd).select('.waterfalllayer').selectAll('.line');
+ expect(sel.size()).toBe(cnt);
+ }
+
+ Plotly.plot(gd, [{
+ type: 'waterfall',
+ x: ['Initial', 'A', 'B', 'C', 'Total'],
+ y: [10, 2, 3, 5],
+ measure: ['absolute', 'relative', 'relative', 'relative', 'total'],
+ connector: { visible: false }
+ }])
+ .then(function() {
+ _assertNumberOfWaterfallConnectorNodes(0);
+ return Plotly.restyle(gd, 'connector.visible', true);
+ })
+ .then(function() {
+ _assertNumberOfWaterfallConnectorNodes(4);
+ return Plotly.restyle(gd, 'connector.visible', false);
+ })
+ .then(function() {
+ _assertNumberOfWaterfallConnectorNodes(0);
+ return Plotly.restyle(gd, 'connector.visible', true);
+ })
+ .then(function() {
+ _assertNumberOfWaterfallConnectorNodes(4);
+ })
+ .catch(failTest)
+ .then(done);
+ });
+
it('should coerce text-related attributes', function(done) {
var data = [{
y: [10, 20, 30, 40],
| 0 |
diff --git a/demo/views/pages/home/home.js b/demo/views/pages/home/home.js import React from 'react';
-import Sectioniser from './sectioniser';
-import styled from 'styled-components';
-import { ScrollableList, ScrollableItemWrapper, ScrollableListItem } from '../../../../src/components/scrollable-list';
+import AlertBanner from './alert-banner';
+import ComponentShowcase from './component-showcase';
+import GetStarted from './get-started';
+import PageHeaderLarge from '../../common/page-header-large';
+import SageLovesCarbon from './sage-loves-carbon';
+import SellingPoints from './selling-points';
+import Sectioniser from './sectioniser';
+import Wrapper from './../../common/wrapper';
import './demo-site.scss';
-const Divider = ({ background }) => <div style={ { height: '100%', width: '100%', background } }>divider</div>;
-const MiniApp = () => {
- return (
- <div style={ { display: 'flex' } }>
- <h2>Mini App</h2>
- <button>Increment - </button>
- <button>Decrement + </button>
- </div>
- )
-}
-
-const CustomItem = styled.div`
- background: ${({isSelected}) => isSelected && `rgba(40, 250, 20, 0.8)`};
-`;
-
-
class Home extends React.Component {
/**
* @method render
*/
render() {
return (
- <div style={{ height: '400px', width: '500px'}}>
- <ScrollableList
- onLazyLoad={() => console.log('lazy load now')}
- onSelect={(id) => console.log(id, 'SELECTED')}
- keyNavigation
+ <Sectioniser
+ minDepth='0'
+ maxDepth='0'
>
- <div style={{ color: 'white', display: 'flex', alignItems: 'center', justifyContent: 'center', background: 'rgba(40, 40, 250, 0.5)'}}>This header should not be selectable:</div>
- {/* <ScrollableListItem >sub 0</ScrollableListItem>
- <div>--- nor should this div be ---</div>
- <ScrollableListItem >sub 3</ScrollableListItem>
- <ScrollableListItem >sub 4</ScrollableListItem>
- <div>--- nor should this div be ---</div>
- <ScrollableListItem >sub 3</ScrollableListItem>
- <ScrollableListItem >sub 4</ScrollableListItem>
- <div>--- nor should this div be ---</div>
- <CustomItem isSelectable>Style changes on select</CustomItem>
- <ScrollableListItem >sub 3</ScrollableListItem>
- <ScrollableListItem >sub 4</ScrollableListItem>
- <div>--- nor should this div be ---</div>
- <ScrollableListItem >sub 3</ScrollableListItem>
- <MiniApp />
- <ScrollableListItem >sub 4</ScrollableListItem>
- <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', background: 'rgba(240, 40, 250, 0.5)'}}>This footer should not be selectable:</div> */}
- </ScrollableList>
- </div>
-
+ <AlertBanner />
+ <PageHeaderLarge />
+ <ComponentShowcase />
+ <SellingPoints />
+ <SageLovesCarbon />
+ <GetStarted />
+ </Sectioniser>
);
}
}
| 13 |
diff --git a/src/ace/AceTooltips.hx b/src/ace/AceTooltips.hx @@ -55,6 +55,18 @@ class AceTooltips {
}
}
}
+ inline function calcRow(row:Int) {
+ var showRow = row;
+ var startRow = row + 1;
+ var checkRx = GmlAPI.scopeResetRx;
+ if (GmlExternAPI.gmlResetOnDefine) while (--startRow > 0) {
+ if (checkRx.test(session.getLine(startRow))) {
+ showRow -= startRow + 1;
+ break;
+ }
+ }
+ return showRow;
+ }
if (doc == null) switch (t) {
case "enumfield": {
var iter = new AceTokenIterator(session, pos.row, pos.column);
@@ -142,7 +154,7 @@ class AceTooltips {
case "curly.paren.rparen": depth++;
case "curly.paren.lparen": if (--depth <= 0) {
var row = iter.getCurrentTokenRow();
- r = "Closes line " + (row + 1) + ": ";
+ r = "Closes line " + (calcRow(row) + 1) + ": ";
var rowText = session.getLine(row);
while (row > 0 && rowText.trimBoth().length <= 1) rowText = session.getLine(--row);
r += rowText;
@@ -161,9 +173,12 @@ class AceTooltips {
case "curly.paren.lparen": depth++;
case "curly.paren.rparen": if (--depth <= 0) {
var row = iter.getCurrentTokenRow();
- r = "Spans until line " + (row + 1);
+ r = "Spans until line " + (calcRow(row) + 1);
var rowText = session.getLine(row);
- while (rowText != null && rowText.trimBoth().length <= 1) rowText = session.getLine(++row);
+ var len = session.getLength();
+ while (rowText != null && row < len && rowText.trimBoth().length <= 1) {
+ rowText = session.getLine(++row);
+ }
if (rowText != null) r += ": " + rowText;
break;
};
| 1 |
diff --git a/src/intrinsics/DatePrototype.mjs b/src/intrinsics/DatePrototype.mjs @@ -496,10 +496,10 @@ function DateProto_toUTCString(args, { thisValue }) {
if (tv.isNaN()) {
return new Value('Invalid Date');
}
- const weekday = daysOfTheWeek[WeekDay(tv)];
- const month = monthsOfTheYear[MonthFromTime(tv)];
- const day = String(DateFromTime(tv)).padStart(2, '0');
- const year = String(YearFromTime(tv)).padStart(4, '0');
+ const weekday = daysOfTheWeek[WeekDay(tv).numberValue()];
+ const month = monthsOfTheYear[MonthFromTime(tv).numberValue()];
+ const day = String(DateFromTime(tv).numberValue()).padStart(2, '0');
+ const year = String(YearFromTime(tv).numberValue()).padStart(4, '0');
return new Value(`${weekday}, ${day} ${month} ${year} ${TimeString(tv).stringValue()}`);
}
| 1 |
diff --git a/src/framework/components/script/component.js b/src/framework/components/script/component.js @@ -408,7 +408,7 @@ pc.extend(pc, function () {
}
// remove swap event
- this.system.app.scripts.unbind('swap:' + scriptName, scriptData.onSwap);
+ this.system.app.scripts.off('swap:' + scriptName, scriptData.onSwap);
delete this._scriptsIndex[scriptName];
delete this[scriptName];
| 14 |
diff --git a/_data/conferences.yml b/_data/conferences.yml sub: CV
- title: ISMIR
- year: 2019
- id: ismir19
- link: http://ismir2019.ewi.tudelft.nl/
- deadline: '2019-04-05 23:59:59'
+ year: 2020
+ id: ismir20
+ link: https://ismir.github.io/ISMIR2020/
+ deadline: '2020-04-17 23:59:59'
timezone: UTC-12
- date: November 4-8, 2019
- place: Delft, The Netherlands
+ date: October 12-15, 2020
+ place: Montreal, Canada
sub: SP
+ note: '<b>NOTE</b>: Mandatory abstract deadline on Apr 10, 2020. More info <a href=''https://ismir.github.io/ISMIR2020/cfp/''>here</a>.'
+
- title: BMVC
year: 2019
| 3 |
diff --git a/lib/peg.d.ts b/lib/peg.d.ts // Based on PEG.js Type Definitions by: vvakame <https://github.com/vvakame>, Tobias Kahlert <https://github.com/SrTobi>, C.J. Bell <https://github.com/siegebell>
-export namespace parser {
- function parse(input: string): any;
-
- interface Location {
- line: number;
- column: number;
- offset: number;
- }
-
- interface LocationRange {
- /** Any object that was supplied to the `parse()` call as the `grammarSource` option. */
- source: any;
- start: Location;
- end: Location;
- }
-
- class SyntaxError {
- location: LocationRange;
- expected: any[];
- found: any;
- name: string;
- message: string;
- }
-}
-
-export type Location = parser.Location;
-export type LocationRange = parser.LocationRange;
-
-export interface ExpectedItem {
- type: string;
- value?: string;
- description: string;
-}
+/** Current Peggy version in semver format. */
+export const VERSION: string;
/**
* The entry that maps object in the `source` property of error locations
@@ -99,6 +68,40 @@ export type PegjsError = PeggyError;
export type GrammarError = PeggyError;
export var GrammarError: any;
+export namespace parser {
+ function parse(input: string): any;
+
+ interface Location {
+ line: number;
+ column: number;
+ offset: number;
+ }
+
+ interface LocationRange {
+ /** Any object that was supplied to the `parse()` call as the `grammarSource` option. */
+ source: any;
+ start: Location;
+ end: Location;
+ }
+
+ class SyntaxError {
+ name: string;
+ message: string;
+ location: LocationRange;
+ expected: any[];
+ found: any;
+ }
+}
+
+export type Location = parser.Location;
+export type LocationRange = parser.LocationRange;
+
+export interface ExpectedItem {
+ type: string;
+ value?: string;
+ description: string;
+}
+
export interface ParserOptions {
/**
* Object that will be attached to the each `LocationRange` object created by
@@ -207,7 +210,5 @@ export function generate(grammar: string, options: OutputFormatGlobals): string;
/** Returns the generated source code as a `string`. It will throw an exception if the grammar is invalid. The exception will contain `message` property with more details about the error. */
export function generate(grammar: string, options: OutputFormatBare): string;
-export const VERSION: string;
-
// Export all exported stuff under a global variable PEG in non-module environments
export as namespace PEG;
| 5 |
diff --git a/test/e2e/create-account.spec.js b/test/e2e/create-account.spec.js @@ -17,16 +17,7 @@ afterAll(async () => {
await browser.close()
})
-test('Restores an account with backup codes', async () => {
- //click "Add Account"
- await page.waitForSelector('button')
- await page.click('button')
-
- //click "Use an Existing Address"
- await page.waitForSelector("a[href='#/existing']")
- await page.waitFor(300)
- await page.click("a[href='#/existing']")
-
+test('Restores an account with backup code when has no accounts', async () => {
//click "Recover with backup code"
await page.waitForSelector("a[href='#/recover']")
await page.waitFor(300)
@@ -54,6 +45,9 @@ test('Restores an account with backup codes', async () => {
)
await page.click('div.session-footer')
+ const accountRenders = await page.$eval('h3', el => el.textContent)
+ expect(accountRenders).toEqual(signupData.name)
+
//needs better check once account is accessible
expect(await page.$('body')).toBeTruthy()
})
| 3 |
diff --git a/python/ccxtpro/base/fast_client.py b/python/ccxtpro/base/fast_client.py @@ -14,17 +14,20 @@ class FastClient(AiohttpClient):
# instead of using the deque in aiohttp we implement our own for speed
# https://github.com/aio-libs/aiohttp/blob/1d296d549050aa335ef542421b8b7dad788246d5/aiohttp/streams.py#L534
self.stack = collections.deque()
+ self.callback_scheduled = False
def receive_loop(self):
def handler():
if not self.stack:
+ self.callback_scheduled = False
return
message = self.stack.popleft()
self.handle_message(message)
self.asyncio_loop.call_soon(handler)
def feed_data(message, size):
- if not self.stack:
+ if not self.callback_scheduled:
+ self.callback_scheduled = True
self.asyncio_loop.call_soon(handler)
self.stack.append(message)
| 1 |
diff --git a/test/runtests.cmd b/test/runtests.cmd @echo off
setlocal
+rem <repo root>\test\
+set script_dir=%~dp0
+
+rem remove trailing \
+set script_dir=%script_dir:~,-1%
+
goto :main
:: ============================================================================
@@ -75,9 +81,8 @@ goto :main
:: ============================================================================
:main
- if not exist %cd%\rlexedirs.xml (
- echo Error: rlexedirs.xml not found in current directory.
- echo runtests.cmd must be run from a test root directory containing rlexedirs.xml.
+ if not exist %script_dir%\rlexedirs.xml (
+ echo Error: rlexedirs.xml not found in %script_dir% directory.
exit /b 1
)
@@ -98,7 +103,9 @@ goto :main
call :configureVars
- set _logsRoot=%cd%\logs
+ pushd %script_dir%
+
+ set _logsRoot=%script_dir%\logs
call :doSilent del /s /q profile.dpl.*
for %%i in (%_Variants%) do (
@@ -108,6 +115,8 @@ goto :main
call :cleanUp
+ popd
+
for %%i in (%_Variants%) do (
echo.
echo ######## Logs for %%i variant ########
@@ -469,7 +478,7 @@ goto :main
set _rlArgs=%_rlArgs% %EXTRA_RL_FLAGS%
set _rlArgs=%_rlArgs% %_rebase%
- set REGRESS=%CD%
+ set REGRESS=%script_dir%
call :do rl %_rlArgs%
if %ERRORLEVEL% NEQ 0 set _HadFailures=1
| 11 |
diff --git a/angular/projects/spark-angular/src/lib/interfaces/sprk-big-nav-link.interface.ts b/angular/projects/spark-angular/src/lib/interfaces/sprk-big-nav-link.interface.ts +import { ISprkLink } from './sprk-link.interface';
/**
* Used to create the "Big Navigation"
- * in the extended variant of the masthead.
- * Data is used to create `<li>` elements
- * inside of a `<ul>` that has a parent
- * `<nav>` element.
+ * in the extended variant of the Masthead.
*/
-export interface ISprkBigNavLink {
- /**
- * The text for the link.
- */
- text: string;
- /**
- * The `href` value for the link if it does not
- * have a `subNav`. If it has a `subNav`, then
- * the link is treated as a trigger that opens
- * the `subNav` and it doesnt navigate the user
- * anywhere. Therefore, this is optional as it is
- * only needed in cases where there is no `subNav`.
- */
- href?: string;
+export interface ISprkBigNavLink extends ISprkLink {
/**
* If this is `true` and the link has a `subNav`
* then the link will
| 3 |
diff --git a/articles/libraries/lock/v10/auth0js.md b/articles/libraries/lock/v10/auth0js.md @@ -9,11 +9,17 @@ description: How to use Lock V10 with auth0.js
If you try to use `auth0.js` along with Lock 10, you will not be able to call `getClient()`. Instead, you should include its dependency and instantiate an `Auth0` object.
-If you included the script from the Auth0 CDN, you will need to also include the auth0.js one before Lock:
+In the past, a version of auth0.js was included automatically with Lock; at this point, you must include auth0.js yourself, allowing you to choose the version of auth0.js that best suits the needs of your application.
+
+## Using auth0.js v8
+
+### Including auth0.js
+
+If you included the Lock script from the Auth0 CDN, you will need to also include the auth0.js script before Lock:
```html
-<script src="http://cdn.auth0.com/js/auth0/8.0.0/auth0.min.js"></script>
-<script src="http://cdn.auth0.com/js/lock/10.9.0/lock.min.js"></script>
+<script src="https://cdn.auth0.com/js/auth0/8.0.0/auth0.min.js"></script>
+<script src="https://cdn.auth0.com/js/lock/10.9.0/lock.min.js"></script>
```
If you installed Lock from npm, you must include `auth0-js` in your project dependencies and import it. Before instantiating the `Auth0` object, you will need to require `auth0-js`:
@@ -22,6 +28,38 @@ If you installed Lock from npm, you must include `auth0-js` in your project depe
var Auth0 = require('auth0-js');
```
+### Initiating auth0.js
+
+Then, to use `auth0.js`, simply instantiate a new `Auth0` object:
+
+```js
+var auth0 = new auth0.WebAuth({
+ domain: "${account.namespace}",
+ clientID: "${account.clientId}"
+});
+```
+
+If you need further detail about usage, check out the [Auth0.js v8 Reference](/libraries/auth0js).
+
+## Using auth0.js v7
+
+### Including auth0.js
+
+If you included the Lock script from the Auth0 CDN, you will need to also include the auth0.js script before Lock:
+
+```html
+<script src="https://cdn.auth0.com/w2/auth0-7.6.1.min.js"></script>
+<script src="https://cdn.auth0.com/js/lock/10.9.0/lock.min.js"></script>
+```
+
+If you installed Lock from npm, you must include `auth0-js` in your project dependencies and import it. Before instantiating the `Auth0` object, you will need to require `auth0-js`:
+
+```js
+var Auth0 = require('auth0-js');
+```
+
+### Initiating auth0.js
+
Then, to use `auth0.js`, simply instantiate a new `Auth0` object:
```js
@@ -33,4 +71,6 @@ var client = new Auth0({
});
```
+If you need further detail about usage, check out the [Auth0.js v7 Reference](/libraries/auth0js/v7).
+
<%= include('../_includes/_lock-toc') %>
| 3 |
diff --git a/labs/webapps.md b/labs/webapps.md @@ -91,11 +91,12 @@ If you are in the Cloud Shell then `cat index.html` will display the raw html.
Run the following command to create the deployment user:
-```
+```bash
az webapp deployment user set --user-name $user --password $pwd
```
-* You will be prompted to make your username or password more unique if you have chosen one that is too common, although the error is a basic 400 decline HTTP error
+* If you have changed the password from the example above, and is too simple or common then you may see a basic 400 decline HTTP error
+ * If that happens then you can change the password to something more complex and obscure and retry
* The deployment user is the equivalent of a service account so that Git can authenticate to Azure and deploy to it
**3. Create the resource group**
| 7 |
diff --git a/website/editor/src/components/ImageSearcher.vue b/website/editor/src/components/ImageSearcher.vue @@ -65,7 +65,10 @@ export default {
close() {
this.show = false
},
- handleEscKey() {
+ handleEscKey(event) {
+ if (event.key !== "Escape") {
+ return
+ }
this.$nextTick(() => {
if (this.state.openedPopups[this.state.openedPopups.length - 1] === this.popupId) {
document.removeEventListener('keydown', this.handleEscKey)
| 8 |
diff --git a/packages/terra-button/docs/README.md b/packages/terra-button/docs/README.md @@ -4,6 +4,8 @@ The button component provides users a way to trigger actions in the UI.
It can be modified in color and type, and can optionally display an icon.
Submit a request if additional variants not provided are needed.
+The `action` variant is intended for specific solutions in which a non-inline floating button sits above the page content in a fixed position.
+
## Getting Started
- Install with [npmjs](https://www.npmjs.com):
| 7 |
diff --git a/lib/node_modules/@stdlib/_tools/remark/plugins/remark-run-javascript-examples/lib/transformer.js b/lib/node_modules/@stdlib/_tools/remark/plugins/remark-run-javascript-examples/lib/transformer.js @@ -178,7 +178,8 @@ function factory( options ) {
// Set the working directory of the script to the file directory:
opts = {
- 'cwd': dir
+ 'cwd': dir,
+ 'maxBuffer': options.maxBuffer
};
debug( 'Executing code block...' );
| 12 |
diff --git a/webpack.dev.js b/webpack.dev.js @@ -53,7 +53,7 @@ module.exports = merge.smart(require('./webpack.base.js'), {
disable: true,
}),
],
- devtool: 'cheap-module-source-map',
+ devtool: 'source-map',
devServer: {
hot: true,
contentBase: 'example/',
| 4 |
diff --git a/contracts/Havven.sol b/contracts/Havven.sol @@ -437,7 +437,7 @@ contract Havven is DestructibleExternStateToken {
/* Only allow accounts to withdraw fees once per period. */
require(!hasWithdrawnFees[sender]);
- uint feesOwed = 0;
+ uint feesOwed;
uint lastTotalIssued = totalIssuanceData.lastAverageBalance;
| 2 |
diff --git a/src/components/tab/QRouteTab.js b/src/components/tab/QRouteTab.js @@ -22,6 +22,9 @@ export default {
if (this.$el.classList.contains('router-link-active') || this.$el.classList.contains('router-link-exact-active')) {
this.selectTab(this.name)
}
+ else if (this.data.tabName === this.name) {
+ this.selectTab('')
+ }
})
}
},
| 2 |
diff --git a/lore-ai.js b/lore-ai.js @@ -14,7 +14,7 @@ const characterLore = `\
AI anime avatars in a virtual world. They have human-level intelligence and unique and interesting personalities.
`;
-const _makeChatPrompt = (setting, characters, messages, dstCharacter) => `\
+const _makeChatPrompt = (setting, characters, objects, messages, dstCharacter) => `\
${characterLore}
Script examples:
@@ -156,8 +156,10 @@ class AICharacter extends EventTarget {
class AIScene {
constructor(localPlayer, {
setting = defaultSetting,
+ objects = [],
} = {}) {
this.setting = setting;
+ this.objects = objects;
this.localCharacter = new AICharacter(localPlayer.name, localPlayer.bio);
this.characters = [
this.localCharacter,
@@ -291,6 +293,7 @@ class AIScene {
this.setting,
this.characters,
this.messages,
+ this.objects,
dstCharacter
);
/* console.log('generate prompt', prompt, [
| 0 |
diff --git a/src/encoded/schemas/human_donor.json b/src/encoded/schemas/human_donor.json }
}
]
+ },
+ "twin_type": {
+ "comment": "Twin type could be specified only if twin sibling is specified.",
+ "required": ["twin"]
}
-
},
"properties": {
"schema_version": {
| 0 |
diff --git a/templates/master/examples/py/Next.py b/templates/master/examples/py/Next.py @@ -83,6 +83,6 @@ def updateResult(event, response):
if len(tempList) > 10:
#setting limit to 10 elements in previous stack since ,since lex has a max header size and we want to save that for other functions, same max size is set in the query lambda
tempList.pop(0)
- event["res"]["session"]["previous"] ={"qid":response["qid"],"a":stringToJson["a"],"q":stringToJson["q"],"next":response["next"],"previous":tempList}
+ event["res"]["session"]["previous"] ={"qid":response["qid"],"a":stringToJson["a"],"q":stringToJson["q"],"next":response.get("next",""),"previous":tempList}
return event
| 1 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -43,7 +43,6 @@ const { createRegistrySelector, createRegistryControl } = Data;
// Actions.
const REFETCH_AUTHENTICATION = 'REFETCH_AUTHENTICATION';
const REGISTER_MODULE = 'REGISTER_MODULE';
-const WAIT_FOR_MODULES = 'WAIT_FOR_MODULES';
const moduleDefaults = {
name: '',
@@ -112,19 +111,6 @@ const BASE_INITIAL_STATE = {
};
const baseActions = {
- /**
- * Wait for the modules to be loaded
- *
- * @since 1.13.0
- *
- * @return {Object} Redux-style action.
- */
- waitForModules() {
- return {
- payload: {},
- type: WAIT_FOR_MODULES,
- };
- },
/**
* Activates a module on the server.
*
@@ -235,23 +221,6 @@ export const baseControls = {
[ REFETCH_AUTHENTICATION ]: createRegistryControl( ( { dispatch } ) => () => {
return dispatch( CORE_USER ).fetchGetAuthentication();
} ),
- [ WAIT_FOR_MODULES ]: createRegistryControl( ( registry ) => ( { payload: {} } ) => {
- // Select first to ensure resolution is always triggered.
- const { getModules, hasFinishedResolution } = registry.select( STORE_NAME );
- getModules();
- const modulesAreLoaded = () => hasFinishedResolution( 'getModules', [] );
- if ( modulesAreLoaded() ) {
- return;
- }
- return new Promise( ( resolve ) => {
- const unsubscribe = registry.subscribe( () => {
- if ( modulesAreLoaded() ) {
- unsubscribe();
- resolve();
- }
- } );
- } );
- } ),
};
const baseReducer = ( state, { type, payload } ) => {
| 2 |
diff --git a/assets/js/googlesitekit/data/create-fetch-infrastructure.js b/assets/js/googlesitekit/data/create-fetch-infrastructure.js @@ -135,7 +135,14 @@ export const createFetchInfrastructure = ( {
[ receiveCreator ]: function( response, params ) { // eslint-disable-line object-shorthand
invariant( 'undefined' !== typeof response, 'response is required.' );
+
+ // If params are required, ensure they are passed, otherwise use
+ // default empty object.
+ if ( Object.keys( keyParams ).length ) {
invariant( 'object' === typeof params, 'params is required.' );
+ } else {
+ params = {};
+ }
return {
payload: { response, params },
| 7 |
diff --git a/src/browser/PluginMap.js b/src/browser/PluginMap.js +
var utils = require('cordova/utils'),
event = require('cordova-plugin-googlemaps.event'),
BaseClass = require('cordova-plugin-googlemaps.BaseClass'),
@@ -432,10 +433,29 @@ PluginMap.prototype.animateCamera = function(onSuccess, onError, args) {
});
map.fitBounds(bounds, padding);
} else {
- if (typeof options.zoom === 'number') {
+ var zoomFlag = typeof options.zoom === 'number';
+ var targetFlag = !!options.target;
+
+ if (zoomFlag && targetFlag) {
+ var projection = map.getProjection();
+ var centerLatLng = new google.maps.LatLng(options.target.lat, options.target.lng, true);
+ var centerPoint = projection.fromLatLngToPoint(centerLatLng);
+
+ var scale = Math.pow(2, options.zoom);
+
+ var div = map.getDiv();
+ var harfWidth = div.offsetWidth / 2;
+ var harfHeight = div.offsetHeight / 2;
+ var swPoint = new google.maps.Point((centerPoint.x * scale - harfWidth) / scale, (centerPoint.y * scale + harfHeight) / scale );
+ var nePoint = new google.maps.Point((centerPoint.x * scale + harfWidth) / scale, (centerPoint.y * scale - harfHeight) / scale);
+ var sw = projection.fromPointToLatLng(swPoint);
+ var ne = projection.fromPointToLatLng(nePoint);
+ var bounds = new google.maps.LatLngBounds(sw, ne);
+ map.fitBounds(bounds, padding);
+
+ } else if (zoomFlag) {
map.setZoom(options.zoom);
- }
- if (options.target) {
+ } else if (targetFlag) {
map.panTo(options.target);
}
}
@@ -450,32 +470,9 @@ PluginMap.prototype.animateCamera = function(onSuccess, onError, args) {
};
PluginMap.prototype.moveCamera = function(onSuccess, onError, args) {
- var self = this;
- var map = self.get('map');
-
- var options = args[0];
- var padding = 'padding' in options ? options.padding : 5;
- if (Array.isArray(options.target)) {
- var bounds = new google.maps.LatLngBounds();
- options.target.forEach(function(pos) {
- bounds.extend(pos);
- });
- map.fitBounds(bounds, padding);
- } else {
- if (typeof options.zoom === 'number') {
- map.setZoom(options.zoom);
- }
- map.setCenter(options.target);
- }
- if (typeof options.tilt === 'number') {
- map.setTilt(options.tilt);
- }
- if (typeof options.bearing === 'number') {
- map.setHeading(options.bearing);
- }
- onSuccess();
-
+ this.animateCamera.call(this, onSuccess, onError, args);
};
+
PluginMap.prototype.setMapTypeId = function(onSuccess, onError, args) {
var self = this;
var map = self.get('map');
| 7 |
diff --git a/Documentation/Contributors/PresentersGuide/README.md b/Documentation/Contributors/PresentersGuide/README.md @@ -153,4 +153,4 @@ When presenting with a partner, strive to make it like a conversation. For a gre
- [10 tips for academic talks](http://matt.might.net/articles/academic-presentation-tips/) by Matt Might applies equally well to Cesium talks.
- [Presentation Advice](http://cs.williams.edu/~morgan/presentation-advice.pdf) by Morgan McGuire
-- [Tips for Giving Clear Talks](http://www.cs.cmu.edu/~kayvonf/misc/cleartalktips.pdf) by Kayvon Fatahalian
+- [Tips for Giving Clear Talks](https://graphics.stanford.edu/~kayvonf/misc/cleartalktips.pdf) by Kayvon Fatahalian
| 3 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -1340,6 +1340,22 @@ const bindInterface = () => {
});
});
+ {
+ const _stopPropagation = e => {
+ e.stopPropagation();
+ };
+ [
+ menu1El,
+ menu2El,
+ menu3El,
+ menu4El,
+ unmenuEl,
+ objectMenuEl,
+ ].forEach(menuEl => {
+ menuEl.addEventListener('wheel', _stopPropagation);
+ });
+ }
+
(async () => {
await loginManager.waitForLoad();
| 0 |
diff --git a/src/js/controllers/tab-scan.controller.js b/src/js/controllers/tab-scan.controller.js @@ -27,6 +27,7 @@ angular
unavailable: 'unavailable',
visible: 'visible'
};
+ var isHandlerEnable = true;
$scope.onRetry = onRetry;
$scope.scannerStates = scannerStates;
@@ -47,9 +48,13 @@ angular
});
function onResume() {
+ if (isHandlerEnable) {
$scope.$apply(function () {
startReading();
});
+ } else {
+ isHandlerEnable = true;
+ }
}
function handleSuccessfulScan(contents){
@@ -137,6 +142,7 @@ angular
$scope.currentState = scannerStates.visible;
console.log('Starting qrreader.');
+ isHandlerEnable = false;
qrReaderService.startReading().then(
function onStartReadingResolved(contents) {
handleSuccessfulScan(contents);
| 1 |
diff --git a/articles/users/search.md b/articles/users/search.md @@ -38,7 +38,7 @@ The [`GET /api/v2/users` endpoint](/api/management/v2#!/Users/get_users) allows
```har
{
"method": "GET",
- "url": "${account.namespace}/api/v2/users",
+ "url": "YOUR_AUTH0_DOMAIN/api/v2/users",
"headers": [{
"name": "Authorization",
"value": "Bearer YOUR_MGMT_API_ACCESS_TOKEN"
@@ -60,7 +60,7 @@ The [`GET /api/v2/users-by-email` endpoint](/api/management/v2#!/Users_By_Email/
```har
{
"method": "GET",
- "url": "${account.namespace}/api/v2/users-by-email?email=USER_EMAIL_ADDRESS",
+ "url": "YOUR_AUTH0_DOMAIN/api/v2/users-by-email?email=USER_EMAIL_ADDRESS",
"headers": [{
"name": "Authorization",
"value": "Bearer YOUR_MGMT_API_ACCESS_TOKEN"
@@ -92,7 +92,7 @@ When you create your job, you'll need to provide:
```har
{
"method": "POST",
- "url": "${account.namespace}/api/v2/jobs/users-exports",
+ "url": "YOUR_AUTH0_DOMAIN/api/v2/jobs/users-exports",
"httpVersion": "HTTP/1.1",
"cookies": [],
"headers": [{
| 2 |
diff --git a/README.md b/README.md @@ -12,8 +12,12 @@ This repo should help get started and keep the different projects aligned.
5. `npm test` - run tests
6. `npm run coverage` - run tests w/ coverage
-#### Next up
-[ ] Docs
-[ ] Ability to remove reference files
-[](http://waffle.io/hackoregon/hackoregon-frontend-starter)
+#### Using the [Component Library](https://github.com/hackoregon/component-library) in your project
+The component libary has been installed as a dependency from the npm build version 0.0.6 (https://www.npmjs.com/package/@hackoregon/component-library)
+
+To use a component in your project, import the component from its source in the lib folder
+Example: importing the Header compoenent from the component library
+`import Header from '@hackoregon/component-library/lib/Navigation/Header';`
+
+
| 3 |
diff --git a/desktop/sources/scripts/clock.js b/desktop/sources/scripts/clock.js @@ -59,8 +59,8 @@ function Clock (client) {
this.play = function (msg = false) {
console.log('Clock', 'Play', msg)
if (this.isPaused === false) { return }
- if (this.isPuppet === true) { console.warn('Clock', 'External Midi control'); return }
this.isPaused = false
+ if (this.isPuppet === true) { console.warn('Clock', 'External Midi control'); return }
if (msg === true) { client.io.midi.sendClockStart() }
this.setSpeed(this.speed.target, this.speed.target, true)
}
@@ -68,8 +68,8 @@ function Clock (client) {
this.stop = function (msg = false) {
console.log('Clock', 'Stop')
if (this.isPaused === true) { return }
- if (this.isPuppet === true) { console.warn('Clock', 'External Midi control'); return }
this.isPaused = true
+ if (this.isPuppet === true) { console.warn('Clock', 'External Midi control'); return }
if (msg === true || client.io.midi.isClock) { client.io.midi.sendClockStop() }
client.io.midi.allNotesOff()
this.clearTimer()
| 11 |
diff --git a/generators/server/templates/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs b/generators/server/templates/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs @@ -19,4 +19,4 @@ CREATE INDEX token_date ON `${bucket}`(tokenDate)
<%_ } _%>
-- build indexes asynchronously
-BUILD INDEX ON `${bucket}`(type<% if (!skipUserManagement) { %>, user_mail, audit_event<% if (authenticationType === 'session') { %>, token_login, token_date<% } %><% } %>);
+BUILD INDEX ON `${bucket}`(type<% if (!skipUserManagement) { %>, user_mail<% if (authenticationType === 'session') { %>, token_login, token_date<% } %><% } %>);
| 2 |
diff --git a/utils/testutils.py b/utils/testutils.py from utils.deployutils import mine_tx
-def assertCallReverts(testcase, function):
- with testcase.assertRaises(ValueError) as error:
- function.call()
- testcase.assertTrue("revert" in error.exception.args[0]['message'])
- testcase.assertEqual(-32000, error.exception.args[0]['code'])
-
-def assertTransactionReverts(testcase, function, caller, gas=5000000):
- with testcase.assertRaises(ValueError) as error:
- mine_tx(function.transact({'from': caller, 'gas': gas}))
- testcase.assertTrue("revert" in error.exception.args[0]['message'])
- testcase.assertEqual(-32000, error.exception.args[0]['code'])
-
def assertReverts(testcase, function, args=[]):
with testcase.assertRaises(ValueError) as error:
function(*args)
| 2 |
diff --git a/assets/js/components/surveys/SurveyQuestionOpenText.js b/assets/js/components/surveys/SurveyQuestionOpenText.js @@ -62,7 +62,7 @@ const SurveyQuestionOpenText = ( {
<div className="googlesitekit-survey__body">
<div>
<TextField
- name="siteProperty"
+ name="open-text"
helperText={
<HelperText>
{ subtitle }
| 12 |
diff --git a/pages/search.js b/pages/search.js @@ -121,23 +121,13 @@ class Search extends React.Component {
query.until = today
}
- try {
[msmtR, testNamesR, countriesR] = await Promise.all([
getMeasurements(query),
client.get('/api/_/test_names'),
client.get('/api/_/countries')
])
- } catch (err) {
- return {
- error: err,
- results: [],
- testNamesKeyed: {},
- testNames: [],
- countries: [],
- }
- }
- const measurements = msmtR.data
+ const measurements = msmtR.data
let countries = countriesR.data.countries
countries.sort(sortByKey('name'))
| 9 |
diff --git a/ai/lore/lore-ai.js b/ai/lore/lore-ai.js @@ -28,6 +28,10 @@ import {
makeOptionsPrompt,
makeOptionsStop,
parseOptionsResponse,
+
+ makeCharacterIntroPrompt,
+ makeCharacterIntroStop,
+ parseCharacterIntroResponse,
} from './lore-model.js'
const numGenerateTries = 5;
@@ -281,6 +285,19 @@ class AIScene {
console.log('dialogue options parsed', {response2});
return response2;
}
+ async generateCharacterIntroPrompt(name, bio) {
+ const prompt = makeCharacterIntroPrompt({
+ name,
+ bio,
+ });
+ console.log('dialogue options prompt', {prompt});
+ const stop = makeCharacterIntroStop();
+ let response = await this.generateFn(prompt, stop);
+ console.log('dialogue options response', {prompt, response});
+ const response2 = parseCharacterIntroResponse(response);
+ console.log('dialogue options parsed', {response2});
+ return response2;
+ }
}
class LoreAI {
| 0 |
diff --git a/public_app/src/components/Appointment/index.js b/public_app/src/components/Appointment/index.js @@ -210,7 +210,7 @@ export const Appointment = (props) => {
<div>{formatAddress(facility.address)}
<div>
<span
- className="badge purple">{facility.osid in facilitiesSchedule && facilitiesSchedule[facility.osid].walkInSchedule.length > 0 && "Walk-in"}</span>
+ className="badge purple">{facility.osid in facilitiesSchedule && facilitiesSchedule[facility.osid].walkInSchedule.length > 0 && "Walkin"}</span>
<span
className="badge green">{facility.osid in facilitiesSchedule && facilitiesSchedule[facility.osid].appointmentSchedule.length > 0 && "Appointments"}</span>
</div>
| 10 |
diff --git a/scenes/street.scn b/scenes/street.scn "position": [1, 2, 3]
}
},
+ {
+ "type": "application/wind",
+ "content": {
+ "windType": "directional",
+ "direction": [-1, 0, 0],
+ "windForce": 0.5,
+ "noiseScale": 1,
+ "windFrequency": 1
+ }
+ },
{
"position": [
0,
| 0 |
diff --git a/src/content/en/updates/_shared/discover.md b/src/content/en/updates/_shared/discover.md @@ -6,7 +6,7 @@ Below is a list of everything that's been covered in the *What's New In DevTools
* [Faster DevTools startup](/web/updates/2020/11/devtools#fast-startup)
* [New CSS angle visualization tools](/web/updates/2020/11/devtools#css-angle)
-* [Emulate unsupported image types](/web/updates/2020/11/devtools#mulate-image)
+* [Emulate unsupported image types](/web/updates/2020/11/devtools#emulate-image)
* [Simulate storage quota size in the Storage pane](/web/updates/2020/11/devtools#simulate-storage)
* [New Web Vitals lane in the Performance panel](/web/updates/2020/11/devtools#web-vitals)
* [Report CORS errors in the Network panel](/web/updates/2020/11/devtools#cors)
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -69579,10 +69579,12 @@ var $$IMU_EXPORT$$;
obj.extra.page = "https://asiansister.com/viewImg.php?code=" + match[1] + "&id=" + match[2];
}
+ var urls = [src];
newsrc = src.replace(/(\/images\/+items\/+[0-9]+\/+[0-9]+_[0-9]+_[0-9a-zA-Z]+)_t(\.[^/.]+)(?:[?#].*)?$/, "$1$2");
- obj.url = newsrc;
+ if (newsrc !== src)
+ urls = add_extensions(newsrc);
- return obj;
+ return fillobj_urls(urls, obj);
}
| 7 |
diff --git a/circle.yml b/circle.yml @@ -76,7 +76,7 @@ jobs:
- restore_cache:
key: cypress-documentation-{{ .Branch }}-{{ .Revision }}
- run: npm ls || true
- - run: NODE_ENV=development npm run build
+ - run: NODE_ENV=staging npm run build
- run: ls -Rl themes/cypress/source/js
- run: ls public
- run: ls -Rl public/js
| 12 |
diff --git a/articles/quickstart/spa/angular-beta/_includes/_centralized_login.md b/articles/quickstart/spa/angular-beta/_includes/_centralized_login.md @@ -337,7 +337,6 @@ import { CallbackComponent } from './callback/callback.component';
// NEW - import the Profile component
import { ProfileComponent } from './profile/profile.component';
-// NEW - add a route to the profile component
const routes: Routes = [
{
path: 'callback',
| 2 |
diff --git a/components/mapbox/ban-map/index.js b/components/mapbox/ban-map/index.js @@ -9,6 +9,7 @@ import CadastreLayerControl from '../cadastre-layer-control'
import CenterControl from '../center-control'
import SelectPaintLayer from '../select-paint-layer'
import MapLegends from '../map-legends'
+import OpenGPS from '../open-gps'
import {
adresseCircleLayer,
@@ -84,6 +85,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
const [selectedPaintLayer, setSelectedPaintLayer] = useState('certification')
const [isCadastreDisplayable, setIsCadastreDisplayble] = useState(true)
const [isCadastreLayersShown, setIsCadastreLayersShown] = useState(false)
+ const {lat, lon} = address
const onLeave = useCallback(() => {
if (hoveredFeature) {
@@ -298,6 +300,9 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
<div className='mapboxgl-ctrl-group mapboxgl-ctrl'>
<CenterControl isDisabled={isCenterControlDisabled} handleClick={centerAddress} />
<CadastreLayerControl isDisabled={isCadastreDisplayable} isActived={isCadastreLayersShown} handleClick={() => setIsCadastreLayersShown(!isCadastreLayersShown)} />
+ {isMobile && lat && lon && (
+ <OpenGPS lat={lat} lon={lon} />
+ )}
</div>
<SelectPaintLayer
@@ -339,7 +344,9 @@ BanMap.propTypes = {
type: PropTypes.string.isRequired,
position: PropTypes.object,
parcelles: PropTypes.array,
- displayBBox: PropTypes.array
+ displayBBox: PropTypes.array,
+ lat: PropTypes.number,
+ lon: PropTypes.number
}),
map: PropTypes.object.isRequired,
isSourceLoaded: PropTypes.bool,
| 0 |
diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js @@ -2389,11 +2389,7 @@ function processTour(dataSource, node, processingData, deferredLoading) {
}
}
- if (!defined(dataSource.kmlTours)) {
- dataSource.kmlTours = [];
- }
-
- dataSource.kmlTours.push(tour);
+ dataSource._kmlTours.push(tour);
}
function processTourUnsupportedNode(tour, entryNode) {
@@ -3349,7 +3345,6 @@ function load(dataSource, entityCollection, data, options) {
* @property {Boolean} [clampToGround=false] true if we want the geometry features (Polygons, LineStrings and LinearRings) clamped to the ground.
* @property {Ellipsoid} [ellipsoid=Ellipsoid.WGS84] The global ellipsoid used for geographical calculations.
* @property {Credit|String} [credit] A credit for the data source, which is displayed on the canvas.
- * @property {KmlTour} [KmlTours] The KmlTour that is used to guide the camera to specified destinations on given time intervals.
*/
/**
@@ -3442,6 +3437,8 @@ function KmlDataSource(options) {
// Create a list of Credit's from the resource that the user can't remove
this._resourceCredits = [];
+
+ this._kmlTours = [];
}
/**
@@ -3601,6 +3598,16 @@ Object.defineProperties(KmlDataSource.prototype, {
return this._credit;
},
},
+ /**
+ * Gets the KML Tours that are used to guide the camera to specified destinations on given time intervals.
+ * @memberof KmlDataSource.prototype
+ * @type {KmlTour[]}
+ */
+ kmlTours: {
+ get: function () {
+ return this._kmlTours;
+ },
+ },
});
/**
| 3 |
diff --git a/util/utility.js b/util/utility.js @@ -273,9 +273,9 @@ function mergeObjects(merge, val) {
}
/**
- * Finds the mode of the input array
+ * Finds the mode and its occurances of the input array
**/
-function mode(array) {
+function modeWithCount(array) {
if (!array.length) return null;
const modeMap = {};
let maxEl = array[0];
@@ -289,7 +289,7 @@ function mode(array) {
maxCount = modeMap[el];
}
}
- return maxEl;
+ return { mode: maxEl, count: maxCount };
}
/**
@@ -705,12 +705,22 @@ function getLaneFromPosData(lanePos, isRadiant) {
}
});
});
- const lane = mode(lanes);
+ const laneWithCount = modeWithCount(lanes);
+ let { mode: lane } = laneWithCount;
+ const { count } = laneWithCount;
+ const allPositions = lanes.length;
+ const presenceRatio = count / allPositions;
+ if (presenceRatio < 0.45) {
+ // Roaming
+ lane = 6;
+ }
+
// Roles, currently doesn't distinguish between carry/support in safelane
// 1 safelane
// 2 mid
// 3 offlane
// 4 jungle
+ // 5 roaming
const laneRoles = {
// bot
1: isRadiant ? 1 : 3,
@@ -722,6 +732,8 @@ function getLaneFromPosData(lanePos, isRadiant) {
4: 4,
// dire jungle
5: 4,
+ // roaming
+ 6: 5,
};
return {
lane,
@@ -753,7 +765,7 @@ module.exports = {
convert64to32,
isRadiant,
mergeObjects,
- mode,
+ modeWithCount,
isSignificant,
max,
min,
| 12 |
diff --git a/docs/README.md b/docs/README.md @@ -126,7 +126,7 @@ The most updated and useful are :
* See [docs/history.md](history.md).
* See [examples/](https://github.com/PrismarineJS/mineflayer/tree/master/examples).
* See [docs/unstable_api.md](unstable_api.md).
- * See [docs/contribute.md](contribute.md).
+ * See [docs/contribute.md](CONTRIBUTING.md).
## Contribute
| 1 |
diff --git a/src/js/createTippy.js b/src/js/createTippy.js @@ -705,7 +705,7 @@ export default function createTippy(reference, collectionProps) {
/**
* Sets new props for the instance and redraws the tooltip
*/
- function set(options) {
+ function set(options = {}) {
validateOptions(options, Defaults)
const prevProps = tip.props
@@ -714,15 +714,20 @@ export default function createTippy(reference, collectionProps) {
...options,
performance: true
})
- nextProps.performance = options.performance || prevProps.performance
+ nextProps.performance = options.hasOwnProperty('performance')
+ ? options.performance
+ : prevProps.performance
tip.props = nextProps
- if ('trigger' in options || 'touchHold' in options) {
+ if (
+ options.hasOwnProperty('trigger') ||
+ options.hasOwnProperty('touchHold')
+ ) {
removeTriggersFromReference()
addTriggersToReference()
}
- if ('interactiveDebounce' in options) {
+ if (options.hasOwnProperty('interactiveDebounce')) {
cleanupOldMouseMoveListeners()
debouncedOnMouseMove = debounce(onMouseMove, options.interactiveDebounce)
}
@@ -732,7 +737,7 @@ export default function createTippy(reference, collectionProps) {
if (
tip.popperInstance &&
- POPPER_INSTANCE_RELATED_PROPS.some(prop => prop in options)
+ POPPER_INSTANCE_RELATED_PROPS.some(prop => options.hasOwnProperty(prop))
) {
tip.popperInstance.destroy()
tip.popperInstance = createPopperInstance()
| 7 |
diff --git a/package.json b/package.json "start": "gulp server",
"build": "gulp clean && gulp sass && gulp copy && webpack",
"prepublish": "babel ./src --out-dir ./lib && gulp dist",
- "test": "jest",
+ "test": "eslint src && jest",
"test:watch": "jest --watch",
"lint": "eslint src"
},
| 0 |
diff --git a/physics-manager.js b/physics-manager.js @@ -37,6 +37,7 @@ const _makePhysicsObject = (physicsId, position, quaternion/*, scale*/) => {
// physicsObject.scale.copy(scale);
physicsObject.updateMatrixWorld();
physicsObject.physicsId = physicsId;
+ physicsObject.detached = false;
physicsObject.collided = false;
physicsObject.grounded = false;
return physicsObject;
| 0 |
diff --git a/token-metadata/0x8578530205CEcbe5DB83F7F29EcfEEC860C297C2/metadata.json b/token-metadata/0x8578530205CEcbe5DB83F7F29EcfEEC860C297C2/metadata.json "symbol": "AOG",
"address": "0x8578530205CEcbe5DB83F7F29EcfEEC860C297C2",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/domain/session/room/timeline/tiles/BaseMessageTile.js b/src/domain/session/room/timeline/tiles/BaseMessageTile.js @@ -117,16 +117,16 @@ export class BaseMessageTile extends SimpleTile {
}
updateEntry(entry, param, tilesCreator) {
- this._updateReplyTileIfNeeded(tilesCreator);
const action = super.updateEntry(entry, param, tilesCreator);
if (action.shouldUpdate) {
this._updateReactions();
}
+ this._updateReplyTileIfNeeded(tilesCreator);
return action;
}
_updateReplyTileIfNeeded(tilesCreator) {
- const replyEntry = entry.contextEntry;
+ const replyEntry = this._entry.contextEntry;
if (replyEntry) {
// this is an update to contextEntry used for replyPreview
const action = this._replyTile?.updateEntry(replyEntry, param, tilesCreator);
| 4 |
diff --git a/src/user_camera.js b/src/user_camera.js @@ -28,6 +28,10 @@ class UserCamera extends gltfCamera
this.zoomFactor = 1.04;
this.rotateSpeed = 1 / 180;
this.panSpeed = 1;
+ this.sceneExtents = {
+ min: vec3.create(),
+ max: vec3.create()
+ };
}
updatePosition()
@@ -42,6 +46,8 @@ class UserCamera extends gltfCamera
vec3.add(position, position, this.target);
this.position = position;
+
+ this.fitCameraPlanesToExtents(this.sceneExtents.min, this.sceneExtents.max);
}
reset(gltf, sceneIndex)
@@ -93,21 +99,17 @@ class UserCamera extends gltfCamera
fitViewToScene(gltf, sceneIndex)
{
- const min = vec3.create();
- const max = vec3.create();
- getSceneExtents(gltf, sceneIndex, min, max);
- this.fitCameraTargetToExtents(min, max);
- this.fitZoomToExtents(min, max);
- this.fitPanSpeedToScene(min, max);
- this.fitCameraPlanesToExtents(min, max);
+ getSceneExtents(gltf, sceneIndex, this.sceneExtents.min, this.sceneExtents.max);
+ this.fitCameraTargetToExtents(this.sceneExtents.min, this.sceneExtents.max);
+ this.fitZoomToExtents(this.sceneExtents.min, this.sceneExtents.max);
+ this.fitPanSpeedToScene(this.sceneExtents.min, this.sceneExtents.max);
+ this.fitCameraPlanesToExtents(this.sceneExtents.min, this.sceneExtents.max);
}
fitCameraPlanesToScene(gltf, sceneIndex)
{
- const min = vec3.create();
- const max = vec3.create();
- getSceneExtents(gltf, sceneIndex, min, max);
- this.fitCameraPlanesToExtents(min, max);
+ getSceneExtents(gltf, sceneIndex, this.sceneExtents.min, this.sceneExtents.max);
+ this.fitCameraPlanesToExtents(this.sceneExtents.min, this.sceneExtents.max);
}
toLocalRotation(vector)
| 3 |
diff --git a/.appveyor.yml b/.appveyor.yml @@ -4,9 +4,9 @@ image:
platform: x64
environment:
matrix:
+ - nodejs_version: "10"
- nodejs_version: "8"
- nodejs_version: "6"
- - nodejs_version: "4"
install:
- ps: Install-Product node $env:nodejs_version $env:platform
| 14 |
diff --git a/lib/svgo/jsAPI.js b/lib/svgo/jsAPI.js @@ -332,12 +332,12 @@ JSAPI.prototype.addAttr = function (attr) {
if (attr.name === 'class') {
// newly added class attribute
- this.class.hasClass();
+ this.class.addClassValueHandler();
}
if (attr.name === 'style') {
// newly added style attribute
- this.style.hasStyle();
+ this.style.addStyleValueHandler();
}
return this.attrs[attr.name];
| 14 |
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js @@ -1199,11 +1199,12 @@ function createHoverText(hoverData, opts, gd) {
var lx, ly; // top and left positions of the hover box
// horizontal alignment to end up on screen
+ if(outerWidth > 0) {
if(lxRight + tWidth < outerWidth && lxRight >= 0) {
lx = lxRight;
} else if(lxLeft + tWidth < outerWidth && lxLeft >= 0) {
lx = lxLeft;
- } else if(xOffset + tWidth < outerWidth) {
+ } else if(outerWidth > 0 && xOffset + tWidth < outerWidth) {
lx = xOffset; // subplot left corner
} else {
// closest left or right side of the paper
@@ -1213,9 +1214,13 @@ function createHoverText(hoverData, opts, gd) {
lx = 0;
}
}
+ } else {
+ lx = lxLeft;
+ }
lx += HOVERTEXTPAD;
// vertical alignement to end up on screen
+ if(outerHeight > 0) {
if(lyBottom + tHeight < outerHeight && lyBottom >= 0) {
ly = lyBottom;
} else if(lyTop + tHeight < outerHeight && lyTop >= 0) {
@@ -1230,6 +1235,9 @@ function createHoverText(hoverData, opts, gd) {
ly = 0;
}
}
+ } else { // N.B. this case happens on documentation website (outerHeight: 0)
+ ly = lyTop;
+ }
ly += HOVERTEXTPAD;
legendContainer.attr('transform', strTranslate(lx - 1, ly - 1));
| 9 |
diff --git a/token-metadata/0xA0471cdd5c0dc2614535fD7505b17A651a8F0DAB/metadata.json b/token-metadata/0xA0471cdd5c0dc2614535fD7505b17A651a8F0DAB/metadata.json "symbol": "ESWA",
"address": "0xA0471cdd5c0dc2614535fD7505b17A651a8F0DAB",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/blocks/init/src/Blocks/components/jumbotron/jumbotron.php b/blocks/init/src/Blocks/components/jumbotron/jumbotron.php @@ -34,7 +34,7 @@ $jumbotronContentWrapClass = Components::selector($componentClass, $componentCla
?>
-<div class="<?php echo esc_attr($jumbotronClass); ?>" data-id="<?php echo esc_attr($unique); ?>" role="section">
+<div class="<?php echo esc_attr($jumbotronClass); ?>" data-id="<?php echo esc_attr($unique); ?>" role="region">
<?php
echo Components::outputCssVariables($attributes, $manifest, $unique, $globalManifest); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
| 14 |
diff --git a/test/scripts/helpers/debug.js b/test/scripts/helpers/debug.js @@ -21,7 +21,7 @@ describe('debug', () => {
it('inspect deep object', () => {
const obj = { baz: { thud: 'narf', dur: { foo: 'bar', baz: { bang: 'zoom' } } } };
- debug.inspectObject(obj).should.not.eql(inspect(obj, {depth: 5}));
+ debug.inspectObject(obj, {depth: 2}).should.not.eql(inspect(obj, {depth: 5}));
debug.inspectObject(obj, {depth: 5}).should.eql(inspect(obj, {depth: 5}));
});
| 1 |
diff --git a/articles/connections/enterprise/samlp.md b/articles/connections/enterprise/samlp.md ---
title: Connecting SAML Providers with Auth0
-connection: SAML-P
+connection: SAMLP
image: /media/connections/saml.png
-public: false
alias:
- saml
seo_alias: samlp
description: Connecting SAML Providers with Auth0
---
+
+# Create a SAMLP Identity Provider Connection
+
+Auth0 allows you to create SAMLP Identity Provider connections using either the Management [Dashboard](${manage_url}/#/connections/enterprise) or [API](/api/management/v2#!/Connections/post_connections).
+
+## Obtain IdP Signing Certificates
+
+When you're setting up a SAMLP Connection, Auth0 acts as the service provider. As such, you will need to retrieve and provide to Auth0 an X509 signing certificate from the SAML IDP in PEM or CER format. The methods for retrieving this certificate vary, so please see your identity provider for additonal assistance if necessary.
+
+### Convert the Signing Certificate to Base64
+
+Prior to uploading the X509 signing certificate to Auth0, you'll need to convert the file to Base64. You can use a simple online tool like [this one](https://www.base64decode.org/), or you can run the following in Bash: `cat signing-cert.crt | base64`
+
+## Create a Connection Using the Management Dashboard
+
+Log into the [Management Dashboard](${manage_url}), and navigate to [Connections > Enterprise](${manage_url}/#/connections/enterprise).
+
+
+
+Scroll down to the row for *SAMLP Identity Provider* and click **Add New** (which is represented by the plus symbol). You'll see the *Settings* page for your new Connection.
+
+
+
+Provide the following information for your new Connection:
+
+* **Connection Name**: The logical identifier for your Connection
+* **Email Domains** (optional): A comma-separated list of domains for [use with Lock](/libraries/lock)
+* **Sign In URL**: The SAML single login URL
+* **X509 Signing Certificate**: The signing certificate (encoded in PEM or CER) provided by the identity provider
+* **Sign Out URL** (optional): The SAML single logout URL
+* **User ID Attribute** (optional): The attribute in the SAML token that maps to the Auth0 `user_id` property
+* **Debug Mode**: Toggle this to enable/disable verbose logging during the authentication process
+* **Sign Request**: Toggle this to enable/disable signing of the authentication request (be sure to download and provide the accompanying certificate so the identity provider can validate the assertion's signature)
+* **Sign Request Algorithm**: The algorithm you want Auth0 to use to sign the SAML assertions
+* **Sign Request Digest Algorithm**: The algorithm you want to use for the sign request digest
+* **Protocol Binding**: The HTTP binding supported by the identity provider
+* **Request Template** (optional): The template that formats the SAML request
+
+Click **Save** to persist your changes.
+
+You will then see a pop-up window with the next steps you need to take.
+
+
+
+If you do not have the appropriate administrative permissions to complete the integration, you will see a URL to provide to someone who does. If you do, click **Continue** to see additional configuration instructions.
+
+
+
+## Create a Connection Using the Management API
+
+Instead of using the [Management Dashboard](${manage_url}), you can use the [Management API](/api/management/v2#!) to create your SAMLP Connection. You'll need to make the appropriate `POST` call to the [`post_connections` endpoint](/api/management/v2#!/Connections/post_connections).
+
+```json
+{
+ "strategy": "samlp",
+ "name": "CONNECTION_NAME",
+ "options": {
+ "signInEndpoint": "SIGN_IN_ENDPOINT_URL",
+ "signOutEndpoint": "SIGN_OUT_ENDPOINT_URL",
+ "signatureAlgorithm": "rsa-sha256",
+ "digestAlgorithm": "sha256",
+ "fieldsMap": {
+ ...
+ },
+ "signingCert": "BASE64_SIGNING_CERT"
+ }
+}
+```
+
+Here's how you might include the call within your application's code:
+
+```har
+{
+ "method": "POST",
+ "url": "https://${account.namespace}.auth0.com/api/v2/connections",
+ "httpVersion": "HTTP/1.1",
+ "cookies": [],
+ "headers": [{
+ "name": "Authorization",
+ "value": "Bearer MGMT_API_ACCESS_TOKEN"
+ }],
+ "queryString": [],
+ "postData": {
+ "mimeType": "application/json",
+ "text": "{ \"strategy\": \"samlp\", \"name\": \"CONNECTION_NAME\", \"options\": { \"signInEndpoint\": \"SIGN_IN_ENDPOINT_URL\", \"signOutEndpoint\": \"SIGN_OUT_ENDPOINT_URL\", \"signatureAlgorithm\": \"rsa-sha256\", \"digestAlgorithm\": \"sha256\", \"fieldsMap\": {}, \"signingCert\": \"BASE64_SIGNING_CERT\" } }"
+ },
+ "headersSize": -1,
+ "bodySize": -1,
+ "comment": ""
+}
+```
| 0 |
diff --git a/contribs/gmf/src/print/component.js b/contribs/gmf/src/print/component.js @@ -1088,7 +1088,6 @@ exports.Controller_ = class {
*/
getLegend_(scale, dpi, bbox) {
const legend = {'classes': []};
- let classes, layerNames, layerName, icons;
const gettextCatalog = this.gettextCatalog_;
// Get layers from layertree only.
@@ -1098,12 +1097,12 @@ exports.Controller_ = class {
// For each visible layer in reverse order, get the legend url.
layers.reverse().forEach((layer) => {
- classes = [];
+ const classes = [];
if (layer.getVisible() && layer.getSource()) {
// For WMTS layers.
if (layer instanceof olLayerTile) {
- layerName = `${layer.get('layerNodeName')}`;
- icons = this.getMetadataLegendImage_(layerName);
+ const layerName = `${layer.get('layerNodeName')}`;
+ let icons = this.getMetadataLegendImage_(layerName);
if (!icons) {
icons = this.ngeoLayerHelper_.getWMTSLegendURL(layer);
}
@@ -1111,16 +1110,15 @@ exports.Controller_ = class {
if (icons) {
classes.push({
'name': gettextCatalog.getString(layerName),
- 'dpi': dpi,
'icons': [icons]
});
}
} else {
const source = /** @type ol.source.ImageWMS */ (layer.getSource());
// For each name in a WMS layer.
- layerNames = source.getParams()['LAYERS'].split(',');
+ const layerNames = source.getParams()['LAYERS'].split(',');
layerNames.forEach((name) => {
- icons = this.getMetadataLegendImage_(name);
+ let icons = this.getMetadataLegendImage_(name);
if (!icons) {
icons = this.ngeoLayerHelper_.getWMSLegendURL(source.getUrl(), name,
scale, undefined, undefined, undefined, source.serverType_, dpi, bbox,
@@ -1130,11 +1128,12 @@ exports.Controller_ = class {
// Don't add classes without legend url or from layers without any
// active name.
if (icons && name.length !== 0) {
- classes.push({
+ classes.push(Object.assign({
'name': gettextCatalog.getString(name),
- 'dpi': dpi,
'icons': [icons]
- });
+ }, layer.getSource().serverType_ === 'qgis' ? {
+ 'dpi': dpi,
+ } : {}));
}
});
}
| 12 |
diff --git a/app/client/rest/files.ts b/app/client/rest/files.ts @@ -72,6 +72,7 @@ const ClientFiles = (superclass: any) => class extends superclass {
channel_id: channelId,
},
},
+ timeoutInterval: 3 * 60 * 1000, // 3 minutes
};
const promise = this.apiClient.upload(url, file.localPath, options) as ProgressPromise<ClientResponse>;
promise.progress!(onProgress).then(onComplete).catch(onError);
| 12 |
diff --git a/src/docs/spec/prop-string.js b/src/docs/spec/prop-string.js const getPropString = propData => {
- // TODO: Refactor this block when less sleepy
-
let propString = ''
+ /* filter out internal props, they start with _underscore */
const propNames = Object.keys(propData).filter(key => key[0] !== '_')
propNames.forEach(name => {
+ console.log(propData[name])
if (propData[name].type.name === 'bool' && propData[name].value === 'true') {
propString += ` ${name}`
} else if (propData[name].type.name === 'string' && propData[name].value !== 'null') {
propString += ` ${name}="${propData[name].value}"`
- } else if (propData[name].value !== 'null') {
+ } else if (propData[name].type.name === 'number' && propData[name].value !== 'null') {
propString += ` ${name}={${propData[name].value}}`
}
})
| 13 |
diff --git a/server/game/cards/16-TTWDFL/TheGatheringStorm.js b/server/game/cards/16-TTWDFL/TheGatheringStorm.js @@ -20,7 +20,8 @@ class TheGatheringStorm extends PlotCard {
if(plot) {
this.game.addMessage('{player} chooses to reveal {plot} for {source}', { player, plot, source: this });
player.selectedPlot = plot;
- player.removeActivePlot();
+ player.moveCard(player.activePlot, 'plot deck');
+ player.activePlot = null;
player.flipPlotFaceup();
plots.push(plot);
} else {
| 5 |
diff --git a/shows/032 - Sending Email.md b/shows/032 - Sending Email.md @@ -111,7 +111,7 @@ Listeners of this show get 20% off with the coupon code SYNTAX over at [xojo.com
52:00
* Host your own Platforms
-* [Sendy](http://wes.io/bvN7)
+* [Sendy](https://sendy.co/)
* [Email Octopus](https://emailoctopus.com/)
* [Mautic](http://mautic.org/)
* [MailTrain](https://github.com/Mailtrain-org/mailtrain)
| 1 |
diff --git a/package.json b/package.json {
"name": "atlas",
- "version": "2.10.0",
+ "version": "2.11.0-DEV",
"description": "is an open source software tool for researchers to conduct scientific analyses on standardized observational data converted to the OMOP Common Data Model V5",
"main": "js/main.js",
"scripts": {
| 12 |
diff --git a/docs/source/docs/examples/cards.blade.md b/docs/source/docs/examples/cards.blade.md @@ -28,14 +28,15 @@ description: null
## Horizontal
@component('_partials.code-sample', ['class' => 'p-10 flex justify-center'])
-<div class="max-w-md flex">
- <div class="rounded rounded-l w-128 text-center overflow-hidden">
- <img class="block h-64" src="{{ $page->baseUrl }}/img/card-left.jpg" alt="Woman holding a mug">
+<div class="max-w-md w-full lg:flex">
+ <div class="h-48 lg:h-auto lg:w-48 flex-none bg-cover rounded rounded-t lg:rounded lg:rounded-l text-center overflow-hidden" style="background-image: url('{{ $page->baseUrl }}/img/card-left.jpg')" title="Woman holding a mug">
</div>
- <div class="border-t border-r border-b border-grey-light rounded rounded-r p-4 flex flex-col justify-between">
- <div>
+ <div class="border-r border-b border-l border-grey-light lg:border-l-0 lg:border-t lg:border-grey-light bg-white rounded rounded-b lg:rounded lg:rounded-r p-4 flex flex-col justify-between leading-normal">
+ <div class="mb-8">
<p class="text-sm text-grey-dark flex items-center">
- <svg class="text-grey w-3 h-3 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M4 8V6a6 6 0 1 1 12 0v2h1a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2v-8c0-1.1.9-2 2-2h1zm5 6.73V17h2v-2.27a2 2 0 1 0-2 0zM7 6v2h6V6a3 3 0 0 0-6 0z"/></svg>
+ <svg class="text-grey w-3 h-3 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+ <path d="M4 8V6a6 6 0 1 1 12 0v2h1a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2v-8c0-1.1.9-2 2-2h1zm5 6.73V17h2v-2.27a2 2 0 1 0-2 0zM7 6v2h6V6a3 3 0 0 0-6 0z" />
+ </svg>
Members only
</p>
<div class="text-black font-bold text-xl mb-2">Can coffee make you a better developer?</div>
| 7 |
diff --git a/engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/Text.java b/engine/modules/entities/src/main/java/com/codingame/gameengine/module/entities/Text.java @@ -8,14 +8,14 @@ import java.util.Objects;
public class Text extends TextureBasedEntity<Text> {
/**
- * The list of supported font weight.
+ * The list of supported font weights.
*
*/
public static enum FontWeight {
NORMAL, BOLD, BOLDER, LIGHTER;
public String toString() {
- return super.toString().toLowerCase();
+ return name().toLowerCase();
}
}
| 1 |
diff --git a/plugins/downloader/youtube-dl.js b/plugins/downloader/youtube-dl.js @@ -126,6 +126,7 @@ const toMP3 = async (
: videoName;
const filename = filenamify(name + "." + extension, {
replacement: "_",
+ maxLength: 255,
});
const filePath = join(folder, subfolder, filename);
| 12 |
diff --git a/contracts/connectors/loantoken/LoanTokenSettingsLowerAdmin.sol b/contracts/connectors/loantoken/LoanTokenSettingsLowerAdmin.sol @@ -55,10 +55,7 @@ contract LoanTokenSettingsLowerAdmin is AdvancedToken {
admin = _admin;
}
- function setPauser(address _pauser) public {
- require(msg.sender == address(this) ||
- msg.sender == admin ||
- msg.sender == owner(), "not allowed");
+ function setPauser(address _pauser) public onlyOwner {
pauser = _pauser;
}
| 12 |
diff --git a/ui/src/components/uploader/QUploader.json b/ui/src/components/uploader/QUploader.json "isBusy": {
"type": "Boolean",
"desc": "The component state is set as busy; User should not be able to interact with the component"
+ },
+
+ "isUploading": {
+ "type": "Boolean",
+ "desc": "The component is uploading files"
}
}
}
| 1 |
diff --git a/test/integration/offline.js b/test/integration/offline.js @@ -242,7 +242,7 @@ describe('Offline', () => {
},
payload: { data: 'data' },
}, res => {
- console.log(res);
+ // console.log(res);
expect(res.headers).to.have.property('content-type', 'application/vnd.api+json');
done();
});
| 2 |
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml @@ -23,7 +23,7 @@ jobs:
- name: Run test on default container for Edge
run: docker run --rm sitespeedio/sitespeed.io https://www.sitespeed.io -n 1 -b edge
- name: Run test on slim container
- run: docker run --rm sitespeedio/sitespeed.io:slim https://www.sitespeed.io -n 1
+ run: docker run --rm sitespeedio/sitespeed.io:slim https://www.sitespeed.io -n 1 --browsertime.firefox.preference "devtools.netmonitor.persistlog:true"
- name: Test WebPageReplay with Chrome
run: docker run --cap-add=NET_ADMIN --rm -e REPLAY=true -e LATENCY=100 sitespeedio/sitespeed.io https://www.sitespeed.io -n 3 -b chrome
- name: Test WebPageReplay with Firefox
| 4 |
diff --git a/packages/@uppy/status-bar/src/style.scss b/packages/@uppy/status-bar/src/style.scss to { background-position: 64px 0; }
}
+ .uppy-StatusBar.is-preprocessing .uppy-StatusBar-progress,
+ .uppy-StatusBar.is-postprocessing .uppy-StatusBar-progress {
+ background-color: $color-orange;
+ }
+
.uppy-StatusBar.is-waiting .uppy-StatusBar-progress {
display: none;
}
| 0 |
diff --git a/src/encoded/schemas/file.json b/src/encoded/schemas/file.json }
},
"mapped_run_type": {
+ "comment": "Only bam files can have mapped_run_type specified.",
"properties": {
"file_format": {
"enum": ["bam"]
}
},
"mapped_read_length": {
+ "comment": "Only bam files can have mapped_read_length specified.",
"properties": {
"file_format": {
"enum": ["bam"]
}
},
"paired_end": {
- "comment": "Files with paired-end value 2 require a paired_with value.",
+ "comment": "Files with paired-end value 2 require a paired_with value and files with paired_end specified require run_type to be specified as paired-ended",
"oneOf": [
{
"required": ["paired_with", "run_type"],
]
},
"output_type":{
+ "comment": "Files with output_type reads and file format fastq, fatsa, csfasta, csqual and sra require read_length to be specified.",
"oneOf":[
{
"required": ["read_length"],
]
},
"file_format":{
- "comment": "Fastq and sra files require run_type and replicate but should not have assembly.",
+ "comment": "Fastq and sra files require run_type and replicate but should not have assembly. Raw data files require platform to be specified. Processed files require assembly to be specified.",
"oneOf": [
{
"allOf": [
]
},
"status": {
+ "comment": "file_size is required in files with statuses in progress, revoked, archived and released. content_error_details can be specified in files with status deleted and is required in files with the status content error.",
"allOf": [
{
"oneOf": [
| 0 |
diff --git a/deepfence_ui/app/scripts/components/vulnerability-view/sbom-modal/index.jsx b/deepfence_ui/app/scripts/components/vulnerability-view/sbom-modal/index.jsx @@ -103,7 +103,7 @@ export const SBOMModal = ({
const val = row.value?.filter?.((v) => {
return !!v?.path?.trim?.()?.length;
});
- if (!val.length) return 'Unknown';
+ if (!val?.length) return 'Unknown';
if (val.length > 0) return val.map((v) => v.path).join(', ');
},
disableSortBy: true,
| 9 |
diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js @@ -232,10 +232,10 @@ export default class ScanLndInvoice extends React.Component {
>
<Text style={{ color: '#0c2550', fontSize: 14 }}>{this.state.fromWallet.getLabel()}</Text>
<Text style={{ color: '#0c2550', fontSize: 14, fontWeight: '600', marginLeft: 8, marginRight: 4 }}>
- {loc.formatBalanceWithoutSuffix(this.state.fromWallet.getBalance(), BitcoinUnit.BTC, false)}
+ {loc.formatBalanceWithoutSuffix(this.state.fromWallet.getBalance(), BitcoinUnit.SATS, false)}
</Text>
<Text style={{ color: '#0c2550', fontSize: 11, fontWeight: '600', textAlignVertical: 'bottom', marginTop: 2 }}>
- {BitcoinUnit.BTC}
+ {BitcoinUnit.SATS}
</Text>
</TouchableOpacity>
</View>
| 14 |
diff --git a/src/components/granularUserProfile/index.js b/src/components/granularUserProfile/index.js @@ -50,7 +50,12 @@ const LinkHandler = ({
}: {
username: ?string,
children: React.Node,
-}) => (username ? <Link to={`/users/${username}`}>{children}</Link> : children);
+}) =>
+ username ? (
+ <Link to={`/users/${username}`}>{children}</Link>
+ ) : (
+ <span>{children}</span>
+ );
class GranularUserProfileHandler extends React.Component<Props> {
render() {
| 1 |
diff --git a/src/components/send/SendContainer.js b/src/components/send/SendContainer.js @@ -50,8 +50,12 @@ export function SendContainer({ match, location }) {
const [confirm, setConfirm] = useState(null)
const [id, setId] = useState(match.params.id || '')
const [success, setSuccess] = useState(null)
- const amountAvailableToSend = new BN(balance.available).sub(new BN(parseNearAmount(WALLET_APP_MIN_AMOUNT)))
- const sufficientBalance = !new BN(parseNearAmount(amount)).isZero() && (new BN(parseNearAmount(amount)).lte(amountAvailableToSend) || useMax) && isDecimalString(amount)
+ const amountAvailableToSend = balance.available
+ ? new BN(balance.available).sub(new BN(parseNearAmount(WALLET_APP_MIN_AMOUNT)))
+ : undefined
+ const sufficientBalance = balance.available
+ ? !new BN(parseNearAmount(amount)).isZero() && (new BN(parseNearAmount(amount)).lte(amountAvailableToSend) || useMax) && isDecimalString(amount)
+ : undefined
const sendAllowed = ((localAlert && localAlert.success !== false) || id.length === 64) && sufficientBalance && amount && !mainLoader && !success
useEffect(() => {
| 9 |
diff --git a/src/pages/using-spark/foundations/space.mdx b/src/pages/using-spark/foundations/space.mdx @@ -13,7 +13,7 @@ these proportions affect design.
Spacing values are used for padding and margin
throughout the design system and are relative to
-the standard type size of 1em/16px. Applying one
+the standard type size of `1em/16px`. Applying one
spacing size consistently throughout a page will
help bring visual consistency to its layout and components.
@@ -24,11 +24,11 @@ in your application.
### Guidelines
- There are five built in spacing sizes:
- - Extra Small (4px, .25 rem)
- - Small (8px, .5 rem)
- - Medium (16px, 1rem)
- - Large (32px, 2rem)
- - Extra Large (64px, 4 rem)
+ - Extra Small (`4px`, `.25rem`)
+ - Small (`8px`, `.5rem`)
+ - Medium (`16px`, `1rem`)
+ - Large (`32px`, `2rem`)
+ - Extra Large (`64px`, `4rem`)
<SprkDivider
element="span"
@@ -53,8 +53,8 @@ is a convenient way to apply this spacing style.
Inset Short behaves just like Inset, except the
top and bottom padding is reduced by 50%. For
-example, Inset Short Small has 8px of padding
-on the left and right sides, but 4px padding
+example, Inset Short Small has `8px` of padding
+on the left and right sides, but `4px` padding
on the top and bottom.
<ComponentPreview
@@ -67,8 +67,8 @@ on the top and bottom.
Inset Tall behaves just like Inset, except the
top and bottom padding is increased by 50%. For
-example, Inset Tall Small has 8px padding on the
-left and right sides, but 12px padding on the
+example, Inset Tall Small has `8px` padding on the
+left and right sides, but `12px` padding on the
top and bottom.
<ComponentPreview
@@ -103,10 +103,10 @@ horizontal space. Use the Stack utility to include vertical space.
These are additional sizing proportions to supplement our existing XS-XL sizes:
-- Misc A (24px, 1.5rem)
-- Misc B (40px, 2.5rem)
-- Misc C (48px, 3rem)
-- Misc D (80px, 5rem)
+- Misc A (`24px`, `1.5rem`)
+- Misc B (`40px`, `2.5rem`)
+- Misc C (`48px`, `3rem`)
+- Misc D (`80px`, `5rem`)
<ComponentPreview
componentName="spacing--inline-spacing-misc"
| 3 |
diff --git a/packages/yoroi-extension/app/components/wallet/add/option-dialog/WalletEraOptionDialog.js b/packages/yoroi-extension/app/components/wallet/add/option-dialog/WalletEraOptionDialog.js @@ -54,13 +54,6 @@ export default class WalletEraOptionDialog extends Component<Props> {
>
<div className={styles.component}>
<ul className={styles.optionBlockList}>
- <OptionBlock
- parentName="WalletEraOptionDialog"
- type="bgByronMainnet"
- title={intl.formatMessage(messages.restoreByronEraWalletTitle)}
- learnMoreText={intl.formatMessage(globalMessages.restoreByronEraWalletDescription)}
- onSubmit={this.props.onByron}
- />
<OptionBlock
parentName="WalletEraOptionDialog"
type="bgShelleyMainnet"
@@ -68,6 +61,13 @@ export default class WalletEraOptionDialog extends Component<Props> {
learnMoreText={intl.formatMessage(globalMessages.restoreShelleyEraWalletDescription)}
onSubmit={this.props.onShelley}
/>
+ <OptionBlock
+ parentName="WalletEraOptionDialog"
+ type="bgByronMainnet"
+ title={intl.formatMessage(messages.restoreByronEraWalletTitle)}
+ learnMoreText={intl.formatMessage(globalMessages.restoreByronEraWalletDescription)}
+ onSubmit={this.props.onByron}
+ />
</ul>
</div>
</Dialog>
| 5 |
diff --git a/src/components/signup/SignupState.js b/src/components/signup/SignupState.js @@ -106,9 +106,9 @@ const Signup = ({ navigation, screenProps }: { navigation: any, screenProps: any
setLoading(false)
return setError(data.error)
}
+ log.debug('skipping email verification?', { ...data, skip: Config.skipEmailVerification })
if (Config.skipEmailVerification || data.onlyInEnv) {
// Server is using onlyInEnv middleware (probably dev mode), email verification is not sent.
- log.debug({ ...data })
// Skip EmailConfirmation screen
nextRoute = navigation.state.routes[navigation.state.index + 2]
| 0 |
diff --git a/_includes/components/import.js b/_includes/components/import.js @@ -10,6 +10,7 @@ if( "forEach" in NodeList.prototype ) {
}).then(function (text) {
el.innerHTML = text;
el.removeAttribute("data-import");
+ el.setAttribute("data-import-complete", "");
}).catch((err) => {
console.log('Import failed', err);
});
| 12 |
diff --git a/connectors/mycloudplayer.js b/connectors/mycloudplayer.js 'use strict';
-/* global Connector, Util */
+/* global Connector */
Connector.playerSelector = '#html5player';
-Connector.getArtistTrack = function() {
- let artistTrack = $('#staticHeader h3').contents()[0].textContent;
- return Util.splitArtistTrack(artistTrack);
-};
+Connector.getTrack = () => $('#staticHeader h3').contents()[0].textContent;
+
+Connector.artistSelector = '#staticHeader h4 > a';
Connector.currentTimeSelector = '#progress';
@@ -15,6 +14,4 @@ Connector.durationSelector = '#duration';
Connector.trackArtImageSelector = '#artwork img';
-Connector.isPlaying = function() {
- return $('.playtoggle').hasClass('pause');
-};
+Connector.isPlaying = () => $('.playtoggle').hasClass('pause');
| 1 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/objectview/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/objectview/template.vue #L%
-->
<template>
- <div v-if="currentObject">
- <button class="btn-flat" v-on:click.stop.prevent="onView">view</button>
- <button class="btn-flat" v-on:click.stop.prevent="onEdit">edit</button>
+ <div v-if="currentObject" :class="`object-editor ${isFullscreen ? 'fullscreen' : 'narrow'}`">
+ <div class="object-editor-content">
+ <button
+ v-if="isFullscreen"
+ type="button"
+ class="toggle-fullscreen"
+ v-on:click.prevent="onPreviewExitFullscreen">
+ <i class="material-icons">fullscreen_exit</i>
+ </button>
+ <button
+ v-if="!isFullscreen"
+ type="button"
+ class="toggle-fullscreen"
+ v-on:click.prevent="onPreviewFullscreen">
+ <i class="material-icons">fullscreen</i>
+ </button>
- <div v-if="!edit">
+ <div class="display-json">
<pre>{{currentObject.data}}</pre>
</div>
- <form v-else>
-
+ <form v-if="edit">
<vue-form-generator
v-bind:schema = "schema"
v-bind:model = "currentObject.data"
v-bind:options = "formOptions">
</vue-form-generator>
- <button class="btn-flat" v-on:click.stop.prevent="onOk">ok</button>
- <button class="btn-flat" v-on:click.stop.prevent="onCancel">cancel</button>
</form>
-
+ <div class="right-align">
+ <button v-if="!edit" class="btn btn-raised" v-on:click.stop.prevent="onEdit">
+ <i class="material-icons">edit</i>
+ </button>
+ <button v-if="edit" class="btn btn-raised" v-on:click.stop.prevent="onOk">
+ <i class="material-icons">check</i>
+ </button>
+ <button v-if="edit" class="btn btn-raised" v-on:click.stop.prevent="onCancel">
+ <i class="material-icons">close</i>
+ </button>
+ </div>
</div>
</template>
resourceType = resourceType.split('/').join('-')
return $perAdminApp.getNodeFromView('/admin/componentDefinitions/' + resourceType)
}
- }
- ,
+ },
data: function() {
return {
formOptions: {
validateAfterLoad: true,
validateAfterChanged: true
},
- edit: true
-
+ edit: false,
+ isFullscreen: false
}
},
methods: {
- onView: function() {
- this.edit = false
- },
onEdit: function() {
this.edit = true
},
onOk: function() {
// should store the current node
$perAdminApp.stateAction('saveObjectEdit', { data: this.currentObject.data, path: this.currentObject.show })
+ this.edit = false
},
onCancel: function() {
$perAdminApp.stateAction('selectObject', { selected: this.currentObject.show })
+ this.edit = false
+ },
+ onPreviewExitFullscreen(){
+ this.isFullscreen = false
+ },
+ onPreviewFullscreen(){
+ this.isFullscreen = true
}
}
}
| 11 |
diff --git a/package.json b/package.json ],
"main": "./src/main/main.js",
"scripts": {
- "dev": "NODE_ENV=development gulp && electron-webpack dev",
+ "dev": "gulp && electron-webpack dev",
"postinstall": "ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
"compile": "gulp && electron-webpack",
"dist": "yarn compile && electron-builder",
| 2 |
diff --git a/stories/index.tsx b/stories/index.tsx @@ -1252,7 +1252,7 @@ storiesOf('Settings', module)
<input
type="checkbox"
name={columns[c].id}
- defaultChecked={!columns[c].isVisible}
+ defaultChecked={columns[c].visible !== false}
onChange={onToggle}
/>
{columns[c].title || columns[c].id}
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.