code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/build/tasks/copy.js b/lib/build/tasks/copy.js @@ -16,7 +16,7 @@ exports.task = function (grunt) {
// Change all routes from img to asset version path
process: function (content, srcpath) {
// return content.replace(/\.\.\/img/gi,"/assets/<%= pkg.version %>/images/themes");
- var path = grunt.template.process('<%= env.http_path_prefix %>/editor/<%= editor_assets_version %>/images/themes');
+ var path = grunt.template.process('<%= env.http_path_prefix %>/assets/editor/<%= editor_assets_version %>/images/themes');
return content.replace(/\.\.\/img/gi, path);
}
}
| 1 |
diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js @@ -22,6 +22,7 @@ import SettlementButton from '../../components/SettlementButton';
import ROUTES from '../../ROUTES';
import FixedFooter from '../../components/FixedFooter';
import networkPropTypes from '../../components/networkPropTypes';
+import * as StyleUtils from '../../styles/StyleUtils';
const propTypes = {
/** URL Route params */
@@ -144,11 +145,13 @@ class IOUDetailsModal extends Component {
{reportIsLoading ? <ActivityIndicator color={themeColors.text} /> : (
<View style={[styles.flex1, styles.justifyContentBetween]}>
<ScrollView contentContainerStyle={styles.iouDetailsContainer}>
+ <View style={StyleUtils.getIOUPreviewLoadingItemStyle(isLoading)} >
<IOUPreview
chatReportID={this.props.route.params.chatReportID}
iouReportID={this.props.route.params.iouReportID}
shouldHidePayButton
/>
+ </View>
<IOUTransactions
chatReportID={this.props.route.params.chatReportID}
iouReportID={this.props.route.params.iouReportID}
| 4 |
diff --git a/test/functional/specs/Personalization/C28755.js b/test/functional/specs/Personalization/C28755.js @@ -23,7 +23,7 @@ const decisionContent =
createFixture({
title:
- "C28755: A VEC offer for all visitors should return in every event if __view__ scope exist",
+ "C28755: The first sendEvent on the page should fetch Personalization VEC offers",
requestHooks: [networkLogger.edgeEndpointLogs],
url: `${testPageUrl}?test=C28755`
});
@@ -34,7 +34,7 @@ test.meta({
TEST_RUN: "Regression"
});
-test("Test C28755: A VEC offer for all visitors should return in every event if __view__ scope exist", async () => {
+test("Test C28755: The first sendEvent on the page should fetch Personalization VEC offers", async () => {
const alloy = createAlloyProxy();
await alloy.configure(config);
const result = await alloy.sendEvent();
| 3 |
diff --git a/articles/quickstart/spa/react/_includes/_centralized_login.md b/articles/quickstart/spa/react/_includes/_centralized_login.md @@ -273,7 +273,7 @@ To display this information to the user, create a new file called `Profile.js` i
```jsx
// src/components/Profile.js
-import React from "react";
+import React, { Fragment } from "react";
import { useAuth0 } from "../react-auth0-wrapper";
const Profile = () => {
@@ -286,13 +286,13 @@ const Profile = () => {
}
return (
- <>
+ <Fragment>
<img src={user.picture} alt="Profile" />
<h2>{user.name}</h2>
<p>{user.email}</p>
<code>{JSON.stringify(user, null, 2)}</code>
- </>
+ </Fragment>
);
};
| 2 |
diff --git a/lib/voice/SharedStream.js b/lib/voice/SharedStream.js @@ -229,8 +229,8 @@ class SharedStream extends EventEmitter {
}
this.voiceConnections.forEach((connection) => {
- if(connection.ready) {
- connection._sendPacket(connection._createPacket(this.current.buffer));
+ if(connection.ready && this.current.buffer) {
+ connection._sendAudioPacket(this.current.buffer);
}
});
this.current.playTime += this.current.options.frameDuration;
| 4 |
diff --git a/assets/js/modules/adsense/components/setup/v2/SetupAccount.js b/assets/js/modules/adsense/components/setup/v2/SetupAccount.js @@ -58,10 +58,6 @@ export default function SetupAccount( { account, finishSetup } ) {
select( MODULES_ADSENSE ).getClientID()
);
- const clients = useSelect( ( select ) =>
- select( MODULES_ADSENSE ).getClients( accountID )
- );
-
const site = useSelect( ( select ) =>
select( MODULES_ADSENSE ).getCurrentSite( accountID )
);
@@ -89,8 +85,8 @@ export default function SetupAccount( { account, finishSetup } ) {
}, [ setSiteStatus, site ] );
useEffect( () => {
- // Do nothing if clients aren't loaded because we can't determine afcClientID yet.
- if ( clients === undefined || site === undefined ) {
+ // Do nothing if site isn't loaded yet.
+ if ( site === undefined ) {
return;
}
@@ -105,10 +101,10 @@ export default function SetupAccount( { account, finishSetup } ) {
} else {
setAccountStatus( ACCOUNT_STATUS_READY );
}
- }, [ accountState, afcClient, clientID, clients, setAccountStatus, site ] );
+ }, [ accountState, afcClient, clientID, setAccountStatus, site ] );
- // Show the progress bar if clients or site aren't loaded yet.
- if ( clients === undefined || site === undefined ) {
+ // Show the progress bar if site isn't loaded yet.
+ if ( site === undefined ) {
return <ProgressBar />;
}
| 2 |
diff --git a/app/pages/project/index.spec.js b/app/pages/project/index.spec.js @@ -84,6 +84,9 @@ const preferences = apiClient.type('project_preferences').create({
},
links: {
project: project.id
+ },
+ save() {
+ Promise.resolve(preferences)
}
});
@@ -120,7 +123,8 @@ describe('ProjectPageController', () => {
});
it('should load the specified workflow for the project owner', () => {
- wrapper.setProps({ user: owner }).update();
+ wrapper.setProps({ user: owner });
+ wrapper.setState({ preferences });
controller.getSelectedWorkflow(project, preferences);
sinon.assert.calledOnce(workflowSpy);
sinon.assert.calledWith(workflowSpy, '6', false);
@@ -128,7 +132,8 @@ describe('ProjectPageController', () => {
it('should load the specified workflow for a collaborator', () => {
const user = apiClient.type('users').create({ id: '2' });
- wrapper.setProps({ user }).update();
+ wrapper.setProps({ user });
+ wrapper.setState({ preferences });
controller.getSelectedWorkflow(project, preferences);
sinon.assert.calledOnce(workflowSpy);
sinon.assert.calledWith(workflowSpy, '6', false);
@@ -136,7 +141,8 @@ describe('ProjectPageController', () => {
it('should load the specified workflow for a tester', () => {
const user = apiClient.type('users').create({ id: '3' });
- wrapper.setProps({ user }).update();
+ wrapper.setProps({ user });
+ wrapper.setState({ preferences });
controller.getSelectedWorkflow(project, preferences);
sinon.assert.calledOnce(workflowSpy);
sinon.assert.calledWith(workflowSpy, '6', false);
| 1 |
diff --git a/src/connectors/youtube.js b/src/connectors/youtube.js @@ -32,7 +32,13 @@ Connector.getArtistTrack = () => {
if (byLineMatch) {
return { artist: byLineMatch[1], track: videoTitle };
}
- return Util.processYoutubeVideoTitle(videoTitle);
+
+ let { artist, track } = Util.processYoutubeVideoTitle(videoTitle);
+ if (!artist) {
+ artist = $('#meta-contents #owner-name').text();
+ }
+
+ return { artist, track };
};
/*
| 7 |
diff --git a/src/mixins/crownConfig.js b/src/mixins/crownConfig.js @@ -4,7 +4,7 @@ import messageFlowIcon from '@/assets/message-flow.svg';
import { direction } from '@/components/nodes/association/associationConfig';
import pull from 'lodash/pull';
import startCase from 'lodash/startCase';
-import JQuery from 'jquery';
+import $ from 'jquery';
export const highlightPadding = 3;
@@ -84,6 +84,7 @@ export default {
}
});
+ $('[data-toggle="tooltip"]').tooltip('hide');
this.$emit('remove-node', this.node);
},
removeCrown() {
@@ -172,7 +173,6 @@ export default {
});
this.crownConfig.forEach(({ id, icon, clickHandler }) => {
- const $ = JQuery;
$(document).ready(() => $('[data-toggle="tooltip"]').tooltip());
const removeButtonString = id.replace('button', '');
const formatId = startCase(removeButtonString);
| 2 |
diff --git a/bundles/ranvier-crafting/commands/craft.js b/bundles/ranvier-crafting/commands/craft.js @@ -61,7 +61,6 @@ module.exports = (srcPath, bundlePath) => {
return say(player, "Invalid item.");
}
- item.item.hydrate(state);
say(player, renderItem(state, item.item, player));
say(player, '<b>Recipe:</b>');
for (const resource in item.recipe) {
@@ -157,6 +156,7 @@ module.exports = (srcPath, bundlePath) => {
continue;
}
+ recipeItem.hydrate(state);
craftingCategories[catIndex].items.push({
item: recipeItem,
recipe: recipe.recipe
| 1 |
diff --git a/docs/pitfalls.md b/docs/pitfalls.md @@ -5,7 +5,7 @@ title: Pitfalls
<div id="codefund"><!-- fallback content --></div>
-1. Don't redefine draft like, `draft = myCoolNewState`. Instead, either modify the `draft` or return a new state. See [Returning data from producers](#returning-data-from-producers).
+1. Don't redefine draft like, `draft = myCoolNewState`. Instead, either modify the `draft` or return a new state. See [Returning data from producers](https://immerjs.github.io/immer/docs/return).
1. Immer assumes your state to be a unidirectional tree. That is, no object should appear twice in the tree, and there should be no circular references.
1. Since Immer uses proxies, reading huge amounts of data from state comes with an overhead (especially in the ES5 implementation). If this ever becomes an issue (measure before you optimize!), do the current state analysis before entering the producer function or read from the `currentState` rather than the `draftState`. Also, realize that immer is opt-in everywhere, so it is perfectly fine to manually write super performance critical reducers, and use immer for all the normal ones. Also note that `original` can be used to get the original state of an object, which is cheaper to read.
1. Always try to pull `produce` 'up', for example `for (let x of y) produce(base, d => d.push(x))` is exponentially slower than `produce(base, d => { for (let x of y) d.push(x)})`
| 1 |
diff --git a/lib/plugins/package/package.test.js b/lib/plugins/package/package.test.js @@ -15,7 +15,8 @@ describe('Package', () => {
let options;
let pkg;
- beforeEach(() => {
+ beforeEach(function () {
+ this.timeout(5000); // Ocassionally timed out with default settings
serverless = new Serverless();
return serverless.init().then(() => {
options = {
| 7 |
diff --git a/test/e2e/display.test.js b/test/e2e/display.test.js @@ -82,7 +82,7 @@ function assertDiffThresholdMet (diff) {
} else if (environmentIs(DEVICES.IOS)) {
threshold = 0.25;
} else if (environmentIs(BROWSERS.EDGE)) {
- threshold = 0.05;
+ threshold = 0.09;
}
if (threshold) assert(diff <= threshold, `${diff} is above the threshold of ${threshold}`);
else assert.strictEqual(diff, 0);
| 3 |
diff --git a/Source/Core/Quaternion.js b/Source/Core/Quaternion.js @@ -183,9 +183,7 @@ define([
* negative z axis. Pitch is the rotation about the negative y axis. Roll is the rotation about
* the positive x axis.
*
- * @param {Number} heading The heading angle in radians.
- * @param {Number} pitch The pitch angle in radians.
- * @param {Number} roll The roll angle in radians.
+ * @param {HeadingPitchRoll} headingPitchRoll The rotation expressed as a heading, pitch and roll.
* @param {Quaternion} [result] The object onto which to store the result.
* @returns {Quaternion} The modified result parameter or a new Quaternion instance if none was provided.
*/
| 3 |
diff --git a/infra/token-transfer-server/src/lib/email.js b/infra/token-transfer-server/src/lib/email.js @@ -5,6 +5,7 @@ const template = require('lodash/template')
const sendgridMail = require('@sendgrid/mail')
const jwt = require('jsonwebtoken')
const mjml2html = require('mjml')
+const Sequelize = require('sequelize')
const { User } = require('../models')
const {
@@ -122,11 +123,18 @@ async function sendEmail(to, emailType, vars) {
async function sendLoginToken(email) {
// Check the user exists before sending an email code.
- const user = await User.findOne({ where: { email } })
+ const user = await User.findOne({
+ where: {
+ email: Sequelize.where(
+ Sequelize.fn('lower', Sequelize.col('email')),
+ Sequelize.fn('lower', email)
+ )
+ }
+ })
if (user) {
const token = jwt.sign(
{
- email
+ email: user.email
},
encryptionSecret,
{ expiresIn: '30m' }
| 8 |
diff --git a/src/components/Modal.js b/src/components/Modal.js @@ -5,6 +5,8 @@ const FocusTrap = require('focus-trap-react');
const Button = require('./Button');
const Icon = require('./Icon');
+const _merge = require('lodash/merge');
+
const { themeShape } = require('../constants/App');
const StyleUtils = require('../utils/Style');
@@ -35,6 +37,7 @@ class Modal extends React.Component {
showScrim: PropTypes.bool,
showTitleBar: PropTypes.bool,
style: PropTypes.object,
+ styles: PropTypes.object,
theme: themeShape,
title: PropTypes.string,
tooltip: PropTypes.string,
@@ -223,7 +226,7 @@ class Modal extends React.Component {
}
styles = theme => {
- return {
+ return _merge({}, {
scrim: {
zIndex: 1000,
position: 'fixed',
@@ -330,7 +333,7 @@ class Modal extends React.Component {
width: 400,
textAlign: 'center'
}
- };
+ }, this.props.styles);
};
}
| 11 |
diff --git a/shared/js/background/classes/tab.es6.js b/shared/js/background/classes/tab.es6.js @@ -115,15 +115,6 @@ class Tab {
}
};
- addBlockedAsset (url, type) {
- this.blockedAssets.push({url, type})
- };
-
- // return list of asset urls of specific type
- getBlockedAssets (types) {
- return this.blockedAssets.filter(asset => types.includes(asset.type)).map(asset => asset.url)
- };
-
endStopwatch () {
this.stopwatch.end = Date.now()
this.stopwatch.completeMs = (this.stopwatch.end - this.stopwatch.begin)
| 2 |
diff --git a/articles/clients/client-grant-types.md b/articles/clients/client-grant-types.md @@ -149,6 +149,10 @@ Trusted first-party clients can additionally use the following `grant_types`:
* `http://auth0.com/oauth/grant-type/mfa-otp`
* `http://auth0.com/oauth/grant-type/mfa-recovery-code`
+::: note
+If you are using the [Dashboard](${manage_url}) to enable or disable these grant types, note that all the Password and MFA grant types are enabled when you add the `Password` or `MFA` grant type on your client. You cannot select these individually.
+:::
+
## Secure Alternatives to the Legacy Grant Types
If you're currently using a legacy grant type, refer to the chart below to see which of the secure alternatives you should use instead.
| 0 |
diff --git a/token-metadata/0x111111111117dC0aa78b770fA6A738034120C302/metadata.json b/token-metadata/0x111111111117dC0aa78b770fA6A738034120C302/metadata.json "symbol": "1INCH",
"address": "0x111111111117dC0aa78b770fA6A738034120C302",
"decimals": 18,
- "dharmaVerificationStatus": "UNVERIFIED"
+ "dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
| 3 |
diff --git a/articles/users/search/v3/query-syntax.md b/articles/users/search/v3/query-syntax.md @@ -26,7 +26,8 @@ You can search for users using the following fields:
* Booleans
* Numeric (integer or double)
* Text
- * Arrays. You can search for strings and numerics in metadata arrays on the root object, but not in nested fields.
+ * Objects. In order to search a scalar value nested in another object, use the path to the field. For example, `app_metadata.subscription.plan:"gold"`
+ * Arrays. In order to search fields in objects nested arrays, use the path to the field and ignore the array level. For example, `user_metadata.addresses.city:"Paris"`
Range and wildcard searches are not available on [user metadata](/metadata) fields.
| 3 |
diff --git a/js/webcomponents/bisweb_mainviewerapplication.js b/js/webcomponents/bisweb_mainviewerapplication.js @@ -268,10 +268,8 @@ class ViewerApplicationElement extends HTMLElement {
// --------------------------------------------------------------------------------
/** Save image from viewer to a file */
saveImage(fname, viewerno = 0) {
- let index = viewerno + 1;
let img = this.VIEWERS[viewerno].getimage();
- let name = "image " + index;
- bisweb_apputil.saveImage(img, fname, name);
+ bisweb_apputil.saveImage(img, null, name);
}
getSaveImageInitialFilename(viewerno = 0) {
| 2 |
diff --git a/token-metadata/0xa960d2bA7000d58773E7fa5754DeC3Bb40A069D5/metadata.json b/token-metadata/0xa960d2bA7000d58773E7fa5754DeC3Bb40A069D5/metadata.json "symbol": "ODEX",
"address": "0xa960d2bA7000d58773E7fa5754DeC3Bb40A069D5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/public/index.html b/public/index.html f.parentNode.insertBefore(j, f)
})(window, document, 'script', 'dataLayer', 'GTM-PZJ7X57')
</script>
+ <script>
+ var oldErrorHandler = window.onerror;
+ window.onerror = function newErrorHandler(m, u, l, c, error) {
+ if(error && error.name === 'SyntaxError' && error.message.startsWith("Unexpected token '<'")) {
+ window.location.reload(true)
+ }
+
+ if (oldErrorHandler) return oldErrorHandler(m, u, l, c, error);
+ return false;
+ }
+ </script>
<script>
window['_fs_debug'] = false
window['_fs_host'] = 'fullstory.com'
| 0 |
diff --git a/lambda_permissions.go b/lambda_permissions.go @@ -69,6 +69,9 @@ type BasePermission struct {
}
func (perm *BasePermission) sourceArnExpr(joinParts ...gocf.Stringable) *gocf.StringExpr {
+ if perm.SourceArn == nil {
+ return nil
+ }
stringARN, stringARNOk := perm.SourceArn.(string)
if stringARNOk && strings.Contains(stringARN, "arn:aws:") {
return gocf.String(stringARN)
@@ -1073,3 +1076,142 @@ func (perm CloudWatchLogsPermission) descriptionInfo() ([]descriptionNode, error
//
// END - CloudWatchLogsPermission
///////////////////////////////////////////////////////////////////////////////////
+
+/*
+{
+ "configurationId": "5af0e618-67c7-4cfc-be51-9509194b9414",
+ "triggers": [
+ {
+ "name": "codeCommitTrigger",
+ "destinationArn": "arn:aws:lambda:us-west-2:027159405834:function:codeCommitTriggered",
+ "branches": [],
+ "events": [
+ "all"
+ ]
+ }
+ ]
+}
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// START - CodeCommitPermission
+//
+// arn:aws:codecommit:us-west-2:123412341234:myRepo
+var codeCommitSourceArnParts = []gocf.Stringable{
+ gocf.String("arn:aws:codecommit:"),
+ gocf.Ref("AWS::Region"),
+ gocf.String(":"),
+ gocf.Ref("AWS::AccountId"),
+ gocf.String(":"),
+}
+
+// CodeCommitPermission struct encapsulates the data necessary
+// to trigger the owning LambdaFunction in response to
+// CodeCommit events
+type CodeCommitPermission struct {
+ BasePermission
+ // RepositoryName
+ RepositoryName *gocf.StringExpr
+ // Branches to register for
+ Branches []string `json:"branches,omitempty"`
+ // Events to subscribe to. Defaults to "all" if empty.
+ Events []string `json:"events,omitempty"`
+}
+
+func (perm CodeCommitPermission) export(serviceName string,
+ lambdaFunctionDisplayName string,
+ lambdaLogicalCFResourceName string,
+ template *gocf.Template,
+ S3Bucket string,
+ S3Key string,
+ logger *logrus.Logger) (string, error) {
+
+ principal := gocf.Join("",
+ gocf.String("codecommit."),
+ gocf.Ref("AWS::Region"),
+ gocf.String(".amazonaws.com"))
+
+ sourceArnExpression := perm.BasePermission.sourceArnExpr(codeCommitSourceArnParts...)
+
+ targetLambdaResourceName, err := perm.BasePermission.export(principal,
+ codeCommitSourceArnParts,
+ lambdaFunctionDisplayName,
+ lambdaLogicalCFResourceName,
+ template,
+ S3Bucket,
+ S3Key,
+ logger)
+
+ if nil != err {
+ return "", errors.Wrap(err, "Failed to export CodeCommit permission")
+ }
+
+ // Make sure that the handler that manages triggers is registered.
+ configuratorResName, err := EnsureCustomResourceHandler(serviceName,
+ cfCustomResources.CodeCommitLambdaEventSource,
+ sourceArnExpression,
+ []string{},
+ template,
+ S3Bucket,
+ S3Key,
+ logger)
+
+ if nil != err {
+ return "", errors.Wrap(err, "Exporing CodeCommit permission handler")
+ }
+
+ // Add a custom resource invocation for this configuration
+ //////////////////////////////////////////////////////////////////////////////
+ newResource, newResourceError := newCloudFormationResource(cfCustomResources.CodeCommitLambdaEventSource,
+ logger)
+ if nil != newResourceError {
+ return "", newResourceError
+ }
+ repoEvents := perm.Events
+ if len(repoEvents) <= 0 {
+ repoEvents = []string{"all"}
+ }
+ customResource := newResource.(*cfCustomResources.CodeCommitLambdaEventSourceResource)
+ customResource.ServiceToken = gocf.GetAtt(configuratorResName, "Arn")
+ customResource.LambdaTargetArn = gocf.GetAtt(lambdaLogicalCFResourceName, "Arn")
+ customResource.TriggerName = gocf.Ref(lambdaLogicalCFResourceName).String()
+ customResource.RepositoryName = perm.RepositoryName
+ customResource.Events = repoEvents
+ customResource.Branches = perm.Branches
+
+ // Name?
+ resourceInvokerName := CloudFormationResourceName("ConfigCodeCommit",
+ lambdaLogicalCFResourceName,
+ perm.BasePermission.SourceAccount)
+
+ // Add it
+ cfResource := template.AddResource(resourceInvokerName, customResource)
+ cfResource.DependsOn = append(cfResource.DependsOn,
+ targetLambdaResourceName,
+ configuratorResName)
+ return "", nil
+}
+
+func (perm CodeCommitPermission) descriptionInfo() ([]descriptionNode, error) {
+ nodes := make([]descriptionNode, 0)
+ if len(perm.Branches) <= 0 {
+ nodes = append(nodes, descriptionNode{
+ Name: describeInfoValue(perm.SourceArn),
+ Relation: "all",
+ })
+ } else {
+ for _, eachBranch := range perm.Branches {
+ filterRel := fmt.Sprintf("%s (%#v)",
+ eachBranch,
+ perm.Events)
+ nodes = append(nodes, descriptionNode{
+ Name: describeInfoValue(perm.SourceArn),
+ Relation: filterRel,
+ })
+ }
+ }
+ return nodes, nil
+}
+
+// END - CodeCommitPermission
+///////////////////////////////////////////////////////////////////////////////////
| 9 |
diff --git a/src/components/Pane/Pane.js b/src/components/Pane/Pane.js @@ -6,6 +6,7 @@ import type { ComponentType } from "react";
import { Column, MainContainer, SelectorLabelContainer, SelectorDescription, SelectorLabel, SelectorContainer } from "./Pane.styles";
import { useLocation} from "react-router";
import { Link } from "react-router-dom";
+import useResponsiveLayout from "../../hooks/useResponsiveLayout";
export const ColumnEntry: ComponentType<*> = ({id, label, description, children, parentPath, nextColumn }) => {
@@ -16,12 +17,12 @@ export const ColumnEntry: ComponentType<*> = ({id, label, description, children,
return children
}
- const active = pathname.indexOf(id) > -1;
+ const active = pathname.split("/").indexOf(id) > -1;
return <SelectorContainer isActive={ active }>
<Link className={ "govuk-link govuk-link--no-visited-state govuk-link--no-underline " }
to={ active ? parentPath : `${parentPath}/${id}` }>
- <SelectorLabelContainer>
+ <SelectorLabelContainer isActive={ active }>
<SelectorLabel isActive={ active }>{ label }</SelectorLabel>
</SelectorLabelContainer>
{
| 7 |
diff --git a/articles/connections/social/salesforce-community.md b/articles/connections/social/salesforce-community.md @@ -49,7 +49,7 @@ While setting up your app, make sure you use the following settings:
| Field | Value to Provide |
| - | - |
| API (Enable OAuth Settings) | Click `Enable OAuth Settings` |
-| Callback URL | `${manage_url}.auth0.com/login/callback` |
+| Callback URL | `https://${account.namespace}/login/callback` |
| Selected OAuth Scopes | Add `Access your basic information` |
<%= include('../../connections/_find-auth0-domain-redirects') %>
| 3 |
diff --git a/tests/phpunit/integration/Core/Storage/SettingTest.php b/tests/phpunit/integration/Core/Storage/SettingTest.php @@ -142,7 +142,7 @@ class SettingTest extends TestCase {
$setting = new FakeSetting( new Options( $this->context ) );
// Without callback, value should be passed through.
- $this->assertEquals( '1234', $setting->validate( '1234' ) );
+ $this->assertSame( '1234', $setting->validate( '1234' ) );
$setting->set_validate_callback(
function( $value ) {
@@ -154,7 +154,7 @@ class SettingTest extends TestCase {
);
// With callback and valid value.
- $this->assertEquals( 1234, $setting->validate( $value ) );
+ $this->assertSame( 1234, $setting->validate( $value ) );
// With callback and invalid value.
$this->assertWPError( $setting->validate( '' ), 'Empty value.' );
| 4 |
diff --git a/src/error-rescue.js b/src/error-rescue.js @@ -143,7 +143,7 @@ module.exports = class KiteErrorRescue {
if (this.isSidebarOpen) {
this.update();
} else {
- vscode.commands.executeCommand('vscode.previewHtml', URI, vscode.ViewColumn.Two, 'Kite');
+ vscode.commands.executeCommand('vscode.previewHtml', URI, vscode.ViewColumn.Two, 'Kite Error Rescue');
this.isSidebarOpen = true;
}
}
| 10 |
diff --git a/css/tarteaucitron.css b/css/tarteaucitron.css @@ -784,3 +784,16 @@ a.tarteaucitronSelfLink {
span.tarteaucitronTitle.tarteaucitronH3 {
margin-top: 12px!important;
}
+
+.spacer-20 {
+ height: 20px;
+ display: block;
+}
+
+.display-block {
+ display: block;
+}
+
+.display-none {
+ display: none;
+}
| 5 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -198,17 +198,11 @@ const animationsIdleArrays = {
run: {name: 'idle.fbx'},
crouch: {name: 'Crouch Idle.fbx'},
};
-let animations;
-// let walkingAnimations;
-// let walkingBackwardAnimations;
-// let runningAnimations;
-// let runningBackwardAnimations;
+let animations;
+let animationsSkeleton;
let jumpAnimation;
-// let sittingAnimation;
let floatAnimation;
-// let rifleAnimation;
-// let hitAnimation;
let useAnimations;
let sitAnimations;
let danceAnimations;
@@ -217,10 +211,33 @@ let crouchAnimations;
let activateAnimations;
let narutoRunAnimations;
const loadPromise = (async () => {
+ await Promise.resolve(); // wait for metaversefile to be defined
+
+ await Promise.all([
+ (async () => {
const res = await fetch('../animations/animations.cbor');
const arrayBuffer = await res.arrayBuffer();
animations = CBOR.decode(arrayBuffer).animations
.map(a => THREE.AnimationClip.parse(a));
+ })(),
+ (async () => {
+ const srcUrl = '../animations/animations-skeleton.glb';
+
+ let o;
+ try {
+ o = await new Promise((accept, reject) => {
+ const {gltfLoader} = metaversefile.useLoaders();
+ gltfLoader.load(srcUrl, accept, function onprogress() {}, reject);
+ });
+ } catch(err) {
+ console.warn(err);
+ }
+ if (o) {
+ animationsSkeleton = getSkeleton(o);
+ console.log('got animations skeleton', o, animationsSkeleton);
+ }
+ })(),
+ ]);
for (const k in animationsAngleArrays) {
const as = animationsAngleArrays[k];
| 0 |
diff --git a/packages/app/src/server/models/in-app-notification.ts b/packages/app/src/server/models/in-app-notification.ts @@ -4,6 +4,7 @@ import {
} from 'mongoose';
import mongoosePaginate from 'mongoose-paginate-v2';
import ActivityDefine from '../util/activityDefine';
+import { ActivityDocument } from './activity';
import { getOrCreateModel } from '../util/mongoose-utils';
import loggerFactory from '../../utils/logger';
@@ -20,7 +21,7 @@ export interface InAppNotificationDocument extends Document {
targetModel: string
target: Types.ObjectId
action: string
- activities: Types.ObjectId[]
+ activities: ActivityDocument[]
status: string
createdAt: Date
}
| 7 |
diff --git a/layouts/partials/header.html b/layouts/partials/header.html <div id="header-menu-wrap" data-js-header-menu-wrap>
<nav id="header-main-menu">
<a class="menu-link" href='{{ site.Param "landingURL" }}/pricing' onclick="sendGtag('Pricing_clicked', 'CodemagicMenu')" target="_blank">Pricing</a>
- <a class="menu-link" href='{{ site.Param "landingURL" }}/business' onclick="sendGtag('Business_clicked', 'CodemagicMenu')" target="_blank">Business</a>
+ <a class="menu-link" href='{{ site.Param "landingURL" }}/enterprise'
+ onclick="sendGtag('Enterprise_clicked', 'CodemagicMenu')" target="_blank">
+ Enterprise
+ </a>
<a class="menu-link" href='/' onclick="sendGtag('Documentation_clicked', 'CodemagicMenu')">Documentation</a>
<a class="menu-link" href='{{ site.Param "blogURL" }}' onclick="sendGtag('Blog_clicked', 'CodemagicMenu')" target="_blank">Blog</a>
<a class="menu-link" href='{{ site.Param "landingURL" }}/integrations' onclick="sendGtag('Integrations_clicked', 'CodemagicMenu')" target="_blank">Integrations</a>
| 10 |
diff --git a/HeroSystem6e/HeroSystem6e.js b/HeroSystem6e/HeroSystem6e.js -var Hero6Playable = Hero6Playable || (function() {
+var HeroSystem6e = HeroSystem6e || (function() {
'use strict';
- var version = '1.0',
- lastUpdate = 1529297199799,
+ var version = '1.1',
+ lastUpdate = 1531368487971,
lastBody = 0,
checkInstall = function() {
var updated = new Date(lastUpdate);
- log('[ Hero6Playable v'+version+', ' + updated.getFullYear() + "/" + (updated.getMonth()+1) + "/" + updated.getDate() + " ]");
+ log('[ HeroSystem6e v'+version+', ' + updated.getFullYear() + "/" + (updated.getMonth()+1) + "/" + updated.getDate() + " ]");
},
getChat = function(msg) {
@@ -153,7 +153,10 @@ var Hero6Playable = Hero6Playable || (function() {
});
- if(has_dice === true ) return body;
+ if(has_dice === true ) {
+ lastBody = body;
+ return body;
+ }
else return NaN;
},
@@ -336,6 +339,6 @@ var Hero6Playable = Hero6Playable || (function() {
on('ready',function() {
'use strict';
- Hero6Playable.CheckInstall();
- Hero6Playable.RegisterEventHandlers();
+ HeroSystem6e.CheckInstall();
+ HeroSystem6e.RegisterEventHandlers();
});
| 3 |
diff --git a/src/lib/gundb/UserPropertiesClass.js b/src/lib/gundb/UserPropertiesClass.js @@ -65,8 +65,7 @@ export default class UserProperties {
* @returns {Promise<void>}
*/
async set(field: string, value: any) {
- this.data[field] = value
- await this.gun.secret(this.data)
+ await this.updateAll({ [field]: value })
return true
}
| 3 |
diff --git a/src/components/small-item-table/index.js b/src/components/small-item-table/index.js @@ -75,7 +75,7 @@ function SmallItemTable(props) {
const data = useMemo(() => {
let returnData = items.map((itemData) => {
- return {
+ const formattedItem = {
id: itemData.id,
name: itemData.name,
shortName: itemData.shortName,
@@ -84,12 +84,20 @@ function SmallItemTable(props) {
lastLowPrice: itemData.lastLowPrice,
// iconLink: `https://assets.tarkov-tools.com/${itemData.id}-icon.jpg`,
iconLink: itemData.iconLink || `${process.env.PUBLIC_URL}/images/unknown-item-icon.jpg`,
+ instaProfit: 0,
itemLink: `/item/${itemData.normalizedName}`,
- instaProfit: itemData.lastLowPrice ? (itemData.traderPrice - itemData.lastLowPrice) : 0,
traderName: itemData.traderName,
traderPrice: itemData.traderPrice,
types: itemData.types,
+ };
+
+ const buyOnFleaPrice = itemData.buyFor.find(buyPrice => buyPrice.source === 'flea-market');
+
+ if(buyOnFleaPrice){
+ formattedItem.instaProfit = itemData.traderPrice - buyOnFleaPrice.price;
}
+
+ return formattedItem;
})
.filter(item => {
return !item.types.includes('disabled');
| 4 |
diff --git a/templates/master/elasticsearch/schema/qna.js b/templates/master/elasticsearch/schema/qna.js @@ -66,6 +66,16 @@ module.exports={
type:"string",
description:"Enter your lambda function name/ARN to dynamically create or modify answers, or to redirect to a different question.",
title:"Lambda Hook"
+ },
+ args:{
+ title:"Lambda Hook Arguments",
+ description:"If you named a lambda hook above and it requires additional information beyond what you've entered for this document, enter that information here. These fields will not do anything unless the lambda hook you named has been coded to handle them specifically.",
+ type:"array",
+ items:{
+ title:"Question",
+ type:"string",
+ maxLength:140
+ }
}
},
required:["qid","q","a"]
| 3 |
diff --git a/test/statementTests.js b/test/statementTests.js @@ -199,8 +199,9 @@ describe('Test statements', function() {
'if (true) {',
' function foo() {}',
' abstract class foo {}',
- ' trait foo {}',
' final class foo {}',
+ ' class foo {}',
+ ' trait foo {}',
' interface foo {}',
'}'
].join('\n'), {
| 7 |
diff --git a/lib/carto/dbdirect/firewall_manager.rb b/lib/carto/dbdirect/firewall_manager.rb @@ -49,7 +49,7 @@ module Carto
@service.delete_firewall(config['project_id'], name)
rescue Google::Apis::ClientError => error
- # error.message =~ /^notFound:/
+ raise unless error.message =~ /^notFound:/
end
def create_rule(project_id:, name:, network:, ips:, target_tag:, ports:)
| 8 |
diff --git a/lib/cartodb/controllers/named_maps_admin.js b/lib/cartodb/controllers/named_maps_admin.js @@ -136,7 +136,7 @@ NamedMapsAdminController.prototype.update = function () {
};
NamedMapsAdminController.prototype.retrieve = function () {
- return function updateTemplateMiddleware (req, res, next) {
+ return function retrieveTemplateMiddleware (req, res, next) {
req.profiler.start('windshaft-cartodb.get_template');
const { user } = res.locals;
| 10 |
diff --git a/src/encoded/tests/test_types_biosample.py b/src/encoded/tests/test_types_biosample.py @@ -158,6 +158,7 @@ def test_biosample_summary_construct(testapp,
'biosample_term_name': 'liver',
'biosample_type': 'tissue',
'constructs': [construct['@id']],
+ 'transfection_type': 'stable',
'model_organism_age': '10',
'model_organism_age_units': 'day',
'model_organism_sex': 'female',
@@ -166,4 +167,4 @@ def test_biosample_summary_construct(testapp,
res = testapp.get(biosample_1['@id']+'@@index-data')
assert res.json['object']['summary'] == \
'Drosophila melanogaster liver tissue ' + \
- 'female (10 days) expressing C-terminal ATF4 fusion protein under daf-2 promoter'
+ 'female (10 days) stably expressing C-terminal ATF4 fusion protein under daf-2 promoter'
| 1 |
diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl @@ -46,6 +46,8 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
font-size: 1.1em
margin-top: 3px
display: flex
+ &:hover
+ background-color: darken(white, 8%)
.check-box
margin-top: 5px
@@ -54,6 +56,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
border-right: 2px solid #3cb500
.item-title
+ flex-grow: 1
padding-left: 10px;
&.is-checked
color: #8c8c8c
| 7 |
diff --git a/runtime/opensbp/parser.js b/runtime/opensbp/parser.js @@ -144,7 +144,7 @@ Parser.prototype._transform = function(chunk, enc, cb) {
}
Parser.prototype._flush = function(done) {
- if (this.scrap) { this.push(parseLine(scrap)); }
+ if (this.scrap) { this.push(parseLine(this.scrap)); }
this.scrap = '';
done();
};
| 1 |
diff --git a/src/core/operations/Lorenz.mjs b/src/core/operations/Lorenz.mjs * @license Apache-2.0
*/
-import Operation from "../Operation";
-import OperationError from "../errors/OperationError";
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
/**
* Lorenz operation
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -7588,7 +7588,7 @@ var $$IMU_EXPORT$$;
var cache_key = "tiktok_watermarkfree:" + vidid;
api_cache.fetch(cache_key, cb, function(done) {
do_request({
- url: "https://api2.musical.ly/aweme/v1/playwm/?video_id=" + vidid,
+ url: "https://api2.musical.ly/aweme/v1/playwm/?video_id=" + vidid + "&improve_bitrate=1&ratio=1080p",
headers: {
Referer: ""
},
| 7 |
diff --git a/src/system/dom.js b/src/system/dom.js import * as event from "./event.js";
+import { nodeJS } from "./platform.js";
// track if DOMContentLoaded was called already
let readyBound = false;
@@ -51,7 +52,7 @@ export function DOMContentLoaded(fn) {
// bind dom load event if not done yet
if (!readyBound) {
// directly call domReady if document is already "ready"
- if (((typeof process !== "undefined") && (process.release.name === "node")) || (typeof globalThis.document !== "undefined" && globalThis.document.readyState === "complete")) {
+ if (nodeJS === true || typeof globalThis.document !== "undefined" && globalThis.document.readyState === "complete") {
// defer the fn call to ensure our script is fully loaded
globalThis.setTimeout(_domReady, 0);
}
| 1 |
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml %h1
Hack Week
%small
- \- Innovate, collaborate, and learn!
+ \- Innovate, collaborate, and learn.
%p.lead
- In the past Hack Week has incubated software that brought SUSE products forward
- like the openSUSE ARM port, projects that benefit the whole open source
- ecosystem like
+ In the past Hack Week has incubated software that brought SUSE products
+ to life like the
+ = link_to 'openSUSE ARM port,', 'https://en.opensuse.org/Portal:ARM'
+ projects that benefit the whole free software ecosystem like
= link_to 'Inqlude', "https://inqlude.org/"
(a Qt library archive) and tools like
= link_to 'Jangouts', 'https://github.com/jangouts/jangouts'
- (open source video conferencing) that our engineers came up with to scratch
- their own itch. What are you going to hack on?
+ (open source video conferencing)
+ that our engineers came up with to scratch their own itch. What are you
+ going to add to this collection?
+
%h3 Innovate
%p
- Use this opportunity to work on any activity of your passion.
- You choose if you contribute to an existing open source
- project or if you explore strange new languages, seek out new
- tools and new communities, if you boldly go where no hacker
- has gone before! Just
+ Use this opportunity to work on any activity of your passion. You choose
+ if you contribute to an existing free software project or if you explore
+ strange new languages, seek out new tools and new communities, if you
+ boldly go where no hacker has gone before! Just
= link_to 'record your ideas,', new_project_path
- about what people could hack on, in this tool.
+ about what people could hack on in this tool.
%p
- And be open-minded, supportive, and respectful. Hack Week is a happy
- and constructive place. Support ideas you like, ignore ideas you
- don't like. Help to improve ideas of others, and accept help to
- improve your own. Hack Week is about discourse and open discussion.
- Please approach innovation with and open mind, respect, and the
- desire to support your fellow hackers!
+ And be open-minded, supportive, and respectful. Hack Week is a happy and
+ constructive place. Support ideas you like, ignore ideas you don't like.
+ Help to improve ideas of others, and accept help to improve your own. Hack
+ Week is about discourse and open discussion. Please approach innovation
+ with an open mind, respect, and the desire to support your fellow hackers!
%h3 Collaborate
%p
- We encourage you to find like-minded developers and team up
- to multiply your hacking power. Take the opportunity to work
- with people from other teams, departments or locations.
- Get together at an office, make use of all the nice
- things the Internet provides to collaborate remotely.
-
+ We encourage you to find like-minded developers and team up to multiply
+ your hacking power. Use the opportunity to work with people from other
+ teams, departments or locations. Get together in an office and make use of
+ all the nice things the Internet provides to collaborate remotely.
%p
- Remember: we are an open company, and work transparently on open source
- code. Share your code on the platform of your choice, and
- reference it from your project. Then let the community and the rest
- of the world know about what you are doing. Blog, tweet, publish videos,
- shout it from the roof tops so people can pick up your project,
- copy, distribute, study, change and improve it!
+ Remember: we are an open company, and work transparently on free software.
+ Share your code on the platform of your choice, and reference it from your
+ project. Then let the community and the rest of the world know about what
+ you are doing. Blog, tweet, publish videos, shout it from the roof tops so
+ people can pick up your project, copy, distribute, study, change and
+ improve it!
%h3 Learn
%p
- Hack Week is also the time to pick up new tricks, by yourself
- and from each other. Use this week to expand your horizon and maybe
- even crack the books. Acquire new information, reinforce what you know,
- adapt your behavior and expand your skills!
+ Hack Week is also the time to pick up new tricks, by yourself and from
+ each other. Use this week to expand your horizon and maybe even crack the
+ books. Acquire new information, reinforce what you know, adapt your
+ behavior and expand your skills!
%h3.text-success And don't forget to have a lot of fun ...
%p
| 1 |
diff --git a/resource/js/util/Crowi.js b/resource/js/util/Crowi.js @@ -142,12 +142,11 @@ export default class Crowi {
if (res.data.ok) {
resolve(res.data);
} else {
- // FIXME?
reject(new Error(res.data));
}
- }).catch(res => {
- // FIXME?
- reject(new Error('Error'));
+ })
+ .catch(res => {
+ reject(res);
});
});
}
| 7 |
diff --git a/src/component/parent/drivers.js b/src/component/parent/drivers.js @@ -109,6 +109,7 @@ RENDER_DRIVERS[CONTEXT_TYPES.IFRAME] = {
getInitialDimensions: DELEGATE.CALL_ORIGINAL,
renderTemplate: DELEGATE.CALL_ORIGINAL,
+ openContainerFrame: DELEGATE.CALL_ORIGINAL,
open(original, override) {
return function() {
@@ -231,7 +232,8 @@ if (__POPUP_SUPPORT__) {
destroyComponent: DELEGATE.CALL_ORIGINAL,
resize: DELEGATE.CALL_ORIGINAL,
getInitialDimensions: DELEGATE.CALL_ORIGINAL,
- renderTemplate: DELEGATE.CALL_ORIGINAL
+ renderTemplate: DELEGATE.CALL_ORIGINAL,
+ openContainerFrame: DELEGATE.CALL_ORIGINAL
},
loadUrl(url) {
| 11 |
diff --git a/src/test-utils/createShallow.js b/src/test-utils/createShallow.js @@ -25,9 +25,5 @@ export default function createShallow(
shallowWithContext.context = context;
- shallowWithContext.cleanUp = () => {
- styleManager.reset();
- };
-
return shallowWithContext;
}
| 2 |
diff --git a/app/lib/components/Peers.jsx b/app/lib/components/Peers.jsx @@ -25,12 +25,7 @@ class Peers extends React.Component
updateDimensions()
{
- const n = this.props.videoStreams ? this.props.videoStreams : 0;
-
- if (n == 0)
- {
- return;
- }
+ const n = this.props.peers.length;
const width = this.refs.peers.clientWidth;
const height = this.refs.peers.clientHeight;
| 4 |
diff --git a/package.json b/package.json "build": "lerna run build --scope @semcore/icon && lerna run build --scope @semcore/* --ignore @semcore/icon,@semcore/ui",
"typecheck": "lerna exec --scope @semcore/* -- tsc --noEmit",
"prebuild": "rm -rf semcore/**/lib && find semcore/icon/. -type d -maxdepth 1 | egrep -v \"__tests__|src|svg|svg-new\" | xargs rm -rf || true",
- "test": "jest --no-cache",
+ "test": "NODE_ENV=test jest --no-cache",
"playground": "yarn workspace @semcore/playground start",
"analyze": "yarn workspace @semcore/analyzer start",
"pub": "super-publisher --root ./semcore",
| 0 |
diff --git a/lib/utils.js b/lib/utils.js @@ -132,7 +132,7 @@ const isPlainObject = (val) => {
}
const prototype = getPrototypeOf(val);
- return prototype === null || prototype === Object.prototype;
+ return (prototype === null || prototype === Object.prototype || Object.getPrototypeOf(prototype) === null) && !(Symbol.toStringTag in val) && !(Symbol.iterator in val);
}
/**
| 7 |
diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx @@ -477,7 +477,8 @@ class SmartForm extends Component {
// get nested schema
// for each nested field, get field object by calling createField recursively
field.nestedFields = this.getFieldNames({
- schema: field.nestedSchema
+ schema: field.nestedSchema,
+ addExtraFields: false
}).map(subFieldName => {
return this.createField(
subFieldName,
| 1 |
diff --git a/src/client/js/components/Admin/SlackIntegration/OfficialBotSettings.jsx b/src/client/js/components/Admin/SlackIntegration/OfficialBotSettings.jsx import React from 'react';
import { useTranslation } from 'react-i18next';
-import OfficialBotSettingsAccordion from './CustomBotWithoutProxySettingsAccordion';
+import OfficialBotSettingsAccordion from './OfficialbotSettingsAccordion';
const OfficialBotSettings = () => {
const { t } = useTranslation();
| 10 |
diff --git a/src/web/workers/ZipWorker.mjs b/src/web/workers/ZipWorker.mjs @@ -26,10 +26,6 @@ self.addEventListener("message", function(e) {
log.error("No filename was passed to the ZipWorker");
return;
}
- if (!r.hasOwnProperty("fileExtension")) {
- log.error("No file extension was passed to the ZipWorker");
- return;
- }
self.zipFiles(r.outputs, r.filename, r.fileExtension);
});
@@ -55,7 +51,7 @@ self.zipFiles = async function(outputs, filename, fileExtension) {
const cloned = new Dish(outputs[iNum].data.dish);
const output = new Uint8Array(await cloned.get(Dish.ARRAY_BUFFER));
- if (fileExtension === "") {
+ if (fileExtension === undefined || fileExtension === "") {
// Detect automatically
const types = detectFileType(output);
if (!types.length) {
| 2 |
diff --git a/includes/Modules/AdSense.php b/includes/Modules/AdSense.php @@ -783,24 +783,4 @@ tag_partner: "site_kit"
protected function setup_settings() {
return new Settings( $this->options );
}
-
- /**
- * Transforms an exception into a WP_Error object.
- *
- * @since 1.4.0
- *
- * @param Exception $e Exception object.
- * @param string $datapoint Datapoint originally requested.
- * @return WP_Error WordPress error object.
- */
- protected function exception_to_error( Exception $e, $datapoint ) {
- if ( in_array( $datapoint, array( 'accounts', 'alerts', 'clients', 'urlchannels' ), true ) ) {
- $errors = json_decode( $e->getMessage() );
- if ( $errors ) {
- return new WP_Error( $e->getCode(), $errors, array( 'status' => 500 ) );
- }
- }
-
- return parent::exception_to_error( $e, $datapoint );
- }
}
| 2 |
diff --git a/assets/js/modules/pagespeed-insights/components/ReportMetric.js b/assets/js/modules/pagespeed-insights/components/ReportMetric.js @@ -67,12 +67,7 @@ export default function ReportMetric( {
<div className="googlesitekit-pagespeed-report-metric-value__number">
{ displayValue }
</div>
- <div
- className={ classnames(
- 'googlesitekit-pagespeed-report-metric-value__rating',
- 'googlesitekit-uppercase'
- ) }
- >
+ <div className="googlesitekit-pagespeed-report-metric-value__rating">
{ category === CATEGORY_FAST && _x( 'Good', 'Performance rating', 'google-site-kit' ) }
{ category === CATEGORY_AVERAGE && _x( 'Needs improvement', 'Performance rating', 'google-site-kit' ) }
{ category === CATEGORY_SLOW && _x( 'Poor', 'Performance rating', 'google-site-kit' ) }
| 2 |
diff --git a/src/jsx.d.ts b/src/jsx.d.ts @@ -29,7 +29,8 @@ export namespace JSXInternal {
children: any;
}
- interface SVGAttributes extends HTMLAttributes<SVGElement> {
+ interface SVGAttributes<Target extends EventTarget = SVGElement>
+ extends HTMLAttributes<Target> {
accentHeight?: number | string;
accumulate?: 'none' | 'sum';
additive?: 'replace' | 'sum';
@@ -852,48 +853,48 @@ export namespace JSXInternal {
wbr: HTMLAttributes<HTMLElement>;
//SVG
- svg: SVGAttributes;
- animate: SVGAttributes;
- circle: SVGAttributes;
- clipPath: SVGAttributes;
- defs: SVGAttributes;
- desc: SVGAttributes;
- ellipse: SVGAttributes;
- feBlend: SVGAttributes;
- feColorMatrix: SVGAttributes;
- feComponentTransfer: SVGAttributes;
- feComposite: SVGAttributes;
- feConvolveMatrix: SVGAttributes;
- feDiffuseLighting: SVGAttributes;
- feDisplacementMap: SVGAttributes;
- feFlood: SVGAttributes;
- feGaussianBlur: SVGAttributes;
- feImage: SVGAttributes;
- feMerge: SVGAttributes;
- feMergeNode: SVGAttributes;
- feMorphology: SVGAttributes;
- feOffset: SVGAttributes;
- feSpecularLighting: SVGAttributes;
- feTile: SVGAttributes;
- feTurbulence: SVGAttributes;
- filter: SVGAttributes;
- foreignObject: SVGAttributes;
- g: SVGAttributes;
- image: SVGAttributes;
- line: SVGAttributes;
- linearGradient: SVGAttributes;
- marker: SVGAttributes;
- mask: SVGAttributes;
- path: SVGAttributes;
- pattern: SVGAttributes;
- polygon: SVGAttributes;
- polyline: SVGAttributes;
- radialGradient: SVGAttributes;
- rect: SVGAttributes;
- stop: SVGAttributes;
- symbol: SVGAttributes;
- text: SVGAttributes;
- tspan: SVGAttributes;
- use: SVGAttributes;
+ svg: SVGAttributes<SVGSVGElement>;
+ animate: SVGAttributes<SVGAnimateElement>;
+ circle: SVGAttributes<SVGCircleElement>;
+ clipPath: SVGAttributes<SVGClipPathElement>;
+ defs: SVGAttributes<SVGDefsElement>;
+ desc: SVGAttributes<SVGDescElement>;
+ ellipse: SVGAttributes<SVGEllipseElement>;
+ feBlend: SVGAttributes<SVGFEBlendElement>;
+ feColorMatrix: SVGAttributes<SVGFEColorMatrixElement>;
+ feComponentTransfer: SVGAttributes<SVGFEComponentTransferElement>;
+ feComposite: SVGAttributes<SVGFECompositeElement>;
+ feConvolveMatrix: SVGAttributes<SVGFEConvolveMatrixElement>;
+ feDiffuseLighting: SVGAttributes<SVGFEDiffuseLightingElement>;
+ feDisplacementMap: SVGAttributes<SVGFEDisplacementMapElement>;
+ feFlood: SVGAttributes<SVGFEFloodElement>;
+ feGaussianBlur: SVGAttributes<SVGFEGaussianBlurElement>;
+ feImage: SVGAttributes<SVGFEImageElement>;
+ feMerge: SVGAttributes<SVGFEMergeElement>;
+ feMergeNode: SVGAttributes<SVGFEMergeNodeElement>;
+ feMorphology: SVGAttributes<SVGFEMorphologyElement>;
+ feOffset: SVGAttributes<SVGFEOffsetElement>;
+ feSpecularLighting: SVGAttributes<SVGFESpecularLightingElement>;
+ feTile: SVGAttributes<SVGFETileElement>;
+ feTurbulence: SVGAttributes<SVGFETurbulenceElement>;
+ filter: SVGAttributes<SVGFilterElement>;
+ foreignObject: SVGAttributes<SVGForeignObjectElement>;
+ g: SVGAttributes<SVGGElement>;
+ image: SVGAttributes<SVGImageElement>;
+ line: SVGAttributes<SVGLineElement>;
+ linearGradient: SVGAttributes<SVGLinearGradientElement>;
+ marker: SVGAttributes<SVGMarkerElement>;
+ mask: SVGAttributes<SVGMaskElement>;
+ path: SVGAttributes<SVGPathElement>;
+ pattern: SVGAttributes<SVGPatternElement>;
+ polygon: SVGAttributes<SVGPolygonElement>;
+ polyline: SVGAttributes<SVGPolylineElement>;
+ radialGradient: SVGAttributes<SVGRadialGradientElement>;
+ rect: SVGAttributes<SVGRectElement>;
+ stop: SVGAttributes<SVGStopElement>;
+ symbol: SVGAttributes<SVGSymbolElement>;
+ text: SVGAttributes<SVGTextElement>;
+ tspan: SVGAttributes<SVGTSpanElement>;
+ use: SVGAttributes<SVGUseElement>;
}
}
| 7 |
diff --git a/contracts/Havven.sol b/contracts/Havven.sol @@ -167,8 +167,8 @@ contract Havven is ERC20Token, Owned {
uint public targetFeePeriodDurationSeconds = 1 weeks;
// And may not be set to be shorter than 1 day.
uint public constant minFeePeriodDurationSeconds = 1 days;
- // The actual measured duration of the last fee period.
- uint public lastFeePeriodDurationDecimal = 1;
+ // The actual measured duration of the last fee period (decimal seconds).
+ uint public lastFeePeriodDuration = 1;
// The quantity of nomins that were in the fee pot at the time
// of the last fee rollover (feePeriodStartTime).
| 10 |
diff --git a/src/components/sign/SignTransferDetails.js b/src/components/sign/SignTransferDetails.js @@ -175,7 +175,7 @@ const ActionMessage = ({ transaction, action, actionKind }) => (
const ActionWarrning = ({ actionKind, action }) => (
<Fragment>
{actionKind === 'functionCall' && (
- !!action?.args.length
+ !!action?.args?.length
? (
<>
<Translate id='arguments' />: {(Buffer.from(action.args).toString())}
| 9 |
diff --git a/README.md b/README.md @@ -159,7 +159,7 @@ Use the "Table of Contents" menu on the top-left corner to explore the list.
- [vite-plugin-plain-text](https://github.com/zheeeng/vite-plugin-plain-text) - A Vite plugin transforms the rule-matched file as plain text.
- [vite-plugin-virtual-html-template](https://github.com/hex-ci/vite-plugin-virtual-html-template) - HTML template for vite app, support flexible virtual URL.
- [vite-plugin-require-context](https://github.com/originjs/vite-plugins/tree/main/packages/vite-plugin-require-context) - A Vite plugin that supports `require.context` by code transforming.
-- [vite-remark-html](https://github.com/alloc/vite-remark-html) - Transform `.md` imports into HTML strings
+- [vite-remark-html](https://github.com/alloc/vite-remark-html) - Transform `.md` imports into HTML strings.
#### Helpers
| 1 |
diff --git a/src/og/terrain/GlobusTerrain.js b/src/og/terrain/GlobusTerrain.js @@ -146,8 +146,8 @@ class GlobusTerrain extends EmptyTerrain {
this._urlRewriteCallback = null;
this._ellToAltFn = [
- (lonLat, altEll, callback) => callback(altEll),
- (lonLat, altEll, callback) => callback(altEll - this._geoid.getHeightLonLat(lonLat)),
+ (lonLat, altEll, callback) => { callback(altEll); return true; },
+ (lonLat, altEll, callback) => { callback(altEll - this._geoid.getHeightLonLat(lonLat)); return true; },
(lonLat, altEll, callback) => {
let z = this.maxZoom;
@@ -165,7 +165,8 @@ class GlobusTerrain extends EmptyTerrain {
let altMsl = this._geoid.getHeightLonLat(lonLat);
if (cache) {
- return callback(altEll - (this._getGroundHeightMerc(merc, cache) + altMsl));
+ callback(altEll - (this._getGroundHeightMerc(merc, cache) + altMsl));
+ return true;
} else {
if (!this._fetchCache[tileIndex]) {
@@ -204,6 +205,8 @@ class GlobusTerrain extends EmptyTerrain {
}
});
}
+
+ return false;
},
];
}
| 0 |
diff --git a/.github/workflows/jest-cadence-tests.yml b/.github/workflows/jest-cadence-tests.yml @@ -63,7 +63,7 @@ jobs:
run: iex "& { $(irm 'https://storage.googleapis.com/flow-cli/install.ps1') }"
- name: Update PATH
- run: echo "/root/.local/bin" >> $GITHUB_PATH
+ run: echo "/root/.local/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Checkout
uses: actions/checkout@v2
| 14 |
diff --git a/test/unit/tracing/exporters/datadog.spec.js b/test/unit/tracing/exporters/datadog.spec.js @@ -253,8 +253,8 @@ describe("Test Datadog tracing exporter class", () => {
//expect(fakeSpanContext._traceId).toBeInstanceOf("Identifier");
//expect(fakeSpanContext._spanId).toBeInstanceOf(DatadogID.Identifier);
- expect(fakeSpanContext._traceId.toString()).toEqual("cde123456789012345678900");
- expect(fakeSpanContext._spanId.toString()).toEqual("abc123456789012345678900");
+ expect(fakeSpanContext._traceId.toString()).toEqual("cde1234567890123");
+ expect(fakeSpanContext._spanId.toString()).toEqual("abc1234567890123");
expect(span.meta.datadog).toEqual({
span: fakeDdSpan,
@@ -568,9 +568,9 @@ describe("Test Datadog tracing exporter class", () => {
expect(exporter.convertID("")).toBeNull();
expect(exporter.convertID("12345678").toString()).toEqual("12345678");
expect(exporter.convertID("123456789-0123456").toString()).toEqual("1234567890123456");
- expect(exporter.convertID("123456789-0123456789-abcdef").toString()).toEqual("1234567890123456789abcde0f");
+ expect(exporter.convertID("123456789-0123456789-abcdef").toString()).toEqual("1234567890123456");
expect(exporter.convertID("abc-def").toString()).toEqual("abcdef");
- expect(exporter.convertID("abc-def-abc-def-abc-def").toString()).toEqual("abcdefabcdefabcdef");
+ expect(exporter.convertID("abc-def-abc-def-abc-def").toString()).toEqual("abcdefabcdefabcd");
});
});
| 3 |
diff --git a/tests/e2e/specs/modules/tagmanager/setup.test.js b/tests/e2e/specs/modules/tagmanager/setup.test.js @@ -34,7 +34,6 @@ import {
resetSiteKit,
useRequestInterception,
setSearchConsoleProperty,
- setupAnalytics,
setAMPMode,
pageWait,
} from '../../../utils';
@@ -75,7 +74,6 @@ describe( 'Tag Manager module setup', () => {
await activatePlugin( 'e2e-tests-site-verification-plugin' );
await activatePlugin( 'e2e-tests-oauth-callback-plugin' );
await setSearchConsoleProperty();
- await setupAnalytics();
} );
afterEach( async () => {
| 2 |
diff --git a/app/remoteConfig.js b/app/remoteConfig.js @@ -10,6 +10,13 @@ const airgrabs = [
description: 'Payments & Budget Management Decentralized App Leveraging the Blockchain, Cryptocurrency and AI Technologies. Drops happen every 24 hours, Airgrab Today!',
url: 'https://www.atidium.io/',
},
+ {
+ symbol: 'BRM',
+ account: 'openbrmeos11',
+ method: 'open',
+ description: 'Very First Open source Billing and Revenue Management on Blockchain. OpenBRM is a carrier-grade billing platform aimed at telecommunications, Subscription, Utilities and logistics organizations.',
+ url: 'https://openbrm.io',
+ },
{
symbol: 'NEB',
account: 'nebulatokenn',
| 0 |
diff --git a/scripts/kvm/create_link.sh b/scripts/kvm/create_link.sh @@ -13,8 +13,7 @@ cat /proc/net/dev | grep -q "\<$vm_br\>:"
if [ $? -eq 0 ]; then
[ "$vlan" = "$external_vlan" -o "$vlan" = "$internal_vlan" ] && exit 0
else
- nmcli connection add con-name $vm_br type bridge ifname $vm_br ipv4.method static ipv4.addresses 169.254.169.254/32
- nmcli con modify $vm_br bridge.stp no
+ nmcli connection add con-name $vm_br type bridge ifname $vm_br stp no ipv4.method static ipv4.addresses 169.254.169.254/32
nmcli connection up $vm_br
apply_bridge -I $vm_br
fi
| 12 |
diff --git a/lib/runtime/console2.js b/lib/runtime/console2.js @@ -88,7 +88,8 @@ export function activate (ink) {
}
let validator = (uri, cb) => {
- if (client.isActive()) {
+ // FIXME: maybe choose something less arbitrary for the path length limit:
+ if (client.isActive() && uri.length < 500) {
validatepath(uri).then((isvalid) => {
cb(isvalid)
})
| 12 |
diff --git a/tests/test_utils.py b/tests/test_utils.py @@ -27,10 +27,11 @@ def test_copy(tmpdir):
filename = 'KeckObservatory20071020.jpg'
src = os.path.join(SAMPLE_DIR, 'pictures', 'dir2', filename)
+ dst = str(tmpdir.join(filename))
utils.copy(src, dst, symlink=True, rellink=True)
assert os.path.islink(dst)
- assert os.readlink(dst) == src
-
+ assert os.path.join(os.path.dirname(CURRENT_DIR)), os.readlink(dst) == src
+ # get absolute path of the current dir plus the relative dir
def test_check_or_create_dir(tmpdir):
path = str(tmpdir.join('new_directory'))
| 1 |
diff --git a/public/app/js/cbus-ui.js b/public/app/js/cbus-ui.js @@ -92,7 +92,7 @@ cbus.ui.display = function(thing, data) {
ctx.fillRect(0, 0, canvas.width, canvas.height);
});
if (feed.image === cbus.data.IMAGE_ON_DISK_PLACEHOLDER) {
- podcastImage.src = "file:///" + cbus.data.PODCAST_IMAGES_DIR.replace(/\\/g,"/") + "/" + sha1(feedUrl) +".png";
+ podcastImage.src = "file:///" + cbus.data.PODCAST_IMAGES_DIR.replace(/\\/g,"/") + "/" + sha1(feed.url) +".png";
} else if (typeof feed.image === "string") {
podcastImage.src = feed.image;
} else if (feed.image instanceof Blob) {
| 1 |
diff --git a/packages/node_modules/pouchdb-adapter-indexeddb/src/index.js b/packages/node_modules/pouchdb-adapter-indexeddb/src/index.js @@ -78,13 +78,12 @@ function IdbPouch(dbOpts, callback) {
setup(openDatabases, api, dbOpts).then(function (res) {
metadata = res.metadata;
txn.txn = res.idb.transaction(stores, mode);
+ args.unshift(txn);
+ fun.apply(api, args);
}).catch(function (err) {
console.error('Failed to establish transaction safely');
console.error(err);
txn.error = err;
- }).then(function () {
- args.unshift(txn);
- fun.apply(api, args);
});
};
};
| 5 |
diff --git a/README.md b/README.md @@ -9,7 +9,7 @@ Head Start is a web-based knowledge mapping software intended to give researcher
### Client
To get started, clone this repository. Next, duplicate the file `config.example.js` in the root folder and rename it to `config.js`.
-Make sure to have `npm` version 3.10.10 installed (it comes with Node.js 6.12.0, you can [download installers here](https://nodejs.org/dist/latest-v6.x/)) and run the following two commands to build the Headstart client:
+Make sure to have `npm` version 6.11.3 installed (it comes with Node.js 10.17.0, best way to install is with [nvm](https://github.com/nvm-sh/nvm), `nvm install 10.17.0`) and run the following two commands to build the Headstart client:
npm install
npm run dev
| 3 |
diff --git a/src/apps.json b/src/apps.json "cats": [
47
],
- "html": "<p>Powered by <a[^>]+>GitList ([\\d.+])\\;version:\\1",
+ "html": "<p>Powered by <a[^>]+>GitList ([\\d.]+)\\;version:\\1",
"implies": [
"PHP",
"git"
| 1 |
diff --git a/packages/slackbot-proxy/src/controllers/slack.ts b/packages/slackbot-proxy/src/controllers/slack.ts @@ -109,8 +109,11 @@ export class SlackCtrl {
const url = new URL('/_api/v3/slack-integration/proxied/commands', relation.growiUri);
return axios.post(url.toString(), {
...body,
- tokenPtoG: relation.tokenPtoG,
growiCommand,
+ }, {
+ headers: {
+ 'x-growi-ptog-tokens': relation.tokenPtoG,
+ },
});
});
| 12 |
diff --git a/README.markdown b/README.markdown @@ -119,7 +119,7 @@ seo:
---
```
-By default `<title>` tags follow the template `{Page Title} {Site Title}`. However the page title can be changed for the purpose of the tag by using `seo["title"]`. `seo["override"]` will override the entire template, instead making the title page `{seo["title"]}`, `description` and `canonical` change their respective tags.
+By default `<title>` tags follow the template `{Page Title} {Site Title}`. However the page title can be changed for the purpose of the tag by using `seo["title"]`. `seo["override"]` will override the entire template, instead making the title page `{seo["title"]}`. `description` and `canonical` change their respective tags.
### Custom Liquid Tags
There are some custom plugins (look in the `plugins` folder) that define new liquid blocks for use in pages.
| 13 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md I am very excited that you are interested in contributing to neo.mjs.
-Please make sure that pull requests are always related to an issue inside our <a href="issues">Issues Tracker</a>.
+Please make sure that pull requests are always related to an issue inside our <a href="../../issues">Issues Tracker</a>.
More details are coming soon!
\ No newline at end of file
| 12 |
diff --git a/src/context/useGenerateTest.jsx b/src/context/useGenerateTest.jsx @@ -1615,6 +1615,21 @@ function useGenerateTest(test, projectFilePath) {
}))
);
// add solid switch statement **************************************
+ case 'solid':
+ var solidTestCase = testState;
+ var mockData = mockDataState;
+ return (
+ addSolidComponentImportStatement(),
+ addSolidImportStatements(),
+ addMockData(),
+ addSolidDescribeBlock(),
+ (testFileCode = beautify(testFileCode, {
+ brace_style: 'collapse, preserve-inline',
+ indent_size: 2,
+ space_in_empty_paren: true,
+ e4x: true,
+ }))
+ );
default:
return 'not a test';
}
| 3 |
diff --git a/index.html b/index.html <h1>Find polar Representaion of complex number</h1>
-
- <h1>Polar representaion of complex number</h1>
-
<div class="form-group" style="display:inline-block">
<label>Enter the real part : </label>
<input type="number" id="cpreal" class="form__field" placeholder="Real"
| 1 |
diff --git a/planet.js b/planet.js @@ -751,6 +751,7 @@ const _connectRoom = async roomName => {
playerRig.inputs.leftGamepad.quaternion.fromArray(leftGamepad[1]);
playerRig.inputs.rightGamepad.position.fromArray(rightGamepad[0]);
playerRig.inputs.rightGamepad.quaternion.fromArray(rightGamepad[1]);
+ playerRig.setFloorHeight(-0xFFFFFF)
// playerRig.setPose(pose);
/* playerRig.textMesh.position.fromArray(head[0]);
playerRig.textMesh.position.y += 0.5;
| 3 |
diff --git a/pages/show/[number]/[slug].js b/pages/show/[number]/[slug].js @@ -66,7 +66,7 @@ export default withRouter(
};
}
- componentWillReceiveProps(nextProps) {
+ UNSAFE_componentWillReceiveProps(nextProps) {
const { query } = nextProps.router;
if (query.number) {
this.setState({ currentShow: query.number });
| 10 |
diff --git a/utils/order-utils/src/signatures.js b/utils/order-utils/src/signatures.js @@ -32,6 +32,7 @@ const hashes = require('./hashes')
module.exports = {
async getWeb3Signature(order, signatory, verifyingContract) {
const orderHash = hashes.getOrderHash(order, verifyingContract)
+ console.log(orderHash)
const orderHashHex = ethUtil.bufferToHex(orderHash)
const sig = await eth.sign(orderHashHex, signatory)
const { v, r, s } = ethUtil.fromRpcSig(sig)
@@ -106,9 +107,9 @@ module.exports = {
}
},
async isSignatureValid(order) {
- console.log(order)
- const signature = '\x19Ethereum Signed Message:\n32' + order['signature']
+ const signature = order['signature']
const orderHash = hashes.getOrderHash(order, signature['validator'])
+ console.log(orderHash)
const signingPubKey = ethUtil.ecrecover(
orderHash,
signature['v'],
| 13 |
diff --git a/samples/javascript_nodejs/11.qnamaker/README.md b/samples/javascript_nodejs/11.qnamaker/README.md @@ -115,6 +115,6 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure][40]
[50]: https://docs.microsoft.com/en-us/azure/cognitive-services/qnamaker/how-to/improve-knowledge-base
[51]: https://docs.microsoft.com/en-us/azure/cognitive-services/qnamaker/how-to/multiturn-conversation
-
+[41]: https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-qna?view=azure-bot-service-4.0&tabs=cs
[71]: https://docs.microsoft.com/en-us/azure/cognitive-services/qnamaker/how-to/improve-knowledge-base
[72]: https://docs.microsoft.com/en-us/azure/cognitive-services/qnamaker/how-to/multiturn-conversation
| 3 |
diff --git a/modules/xmpp/XmppConnection.js b/modules/xmpp/XmppConnection.js @@ -206,7 +206,7 @@ export default class XmppConnection extends Listenable {
* @returns {void}
*/
connect(jid, pass, callback, ...args) {
- const connectCb = (status, condition) => {
+ const connectCb = (status, ...cbArgs) => {
this._status = status;
let blockCallback = false;
@@ -224,7 +224,7 @@ export default class XmppConnection extends Listenable {
}
if (!blockCallback) {
- callback(status, condition);
+ callback(status, ...cbArgs);
this.eventEmitter.emit(XmppConnection.Events.CONN_STATUS_CHANGED, status);
}
};
| 1 |
diff --git a/Specs/Scene/ImageryLayerCollectionSpec.js b/Specs/Scene/ImageryLayerCollectionSpec.js @@ -288,9 +288,6 @@ describe(
var scene;
var globe;
var camera;
- var customScene;
- var customGlobe;
- var customCamera;
beforeAll(function () {
scene = createScene();
@@ -298,12 +295,6 @@ describe(
camera = scene.camera;
scene.frameState.passes.render = true;
- //NEW:
- customScene = createScene();
- customGlobe = customScene.globe = new Globe();
- customCamera = customScene.camera;
-
- customScene.frameState.passes.render = true;
});
afterAll(function () {
@@ -391,28 +382,25 @@ describe(
});
});
- it("pickImageryHelper returns if undefined tile picked", function () {
- return updateUntilDone(customGlobe, customScene).then(function () {
+ it("pickImageryLayers returns undefined if no tiles are picked", function () {
+ return updateUntilDone(globe, scene).then(function () {
var ellipsoid = Ellipsoid.WGS84;
- for (var i = 0; i < customGlobe._surface._tilesToRender.length; i++) {
- customGlobe._surface._tilesToRender[i]._rectangle = new Rectangle();
+ for (var i = 0; i < globe._surface._tilesToRender.length; i++) {
+ globe._surface._tilesToRender[i]._rectangle = new Rectangle();
}
- customCamera.lookAt(
+ camera.lookAt(
new Cartesian3(ellipsoid.maximumRadius, 1.0, 1.0),
new Cartesian3(1.0, 1.0, 100.0)
);
- customCamera.lookAtTransform(Matrix4.IDENTITY);
- var ray = new Ray(customCamera.position, customCamera.direction);
- var imagery = customScene.imageryLayers.pickImageryLayers(
- ray,
- customScene
- );
+ camera.lookAtTransform(Matrix4.IDENTITY);
+ var ray = new Ray(camera.position, camera.direction);
+ var imagery = scene.imageryLayers.pickImageryLayers(ray, scene);
expect(imagery).toBeUndefined();
});
});
- it("continues if imagery rectangle does not contain picked location", function () {
+ it("pickImageryLayers skips imagery layers that don't overlap the picked location", function () {
var provider = {
ready: true,
rectangle: new Rectangle(
| 3 |
diff --git a/native/navigation-setup.js b/native/navigation-setup.js import type { BaseAction } from 'lib/types/redux-types';
import type { BaseNavInfo } from 'lib/types/nav-types';
import type { CalendarInfo } from 'lib/types/calendar-types';
-import type { NavigationState } from 'react-navigation';
+import type {
+ NavigationState,
+ NavigationScreenProp,
+ NavigationRoute,
+ NavigationAction,
+ NavigationRouter,
+} from 'react-navigation';
import type { PingResult } from 'lib/actions/ping-actions';
+import type { AppState } from './redux-setup';
import { TabNavigator, StackNavigator } from 'react-navigation';
import invariant from 'invariant';
import _findIndex from 'lodash/fp/findIndex';
import _includes from 'lodash/fp/includes';
-import { Alert } from 'react-native';
+import { Alert, BackAndroid } from 'react-native';
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
import { partialNavInfoFromURL } from 'lib/utils/url-utils';
@@ -25,6 +35,7 @@ import {
VerificationModal,
VerificationModalRouteName,
} from './account/verification-modal.react';
+import { createIsForegroundSelector } from './nav-selectors';
export type NavInfo = BaseNavInfo & {
home: bool,
@@ -46,12 +57,70 @@ const AppNavigator = TabNavigator(
initialRouteName: 'Calendar',
},
);
+type WrappedAppNavigatorProps = {
+ navigation: NavigationScreenProp<NavigationRoute, NavigationAction>,
+ isForeground: bool,
+ atInitialRoute: bool,
+};
+class WrappedAppNavigator extends React.PureComponent {
+
+ props: WrappedAppNavigatorProps;
+ static propTypes = {
+ navigation: PropTypes.shape({
+ goBack: PropTypes.func.isRequired,
+ }).isRequired,
+ isForeground: PropTypes.bool.isRequired,
+ atInitialRoute: PropTypes.bool.isRequired,
+ };
+
+ componentDidMount() {
+ if (this.props.isForeground) {
+ this.onForeground();
+ }
+ }
+
+ componentWillReceiveProps(nextProps: WrappedAppNavigatorProps) {
+ if (!this.props.isForeground && nextProps.isForeground) {
+ this.onForeground();
+ } else if (this.props.isForeground && !nextProps.isForeground) {
+ this.onBackground();
+ }
+ }
+
+ onForeground() {
+ BackAndroid.addEventListener('hardwareBackPress', this.hardwareBack);
+ }
+
+ onBackground() {
+ BackAndroid.removeEventListener('hardwareBackPress', this.hardwareBack);
+ }
+
+ hardwareBack = () => {
+ if (this.props.atInitialRoute) {
+ return false;
+ }
+ this.props.navigation.goBack(null);
+ return true;
+ }
+
+ render() {
+ return <AppNavigator navigation={this.props.navigation} />;
+ }
+
+}
+const AppRouteName = 'App';
+const isForegroundSelector = createIsForegroundSelector(AppRouteName);
+const ReduxWrappedAppNavigator = connect((state: AppState) => ({
+ isForeground: isForegroundSelector(state),
+ atInitialRoute: state.navInfo.navigationState.routes[0].index === 0,
+}))(WrappedAppNavigator);
+ReduxWrappedAppNavigator.router = AppNavigator.router;
const RootNavigator = StackNavigator(
{
[LoggedOutModalRouteName]: { screen: LoggedOutModal },
[VerificationModalRouteName]: { screen: VerificationModal },
- App: { screen: AppNavigator },
+ [AppRouteName]: { screen: ReduxWrappedAppNavigator },
},
{
headerMode: 'none',
@@ -64,7 +133,7 @@ const defaultNavigationState = {
routes: [
{
key: 'App',
- routeName: 'App',
+ routeName: AppRouteName,
index: 0,
routes: [
{ key: 'Calendar', routeName: 'Calendar' },
| 0 |
diff --git a/packages/sling-web-component-table/src/component/Table.js b/packages/sling-web-component-table/src/component/Table.js @@ -120,7 +120,7 @@ export class Table extends HTMLElement {
}
case 'rate': {
cell = `
- <span>${fieldItem.toString().concat('%')}</span>
+ <span>${fieldItem.toString().replace('.', ',').concat('%')}</span>
`;
break;
}
| 14 |
diff --git a/scripts/compile-fx.sh b/scripts/compile-fx.sh @@ -13,3 +13,12 @@ for f2 in *.webm; do
cp spritesheet.png "$f2"-spritesheet.png
cp spritesheet.ktx2 "$f2"-spritesheet.ktx2
done;
+
+rm -f animation-frames.txt
+for f2 in *.webm; do
+ frameCount=$(ffprobe -v error -select_streams v:0 -count_frames -show_entries stream=nb_read_frames -of csv=p=0 "$f2")
+ if [ "$frameCount" -le 64 ]; then
+ echo "$frameCount" "$f2" | tee -a fx-files.txt
+ fi;
+done;
+node -e 'a = require("fs").readFileSync("./fx-files.txt", "utf8").split("\n").filter(l => !!l).map(s => {m = s.match(/^([0-9]+) (.+)$/); numFrames = parseInt(m[1], 10); name = m[2]; return {name,numFrames};}); console.log(JSON.stringify(a, null, 2))' > fx-files.json
| 0 |
diff --git a/tests/phpunit/includes/TestCase.php b/tests/phpunit/includes/TestCase.php @@ -31,7 +31,7 @@ class TestCase extends \WP_UnitTestCase {
*/
add_filter(
'wp_redirect_status',
- function ( $status, $location ) {
+ function ( $status, $location ) { // phpcs:ignore WordPressVIPMinimum.Hooks.AlwaysReturnInFilter.MissingReturnStatement
$e = new RedirectException( "Intercepted attempt to redirect to $location" );
$e->set_location( $location );
$e->set_status( $status );
| 8 |
diff --git a/test/jasmine/tests/draw_shape_test.js b/test/jasmine/tests/draw_shape_test.js @@ -6,6 +6,7 @@ var Lib = require('@src/lib');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var failTest = require('../assets/fail_test');
+var selectButton = require('../assets/modebar_button');
var mouseEvent = require('../assets/mouse_event');
var touchEvent = require('../assets/touch_event');
var click = require('../assets/click');
@@ -1346,6 +1347,15 @@ describe('Activate and deactivate shapes to edit', function() {
print(obj);
assertPos(obj.path, 'M300,70C300,10 380,10 380,70C380,90 300,90 300,70ZM320,60C320,50 332,50 332,60ZM348,60C348,50 360,50 360,60ZM320,70C326,80 354,80 360,70Z');
})
+ // erase shape
+ .then(function() {
+ expect(gd._fullLayout.shapes.length).toEqual(8);
+ selectButton(gd._fullLayout._modeBar, 'eraseshape').click();
+ })
+ .then(function() {
+ expect(gd._fullLayout.shapes.length).toEqual(7);
+ expect(gd._fullLayout._activeShapeIndex).toEqual(undefined, 'clear active shape index');
+ })
.catch(failTest)
.then(done);
| 0 |
diff --git a/modules/@apostrophecms/page/ui/apos/components/AposPagesManager.stories.js b/modules/@apostrophecms/page/ui/apos/components/AposPagesManager.stories.js export default {
- title: 'Pages Organize'
+ title: 'Pages Manager'
};
-export const pagesOrganize = () => {
+export const pagesManager = () => {
return {
methods: {
toggleActive: function () {
| 10 |
diff --git a/token-metadata/0x757703bD5B2c4BBCfde0BE2C0b0E7C2f31FCf4E9/metadata.json b/token-metadata/0x757703bD5B2c4BBCfde0BE2C0b0E7C2f31FCf4E9/metadata.json "symbol": "ZEST",
"address": "0x757703bD5B2c4BBCfde0BE2C0b0E7C2f31FCf4E9",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/jasmine/assets/mock_lists.js b/test/jasmine/assets/mock_lists.js @@ -68,7 +68,8 @@ var glMockList = [
var mapboxMockList = [
['scattermapbox', require('@mocks/mapbox_bubbles-text.json')],
- ['choroplethmapbox', require('@mocks/mapbox_choropleth0.json')]
+ ['choroplethmapbox', require('@mocks/mapbox_choropleth0.json')],
+ ['densitymapbox', require('@mocks/mapbox_density0.json')]
];
module.exports = {
| 0 |
diff --git a/resources/css/custom-stylesheet.css b/resources/css/custom-stylesheet.css @@ -531,15 +531,12 @@ body.no-acrylic {
}
@keyframes lyricWaitingLine {
0% {
- opacity: 0;
transform: scale(0.85);
}
50% {
- opacity: 1;
transform: scale(1);
}
100% {
- opacity: 0;
transform: scale(0.85);
}
}
| 2 |
diff --git a/src/dev/fdm/Creality.Ender.3 b/src/dev/fdm/Creality.Ender.3 "M107 ; turn off filament cooling fan",
"G90 ; set absolute positioning mode",
"M82 ; set absolute positioning for extruder",
- "M104 S{temp} T{tool} ; set extruder temperature",
- "M140 S{bed_temp} T{tool} ; set bed temperature",
+ "M104 S{temp} ; set extruder temperature",
+ "M140 S{bed_temp} ; set bed temperature",
"G28 ; home axes",
- "G92 X0 Y0 Z0 E0 ; reset all axes positions",
- "G1 Z0.25 F180 ; move to Z 0.25mm over bed",
- "G1 F225 ; set feed speed",
- "M190 S{bed_temp} T{tool} ; wait for bed to reach target temp",
- "M109 S{temp} T{tool} ; wait for extruder to reach target temp"
+ "G92 E0 ; reset all axes positions",
+ "M109 S{temp} ; wait for extruder to reach target temp",
+ "M190 S{bed_temp} ; wait for bed to reach target temp"
],
"post":[
"M107 ; turn off filament cooling fan",
"M104 S0 T{tool} ; turn off right extruder",
"M140 S0 T{tool} ; turn off bed",
- "G1 X0 Y300 F1200 ; end move",
+ "G1 X0 Y300 F1200 ; end move eject bed",
"M84 ; disable stepper motors"
],
"extruders":[
| 3 |
diff --git a/modules/keyboard.js b/modules/keyboard.js @@ -342,6 +342,20 @@ Keyboard.DEFAULTS = {
}
},
},
+ 'table tab': {
+ key: 'Tab',
+ shiftKey: null,
+ format: ['table'],
+ handler(range, context) {
+ const { event, line: cell } = context;
+ const offset = cell.offset(this.quill.scroll);
+ if (event.shiftKey) {
+ this.quill.setSelection(Math.max(0, offset - 1), Quill.sources.USER);
+ } else {
+ this.quill.setSelection(offset + cell.length(), Quill.sources.USER);
+ }
+ },
+ },
'list autofill': {
key: ' ',
collapsed: true,
| 9 |
diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js @@ -1317,17 +1317,41 @@ describe(
s.initializeFrame();
s.render();
- s.camera.lookLeft(
+ s.camera.lookUp(
s.camera.frustum.fov * (s.camera.percentageChanged + 0.1)
);
s.initializeFrame();
s.render();
- expect(spyListener.calls.count()).toBe(2);
+ expect(spyListener.calls.count()).toBe(1);
var args = spyListener.calls.allArgs();
- expect(args.length).toEqual(2);
+ expect(args.length).toEqual(1);
+ expect(args[0].length).toEqual(1);
+ expect(args[0][0]).toBeGreaterThan(s.camera.percentageChanged);
+
+ s.destroyForSpecs();
+ });
+
+ it("raises the camera changed event on heading changed", function () {
+ var s = createScene();
+
+ var spyListener = jasmine.createSpy("listener");
+ s.camera.changed.addEventListener(spyListener);
+
+ s.initializeFrame();
+ s.render();
+
+ s.camera.twistLeft(100);
+
+ s.initializeFrame();
+ s.render();
+
+ expect(spyListener.calls.count()).toBe(1);
+
+ var args = spyListener.calls.allArgs();
+ expect(args.length).toEqual(1);
expect(args[0].length).toEqual(1);
expect(args[0][0]).toBeGreaterThan(s.camera.percentageChanged);
| 3 |
diff --git a/static/css/app.css b/static/css/app.css @@ -10,6 +10,7 @@ html {
body {
/* Margin bottom by footer height */
height: 100%;
+ margin-top: 50px;
margin-bottom: 60px;
font-family: "Lato", system-ui, sans-serif !important;
background-color: #fafafa;
| 0 |
diff --git a/javascript/utils/StyleValue.ts b/javascript/utils/StyleValue.ts @@ -4,7 +4,6 @@ import {
processColor,
ProcessedColorValue,
} from 'react-native';
-import { UsesNonExemptEncryption } from '@expo/config-plugins/build/ios';
import { getStyleType } from './styleMap';
import BridgeValue, {
| 2 |
diff --git a/src/VR.js b/src/VR.js @@ -430,6 +430,9 @@ class FakeVRDisplay extends MRDisplay {
requestPresent() {
this.isPresenting = true;
+ GlobalContext.xrState.renderWidth[0] = this.window.innerWidth * this.window.devicePixelRatio;
+ GlobalContext.xrState.renderHeight[0] = this.window.innerHeight * this.window.devicePixelRatio;
+
if (this.onvrdisplaypresentchange) {
this.onvrdisplaypresentchange();
}
| 12 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -214,7 +214,6 @@ const baseActions = {
const registry = yield commonActions.getRegistry();
yield actions.waitForModules();
- registry.select( STORE_NAME ).getModules();
yield registryKeyActions.waitForRegistryKey();
const registryKey = registry.select( CORE_SITE ).getRegistryKey();
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.