code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/Services/Air/templates/AIR_AVAILABILTIY_REQUEST.handlebars.js b/src/Services/Air/templates/AIR_AVAILABILTIY_REQUEST.handlebars.js @@ -12,6 +12,11 @@ module.exports = `
{{#if emulatePcc}}
<com:OverridePCC ProviderCode="1G" PseudoCityCode="{{emulatePcc}}"/>
{{/if}}
+ {{#nextResultReference}}
+ <com:NextResultReference ProviderCode="1G" >
+ {{nextResultReference}}
+ </com:NextResultReference>
+ {{/nextResultReference}}
{{#legs}}
<air:SearchAirLeg>
<air:SearchOrigin>
| 0 |
diff --git a/js/views/Column.js b/js/views/Column.js @@ -343,7 +343,7 @@ var Column = React.createClass({
onMenuToggle: function (open) {
var {xzoomable} = this.state,
{column: {xzoom, maxXZoom, valueType}, onXZoom, id} = this.props;
- if (xzoomable && !open && valueType === 'mutation') {
+ if (xzoomable && !open && ['mutation', 'segmented'].indexOf(valueType) !== -1) {
let start = this.refs.start.getValue(),
end = this.refs.end.getValue(),
position = getPosition(maxXZoom, start, end);
| 11 |
diff --git a/examples/devicetest/js/screens/play.js b/examples/devicetest/js/screens/play.js @@ -26,7 +26,7 @@ game.PlayScreen = me.Stage.extend({
this.font.draw(renderer, "X: " + me.device.accelerationX, 10, 90);
this.font.draw(renderer, "Y: " + me.device.accelerationY, 10, 120);
this.font.draw(renderer, "Z: " + me.device.accelerationZ, 10, 150);
- this.font.draw(renderer, "orientation: " + me.device.orientation + " degrees", 10, 180);
+ this.font.draw(renderer, "orientation: " + me.device.getScreenOrientation(), 10, 180);
}
});
| 1 |
diff --git a/polyfill/XMLHttpRequest.js b/polyfill/XMLHttpRequest.js @@ -277,7 +277,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
_headerReceived = (e) => {
log.debug('header received ', this._task.taskId, e)
this.responseURL = this._url
- if(e.state === "2") {
+ if(e.state === "2" && e.taskId === this._task.taskId) {
this._responseHeaders = e.headers
this._statusText = e.status
this._status = Math.floor(e.status)
| 1 |
diff --git a/coq/Semantics.v b/coq/Semantics.v @@ -1561,11 +1561,22 @@ Definition stepAllaux4 (com : InputT) (os : OST) (st : StateT) (con : Contract)
| right _ => (st, con, ac)
end.
-Definition stepAllaux3 (com : InputT) (os : OST) (st : StateT) (con : Contract) (ac : AS)
+(* Definition stepAllaux3 (com : InputT) (os : OST) (st : StateT) (con : Contract) (ac : AS)
(f : forall y : StateT * Contract * AS, StepValOrder y (st, con, ac) -> StateT * Contract * AS) : StateT * Contract * AS :=
match (step com st con os) with
(nst, ncon, nac) => stepAllaux4 com os st con ac f nst ncon nac
- end eq_refl.
+ end eq_refl. *)
+
+Lemma alt_refl : forall com st con os, (fst (fst (step com st con os)), snd (fst (step com st con os)), snd (step com st con os)) = step com st con os.
+intros.
+destruct (step).
+destruct p.
+reflexivity.
+Defined.
+
+Definition stepAllaux3 (com : InputT) (os : OST) (st : StateT) (con : Contract) (ac : AS)
+ (f : forall y : StateT * Contract * AS, StepValOrder y (st, con, ac) -> StateT * Contract * AS) : StateT * Contract * AS :=
+ stepAllaux4 com os st con ac f (fst (fst ((step com st con os)))) (snd (fst ((step com st con os)))) (snd ((step com st con os))) (alt_refl com st con os).
Definition stepAllaux2 (com : InputT) (os : OST) (x : StateT * Contract * AS) (f : forall y : StateT * Contract * AS, StepValOrder y x -> StateT * Contract * AS) : StateT * Contract * AS :=
match x with
| 14 |
diff --git a/userscript.user.js b/userscript.user.js @@ -153,14 +153,18 @@ var $$IMU_EXPORT$$;
try {
window_location = window.location.href;
- if (/^https?:\/\/qsniyg\.github\.io\/+maxurl\/+options\.html/.test(window_location) ||
+ (function() {
+ var our_url = window_location.replace(/^[a-z]+:\/\/web\.archive\.org\/+web\/+[0-9]+\/+(https?:\/\/)/, "$1");
+
+ if (/^https?:\/\/qsniyg\.github\.io\/+maxurl\/+options\.html/.test(our_url) ||
/^file:\/\/.*\/maxurl\/site\/options\.html/.test(window_location)) {
is_options_page = true;
is_maxurl_website = true;
- } else if (/^https?:\/\/qsniyg\.github\.io\/+maxurl\/+/.test(window_location) ||
+ } else if (/^https?:\/\/qsniyg\.github\.io\/+maxurl\/+/.test(our_url) ||
/^file:\/\/.*\/maxurl\/site\/(?:index|about|options)\.html/.test(window_location)) {
is_maxurl_website = true;
}
+ })();
} catch(e) {
}
| 11 |
diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## v0.18.1 (2017-10-17): a recovery release following v0.18.0
+
+### Bug fix ([#1881](https://github.com/DevExpress/testcafe/issues/1881))
+
+In v0.18.0, we have accidentally changed the [--reporter](https://devexpress.github.io/testcafe/documentation/using-testcafe/command-line-interface.html#-r-namefile---reporter-namefile) CLI flag to `--reporters`. In this recovery release, we roll back to the previous flag name.
+
+We apologize for any inconvenience.
+
## v0.18.0 (2017-10-10)
### Enhancements
| 0 |
diff --git a/_data/conferences.yml b/_data/conferences.yml ---
+- name: AISTATS
+ year: 2018
+ id: aistats18
+ link: http://www.aistats.org/
+ deadline: "2017-10-13 23:59:59"
+ date: April 9-11, 2018
+ place: Lanzarote, Spain
+ sub: ML
+
- name: AAAI
year: 2018
id: aaai18
| 3 |
diff --git a/src/server/system_services/system_store.js b/src/server/system_services/system_store.js @@ -530,6 +530,7 @@ class SystemStore extends EventEmitter {
_.each(list, item => {
data.check_indexes(col, item);
let updates = _.omit(item, '_id');
+ if (_.isEmpty(updates)) return;
let keys = _.keys(updates);
if (_.first(keys)[0] === '$') {
| 9 |
diff --git a/test/jasmine/tests/transform_sort_test.js b/test/jasmine/tests/transform_sort_test.js @@ -352,6 +352,18 @@ describe('Test sort transform interactions:', function() {
.then(function(eventData) {
assertPt(eventData, 1, 1, 5, 'G');
})
+ .then(function() {
+ return Plotly.relayout(gd, 'xaxis.range', [-5, 5]);
+ })
+ .then(function() { return hover(gd, 'D'); })
+ .then(function(eventData) {
+ assertPt(eventData, 0, 1, 1, 'D');
+ })
+ .then(wait)
+ .then(function() { return click(gd, 'G'); })
+ .then(function(eventData) {
+ assertPt(eventData, 1, 1, 5, 'G');
+ })
.catch(fail)
.then(done);
});
| 0 |
diff --git a/testHelpers/index.js b/testHelpers/index.js @@ -52,17 +52,20 @@ const createModPartitioner = () => ({ partitionMetadata, message }) => {
}
const waitFor = (fn, { delay = 50 } = {}) => {
+ let totalWait = 0
return new Promise((resolve, reject) => {
- const check = () =>
+ const check = () => {
+ totalWait += delay
setTimeout(async () => {
try {
- const result = await fn()
+ const result = await fn(totalWait)
result ? resolve(result) : check()
} catch (e) {
reject(e)
}
- })
- check()
+ }, delay)
+ }
+ check(totalWait)
})
}
| 1 |
diff --git a/test/functional/specs/Privacy/IAB/C224677.js b/test/functional/specs/Privacy/IAB/C224677.js @@ -57,18 +57,18 @@ test("Test C224677: Call setConsent when purpose 10 is FALSE", async () => {
await t.expect(identityHandle.length).eql(1);
await t.expect(returnedNamespaces).contains("ECID");
- // 3. Event calls going forward should be opted out because AAM opts out consents with no purpose 10.
+ // 3. Event calls going forward should remain opted in, even though AAM opts out consents with no purpose 10.
await alloy.sendEvent();
const rawEventResponse = JSON.parse(
getResponseBody(networkLogger.edgeEndpointLogs.requests[0])
);
const eventResponse = createResponse({ content: rawEventResponse });
- // 4. And a warning message should be returned, confirming the opt-out
+ // 4. No warning message regarding opt-out should be returned anymore
const warningTypes = eventResponse.getWarnings().map(w => w.type);
await t
.expect(warningTypes)
- .contains("https://ns.adobe.com/aep/errors/EXEG-0301-200");
+ .notContains("https://ns.adobe.com/aep/errors/EXEG-0301-200");
await t.expect(networkLogger.edgeEndpointLogs.requests.length).eql(1);
await responseStatus(networkLogger.edgeEndpointLogs.requests, 200);
| 1 |
diff --git a/world.js b/world.js @@ -106,7 +106,7 @@ world.connectRoom = async (roomName, worldURL) => {
channelConnection.setMicrophoneMediaStream(networkMediaStream);
}
- if (live) {
+
interval = setInterval(() => {
const name = loginManager.getUsername();
const avatarSpec = loginManager.getAvatar();
@@ -115,7 +115,10 @@ world.connectRoom = async (roomName, worldURL) => {
const address = loginManager.getAddress();
const aux = rigManager.localRig?.aux.getPose();
channelConnection.send(JSON.stringify({
+ request: true,
+ id: Math.floor(Math.random() * Number.MAX_SAFE_INTEGER),
method: 'status',
+
data: {
peerId: channelConnection.connectionId,
status: {
@@ -135,7 +138,7 @@ world.connectRoom = async (roomName, worldURL) => {
},
}));
}, 10);
- }
+
/* world.dispatchEvent(new MessageEvent('peersupdate', {
data: Array.from(rigManager.peerRigs.values()),
| 13 |
diff --git a/Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js b/Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js @@ -556,6 +556,7 @@ define([
fragmentLightingBlock += ' float VdotH = clamp(dot(v, h), 0.0, 1.0);\n';
fragmentLightingBlock += ' vec3 f0 = vec3(0.04);\n';
+ fragmentLightingBlock += ' float alpha = roughness * roughness;\n';
fragmentLightingBlock += ' vec3 diffuseColor = baseColor * (1.0 - metalness);\n';
fragmentLightingBlock += ' vec3 specularColor = mix(f0, baseColor, metalness);\n';
fragmentLightingBlock += ' float reflectance = max(max(specularColor.r, specularColor.g), specularColor.b);\n';
@@ -563,8 +564,8 @@ define([
fragmentLightingBlock += ' vec3 r0 = specularColor.rgb;\n';
fragmentLightingBlock += ' vec3 F = fresnelSchlick2(r0, r90, VdotH);\n';
- fragmentLightingBlock += ' float G = smithVisibilityGGX(roughness, NdotL, NdotV);\n';
- fragmentLightingBlock += ' float D = GGX(roughness, NdotH);\n';
+ fragmentLightingBlock += ' float G = smithVisibilityGGX(alpha, NdotL, NdotV);\n';
+ fragmentLightingBlock += ' float D = GGX(alpha, NdotH);\n';
fragmentLightingBlock += ' vec3 diffuseContribution = (1.0 - F) * lambertianDiffuse(baseColor);\n';
fragmentLightingBlock += ' vec3 specularContribution = F * G * D / (4.0 * NdotL * NdotV);\n';
| 3 |
diff --git a/packages/fela/src/combineRules.js b/packages/fela/src/combineRules.js /* @flow */
import assignStyle from 'css-in-js-utils/lib/assignStyle'
-import objectReduce from 'fast-loops/lib/objectReduce'
+import arrayReduce from 'fast-loops/lib/arrayReduce'
import type { DOMRenderer } from '../../../flowtypes/DOMRenderer'
import type { NativeRenderer } from '../../../flowtypes/NativeRenderer'
@@ -9,7 +9,7 @@ export default function combineRules(...rules: Array<Function>): Function {
return (props, renderer) => {
const merge = renderer._mergeStyle || assignStyle
- return objectReduce(
+ return arrayReduce(
rules,
(style, rule) => merge(style, rule(props, renderer)),
{}
| 4 |
diff --git a/src/components/molecules/DoDont/index.js b/src/components/molecules/DoDont/index.js -import { Flex, Text } from 'components/atoms'
+import { Flex, Text, Image } from 'components/atoms'
import PropTypes from 'prop-types'
import React from 'react'
import styles from './styles.module.scss'
@@ -12,7 +12,7 @@ export default function DoDont({ good, bad }) {
width="100%"
>
<Flex direction="column" width="40%">
- <img src={good} />
+ <Image src={good} />
<Text
className={styles.do}
type="p"
@@ -24,7 +24,7 @@ export default function DoDont({ good, bad }) {
</Text>
</Flex>
<Flex direction="column" width="40%">
- <img src={bad} />
+ <Image src={bad} />
<Text
className={styles.dont}
type="p"
| 14 |
diff --git a/src/runtime/vdom/morphdom/index.js b/src/runtime/vdom/morphdom/index.js @@ -56,12 +56,12 @@ function onNodeAdded(node, componentsContext) {
function morphdom(fromNode, toNode, doc, componentsContext) {
var globalComponentsContext;
- var isRerenderInBrowser = false;
+ var isHydrate = false;
var keySequences = {};
if (componentsContext) {
globalComponentsContext = componentsContext.___globalContext;
- isRerenderInBrowser = globalComponentsContext.___isHydrate;
+ isHydrate = globalComponentsContext.___isHydrate;
}
function insertVirtualNodeBefore(
@@ -173,7 +173,7 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
(matchingFromComponent =
existingComponentLookup[component.id]) === undefined
) {
- if (isRerenderInBrowser === true) {
+ if (isHydrate === true) {
var rootNode = beginFragmentNode(
curFromNodeChild,
fromNode
@@ -328,7 +328,7 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
curToNodeKey
]) === undefined
) {
- if (isRerenderInBrowser === true && curFromNodeChild) {
+ if (isHydrate === true && curFromNodeChild) {
if (
curFromNodeChild.nodeType === ELEMENT_NODE &&
caseInsensitiveCompare(
@@ -600,7 +600,7 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
curFromNodeChild
);
if (curVFromNodeChild === undefined) {
- if (isRerenderInBrowser === true) {
+ if (isHydrate === true) {
curVFromNodeChild = virtualizeElement(
curFromNodeChild
);
@@ -761,7 +761,7 @@ function morphdom(fromNode, toNode, doc, componentsContext) {
) {
var nodeName = toEl.___nodeName;
- if (isRerenderInBrowser === true && toElKey) {
+ if (isHydrate === true && toElKey) {
ownerComponent.___keyedElements[toElKey] = fromEl;
}
| 10 |
diff --git a/assets/js/modules/adsense/index.js b/assets/js/modules/adsense/index.js @@ -52,12 +52,8 @@ addFilter(
fillFilterWithComponent( DashboardZeroData )
);
-let isAdBlockerActive = () => {};
-
export const registerStore = ( registry ) => {
registerDatastore( registry );
- // TODO: fix hack
- isAdBlockerActive = () => registry.__experimentalResolveSelect( STORE_NAME ).isAdBlockerActive();
};
export const registerModule = ( modules ) => {
@@ -74,8 +70,8 @@ export const registerModule = ( modules ) => {
__( 'Monetize your website', 'google-site-kit' ),
__( 'Intelligent, automatic ad placement', 'google-site-kit' ),
],
- checkRequirements: async () => {
- if ( ! await isAdBlockerActive() ) {
+ checkRequirements: async ( registry ) => {
+ if ( ! registry.select( STORE_NAME ).isAdBlockerActive() ) {
return;
}
| 2 |
diff --git a/src/collection/cache-traversal-call.js b/src/collection/cache-traversal-call.js let is = require('../is');
+let util = require('../util');
let cache = function( fn, name ){
return function traversalCache( arg1, arg2, arg3, arg4 ){
@@ -7,21 +8,22 @@ let cache = function( fn, name ){
let key;
if( selectorOrEles == null ){
- key = 'null';
+ key = '';
} else if( is.elementOrCollection( selectorOrEles ) && selectorOrEles.length === 1 ){
- key = '#' + selectorOrEles.id();
+ key = selectorOrEles.id();
}
if( eles.length === 1 && key ){
let _p = eles[0]._private;
let tch = _p.traversalCache = _p.traversalCache || {};
- let ch = tch[ name ] = tch[ name ] || {};
- let cacheHit = ch[ key ];
+ let ch = tch[ name ] = tch[ name ] || [];
+ let hash = util.hashString( key );
+ let cacheHit = ch[ hash ];
if( cacheHit ){
return cacheHit;
} else {
- return ( ch[ key ] = fn.call( eles, arg1, arg2, arg3, arg4 ) );
+ return ( ch[ hash ] = fn.call( eles, arg1, arg2, arg3, arg4 ) );
}
} else {
return fn.call( eles, arg1, arg2, arg3, arg4 );
| 4 |
diff --git a/components/mapbox/ban-map/index.js b/components/mapbox/ban-map/index.js @@ -12,19 +12,24 @@ import {forEach} from 'lodash'
let hoveredVoieId = null
const SOURCES = ['adresses', 'toponymes']
+const MAX_ZOOM = 19 // Zoom maximum de la carte
const ZOOM_RANGE = {
commune: {
- min: 12,
- max: 13
+ min: adresseCircleLayer.minzoom,
+ max: MAX_ZOOM
},
voie: {
- min: 15,
- max: 18
+ min: voieLayer.minzoom,
+ max: voieLayer.maxzoom
},
numero: {
- min: 17,
- max: 20
+ min: adresseLabelLayer.minzoom,
+ max: MAX_ZOOM
+ },
+ 'lieu-dit': {
+ min: toponymeLayer.minzoom,
+ max: toponymeLayer.maxzoom
}
}
| 0 |
diff --git a/changelog.md b/changelog.md @@ -32,6 +32,7 @@ This prints: `check: [Broadsword ], modified target: [15], roll total: [13], mar
- Fixed an issue with Western European style decimals (such as '6,25') in the Basic Speed field during imports. If the value contains a comma (',') character, it is parsed as if it is Western European; otherwise it is parsed as if it is US/UK ('6.25').
- More maneuver tweaks -- I think it really works correctly now.
- Implemented tight beam burning from B399. To use this, add the 'tbb' damage modifier with the 'burn' damage type (for example, `[6d burn tbb]`).
+- Added portrait to NPC and NPC-CI actor sheets.
Release 0.11.7 - 7/22/2021
| 3 |
diff --git a/lib/unfurl.js b/lib/unfurl.js -const REGEX = new RegExp("https://github.com/([^/]+)/([^/]+)/issues/(\\d+)");
+// Roadmap: What do we want to unfurl?
+// Phase 1: Issues, Pull Requests, Repositories, Profiles, Organizations, App
+// Phase 2: Repository contents (files), Projects, Gists
+
+// likely need different regular expressions based on what we're trying to parse
+
+const moment = require('moment');
+const { arrayToFormattedString } = require('./helpers');
+const REGEX = new RegExp('https://github.com/([^/]+)/([^/]+)/issues/(\\d+)');
+
+const ISSUE_CLOSED_RED = '#cb2431';
+const ISSUE_OPEN_GREEN = '#36a64f';
module.exports = async (github, url) => {
const [_, owner, repo, number] = url.match(REGEX);
const issue = await github.issues.get({owner, repo, number});
- return {text: issue.data.title};
+ return {
+ 'color': issue.data.state === 'open' ? ISSUE_OPEN_GREEN : ISSUE_CLOSED_RED,
+ 'fallback': `#${issue.data.number} ${issue.data.title}`,
+ 'author_name': issue.data.user.login,
+ 'author_link': issue.data.user.html_url,
+ 'author_icon': issue.data.user.avatar_url,
+ 'title': `#${issue.data.number} ${issue.data.title}`,
+ 'title_link': issue.data.html_url,
+ 'text': issue.data.body, // We should truncate markdown that Slack doesn't understand.
+ 'fields': [
+ {
+ 'title': 'State',
+ 'value': issue.data.state === 'open' ? ':green_heart: Open' : ':heart: Closed',
+ 'short': true
+ },
+ {
+ 'title': 'Labels',
+ 'value': arrayToFormattedString(issue.data.labels, 'name'),
+ 'short': true
+ },
+ {
+ 'title': 'Assignees',
+ 'value': arrayToFormattedString(issue.data.assignees, 'login'),
+ 'short': true
+ },
+ {
+ 'title': 'Comments',
+ 'value': `<${issue.data.html_url}|:speech_balloon: ${issue.data.comments}>`,
+ 'short': true
+ },
+ ],
+ 'footer': `<${issue.data.html_url}|View it on GitHub>`,
+ 'footer_icon': 'https://assets-cdn.github.com/favicon.ico',
+ 'ts': moment(issue.data.created_at).unix(),
+ 'mrkdwn_in': ['pretext', 'text', 'fields']
+ };
};
| 7 |
diff --git a/src/scripts/interactive-video.js b/src/scripts/interactive-video.js @@ -1066,6 +1066,16 @@ InteractiveVideo.prototype.closePopupMenus = function ($exceptButton) {
});
};
+/**
+ * Check if there are any bookmarks defined
+ *
+ * @return {boolean}
+ */
+InteractiveVideo.prototype.hasBookmarks = function () {
+ return this.options.assets.bookmarks &&
+ this.options.assets.bookmarks.length;
+};
+
/**
* Puts all the cool narrow lines around the slider / seek bar.
*/
@@ -1747,8 +1757,7 @@ InteractiveVideo.prototype.attachControls = function ($wrapper) {
* Only available for controls.
* @private
*/
- var hasBookmarks = self.options.assets.bookmarks && self.options.assets.bookmarks.length;
- var bookmarksEnabled = self.editor || (hasBookmarks && !self.preventSkipping);
+ var bookmarksEnabled = self.editor || (self.hasBookmarks() && !self.preventSkipping);
// Add bookmark controls
if (bookmarksEnabled) {
@@ -2269,7 +2278,7 @@ InteractiveVideo.prototype.attachControls = function ($wrapper) {
}
/* Show bookmarks, except when youtube is used on iPad */
- if (self.showBookmarksmenuOnLoad && self.video.pressToPlay === false) {
+ if (self.hasBookmarks() && self.showBookmarksmenuOnLoad && self.video.pressToPlay === false) {
self.toggleBookmarksChooser(true);
}
| 9 |
diff --git a/CHANGES.md b/CHANGES.md @@ -5,18 +5,18 @@ Change Log
* Deprecated
* The `text`, `imageUrl` and `link` parameters for `Credit` have been deprecated and will be removed in Cesium 1.41. Use `options.text`, `options.imageUrl` and `options.link` instead.
-* Added a Reverse Geocoder [Sandcastle demo](https://cesiumjs.org/Cesium/Apps/Sandcastle/?src=Reverse%20Geocoder.html&label=Showcases). [#5976](https://github.com/AnalyticalGraphicsInc/cesium/pull/5976)
* Added `Globe.material` to apply materials to the globe/terrain for shading such as height- or slope-based color ramps. See the new [Sandcastle example](https://cesiumjs.org/Cesium/Apps/Sandcastle/?src=Globe%20Materials.html&label=Showcases). [#5919](https://github.com/AnalyticalGraphicsInc/cesium/pull/5919/files)
-* Added ability to support touch event in Imagery Layers Split demo application. [#5948](https://github.com/AnalyticalGraphicsInc/cesium/pull/5948)
-* Added `file:` scheme compatibility to `joinUrls`. [#5989](https://github.com/AnalyticalGraphicsInc/cesium/pull/5989)
-* Fixed `Invalid asm.js: Invalid member of stdlib` console error by recompiling crunch.js with latest emscripten toolchain. [#5847](https://github.com/AnalyticalGraphicsInc/cesium/issues/5847)
* Added CZML support for `polyline.depthFailMaterial`, `label.scaleByDistance`, `distanceDisplayCondition`, and `disableDepthTestDistance`. [#5986](https://github.com/AnalyticalGraphicsInc/cesium/pull/5986)
* Moved terrain and imagery credits to a lightbox that pops up when you click a link in the onscreen credits [#3013](https://github.com/AnalyticalGraphicsInc/cesium/issues/3013)
+* Added a Reverse Geocoder [Sandcastle demo](https://cesiumjs.org/Cesium/Apps/Sandcastle/?src=Reverse%20Geocoder.html&label=Showcases). [#5976](https://github.com/AnalyticalGraphicsInc/cesium/pull/5976)
+* Added ability to support touch event in Imagery Layers Split demo application. [#5948](https://github.com/AnalyticalGraphicsInc/cesium/pull/5948)
* Fixed bug in KMLDataSource.js (`processLookAt` function). Degrees and radians were mixing in a subtraction. [#5992](https://github.com/AnalyticalGraphicsInc/cesium/issues/5992)
* Fixed handling of KMZ files with missing `xsi` namespace declarations. [#6003](https://github.com/AnalyticalGraphicsInc/cesium/pull/6003)
* Fixed a bug where models with animations of different lengths would cause an error. [#5694](https://github.com/AnalyticalGraphicsInc/cesium/issues/5694)
-* Added a new `@experimental` tag to the documentation. A small subset of the API tagged as such are subject to breaking changes without deprecation. See the [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/CodingGuide#deprecation-and-breaking-changes) for further explanation. [#6010](https://github.com/AnalyticalGraphicsInc/cesium/pull/6010)
* Added a `clampAnimations` parameter to `Model` and `Entity.model`. Setting this to `false` allows different length animations to loop asynchronously over the duration of the longest animation.
+* Added a new `@experimental` tag to the documentation. A small subset of the API tagged as such are subject to breaking changes without deprecation. See the [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/CodingGuide#deprecation-and-breaking-changes) for further explanation. [#6010](https://github.com/AnalyticalGraphicsInc/cesium/pull/6010)
+* Added `file:` scheme compatibility to `joinUrls`. [#5989](https://github.com/AnalyticalGraphicsInc/cesium/pull/5989)
+* Fixed `Invalid asm.js: Invalid member of stdlib` console error by recompiling crunch.js with latest emscripten toolchain. [#5847](https://github.com/AnalyticalGraphicsInc/cesium/issues/5847)
### 1.39 - 2017-11-01
| 3 |
diff --git a/src/reports/report.js b/src/reports/report.js @@ -156,7 +156,7 @@ export default class Report {
case "rpki":
matched = content.data[0].matchedRule;
context.asn = matched.asn.toString();
- context.prefix = matched.prefix;
+ context.prefix = matched.prefix | content.data[0].matchedMessage.prefix;
context.description = matched.description;
break;
| 11 |
diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx @@ -46,7 +46,7 @@ const About = () => (
<div className="body">
<ul>
<li>
- <h3><FormattedMessage id="about.whoUsesScratch" /></h3>
+ <h2><FormattedMessage id="about.whoUsesScratch" /></h2>
<img
alt=""
src="/images/about/who-uses-scratch.jpg"
@@ -55,7 +55,7 @@ const About = () => (
</li>
<li>
- <h3><FormattedMessage id="about.literacy" /></h3>
+ <h2><FormattedMessage id="about.literacy" /></h2>
<iframe
allowFullScreen
mozallowfullscreen={'true'}
@@ -67,7 +67,7 @@ const About = () => (
</li>
<li>
- <h3><FormattedMessage id="about.aroundTheWorld" /></h3>
+ <h2><FormattedMessage id="about.aroundTheWorld" /></h2>
<img
alt=""
src="/images/about/around-the-world.png"
@@ -90,7 +90,7 @@ const About = () => (
/></p>
</li>
<li>
- <h3><FormattedMessage id="about.schools" /></h3>
+ <h2><FormattedMessage id="about.schools" /></h2>
<img
alt=""
src="/images/about/scratch-in-schools.jpg"
@@ -107,7 +107,7 @@ const About = () => (
/></p>
</li>
<li>
- <h3><FormattedMessage id="about.quotes" /></h3>
+ <h2><FormattedMessage id="about.quotes" /></h2>
<img
alt="Quotes about Scratch"
src="/images/about/quotes.gif"
@@ -127,7 +127,7 @@ const About = () => (
</li>
<li>
- <h3><FormattedMessage id="about.research" /></h3>
+ <h2><FormattedMessage id="about.research" /></h2>
<img
alt=""
src="/images/about/research-remix.png"
@@ -186,7 +186,7 @@ const About = () => (
</li>
<li>
- <h3><FormattedMessage id="about.learnMore" /></h3>
+ <h2><FormattedMessage id="about.learnMore" /></h2>
<ul className="list">
<li>
<a href="/faq"><FormattedMessage id="about.learnMoreFaq" /></a>
@@ -204,7 +204,7 @@ const About = () => (
</li>
<li>
- <h3><FormattedMessage id="about.support" /></h3>
+ <h2><FormattedMessage id="about.support" /></h2>
<p><FormattedMessage
id="about.supportDescription"
values={{
| 14 |
diff --git a/test/1_utils.js b/test/1_utils.js @@ -407,87 +407,6 @@ describe('utils', function() {
});
});
- describe('removePropertiesFromObject', function() {
- it('remove two properties from an object', function() {
- var keysToRemove = [ "productId", "productName" ];
- var original = {
- productId: '1234',
- productName: 'shoes',
- $ios_deeplink_path: 'monster/view/ios',
- $android_deeplink_path: 'monster/view/android'
- };
- var expected = {
- $ios_deeplink_path: 'monster/view/ios',
- $android_deeplink_path: 'monster/view/android'
- };
- utils.removePropertiesFromObject(original, keysToRemove);
- assert.deepEqual(
- original,
- expected,
- 'original and expected objects should be equal'
- );
- });
- it('remove two properties from an object but keysToRemove is of wrong type', function() {
- var keysToRemove = "productId, productName";
- var original = {
- productId: '1234',
- productName: 'shoes',
- $ios_deeplink_path: 'monster/view/ios',
- $android_deeplink_path: 'monster/view/android'
- };
- var expected = Object.assign({}, original);
- utils.removePropertiesFromObject(original, keysToRemove);
- assert.deepEqual(
- original,
- expected,
- 'original and expected objects should be equal'
- );
- });
- it('remove two properties from an object but object is an array', function() {
- var keysToRemove = [ "productId", "productName" ];
- var original = [
- 'productId: 1234',
- 'productName: shoes',
- '$ios_deeplink_path: monster/view/ios',
- '$android_deeplink_path: monster/view/android'
- ];
- var expected = original.slice();
- utils.removePropertiesFromObject(original, keysToRemove);
- assert.deepEqual(
- original,
- expected,
- 'original and expected objects should be equal'
- );
- });
- it('remove two properties from an object but object is null', function() {
- var keysToRemove = [ "productId", "productName" ];
- var original = null;
- var expected = null;
- utils.removePropertiesFromObject(original, keysToRemove);
- assert.deepEqual(
- original,
- expected,
- 'original and expected objects should be equal'
- );
- });
- it('remove two properties from an object but keysToRemove is null', function() {
- var keysToRemove = null;
- var original = {
- productId: '1234',
- productName: 'shoes',
- $ios_deeplink_path: 'monster/view/ios',
- $android_deeplink_path: 'monster/view/android'
- };
- var expected = Object.assign({}, original);
- utils.removePropertiesFromObject(original, keysToRemove);
- assert.deepEqual(
- original,
- expected,
- 'original and expected objects should be equal'
- );
- });
- });
-
describe('isSafari11OrGreater', function() {
var originalUa = navigator.userAgent;
| 13 |
diff --git a/app/containers/LoginPrivateKey/LoginPrivateKey.jsx b/app/containers/LoginPrivateKey/LoginPrivateKey.jsx @@ -28,14 +28,6 @@ export default class LoginPrivateKey extends Component<Props, State> {
}))
}
- handleInputChange = (e: SyntheticInputEvent<*>) => {
- const value = e.target.value
-
- this.setState({
- wif: value
- })
- }
-
render () {
const { history, loginWithPrivateKey } = this.props
const { showKey, wif } = this.state
@@ -48,7 +40,7 @@ export default class LoginPrivateKey extends Component<Props, State> {
<input
type={showKey ? 'text' : 'password'}
placeholder='Enter your private key here (WIF)'
- onChange={this.handleInputChange}
+ onChange={(e) => this.setState({ wif: e.target.value })}
autoFocus
/>
| 5 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js @@ -243,6 +243,7 @@ RED.library = (function() {
useWorker: false
});
libraryEditor.setTheme("ace/theme/tomorrow");
+ libraryEditor.setShowPrintMargin(false);
if (options.mode) {
libraryEditor.getSession().setMode(options.mode);
}
| 2 |
diff --git a/src/XR.js b/src/XR.js @@ -371,7 +371,7 @@ class XRPresentationFrame {
.premultiply(
localMatrix2.compose(
localVector.fromArray(xrOffset.position),
- localQuaternion.fromArray(xrOffset.rotation),
+ localQuaternion.fromArray(xrOffset.orientation),
localVector2.fromArray(xrOffset.scale)
)
.getInverse(localMatrix2)
@@ -444,7 +444,7 @@ class XRDevicePose {
.multiply(
localMatrix2.compose(
localVector.fromArray(xrOffset.position),
- localQuaternion.fromArray(xrOffset.rotation),
+ localQuaternion.fromArray(xrOffset.orientation),
localVector2.fromArray(xrOffset.scale)
)
)
| 10 |
diff --git a/assets/sass/components/global/_googlesitekit-table.scss b/assets/sass/components/global/_googlesitekit-table.scss justify-content: flex-end;
}
- .googlesitekit-table__link--secondary {
- background-image: none;
- display: block;
- font-size: 0.75rem;
- word-break: break-word;
- }
-
.googlesitekit-table__source {
margin-top: $grid-gap-phone;
| 2 |
diff --git a/tests/e2e/plugins/gcp-credentials.php b/tests/e2e/plugins/gcp-credentials.php * @link https://sitekit.withgoogle.com
*/
-use Google\Site_Kit\Core\Storage\Data_Encryption;
-
/**
* Provide dummy client configuration, normally provided in step 1 of the set up.
- * We need to filter the credentials option here due to `isSiteKitConnected`'s dependence
- * on `Credentials` in `\Google\Site_Kit\Core\Authentication\Authentication::inline_js_setup_data`
- * which is option-based.
*/
-add_filter( 'pre_option_googlesitekit_credentials', function () {
- return ( new Data_Encryption() )->encrypt(
- serialize(
+add_filter(
+ 'googlesitekit_oauth_secret',
+ function () {
+ return json_encode(
array(
- 'oauth2_client_id' => '1234567890-asdfasdfasdfasdfzxcvzxcvzxcvzxcv.apps.googleusercontent.com',
- 'oauth2_client_secret' => 'x_xxxxxxxxxxxxxxxxxxxxxx',
- )
+ 'web' => array(
+ 'client_id' => '1234567890-asdfasdfasdfasdfzxcvzxcvzxcvzxcv.apps.googleusercontent.com',
+ 'client_secret' => 'x_xxxxxxxxxxxxxxxxxxxxxx',
+ 'auth_uri' => 'https://accounts.google.com/o/oauth2/auth',
+ 'token_uri' => 'https://oauth2.googleapis.com/token',
+ 'auth_provider_x509_cert_url' => 'https://www.googleapis.com/oauth2/v1/certs',
+ 'redirect_uris' => array( add_query_arg( 'oauth2callback', '1', home_url() ) ),
+ ),
)
);
-} );
+ }
+);
| 3 |
diff --git a/src/features/items/do-fetch-items.js b/src/features/items/do-fetch-items.js @@ -149,6 +149,30 @@ const doFetchItems = async (...a) => {
};
});
+ if(rawItem.itemProperties.defAmmo){
+ rawItem.defAmmo = rawItem.itemProperties.defAmmo;
+
+ delete rawItem.itemProperties.defAmmo;
+ }
+
+ if(rawItem.itemProperties.InitialSpeed){
+ rawItem.initialSpeed = rawItem.itemProperties.InitialSpeed;
+
+ delete rawItem.itemProperties.InitialSpeed;
+ }
+
+ if(rawItem.itemProperties.CenterOfImpact){
+ rawItem.centerOfImpact = rawItem.itemProperties.CenterOfImpact;
+
+ delete rawItem.itemProperties.CenterOfImpact;
+ }
+
+ if(rawItem.itemProperties.SightingRange){
+ rawItem.itemProperties.sightingRange = rawItem.itemProperties.SightingRange;
+
+ delete rawItem.itemProperties.SightingRange;
+ }
+
return {
...rawItem,
fee: calculateFee(rawItem.avg24hPrice, rawItem.basePrice),
| 1 |
diff --git a/generators/server/templates/src/main/docker/app.yml.ejs b/generators/server/templates/src/main/docker/app.yml.ejs @@ -206,7 +206,7 @@ services:
# Also set SPRING_CLOUD_CONSUL_CONFIG_FORMAT=files on your apps
# - CONFIG_MODE=git
<%_ } _%>
- <%_ if (authenticationType === 'oauth2') { _%>
+ <%_ if (authenticationType === 'oauth2' && applicationType !== 'microservice') { _%>
keycloak:
extends:
file: keycloak.yml
| 2 |
diff --git a/lib/sketchPage.js b/lib/sketchPage.js if (! isShowingGlyphs && ! isTextMode) {
color(overlayColor);
lineWidth(1);
- let sc = 26, font = floor(sc*12/18) + 'pt Arial';
+ let sc = 26, font = '17pt Arial';
let y0 = 10 - _g.panY;
for (let j = 0 ; j < hotKeyMenu.length ; j++) {
let y = y0 + j * sc*14/18;
| 1 |
diff --git a/lib/assets/javascripts/unpoly/link.coffee b/lib/assets/javascripts/unpoly/link.coffee @@ -585,12 +585,12 @@ up.link = do ->
\#\#\# Cancelation is forwarded
If the user cancels an `up:click` event using `event.preventDefault()`,
- the underlying `click` or `mousedown` will also be canceled.
+ the underlying `click` or `mousedown` event will also be canceled.
\#\#\# Accessibility
If the user activates an element using their keyboard, the `up:click` event will be emitted
- on `click`, even if the element has an `[up-instant]` attribute.
+ when the key is pressed even if the element has an `[up-instant]` attribute.
@event up:click
@param {Element} event.target
| 7 |
diff --git a/components/bases-locales/charte/partner.js b/components/bases-locales/charte/partner.js @@ -68,6 +68,7 @@ function Partner({partnerInfos}) {
</div>
<style jsx>{`
.partner {
+ max-width: 300px;
width: 100%;
grid-template-rows: 0.5fr auto;
grid-template-columns: 1fr;
@@ -79,7 +80,7 @@ function Partner({partnerInfos}) {
.general-partner-infos {
text-align: left;
display: grid;
- grid-template-rows: 40px 150px 20px;
+ grid-template-rows: 40px 100px 20px;
grid-template-columns: 1fr;
gap: 1em;
align-items: center;
| 7 |
diff --git a/world.js b/world.js @@ -361,6 +361,14 @@ for (const arrayName of [
app.updateMatrixWorld();
app.setAttribute('physics', true);
app.name = contentId;
+ app.type = (() => {
+ const match = contentId.match(/\.([a-z0-9]+)$/i);
+ if (match) {
+ return match[1];
+ } else {
+ return '';
+ }
+ })();
app.contentId = contentId;
metaversefile.addApp(app);
mesh = await app.addModule(m);
| 12 |
diff --git a/token-metadata/0xA64BD6C70Cb9051F6A9ba1F163Fdc07E0DfB5F84/metadata.json b/token-metadata/0xA64BD6C70Cb9051F6A9ba1F163Fdc07E0DfB5F84/metadata.json "symbol": "ALINK",
"address": "0xA64BD6C70Cb9051F6A9ba1F163Fdc07E0DfB5F84",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html s.parentNode.insertBefore( wf, s );
} )();
- const allImagesLoaded = new Promise( ( resolve ) => {
- // Wait for the document to completely finish loading before checking for images.
- window.addEventListener( 'load', () => {
- imagesLoaded( '.googlesitekit-plugin-preview', { background: true }, resolve );
- } );
- } );
-
Promise.all( [
webFontsLoaded,
- allImagesLoaded,
] ).then( () => {
// Signal Backstop that the environment is ready to go.
document.body.classList.add( 'backstopjs-ready' );
| 2 |
diff --git a/lib/cartodb/models/dataview/base.js b/lib/cartodb/models/dataview/base.js -function BaseDataview() {}
+const FLOAT_OIDS = {
+ 700: true,
+ 701: true,
+ 1700: true
+};
+
+const DATE_OIDS = {
+ 1082: true,
+ 1114: true,
+ 1184: true
+};
-module.exports = BaseDataview;
+const columnTypeQueryTpl = ctx => `SELECT pg_typeof(${ctx.column})::oid FROM (${ctx.query}) _cdb_column_type limit 1`;
-BaseDataview.prototype.getResult = function(psql, override, callback) {
- var self = this;
+function getPGTypeName (pgType) {
+ return {
+ float: FLOAT_OIDS.hasOwnProperty(pgType),
+ date: DATE_OIDS.hasOwnProperty(pgType)
+ };
+}
+
+module.exports = class BaseDataview {
+ getResult (psql, override, callback) {
+ const self = this;
this.sql(psql, override, function(err, query) {
if (err) {
return callback(err);
@@ -21,44 +39,23 @@ BaseDataview.prototype.getResult = function(psql, override, callback) {
}, true); // use read-only transaction
});
+ }
-};
-
-BaseDataview.prototype.search = function(psql, userQuery, callback) {
+ search (psql, userQuery, callback) {
return callback(null, this.format({ rows: [] }));
};
-var FLOAT_OIDS = {
- 700: true,
- 701: true,
- 1700: true
-};
-
-var DATE_OIDS = {
- 1082: true,
- 1114: true,
- 1184: true
-};
-
-var columnTypeQueryTpl = ctx => `SELECT pg_typeof(${ctx.column})::oid FROM (${ctx.query}) _cdb_column_type limit 1`;
+ getColumnType (psql, column, query, callback) {
+ const readOnlyTransaction = true;
-BaseDataview.prototype.getColumnType = function (psql, column, query, callback) {
- var readOnlyTransaction = true;
-
- var columnTypeQuery = columnTypeQueryTpl({ column, query });
+ const columnTypeQuery = columnTypeQueryTpl({ column, query });
psql.query(columnTypeQuery, function(err, result) {
if (err) {
return callback(err);
}
- var pgType = result.rows[0].pg_typeof;
+ const pgType = result.rows[0].pg_typeof;
callback(null, getPGTypeName(pgType));
}, readOnlyTransaction);
-};
-
-function getPGTypeName (pgType) {
- return {
- float: FLOAT_OIDS.hasOwnProperty(pgType),
- date: DATE_OIDS.hasOwnProperty(pgType)
- };
}
+};
| 4 |
diff --git a/src/tagui_parse.php b/src/tagui_parse.php @@ -113,24 +113,30 @@ file_put_contents($script . '.raw', $translated_raw_flow); // save translated ou
$input_file = fopen($script . '.raw','r') or die("ERROR - cannot open " . $script . '.raw' . "\n");}
// section to do required pre-processing on expanded .raw flow file
-$padded_raw_flow = ""; $previous_line_is_condition = false;
+$padded_raw_flow = ""; $previous_line_is_condition = false; $reference_indentation = "";
while(!feof($input_file)) {$padded_raw_flow_line = fgets($input_file);
$indentation_tracker = str_replace(ltrim($padded_raw_flow_line),'',$padded_raw_flow_line);
+$indentation_tracker = substr($indentation_tracker,strlen($reference_indentation));
+// above line handles py and vision blocks that begin indented (eg in if or loops)
$padded_raw_flow_line = ltrim($padded_raw_flow_line);
// track whether line is inside integrations begin-finish code blocks
if (strtolower(trim($padded_raw_flow_line)) == "js begin") $inside_js_block = 1;
else if (strtolower(trim($padded_raw_flow_line)) == "js finish") $inside_js_block = 0;
-else if (strtolower(trim($padded_raw_flow_line)) == "py begin") $inside_py_block = 1;
-else if (strtolower(trim($padded_raw_flow_line)) == "py finish") $inside_py_block = 0;
+else if (strtolower(trim($padded_raw_flow_line)) == "py begin")
+{$inside_py_block = 1; $reference_indentation = $indentation_tracker;}
+else if (strtolower(trim($padded_raw_flow_line)) == "py finish")
+{$inside_py_block = 0; $reference_indentation = "";} // reset reference indentation
else if (strtolower(trim($padded_raw_flow_line)) == "r begin") $inside_r_block = 1;
else if (strtolower(trim($padded_raw_flow_line)) == "r finish") $inside_r_block = 0;
else if (strtolower(trim($padded_raw_flow_line)) == "dom begin") $inside_dom_block = 1;
else if (strtolower(trim($padded_raw_flow_line)) == "dom finish") $inside_dom_block = 0;
else if (strtolower(trim($padded_raw_flow_line)) == "run begin") $inside_run_block = 1;
else if (strtolower(trim($padded_raw_flow_line)) == "run finish") $inside_run_block = 0;
-else if (strtolower(trim($padded_raw_flow_line)) == "vision begin") $inside_vision_block = 1;
-else if (strtolower(trim($padded_raw_flow_line)) == "vision finish") $inside_vision_block = 0;
+else if (strtolower(trim($padded_raw_flow_line)) == "vision begin")
+{$inside_vision_block = 1; $reference_indentation = $indentation_tracker;}
+else if (strtolower(trim($padded_raw_flow_line)) == "vision finish")
+{$inside_vision_block = 0; $reference_indentation = "";} // reset reference indentation
// auto-padding not relevant in integrations code blocks
if (($inside_js_block + $inside_py_block + $inside_r_block +
| 9 |
diff --git a/token-metadata/0xFFE02ee4C69eDf1b340fCaD64fbd6b37a7b9e265/metadata.json b/token-metadata/0xFFE02ee4C69eDf1b340fCaD64fbd6b37a7b9e265/metadata.json "symbol": "NANJ",
"address": "0xFFE02ee4C69eDf1b340fCaD64fbd6b37a7b9e265",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/builtin/loop.ts b/src/builtin/loop.ts @@ -4,6 +4,7 @@ import { models } from '../models'
import constants from '../constants'
import { spawn } from 'child_process'
import { loadConfig } from '../utils/config'
+import { sphinxLogger } from '../utils/logger'
import { getTribeOwnersChatByUUID } from '../utils/tribes'
const config = loadConfig()
@@ -128,13 +129,13 @@ export function init() {
`--fast`,
`--addr=${addy}`,
]
- console.log('=> SPAWN', cmd, args)
+ sphinxLogger.info(`=> SPAWN ${cmd} ${args}`)
let childProcess = spawn(cmd, args)
childProcess.stdout.on('data', function (data) {
const stdout = data.toString()
- console.log('LOOPBOT stdout:', stdout)
+ sphinxLogger.info(`LOOPBOT stdout: ${stdout}`)
if (stdout) {
- console.log('=> LOOPBOT stdout', stdout)
+ sphinxLogger.info(`=> LOOPBOT stdout ${stdout}`)
if (stdout.includes('CONTINUE SWAP?')) {
childProcess.stdin.write('y\n')
}
@@ -149,16 +150,16 @@ export function init() {
}
})
childProcess.stderr.on('data', function (data) {
- console.log('STDERR:', data.toString())
+ sphinxLogger.error(`STDERR: ${data.toString()}`)
})
childProcess.on('error', (error) => {
- console.log('error', error.toString())
+ sphinxLogger.error(`error ${error.toString()}`)
})
childProcess.on('close', (code) => {
- console.log('CHILD PROCESS closed', code)
+ sphinxLogger.info(`CHILD PROCESS closed ${code}`)
})
} catch (e) {
- console.log('LoopBot error', e)
+ sphinxLogger.error(`LoopBot error ${e}`)
}
} else {
const cmd = arr[1]
| 0 |
diff --git a/assets/js/googlesitekit/datastore/user/feature-tours.test.js b/assets/js/googlesitekit/datastore/user/feature-tours.test.js @@ -30,7 +30,7 @@ import initialState, {
FEATURE_TOUR_COOLDOWN_SECONDS,
FEATURE_TOUR_LAST_DISMISSED_AT,
} from './feature-tours';
-const { setItem, deleteItem } = CacheModule;
+const { setItem } = CacheModule;
describe( 'core/user feature-tours', () => {
let registry;
@@ -350,9 +350,7 @@ describe( 'core/user feature-tours', () => {
} );
describe( 'getLastDismissedAt', () => {
- afterEach( async () => {
- await deleteItem( FEATURE_TOUR_LAST_DISMISSED_AT );
- } );
+ // Note: storage is cleared before every test in the global config.
it( 'returns initial state (undefined) if there is no lastDismissedAt timestamp', () => {
const lastDismissedAt = registry.select( STORE_NAME ).getLastDismissedAt();
@@ -367,7 +365,7 @@ describe( 'core/user feature-tours', () => {
it( 'uses a resolver to set lastDismissedAt in the store if there is a value in the cache', async () => {
const timestamp = Date.now();
- setItem( FEATURE_TOUR_LAST_DISMISSED_AT, timestamp );
+ await setItem( FEATURE_TOUR_LAST_DISMISSED_AT, timestamp );
registry.select( STORE_NAME ).getLastDismissedAt();
await untilResolved( registry, STORE_NAME ).getLastDismissedAt();
| 2 |
diff --git a/services/DatabaseService.php b/services/DatabaseService.php @@ -5,9 +5,7 @@ namespace Grocy\Services;
class DatabaseService
{
private static $DbConnection = null;
-
private static $DbConnectionRaw = null;
-
private static $instance = null;
/**
@@ -67,6 +65,12 @@ class DatabaseService
{
$pdo = new \PDO('sqlite:' . $this->GetDbFilePath());
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+ $pdo->sqliteCreateFunction('regexp', function ($pattern, $value) {
+ mb_regex_encoding('UTF-8');
+ return (false !== mb_ereg($pattern, $value)) ? 1 : 0;
+ });
+
self::$DbConnectionRaw = $pdo;
}
| 0 |
diff --git a/package.json b/package.json "Jarda Snajdr (https://github.com/jsnajdr)",
"jgilbert01 (https://github.com/jgilbert01)",
"John McKim (https://github.com/johncmckim)",
+ "Jonas De Kegel (https://github.com/jlsjonas)",
"Joost Farla (https://github.com/joostfarla)",
+ "Joubert RedRat (https://github.com/joubertredrat)",
"Kaj Wiklund (https://github.com/kajwiklund)",
"Kiryl Yermakou (https://github.com/rma4ok)",
"Leonardo Alifraco (https://github.com/lalifraco-devspark)",
| 0 |
diff --git a/src/lib/realmdb/feedSource/NewsSource.js b/src/lib/realmdb/feedSource/NewsSource.js @@ -51,10 +51,15 @@ export default class NewsSource extends FeedSource {
return
} catch (exception) {
- // throw if not HISTORY_NOT_FOUND, otherwise falling back to _loadRemoteFeed()
+ // throw if not HISTORY_NOT_FOUND
if ('HISTORY_NOT_FOUND' !== exception.name) {
throw exception
}
+
+ // otherwise falling back to _loadRemoteFeed()
+ log.warn('ceramic history ID not found or broken. reloading the whole feed', exception.message, exception, {
+ historyId,
+ })
}
}
| 0 |
diff --git a/doc-src/templates/api-versions/model_documentor.rb b/doc-src/templates/api-versions/model_documentor.rb @@ -399,10 +399,10 @@ class ExampleShapeVisitor
end
def visit_map(node, required = false)
- data = indent("someKey: " + traverse(node['value']))
+ data = indent("'<#{node['key']['shape']}>': " + traverse(node['value']))
lines = ["{" + mark_rec_shape(node) + (required ? " /* required */" : "")]
lines << data + ","
- lines << " /* anotherKey: ... */"
+ lines << " /* '<#{node['key']['shape']}>': ... */"
lines << "}"
lines.join("\n")
end
| 4 |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ concurrency:
cancel-in-progress: true
jobs:
SPM:
- name: Test macOS 11 (5.4)
+ name: Swift Package Manager 5.4
runs-on: macOS-11
env:
DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
@@ -29,12 +29,7 @@ jobs:
destination: ['OS=14.5,name=iPhone 12']
steps:
- uses: actions/checkout@v2
- # - name: Fetch dependencies
- # run: |
- # carthage bootstrap --no-use-binaries --platform iOS --cache-builds
- # bundle exec pod install
- # swift package update
- name: Resolve dependencies
run: swift package resolve
- - name: Test
+ - name: Run local test
run: swift test --filter localTests
\ No newline at end of file
| 10 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -11,8 +11,8 @@ jobs:
- restore_cache:
keys:
- - v1-dependencies-v6-{{ checksum "package.json" }}
- - v1-dependencies-v6-
+ - v1-dependencies-v12-{{ checksum "package.json" }}
+ - v1-dependencies-v12-
- v1-dependencies-
- run:
@@ -22,7 +22,7 @@ jobs:
- save_cache:
paths:
- node_modules
- key: v1-dependencies-v6-{{ checksum "package.json" }}
+ key: v1-dependencies-v12-{{ checksum "package.json" }}
- run:
name: unit tests
@@ -48,8 +48,8 @@ jobs:
- restore_cache:
keys:
- - v1-dependencies-v6-{{ checksum "package.json" }}
- - v1-dependencies-v6-
+ - v1-dependencies-v10-{{ checksum "package.json" }}
+ - v1-dependencies-v10-
- v1-dependencies-
- run:
@@ -59,7 +59,7 @@ jobs:
- save_cache:
paths:
- node_modules
- key: v1-dependencies-v6-{{ checksum "package.json" }}
+ key: v1-dependencies-v10-{{ checksum "package.json" }}
- run:
name: unit tests
@@ -69,11 +69,6 @@ jobs:
name: coverage reporting
command: npm run coverage:submit
- - persist_to_workspace:
- root: ~/
- paths:
- - middy/*
-
build_node8:
docker:
- image: circleci/node:8.10
@@ -109,7 +104,7 @@ jobs:
deploy:
docker:
- - image: circleci/node:6.10
+ - image: circleci/node:12
steps:
- attach_workspace:
| 7 |
diff --git a/package.json b/package.json "postcss-import-url": "^5.1.0",
"postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.7.0",
- "puppeteer": "^1.20.0",
"rimraf": "^3.0.2",
"rxjs": "^6.6.6",
"sanitize-filename": "^1.6.3",
| 2 |
diff --git a/packages/openneuro-app/src/scripts/refactor_2021/aggregate-queries/aggregate-counts-container.tsx b/packages/openneuro-app/src/scripts/refactor_2021/aggregate-queries/aggregate-counts-container.tsx @@ -35,7 +35,7 @@ const AggregateCountsContainer: React.FC<AggregateCountsContainerProps> = ({
/>
<AggregateCount
type="publicDataset"
- count={publicDatasetsData.datasets.pageInfo.count}
+ count={publicDatasetsData.datasets?.pageInfo?.count || 0}
/>
</>
)
| 9 |
diff --git a/lib/lesshint.js b/lib/lesshint.js @@ -11,22 +11,6 @@ const path = require('path');
const fs = require('fs');
class Lesshint {
- checkFile (checkPath) {
- return new Promise((resolve, reject) => {
- fs.readFile(checkPath, 'utf8', (err, data) => {
- if (err) {
- return reject(err);
- }
-
- try {
- resolve(this.checkString(data, checkPath));
- } catch (e) {
- reject(e);
- }
- });
- });
- }
-
checkFiles (patterns) {
return new Promise((resolve, reject) => {
const ignorePatterns = this.config.excludedFiles.map((pattern) => {
@@ -39,7 +23,7 @@ class Lesshint {
.then((files) => {
files = files.filter(this.hasAllowedExtension, this);
files = files.map((file) => {
- return this.checkFile(file);
+ return this.runOnFile(file);
});
this.formatResults(files, resolve, reject);
@@ -83,6 +67,22 @@ class Lesshint {
return result;
}
+ runOnFile (checkPath) {
+ return new Promise((resolve, reject) => {
+ fs.readFile(checkPath, 'utf8', (err, data) => {
+ if (err) {
+ return reject(err);
+ }
+
+ try {
+ resolve(this.checkString(data, checkPath));
+ } catch (e) {
+ reject(e);
+ }
+ });
+ });
+ }
+
configure (config) {
const defaultConfig = configLoader(__dirname + '/config/defaults.json');
| 10 |
diff --git a/civictechprojects/helpers/context_preload.py b/civictechprojects/helpers/context_preload.py @@ -7,12 +7,13 @@ def about_project_preload(context, query_args):
context = default_preload(context, query_args)
project_id = query_args['id'][0]
project_json = ProjectCache.get(project_id)
- if project_json is None:
- print('Failed to preload project info, no cache entry found: ' + project_id)
+ if project_json is not None:
context['title'] = project_json['project_name'] + ' | DemocracyLab'
context['description'] = project_json['project_short_description'] or project_json['project_description'][:300]
if 'project_thumbnail' in project_json:
context['og_image'] = project_json['project_thumbnail']['publicUrl']
+ else:
+ print('Failed to preload project info, no cache entry found: ' + project_id)
return context
| 9 |
diff --git a/js/core/bis_genericio.js b/js/core/bis_genericio.js @@ -655,7 +655,7 @@ let makeFileChecksum = (url) => {
read(url, true).then( (obj) => {
let hash = util.SHA256(obj.data);
//resolves data structure in an 'output' field for cross-compatibility with objects returned by the server
- if (hash) { resolve( { 'output' : { 'hash' : hash, 'filename' : url } } ); };
+ if (hash) { resolve( { 'output' : { 'hash' : hash, 'filename' : url } } ); }
reject(hash);
}).catch( (e) => {
| 1 |
diff --git a/src/js/base/module/Buttons.js b/src/js/base/module/Buttons.js @@ -646,9 +646,9 @@ define([
}).render();
for (var idx = 0, len = buttons.length; idx < len; idx++) {
- var button = context.memo('button.' + buttons[idx]);
- if (button) {
- $group.append(typeof button === 'function' ? button(context) : button);
+ var btn = context.memo('button.' + buttons[idx]);
+ if (btn) {
+ $group.append(typeof btn === 'function' ? btn(context) : btn);
}
}
$group.appendTo($container);
| 10 |
diff --git a/services/backend-api/client/src/pages/FeedMessage.tsx b/services/backend-api/client/src/pages/FeedMessage.tsx import { Heading, Stack, Text } from '@chakra-ui/react';
import { useParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
-import { DashboardContent } from '@/components';
+import { DashboardContent, DiscordMessageForm } from '@/components';
import { FeedArticlesPlaceholders, useFeed } from '../features/feed';
import RouteParams from '../types/RouteParams';
-import { TextForm } from '@/features/feed/components/TextForm';
+import { DiscordMessageFormData } from '../types/discord';
+import { useUpdateFeed } from '../features/feed/hooks/useUpdateFeed';
+import { notifySuccess } from '../utils/notifySuccess';
const FeedMessage: React.FC = () => {
const { feedId } = useParams<RouteParams>();
const {
- feed, status: feedStatus, error: feedError, refetch,
+ feed, status: feedStatus, error: feedError,
} = useFeed({
feedId,
});
+ const { mutateAsync } = useUpdateFeed();
const { t } = useTranslation();
+ const onFormSaved = async (data: DiscordMessageFormData) => {
+ if (!feedId) {
+ return;
+ }
+
+ await mutateAsync({
+ feedId,
+ details: {
+ text: data.content,
+ embeds: data.embeds,
+ },
+ });
+
+ notifySuccess(t('common.success.savedChanges'));
+ };
+
return (
<Stack>
<DashboardContent
@@ -31,37 +50,14 @@ const FeedMessage: React.FC = () => {
/>
</Stack>
<Stack spacing="4">
- <Heading size="md">{t('pages.message.textSectionTitle')}</Heading>
- <Text>
- {t('pages.message.textSectionDescription')}
- </Text>
- <TextForm
- feedId={feedId as string}
- text={feed?.text || ''}
- onUpdated={refetch}
- />
- </Stack>
- {/* <Stack spacing="4">
- <Stack direction="row" justifyContent="space-between">
- <Heading size="md">Embeds</Heading>
- <ButtonGroup>
- <IconButton
- aria-label="previous embed"
- icon={<ChevronLeftIcon fontSize="xl" />}
- />
- <Text
- alignSelf="center"
- >
- 1/3
- </Text>
- <IconButton
- aria-label="next embed"
- icon={<ChevronRightIcon fontSize="xl" />}
+ <DiscordMessageForm
+ defaultValues={{
+ content: feed?.text || '',
+ embeds: feed?.embeds,
+ }}
+ onClickSave={onFormSaved}
/>
- </ButtonGroup>
</Stack>
- <EmbedForm />
- </Stack> */}
</Stack>
</DashboardContent>
</Stack>
| 4 |
diff --git a/util.js b/util.js @@ -552,4 +552,26 @@ export const unFrustumCull = o => {
});
};
+const hitAnimationLength = 300;
+export const makeHitTracker = () => {
+ const jitterObject = new THREE.Object3D();
+ let hitTime = -1;
+ jitterObject.startHit = () => {
+ hitTime = 0;
+ };
+ jitterObject.update = timeDiff => {
+ if (hitTime !== -1) {
+ hitTime += timeDiff;
+
+ const scale = (1-hitTime/hitAnimationLength) * 0.1;
+ jitterObject.position.set((-1+Math.random()*2)*scale, (-1+Math.random()*2)*scale, (-1+Math.random()*2)*scale);
+
+ if (hitTime > hitAnimationLength) {
+ hitTime = -1;
+ }
+ }
+ };
+ return jitterObject;
+};
+
export const epochStartTime = Date.now();
\ No newline at end of file
| 0 |
diff --git a/test/unit/collection/validations.js b/test/unit/collection/validations.js @@ -98,7 +98,7 @@ describe('Collection Validator ::', function() {
});
});
- it('should return an Error with name `UsageError` when a required string field is set to empty string in a `create`', function(done) {
+ it('should return an Error with name `UsageError` when a required string field is set to empty string in a `update`', function(done) {
person.update({}, { sex: '' }).exec(function(err) {
assert(err);
assert.equal(err.name, 'UsageError');
@@ -107,7 +107,7 @@ describe('Collection Validator ::', function() {
});
});
- it('should return an Error with name `UsageError` when a field is set to the wrong type in a `create`', function(done) {
+ it('should return an Error with name `UsageError` when a field is set to the wrong type in a `update`', function(done) {
person.update({}, { age: 'bar' }).exec(function(err) {
assert(err);
assert.equal(err.name, 'UsageError');
@@ -116,7 +116,7 @@ describe('Collection Validator ::', function() {
});
});
- it('should return an Error with name `UsageError` when a field fails a validation rule in a `create`', function(done) {
+ it('should return an Error with name `UsageError` when a field fails a validation rule in a `update`', function(done) {
person.update({}, { sex: 'bar' }).exec(function(err) {
assert(err);
assert.equal(err.name, 'UsageError');
| 1 |
diff --git a/components/Article/Progress/index.js b/components/Article/Progress/index.js @@ -44,7 +44,6 @@ const Progress = ({
submitProgressConsent,
article,
isArticle,
- userProgress,
router,
upsertDocumentProgress
}) => {
@@ -148,9 +147,9 @@ const Progress = ({
percentage > 0 &&
// ignore elements until min index
element.index >= MIN_INDEX &&
- (!userProgress ||
- userProgress.nodeId !== element.nodeId ||
- Math.floor(userProgress.percentage * 100) !==
+ (!article.userProgress ||
+ article.userProgress.nodeId !== element.nodeId ||
+ Math.floor(article.userProgress.percentage * 100) !==
Math.floor(percentage * 100))
) {
upsertDocumentProgress(article.id, percentage, element.nodeId)
@@ -161,7 +160,7 @@ const Progress = ({
if (e) {
e.preventDefault()
}
- const { percentage, nodeId } = userProgress
+ const { percentage, nodeId } = article.userProgress
const progressElements = getProgressElements()
const progressElement =
| 13 |
diff --git a/test/jasmine/tests/sankey_test.js b/test/jasmine/tests/sankey_test.js @@ -9,6 +9,7 @@ var Sankey = require('@src/traces/sankey');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
+var fail = require('../assets/fail_test');
var mouseEvent = require('../assets/mouse_event');
describe('sankey tests', function() {
@@ -257,15 +258,8 @@ describe('sankey tests', function() {
});
describe('lifecycle methods', function() {
-
afterEach(destroyGraphDiv);
- function wait() {
- return new Promise(function(resolve) {
- setTimeout(resolve, 60);
- });
- }
-
it('Plotly.deleteTraces with two traces removes the deleted plot', function(done) {
var gd = createGraphDiv();
@@ -317,24 +311,102 @@ describe('sankey tests', function() {
done();
});
});
+ });
+
+ describe('Test hover/click interactions:', function() {
+ afterEach(destroyGraphDiv);
+
+ function assertLabel(content, style) {
+ var g = d3.selectAll('.hovertext');
+ var lines = g.selectAll('.nums .line');
+ var name = g.selectAll('.name');
+
+ expect(lines.size()).toBe(content.length - 1);
+
+ lines.each(function(_, i) {
+ expect(d3.select(this).text()).toBe(content[i]);
+ });
+
+ expect(name.text()).toBe(content[content.length - 1]);
+
+ var path = g.select('path');
+ expect(path.style('fill')).toEqual(style[0], 'bgcolor');
+ expect(path.style('stroke')).toEqual(style[1], 'bordercolor');
+
+ var text = g.select('text.nums');
+ expect(parseInt(text.style('font-size'))).toEqual(style[2], 'font.size');
+ expect(text.style('font-family').split(',')[0]).toEqual(style[3], 'font.family');
+ expect(text.style('fill')).toEqual(style[4], 'font.color');
+ }
- it('Plotly.plot shows and removes tooltip on node, link', function(done) {
+ it('should shows the correct hover labels', function(done) {
var gd = createGraphDiv();
var mockCopy = Lib.extendDeep({}, mock);
+ function _hover(px, py) {
+ mouseEvent('mousemove', px, py);
+ mouseEvent('mouseover', px, py);
+ delete gd._lastHoverTime;
+ }
+
Plotly.plot(gd, mockCopy).then(function() {
- mouseEvent('mousemove', 400, 300);
- mouseEvent('mouseover', 400, 300);
+ _hover(400, 300);
+
+ assertLabel(
+ ['Solid', 'Incoming flow count: 4', 'Outgoing flow count: 3', '447TWh'],
+ ['rgb(148, 103, 189)', 'rgb(255, 255, 255)', 13, 'Arial', 'rgb(255, 255, 255)']
+ );
+ })
+ .then(function() {
+ _hover(450, 300);
+
+ assertLabel(
+ ['Source: Solid', 'Target: Industry', '46TWh'],
+ ['rgb(0, 0, 96)', 'rgb(255, 255, 255)', 13, 'Arial', 'rgb(255, 255, 255)']
+ );
+
+ return Plotly.relayout(gd, 'hoverlabel.font.family', 'Roboto');
})
- .then(wait)
.then(function() {
- expect(d3.select('.hoverlayer>.hovertext>text').node().innerHTML)
- .toEqual('447TWh', 'tooltip present');
+ _hover(400, 300);
+
+ assertLabel(
+ ['Solid', 'Incoming flow count: 4', 'Outgoing flow count: 3', '447TWh'],
+ ['rgb(148, 103, 189)', 'rgb(255, 255, 255)', 13, 'Roboto', 'rgb(255, 255, 255)']
+ );
})
.then(function() {
- mouseEvent('mousemove', 450, 300);
- mouseEvent('mouseover', 450, 300);
+ _hover(450, 300);
+
+ assertLabel(
+ ['Source: Solid', 'Target: Industry', '46TWh'],
+ ['rgb(0, 0, 96)', 'rgb(255, 255, 255)', 13, 'Roboto', 'rgb(255, 255, 255)']
+ );
+
+ return Plotly.restyle(gd, {
+ 'hoverlabel.bgcolor': 'red',
+ 'hoverlabel.bordercolor': 'blue',
+ 'hoverlabel.font.size': 20,
+ 'hoverlabel.font.color': 'black'
+ });
+ })
+ .then(function() {
+ _hover(400, 300);
+
+ assertLabel(
+ ['Solid', 'Incoming flow count: 4', 'Outgoing flow count: 3', '447TWh'],
+ ['rgb(255, 0, 0)', 'rgb(0, 0, 255)', 20, 'Roboto', 'rgb(0, 0, 0)']
+ );
+ })
+ .then(function() {
+ _hover(450, 300);
+
+ assertLabel(
+ ['Source: Solid', 'Target: Industry', '46TWh'],
+ ['rgb(255, 0, 0)', 'rgb(0, 0, 255)', 20, 'Roboto', 'rgb(0, 0, 0)']
+ );
})
+ .catch(fail)
.then(done);
});
});
| 0 |
diff --git a/src/map/handler/Map.Drag.js b/src/map/handler/Map.Drag.js @@ -155,8 +155,11 @@ class MapDragHandler extends Handler {
preBearing = map.getBearing();
const dx = Math.abs(mx - this.preX),
dy = Math.abs(my - this.preY);
+
if (!this._rotateMode) {
- if (dx > dy) {
+ if (map.options['dragRotatePitch']) {
+ this._rotateMode = 'rotate_pitch';
+ } else if (dx > dy) {
this._rotateMode = 'rotate';
} else if (dx < dy) {
this._rotateMode = 'pitch';
@@ -167,10 +170,11 @@ class MapDragHandler extends Handler {
return;
}
- if (this._rotateMode === 'rotate' && map.options['dragRotate']) {
- map.setBearing(map.getBearing() + 3 * (mx > this.preX ? 1 : -1));
- } else if (this._rotateMode === 'pitch' && map.options['dragPitch']) {
- map.setPitch(map.getPitch() + (my > this.preY ? -1 : 1) * 3);
+ if (this._rotateMode.indexOf('rotate') >= 0 && map.options['dragRotate']) {
+ map.setBearing(map.getBearing() - 0.6 * (this.preX - mx));
+ }
+ if (this._rotateMode.indexOf('pitch') >= 0 && map.options['dragPitch']) {
+ map.setPitch(map.getPitch() + (this.preY - my) * 0.4);
}
this.preX = mx;
this.preY = my;
@@ -196,6 +200,7 @@ class MapDragHandler extends Handler {
Map.mergeOptions({
'draggable': true,
'dragPan' : true,
+ 'dragRotatePitch' : false,
'dragRotate' : true,
'dragPitch' : true
});
| 3 |
diff --git a/closure/goog/fx/abstractdragdrop.js b/closure/goog/fx/abstractdragdrop.js @@ -392,7 +392,16 @@ goog.fx.AbstractDragDrop.prototype.startDrag = function(event, item) {
// Dispatch DRAGSTART event
var dragStartEvent = new goog.fx.DragDropEvent(
- goog.fx.AbstractDragDrop.EventType.DRAGSTART, this, this.dragItem_);
+ goog.fx.AbstractDragDrop.EventType.DRAGSTART, this, this.dragItem_,
+ undefined, // opt_target
+ undefined, // opt_targetItem
+ undefined, // opt_targetElement
+ undefined, // opt_clientX
+ undefined, // opt_clientY
+ undefined, // opt_x
+ undefined, // opt_y
+ undefined, // opt_subtarget
+ event);
if (this.dispatchEvent(dragStartEvent) == false) {
this.dragItem_ = null;
return;
| 12 |
diff --git a/src/pages/item/index.css b/src/pages/item/index.css margin: 0;
}
-.text-and-image-information-wrapper.first-trader-price {
- /* margin-left: auto; */
+.trader-wrapper {
+ justify-content: space-between;
}
@media screen and (min-width: 900px) {
.icon-and-link-wrapper img {
max-height: 200px;
}
-}
.trader-wrapper {
display: flex;
- justify-content: space-between;
+ }
}
\ No newline at end of file
| 1 |
diff --git a/core/rendered_type_expr.js b/core/rendered_type_expr.js @@ -258,7 +258,7 @@ Blockly.RenderedTypeExpr.TVAR.prototype.shape = {
return [];
},
- highlight: function() {
+ tvarHighlight: function() {
return 'm 0,5 l -8,0 0,15 8,0';
}
};
@@ -293,7 +293,7 @@ Blockly.RenderedTypeExpr.prototype.typeVarHighlights_ = function(y, typeVarHighl
if (type.isTypeVar()) {
typeVarHighlights.push({
color: type.color,
- path: "m 0," + y + " " + type.shape.highlight.call(type)
+ path: "m 0," + y + " " + type.shape.tvarHighlight.call(type)
});
} else if (children.length != 0) {
var name = type.getTypeName();
| 10 |
diff --git a/docs/api.mdx b/docs/api.mdx @@ -4,17 +4,95 @@ title: API Reference
# API Reference
-### siimple.configure(...)
+Import the **siimple** package in your SCSS file using the `@use` rule:
-A mixin for configuring the default values of siimple, like scales, breakpoints, flags, and more. See the [configure section](/configure) to learn more.
+```scss
+@use "siimple" as siimple;
+```
+
+This package exports the following variables, mixins and functions.
+
+
+### Variables
+
+You can access to the default values that has been defined in **siimple** using the following variables:
+
+```scss
+// Screen sizes
+$tablet: 640px; // 576px + 4rem
+$desktop: 1264px; // 1200px + 4rem
+$widescreen: 1504px; // 1440px + 4rem
+
+// Default colors
+$primary: #1c76fd; // blue-500
+$secondary: #202ba2; // royal-600
+$accent: #4622a0; // purple-600
+
+$body-bg: #ffffff; // white
+$body-text: #363f4f; // coolgray-700
+$heading: #1d2734; // coolgray-800
+$fill: #ebedef; // coolgray-200
+$muted: #747c8b; // coolgray-500
+
+$black: #000000;
+$white: #ffffff;
+
+// Fonts
+$font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+$font-serif: Georgia, Cambria, "Times New Roman", Times, serif;
+$font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+```
+
+### Mixins
+
+#### siimple.configure(...)
+
+A mixin for extending the **siimple** default configuration using your project's color palette, font families, breakpoints, and more.
-### siimple.css()
+```scss
+@include siimple.configure(
+ $prefix: "si-",
+ $breakpoints: (
+ "sm": (
+ "max": 480px,
+ ),
+ "md": (
+ "min": 481px,
+ "max": 768px,
+ ),
+ "lg": (
+ "min": 769px,
+ ),
+ ),
+ $scales: (
+ "colors": (
+ "primary": #3333ee,
+ "secondary": #4c5aae,
+ "background": #fafafa,
+ ),
+ "fonts": (
+ "body": (Roboto, sans-serif),
+ "heading": (Roboto, sans-serif),
+ "monospace": monospace,
+ ),
+ ),
+);
+```
+
+To learn more about the allowed values of this mixin, see the [configuration documentation](/configuration).
+
+
+#### siimple.css()
A mixin for including all configured modules of siimple. You can use the `$flags` section of the `siimple.configure` mixin to customize which modules will be included.
+```scss
+@include siimple.css;
+```
+
-### siimple.utility($options)
+#### siimple.utility($options)
A mixin that you can use to generate your own CSS utility classes. The `$options` argument is a map that accepts the following fields:
@@ -25,30 +103,9 @@ A mixin that you can use to generate your own CSS utility classes. The `$options
- `"responsibe"`: a boolean to generate also responsive utilities.
- `"important"`: a boolean for adding the `!important` flag.
-Example:
-
-```scss
-@use "siimple" as siimple;
-
-@include siimple.utility((
- "name": "text",
- "properties": ("text-align"),
- "values": (
- "left": "left",
- "right": "right",
- ),
-));
-
-// Will generate
-// .has-text-left { text-align: left; }
-// .has-text-right { text-align: right; }
-```
-
-Example using different states:
+The following example:
```scss
-@use "siimple" as siimple;
-
@include siimple.utility((
"name": "text",
"properties": ("color"),
@@ -58,18 +115,23 @@ Example using different states:
"black": "#000",
),
));
+```
-// Will generate
-// .text-white { color: #fff; }
-// .text-black { color: #000; }
-// .text-white:hover { color: #fff; }
-// .text-black:hover { color: #000; }
+Will generate the following CSS styles:
+
+```css
+.text-white { color: #fff; }
+.text-black { color: #000; }
+.text-white:hover { color: #fff; }
+.text-black:hover { color: #000; }
```
-### siimple.get-color($name, $shade)
+### Functions
+
+#### siimple.get-color($name, $shade)
-A function that returns the color from our [color palette](/colors) that matches the specified `$name` and with the `$shade`. If no `$shade` is provided we will use by default the `"500"`.
+A function that returns the color from our [color palette](/colors) that matches the specified `$name` and the provided `$shade` value. If no `$shade` is provided we will use by default `"500"`.
```scss
@use "siimple" as siimple;
@@ -78,3 +140,14 @@ $blue: siimple.get-color("blue", "600");
$red: siimple.get-color("red"); // == siimple.get-color("red", "500");
```
+
+#### siimple.get-icon($name)
+
+A function that returns the unicode value of the specified icon.
+
+```scss
+@use "siimple" as siimple;
+
+$arrow-left: siimple.get-icon("arrow-left");
+$arrow-right: siimple.get-icon("arrow-right");
+```
| 7 |
diff --git a/edit.js b/edit.js @@ -5106,6 +5106,28 @@ scene.add(rayMesh);
/* const uiMesh = makeUiFullMesh(cubeMesh);
scene.add(uiMesh); */
+const buildsMesh = makeInventoryMesh(cubeMesh, async scrollFactor => {
+ await loadPromise;
+
+ if (!buildsMesh.inventoryBuildsMesh) {
+ buildsMesh.inventoryBuildsMesh = _makeInventoryBuildsMesh();
+ buildsMesh.inventoryBuildsMesh.frustumCulled = false;
+ buildsMesh.add(buildsMesh.inventoryBuildsMesh);
+ }
+});
+buildsMesh.visible = false;
+buildsMesh.handleIconClick = (i, srcIndex) => {
+ console.log('handle builds click', i, srcIndex);
+ /* if (srcIndex < buildsMesh.inventoryShapesMesh.geometries.length) {
+ const geometry = shapesMesh.inventoryShapesMesh.geometries[srcIndex];
+ const material = shapesMesh.inventoryShapesMesh.material.clone();
+ const mesh = new THREE.Mesh(geometry, material);
+ mesh.frustumCulled = false;
+ meshComposer.setPlaceMesh(i, mesh);
+ } */
+};
+scene.add(buildsMesh);
+
const thingsMesh = makeInventoryMesh(cubeMesh, async scrollFactor => {
await loadPromise;
thingsMesh.queue.clearQueue();
@@ -5295,6 +5317,66 @@ const _makeInventoryContentsMesh = () => {
const mesh = new THREE.Mesh(geometry, material);
return mesh;
};
+const _makeInventoryBuildsMesh = () => {
+ return new THREE.Object3D();
+ /* const boxMesh = new THREE.BoxBufferGeometry()
+ const coneMesh = new THREE.ConeBufferGeometry();
+ const cylinderMesh = new THREE.CylinderBufferGeometry();
+ const dodecahedronMesh = new THREE.DodecahedronBufferGeometry();
+ const icosahedronMesh = new THREE.IcosahedronBufferGeometry();
+ const octahedronMesh = new THREE.OctahedronBufferGeometry();
+ const sphereMesh = new THREE.SphereBufferGeometry();
+ const tetrahedronMesh = new THREE.TetrahedronBufferGeometry();
+ const torusMesh = new THREE.TorusBufferGeometry();
+ const geometries = [
+ boxMesh,
+ coneMesh,
+ cylinderMesh,
+ dodecahedronMesh,
+ icosahedronMesh,
+ octahedronMesh,
+ sphereMesh,
+ tetrahedronMesh,
+ torusMesh,
+ ];
+ const material = _makeDrawMaterial(localColor.setStyle('#' + colors[0]).getHex(), localColor.setStyle('#' + colors[1]).getHex(), 1);
+ const scaleMatrix = new THREE.Matrix4().makeScale(0.1, 0.1, 0.1);
+ for (const geometry of geometries) {
+ geometry.applyMatrix4(scaleMatrix);
+ geometry.boundingBox = new THREE.Box3().setFromBufferAttribute(geometry.attributes.position);
+
+ if (!geometry.index) {
+ const indices = new Uint16Array(geometry.attributes.position.array.length/3);
+ for (let i = 0; i < indices.length; i++) {
+ indices[i] = i;
+ }
+ geometry.setIndex(new THREE.BufferAttribute(indices, 1));
+ }
+ }
+
+ const h = 0.1;
+ const arrowW = h/10;
+ const wrapInnerW = h - 2*arrowW;
+ const w = wrapInnerW/3;
+
+ const _compileGeometry = () => BufferGeometryUtils.mergeBufferGeometries(geometries.map((geometry, i) => {
+ const dx = i%3;
+ const dy = (i-dx)/3;
+ return geometry.clone()
+ .applyMatrix4(new THREE.Matrix4().makeScale(w*2, w*2, w*2))
+ .applyMatrix4(new THREE.Matrix4().makeTranslation(-h + w/2 + dx*w, h/2 - arrowW - w/2 - dy*w, w/4));
+ }));
+ const geometry = _compileGeometry();
+ const mesh = new THREE.Mesh(geometry, material);
+ mesh.geometries = geometries;
+ mesh.setColors = selectedColors => {
+ mesh.material.uniforms.color1.value.setStyle('#' + colors[selectedColors[0]]);
+ mesh.material.uniforms.color1.needsUpdate = true;
+ mesh.material.uniforms.color2.value.setStyle('#' + colors[selectedColors[1]]);
+ mesh.material.uniforms.color2.needsUpdate = true;
+ };
+ return mesh; */
+};
const _makeInventoryShapesMesh = () => {
const boxMesh = new THREE.BoxBufferGeometry()
const coneMesh = new THREE.ConeBufferGeometry();
@@ -5421,7 +5503,7 @@ const detailsMesh = makeDetailsMesh(cubeMesh, function onrun(anchorSpec) {
detailsMesh.visible = false;
scene.add(detailsMesh);
-const menuMeshes = [thingsMesh, shapesMesh, inventoryMesh, colorsMesh];
+const menuMeshes = [buildsMesh, thingsMesh, shapesMesh, inventoryMesh, colorsMesh];
const uiMeshes = menuMeshes.concat([detailsMesh]);
let selectedWeapon = 'hand';
@@ -6196,7 +6278,7 @@ function animate(timestamp, frame) {
rayMesh.visible = false;
const _raycastWeapon = () => {
- if (['things', 'shapes', 'inventory', 'colors', 'select'].includes(selectedWeapon)) {
+ if (['build', 'things', 'shapes', 'inventory', 'colors', 'select'].includes(selectedWeapon)) {
const [{position, quaternion}] = _getRigTransforms();
raycaster.ray.origin.copy(position);
raycaster.ray.direction.set(0, 0, -1).applyQuaternion(quaternion);
@@ -6594,6 +6676,10 @@ function animate(timestamp, frame) {
_light();
break;
}
+ case 'build': {
+ _triggerAnchor(buildsMesh);
+ break;
+ }
case 'things': {
_triggerAnchor(thingsMesh);
break;
@@ -6789,6 +6875,7 @@ function animate(timestamp, frame) {
const selectedMenuMesh = (() => {
switch (selectedWeapon) {
+ case 'build': return buildsMesh;
case 'things': return thingsMesh;
case 'shapes': return shapesMesh;
case 'inventory': return inventoryMesh;
| 0 |
diff --git a/src/encoded/tests/test_audit_experiment.py b/src/encoded/tests/test_audit_experiment.py @@ -834,8 +834,7 @@ def test_audit_experiment_wrong_organism_histone_antibody(testapp, base_experime
testapp.patch_json(base_replicate['@id'], {'antibody': histone_antibody['@id'],
'library': base_library['@id'],
'experiment': base_experiment['@id']})
- testapp.patch_json(base_experiment['@id'], {'assay_term_id': 'OBI:0000716',
- 'assay_term_name': 'ChIP-seq',
+ testapp.patch_json(base_experiment['@id'], {'assay_term_name': 'ChIP-seq',
'biosample_term_id': 'EFO:0003971',
'biosample_term_name': 'MEL cell line',
'biosample_type': 'immortalized cell line',
@@ -879,8 +878,7 @@ def test_audit_experiment_partially_characterized_antibody(testapp, base_experim
testapp.patch_json(base_replicate['@id'], {'antibody': TF_antibody['@id'],
'library': base_library['@id'],
'experiment': base_experiment['@id']})
- testapp.patch_json(base_experiment['@id'], {'assay_term_id': 'OBI:0000716',
- 'assay_term_name': 'ChIP-seq',
+ testapp.patch_json(base_experiment['@id'], {'assay_term_name': 'ChIP-seq',
'biosample_term_id': 'EFO:0002067',
'biosample_term_name': 'K562',
'biosample_type': 'immortalized cell line',
| 2 |
diff --git a/packages/build/src/error/parse/properties.js b/packages/build/src/error/parse/properties.js @@ -11,7 +11,7 @@ const getErrorProps = function({ errorProps, showErrorProps, colors }) {
return
}
- return inspect(errorPropsA, { colors })
+ return inspect(errorPropsA, { colors, depth: 5 })
}
// Remove error static properties that should not be logged
| 7 |
diff --git a/lib/query.js b/lib/query.js @@ -2368,7 +2368,7 @@ Query.prototype.__distinct = wrapThunk(function __distinct(callback) {
});
/**
- * Declares or executes a distict() operation.
+ * Declares or executes a distinct() operation.
*
* Passing a `callback` executes the query.
*
| 1 |
diff --git a/app/containers/TokenSale/TokenSale.jsx b/app/containers/TokenSale/TokenSale.jsx @@ -4,6 +4,7 @@ import { Link } from 'react-router'
import * as Neon from 'neon-js'
import NetworkSwitch from '../NetworkSwitch'
import Logo from '../../components/Logo'
+import { ROUTES } from '../../core/constants'
type Props = {
address: string,
@@ -154,7 +155,7 @@ export default class TokenSale extends Component<Props, State> {
<button onClick={(this.participateInSale)}>Submit for Sale</button>
<button onClick={this.refreshTokenBalance}>Refresh Token Balance</button>
</div>
- <Link to='/'><button className='altButton'>Home</button></Link>
+ <Link to={ROUTES.HOME}><button className='altButton'>Home</button></Link>
</div>
)
}
| 14 |
diff --git a/app/addons/fauxton/tests/nightwatch/updatesUrlsSameRouteobject.js b/app/addons/fauxton/tests/nightwatch/updatesUrlsSameRouteobject.js @@ -27,6 +27,9 @@ module.exports = {
.assert.valueContains('.text-field-to-copy', newDatabaseName + '/_find')
.clickWhenVisible('.edit-link')
.waitForElementVisible('.prettyprint', waitTime, false)
+ // We need to wait for the previous API Url modal to disappear before
+ // attempting to view it with the new text-field-to-copy.
+ .waitForElementNotPresent('.api-bar-tray', waitTime, false)
.clickWhenVisible('.control-toggle-api-url')
.waitForElementVisible('.text-field-to-copy', waitTime, false)
.assert.valueContains('.text-field-to-copy', newDatabaseName + '/_index')
| 0 |
diff --git a/src/core/operations/ToUpperCase.mjs b/src/core/operations/ToUpperCase.mjs @@ -37,6 +37,9 @@ class ToUpperCase extends Operation {
* @returns {string}
*/
run(input, args) {
+ if (!args || args.length === 0) {
+ throw new OperationException("No capitalization scope was provided.");
+ }
const scope = args[0];
if (scope === "All") {
return input.toUpperCase();
| 0 |
diff --git a/assets/js/modules/optimize/common/InstructionInformation.test.js b/assets/js/modules/optimize/common/InstructionInformation.test.js @@ -63,9 +63,16 @@ describe( 'InstructionInformation', () => {
} );
it( 'should render with analytics active and no analytics useSnippet, also with tagmanager active and a gtm useSnippet', () => {
+ const newFixtures = fixtures.map( ( fixture ) => {
+ if ( fixture.slug !== 'tagmanager' && fixture.slug !== 'optimize' ) {
+ return fixture;
+ }
+ return { ...fixture, active: true, connected: true };
+ } );
+
const setupRegistry = ( registry ) => {
registry.dispatch( STORE_NAME ).setOptimizeID( 'OPT-1234567' );
- registry.dispatch( CORE_MODULE ).receiveGetModules( fixtures.analyticsGtmActivate );
+ registry.dispatch( CORE_MODULE ).receiveGetModules( newFixtures );
registry.dispatch( MODULES_TAGMANAGER ).setUseSnippet( true );
};
| 1 |
diff --git a/src/utils/account-with-lockup.js b/src/utils/account-with-lockup.js @@ -137,7 +137,8 @@ async function getAccountBalance(limitedAccountData = false) {
let lockupAccountId = getLockupAccountId(this.accountId)
console.log('lockupAccountId', lockupAccountId)
try {
- const lockupBalance = await new Account(this.connection, lockupAccountId).getAccountBalance();
+ const lockupAccount = new Account(this.connection, lockupAccountId)
+ const lockupBalance = await lockupAccount.getAccountBalance();
const {
lockupAmount,
releaseDuration,
@@ -150,22 +151,24 @@ async function getAccountBalance(limitedAccountData = false) {
const { transfer_poll_account_id, transfers_timestamp } = transferInformation
const transfersTimestamp = transfer_poll_account_id ? await this.viewFunction(transfer_poll_account_id, 'get_result') : transfers_timestamp
- const startTimestampBN = lockupTimestamp
- ? BN.max(new BN(lockupTimestamp), new BN(transfersTimestamp))
- : new BN(transfersTimestamp)
+
+ const hasBrokenTimestamp = (await lockupAccount.state()).code_hash === '3kVY9qcVRoW3B5498SMX6R3rtSLiCdmBzKs7zcnzDJ7Q' && lockupTimestamp !== null
+ const startTimestampBN = BN.max(
+ new BN(transfersTimestamp),
+ new BN(!hasBrokenTimestamp && (lockupTimestamp || 0))
+ )
+
const releaseDurationBN = new BN(releaseDuration || '0')
const endTimestamp = startTimestampBN.add(releaseDurationBN)
const timeLeft = BN.max(new BN(0), endTimestamp.sub(dateNowBN))
const lockupDurationBN = new BN(lockupDuration || '0')
const lockupCliff = dateNowBN.lt(startTimestampBN.add(lockupDurationBN))
- const unreleasedAmountCorrect = lockupCliff
+ const unreleasedAmount = lockupCliff
? new BN(lockupAmount)
: releaseDurationBN.eq(new BN(0))
? new BN(0)
: new BN(lockupAmount).mul(timeLeft).div(releaseDurationBN)
- const unreleasedAmountCoreContracts = new BN(await this.wrappedAccount.viewFunction(lockupAccountId, 'get_locked_amount'))
- const unreleasedAmount = BN.min(unreleasedAmountCorrect, unreleasedAmountCoreContracts)
let totalBalance = new BN(lockupBalance.total)
let stakedBalanceLockup = new BN(0)
| 9 |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -241,7 +241,7 @@ pages:
- cp -R ${CONTRIBUTE_DIR}/* ${CONTRIBUTE_DOCS}
# make relative links absolute - this could be better...
#  -> 
- - BASE_URL_FOR_LINKS=${BASE_REPO_URL}/tree/${CI_COMMIT_REF_NAME}/${CONTRIBUTE_DIR}/
+ - BASE_URL_FOR_LINKS=${CI_PROJECT_URL}/tree/${CI_COMMIT_REF_NAME}/${CONTRIBUTE_DIR}/
- README=${CONTRIBUTE_DOCS}/README.md
# make absolute URL(s) for relative URL(s) outside current directory '../'
- sed -i -E 's/\[.*\]\(\.\./&SED_TEMP/' ${README} && sed -i "s|..SED_TEMP|${BASE_URL_FOR_LINKS}..|" ${README}
| 4 |
diff --git a/examples/js/cli.js b/examples/js/cli.js @@ -65,19 +65,7 @@ let globalKeysFile = fs.existsSync (keysGlobal) ? keysGlobal : false
let localKeysFile = fs.existsSync (keysLocal) ? keysLocal : globalKeysFile
let settings = localKeysFile ? (require (localKeysFile)[exchangeId] || {}) : {}
-// check auth keys in env var if not in keys file
-const keyID = 'apiKey';
-if (settings[keyID] === undefined) {
- const apiKeyVar = (exchangeId + '_' + keyID).toUpperCase() // example: KRAKEN_APIKEY
- const apiKey = process.env[apiKeyVar]
- settings[keyID] = apiKey
-}
-const secretID = 'secret';
-if (settings[secretID] === undefined) {
- const apiSecretVar = (exchangeId + '_' + secretID).toUpperCase() // example: KRAKEN_SECRET
- const secret = process.env[apiSecretVar]
- settings[secretID] = secret
-}
+
//-----------------------------------------------------------------------------
@@ -101,6 +89,18 @@ try {
... settings,
})
+ // check auth keys in env var
+ const requiredCredentials = exchange.requiredCredentials;
+ for( const [credential, isRequired] of Object.entries(requiredCredentials) ) {
+ if (isRequired && exchange[credential] === undefined) {
+ const credentialEnvName = (exchangeId + '_' + credential).toUpperCase() // example: KRAKEN_APIKEY
+ const credentialValue = process.env[credentialEnvName]
+ if (credentialValue) {
+ exchange[credential] = credentialValue
+ }
+ }
+ }
+
if (testnet) {
exchange.setSandboxMode (true)
}
| 7 |
diff --git a/packages/app/test/cypress/integration/30-search/search.spec.ts b/packages/app/test/cypress/integration/30-search/search.spec.ts @@ -105,10 +105,10 @@ context('Search all pages', () => {
cy.get('#wiki').should('be.visible');
// force to add 'active' to pass VRT: https://github.com/weseek/growi/pull/6603
cy.getByTestid('page-list-item-L').first().invoke('addClass', 'active');
- // eslint-disable-next-line cypress/no-unnecessary-waiting
- cy.wait(1500);
// for avoid mismatch by auto scrolling
cy.get('.search-result-content-body-container').scrollTo('top');
+ // eslint-disable-next-line cypress/no-unnecessary-waiting
+ cy.wait(1500);
cy.screenshot(`${ssPrefix}3-search-page-results`, { capture: 'viewport'});
cy.getByTestid('open-page-item-control-btn').eq(1).click();
| 14 |
diff --git a/gulpfile.cjs b/gulpfile.cjs @@ -67,6 +67,17 @@ if (!concurrency) {
concurrency = os.cpus().length;
}
+// Work-around until all third party libraries use npm
+const filesToLeaveInThirdParty = [
+ "!Source/ThirdParty/Workers/*",
+ "!Source/ThirdParty/*.wasm",
+ "!Source/ThirdParty/google-earth-dbroot-parser.js",
+ "!Source/ThirdParty/knockout*.js",
+ "!Source/ThirdParty/measureText.js",
+ "!Source/ThirdParty/protobuf-minimal.js",
+ "!Source/ThirdParty/Uri.js",
+];
+
const sourceFiles = [
"Source/**/*.js",
"!Source/*.js",
@@ -75,6 +86,24 @@ const sourceFiles = [
"Source/WorkersES6/createTaskProcessorWorker.js",
"!Source/ThirdParty/Workers/**",
"!Source/ThirdParty/google-earth-dbroot-parser.js",
+ "!Source/ThirdParty/_commonjsHelpers*",
+ "!Source/ThirdParty/Autolinker.js",
+ "!Source/ThirdParty/bitmap-sdf.js",
+ "!Source/ThirdParty/dompurify.js",
+ "!Source/ThirdParty/earcut.js",
+ "!Source/ThirdParty/grapheme-splitter.js",
+ "!Source/ThirdParty/jsep.js",
+ "!Source/ThirdParty/kdbush.js",
+ "!Source/ThirdParty/ktx-parse.js",
+ "!Source/ThirdParty/lerc.js",
+ "!Source/ThirdParty/mersenne-twister.js",
+ "!Source/ThirdParty/nosleep.js",
+ "!Source/ThirdParty/pako.js",
+ "!Source/ThirdParty/rbush.js",
+ "!Source/ThirdParty/topojson.js",
+ "!Source/ThirdParty/Tween.js",
+ "!Source/ThirdParty/when.js",
+ "!Source/ThirdParty/zip.js",
];
const watchedFiles = [
@@ -122,17 +151,6 @@ const filesToConvertES6 = [
"!Specs/TestWorkers/**",
];
-// Work-around until all third party libraries use npm
-const filesToLeaveInThirdParty = [
- "!Source/ThirdParty/Workers/*",
- "!Source/ThirdParty/*.wasm",
- "!Source/ThirdParty/google-earth-dbroot-parser.js",
- "!Source/ThirdParty/knockout*.js",
- "!Source/ThirdParty/measureText.js",
- "!Source/ThirdParty/protobuf-minimal.js",
- "!Source/ThirdParty/Uri.js",
-];
-
function rollupWarning(message) {
// Ignore eval warnings in third-party code we don't have control over
if (
| 8 |
diff --git a/packages/saltcorn-data/models/view.js b/packages/saltcorn-data/models/view.js @@ -206,7 +206,7 @@ class View {
}
throw new Error(
- `runMany on view ${this.name}: viewtemplate does not have renderRows or runMany methods`
+ `runMany on view ${this.name}: viewtemplate ${this.viewtemplate} does not have renderRows or runMany methods`
);
}
async runPost(query, body, extraArgs) {
| 7 |
diff --git a/app/assets/stylesheets/assignments.scss b/app/assets/stylesheets/assignments.scss @@ -187,4 +187,19 @@ a:not([href]):not([tabindex]) {
.assignments-description img {
max-width: 100%;
}
+
+.primary-checkpoint {
+ background-color: $white;
+ border: 1px solid $secondary-green;
+ cursor: pointer;
+ padding-left: 4px;
+ padding-top: 4px;
+ text-align: center;
+
+ &:hover {
+ border-color: $primary-green;
+ opacity: 1;
+ transition: .2s ease-in-out;
+ }
+}
//assignment details ends
| 1 |
diff --git a/src/components/dashboard/utils/routeAndPathForCode.js b/src/components/dashboard/utils/routeAndPathForCode.js @@ -40,7 +40,7 @@ export const routeAndPathForCode = async (
}
const lcAddress = (address || '').toLowerCase()
- const { _address: lcUBIAddress } = goodWallet.UBIContract
+ const lcUBIAddress = goodWallet.UBIContract._address.toLowerCase()
const profile = (await userStorage.getPublicProfile(address)) || {}
const counterPartyDisplayName =
lcAddress === lcUBIAddress ? 'GoodDollar UBI' : profile?.fullName || goodWallet.getContractName(address)
| 0 |
diff --git a/spark/components/masthead/react/SprkMastheadAccordion.js b/spark/components/masthead/react/SprkMastheadAccordion.js @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { uniqueId } from 'lodash';
-import SprkMastheadAccordionItem from '../SprkMastheadAccordionItem/SprkMastheadAccordionItem';
+import SprkMastheadAccordionItem from './SprkMastheadAccordionItem';
class SprkMastheadAccordion extends React.Component {
constructor(props) {
| 3 |
diff --git a/bin/definition-validators/media-type.js b/bin/definition-validators/media-type.js * limitations under the License.
**/
'use strict';
-const EncodingEnforcer = require('../enforcers/encoding');
const MediaTypeEnforcer = require('../enforcers/media-type');
const rxContentTypeMime = /(?:^multipart\/)|(?:^application\/x-www-form-urlencoded$)/;
@@ -33,7 +32,6 @@ function MediaTypeObject() {
type: 'object',
properties: {
encoding: {
- component: EncodingEnforcer,
type: 'object',
allowed: ({ key, parent }) => {
if (!rxContentTypeMime.test(parent.key)) {
| 2 |
diff --git a/Changelog.md b/Changelog.md ### v5.0.0
-- Upgrade to latest `sqlite` & `mysql` package versions
-- Upgrade to `pg` 7.x. ORM will not work with `pg` < 7
-- Drop support for nodejs < 4 (required due to `pg` upgrade)
+- Update dependencies ([#830](../../pull/830))
+ - You need to upgrade `pg` in your project to version 7.x. Older versions are no longer supported.
+ - Postgres driver now has an error handler. You will need to add an error listener the the ORM instance returned by `connect` function, otherwise any errors will crash your application as per the [EventEmitter documentation](https://nodejs.org/api/events.html#events_error_events). This makes the Postgres driver consistent with other drivers supported by ORM (those however have reconnecting functionality, which prevents the error from surfacing). Due to the lack of reconnecting functionality, you should set `connection.reconnect` to `false` to avoid connection errors.
+ - Drop support for nodejs < 4 (required due to `pg` v 7 upgrade)
### v4.0.2
- Fix timezone bug in sqlite ([822](../../pull/822)]
| 7 |
diff --git a/bin/near b/bin/near @@ -7,5 +7,11 @@ require('v8flags')((e, flags) => {
flaggedRespawn(
flags.concat(['--experimental_repl_await']),
process.argv.indexOf('repl') == -1 ? process.argv : process.argv.concat(['--experimental-repl-await']),
- ready => ready && require('./near-cli.js'));
+ ready => {
+ if (ready) {
+ // Need to filter out '--no-respawning' to avoid yargs complaining about it
+ process.argv = process.argv.filter(arg => arg != '--no-respawning');
+ require('./near-cli.js');
+ }
+ });
})
| 1 |
diff --git a/packages/imba/src/compiler/grammar.imba1 b/packages/imba/src/compiler/grammar.imba1 @@ -413,7 +413,7 @@ var grammar =
]
StyleDeclaration: [
- o 'StyleProperty : StyleExpressions' do StyleDeclaration.new(A1,A3)
+ o 'StyleProperty : StyleExpressions' do StyleDeclaration.new(A1,A3.set(parens: no))
]
StyleProperty: [
| 11 |
diff --git a/examples/viper/about.php b/examples/viper/about.php @@ -10,19 +10,10 @@ include 'config.php';
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link type="text/css" rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
- <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css">
<script src="https://code.jquery.com/jquery-2.1.4.min.js" integrity="sha256-8WqyJLuWKRBVhxXIL1jBDD7SDxU936oZkCnxQbWwJVw=" crossorigin="anonymous"></script>
- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js" integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU=" crossorigin="anonymous"></script>
- <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css">
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/js/bootstrap-multiselect.min.js"></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script>
- <script type="text/javascript" src="pagination.min.js"></script>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" >
<link type="text/css" rel="stylesheet" href="options.css">
- <link type="text/css" rel="stylesheet" href="spinner.css">
- <link type="text/css" rel="stylesheet" href="pagination.css">
<link type="text/css" rel="stylesheet" href="openaire.css">
</head>
| 2 |
diff --git a/packages/app/src/components/SubscribeButton.tsx b/packages/app/src/components/SubscribeButton.tsx @@ -16,7 +16,7 @@ type Props = {
const SubscruibeButton: FC<Props> = (props: Props) => {
const { t } = useTranslation();
- const [isWatching, setIsWatching] = useState(true);
+ const [isWatching, setIsWatching] = useState(false);
const { appContainer, pageContainer } = props;
const handleClick = async() => {
| 12 |
diff --git a/edit.js b/edit.js @@ -15,6 +15,7 @@ import {makeTextMesh} from './vr-ui.js';
import {makeLineMesh, makeTeleportMesh} from './teleport.js';
import perlin from './perlin.js';
import alea from './alea.js';
+import easing from './easing.js';
const rng = alea('lol');
perlin.seed(rng());
@@ -46,6 +47,8 @@ const localEuler = new THREE.Euler();
const localMatrix = new THREE.Matrix4();
const localMatrix2 = new THREE.Matrix4();
+const cubicBezier = easing(0, 1, 0, 1);
+
const HEIGHTFIELD_SHADER = {
uniforms: {
/* fogColor: {
@@ -1957,20 +1960,28 @@ function animate(timestamp, frame) {
object.pickUp = () => {
if (!animation) {
skirtMesh.visible = false;
- // matMeshClone.position.y = 0;
const now = Date.now();
const startTime = now;
const endTime = startTime + 1000;
- const startPosition = object.position.clone()
- // .applyMatrix4(localMatrix2.getInverse(worldContainer.matrix));
+ const startPosition = object.position.clone();
animation = {
update(posePosition) {
const now = Date.now();
const factor = Math.min((now - startTime) / (endTime - startTime), 1);
+ if (factor < 0.5) {
+ const localFactor = factor/0.5;
object.position.copy(startPosition)
- .lerp(posePosition, factor);
+ .lerp(posePosition, cubicBezier(localFactor));
+ } else if (factor < 1) {
+ const localFactor = (factor-0.5)/0.5;
+ object.position.copy(posePosition);
+ } else {
+ worldContainer.remove(object);
+ itemMeshes.splice(itemMeshes.indexOf(object), 1);
+ animation = null;
+ }
},
};
}
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -55103,8 +55103,10 @@ var $$IMU_EXPORT$$;
if (domain === "img.lap.recochoku.jp") {
// thanks to fireattack on github: https://github.com/qsniyg/maxurl/issues/276
// https://img.lap.recochoku.jp/imgicb?p=/common/store/img.gif
+ // https://img.lap.recochoku.jp/imgicb?p=/common/store/boxa2_b.gif
+ // https://img.lap.recochoku.jp/imgicb?p=/common/store_sp/b.png
newsrc = decodeURIComponent(src);
- if (/common\/+store\/+img\.gif/.test(src))
+ if (/common\/+store(?:_[^/]+)?\/+[^/]+\.(?:gif|png)(?:[?#].*)?$/.test(src))
return {
url: src,
bad: "mask"
| 7 |
diff --git a/protocols/swap/contracts/Swap.sol b/protocols/swap/contracts/Swap.sol pragma solidity 0.5.10;
pragma experimental ABIEncoderV2;
-import "@airswap/types/contracts/Types.sol";
import "@airswap/swap/interfaces/ISwap.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
import "openzeppelin-solidity/contracts/token/ERC721/IERC721.sol";
@@ -227,17 +226,20 @@ contract Swap is ISwap {
external
{
- // Ensure the order has not already been taken or canceled.
- require(makerOrderStatus[_makerWallet][_nonce] == OPEN,
- "ORDER_UNAVAILABLE");
-
// Ensure the order is not expired.
require(_expiry > block.timestamp,
"ORDER_EXPIRED");
+ // Ensure the order has not already been taken or canceled.
+ require(makerOrderStatus[_makerWallet][_nonce] == OPEN,
+ "ORDER_UNAVAILABLE");
+
require(_nonce >= makerMinimumNonce[_makerWallet],
"NONCE_TOO_LOW");
+ // Mark the order TAKEN (0x01).
+ makerOrderStatus[_makerWallet][_nonce] = TAKEN;
+
// Validate the taker side of the trade.
address finalTakerWallet;
@@ -288,9 +290,6 @@ contract Swap is ISwap {
)), _v, _r, _s), "SIGNATURE_INVALID");
}
- // Mark the order TAKEN (0x01).
- makerOrderStatus[_makerWallet][_nonce] = TAKEN;
-
// Transfer token from taker to maker.
transferToken(
finalTakerWallet,
| 2 |
diff --git a/src/web/store/index.js b/src/web/store/index.js @@ -151,7 +151,7 @@ const migrateStore = () => {
// Removed "widgets.axes.mzero"
// Removed "widgets.axes.jog.customDistance"
// Removed "widgets.axes.jog.selectedDistance"
- if (semver.lte(cnc.version, '1.9.13')) {
+ if (semver.lt(cnc.version, '1.9.13')) {
// Axes widget
store.unset('widgets.axes.wzero');
store.unset('widgets.axes.mzero');
| 1 |
diff --git a/vis/js/dataschemes/defaultScheme.js b/vis/js/dataschemes/defaultScheme.js @@ -114,7 +114,6 @@ const DEFAULT_SCHEME = [
},
{ name: "readers", fallback: (loc) => loc.default_readers },
{ name: "tags", type: ["string"], fallback: () => "" },
- { name: "bkl_caption", type: ["string"], fallback: (loc) => loc.no_keywords },
{ name: "doi", type: ["string"] },
{
name: "x",
| 2 |
diff --git a/token-metadata/0xf7B098298f7C69Fc14610bf71d5e02c60792894C/metadata.json b/token-metadata/0xf7B098298f7C69Fc14610bf71d5e02c60792894C/metadata.json "symbol": "GUP",
"address": "0xf7B098298f7C69Fc14610bf71d5e02c60792894C",
"decimals": 3,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/client/js/components/Admin/Export/ExportTableMenu.jsx b/src/client/js/components/Admin/Export/ExportTableMenu.jsx @@ -24,7 +24,7 @@ class ExportTableMenu extends React.Component {
</a>
</li>
<li>
- <a type="button" onClick={() => this.props.onZipFileStatRemove(this.props.fileName)}>
+ <a type="button" href="#" onClick={() => this.props.onZipFileStatRemove(this.props.fileName)}>
<span className="text-danger"><i className="icon-trash" /> {t('export_management.delete')}</span>
</a>
</li>
| 12 |
diff --git a/src/os/ui/window.js b/src/os/ui/window.js @@ -257,7 +257,7 @@ os.ui.window.disableModality = function(id) {
*/
os.ui.window.close = function(el) {
if (el) {
- var scope = el.hasClass(os.ui.windowSelector.WINDOW) ?
+ var scope = el.is(os.ui.windowSelector.WINDOW) ?
el.children().scope() : el.parents(os.ui.windowSelector.WINDOW).children().scope();
if (scope) {
/** @type {os.ui.WindowCtrl} */ (scope['windowCtrl']).close();
| 1 |
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js @@ -101,10 +101,6 @@ if(allMock || argv.filter) {
}
var FLAKY_LIST = [
- 'gl2d_parcoords_blocks',
- 'gl3d_directions-streamtube1',
- 'gl3d_traces-with-opacity',
- 'trace_metatext',
'treemap_coffee',
'treemap_textposition',
'treemap_sunburst_marker_colors',
| 3 |
diff --git a/src/components/viewscreens/PlanetaryScan/index.js b/src/components/viewscreens/PlanetaryScan/index.js @@ -16,7 +16,6 @@ class RenderSphere extends Component {
});
};
render() {
- //const cameraPosition = new THREE.Vector3(0, 2, 4);
const { text } = this.props;
const { dimensions } = this.state;
return (
@@ -37,59 +36,6 @@ class RenderSphere extends Component {
)}
</Measure>
<div className="text-box">{text}</div>
- {/*<React3
- alpha
- mainCamera="camera"
- width={window.innerHeight}
- height={window.innerHeight}
- onAnimate={this._onAnimate}
- >
- <scene>
- <perspectiveCamera
- name="camera"
- fov={45}
- aspect={1}
- near={0.1}
- far={1000}
- lookAt={new THREE.Vector3(0, 0, 0)}
- position={cameraPosition}
- />
- <directionalLight
- color={0xffffff}
- intensity={1}
- lookAt={new THREE.Vector3(0, 0, 0)}
- position={new THREE.Vector3(0, 0, 1)}
- />
- <directionalLight
- color={0xffffff}
- intensity={1}
- lookAt={new THREE.Vector3(0, 0, 0)}
- position={new THREE.Vector3(0, 0, -1)}
- />
- {src &&
- <mesh rotation={new THREE.Euler(0, this.state.rotation, 0)}>
- <sphereGeometry
- radius={1}
- widthSegments={32}
- heightSegments={32}
- />
- <meshPhongMaterial shininess={0} wireframe={wireframe}>
- {!wireframe && <texture url={src} />}
- </meshPhongMaterial>
- </mesh>}
- {clouds &&
- <mesh rotation={new THREE.Euler(0, this.state.rotation / 5, 0)}>
- <sphereGeometry
- radius={1.05}
- widthSegments={16}
- heightSegments={16}
- />
- <meshPhongMaterial transparent={true}>
- <texture url={clouds} />
- </meshPhongMaterial>
- </mesh>}
- </scene>
- </React3>*/}
</div>
);
}
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.