code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/demo/app/client/js/patterns/mark.jsx b/demo/app/client/js/patterns/mark.jsx @@ -39,27 +39,45 @@ export let mark = {
<script>
+ // Helper functions
+
+ function getElements(el) {
+ return Array.prototype.slice.call(document.querySelectorAll(el));
+ }
+
+ function hideElement(el) {
+ document.body.querySelector(el).style.display = 'none';
+ }
+
+ function showElement(el) {
+ document.body.querySelector(el).style.display = 'block';
+ }
+
// Listen for changes to the radio fields
- document.body.querySelectorAll('input[name=payment-option]').forEach(function(el) {
+ getElements('input[name=payment-option]').forEach(function(el) {
el.addEventListener('change', function(event) {
// If PayPal is selected, show the PayPal button
if (event.target.value === 'paypal') {
- document.body.querySelector('#card-button-container').style.display = 'none';
- document.body.querySelector('#paypal-button-container').style.display = 'block';
+ hideElement('#card-button-container');
+ showElement('#paypal-button-container');
}
// If Card is selected, show the standard continue button
if (event.target.value === 'card') {
- document.body.querySelector('#card-button-container').style.display = 'block';
- document.body.querySelector('#paypal-button-container').style.display = 'none';
+ showElement('#card-button-container');
+ hideElement('#paypal-button-container');
}
});
});
+ // Hide Non-PayPal button by default
+
+ hideElement('#card-button-container');
+
// Render the PayPal button
paypal.Button.render({
| 7 |
diff --git a/components/Payment/Icons/PSP.js b/components/Payment/Icons/PSP.js import React from 'react'
export const Visa = () => (
- <svg style={{verticalAlign: 'middle'}} width='51' height='40' viewBox='0 -2 51 36'>
- <path fill='#FFF' d='M.493 31.56h49.7V.254H.493' />
- <path fill='#004F8B' d='M18.65 23.845l2.294-16.342h3.67l-2.297 16.342H18.65M35.624 7.905c-.727-.33-1.866-.686-3.29-.686-3.624 0-6.177 2.215-6.2 5.392-.02 2.348 1.824 3.658 3.216 4.44 1.428.8 1.908 1.312 1.9 2.027-.008 1.094-1.14 1.595-2.194 1.595-1.468 0-2.248-.248-3.453-.858l-.473-.26-.515 3.66c.857.455 2.442.85 4.087.87 3.856 0 6.36-2.19 6.388-5.583.014-1.86-.963-3.274-3.08-4.44-1.282-.756-2.068-1.26-2.06-2.026 0-.68.665-1.406 2.102-1.406 1.2-.022 2.068.295 2.746.626l.328.19.498-3.543M45.03 7.518h-2.834c-.878 0-1.535.29-1.92 1.355l-5.45 14.978h3.853s.63-2.013.772-2.455l4.698.007c.11.572.447 2.45.447 2.45H48L45.03 7.517M40.51 18.052c.303-.942 1.46-4.57 1.46-4.57-.02.045.302-.945.488-1.558l.248 1.41.85 4.718h-3.046M15.573 7.514L11.98 18.66l-.38-2.266c-.67-2.61-2.753-5.44-5.083-6.855l3.285 14.29 3.88-.004L19.46 7.514h-3.887' />
- <path d='M8.65 7.504H2.732l-.047.34c4.603 1.353 7.648 4.622 8.913 8.55l-1.288-7.51C10.09 7.85 9.446 7.54 8.65 7.504' fill='#EE9F2D' />
+ <svg style={{verticalAlign: 'middle'}} width='64' height='40'>
+ <g fill='none' fill-rule='evenodd'>
+ <path fill='#F7B600' d='M0 39.708h63.274v-5.673H0z' />
+ <path fill='#1A1F71' d='M0 5.976h63.274V.303H0zM31.09 12.226l-3.334 15.592h-4.034l3.335-15.592h4.034zm16.972 10.068l2.123-5.856 1.222 5.856h-3.345zm4.503 5.524h3.73l-3.26-15.592h-3.44c-.776 0-1.429.45-1.718 1.143l-6.053 14.45h4.236l.841-2.33h5.175l.489 2.33zm-10.531-5.09c.018-4.115-5.689-4.344-5.65-6.182.012-.559.545-1.154 1.71-1.306.578-.075 2.171-.135 3.978.698l.707-3.308c-.97-.351-2.22-.69-3.773-.69-3.988 0-6.794 2.119-6.816 5.155-.025 2.245 2.004 3.496 3.53 4.244 1.573.764 2.1 1.254 2.093 1.937-.011 1.046-1.255 1.509-2.413 1.527-2.03.031-3.205-.549-4.143-.986l-.732 3.418c.944.432 2.684.809 4.485.828 4.24 0 7.011-2.094 7.024-5.336zM25.327 12.225l-6.536 15.592h-4.264l-3.216-12.444c-.195-.765-.365-1.046-.958-1.37-.97-.527-2.572-1.02-3.98-1.326l.096-.452h6.864c.874 0 1.66.581 1.86 1.588l1.7 9.024 4.196-10.612h4.238z' />
+ </g>
</svg>
)
| 1 |
diff --git a/config-dist.php b/config-dist.php @@ -46,8 +46,9 @@ Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
# set this to true
Setting('DISABLE_URL_REWRITING', false);
-# By default the homepage will be set to the stock overview.
-# You can set this to any overview you want. Example: Use recipes to set the homepage to the recipes overview.
+# Specify an custom homepage if desired. By default the homepage will be set to the stock overview.
+# You can chosen one of the following values:
+# stock, shoppinglist, recipes, chores, tasks, batteries, equipment, calendar
Setting('ENTRY_PAGE', 'stock');
# Set this to true if you want to disable authentication / the login screen,
| 0 |
diff --git a/fastlane/Fastfile b/fastlane/Fastfile @@ -113,15 +113,8 @@ platform :ios do
upload_to_testflight(
api_key_path: "./ios/ios-fastlane-json-key.json",
- # TODO: Remove skip_waiting_for_build_processing when https://github.com/fastlane/fastlane/issues/18408 is resolved
- # See: https://github.com/Expensify/App/pull/1984 for more information
- skip_waiting_for_build_processing: true,
- # TODO: Set distribute_external back to true when https://github.com/fastlane/fastlane/issues/18408 is resolved
- # See: https://github.com/Expensify/App/pull/1984 for more information
- distribute_external: false,
- # TODO: Set reject_build_waiting_for_review back to true when https://github.com/fastlane/fastlane/issues/18408 is resolved
- # See: https://github.com/Expensify/App/pull/1984 for more information
- reject_build_waiting_for_review: false,
+ distribute_external: true,
+ notify_external_testers: true,
changelog: "Thank you for beta testing New Expensify, this version includes bug fixes and improvements.",
groups: ["Beta"],
demo_account_required: true,
| 11 |
diff --git a/articles/quickstart/spa/angular-beta/02-calling-an-api.md b/articles/quickstart/spa/angular-beta/02-calling-an-api.md @@ -98,7 +98,7 @@ this.auth0Client = await createAuth0Client({
});
```
-Doing this provides a hint to the authorization server that your application would like to call the API with the identifier `${apiIdentifier}`. This will cause the authorization server to prompt the user for permission the next time they log in. It will also return an access token that can be used to call the API.
+This parameter tells the authorization server that your application would like to call the API with the identifier ${apiIdentifier} on the user's behalf. This will cause the authorization server to prompt the user for consent the next time they log in. It will also return an access token that can be used to call the API.
## Calling the API
| 3 |
diff --git a/assets/js/modules/analytics/dashboard/dashboard-widget-top-level.js b/assets/js/modules/analytics/dashboard/dashboard-widget-top-level.js @@ -41,6 +41,7 @@ import {
getAnalyticsErrorMessageFromData,
siteAnalyticsReportDataDefaults,
overviewReportDataDefaults,
+ isDataZeroForReporting,
} from '../util';
const { __ } = wp.i18n;
@@ -211,33 +212,11 @@ class AnalyticsDashboardWidgetTopLevel extends Component {
}
const isDataZero = ( data, datapoint ) => {
- if ( 'report' !== datapoint ) {
- return false;
- }
-
- // Handle empty data.
- if ( ! data || ! data.length ) {
- return true;
- }
-
- const overview = calculateOverviewData( data );
-
- let totalUsers = '',
- totalSessions = '',
- totalPageViews = '';
-
- if ( overview ) {
- totalUsers = overview.totalUsers;
- totalSessions = overview.totalSessions;
- totalPageViews = overview.totalPageViews;
+ if ( 'report' === datapoint ) {
+ return isDataZeroForReporting( data );
}
- const analyticsDataIsEmpty =
- 0 === parseInt( totalUsers ) &&
- 0 === parseInt( totalSessions ) &&
- 0 === parseInt( totalPageViews );
-
- return analyticsDataIsEmpty;
+ return false;
};
/*
| 3 |
diff --git a/components/popover/popover.jsx b/components/popover/popover.jsx @@ -145,9 +145,14 @@ class Popover extends React.Component {
* Prevents the Popover from changing position based on the viewport/window. If set to true your popover can extend outside the viewport _and_ overflow outside of a scrolling parent. If this happens, you might want to consider making the popover contents scrollable to fit the menu on the screen. When enabled, `position` `absolute` is used.
*/
hasStaticAlignment: PropTypes.bool,
+ /**
+ * Removes display:inline-block from the trigger.
+ */
+ hasNoTriggerStyles: PropTypes.bool,
/**
* Will show the nubbin pointing from the dialog to the reference element. Positioning and offsets will be handled.
*/
+ // change to noNubbin or something (prefer true -> false)
hasNubbin: PropTypes.bool,
/**
* All popovers require a heading that labels the popover for assistive technology users. This text will be placed within a heading HTML tag. A heading is **highly recommended for accessibility reasons.** Please see `ariaLabelledby` prop.
@@ -161,10 +166,6 @@ class Popover extends React.Component {
* Forces the popover to be open or closed. See controlled/uncontrolled callback/prop pattern for more on suggested use [](https://github.com/salesforce-ux/design-system-react/blob/master/CONTRIBUTING.md#concepts-and-best-practices) You will want this if Popover is to be a controlled component.
*/
isOpen: PropTypes.bool,
- /**
- * Removes display:inline-block from the trigger.
- */
- noTriggerStyles: PropTypes.bool,
/**
* This function is passed onto the triggering `Button`. Triggered when the trigger button is clicked. You will want this if Popover is to be a controlled component.
*/
@@ -548,7 +549,7 @@ class Popover extends React.Component {
this.renderOverlay(this.getIsOpen());
const containerStyles = {
- display: this.props.noTriggerStyles ? 'inherit' : 'inline-block',
+ display: this.props.hasNoTriggerStyles ? undefined : 'inline-block',
};
return (
<div
| 10 |
diff --git a/token-metadata/0x187D1018E8ef879BE4194d6eD7590987463eAD85/metadata.json b/token-metadata/0x187D1018E8ef879BE4194d6eD7590987463eAD85/metadata.json "symbol": "FUZE",
"address": "0x187D1018E8ef879BE4194d6eD7590987463eAD85",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/node/lib/util/stitch_util.js b/node/lib/util/stitch_util.js @@ -40,7 +40,6 @@ const DoWorkQueue = require("./do_work_queue");
const GitUtil = require("./git_util");
const SubmoduleConfigUtil = require("./submodule_config_util");
const SubmoduleUtil = require("./submodule_util");
-const SyntheticBranchUtil = require("./synthetic_branch_util");
const TreeUtil = require("./tree_util");
const UserError = require("./user_error");
@@ -706,9 +705,6 @@ exports.fetchSubCommits = co.wrap(function *(repo, url, subFetches) {
if (fetched) {
console.log("Fetched:", sha, "from", subUrl);
- const refName =
- SyntheticBranchUtil.getSyntheticBranchForCommit(sha);
- yield NodeGit.Reference.create(repo, refName, sha, 1, "fetched");
}
}
});
| 2 |
diff --git a/edit.js b/edit.js @@ -9,7 +9,7 @@ import {tryLogin, loginManager} from './login.js';
import runtime from './runtime.js';
import {parseQuery, downloadFile} from './util.js';
import {rigManager} from './rig.js';
-// import {makeRayMesh} from './vr-ui.js';
+import {makeRayMesh} from './vr-ui.js';
import {
THING_SHADER,
makeDrawMaterial,
@@ -316,6 +316,34 @@ scene.add(floorMesh); */
scene.add(mesh);
})(); */
+{
+ const rayMesh = makeRayMesh();
+ rayMesh.visible = false;
+ scene.add(rayMesh);
+
+ window.addEventListener('mousedown', e => {
+ const transforms = rigManager.getRigTransforms();
+ const {position, quaternion} = transforms[0];
+
+ const result = physicsManager.raycast(position, quaternion);
+ if (result) { // world geometry raycast
+ result.point = new THREE.Vector3().fromArray(result.point);
+
+ rayMesh.position.copy(position);
+ rayMesh.quaternion.setFromUnitVectors(new THREE.Vector3(0, 0, -1), result.point.clone().sub(position).normalize());
+ rayMesh.scale.z = result.point.distanceTo(position);
+ rayMesh.visible = true;
+
+ /* raycastChunkSpec.normal = new THREE.Vector3().fromArray(raycastChunkSpec.normal);
+ raycastChunkSpec.objectPosition = new THREE.Vector3().fromArray(raycastChunkSpec.objectPosition);
+ raycastChunkSpec.objectQuaternion = new THREE.Quaternion().fromArray(raycastChunkSpec.objectQuaternion);
+ cubeMesh.position.copy(raycastChunkSpec.point); */
+ } else {
+ rayMesh.visible = false;
+ }
+ });
+}
+
(async () => {
await geometryManager.waitForLoad();
| 0 |
diff --git a/contracts/PermissionGroups.sol b/contracts/PermissionGroups.sol @@ -6,8 +6,8 @@ contract PermissionGroups {
address public pendingAdmin;
mapping(address=>bool) operators;
mapping(address=>bool) alerters;
- address[] public operatorsGroup;
- address[] public alertersGroup;
+ address[] operatorsGroup;
+ address[] alertersGroup;
function PermissionGroups() public {
admin = msg.sender;
| 12 |
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js @@ -677,7 +677,7 @@ self.kiri.lang['en-us'] = {
ou_depf_s: "depth first",
ou_depf_l: ["optimize pocket cuts","with depth priority"],
ou_toin_s: "tool init",
- ou_toin_l: "emit tool change with first operation",
+ ou_toin_l: "add tool change with first operation. when disabled, the gcode assumes the first tool is loaded and offset probed",
ou_forz_s: "force z max",
ou_forz_l: "all moves between pockets will go to z max (above stock). this is usually required if you are not performing a roughing operation before pocketing operations.",
ou_z1st_s: "first z max",
| 3 |
diff --git a/assets/src/edit-story/components/canvas/useInsertElement.js b/assets/src/edit-story/components/canvas/useInsertElement.js @@ -159,12 +159,12 @@ function getElementProperties(
width = size.width;
height = size.height;
- // X and y defaults: in the top quarter of the page.
+ // X and y defaults: in the top corner of the page.
if (!isNum(x)) {
- x = (PAGE_WIDTH / 4) * Math.random();
+ x = 48;
}
if (!isNum(y)) {
- y = (PAGE_HEIGHT / 4) * Math.random();
+ y = 0;
}
x = dataPixels(Math.min(x, PAGE_WIDTH - width));
y = dataPixels(Math.min(y, PAGE_HEIGHT - height));
| 1 |
diff --git a/devtools/lightning-inspect.js b/devtools/lightning-inspect.js @@ -221,7 +221,7 @@ window.attachInspector = function({Application, Element, ElementCore, Stage, Com
oSetParent.apply(this, arguments);
if (!window.mutatingChildren) {
- if (parent) {
+ if (parent && parent.dhtml) {
var index = parent._children.getIndex(this);
if (index == parent._children.get().length - 1) {
parent.dhtml().appendChild(this.dhtml());
@@ -229,7 +229,7 @@ window.attachInspector = function({Application, Element, ElementCore, Stage, Com
parent.dhtml().insertBefore(this.dhtml(), parent.dhtml().children[index]);
}
} else {
- if (prevParent) {
+ if (prevParent && prevParent.dhtml) {
prevParent.dhtml().removeChild(this.dhtml());
}
}
@@ -268,10 +268,14 @@ window.attachInspector = function({Application, Element, ElementCore, Stage, Com
c = c._element;
}
if (v == dv) {
+ if (c.dhtmlRemoveAttribute) {
c.dhtmlRemoveAttribute(n);
+ }
} else {
+ if (c.dhtmlSetAttribute) {
c.dhtmlSetAttribute(n, v);
}
+ }
};
Element.prototype.dhtmlRemoveAttribute = function() {
| 0 |
diff --git a/webui/custom.scss b/webui/custom.scss @@ -51,3 +51,7 @@ $yiq-contrasted-threshold: 160;
.underline {
text-decoration: underline;
}
+
+.homeparagraph {
+ line-height: 1.6875;
+}
\ No newline at end of file
| 7 |
diff --git a/package.json b/package.json "lint": "vue-cli-service lint --no-fix",
"lint-fix": "vue-cli-service lint",
"test": "vue-cli-service test:e2e",
- "test-ci": "vue-cli-service test:e2e --headless --browser chrome",
- "postinstall": "npm run build-bundle"
+ "test-ci": "vue-cli-service test:e2e --headless --browser chrome"
},
"main": "./dist/modeler.common.js",
"files": [
| 2 |
diff --git a/test/tests/button/size.js b/test/tests/button/size.js @@ -963,8 +963,6 @@ describe(`paypal button component sizes`, () => {
},
onEnter() {
- setTimeout(() => {
- container.style.width = '255px';
let frame = getElement('#testContainer iframe');
// eslint-disable-next-line promise/catch-or-return
@@ -982,7 +980,8 @@ describe(`paypal button component sizes`, () => {
return done();
});
- }, 100);
+
+ container.style.width = '255px';
}
}, container);
| 7 |
diff --git a/src/view/fontrules/font-based-rules.less b/src/view/fontrules/font-based-rules.less +@basefontsize: 16;
+
+/* mixin for converting EM to PX */
+.emtoPx( @emvalue ) when (isem( @emvalue)) {
+ @return: (unit(@emvalue) * @basefontsize) + 0px;
+}
+
+/* mixin for passthrough other units */
+.emtoPx( @emvalue ) when (isem(@emvalue) = false) {
+ @return: @emvalue;
+}
+
+@fontsizeparam : {font-size-param};
+
+@value: return;
+.emtoPx(@fontsizeparam);
+@fontsize: @@value;
+
@defaultfontsize : 12px;
@maxvisibleitems: 8;
-@lineheightoffset: 7px;
-@defaultmenuwidth: 300px;
+@lineheightoffset: 5px/@defaultfontsize;
+@defaultmenuwidth: 300px/@defaultfontsize;
-@fontsize : {font-size-param};
-@lineheight: @fontsize + @lineheightoffset;
+@lineheight: @fontsize + @fontsize * @lineheightoffset;
.CodeMirror {
- font-size: @fontsize !important
+ font-size: @fontsize !important;
}
.codehint-menu .dropdown-menu li a {
}
span.brackets-js-hints-with-type-details {
- width: @defaultmenuwidth * (@fontsize / @defaultfontsize) !important;
+ width: @defaultmenuwidth * @fontsize !important;
}
.codehint-menu .dropdown-menu {
| 9 |
diff --git a/core/flyout_base.js b/core/flyout_base.js @@ -431,19 +431,6 @@ Blockly.Flyout.prototype.show = function(xmlList) {
this.hide();
this.clearOldBlocks_();
- // Handle dynamic categories, represented by a name instead of a list of XML.
- // Look up the correct category generation function and call that to get a
- // valid XML list.
- if (typeof xmlList == 'string') {
- var fnToApply = this.workspace_.targetWorkspace.getToolboxCategoryCallback(
- xmlList);
- goog.asserts.assert(goog.isFunction(fnToApply),
- 'Couldn\'t find a callback function when opening a toolbox category.');
- xmlList = fnToApply(this.workspace_.targetWorkspace);
- goog.asserts.assert(goog.isArray(xmlList),
- 'The result of a toolbox category callback must be an array.');
- }
-
this.setVisible(true);
// Create the blocks to be shown in this flyout.
var gaps = [];
@@ -483,8 +470,8 @@ Blockly.Flyout.prototype.show = function(xmlList) {
/**
* Obtains blocks to show in the flyout from the given XML nodes.
- * @param {!Array|!Function} xmlList List of blocks to show, or function to
- * return blocks to show.
+ * @param {!Array|string|!Function} xmlList List of blocks to show, or function
+ * to return blocks to show.
* @param {!Array} gaps The list of gaps to show between contents, which will
* be modified by this function.
* @return {!Array} List of contents (block or buttom etc.) to show.
@@ -494,7 +481,18 @@ Blockly.Flyout.prototype.obtainContentsToShow_ = function(xmlList, gaps) {
var default_gap = this.horizontalLayout_ ? this.GAP_X : this.GAP_Y;
var contents = [];
- if (goog.isFunction(xmlList)) {
+ // Handle dynamic categories, represented by a name instead of a list of XML.
+ // Look up the correct category generation function and call that to get a
+ // valid XML list.
+ if (typeof xmlList == 'string') {
+ var fnToApply = this.workspace_.targetWorkspace.getToolboxCategoryCallback(
+ xmlList);
+ goog.asserts.assert(goog.isFunction(fnToApply),
+ 'Couldn\'t find a callback function when opening a toolbox category.');
+ xmlList = fnToApply(this.workspace_.targetWorkspace);
+ goog.asserts.assert(goog.isArray(xmlList),
+ 'The result of a toolbox category callback must be an array.');
+ } else if (goog.isFunction(xmlList)) {
var blocks = xmlList(this.workspace_);
for (var i = 0; i < blocks.length; i++) {
contents.push({type: 'block', block: blocks[i]});
| 9 |
diff --git a/.travis.yml b/.travis.yml @@ -10,7 +10,7 @@ script:
deploy:
provider: releases
api_key:
- - secure: "enSO+Yl62HY/XblFuRxJiNW0r6OdcWfy69jFfHLO1FuSRbPXj1tUjFMn0XnWv2OXiISB4Ln86fPN8Lhi7EJfe/tl6MFItbzxmdQGf8jjybj/TzRIXD/T6Re5FSFHthZv47DsZFxEmdNSYN7zHmguUEUrTlUnNVfGaSP9TZnHMzdmzVG9sYomEBzAMjWCaDSWywhWI2BAAjY/buLhAejJXz2/o/LgOs0oRt5UT6NbI3vnnnJiOjUm/zitcNGkGEek+Ailz3svLMPGqw1BOS2QvXJfDZk0lBc5JIX3hzm/5/yck+pXTYt1AZ7hMtstjrS7l+i/wITz2Tg32rlIZcoArL49KBCeSp7F2iK4wsK7+ksBXkVYwU4YsSIQM5ycRz7roOCMSzml8Px26dczasXHD7z7y4RDXLYDpX5aiyyXhVBOKbzwEYUQ3yScXL/SlM+JnjFDGSQmxlh7CDNlIZOqcvF6l0asce4ZPRXMHb5kp9ov8/ULaO49rOzyZs11LT27VOVWm9UrHjAOLOyM3o6oTgxtg79cQQt98Lp/xg4oz351+7dzryxMoMpYVfh1RwOo0EPNhsuh1j+hKpYrXMHjZbJM9ZnFAXDT6eLuRe24HS4oJ3J2LuI0pewv0+eZMfd4WeumRUTvTPQEeWMf82jK9joFhR6GRoF4I1dSk3KEKaY="
+ - secure: "4M4z0Qeq/VrNS3FiJ55qPy48j3La2n6+7+dHFXfIqFoF2GDA6UFB0Mg9+akXrZHhMs9KYsVgRvvqLAHj6ilJrVaagY2jYC6zzI3RUfdiKC6729i842BOX1ZgN+pSw/S8fKE3Zryh9P2cVmdlFQukuqIeHboaE/avle92G5xA932ePVNDfKhAz9WjohBvkCV95R6q6M6A5I2re9The0AQo9wwhG1Q+iF22g5AvlpXCmZzH78yOCRzmz6nsvZqLHWT+33hDSD7VpEKL3U4cMgfH2zoAW2bFzrLryYjtV1ShvsCVX7PI9mdWNlC5l0BgJzM5w0r/dZMI24DRS7lP3rAWuc/6pFjp8SuoUSG98UubgLvsWJFg6C1ovENT4yZtEpT0sgDZzLV0F9pUEZ6HAmJLn2wrBLYhm4uUHpirTzpdjJnc4oOHt13/3omje7OIvb5oytUEhIs5YqcSED7y8SzGk7v/O7dh7t+fHzgKM3DEf8sMcvfn0hqo/XrssHOahBhym7PFaAfOhsAsq9cVakxJ18U1RjbDIgiY3Xu3u3jGxISGJsboP6dIOzZqU79FnaIKvPK2bu89rnbWWlaRbvAA/hOrJ5YdOu6ONkbCNQhSyWJyfL4jnKBjYbK3CCo0WRZjrjaewzhoRTIfjyK2UDkjQeEVokX8iw3qWl3oZHntCU="
file_glob: true
file: "bin/nexrender-*"
skip_cleanup: true
| 3 |
diff --git a/src/metrics/commons.js b/src/metrics/commons.js @@ -276,6 +276,9 @@ function updateCommonMetrics() {
// silent
}
}))
+ .catch(err => {
+ this.logger.warn("Unable to collect CPU usage metrics.", err);
+ })
.then(() => {
this.logger.debug(`Collected common metric values in ${duration.toFixed(3)} msec.`);
});
| 9 |
diff --git a/components/input/Input.js b/components/input/Input.js @@ -9,6 +9,7 @@ const factory = (FontIcon) => {
static propTypes = {
children: PropTypes.node,
className: PropTypes.string,
+ defaultValue: PropTypes.string,
disabled: PropTypes.bool,
error: PropTypes.oneOfType([
PropTypes.string,
@@ -154,8 +155,15 @@ const factory = (FontIcon) => {
this.inputNode.focus();
}
+ valuePresent = value => (
+ value !== null
+ && value !== undefined
+ && value !== ''
+ && !(typeof value === 'number' && isNaN(value))
+ )
+
render() {
- const { children, disabled, error, floating, hint, icon,
+ const { children, defaultValue, disabled, error, floating, hint, icon,
name, label: labelText, maxLength, multiline, required,
theme, type, value, onKeyPress, rows = 1, ...others } = this.props;
const length = maxLength && value ? value.length : 0;
@@ -168,10 +176,7 @@ const factory = (FontIcon) => {
[theme.withIcon]: icon,
}, this.props.className);
- const valuePresent = value !== null
- && value !== undefined
- && value !== ''
- && !(typeof value === Number && isNaN(value)); // eslint-disable-line
+ const valuePresent = this.valuePresent(value) || this.valuePresent(defaultValue);
const inputElementProps = {
...others,
@@ -180,6 +185,7 @@ const factory = (FontIcon) => {
ref: (node) => { this.inputNode = node; },
role: 'input',
name,
+ defaultValue,
disabled,
required,
type,
| 9 |
diff --git a/script/cibuild b/script/cibuild @@ -29,7 +29,7 @@ git clone https://${DEPLOY_TOKEN}@${GITHUB_REPO} --branch ${DEPLOY_BRANCH} _site
# https://jekyllrb.com/docs/continuous-integration/travis-ci/#the-html-proofer-executable
# bundle exec htmlproofer ./_site --disable-external --empty-alt-ignore --checks-to-ignore LinkCheck
bundle exec jekyll build --verbose --trace
-bundle exec jekyll algolia
+bundle exec jekyll algolia --verbose
# Jekyll's output folder
| 0 |
diff --git a/src/components/PDFView/index.native.js b/src/components/PDFView/index.native.js import React, {Component} from 'react';
-import {TouchableWithoutFeedback, View} from 'react-native';
+import {TouchableWithoutFeedback, StyleSheet, View} from 'react-native';
import PDF from 'react-native-pdf';
import KeyboardAvoidingView from '../KeyboardAvoidingView';
import styles from '../../styles/styles';
import * as StyleUtils from '../../styles/StyleUtils';
import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
+import Text from '../Text';
import PDFPasswordForm from './PDFPasswordForm';
import * as pdfViewPropTypes from './pdfViewPropTypes';
import compose from '../../libs/compose';
import withWindowDimensions from '../withWindowDimensions';
import withKeyboardState from '../withKeyboardState';
+import withLocalize from '../withLocalize';
/**
* On the native layer, we use react-native-pdf/PDF to display PDFs. If a PDF is
@@ -33,17 +35,31 @@ class PDFView extends Component {
shouldAttemptPdfLoad: true,
shouldShowLoadingIndicator: true,
isPasswordInvalid: false,
+ failedToLoadPDF: false,
password: '',
};
this.initiatePasswordChallenge = this.initiatePasswordChallenge.bind(this);
this.attemptPdfLoadWithPassword = this.attemptPdfLoadWithPassword.bind(this);
this.finishPdfLoad = this.finishPdfLoad.bind(this);
+ this.handleFailureToLoadPDF = this.handleFailureToLoadPDF.bind(this);
}
componentDidUpdate() {
this.props.onToggleKeyboard(this.props.isShown);
}
+ handleFailureToLoadPDF(error) {
+ if (error.message.match(/password/i)) {
+ this.initiatePasswordChallenge();
+ return;
+ }
+
+ this.setState({
+ failedToLoadPDF: true,
+ shouldAttemptPdfLoad: false,
+ });
+ }
+
/**
* Initiate password challenge if message received from react-native-pdf/PDF
* indicates that a password is required or invalid.
@@ -51,16 +67,10 @@ class PDFView extends Component {
* For a password challenge the message is "Password required or incorrect password."
* Note that the message doesn't specify whether the password is simply empty or
* invalid.
- *
- * @param {String} message
*/
- initiatePasswordChallenge({message}) {
+ initiatePasswordChallenge() {
this.setState({shouldShowLoadingIndicator: false});
- if (!message.match(/password/i)) {
- return;
- }
-
// Render password form, and don't render PDF and loading indicator.
this.setState({
shouldRequestPassword: true,
@@ -129,6 +139,13 @@ class PDFView extends Component {
return (
<View style={containerStyles}>
+ {this.state.failedToLoadPDF && (
+ <View style={[styles.flex1, styles.justifyContentCenter]}>
+ <Text style={[styles.textLabel, styles.textLarge]}>
+ {this.props.translate('attachmentView.failedToLoadPDF')}
+ </Text>
+ </View>
+ )}
{this.state.shouldAttemptPdfLoad && (
<TouchableWithoutFeedback style={touchableStyles}>
<PDF
@@ -136,7 +153,7 @@ class PDFView extends Component {
renderActivityIndicator={() => <FullScreenLoadingIndicator />}
source={{uri: this.props.sourceURL}}
style={pdfStyles}
- onError={this.initiatePasswordChallenge}
+ onError={this.handleFailureToLoadPDF}
password={this.state.password}
onLoadComplete={this.finishPdfLoad}
/>
@@ -163,4 +180,5 @@ PDFView.defaultProps = pdfViewPropTypes.defaultProps;
export default compose(
withWindowDimensions,
withKeyboardState,
+ withLocalize,
)(PDFView);
| 9 |
diff --git a/packages/api-explorer/src/ResponseSchemaBody.jsx b/packages/api-explorer/src/ResponseSchemaBody.jsx const React = require('react');
const PropTypes = require('prop-types');
-const marked = require('../../markdown/index');
+const markdown = require('@readme/markdown');
const findSchemaDefinition = require('./lib/find-schema-definition');
const flatten = list => list.reduce((a, b) => a.concat(Array.isArray(b) ? flatten(b) : b), []);
@@ -112,7 +112,7 @@ function ResponseSchemaBody({ schema, oas }) {
}}
>
{row.name}
- {row.description && marked(row.description)}
+ {row.description && markdown(row.description)}
</td>
</tr>
));
| 4 |
diff --git a/assets/js/modules/analytics/hooks/useExistingTagEffect.test.js b/assets/js/modules/analytics/hooks/useExistingTagEffect.test.js @@ -47,7 +47,7 @@ describe( 'useExistingTagEffect', () => {
propertyID: 'UA-987654321-1',
};
- const data = {
+ const gtmAnalytics = {
accountID: '12345',
webPropertyID: 'UA-123456789-1',
ampPropertyID: 'UA-123456789-1',
@@ -77,11 +77,11 @@ describe( 'useExistingTagEffect', () => {
}, { propertyID: existingTag.propertyID } );
const { buildAndReceiveWebAndAMP } = createBuildAndReceivers( registry );
- buildAndReceiveWebAndAMP( data );
+ buildAndReceiveWebAndAMP( gtmAnalytics );
registry.dispatch( STORE_NAME ).receiveGetTagPermission( {
- accountID: data.accountID,
+ accountID: gtmAnalytics.accountID,
permission: true,
- }, { propertyID: data.webPropertyID } );
+ }, { propertyID: gtmAnalytics.webPropertyID } );
act( () => {
renderHook( () => useExistingTagEffect(), { registry } );
@@ -100,7 +100,7 @@ describe( 'useExistingTagEffect', () => {
propertyID: 'UA-987654321-1',
};
- const data = {
+ const gtmAnalytics = {
accountID: '12345',
webPropertyID: 'UA-123456789-1',
ampPropertyID: 'UA-123456789-1',
@@ -130,25 +130,25 @@ describe( 'useExistingTagEffect', () => {
}, { propertyID: existingTag.propertyID } );
const { buildAndReceiveWebAndAMP } = createBuildAndReceivers( registry );
- buildAndReceiveWebAndAMP( data );
+ buildAndReceiveWebAndAMP( gtmAnalytics );
registry.dispatch( STORE_NAME ).receiveGetTagPermission( {
- accountID: data.accountID,
+ accountID: gtmAnalytics.accountID,
permission: true,
- }, { propertyID: data.webPropertyID } );
+ }, { propertyID: gtmAnalytics.webPropertyID } );
act( () => {
renderHook( () => useExistingTagEffect(), { registry } );
} );
- expect( registry.select( STORE_NAME ).getAccountID() ).toBe( data.accountID );
- expect( registry.select( STORE_NAME ).getPropertyID() ).toBe( data.webPropertyID );
+ expect( registry.select( STORE_NAME ).getAccountID() ).toBe( gtmAnalytics.accountID );
+ expect( registry.select( STORE_NAME ).getPropertyID() ).toBe( gtmAnalytics.webPropertyID );
} );
it( 'should select GTM tag if there is no existing tag and user has permissions', async () => {
fetchMock.getOnce( /^\/google-site-kit\/v1\/modules\/analytics\/data\/properties-profiles/, { body: { properties: [] }, status: 200 } );
fetchMock.getOnce( /^\/google-site-kit\/v1\/modules\/analytics\/data\/profiles/, { body: [], status: 200 } );
- const data = {
+ const gtmAnalytics = {
accountID: '12345',
webPropertyID: 'UA-123456789-1',
ampPropertyID: 'UA-123456789-1',
@@ -171,26 +171,26 @@ describe( 'useExistingTagEffect', () => {
registry.dispatch( CORE_SITE ).receiveSiteInfo( { ampMode: AMP_MODE_SECONDARY } );
registry.dispatch( STORE_NAME ).receiveGetTagPermission( {
- accountID: data.accountID,
+ accountID: gtmAnalytics.accountID,
permission: true,
- }, { propertyID: data.webPropertyID } );
+ }, { propertyID: gtmAnalytics.webPropertyID } );
const { buildAndReceiveWebAndAMP } = createBuildAndReceivers( registry );
- buildAndReceiveWebAndAMP( data );
+ buildAndReceiveWebAndAMP( gtmAnalytics );
act( () => {
renderHook( () => useExistingTagEffect(), { registry } );
} );
- expect( registry.select( STORE_NAME ).getAccountID() ).toBe( data.accountID );
- expect( registry.select( STORE_NAME ).getPropertyID() ).toBe( data.webPropertyID );
+ expect( registry.select( STORE_NAME ).getAccountID() ).toBe( gtmAnalytics.accountID );
+ expect( registry.select( STORE_NAME ).getPropertyID() ).toBe( gtmAnalytics.webPropertyID );
} );
it( 'should select nothing if user doesn\'t have permissions neither to existing tag nor to GTM tag', async () => {
fetchMock.getOnce( /^\/google-site-kit\/v1\/modules\/analytics\/data\/properties-profiles/, { body: { properties: [] }, status: 200 } );
fetchMock.getOnce( /^\/google-site-kit\/v1\/modules\/analytics\/data\/profiles/, { body: [], status: 200 } );
- const data = {
+ const gtmAnalytics = {
accountID: '12345',
webPropertyID: 'UA-123456789-1',
ampPropertyID: 'UA-123456789-1',
@@ -213,12 +213,12 @@ describe( 'useExistingTagEffect', () => {
registry.dispatch( CORE_SITE ).receiveSiteInfo( { ampMode: AMP_MODE_SECONDARY } );
registry.dispatch( STORE_NAME ).receiveGetTagPermission( {
- accountID: data.accountID,
+ accountID: gtmAnalytics.accountID,
permission: false,
- }, { propertyID: data.webPropertyID } );
+ }, { propertyID: gtmAnalytics.webPropertyID } );
const { buildAndReceiveWebAndAMP } = createBuildAndReceivers( registry );
- buildAndReceiveWebAndAMP( data );
+ buildAndReceiveWebAndAMP( gtmAnalytics );
act( () => {
renderHook( () => useExistingTagEffect(), { registry } );
| 10 |
diff --git a/src/DevChatter.Bot.Web/Startup.cs b/src/DevChatter.Bot.Web/Startup.cs @@ -51,16 +51,20 @@ public void ConfigureServices(IServiceCollection services)
services.Configure<CommandHandlerSettings>(Configuration.GetSection("CommandHandlerSettings"));
services.Configure<TwitchClientSettings>(Configuration.GetSection("TwitchClientSettings"));
- var twitchClientSettings = Configuration.GetSection("TwitchClientSettings").Get<TwitchClientSettings>();
- var commandHandlerSettings = Configuration.GetSection("CommandHandlerSettings").Get<CommandHandlerSettings>();
- services.AddSingleton(twitchClientSettings);
- services.AddSingleton(commandHandlerSettings);
+ var fullConfig = Configuration.Get<BotConfiguration>();
+
+ services.AddSingleton(fullConfig.TwitchClientSettings);
+ services.AddSingleton(fullConfig.CommandHandlerSettings);
services.Configure<BotConfiguration>(Configuration);
services.AddSingleton<ILoggerFactory,LoggerFactory>();
- services.AddSingleton<IRepository, EfGenericRepo>();
+
+ IRepository repository = SetUpDatabase.SetUpRepository(fullConfig.DatabaseConnectionString);
+
+ services.AddSingleton(repository);
+
services.AddSingleton<IStreamingPlatform, StreamingPlatform>();
services.AddSingleton<IClock, SystemClock>();
@@ -78,6 +82,7 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton<IBotCommand, HeistCommand>();
services.AddSingleton<HeistGame>();
services.AddSingleton<IBotCommand, QuizCommand>();
+ services.AddSingleton<QuizGame>();
services.AddSingleton<HangmanGame>();
services.AddSingleton<IBotCommand, HangmanCommand>();
@@ -117,8 +122,8 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton<IFollowerService, TwitchFollowerService>();
var api = new TwitchAPI();
- api.Settings.ClientId = twitchClientSettings.TwitchClientId;
- api.Settings.AccessToken = twitchClientSettings.TwitchChannelOAuth;
+ api.Settings.ClientId = fullConfig.TwitchClientSettings.TwitchClientId;
+ api.Settings.AccessToken = fullConfig.TwitchClientSettings.TwitchChannelOAuth;
services.AddSingleton<ITwitchAPI>(api);
services.AddSingleton<IChatClient, TwitchChatClient>();
@@ -129,7 +134,7 @@ public void ConfigureServices(IServiceCollection services)
services.AddDbContext<AppDataContext>(ServiceLifetime.Transient);
- services.AddHangfire(cfg => cfg.UseSqlServerStorage("Server=(localdb)\\mssqllocaldb;Database=DevChatterBot;Trusted_Connection=True;MultipleActiveResultSets=true"));
+ services.AddHangfire(cfg => cfg.UseSqlServerStorage(fullConfig.DatabaseConnectionString));
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
}
| 1 |
diff --git a/character-controller.js b/character-controller.js @@ -1171,11 +1171,12 @@ class LocalPlayer extends UninterpolatedPlayer {
};
this.addAction(grabAction);
- const physicsObjects = app.getPhysicsObjects();
- for (const physicsObject of physicsObjects) {
+ physicsScene.disableAppPhysics(app)
+ // const physicsObjects = app.getPhysicsObjects();
+ // for (const physicsObject of physicsObjects) {
// physicsScene.disableGeometry(physicsObject);
- physicsScene.disableGeometryQueries(physicsObject);
- }
+ // physicsScene.disableGeometryQueries(physicsObject);
+ // }
app.dispatchEvent({
type: 'grabupdate',
@@ -1189,10 +1190,12 @@ class LocalPlayer extends UninterpolatedPlayer {
const action = actions[i];
if (action.type === 'grab') {
const app = metaversefile.getAppByInstanceId(action.instanceId);
- const physicsObjects = app.getPhysicsObjects();
- for (const physicsObject of physicsObjects) {
- physicsScene.enableGeometryQueries(physicsObject);
- }
+
+ physicsScene.enableAppPhysics(app)
+ // const physicsObjects = app.getPhysicsObjects();
+ // for (const physicsObject of physicsObjects) {
+ // physicsScene.enableGeometryQueries(physicsObject);
+ // }
this.removeActionIndex(i + removeOffset);
removeOffset -= 1;
| 0 |
diff --git a/packages/rekit-studio/src/features/common/MonacoEditor.js b/packages/rekit-studio/src/features/common/MonacoEditor.js /* eslint no-underscore-dangle: 0 */
/* global monaco */
import React, { Component } from 'react';
+import _ from 'lodash';
import PropTypes from 'prop-types';
import configureMonacoEditor from './monaco/configureMonacoEditor';
import modelManager from './monaco/modelManager';
@@ -35,7 +36,7 @@ export default class MonacoEditor extends Component {
componentDidMount() {
this.afterViewInit();
- window.addEventListener('resize', this.handleWindowResize);
+ window.addEventListener('resize', _.debounce(this.handleWindowResize, 100));
}
componentWillReceiveProps(nextProps) {
| 7 |
diff --git a/lambda/proxy-es/package-lock.json b/lambda/proxy-es/package-lock.json "optional": true
},
"node_modules/follow-redirects": {
- "version": "1.14.4",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
- "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+ "version": "1.15.1",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+ "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
"funding": [
{
"type": "individual",
}
},
"node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
},
"node_modules/neo-async": {
"version": "2.6.1",
"optional": true
},
"follow-redirects": {
- "version": "1.14.4",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
- "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+ "version": "1.15.1",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+ "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
},
"handlebars": {
"version": "4.7.7",
"requires": {}
},
"minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
},
"neo-async": {
"version": "2.6.1",
| 3 |
diff --git a/src/components/FmaMap/index.js b/src/components/FmaMap/index.js @@ -10,11 +10,14 @@ class FmaMap extends Component {
componentWillMount() {
this.props.getFmas();
}
+
onEachFeature(feature, layer) {
- if (feature.properties && feature.properties.fireblocks) {
- layer.bindPopup(`<span>${feature.properties.fireblocks[0].gid}</span>`);
+ console.log(this);
+ if (feature.properties && feature.properties.fma_id) {
+ layer.bindPopup(`<span>This is totally FMA #${feature.properties.fma_id}!</span>`);
}
}
+
render() {
console.log('fmas', this.props.fmasData);
return (
| 3 |
diff --git a/src/options/views/edit/index.vue b/src/options/views/edit/index.vue @@ -172,7 +172,8 @@ export default {
};
},
scriptName() {
- const scriptName = this.script && getScriptName(this.script);
+ const { script } = this;
+ const scriptName = script?.meta && getScriptName(script);
store.title = scriptName;
return scriptName;
},
| 1 |
diff --git a/app/models/user.rb b/app/models/user.rb @@ -456,7 +456,7 @@ class User < Sequel::Model
if organization.users.count > 1
msg = 'Attempted to delete owner from organization with other users'
- CartoDB::StdoutLogger.info msg
+ CartoDB::Logger.info(message: msg)
raise CartoDB::BaseCartoDBError.new(msg)
end
end
@@ -505,7 +505,7 @@ class User < Sequel::Model
ClientApplication.where(user_id: id).each(&:destroy)
rescue StandardError => exception
error_happened = true
- CartoDB::StdoutLogger.info "Error destroying user #{username}. #{exception.message}\n#{exception.backtrace}"
+ CartoDB::Logger.error(message: "Error destroying user #{username}", exception: exception)
end
# Invalidate user cache
@@ -835,7 +835,7 @@ class User < Sequel::Model
avatar_color = Cartodb.config[:avatars]['colors'][Random.new.rand(0..Cartodb.config[:avatars]['colors'].length - 1)]
return "#{avatar_base_url}/avatar_#{avatar_kind}_#{avatar_color}.png"
else
- CartoDB::StdoutLogger.info "Attribute avatars_base_url not found in config. Using default avatar"
+ CartoDB::Logger.info(message: "Attribute avatars_base_url not found in config. Using default avatar")
return default_avatar
end
end
| 14 |
diff --git a/src/traces/scatter/plot.js b/src/traces/scatter/plot.js @@ -404,8 +404,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
var trace = d[0].trace,
s = d3.select(this),
showMarkers = subTypes.hasMarkers(trace),
- showText = subTypes.hasText(trace),
- hasClipOnAxisFalse = trace.cliponaxis === false;
+ showText = subTypes.hasText(trace);
var keyFunc = getKeyFunc(trace),
markerFilter = hideFilter,
@@ -450,7 +449,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
if(hasNode) {
Drawing.singlePointStyle(d, sel, trace, markerScale, lineScale, gd);
- if(hasClipOnAxisFalse) {
+ if(plotinfo.layerClipId) {
Drawing.hideOutsideRangePoint(d, sel, xa, ya);
}
@@ -486,7 +485,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
hasNode = Drawing.translatePoint(d, sel, xa, ya);
if(hasNode) {
- if(hasClipOnAxisFalse) {
+ if(plotinfo.layerClipId) {
Drawing.hideOutsideRangePoint(d, g, xa, ya);
}
} else {
@@ -525,6 +524,13 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
.each(makePoints);
join.exit().remove();
+
+ // lastly, clip points groups of `cliponaxis !== false` traces
+ // on `plotinfo._hasClipOnAxisFalse === true` subplots
+ join.each(function(d) {
+ var hasClipOnAxisFalse = d[0].trace.cliponaxis === false;
+ Drawing.setClipUrl(d3.select(this), hasClipOnAxisFalse ? null : plotinfo.layerClipId);
+ });
}
function selectMarkers(gd, idx, plotinfo, cdscatter, cdscatterAll) {
| 9 |
diff --git a/docs/02-quickstart.md b/docs/02-quickstart.md @@ -15,6 +15,7 @@ npx snowpack
Snowpack is agnostic to how you serve your site during development. If you have a static dev server that you already like, use it to serve your Snowpack app. Otherwise, we recommend one of the following for local development:
- [`serve`](https://www.npmjs.com/package/serve) (popular, easy to use)
+- [`servor`](https://www.npmjs.com/package/servor) (dependency free, has live-reload by default)
- [`live-server`](https://www.npmjs.com/package/live-server) (popular, easy to use, has live-reload)
- [`lite-server`](https://www.npmjs.com/package/lite-server) (has live-reload, built for SPAs)
- [`browser-sync`](https://www.npmjs.com/package/browser-sync) (popular, battle-tested)
| 0 |
diff --git a/packages/browserslist-config/README.md b/packages/browserslist-config/README.md @@ -15,7 +15,9 @@ Shareable [browserslist](https://github.com/ai/browserslist) configuration for S
| Safari | >=10 |
| iOS | >=10 |
-[List all supported browsers](https://browserl.ist/?q=last+3+chrome+versions%2C+last+3+chromeandroid+versions%2C+last+3+firefox+versions%2C+last+3+opera+versions%2C+last+2+edge+versions%2C+safari+%3E%3D+10%2C+ios+%3E%3D+10%2C+android+%3E%3D+4.4)
+You can list all supported browsers by running `npx browserslist "last 1 firefoxandroid versions, last 3 chrome versions, last 3 chromeandroid versions, last 3 firefox versions, last 3 opera versions, last 3 edge versions, safari >= 10, ios >= 10"`
+
+Shopify employees can learn more by visiting the [browser support Vault page](https://vault.shopify.io/pages/1524-Browser-support)
## Installation
| 1 |
diff --git a/articles/tutorials/generic-oauth2-connection-examples.md b/articles/tutorials/generic-oauth2-connection-examples.md @@ -103,31 +103,41 @@ You will be able to log in using these new providers once your call successfully
## JIRA
-Generate an RSA keypair with the following command or any equivalent method:
+### Step 1: Generate an RSA Keypair
+
+Generate an RSA keypair with the following command (or any equivalent method):
```bash
$ openssl genrsa -out EXAMPLE.key 2048 && openssl rsa -pubout -in EXAMPLE.key -out EXAMPLE.pub
```
-From JIRA, create an [Application Link](https://confluence.atlassian.com/display/APPLINKS-050/Application+Links+Documentation) (under Administration > Applications > Application links) with the following settings:
- * Application URL: arbitrary URL, e.g. `https://${account.namespace}` (ignore warnings about "No response was received from the URL")
- * Application Name: arbitrary name, e.g. `Auth0`
- * Application Type: Generic Application
- * Create incoming link: checked
- * All other options left blank
+### Step 2: Create a JIRA Application Link
+
+
+From JIRA, go to **Administration** > **Application** > **Application Links**, and [create an Application Link](https://confluence.atlassian.com/display/APPLINKS-050/Application+Links+Documentation) with the following settings:
+
+* **Application URL**: Any arbitrary URL (you can ignore the `No response was received from the URL` warnings);
+* **Application Name**: Any arbitrary name;
+* **Application Type**: Generic Application;
+* **Create incoming link**: *checked*.
+
+Leave all other options left blank.
+
+To create the incoming link, use the following settings:
-When creating the incoming link, use the following settings:
- * Consumer Key: arbitrary URL-friendly name, e.g. `auth0-jira`
- * Consumer Name: arbitrary name, e.g. `Auth0`
- * Public Key: the previously generated public key (copy and paste entire `.pub` file)
- * Consumer Callback URL: `https://${account.namespace}/login/callback`
+ * **Consumer Key**: Any arbitrary URL-friendly name (for example, `auth0-jira`)
+ * **Consumer Name**: Any arbitrary name
+ * **Public Key**: The RSA keypair previously generated in step 1 (copy and paste the entire `.pub` file)
+ * **Consumer Callback URL**: `https://${account.namespace}/login/callback`
-> Note: If you need to modify these settings on JIRA after having created the application link, they can be found in the "Incoming Authentication" section of the link's settings.
+:::panel-info Updating Settings
+If you need to modify these settings after you've created the application link, you can do so via the **Incoming Authentication** section of the link's settings.
+:::
In the JSON below, replace all instances of the following placeholders:
- * `JIRA_URL`: The root URL of your JIRA instance, e.g. `https://foo.atlassian.net`
+ * `JIRA_URL`: The root URL of your JIRA instance (for example, `https://foo.atlassian.net`)
* `CONSUMER_KEY`: The chosen Consumer Key for your application link
- * `CONSUMER_SECRET`: The previously generated private key, as a JSON string. You can convert `EXAMPLE.key` to a valid JSON string using the following command:
+ * `CONSUMER_SECRET`: The previously generated private key (as a JSON string). You can convert `EXAMPLE.key` to a valid JSON string using the following command:
```bash
node -p -e 'JSON.stringify(require("fs").readFileSync("EXAMPLE.key").toString("ascii"));'
| 0 |
diff --git a/.eslintrc.js b/.eslintrc.js @@ -10,8 +10,6 @@ module.exports = {
utf8_to_b64: 'readonly',
realAudio: 'readonly',
BeautifyAll: 'readonly',
- CM: 'writable',
- unsafeWindow: 'readonly',
},
extends: ['airbnb-base', 'plugin:prettier/recommended'],
parserOptions: {
| 2 |
diff --git a/config/initializers/logstasher.rb b/config/initializers/logstasher.rb @@ -135,7 +135,7 @@ module Logstasher
payload[:params].delete_if{ |k,v|
# remove bank params, binary data params, and common or otherwise indexed params
v.blank? ||
- v.match( /^data:/ ) ||
+ v.to_s.match( /^data:/ ) ||
[ :controller, :action, :utf8, :authenticity_token ].include?(k.to_sym)
}.map{ |k,v|
# flatten out nested object and complex params like uploads
| 1 |
diff --git a/src/components/profile/EditProfile.js b/src/components/profile/EditProfile.js @@ -36,7 +36,7 @@ const EditProfile = ({ screenProps, theme, styles }) => {
debounce(async (profile, storedProfile, setIsPristine, setErrors, setIsValid) => {
if (profile && profile.validate) {
try {
- const isNotModified = isEqualWith(storedProfile, profile, (x, y, k) => {
+ const pristine = isEqualWith(storedProfile, profile, (x, y) => {
if (typeof x === 'function') {
return true
}
@@ -47,9 +47,10 @@ const EditProfile = ({ screenProps, theme, styles }) => {
})
const { isValid, errors } = profile.validate()
const { isValid: isValidIndex, errors: errorsIndex } = await userStorage.validateProfile(profile)
+
setErrors(merge(errors, errorsIndex))
setIsValid(isValid && isValidIndex)
- setIsPristine(isNotModified)
+ setIsPristine(pristine)
} catch (e) {
log.error('validate profile failed', e, e.message)
showErrorDialog('Unexpected error while validating profile', e)
| 10 |
diff --git a/src/web/InputWaiter.js b/src/web/InputWaiter.js @@ -64,6 +64,7 @@ InputWaiter.prototype.set = function(input) {
this.setInputInfo(input.size, null);
} else {
inputText.value = input;
+ this.closeFile();
window.dispatchEvent(this.manager.statechange);
const lines = input.length < (this.app.options.ioDisplayThreshold * 1024) ?
input.count("\n") + 1 : null;
| 12 |
diff --git a/src/utils.js b/src/utils.js import DirectoryPicker from "./lib/DirectoryPicker.js";
import DICTIONARY from './dictionary.js';
+import { DDB_CONFIG } from './ddb-config.js';
const PROXY = "https://proxy.vttassets.com/?url=";
@@ -102,29 +103,42 @@ let utils = {
},
/**
+ *
* Gets the sourcebook for a subset of dndbeyond sources
* @param {obj} definition item definition
*/
getSourceData: (definition) => {
- let source = {
+ let result = {
name: null,
page: null,
};
+ if (definition.sources) {
+ if (definition.sources.length > 0) {
+ result.name = DDB_CONFIG.sources
+ .filter((source) => definition.sources.some((ds) => source.id === ds.sourceId))
+ .map((source) => {
+ const dSource = definition.sources.find((ds) => source.id === ds.sourceId);
+ const page = (dSource.pageNumber) ? ` p ${dSource.pageNumber}` : "";
+ return `${source.description}${page}`;
+ })
+ .join(', ');
+ }
+ } else {
if (definition.sourceIds) {
- source.name = DICTIONARY.sources
+ result.name = DDB_CONFIG.sources
.filter((source) => definition.sourceIds.includes(source.id))
- .map((source) => source.name)
+ .map((source) => source.description)
.join();
} else if (definition.sourceId) {
- source.name = DICTIONARY.sources
+ result.name = DDB_CONFIG.sources
.filter((source) => source.id === definition.sourceId)
- .map((source) => source.name);
+ .map((source) => source.description);
}
// add a page num if available
- if (definition.sourcePageNumber) source.page = definition.sourcePageNumber;
-
- return source;
+ if (definition.sourcePageNumber) result.page = definition.sourcePageNumber;
+ }
+ return result;
},
/**
| 7 |
diff --git a/package.json b/package.json "lint": "lerna run lint --stream --no-bail",
"lint:fix": "lerna run lint:fix --stream --no-bail",
"bootstrap": "npm install && lerna bootstrap && lerna run --stream bootstrap",
- "version": "lerna version --exact --preid alpha",
+ "version": "lerna version --exact --preid beta",
"version:dry": "npm run version -- --no-git-tag-version",
- "release": "lerna publish from-git --pre-dist-tag alpha --no-verify-access --yes",
+ "release": "lerna publish from-git --pre-dist-tag beta --no-verify-access --yes",
"clean": "lerna run clean --parallel --stream && lerna clean --yes && rimraf node_modules",
"test": "lerna run --stream --parallel test",
"inso-start": "npm start --prefix packages/insomnia-inso",
| 13 |
diff --git a/edit.js b/edit.js @@ -276,6 +276,131 @@ function mod(a, b) {
}
const _getPotentialIndex = (x, y, z, subparcelSize) => x + y*subparcelSize*subparcelSize + z*subparcelSize;
+let animals = [];
+(async () => {
+ const animalsMeshes = await _loadGltf('./animals.glb');
+ const deers = animalsMeshes.getObjectByName('Deer');
+ const deer = deers.getObjectByName('alt584');
+ // console.log('got animals', animals, deer);
+
+ const aabb = new THREE.Box3().setFromObject(deer);
+ const center = aabb.getCenter(new THREE.Vector3());
+ const size = aabb.getSize(new THREE.Vector3());
+ const legsPivot = center.clone()
+ .add(size.clone().multiply(new THREE.Vector3(0, -1/2 + 1/3, 0)));
+ const legsSepFactor = 0.5;
+ const legsPivotTopLeft = legsPivot.clone()
+ .add(size.clone().multiply(new THREE.Vector3(-1/2 * legsSepFactor, 0, -1/2 * legsSepFactor)));
+ const legsPivotTopRight = legsPivot.clone()
+ .add(size.clone().multiply(new THREE.Vector3(1/2 * legsSepFactor, 0, -1/2 * legsSepFactor)));
+ const legsPivotBottomLeft = legsPivot.clone()
+ .add(size.clone().multiply(new THREE.Vector3(-1/2 * legsSepFactor, 0, 1/2 * legsSepFactor)));
+ const legsPivotBottomRight = legsPivot.clone()
+ .add(size.clone().multiply(new THREE.Vector3(1/2 * legsSepFactor, 0, 1/2 * legsSepFactor)));
+
+ const positions = deer.geometry.attributes.position.array;
+ const legs = new Float32Array(positions.length/3*4);
+ for (let i = 0, j = 0; i < positions.length; i += 3, j += 4) {
+ localVector.fromArray(positions, i);
+ let xAxis;
+ if (localVector.y < legsPivot.y) {
+ if (localVector.x >= legsPivot.x) {
+ if (localVector.z >= legsPivot.z) {
+ localVector.sub(legsPivotBottomRight);
+ xAxis = 1;
+ } else {
+ localVector.sub(legsPivotTopRight);
+ xAxis = -1;
+ }
+ } else {
+ if (localVector.z >= legsPivot.z) {
+ localVector.sub(legsPivotBottomLeft);
+ xAxis = -1;
+ } else {
+ localVector.sub(legsPivotTopLeft);
+ xAxis = 1;
+ }
+ }
+ } else {
+ localVector.set(0, 0, 0);
+ xAxis = 0;
+ }
+ localVector.toArray(legs, j);
+ legs[j+3] = xAxis;
+ }
+ deer.geometry.setAttribute('leg', new THREE.BufferAttribute(legs, 4));
+
+ const material = new THREE.ShaderMaterial({
+ uniforms: {
+ walkFactor: {
+ type: 'f',
+ value: 0,
+ needsUpdate: true,
+ },
+ walkCycle: {
+ type: 'f',
+ value: 0,
+ needsUpdate: true,
+ },
+ },
+ vertexShader: `\
+ precision highp float;
+ precision highp int;
+
+ #define PI 3.1415926535897932384626433832795
+
+ attribute vec3 color;
+ attribute vec4 leg;
+
+ uniform float walkFactor;
+ uniform float walkCycle;
+ varying vec3 vColor;
+
+ vec4 quat_from_axis_angle(vec3 axis, float angle)
+ {
+ vec4 qr;
+ float half_angle = angle * 0.5;
+ float s = sin(half_angle);
+ qr.x = axis.x * s;
+ qr.y = axis.y * s;
+ qr.z = axis.z * s;
+ qr.w = cos(half_angle);
+ return qr;
+ }
+ vec3 rotate_vertex_position(vec3 position, vec3 axis, float angle)
+ {
+ vec4 q = quat_from_axis_angle(axis, angle);
+ vec3 v = position.xyz;
+ return v + 2.0 * cross(q.xyz, cross(q.xyz, v) + q.w * v);
+ }
+
+ void main() {
+ vec3 p = position;
+ if (leg.y != 0.0) {
+ p -= leg.xyz;
+ p += rotate_vertex_position(leg.xyz, vec3(leg.w, 0., 0.), sin(walkCycle*PI*2.)*PI/2.*walkFactor);
+ }
+ gl_Position = projectionMatrix * modelViewMatrix * vec4(p, 1.0);
+ vColor = color;
+ }
+ `,
+ fragmentShader: `\
+ precision highp float;
+ precision highp int;
+
+ varying vec3 vColor;
+
+ void main() {
+ gl_FragColor = vec4(vColor, 1.0);
+ }
+ `,
+ });
+ deer.material = material;
+
+ scene.add(deer);
+ animals.push(deer);
+})();
+
const itemMeshes = [];
const npcMeshes = [];
/* const _decorateMeshForRaycast = mesh => {
@@ -3086,6 +3211,12 @@ function animate(timestamp, frame) {
return false;
}
});
+ for (const animal of animals) {
+ animal.material.uniforms.walkFactor.value = 1;
+ animal.material.uniforms.walkFactor.needsUpdate = true;
+ animal.material.uniforms.walkCycle.value = (Date.now()%2000)/2000;
+ animal.material.uniforms.walkCycle.needsUpdate = true;
+ }
cometFireMesh.material.uniforms.uAnimation.value = (Date.now() % 2000) / 2000;
hpMesh.update();
/* for (let i = 0; i < npcMeshes.length; i++) {
| 0 |
diff --git a/src/lib/gundb/UserStorage.js b/src/lib/gundb/UserStorage.js @@ -328,7 +328,13 @@ export class UserStorage {
logger.debug('getAllfeed', { feed, cursor: this.cursor })
return feed
}
-
+ /**
+ * Used as subscripition callback for gundb
+ * When the index of <day> to <number of events> changes
+ * We get the object and turn it into a sorted array by <day> which we keep in memory for feed display purposes
+ * @param {object} changed the index data from gundb an object with days as keys and number of event in that day as value
+ * @param {string} field the name of the gundb key changed
+ */
updateFeedIndex = (changed: any, field: string) => {
if (field !== 'index' || changed === undefined) return
delete changed._
@@ -336,6 +342,10 @@ export class UserStorage {
logger.debug('updateFeedIndex', { changed, field, newIndex: this.feedIndex })
}
+ /**
+ * Subscribes to changes on the event index of day to number of events
+ * the "false" (see gundb docs) passed is so we get the complete 'index' on every change and not just the day that changed
+ */
async initFeed() {
this.feed = this.gunuser.get('feed')
this.feed.get('index').on(this.updateFeedIndex, false)
| 0 |
diff --git a/offscreen-engine.js b/offscreen-engine.js @@ -84,6 +84,7 @@ export default _default_export_;`;
if (!error) {
accept(result);
} else {
+ console.warn(error);
reject(error);
}
this.port.removeEventListener('message', message);
| 0 |
diff --git a/src/components/routes/CheckoutApp.vue b/src/components/routes/CheckoutApp.vue <div class="_checkout-identification">
<h2 id="identification">
{{ $t('account.registration') }}
- <small v-if="!isCustomerLogged">
- <a href="javascript:;" @click="login">{{ $t('session.haveAccount') }}?</a>
+ <small>
+ <a v-if="!isCustomerLogged" href="javascript:;" @click="login" class="_checkout-login">
+ {{ $t('session.haveAccount') }}?
+ </a>
+ <a v-else href="javascript:;" @click="logout" class="_checkout-logout">
+ {{ $t('session.isNotYou') }}?
+ </a>
</small>
</h2>
<registration-form :short="true" :buttonText="$t('checkout.goToCheckout')"/>
</template>
<script>
-import { mapGetters, mapActions } from 'vuex'
+import { mapGetters, mapActions, mapMutations } from 'vuex'
import RegistrationForm from '@/components/routes/account/RegistrationForm'
export default {
@@ -67,6 +72,9 @@ export default {
methods: {
...mapActions([
'login'
+ ]),
+ ...mapMutations([
+ 'logout'
])
},
@@ -102,4 +110,7 @@ export default {
._confirmation-icon {
color: lighten($--color-success, 25%);
}
+._checkout-logout {
+ color: $--color-danger;
+}
</style>
| 9 |
diff --git a/articles/migrations/index.md b/articles/migrations/index.md ---
url: /migrations
+toc: true
description: Occasionally, Auth0 engineers must make breaking changes to the Auth0 platform.
---
@@ -94,8 +95,6 @@ Lock version 9 and above uses the [new password reset flow](/connections/databas
## Past Migrations
These are migrations that have already been enabled for all customers.
-
-
### Email Delivery Changes: "From" Address
| Severity | Platforms | Grace Period Start | Mandatory Opt-In|
@@ -169,9 +168,6 @@ The previous endpoint for deleting all users was `DELETE /api/v2/users`. This i
#### Am I affected by the change?
You are affected by the change only if you currently make use of the delete all users endpoint. If so, the only change you need to make is to change the URL as explained above.
-
-
-
### State Parameter required on redirect from rule
| Severity | Effective Date |
| 0 |
diff --git a/editor/uploadImage.php b/editor/uploadImage.php require_once(dirname(__FILE__) . "/../config.php");
_load_language_file("/editor/uploadImage.inc");
-function sanitizeName($file, &$response)
+//** Nolonger required if we are renaming pasted images
+/*function sanitizeName($file, &$response)
{
$filename = str_replace(' ', '_', $file);
if ($filename != $file) {
@@ -32,9 +33,10 @@ function sanitizeName($file, &$response)
}
return $filename;
-}
+}*/
-function return_bytes($val) {
+// Nevr used inside this page so commented out
+/*function return_bytes($val) {
$val = trim($val);
$last = strtolower($val[strlen($val)-1]);
switch($last) {
@@ -48,8 +50,9 @@ function return_bytes($val) {
}
return $val;
-}
+}*/
+// Check we have a logged in user
if (!isset($_SESSION['toolkits_logon_username']) && !is_user_admin())
{
_debug("Session is invalid or expired");
@@ -126,11 +129,13 @@ switch($_FILES['upload']['type'])
exit(-1);
}
-$filename = sanitizeName($_FILES['upload']['name'], $response);
+//$filename = sanitizeName($_FILES['upload']['name'], $response);
+
// Add path to the $filename
-$paste = "image";
+$paste = "pasted_image";
+
// Check if pasted filename already exists, if so add a count until we find a name that is available
-if ($filename == $paste . $paste_ext) {
+//if ($filename == $paste . $paste_ext) {
$final = $paste . $paste_ext;
$count = 1;
while (file_exists($_REQUEST['uploadPath'] . "media/" . $final)) {
@@ -138,7 +143,7 @@ if ($filename == $paste . $paste_ext) {
$count++;
}
$filename = $final;
-}
+//}
$response->uploaded = 1;
$response->url = $_REQUEST['uploadURL'] . "/media/" . $filename;
| 1 |
diff --git a/api/src/parsers/feed.js b/api/src/parsers/feed.js @@ -224,14 +224,6 @@ function checkHeaders(stream, url, checkContenType = false) {
return reject(new Error("Request body larger than maxBodyLength limit"));
}
- response.on('data', data => {
- if (bodyLength + data.length <= maxContentLengthBytes) {
- bodyLength += data.length;
- } else {
- stream.abort();
- return reject(new Error("Request body larger than maxBodyLength limit"));
- }
- })
resolve(stream);
}).on('error', reject);
});
| 12 |
diff --git a/apps/antonclk/app.js b/apps/antonclk/app.js @@ -99,7 +99,7 @@ function updateState() {
}
function isoStr(date) {
- return date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).substr(-2);
+ return date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2);
}
var calWeekBuffer = [false,false,false]; //buffer tz, date, week no (once calculated until other tz or date is requested)
| 14 |
diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js @@ -20,7 +20,15 @@ function DataviewBackend(analysisBackend) {
this.analysisBackend = analysisBackend;
}
-var DATE_AGGREGATIONS = ['minute', 'hour', 'day', 'week', 'month', 'quarter', 'year'];
+var DATE_AGGREGATIONS = {
+ 'minute': true,
+ 'hour': true,
+ 'day': true,
+ 'week': true,
+ 'month': true,
+ 'quarter': true,
+ 'year': true
+};
module.exports = DataviewBackend;
@@ -108,7 +116,7 @@ function getOverrideParams(params, ownFilter) {
{ownFilter: ownFilter}
);
- if (params.aggregation && DATE_AGGREGATIONS.indexOf(params.aggregation) !== -1) {
+ if (params.aggregation && DATE_AGGREGATIONS.hasOwnProperty(params.aggregation)) {
overrideParams.aggregation = params.aggregation;
}
| 4 |
diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js @@ -92,7 +92,7 @@ tarteaucitron.services.podcloud = {
tarteaucitron.services.facebookpost = {
"key": "facebookpost",
"type": "social",
- "name": "Facebook Post",
+ "name": "Facebook (post)",
"uri": "https://www.facebook.com/help/325807937506242",
"needConsent": true,
"cookies": [],
| 10 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,23 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.41.3] -- 2018-09-25
+
+### Fixed
+- Fix handling of hover `text` in `barpolar` traces [#3040]
+- Fix `scatterpolar[gl]` `text` placement in hover label [#3040]
+- Fix `pie` trace support for individual stroke width values [#3030]
+- Fix handling of CSS `max-width` and `max-height` in auto-size routine [#3033]
+- Rotate hover labels when `hovermode: 'y'` and a single trace produces multiple
+ labels [#3043]
+- Rotate hover labels when `hovermode: 'closest'` and multiple labels are
+ generated including one from an horizontal trace [#3043]
+- Fix hover label coloring on white bgcolor [#3048]
+- Do not coerce nor validate `polar?.bar*` attributes on
+ subplots w/o visible `barpolar` traces [#3023]
+- Fix legacy polar attribute descriptions [#3023]
+
+
## [1.41.2] -- 2018-09-19
### Fixed
| 3 |
diff --git a/src/utils/typography.js b/src/utils/typography.js import Typography from 'typography'
import Wordpress2016 from 'typography-theme-wordpress-2016'
+Wordpress2016.overrideThemeStyles = () => ({
+ 'a.gatsby-resp-image-link': {
+ boxShadow: 'none',
+ }
+})
+
const typography = new Typography(Wordpress2016)
// Hot reload typography in development.
| 2 |
diff --git a/server/preprocessing/other-scripts/openaire.R b/server/preprocessing/other-scripts/openaire.R @@ -26,8 +26,6 @@ library(rcrossref)
# * "readers": an indicator of the paper's popularity, e.g. number of readers, views, downloads etc.
# * "subject": keywords or classification, split by ;
-DEBUG <- TRUE
-
get_papers <- function(query, params, limit=NULL) {
# parse params
project_id <- params$project_id
@@ -147,7 +145,7 @@ parse_response <- function(response) {
fill_dois <- function(df) {
missing_doi_indices <- which(is.na(df$doi))
titles <- df[missing_doi_indices,]$title
- if (DEBUG) {
+ if (debug) {
print(paste("Missing DOIs:", length(titles)))
print("Time for filling missing DOIs")
print(system.time(cr_works(query=queries(titles), async=TRUE)))
| 2 |
diff --git a/docs/articles/documentation/test-api/intercepting-http-requests/creating-a-custom-http-request-hook.md b/docs/articles/documentation/test-api/intercepting-http-requests/creating-a-custom-http-request-hook.md @@ -21,7 +21,7 @@ You can create your own request hook to handle HTTP requests. This topic describ
```js
import { RequestHook } from 'testcafe';
- class MyRequestHook extends RequestHook {
+ export class MyRequestHook extends RequestHook {
// ...
}
```
@@ -97,7 +97,7 @@ Do the following to write a custom hook:
```js
import { RequestHook } from 'testcafe';
-class MyRequestHook extends RequestHook {
+export class MyRequestHook extends RequestHook {
constructor (requestFilterRules, responseEventConfigureOpts) {
super(requestFilterRules, responseEventConfigureOpts);
// ...
| 0 |
diff --git a/docs/moment/01-parsing/03-string-format.md b/docs/moment/01-parsing/03-string-format.md @@ -151,7 +151,13 @@ Strict parsing is frequently the best parsing option. For more information about
#### Parsing two digit years
-By default, two digit years above 68 are assumed to be in the 1900's and years 68 or below are assumed to be in the 2000's. This can be changed by replacing the `moment.parseTwoDigitYear` method.
+By default, two digit years above 68 are assumed to be in the 1900's and years 68 or below are assumed to be in the 2000's. This can be changed by replacing the `moment.parseTwoDigitYear` method. The only argument of this method is a string containing the two years input by the user, and should return the year as an integer.
+
+```javascript
+moment.parseTwoDigitYear = function(yearString) {
+ return parseInt(yearString) + 2000;
+}
+```
#### Parsing glued hour and minutes
| 7 |
diff --git a/assets/js/modules/analytics-4/datastore/index.js b/assets/js/modules/analytics-4/datastore/index.js import Data from 'googlesitekit-data';
import { MODULES_ANALYTICS_4 } from './constants';
import accounts from './accounts';
-import api from './api';
import baseModuleStore from './base';
import properties from './properties';
import tags from './tags';
@@ -31,7 +30,6 @@ import { createSnapshotStore } from '../../../googlesitekit/data/create-snapshot
const store = Data.combineStores(
accounts,
- api,
baseModuleStore,
createSnapshotStore( MODULES_ANALYTICS_4 ),
properties,
| 2 |
diff --git a/src/js/extensions/select_row.js b/src/js/extensions/select_row.js -var RowSelect = function(table){
+var SelectRow = function(table){
var extension = {
table:table, //hold Tabulator object
@@ -109,4 +109,4 @@ var RowSelect = function(table){
return extension;
}
-Tabulator.registerExtension("rowSelect", RowSelect);
\ No newline at end of file
+Tabulator.registerExtension("selectRow", SelectRow);
\ No newline at end of file
| 10 |
diff --git a/docs/providers/spotinst/README.md b/docs/providers/spotinst/README.md @@ -18,7 +18,7 @@ If you have questions, join the [chat in gitter](https://gitter.im/serverless/se
<div class="docsSection">
<div class="docsSectionHeader">
<a href="./guide/">
- <img src="https://drive.google.com/file/d/0B4tt_s7cFF3xQW9uMTd6dUc3Vzg/view?usp=sharing" alt="Serverless Spotinst Guide" width="250" draggable="false"/>
+ <img src="https://spotinst.com/app/uploads/2016/10/spotinst-logo-lightBlue.svg" alt="Serverless Spotinst Guide" width="250" draggable="false"/>
</a>
</div>
<div class="test">
@@ -34,7 +34,7 @@ If you have questions, join the [chat in gitter](https://gitter.im/serverless/se
<div class="docsSection">
<div class="docsSectionHeader">
<a href="./cli-reference/">
- <img src="https://drive.google.com/file/d/0B4tt_s7cFF3xTW1iNTJTWnZwNUk/view?usp=sharing" alt="Serverless Spotinst CLI Reference" width="250" draggable="false"/>
+ <img src="https://spotinst.com/app/uploads/2016/10/spotinst-logo-lightBlue.svg" alt="Serverless Spotinst CLI Reference" width="250" draggable="false"/>
</a>
</div>
<div>
@@ -58,7 +58,7 @@ If you have questions, join the [chat in gitter](https://gitter.im/serverless/se
<div class="docsSection">
<div class="docsSectionHeader">
<a href="./events/">
- <img src="https://drive.google.com/file/d/0B4tt_s7cFF3xbmtFRjFyTmNnbjQ/view?usp=sharing" alt="Serverless Spotinst Events" width="250" draggable="false"/>
+ <img src="https://spotinst.com/app/uploads/2016/10/spotinst-logo-lightBlue.svg" alt="Serverless Spotinst Events" width="250" draggable="false"/>
</a>
</div>
<div>
@@ -72,7 +72,7 @@ If you have questions, join the [chat in gitter](https://gitter.im/serverless/se
<div class="docsSection">
<div class="docsSectionHeader">
<a href="./examples/">
- <img src="https://drive.google.com/file/d/0B4tt_s7cFF3xYVhSZ04zV1VlZ28/view?usp=sharing" alt="Serverless Spotinst Examples" width="250" draggable="false"/>
+ <img src="https://spotinst.com/app/uploads/2016/10/spotinst-logo-lightBlue.svg" alt="Serverless Spotinst Examples" width="250" draggable="false"/>
</a>
</div>
<div>
| 13 |
diff --git a/package.json b/package.json "url": "git+https://github.com/stefanjudis/tiny-helpers.git"
},
"engines": {
- "node": "~12.14"
+ "node": "~12.14.0"
},
"keywords": [],
"author": "stefan judis <[email protected]>",
| 1 |
diff --git a/src/client/js/components/Admin/Security/SamlSecuritySetting.jsx b/src/client/js/components/Admin/Security/SamlSecuritySetting.jsx @@ -139,8 +139,10 @@ class SamlSecurityManagement extends React.Component {
<div className="alert alert-danger">
{t('security_setting.missing mandatory configs')}
<ul>
- {/* TODO GW-750 show li after fetch data */}
- {/* <li>{ t('security_setting.form_item_name.key') }</li> */}
+ {adminSamlSecurityContainer.state.missingMandatoryConfigKeys.map((configKey) => {
+ const key = configKey.replace('security:passport-saml:', '');
+ return <li key={configKey}>{t(`security_setting.form_item_name.${key}`)}</li>;
+ })}
</ul>
</div>
)}
| 12 |
diff --git a/app/math-editor.js b/app/math-editor.js @@ -12,7 +12,7 @@ const keyCodes = {
}
const $outerPlaceholder = $(`<div class="rich-text-editor-hidden" data-js="outerPlaceholder">`)
const focus = {
- richText: true,
+ richText: false,
latexField: false,
equationField: false
}
| 12 |
diff --git a/mappings.json b/mappings.json "library": {
"_commands": [ "init", "copy", "migrate", "search", "upload", "publish", "add" ],
- "init": {
- "maps": [ "library", "init" ],
- "usage": "particle library init [directory]",
+ "create": {
+ "maps": [ "library", "create" ],
+ "usage": "particle library create [directory]",
"does": "Initializes a new library in the specified or current directory."
},
"copy": {
| 10 |
diff --git a/app/models/visualization/relator.rb b/app/models/visualization/relator.rb @@ -96,9 +96,7 @@ module CartoDB
end
def related_tables
- @related_tables ||= layers(:carto_and_torque)
- .flat_map { |layer| layer.affected_tables.map(&:service) }
- .uniq(&:id)
+ @related_tables ||= layers(:carto_and_torque).flat_map { |layer| layer.user_tables.map(&:service) }.uniq(&:id)
end
def related_canonical_visualizations
| 5 |
diff --git a/README.md b/README.md @@ -138,19 +138,19 @@ A greyscale image will be saved in the same folder.
<img src="./test/img/taxi/original.jpeg" width="300" /><img src="./test/img/taxi/grey.png" width="300" />
-[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVC4CG6DZZHU)
+[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVD6UC9S7RSV)
### Create a mask
<img src="./test/img/taxi/original.jpeg" width="300" /><img src="./test/img/taxi/mask.png" width="300" />
-[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVC47MLSCEP2)
+[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVD6TP7ICRZM)
### Paint a mask
<img src="./test/img/taxi/original.jpeg" width="300" /><img src="./test/img/taxi/orange.png" width="300" />
-[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVC3Z6F6T6ZQ)
+[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVD6T1Y63MUH)
### Filter a mask using Region Of Interests (ROIs)
@@ -158,13 +158,13 @@ Image-js has a powerful Region of Interests Manager that allows to create ROIs f
<img src="./test/img/taxi/original.jpeg" width="300" /><img src="./test/img/taxi/filteredOrange.png" width="300" />
-[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVC5G8Q3RP78)
+[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVD6SE2F4MWE)
When extracting a mask from a ROI you have many options (`contour`, `box`, `filled`, `center`, `hull` or `normal`). Here it looks better to use the `filled` ROI.
<img src="./test/img/taxi/original.jpeg" width="300" /><img src="./test/img/taxi/filteredFilledOrange.png" width="300" />
-[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVC5VOJXA6V9)
+[Try it](https://www.w3schools.com/code/tryit.asp?filename=FVD6QQISMLZ2)
### Advanced analysis of SEM / TEM images
| 4 |
diff --git a/src/components/input/Select.js b/src/components/input/Select.js @@ -45,11 +45,13 @@ const Select = props => {
bsSize={props.bs_size}
>
<option value="" disabled hidden></option>
- {props.options && props.options.map(option => (
+ {props.options &&
+ props.options.map(option => (
<option
key={option.value}
value={option.value}
disabled={option.disabled}
+ title={option.title}
>
{option.label}
</option>
@@ -113,7 +115,14 @@ Select.propTypes = {
/**
* If true, this checkbox is disabled and can't be clicked on.
*/
- disabled: PropTypes.bool
+ disabled: PropTypes.bool,
+
+ /**
+ * The HTML 'title' attribute for the option. Allows for information on
+ * hover. For more information on this attribute, see
+ * https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/title
+ */
+ title: PropTypes.string
})
),
| 11 |
diff --git a/game.js b/game.js @@ -1238,6 +1238,9 @@ class GameManager extends EventTarget {
menuPaste(s) {
menuMesh.paste(s);
}
+ inputFocused() {
+ return !!document.activeElement && ['INPUT', 'TEXTAREA'].includes(document.activeElement.nodeName);
+ }
canGrab() {
return !!highlightedObject /*&& !editedObject*/;
}
| 0 |
diff --git a/utils/debugger/src/check-order.js b/utils/debugger/src/check-order.js @@ -26,7 +26,6 @@ const checkOrder = async (order, network) => {
// Check swap address provided
if (order['signature']['validator'] == EMPTY_ADDRESS) {
errors.push('Order.signature.validator cannot be 0')
- return errors
}
// Check signer balance and allowance
| 2 |
diff --git a/packages/growi-plugin-lsx/package.json b/packages/growi-plugin-lsx/package.json {
"name": "growi-plugin-lsx",
- "version": "1.3.15",
+ "version": "2.0.0",
"description": "GROWI plugin to add lsx tag",
"keywords": [
"growi",
"rimraf": "^2.6.1"
},
"engines": {
- "node": ">=6.11 <9",
- "npm": ">=4",
- "yarn": "^1.3.1"
+ "node": ">=8.11.1 <9",
+ "npm": ">=5.6.0 <7",
+ "yarn": "^1.5.1"
}
}
| 12 |
diff --git a/token-metadata/0xc4199fB6FFDb30A829614becA030f9042f1c3992/metadata.json b/token-metadata/0xc4199fB6FFDb30A829614becA030f9042f1c3992/metadata.json "symbol": "SGT",
"address": "0xc4199fB6FFDb30A829614becA030f9042f1c3992",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/vis/js/bubbles.js b/vis/js/bubbles.js @@ -826,8 +826,9 @@ BubblesFSM.prototype = {
this.bringPapersToFront(d);
hideSibling(circle);
+ if (papers.is("behindbubble") || papers.is("behindbigbubble") || papers.is("ready")) {
papers.mouseover();
-
+ }
d3.selectAll("#region").style("fill-opacity", 1);
}
| 2 |
diff --git a/src/DevChatter.Bot.Web/Pages/BotAdmin.cshtml.cs b/src/DevChatter.Bot.Web/Pages/BotAdmin.cshtml.cs -using System.ComponentModel;
-using System.Linq;
using DevChatter.Bot.Core;
using Hangfire;
using Hangfire.Server;
using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Linq;
namespace DevChatter.Bot.Web.Pages
{
public class BotAdminModel : PageModel
{
+ public string Message { get; set; }
+
public void OnGet()
{
@@ -26,8 +27,6 @@ public void OnPost()
}
}
- public string Message { get; set; }
-
public class BotWorker : Worker
{
private readonly BotMain _botMain;
| 5 |
diff --git a/scalene/scalene_profiler.py b/scalene/scalene_profiler.py @@ -1459,6 +1459,7 @@ class Scalene:
def log_request(self, code: Union[int, str] = 0, size: Union[int, str] = 0) -> None:
return
Handler = NoLogs
+ socketserver.TCPServer.allow_reuse_address = True
with socketserver.TCPServer(("", PORT), Handler) as httpd:
import threading
t = threading.Thread(target=httpd.serve_forever)
| 11 |
diff --git a/packages/insomnia-cookies/src/cookies.test.ts b/packages/insomnia-cookies/src/cookies.test.ts @@ -24,6 +24,7 @@ describe('jarFromCookies()', () => {
});
it('handles malformed JSON', () => {
+ jest.spyOn(console, 'log').mockImplementationOnce(() => {});
// @ts-expect-error this test is verifying that an invalid input is handled appropriately
const jar = jarFromCookies('not a jar');
expect(jar.constructor.name).toBe('CookieJar');
@@ -59,12 +60,11 @@ describe('cookiesFromJar()', () => {
it('handles bad jar', async () => {
const jar = CookieJar.fromJSON({ cookies: [] });
-
+ jest.spyOn(console, 'warn').mockImplementationOnce(() => {});
// MemoryStore never actually throws errors, so lets mock the function to force it to this time.
// @ts-expect-error intentionally invalid value
jar.store.getAllCookies = cb => cb(new Error('Dummy Error'));
const cookies = await cookiesFromJar(jar);
-
// Cookies failed to parse
expect(cookies.length).toBe(0);
});
| 2 |
diff --git a/src/nodejs/util.js b/src/nodejs/util.js @@ -620,17 +620,16 @@ module.exports = {
* @returns {Object} Returns the data formatted by class
*/
formatDataByClass(data) {
- let ret = {};
+ const ret = {};
if (data && typeof data === 'object' && !Array.isArray(data)) {
+ // assuming a flat declaration where each object contains a class
+ // if that assumption changes this will need to be modified
Object.keys(data).forEach((k) => {
const v = data[k];
// check if value for v is an object that contains a class
if (typeof v === 'object' && v.class) {
if (!ret[v.class]) { ret[v.class] = {}; }
ret[v.class][k] = v;
- } else {
- // need to introspect child objects
- ret = this.formatDataByClass(v);
}
});
}
| 1 |
diff --git a/views/stats.ejs b/views/stats.ejs @@ -919,7 +919,7 @@ twitterDescription += '. Click to view more stats!'
<!DOCTYPE html>
<html lang="en">
<head>
- <title><%- calculated.display_name %><% if(calculated.display_emoji){ %> <%- calculated.display_emoji %><% } %> | sky.lea.moe</title>
+ <title><%- calculated.display_name %><% if(calculated.display_emoji){ %> <%- calculated.display_emoji %><% } %> | SkyCrypte</title>
<meta name="description" content="<%= metaDescription %>">
<link rel="shortcut icon" href="https://crafatar.com/avatars/<%- calculated.uuid %>?size=32&overlay" type="image/png">
<meta property="og:type" content="website">
| 14 |
diff --git a/localization/languages/it.json b/localization/languages/it.json },
"settingsUserAgentToggle": "Utilizza un user agent personalizzato",
"settingsUpdateNotificationsToggle": "Controlla automaticamente la presenza di aggiornamenti",
- "settingsUsageStatisticsToggle": "Invia statistiche di utilizzo (<a href=\"https://github.com/minbrowser/min/blob/master/docs/statistics.md\">Maggiori informazioni</a>)",
+ "settingsUsageStatisticsToggle": {
+ "unsafeHTML": "Invia statistiche di utilizzo (<a href=\"https://github.com/minbrowser/min/blob/master/docs/statistics.md\">Maggiori informazioni</a>)"
+ },
"settingsSearchEngineHeading": "Motore di ricerca",
"settingsDefaultSearchEngine": "Scegli un motore di ricerca predefinito:",
"settingsDDGExplanation": "Imposta DuckDuckGo come motore di ricerca predefinito per vedere risposte istantanee nella barra di ricerca.",
"keychainViewPasswords": "Mostra password salvate",
/* Password manager setup */
"passwordManagerSetupHeading": "Imposta %p per utilizzare l'autocompletamento",
- "passwordManagerSetupStep1": "Prima, <a id='password-manager-setup-link'></a> ed estrailo per il tuo sistema.",
- "passwordManagerInstallerSetup": "Scarica <a id='password-manager-setup-link-installer'></a> e sposta il file nel box qui sotto:",
+ "passwordManagerSetupStep1": {
+ "unsafeHTML": "Prima, <a id='password-manager-setup-link'></a> ed estrailo per il tuo sistema."
+ },
+ "passwordManagerInstallerSetup": {
+ "unsafeHTML": "Scarica <a id='password-manager-setup-link-installer'></a> e sposta il file nel box qui sotto:"
+ },
"passwordManagerSetupLink": "scarica il tool CLI di %p",
"passwordManagerSetupLinkInstaller": "l'install CLI di %p",
"passwordManagerSetupStep2": "Quindi trascina il tool nel box qui sotto:",
| 1 |
diff --git a/token-metadata/0x8cb1d155a5a1d5d667611b7710920fD9D1CD727F/metadata.json b/token-metadata/0x8cb1d155a5a1d5d667611b7710920fD9D1CD727F/metadata.json "symbol": "AIRX",
"address": "0x8cb1d155a5a1d5d667611b7710920fD9D1CD727F",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/README.md b/README.md @@ -226,19 +226,19 @@ To see the console output of the view in your terminal, set the environment vari
A list of all environment variables and their purpose:
| Variable | Values | default | Purpose |
-| ------------------------- | ---------------------------------------- | -------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `NODE_ENV` | 'production', 'development' | | |
-| `LOGGING` | 'true', 'false' | 'true' | Disable logging |
-| `COSMOS_NETWORK` | {path to network configuration folder} | '../networks/gaia-7001' | Network to connect to |
-| `COSMOS_HOME` | {path to config persistence folder} | '\$HOME/.cosmos-voyager[-dev]' | |
-| `LCD_URL` | {URL of a Cosmos light client interface} | see 'app/config.toml' | Cosmos Light Client interface to connect to |
-| `RPC_URL` | {URL of a Tendermint rpc interface} | see 'app/config.toml' | Tendermint node to connect to |
-| `COSMOS_DEVTOOLS` | 'true', 'false' | 'false' | Open the debug panel in the electron view |
-| `ELECTRON_ENABLE_LOGGING` | 'true', 'false' | 'false' | Redirect the browser view console output to the console |
-| `PREVIEW` | 'true', 'false' | 'true' if NODE_ENV 'development' | Show/Hide features that are in development |
-| `COSMOS_E2E_KEEP_OPEN` | 'true', 'false' | 'false' | Keep the Window open in local E2E test to see the state in which the application broke. |
-| `CI` | 'true', 'false' | 'false' | Adds better structured output, makes a screenshot and adds logs to files (used on CircleCI). |
-| `ALLOW_CONSOLE` | 'true', 'false' | 'false' | Unit tests fail if they use `console.error` or `console.warn`. To see the initial use/occurences of those callings, you can escape this behavior using this flag. |
+| ------------------------- | ---------------------------------------- | ------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `NODE_ENV` | `production`, `development` | | |
+| `LOGGING` | `true`, `false` | `true` | Disable logging |
+| `COSMOS_NETWORK` | {path to network configuration folder} | | Network to connect to |
+| `COSMOS_HOME` | {path to config persistence folder} | `\$HOME/.cosmos-voyager[-dev]` | |
+| `LCD_URL` | {URL of a Cosmos light client interface} | see [`config`](https://github.com/cosmos/voyager/blob/develop/app/config.toml) | Cosmos Light Client interface to connect to |
+| `RPC_URL` | {URL of a Tendermint rpc interface} | see [`config`](https://github.com/cosmos/voyager/blob/develop/app/config.toml) | Tendermint node to connect to |
+| `COSMOS_DEVTOOLS` | `true`, `false` | `false` | Open the debug panel in the electron view |
+| `ELECTRON_ENABLE_LOGGING` | `true`, `false` | `false` | Redirect the browser view console output to the console |
+| `PREVIEW` | `true`, `false` | `true` if `NODE_ENV=development` | Show/Hide features that are in development |
+| `COSMOS_E2E_KEEP_OPEN` | `true`, `false` | `false` | Keep the Window open in local E2E test to see the state in which the application broke. |
+| `CI` | `true`, `false` | `false` | Adds better structured output, makes a screenshot and adds logs to files (used on CircleCI). |
+| `ALLOW_CONSOLE` | `true`, `false` | `false` | Unit tests fail if they use `console.error` or `console.warn`. To see the initial use/occurences of those callings, you can escape this behavior using this flag. |
## FAQ
| 3 |
diff --git a/doc/includes/CHANGELOG.md b/doc/includes/CHANGELOG.md ### What's new
- * All queries are now started through `Model.query` [#346](https://github.com/Vincit/objection.js/issues/346)
- * Objection is no longer transpiled using Babel. One of the implications is that you can use a objection github
- link in package.json to test experimental version.
+ * All queries now call `Model.query` to create a `QueryBuilder` instance [#346](https://github.com/Vincit/objection.js/issues/346)
+ * Objection is no longer transpiled using Babel. One of the implications is that you can use a github
+ link in package.json to test experimental versions.
* `count` can now be called without arguments [#364](https://github.com/Vincit/objection.js/issues/364)
### Breaking changes
| 7 |
diff --git a/.github/workflows/TEST-release.yml b/.github/workflows/TEST-release.yml @@ -3,7 +3,7 @@ name: TEST-release
#todo this test should be execute when opening PR to prerelease/release branches
on: [pull_request]
env:
- NODE_ENV: development
+ NODE_ENV: test
ARTIFACTS_DIR: artifacts
CUCUMBER_ARTIFACTS_DIR: artifacts/cucumber
jobs:
| 3 |
diff --git a/server/views/sources/source.py b/server/views/sources/source.py @@ -279,7 +279,7 @@ def source_update(media_id):
# now we need to update the collections separately, because they are tags on the media source
source = user_mc.media(media_id)
existing_tag_ids = [t['tags_id'] for t in source['media_source_tags']
- if (t['tag_sets_id'] in [COLLECTIONS_TAG_SET_ID, GV_TAG_SET_ID, EMM_TAG_SET_ID]) and (t['show_on_media'] is 1)]
+ if (t['tag_sets_id'] in [COLLECTIONS_TAG_SET_ID, GV_TAG_SET_ID, EMM_TAG_SET_ID])]
tag_ids_to_add = tag_ids_from_collections_param()
tag_ids_to_remove = list(set(existing_tag_ids) - set(tag_ids_to_add))
tags_to_add = [MediaTag(media_id, tags_id=cid, action=TAG_ACTION_ADD)
| 11 |
diff --git a/src/components/Spinner.js b/src/components/Spinner.js -import React, { Component } from 'react'
+import React, { Component, PureComponent } from 'react'
import { connect } from 'react-redux'
-import { withTranslation } from 'react-i18next'
import Spinner from 'react-native-loading-spinner-overlay'
-import { selectIsTasksLoading } from '../redux/Courier/'
-import { selectIsDispatchFetching } from '../redux/Dispatch/selectors'
+import { selectIsLoading } from '../redux/App/selectors'
-class SpinnerWrapper extends Component {
+class SpinnerWrapper extends PureComponent {
- render() {
+ constructor(props) {
+
+ super(props)
+
+ this.state = {
+ isLoading: props.loading,
+ }
+ }
+ componentDidUpdate(prevProps, prevState) {
+ if (prevProps.loading !== this.props.loading) {
+ if (prevProps.loading && !this.props.loading) {
+ // https://github.com/joinspontaneous/react-native-loading-spinner-overlay/issues/30
+ setTimeout(() => this.setState({ isLoading: this.props.loading }), 250)
+ } else {
+ this.setState({ isLoading: this.props.loading })
+ }
+ }
+ }
+
+ render() {
return (
- <Spinner visible={ this.props.loading } />
+ <Spinner visible={ this.state.isLoading } />
)
}
}
@@ -19,13 +36,8 @@ class SpinnerWrapper extends Component {
function mapStateToProps(state) {
return {
- loading: state.app.loading
- || selectIsTasksLoading(state)
- || selectIsDispatchFetching(state)
- || state.restaurant.isFetching
- || state.checkout.isFetching
- || false,
+ loading: selectIsLoading(state),
}
}
-export default connect(mapStateToProps)(withTranslation()(SpinnerWrapper))
+export default connect(mapStateToProps)(SpinnerWrapper)
| 4 |
diff --git a/components/Vote/Voting.js b/components/Vote/Voting.js @@ -288,7 +288,7 @@ class Voting extends React.Component {
}
render() {
- const { data } = this.props
+ const { data, description } = this.props
return (
<Loader
loading={data.loading}
@@ -303,7 +303,7 @@ class Voting extends React.Component {
return (
<div {...styles.card}>
- <H3>{voting.description}</H3>
+ <H3>{description || voting.description}</H3>
{error && <ErrorMessage error={error} />}
{this.renderVotingBody()}
</div>
| 11 |
diff --git a/articles/libraries/lock/v10/index.md b/articles/libraries/lock/v10/index.md @@ -5,7 +5,6 @@ title: Lock 10 for Web
description: A widget that provides a frictionless login and signup experience for your web apps.
img: media/articles/libraries/lock-web.png
---
-
# Lock 10 for Web
You're looking at the documentation for the _easiest_ way of securing your website and mobile apps!
@@ -58,7 +57,7 @@ If you are using browserify or webpack to build your project and bundle its depe
## Usage
-### Implementing Lock
+### 1) Implementing Lock
```js
// Initiating our Auth0Lock
@@ -82,7 +81,7 @@ lock.on("authenticated", function(authResult) {
});
```
-### Showing Lock
+### 2) Showing Lock
```js
document.getElementById('btn-login').addEventListener('click', function() {
@@ -90,7 +89,7 @@ document.getElementById('btn-login').addEventListener('click', function() {
});
```
-### Displaying the User's Profile
+### 3) Displaying the User's Profile
```js
// Verify that there's a token in localStorage
@@ -114,7 +113,7 @@ function showLoggedIn() {
This example demonstrates using Lock 10 with a Single Page Application (SPA). To learn how Lock can be modified to provide frictionless authentication for any app, see the [API Reference][lock-api] and the [Configuration Options Reference][lock-customization]. For details specifically about customizing the look and feel of Lock in your app, please take a look at the [UI Customization][ui-customization] page.
:::
-## Start Using Lock
+## Further Examples
<%= include('../../../_includes/_lock-sdk') %>
| 3 |
diff --git a/stdcommands/throw/throwthings.go b/stdcommands/throw/throwthings.go @@ -32,7 +32,7 @@ var throwThings = []string{
"hate",
"a tomato",
"a time machine that takes 1 year to travel 1 year into the future",
- "sadness disguised as hapiness",
+ "sadness disguised as happiness",
"debt",
"all your imaginary friends",
"homelessness",
@@ -55,7 +55,7 @@ var throwThings = []string{
"death",
"tide pods",
"a happy life with a good career and a nice family",
- "a sad life with a deadend career and a horrible family",
+ "a sad life with a dead-end career and a horrible family",
"divorce papers",
"an engagement ring",
"yourself",
| 1 |
diff --git a/src/gameClasses/components/ui/MenuUiComponent.js b/src/gameClasses/components/ui/MenuUiComponent.js @@ -216,37 +216,6 @@ var MenuUiComponent = IgeEntity.extend({
});
- $('#play-game-button').on('click', function () {
- if (this.innerText.includes('Connection Failed')) {
- var serverLength = $('#server-list') && $('#server-list')[0] && $('#server-list')[0].children.length;
- $('#server-list').attr('size', serverLength);
- $('#server-list').focus();
- } else {
- // did user tried to change server
- var isServerChanged = window.connectedServer && ige.client.server.id !== window.connectedServer.id;
-
- if (isServerChanged) {
- window.location = `${window.location.pathname}?serverId=${ige.client.server.id}&joinGame=true`;
- return;
- }
-
- if (ige.game && ige.game.isGameStarted) {
- var wasGamePaused = this.innerText.includes('Continue');
- self.playGame(wasGamePaused);
- self.setResolution();
- } else {
- $('#play-game-button').attr('disabled', true);
- self.startLoading();
- ige.client.connectToServer();
- }
- }
- $('#play-game-button-wrapper').addClass('d-none-important');
- });
-
-
-
-
-
$('#help-button').on('click', function () {
$('#help-modal').modal('show');
});
| 6 |
diff --git a/apiserver/apiserver/coordinator/coordinator.py b/apiserver/apiserver/coordinator/coordinator.py @@ -69,7 +69,7 @@ def upload_game():
# Store the replay and any error logs
replay_key, bucket_class = store_game_artifacts(replay_name, users)
- with model.engine.connect() as conn:
+ with model.engine.begin() as conn:
total_users = conn.execute(model.total_ranked_users).first()[0]
for user in users:
stored_user = conn.execute(
@@ -130,14 +130,14 @@ def upload_game():
user["tier"] = util.tier(total_users, total_users)
# Store game results in database
- game_id = store_game_results(game_output, stats,
+ game_id = store_game_results(conn, game_output, stats,
replay_key, bucket_class,
users, challenge)
# Store game stats in database
- store_game_stats(game_output, stats, game_id, users)
+ store_game_stats(conn, game_output, stats, game_id, users)
# Update rankings
if not challenge:
- update_rankings(users)
+ update_rankings(conn, users)
# Clean up old games
delete_old_games(users)
@@ -192,7 +192,8 @@ def store_game_artifacts(replay_name, users):
return replay_key, bucket_class
-def store_game_results(game_output, stats, replay_key, bucket_class, users, challenge):
+def store_game_results(conn, game_output, stats, replay_key, bucket_class,
+ users, challenge):
"""
Store the outcome of a game in the database.
@@ -205,7 +206,6 @@ def store_game_results(game_output, stats, replay_key, bucket_class, users, chal
"""
# Store game results in database
- with model.engine.connect() as conn:
game_id = conn.execute(model.games.insert().values(
replay_name=replay_key,
map_width=game_output["map_width"],
@@ -254,13 +254,12 @@ def store_game_results(game_output, stats, replay_key, bucket_class, users, chal
update_user_timeout(conn, game_id, user)
if challenge is not None:
- store_challenge_results(users, challenge, stats)
+ store_challenge_results(conn, users, challenge, stats)
return game_id
-def store_challenge_results(users, challenge, stats):
- with model.engine.connect() as conn:
+def store_challenge_results(conn, users, challenge, stats):
conn.execute(model.challenges.update().values(
num_games=model.challenges.c.num_games + 1,
status=sqlalchemy.case(
@@ -308,7 +307,7 @@ def store_challenge_results(users, challenge, stats):
).where(model.challenges.c.id == challenge))
-def store_game_stats(game_output, stats, game_id, users):
+def store_game_stats(conn, game_output, stats, game_id, users):
"""
Store additional game stats into database.
@@ -324,7 +323,6 @@ def store_game_stats(game_output, stats, game_id, users):
400, message="Replay file not found in uploaded files.")
# Store game stats in database
- with model.engine.connect() as conn:
conn.execute(model.game_stats.insert().values(
game_id=game_id,
turns_total=stats.turns_total,
@@ -415,7 +413,7 @@ def parse_replay(replay):
return stats
-def update_rankings(users):
+def update_rankings(conn, users):
"""
Update the rankings via TrueSkill and store in the database.
@@ -431,7 +429,6 @@ def update_rankings(users):
teams = [[trueskill.Rating(mu=user["mu"], sigma=user["sigma"])]
for user in users]
new_ratings = trueskill.rate(teams)
- with model.engine.connect() as conn:
for user, rating in zip(users, new_ratings):
new_score = rating[0].mu - 3*rating[0].sigma
conn.execute(model.bots.update().where(
| 4 |
diff --git a/changelog/65_UNRELEASED_xxxx-xx-xx.md b/changelog/65_UNRELEASED_xxxx-xx-xx.md - Fixed that the labels of context-/more-menu items were not readable in Night Mode (thanks @corbolais)
- Fixed that auto night mode over midnight did not always work
- Fixed that the "Add as new product" productpicker workflow, started from the shopping list item form, always selected the default shopping list after finishing the flow
+
+### API
+- Fixed that backslashes were not allowed in API query filters
| 11 |
diff --git a/package.json b/package.json "dist": " npm run build && npm run minify && mkdirp dist && cp -f build/*.js dist/ && npm run types",
"minify": "terser build/melonjs.js --compress --mangle --comments '/(?:^!|@(?:license|preserve|cc_on))/' --output build/melonjs.min.js",
"lint": "eslint src rollup.config.js",
- "test": "npm run build && karma start tests/karma.conf.cjs",
+ "test": "karma start tests/karma.conf.cjs",
"doc": "mkdirp docs && jsdoc -c jsdoc_conf.json",
"webdoc": "mkdirp dist && webdoc --quiet -R README.md",
- "release": "npm run dist && npm publish --access public",
+ "prepublish": "npm run dist && npm run test",
"clean": "del-cli --force build/*.js dist/*.js dist/*.d.ts docs src/**/*.d.ts",
"types": "tsc dist/melonjs.module.js --declaration --allowJs --emitDeclarationOnly"
}
| 7 |
diff --git a/src/client/js/components/Page/RevisionPath.jsx b/src/client/js/components/Page/RevisionPath.jsx @@ -100,9 +100,6 @@ class RevisionPath extends React.Component {
render() {
// define styles
- const rootStyle = {
- marginRight: '0.2em',
- };
const separatorStyle = {
marginLeft: '0.2em',
marginRight: '0.2em',
@@ -115,6 +112,26 @@ class RevisionPath extends React.Component {
const { isInTrash } = this.state;
const pageLength = this.state.pages.length;
+ const rootElement = isInTrash
+ ? (
+ <>
+ <span className="path-segment">
+ <a href="/trash"><i className="icon-trash"></i></a>
+ </span>
+ <span className="separator" style={separatorStyle}><a href="/">/</a></span>
+ </>
+ )
+ : (
+ <>
+ <span className="path-segment">
+ <a href="/">
+ <i className="icon-home"></i>
+ <span className="separator" style={separatorStyle}>/</span>
+ </a>
+ </span>
+ </>
+ );
+
const afterElements = [];
this.state.pages.forEach((page, index) => {
const isLastElement = (index === pageLength - 1);
@@ -136,14 +153,8 @@ class RevisionPath extends React.Component {
return (
<span className="d-flex align-items-center">
- { isInTrash && (
- <span className="path-segment">
- <a href="/trash"><i className="icon-trash"></i></a>
- </span>
- ) }
- <span className="separator" style={isInTrash ? separatorStyle : rootStyle}>
- <a href="/">/</a>
- </span>
+
+ {rootElement}
{afterElements}
<CopyDropdown t={this.props.t} pagePath={this.props.pagePath} pageId={this.props.pageId} buttonStyle={buttonStyle}></CopyDropdown>
| 7 |
diff --git a/src/index.js b/src/index.js @@ -19,8 +19,8 @@ export {default as Checklist} from './components/input/Checklist';
export {default as Col} from './components/layout/Col';
export {default as Collapse} from './components/Collapse';
export {default as Container} from './components/layout/Container';
-export {default as Dropdown} from './components/Dropdown';
-export {default as DropdownItem} from './components/DropdownItem';
+export {default as DropdownMenu} from './components/DropdownMenu';
+export {default as DropdownMenuItem} from './components/DropdownMenuItem';
export {default as Fade} from './components/Fade';
export {default as Form} from './components/form/Form';
export {default as FormFeedback} from './components/form/FormFeedback';
| 10 |
diff --git a/scenes/grass.scn b/scenes/grass.scn 0,
0
],
+ "quaternion": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "start_url": "https://webaverse.github.io/skybox-360/"
+ },
+ {
+ "position": [
+ 0,
+ 0,
+ 0
+ ],
+ "quaternion": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
"start_url": "https://webaverse.github.io/grass-anime/"
}
]
| 0 |
diff --git a/examples/hello_ml.html b/examples/hello_ml.html </head>
<body>
<script src="three.js"></script>
- <script src="inflate.min.js"></script>
- <script src="FBXLoader.js"></script>
+ <script src="GLTFLoader.js"></script>
<script>
let container, scene, camera, display, model, controllerMeshes, eyeMesh;
let mesher = null, planeTracker = null, handTracker = null, eyeTracker = null;
directionalLight.position.set(1, 1, 1);
scene.add(directionalLight);
- /* (() => {
- const geometry = new THREE.BoxBufferGeometry(0.1, 1, 0.1);
- const material = new THREE.MeshPhongMaterial({
- color: 0xE91E63,
- });
- const mesh = new THREE.Mesh(geometry, material);
- mesh.position.y = 0.5;
- // mesh.position.z = -1;
- mesh.frustumCuled = false;
- scene.add(mesh);
- })();
- (() => {
- const geometry = new THREE.BoxBufferGeometry(0.1, 0.1, 0.1);
- const material = new THREE.MeshPhongMaterial({
- color: 0x4CAF50,
- });
- const mesh = new THREE.Mesh(geometry, material);
- mesh.position.y = 1 + 0.1;
- // mesh.position.z = -1;
- mesh.frustumCulled = false;
- scene.add(mesh);
- })(); */
+ {
+ const loader = new THREE.GLTFLoader(); // .setPath( 'models/' );
+ loader.load( 'exobot.glb', function ( o ) {
- const loader = new THREE.FBXLoader();
- loader.load('exokit.fbx', object => {
- /* object.quaternion.setFromUnitVectors(
- new THREE.Vector3(0, 0, 1),
- new THREE.Vector3(0.5, 0, 1).normalize()
+ o = o.scene;
+
+ // o.position.z = -1;
+ o.rotation.order = 'YXZ';
+ o.scale.set(0.2, 0.2, 0.2);
+ /* o.traverse(e => {
+ e.castShadow = true;
+ }); */
+
+ /* o.quaternion.setFromUnitVectors(
+ new THREE.Vector3(0, 0, -1),
+ new THREE.Vector3(0, 0, 1)
); */
- object.scale.multiplyScalar(0.001);
- object.matrix.compose(object.position, object.quaternion, object.scale);
- object.updateMatrixWorld(true);
- // object.frustumCulled = false;
+ o.updateMatrixWorld();
+ // o.frustumCulled = false;
+ for (let i = 0; i < o.children.length; i++) {
+ o.children[i].frustumCulled = false;
+ }
- object.traverse(child => {
- child.frustumCulled = false;
- });
+ model = o;
- model = object;
+ scene.add(o);
+ // scene.add(o.children[0]);
+ // scene.add(o.children[0]);
+
+ }, undefined, function ( e ) {
+
+ console.error( e );
- scene.add(object);
} );
+ }
controllerMeshes = [
_makeControllerMesh(-0.1),
if (model) {
const animationTime = 4000;
const f = ((Date.now() % animationTime) / animationTime) * (Math.PI * 2);
- model.quaternion.setFromUnitVectors(
+ model.position.y = Math.sin(f) * 0.05;
+ // model.rotation.x = Math.sin(f*4) * Math.PI*2*0.05;
+ model.rotation.y = Math.sin(f*2) * Math.PI*2*0.05;
+ model.rotation.z = Math.cos(f*2) * Math.PI*2*0.05;
+ /* model.quaternion.setFromUnitVectors(
new THREE.Vector3(0, 0, 1),
new THREE.Vector3(Math.cos(f), 0, Math.sin(f)).normalize()
- );
+ ); */
model.updateMatrixWorld();
}
if (eyeTracker) {
| 4 |
diff --git a/source/delegate-factory/package.json b/source/delegate-factory/package.json {
"name": "@airswap/delegate-factory",
- "version": "1.4.4",
+ "version": "0.4.4",
"description": "Deploys Delegate contracts for use in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
| 3 |
diff --git a/docs/netlify-dev.md b/docs/netlify-dev.md @@ -108,13 +108,12 @@ Netlify Dev is meant to work with zero config for the majority of users, by usin
command = "yarn run build"
functions = "functions" # netlify dev uses this to know where to scaffold and serve your functions
publish = "dist"
- port = 8888 # port for dev server
- functionsPort = 34567 # port for functions server
# note: each of these fields are OPTIONAL
[dev]
command = "yarn start" # Command to start your dev server
port = 3000 # Port that the dev server will be listening on
+ functionsPort = 34567 # port for functions server
publish = "dist" # If you use a _redirect file, provide the path to your static content folder
```
| 1 |
diff --git a/definitions/npm/react-intl_v2.x.x/flow_v0.48.x-/react-intl_v2.x.x.js b/definitions/npm/react-intl_v2.x.x/flow_v0.48.x-/react-intl_v2.x.x.js @@ -14,8 +14,8 @@ type LocaleData = {
type MessageDescriptor = {
id: string,
- defaultMessage: string,
description?: string,
+ defaultMessage?: string,
};
type MessageDescriptorMap = { [key: string]: MessageDescriptor };
| 12 |
diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js @@ -318,9 +318,23 @@ function getMessageProperty(msg,expr) {
/**
* Gets a property of an object.
*
+ * Given the object:
+ *
+ * {
+ * "pet": {
+ * "type": "cat"
+ * }
+ * }
+ *
+ * - `pet.type` will return `"cat"`.
+ * - `pet.name` will return `undefined`
+ * - `car` will return `undefined`
+ * - `car.type` will throw an Error (as `car` does not exist)
+ *
* @param {Object} msg - the object
* @param {String} expr - the property expression
* @return {any} the object property, or undefined if it does not exist
+ * @throws Will throw an error if the *parent* of the property does not exist
* @memberof @node-red/util_util
*/
function getObjectProperty(msg,expr) {
| 7 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.