code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/jiff-client.js b/lib/jiff-client.js if (!self.jiff.helpers.array_equals(self.holders, o.holders)) {
throw new Error('shares must be held by the same parties (|)');
}
+ if (op_id == null) {
+ op_id = self.jiff.counters.gen_op_id('sor_bit', self.holders);
+ }
return self.isadd(o).issub(self.ismult(o, op_id + ':smult1'));
};
| 9 |
diff --git a/src/drawNode.js b/src/drawNode.js @@ -115,6 +115,7 @@ function _updateNode(node, x, y, width, height, shape, nodeId, attributes, optio
var subParent = node;
}
var svgElements = subParent.selectAll('ellipse,polygon,path,polyline');
+ var text = node.selectWithoutDataPropagation("text");
node
.attr("id", id);
@@ -146,8 +147,7 @@ function _updateNode(node, x, y, width, height, shape, nodeId, attributes, optio
}
});
- if (shape != 'point') {
- var text = subParent.selectWithoutDataPropagation('text');
+ if (text.size() != 0) {
text
.attr("text-anchor", textAnchor)
| 9 |
diff --git a/client/GameComponents/PlayerPlots.jsx b/client/GameComponents/PlayerPlots.jsx @@ -13,6 +13,7 @@ class PlayerPlots extends React.Component {
<CardPile
cards={ this.props.schemePlots }
className='plot'
+ hiddenTopCard
disablePopup={ !this.props.isMe }
onCardClick={ this.props.onCardClick }
onDragDrop={ this.props.onDragDrop }
@@ -46,7 +47,7 @@ class PlayerPlots extends React.Component {
cards={ this.props.plotDeck }
className={ this.props.plotSelected ? 'plot plot-selected' : 'plot' }
closeOnClick={ this.props.isMe }
- disableMouseOver={ !this.props.isMe }
+ hiddenTopCard
disablePopup={ !this.props.isMe }
onCardClick={ this.props.onCardClick }
onDragDrop={ this.props.onDragDrop }
| 4 |
diff --git a/lib/fileParser.js b/lib/fileParser.js @@ -89,7 +89,13 @@ function parseSourceFile(srcFile, zoomLevels, zoomLvlIndex, cleanupList) {
}
}
}
+ try {
return qidx.xyToIndex(assertInt(parts[1], lineInd), assertInt(parts[2], lineInd), zoom) + '\n';
+ } catch (err) {
+ // Log and ignore xyToIndex error when a tile is out-of-bounds in file
+ core.log('warn', err.message);
+ return undefined;
+ }
}))
.on('error', reject)
.pipe(fs.createWriteStream(outputFile))
| 8 |
diff --git a/src/article/JATS4R.rng b/src/article/JATS4R.rng <ref name="fig-attlist"/>
<!-- We allow only one object-id[pub-id-type=doi] -->
<optional><ref name="object-id"/></optional>
+ <optional>
+ <ref name="label"/>
+ </optional>
<optional>
<ref name="caption"/>
</optional>
- <!-- used to carry source code for reproducible figures -->
+ <!-- Only used to carry source code for reproducible figures -->
<optional>
<ref name="alternatives"/>
</optional>
<define name="media">
<element name="media">
<ref name="media-attlist"/>
- <interleave>
- <zeroOrMore><ref name="id.class"/></zeroOrMore>
- <optional><ref name="label.class"/></optional>
- <optional><ref name="caption.class"/></optional>
- </interleave>
+ <optional><ref name="object-id"/></optional>
+ <optional>
+ <ref name="label"/>
+ </optional>
+ <optional>
+ <ref name="caption"/>
+ </optional>
</element>
</define>
<ref name="table-wrap-attlist"/>
<!-- We allow only one object-id[pub-id-type=doi] -->
<optional><ref name="object-id"/></optional>
+ <optional>
+ <ref name="label"/>
+ </optional>
<optional>
<ref name="caption"/>
</optional>
| 7 |
diff --git a/api/services/SnapshotsService.js b/api/services/SnapshotsService.js @@ -50,6 +50,7 @@ module.exports = {
// Gather entities
for(let entity in entities) {
const result = await KongService.fetch(`/${entity}`, req);
+ if(result) {
entities[entity] = result.data;
// For each upstream, fetch it's targets
@@ -61,6 +62,8 @@ module.exports = {
}
}
+ }
+
// Gather consumer credentials
for(let credential in consumersCredentials) {
const result = await KongService.fetch(`/${credential}`, req);
| 1 |
diff --git a/services/datasources/lib/datasources/url/bigquery.rb b/services/datasources/lib/datasources/url/bigquery.rb @@ -12,6 +12,10 @@ module CartoDB
# Required for all providers
DATASOURCE_NAME = 'bigquery'
+ MAX_PROJECTS = 500000
+ MAX_DATASETS = 500000
+ MAX_TABLES = 500000
+
# Constructor (hidden)
# @param config
# [
@@ -215,13 +219,13 @@ module CartoDB
end
def list_projects
- projects = @bigquery_api.list_projects.projects
+ projects = @bigquery_api.list_projects(max_results: MAX_PROJECTS).projects
return [] unless projects
projects.map { |p| { id: p.id, friendly_name: p.friendly_name } }
end
def list_datasets(project_id)
- datasets = @bigquery_api.list_datasets(project_id).datasets
+ datasets = @bigquery_api.list_datasets(project_id, max_results: MAX_DATASETS).datasets
if datasets
datasets.map { |d|
qualified_name = d.id.gsub(':', '.') # "#{project_id}.#{d.dataset_reference.dataset_id}"
@@ -233,7 +237,7 @@ module CartoDB
end
def list_tables(project_id, dataset_id)
- tables = @bigquery_api.list_tables(project_id, dataset_id).tables
+ tables = @bigquery_api.list_tables(project_id, dataset_id, max_results: MAX_DATASETS).tables
if tables
tables.map { |t|
qualified_name = t.id.gsub(':', '.') # "#{project_id}.#{dataset_id}.#{t.table_reference.table_id}"
| 12 |
diff --git a/src/components/send/SendContainerWrapper.js b/src/components/send/SendContainerWrapper.js @@ -7,7 +7,8 @@ import { clearLocalAlert, showCustomAlert } from '../../actions/status';
import { handleGetTokens } from '../../actions/tokens';
import { useFungibleTokensIncludingNEAR } from '../../hooks/fungibleTokensIncludingNEAR';
import { Mixpanel } from '../../mixpanel/index';
-import { EXPLORER_URL, SHOW_NETWORK_BANNER, wallet, WALLET_APP_MIN_AMOUNT } from '../../utils/wallet';
+import { fungibleTokensService } from '../../services/FungibleTokens';
+import { EXPLORER_URL, SHOW_NETWORK_BANNER, WALLET_APP_MIN_AMOUNT } from '../../utils/wallet';
import SendContainerV2, { VIEWS } from './SendContainerV2';
const { parseNearAmount, formatNearAmount } = utils.format;
@@ -61,7 +62,8 @@ export function SendContainerWrapper({ match }) {
await Mixpanel.withTracking("SEND token",
async () => {
- const result = await wallet.fungibleTokens.transfer({
+ const result = await fungibleTokensService.transfer({
+ accountId,
amount: rawAmount,
receiverId,
contractName
@@ -87,18 +89,20 @@ export function SendContainerWrapper({ match }) {
);
}}
handleContinueToReview={async ({ token, receiverId, rawAmount }) => {
- // We can't estimate fees until we know which token is being sent, and to whom
try {
if (token.symbol === 'NEAR') {
const [totalFees, totalNear] = await Promise.all([
- wallet.fungibleTokens.getEstimatedTotalFees(),
- wallet.fungibleTokens.getEstimatedTotalNearAmount(rawAmount)
+ fungibleTokensService.getEstimatedTotalFees(),
+ fungibleTokensService.getEstimatedTotalNearAmount({ amount: rawAmount })
]);
setEstimatedTotalFees(totalFees);
setEstimatedTotalInNear(totalNear);
} else {
- const totalFees = await wallet.fungibleTokens.getEstimatedTotalFees(token.contractName, receiverId);
+ const totalFees = await fungibleTokensService.getEstimatedTotalFees({
+ accountId: receiverId,
+ contractName: token.contractName,
+ });
setEstimatedTotalFees(totalFees);
}
| 14 |
diff --git a/src/js/components/InfiniteScroll/InfiniteScroll.js b/src/js/components/InfiniteScroll/InfiniteScroll.js @@ -139,7 +139,8 @@ const InfiniteScroll = ({
if (
onMore &&
renderPageBounds[1] === lastPage &&
- items.length >= pendingLength
+ items.length >= pendingLength &&
+ items.length > 0
) {
// remember we've asked for more, so we don't keep asking if it takes
// a while
| 1 |
diff --git a/src/components/TargetTabs.js b/src/components/TargetTabs.js @@ -14,7 +14,7 @@ import AssociatedDiseasesTab from './AssociatedDiseasesTab';
class TargetTabs extends Component {
state = {
- value: 0,
+ value: 'overview',
};
handleChange = (event, value) => {
@@ -31,25 +31,25 @@ class TargetTabs extends Component {
scrollable
scrollButtons="auto"
>
- <Tab label="Overview" />
- <Tab label="Proptein data" />
- <Tab label="Drug & compound data" />
- <Tab label="Pathways & interaction data" />
- <Tab label="Genomic context data" />
- <Tab label="Mouse model data" />
- <Tab label="Cancer data" />
- <Tab label="Bibliography" />
- <Tab label="Associated diseases" />
+ <Tab value="overview" label="Overview" />
+ <Tab value="protein" label="Protein data" />
+ <Tab value="drug" label="Drug & compound data" />
+ <Tab value="pathways" label="Pathways & interaction data" />
+ <Tab value="genomics" label="Genomic context data" />
+ <Tab value="mouse" label="Mouse model data" />
+ <Tab value="cancer" label="Cancer data" />
+ <Tab value="bibliography" label="Bibliography" />
+ <Tab value="associated" label="Associated diseases" />
</Tabs>
- {value === 0 && <OverviewTab />}
- {value === 1 && <ProteinTab />}
- {value === 2 && <DrugAndCompoundTab />}
- {value === 3 && <PathwaysTab />}
- {value === 4 && <GenomicsTab />}
- {value === 5 && <MouseTab />}
- {value === 6 && <CancerTab />}
- {value === 7 && <BibliographyTab />}
- {value === 8 && <AssociatedDiseasesTab />}
+ {value === 'overview' && <OverviewTab />}
+ {value === 'protein' && <ProteinTab />}
+ {value === 'drug' && <DrugAndCompoundTab />}
+ {value === 'pathways' && <PathwaysTab />}
+ {value === 'genomics' && <GenomicsTab />}
+ {value === 'mouse' && <MouseTab />}
+ {value === 'cancer' && <CancerTab />}
+ {value === 'bibliography' && <BibliographyTab />}
+ {value === 'associated' && <AssociatedDiseasesTab />}
</Fragment>
);
}
| 4 |
diff --git a/test/unit/features/instance/properties.spec.js b/test/unit/features/instance/properties.spec.js @@ -80,20 +80,49 @@ describe('Instance properties', () => {
expect(calls).toEqual(['outer:undefined', 'middle:outer', 'inner:middle', 'next:undefined'])
})
- it('$props', () => {
- var Comp = Vue.extend({
+ it('$props', done => {
+ const Comp = Vue.extend({
props: ['msg'],
- template: '<div>{{ msg }}</div>'
+ template: '<div>{{ msg }} {{ $props.msg }}</div>'
})
- var vm = new Comp({
+ const vm = new Comp({
propsData: {
msg: 'foo'
}
- })
+ }).$mount()
+ // check render
+ expect(vm.$el.textContent).toContain('foo foo')
+ // warn set
+ vm.$props = {}
+ expect('$props is readonly').toHaveBeenWarned()
// check existence
expect(vm.$props.msg).toBe('foo')
// check change
- Vue.set(vm, 'msg', 'bar')
+ vm.msg = 'bar'
expect(vm.$props.msg).toBe('bar')
+ waitForUpdate(() => {
+ expect(vm.$el.textContent).toContain('bar bar')
+ }).then(() => {
+ vm.$props.msg = 'baz'
+ expect(vm.msg).toBe('baz')
+ }).then(() => {
+ expect(vm.$el.textContent).toContain('baz baz')
+ }).then(done)
+ })
+
+ it('warn mutating $props', () => {
+ const Comp = {
+ props: ['msg'],
+ render () {},
+ mounted () {
+ expect(this.$props.msg).toBe('foo')
+ this.$props.msg = 'bar'
+ }
+ }
+ new Vue({
+ template: `<comp ref="comp" msg="foo" />`,
+ components: { Comp }
+ }).$mount()
+ expect(`Avoid mutating a prop`).toHaveBeenWarned()
})
})
| 7 |
diff --git a/examples/linkedcat/search.js b/examples/linkedcat/search.js @@ -98,6 +98,7 @@ var addAutoComplete = function() {
author_count = item.data('count');
author_living_dates = item.data('living_dates');
author_image_link = item.data('image_link');
+ $("#searchform").validate().element('input[name=q]');
}
});
}
| 2 |
diff --git a/node/lib/util/submodule_util.js b/node/lib/util/submodule_util.js @@ -564,7 +564,7 @@ exports.getSubmodulesInPath = function (dir, indexSubNames) {
const isParentDir = (short, long) => {
return long.startsWith(short) && (
short[short.length-1] === "/" ||
- long.replace(short, "")[0] === "/"
+ long[short.length] === "/"
);
};
const result = [];
| 7 |
diff --git a/src/display/font_loader.js b/src/display/font_loader.js @@ -75,10 +75,7 @@ class BaseFontLoader {
warn(`Failed to load font "${nativeFontFace.family}": ${reason}`);
});
};
- // Firefox Font Loading API does not work with mozPrintCallback --
- // disabling it in this case.
- const isFontLoadingAPISupported = this.isFontLoadingAPISupported &&
- !this.isSyncFontLoadingSupported;
+
for (const font of fonts) {
// Add the font to the DOM only once; skip if the font is already loaded.
if (font.attached || font.missingFile) {
@@ -86,7 +83,7 @@ class BaseFontLoader {
}
font.attached = true;
- if (isFontLoadingAPISupported) {
+ if (this.isFontLoadingAPISupported) {
const nativeFontFace = font.createNativeFontFace();
if (nativeFontFace) {
this.addNativeFontFace(nativeFontFace);
@@ -103,7 +100,7 @@ class BaseFontLoader {
}
const request = this._queueLoadingCallback(callback);
- if (isFontLoadingAPISupported) {
+ if (this.isFontLoadingAPISupported) {
Promise.all(fontLoadPromises).then(request.complete);
} else if (rules.length > 0 && !this.isSyncFontLoadingSupported) {
this._prepareFontLoadEvent(rules, fontsToLoad, request);
@@ -176,6 +173,16 @@ FontLoader = class GenericFontLoader extends BaseFontLoader {
get isFontLoadingAPISupported() {
let supported = (typeof document !== 'undefined' && !!document.fonts);
+
+ if ((typeof PDFJSDev === 'undefined' || !PDFJSDev.test('CHROME')) &&
+ (supported && typeof navigator !== 'undefined')) {
+ // The Firefox Font Loading API does not work with `mozPrintCallback`
+ // prior to version 63; see https://bugzilla.mozilla.org/show_bug.cgi?id=1473742
+ const m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(navigator.userAgent);
+ if (m && m[1] < 63) {
+ supported = false;
+ }
+ }
return shadow(this, 'isFontLoadingAPISupported', supported);
}
| 4 |
diff --git a/test/www/jxcore/bv_tests/testHttp.js b/test/www/jxcore/bv_tests/testHttp.js @@ -231,10 +231,10 @@ test('Multiple coordinated request ios native',
global.NETWORK_TYPE === ThaliMobile.networkTypes.WIFI;
},
function (t) {
- var str = 'dummy str';
- var firstReply = str.repeat(2000);
- var secondReply = str.repeat(30);
- var thirdReply = str.repeat(3000);
+ var char = 'a';
+ var firstReply = char.repeat(2000);
+ var secondReply = char.repeat(30);
+ var thirdReply = char.repeat(3000);
var reply;
var total = t.participants.length - 1;
var peerFinder = new PeerFinder();
| 14 |
diff --git a/RedactedScreenshots.user.js b/RedactedScreenshots.user.js // @description Masks and hides user-identifing info
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.5.1
+// @version 1.5.2
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
'use strict';
- const ipRegex = /(?<=(?:\b|"|'))(\d{1,3})(\.\d{1,3}){3}(?=(?:\b|"|'))/g;
- const emailRegex = /(?<=(?:\b|"|'))([^@\s]{1,3})([^@\s]+)@(\S+)\.([a-z]+)(?=(?:\b|"|'))/gi;
+ const ipRegex = /(\d{1,3})(\.\d{1,3}){3}(?=(?:\b|"|'))/g;
+ const emailRegex = /([^@\s]{1,3})([^@\s]+)@(\S+)\.([a-z]+)(?=(?:\b|"|'))/gi;
function redactPii(i, elem) {
| 2 |
diff --git a/tests/units/geojson.ts b/tests/units/geojson.ts import { poiToGeoJSON, poisToGeoJSON } from '../../src/libs/geojson';
import IdunnPOI from '../../src/adapters/poi/idunn_poi';
-const mockPoi1 = require('../__data__/poi.json');
-const mockPoi2 = require('../__data__/poi2.json');
+import mockPoi1 from '../__data__/poi.json';
+import mockPoi2 from '../__data__/poi2.json';
describe('geojson', () => {
describe('poiToGeoJSON', () => {
- it('Converts an Idunn POI to a GeoJSON Feature with a Point geometry', () => {
+ it('converts an Idunn POI to a GeoJSON Feature with a Point geometry', () => {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
const poi = new IdunnPOI(mockPoi1);
const geojson = poiToGeoJSON(poi);
expect(geojson).toMatchObject({
@@ -21,7 +23,9 @@ describe('geojson', () => {
});
});
- it('Keeps or transform some POI properties as Feature properties', () => {
+ it('keeps or transform some POI properties as Feature properties', () => {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
const poi = new IdunnPOI(mockPoi1);
const geojson = poiToGeoJSON(poi);
expect(geojson.properties).toMatchObject({
@@ -33,7 +37,9 @@ describe('geojson', () => {
});
describe('poisToGeoJSON', () => {
- it('Converts an array of Idunn POIs to a GeoJSON FeatureCollection of Point features', () => {
+ it('converts an array of Idunn POIs to a GeoJSON FeatureCollection of Point features', () => {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
const pois = [new IdunnPOI(mockPoi1), new IdunnPOI(mockPoi2)];
const geojson = poisToGeoJSON(pois);
expect(geojson.type).toEqual('FeatureCollection');
@@ -42,7 +48,7 @@ describe('geojson', () => {
expect(geojson.features[1]).toMatchObject({ type: 'Feature', geometry: { type: 'Point' } });
});
- it('Returns a valid, empty FeatureCollection when given no POI', () => {
+ it('returns a valid, empty FeatureCollection when given no POI', () => {
const geojson = poisToGeoJSON([]);
expect(geojson.type).toEqual('FeatureCollection');
expect(geojson.features.length).toEqual(0);
| 14 |
diff --git a/features/restore-wallet.feature b/features/restore-wallet.feature @@ -60,7 +60,7 @@ Feature: Restore Wallet
| Ae2tdPwUPEZBdh5hX9QMWCeiihXf3onFAgx6KzKBtm7nj4wwyN8eoroTWqF |
| Ae2tdPwUPEYzErSRwThtfVfBbhM87NCXDwkGHRqSYJcRVP4GS8Lgx3AxAXd |
- Scenario: Fail to completely restore a wallet with wrongly generated addresses
+ Scenario: Fail to completely restore a wallet with addresses generated not following gap from BIP44 protocol
When I click the restore button
And I enter the name "Restored Wallet"
And I enter the recovery phrase:
| 10 |
diff --git a/packages/@uppy/xhr-upload/types/index.d.ts b/packages/@uppy/xhr-upload/types/index.d.ts @@ -14,6 +14,8 @@ declare module XHRUpload {
endpoint: string
method?: 'GET' | 'POST' | 'PUT' | 'HEAD' | 'get' | 'post' | 'put' | 'head'
locale?: XHRUploadLocale
+ responseType?: string
+ withCredentials?: boolean
}
}
| 0 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -785,8 +785,8 @@ const _updateWeapons = timeDiff => {
const popoverMesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(2, 2), new THREE.MeshBasicMaterial({
color: 0x000000,
}));
-popoverMesh.width = 800;
-popoverMesh.height = 300;
+popoverMesh.width = 1200;
+popoverMesh.height = 400;
popoverMesh.position.z = -1;
popoverMesh.target = new THREE.Object3D();
popoverMesh.target.position.set(0, 3, -1);
@@ -829,7 +829,12 @@ const _updatePopover = () => {
const {x, y} = toScreenPosition(popoverMesh.target, camera);
popoverMesh.position.x = -1 + x/(window.innerWidth*window.devicePixelRatio)*2;
popoverMesh.position.y = 1 - y/(window.innerHeight*window.devicePixelRatio)*2;
+ const distance = popoverMesh.position.distanceTo(camera.position);
+ const maxDistance = 5;
popoverMesh.scale.set(popoverMesh.width/(window.innerWidth*window.devicePixelRatio), popoverMesh.height/(window.innerHeight*window.devicePixelRatio), 1);
+ if (distance > maxDistance) {
+ popoverMesh.scale.multiplyScalar(1 / (distance - maxDistance + 1));
+ }
popoverMesh.visible = true;
} else {
popoverMesh.visible = false;
| 0 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/navigation/MapService.js b/public/javascripts/SVLabel/src/SVLabel/navigation/MapService.js @@ -1027,7 +1027,7 @@ function MapService (canvas, neighborhoodModel, uiMap, params) {
uiMap.viewControlLayer.append($navArrows);
// Add an event listener to the nav arrows to log their clicks.
- if (!status.panoLinkListenerSet) {
+ if (!status.panoLinkListenerSet && $navArrows.length > 0) {
// TODO We are adding click events to extra elements that don't need it, we shouldn't do that :)
$navArrows[0].addEventListener('click', function (e) {
var targetPanoId = e.target.getAttribute('pano');
| 1 |
diff --git a/src/components/CalloutBanner.js b/src/components/CalloutBanner.js @@ -71,8 +71,7 @@ const CalloutBanner = ({
alt,
children,
className,
-}) => {
- return (
+}) => (
<StyledCard className={className}>
<Image fluid={image} alt={alt} maxImageWidth={maxImageWidth} />
<Content>
@@ -82,6 +81,5 @@ const CalloutBanner = ({
</Content>
</StyledCard>
)
-}
export default CalloutBanner
| 7 |
diff --git a/OurUmbraco/Repository/Models/PackageVersionSupport.cs b/OurUmbraco/Repository/Models/PackageVersionSupport.cs @@ -23,13 +23,17 @@ namespace OurUmbraco.Repository.Models
public bool Equals(PackageVersionSupport other)
{
+ if (ReferenceEquals(null, other)) return false;
+ if (ReferenceEquals(this, other)) return true;
return _fileId == other._fileId;
}
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
- return obj is PackageVersionSupport && Equals((PackageVersionSupport)obj);
+ if (ReferenceEquals(this, obj)) return true;
+ if (obj.GetType() != this.GetType()) return false;
+ return Equals((PackageVersionSupport) obj);
}
public override int GetHashCode()
@@ -39,12 +43,12 @@ namespace OurUmbraco.Repository.Models
public static bool operator ==(PackageVersionSupport left, PackageVersionSupport right)
{
- return left.Equals(right);
+ return Equals(left, right);
}
public static bool operator !=(PackageVersionSupport left, PackageVersionSupport right)
{
- return !left.Equals(right);
+ return !Equals(left, right);
}
}
}
\ No newline at end of file
| 1 |
diff --git a/lib/api.common.js b/lib/api.common.js @@ -684,7 +684,7 @@ api.common.cache.withSize = (
cache.allocated = 0;
- const dataSize = data => (data && data.lenght ? data.length : 0);
+ const dataSize = data => (data && data.length ? data.length : 0);
cache.add = (key, val) => {
if (cache.has(key)) {
| 1 |
diff --git a/lib/mwUtil.js b/lib/mwUtil.js @@ -409,7 +409,7 @@ mwUtil.hydrateResponse = (response, fetch) => {
for (let i = node.length - 1; i >= 0; i--) {
_traverse(node[i], () => node.splice(i, 1));
}
- } else if (typeof node === 'object') {
+ } else if (node && typeof node === 'object') {
if (Array.isArray(node.$merge)) {
node.$merge.forEach(requestResource);
} else {
| 9 |
diff --git a/src/widgets/histogram/content-view.js b/src/widgets/histogram/content-view.js @@ -6,6 +6,7 @@ var HistogramChartView = require('./chart');
var placeholder = require('./placeholder.tpl');
var template = require('./content.tpl');
var DropdownView = require('../dropdown/widget-dropdown-view');
+var TooltipView = require('../widget-tooltip-view');
var AnimateValues = require('../animate-values.js');
var animationTemplate = require('./animation-template.tpl');
var layerColors = require('../../util/layer-colors');
@@ -60,6 +61,14 @@ module.exports = cdb.core.View.extend({
this._renderMiniChart();
this._renderMainChart();
this._renderAllValues();
+
+ var tooltip = new TooltipView({
+ context: this.histogramChartView,
+ event: 'hover'
+ });
+
+ $('body').append(tooltip.render().el);
+ this.addView(tooltip);
},
_initTitleView: function () {
@@ -292,7 +301,6 @@ module.exports = cdb.core.View.extend({
this.addView(this.histogramChartView);
this.histogramChartView.bind('on_brush_end', this._onBrushEnd, this);
- this.histogramChartView.bind('hover', this._onValueHover, this);
this.histogramChartView.render().show();
this._updateStats();
@@ -344,27 +352,6 @@ module.exports = cdb.core.View.extend({
this.model.off('change:avg', this._onChangeAvg, this);
},
- _clearTooltip: function () {
- this.$('.js-tooltip').stop().hide();
- },
-
- _onValueHover: function (info) {
- var $tooltip = this.$('.js-tooltip');
-
- if (info && info.data) {
- var bottom = this.defaults.chartHeight - info.top;
-
- $tooltip.css({ bottom: bottom, left: info.left });
- $tooltip.text(info.data);
- $tooltip.css({
- left: info.left - $tooltip.width() / 2,
- bottom: bottom + $tooltip.height() + (C.TOOLTIP_TRIANGLE_HEIGHT * 1.5) });
- $tooltip.fadeIn(70);
- } else {
- this._clearTooltip();
- }
- },
-
_onMiniRangeUpdated: function (loBarIndex, hiBarIndex) {
this.lockedByUser = false;
| 4 |
diff --git a/client/GameComponents/Ring.jsx b/client/GameComponents/Ring.jsx @@ -47,9 +47,6 @@ class Ring extends React.Component {
<img className='ring' src={ '/img/' + this.props.conflictType + '-' + this.props.ringType + '.png' } />
{ this.showCounters() ? <CardCounters counters={ this.getCountersForRing(this.props.ringType) } /> : null }
</div>
- <!--div className='ring-claim' >
- {this.props.claimed ? 'Claimed By ' + this.props.claimedBy : 'Unclaimed' }
- </div-->
</div>);
}
}
| 2 |
diff --git a/src/views/preview/preview.jsx b/src/views/preview/preview.jsx @@ -545,7 +545,8 @@ Preview.defaultProps = {
};
const mapStateToProps = state => {
- const projectInfoPresent = Object.keys(state.preview.projectInfo).length > 0;
+ const projectInfoPresent = state.preview.projectInfo &&
+ Object.keys(state.preview.projectInfo).length > 0 && state.preview.projectInfo.id > 0;
const userPresent = state.session.session.user !== null &&
typeof state.session.session.user !== 'undefined' &&
Object.keys(state.session.session.user).length > 0;
@@ -558,15 +559,15 @@ const mapStateToProps = state => {
state.session.session.user.id === state.preview.projectInfo.author.id;
return {
- canAddToStudio: isLoggedIn && userOwnsProject,
+ canAddToStudio: userOwnsProject,
canCreateNew: true,
- canRemix: false,
+ canRemix: isLoggedIn && projectInfoPresent && !userOwnsProject,
canReport: isLoggedIn && !userOwnsProject,
- canSave: isLoggedIn && (userOwnsProject || !state.preview.projectInfo.id),
- canSaveAsCopy: false,
+ canSave: isLoggedIn && (userOwnsProject || !projectInfoPresent), // can save a new project
+ canSaveAsCopy: userOwnsProject && projectInfoPresent,
canShare: userOwnsProject && state.permissions.social,
comments: state.preview.comments,
- enableCommunity: state.preview.projectInfo && state.preview.projectInfo.id > 0,
+ enableCommunity: projectInfoPresent,
faved: state.preview.faved,
fullScreen: state.scratchGui.mode.isFullScreen,
// project is editable iff logged in user is the author of the project, or
| 12 |
diff --git a/src/6_branch.js b/src/6_branch.js @@ -332,9 +332,9 @@ Branch.prototype['init'] = wrap(
var link_identifier = (branchMatchIdFromOptions || utils.getParamValue('_branch_match_id') || utils.hashValue('r'));
var freshInstall = !sessionData || !sessionData['identity_id'];
self._branchViewEnabled = !!self._storage.get('branch_view_enabled');
- var checkHasApp = function(sessionData, cb) {
+ var checkHasApp = function(cb) {
var params_r = { "sdk": config.version, "branch_key": self.branch_key };
- var currentSessionData = sessionData || session.get(self._storage) || {};
+ var currentSessionData = session.get(self._storage) || {};
var permData = session.get(self._storage, true) || {};
if (permData['browser_fingerprint_id']) {
params_r['_t'] = permData['browser_fingerprint_id'];
@@ -449,7 +449,7 @@ Branch.prototype['init'] = wrap(
if (changeEvent) {
document.addEventListener(changeEvent, function() {
if (!document[hidden]) {
- checkHasApp(null, null);
+ checkHasApp(null);
if (typeof self._deepviewRequestForReplay === 'function') {
self._deepviewRequestForReplay();
}
@@ -462,7 +462,7 @@ Branch.prototype['init'] = wrap(
// resets data in session storage to prevent previous link click data from being returned to Branch.init()
session.update(self._storage, { "data": "" });
attachVisibilityEvent();
- checkHasApp(null, finishInit);
+ checkHasApp(finishInit);
return;
}
| 2 |
diff --git a/assets/js/modules/analytics/datastore/setup-flow.js b/assets/js/modules/analytics/datastore/setup-flow.js @@ -31,7 +31,6 @@ import {
import { MODULES_ANALYTICS_4 } from '../../analytics-4/datastore/constants';
import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
import { CORE_FORMS } from '../../../googlesitekit/datastore/forms/constants';
-import { MODULES_TAGMANAGER } from '../../tagmanager/datastore/constants';
const { createRegistrySelector } = Data;
@@ -114,40 +113,6 @@ const baseSelectors = {
return uaConnected === ga4Connected;
} ),
-
- /**
- * Determines whether the live container version has finished loading.
- *
- * @since n.e.x.t
- *
- * @return {boolean} TRUE if the GTM module is not available or the live container version has finished loading, otherwise FALSE.
- */
- hasFinishedLoadingGTMContainers: createRegistrySelector(
- ( select ) => () => {
- const tagmanagerModuleAvailable =
- select( CORE_MODULES ).isModuleAvailable( 'tagmanager' );
- if ( ! tagmanagerModuleAvailable ) {
- return true;
- }
-
- const accountID = select( MODULES_TAGMANAGER ).getAccountID();
- const internalContainerID =
- select( MODULES_TAGMANAGER ).getInternalContainerID();
- const internalAMPContainerID =
- select( MODULES_TAGMANAGER ).getInternalAMPContainerID();
-
- return (
- select( MODULES_TAGMANAGER ).hasFinishedResolution(
- 'getLiveContainerVersion',
- [ accountID, internalContainerID ]
- ) ||
- select( MODULES_TAGMANAGER ).hasFinishedResolution(
- 'getLiveContainerVersion',
- [ accountID, internalAMPContainerID ]
- )
- );
- }
- ),
};
const store = Data.combineStores( {
| 2 |
diff --git a/test/server/cards/07-WotW/MotoChagatai.spec.js b/test/server/cards/07-WotW/MotoChagatai.spec.js -fdescribe('Moto Chagatai', function() {
+describe('Moto Chagatai', function() {
integration(function() {
describe('Moto Chagatai\'s ability', function() {
beforeEach(function() {
| 2 |
diff --git a/storybook-spark-theme.js b/storybook-spark-theme.js @@ -9,9 +9,9 @@ export default create({
appBorderRadius: 4,
fontBase: '"urw-din", sans-serif',
fontCode: 'monospace',
- barTextColor: '#ffffff',
+ barTextColor: '#333333',
barSelectedColor: '#fd6c45',
- barBg: '#302e2e',
+ // barBg: '#302e2e',
inputBorderRadius: 4,
brandTitle: 'Spark Design System',
brandUrl: 'https://sparkdesignsystem.com',
| 3 |
diff --git a/src/client/js/components/PageAccessoriesModal.jsx b/src/client/js/components/PageAccessoriesModal.jsx @@ -30,25 +30,25 @@ const PageAccessoriesModal = (props) => {
>
<ModalBody>
<Nav className="nav-title border-bottom">
- <NavItem className={`nav-link ${props.isActive === 'pageList' && 'active'}`}>
+ <NavItem className={`nav-link ${props.activeTab === 'pageList' && 'active'}`}>
<NavLink>
<PageList />
{ t('page_list') }
</NavLink>
</NavItem>
- <NavItem className={`nav-link ${props.isActive === 'timeLine' && 'active'}`}>
+ <NavItem className={`nav-link ${props.activeTab === 'timeLine' && 'active'}`}>
<NavLink>
<TimeLine />
{ t('Timeline View') }
</NavLink>
</NavItem>
- <NavItem className={`nav-link ${props.isActive === 'recentChanges' && 'active'}`}>
+ <NavItem className={`nav-link ${props.activeTab === 'recentChanges' && 'active'}`}>
<NavLink>
<RecentChanges />
{ t('History') }
</NavLink>
</NavItem>
- <NavItem className={`nav-link ${props.isActive === 'attachment' && 'active'}`}>
+ <NavItem className={`nav-link ${props.activeTab === 'attachment' && 'active'}`}>
<NavLink>
<Attachment />
{ t('attachment_data') }
@@ -76,7 +76,7 @@ PageAccessoriesModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onClose: PropTypes.func,
- isActive: PropTypes.string.isRequired,
+ activeTab: PropTypes.string.isRequired,
};
export default withTranslation()(PageAccessoriesModalWrapper);
| 10 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -18,6 +18,7 @@ const localVector2 = new THREE.Vector3();
const localQuaternion = new THREE.Quaternion();
const localQuaternion2 = new THREE.Quaternion();
const localQuaternion3 = new THREE.Quaternion();
+const localQuaternion4 = new THREE.Quaternion();
const localEuler = new THREE.Euler();
const localMatrix = new THREE.Matrix4();
@@ -863,20 +864,7 @@ class Avatar {
result.divideScalar(points.length);
return result;
};
- const _getEyePosition = () => {
- if (modelBones.Eye_L && modelBones.Eye_R) {
- return modelBones.Eye_L.getWorldPosition(new THREE.Vector3())
- .add(modelBones.Eye_R.getWorldPosition(new THREE.Vector3()))
- .divideScalar(2);
- } else {
- const neckToHeadDiff = modelBones.Head.getWorldPosition(new THREE.Vector3()).sub(modelBones.Neck.getWorldPosition(new THREE.Vector3()));
- if (neckToHeadDiff.z < 0) {
- neckToHeadDiff.z *= -1;
- }
- return modelBones.Head.getWorldPosition(new THREE.Vector3()).add(neckToHeadDiff);
- }
- };
- const eyePosition = _getEyePosition();
+ const eyePosition = this.getEyePosition();
this.poseManager = new PoseManager();
this.shoulderTransforms = new ShoulderTransforms(this);
@@ -952,6 +940,9 @@ class Avatar {
// this.allHairBones = allHairBones;
this.hairBones = hairBones;
+ this.eyeTarget = new THREE.Vector3();
+ this.eyeTargetEnabled = false;
+
this.springBoneManager = null;
let springBoneManagerPromise = null;
if (options.hair) {
@@ -1817,6 +1808,20 @@ class Avatar {
}
}
}
+ getEyePosition() {
+ const {modelBones} = this;
+ if (modelBones.Eye_L && modelBones.Eye_R) {
+ return modelBones.Eye_L.getWorldPosition(new THREE.Vector3())
+ .add(modelBones.Eye_R.getWorldPosition(new THREE.Vector3()))
+ .divideScalar(2);
+ } else {
+ const neckToHeadDiff = modelBones.Head.getWorldPosition(new THREE.Vector3()).sub(modelBones.Neck.getWorldPosition(new THREE.Vector3()));
+ if (neckToHeadDiff.z < 0) {
+ neckToHeadDiff.z *= -1;
+ }
+ return modelBones.Head.getWorldPosition(new THREE.Vector3()).add(neckToHeadDiff);
+ }
+ }
initializeBonePositions(setups) {
this.shoulderTransforms.spine.position.copy(setups.spine);
this.shoulderTransforms.chest.position.copy(setups.chest);
@@ -2101,6 +2106,40 @@ class Avatar {
this.shoulderTransforms.Update();
this.legsManager.Update();
+ if (this.eyeTargetEnabled) {
+ const eyePosition = this.getEyePosition();
+ const upVector = new THREE.Vector3(0, 1, 0);
+ this.modelBoneOutputs.Neck.updateMatrixWorld();
+ this.modelBoneOutputs.Neck.matrixWorld.decompose(localVector, localQuaternion, localVector2);
+
+ const globalQuaternion = localQuaternion2.setFromRotationMatrix(
+ new THREE.Matrix4().lookAt(
+ eyePosition,
+ this.eyeTarget,
+ upVector
+ )
+ );
+ localQuaternion3.copy(globalQuaternion)// .setFromEuler(localEuler)
+ .premultiply(
+ this.modelBoneOutputs.Hips.getWorldQuaternion(localQuaternion4)
+ .invert()
+ )
+ if (localQuaternion.angleTo(localQuaternion3) < Math.PI*0.4) {
+ // localEuler.setFromQuaternion(localQuaternion, 'YXZ');
+ // localEuler.y *= -1;
+ // localEuler.y = Math.min(Math.max(localEuler.y, -Math.PI/2), Math.PI/2);
+
+ /* .premultiply(
+ localQuaternion2.copy(camera.quaternion)
+ .invert()
+ ); */
+ this.modelBoneOutputs.Neck.matrixWorld.compose(localVector, localQuaternion3, localVector2);
+ this.modelBoneOutputs.Neck.matrix.copy(this.modelBoneOutputs.Neck.matrixWorld)
+ .premultiply(localMatrix.copy(this.modelBoneOutputs.Neck.parent.matrixWorld).invert())
+ .decompose(this.modelBoneOutputs.Neck.position, this.modelBoneOutputs.Neck.quaternion, this.modelBoneOutputs.Neck.scale);
+ }
+ }
+
Avatar.applyModelBoneOutputs(
this.modelBones,
this.modelBoneOutputs,
| 0 |
diff --git a/components/popover/popover.jsx b/components/popover/popover.jsx @@ -383,7 +383,8 @@ const Popover = React.createClass({
},
toggleOpenFromKeyboard (event) {
- if (this.state.isOpen) {
+ const isOpen = this.getIsOpen();
+ if (isOpen) {
this.handleCancel(event);
} else {
this.handleOpen();
| 1 |
diff --git a/js/collections/Listings.js b/js/collections/Listings.js @@ -37,8 +37,8 @@ export default class extends Collection {
const cats = [];
this.models.forEach(listing => {
- listing.get('categories')
- .forEach(cat => {
+ const categories = listing.get('categories') || []; // this may be returned as null
+ categories.forEach(cat => {
if (cats.indexOf(cat) === -1) cats.push(cat);
});
});
| 9 |
diff --git a/articles/onboarding/appliance-sprint.md b/articles/onboarding/appliance-sprint.md @@ -56,4 +56,4 @@ The following sections describe what happens during each step of the PSaaS Appli
## What's next?
-Once the PSaaS Appliance is deployed, an Auth0 Customer Success Manager will work with you to complete the rest of the [Sprint onboarding program](https://auth0.com/docs/onboarding/sprint) - the end result being a joint success plan to drive value throughout the subscription lifecycle.
+Once the PSaaS Appliance is deployed, an Auth0 Customer Success Manager will work with you to build a joint success plan to drive value throughout the subscription lifecycle.
| 2 |
diff --git a/lib/tasks/platform_limits.rake b/lib/tasks/platform_limits.rake @@ -77,4 +77,18 @@ namespace :cartodb do
user.save
end
+ desc 'Set max_import_file_size, max_import_table_row_count'
+ task :set_import_limits, [:username, :max_import_file_size, :max_import_table_row_count] => :environment do |_task, args|
+ username = args[:username]
+ raise 'username needed' unless username
+ user = ::User.where(username: username).first
+ raise "user #{username} not found" unless user
+
+
+ user.max_import_file_size = args[:max_import_file_size] if args[:max_import_file_size].present?
+ user.max_import_table_row_count = args[:max_import_table_row_count] if args[:max_import_table_row_count].present?
+
+ user.save
+ end
+
end
| 12 |
diff --git a/src/plots/cartesian/axis_format.js b/src/plots/cartesian/axis_format.js @@ -25,13 +25,13 @@ function descriptionOnlyNumbers(label, x) {
return [
'Sets the ' + label + ' formatting rule' + (x ? 'for `' + x + '` ' : ''),
'using d3 formatting mini-languages',
- 'which are very similar to those in Python. For numbers, see: ' + FORMAT_LINK
+ 'which are very similar to those in Python. For numbers, see: ' + FORMAT_LINK + '.'
].join(' ');
}
function descriptionWithDates(label, x) {
return descriptionOnlyNumbers(label, x) + [
- ' And for dates see: ' + DATE_FORMAT_LINK,
+ ' And for dates see: ' + DATE_FORMAT_LINK + '.',
'We add two items to d3\'s date formatter:',
'*%h* for half of the year as a decimal number as well as',
'*%{n}f* for fractional seconds',
| 0 |
diff --git a/packages/components/src/components/as-histogram-widget/utils/draw.service.ts b/packages/components/src/components/as-histogram-widget/utils/draw.service.ts @@ -126,7 +126,7 @@ export function renderXAxis(
bins: number,
X_PADDING: number,
Y_PADDING: number,
- customFormatter: (value: Date | number) => string = conditionalFormatter,
+ customFormatter: (value: Date | number, domainPrecision: number) => string = conditionalFormatter,
axisOptions: AxisOptions): Axis<{ valueOf(): number }> {
if (!container || !container.node()) {
@@ -150,6 +150,9 @@ export function renderXAxis(
let xAxis;
+ // Get domain precision for formatter in case of numbers
+ let domainPrecision = getDomainPrecision(domain);
+
if (axisOptions.values || axisOptions.format) {
const altScale = scaleLinear()
.domain(domain)
@@ -164,7 +167,7 @@ export function renderXAxis(
.tickValues(ticks !== undefined ? null : tickValues)
.tickFormat((value) => {
const realValue = realScale.invert(value);
- return customFormatter(realValue);
+ return customFormatter(realValue, domainPrecision);
});
}
@@ -293,8 +296,30 @@ function _delayFn(_d, i) {
return i;
}
-export function conditionalFormatter(value) {
- if (value > 0 && value < 1) {
+function getFloatPrecision(value) {
+ const expValue = value.toPrecision()
+ const expPos = expValue.indexOf('.')
+ return expPos > -1 ? expValue.slice(expPos + 1).length : 0
+}
+
+function getDomainPrecision(domain) {
+ let domainPrecision = 0;
+ if (!(domain[0] instanceof Date)) {
+ const domainDiff = domain[domain.length - 1] as any - domain[0];
+ const domainDiffPrecision = getFloatPrecision(domainDiff);
+ if (domainDiff > 1 && domainDiffPrecision > 1) {
+ domainPrecision = 1;
+ } else if (domainDiff < 1) {
+ domainPrecision = domainDiffPrecision;
+ }
+ }
+
+ return domainPrecision;
+}
+
+export function conditionalFormatter(value, domainPrecision = 0) {
+ // Until we really need to use kilo or milli, we will not use SI prefixes
+ if (value > -100 && value < 100 && domainPrecision < 3) {
return decimalFormatter(value);
}
| 7 |
diff --git a/app/views/faq.scala.html b/app/views/faq.scala.html <div class="col-sm-12">
<div class="spacer10"></div>
<p class="text-justify">
- You have more questions? Email us (sidewalk@@umiacs.umd.edu),
+ You have more questions? Email us (sidewalk@@cs.uw.edu),
post a <a href="https://github.com/ProjectSidewalk/SidewalkWebpage/issues">GitHub issue</a>, or follow and talk to us
on <a href="https://twitter.com/projsidewalk">Twitter (@@projsidewalk)!</a>
</p>
<div class="row">
<div class="col-sm-12">
<p class="text-justify">
- You have more questions? Email us (sidewalk@@umiacs.umd.edu),
+ You have more questions? Email us (sidewalk@@cs.uw.edu),
post a <a href="https://github.com/ProjectSidewalk/SidewalkWebpage/issues">GitHub issue</a>, or follow and talk to us
on <a href="https://twitter.com/projsidewalk">Twitter (@@projsidewalk)!</a>
</p>
| 3 |
diff --git a/.vscode/settings.json b/.vscode/settings.json "editor.formatOnType": true,
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
+ "editor.insertSpaces": false,
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
"javascript.format.placeOpenBraceOnNewLineForFunctions": true,
"javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
| 0 |
diff --git a/core/task-executor/lib/jobs/template.js b/core/task-executor/lib/jobs/template.js @@ -6,6 +6,7 @@ const jobTemplate = {
labels: {
type: 'worker',
group: 'hkube',
+ core: 'true',
'algorithm-name': 'algorithm-name',
'metrics-group': 'workers'
}
| 0 |
diff --git a/src/muncher/monster/spells.js b/src/muncher/monster/spells.js @@ -4,10 +4,11 @@ import logger from '../../logger.js';
function parseSpellcasting(text) {
let spellcasting = "";
- const abilitySearch = "(?:spellcasting ability is|uses|using) (\\w+)(?: as \\w+ spellcasting ability| )";
+ const abilitySearch = /((?:spellcasting ability) (?:is|uses|using) (\w+)| (\w+)(?: as \w+ spellcasting ability))/;
const match = text.match(abilitySearch);
if (match) {
- spellcasting = match[1].toLowerCase().substr(0, 3);
+ const abilityMatch = match[0] || match[1];
+ spellcasting = abilityMatch.toLowerCase().substr(0, 3);
}
return spellcasting;
}
@@ -387,7 +388,7 @@ export function getSpells(monster) {
spellAttackBonus: spellAttackBonus,
};
- // console.log(JSON.stringify(result, null, 4));
+ // console.warn("spell result", JSON.stringify(result, null, 4));
return result;
}
| 7 |
diff --git a/Bundle/BlogBundle/Manager/ArticleManager.php b/Bundle/BlogBundle/Manager/ArticleManager.php @@ -11,7 +11,7 @@ use Victoire\Bundle\BusinessPageBundle\Transformer\VirtualToBusinessPageTransfor
use Victoire\Bundle\CoreBundle\Entity\View;
use Victoire\Bundle\PageBundle\Entity\PageStatus;
use Victoire\Bundle\PageBundle\Helper\PageHelper;
-use Victoire\Bundle\UserBundle\Entity\User;
+use Victoire\Bundle\UserBundle\Model\User;
use Victoire\Bundle\ViewReferenceBundle\Connector\ViewReferenceRepository;
use Victoire\Bundle\ViewReferenceBundle\Exception\ViewReferenceNotFoundException;
| 4 |
diff --git a/src/encoded/schemas/fastqc_quality_metric.json b/src/encoded/schemas/fastqc_quality_metric.json { "$ref": "mixins.json#/schema_version" },
{ "$ref": "quality_metric.json#/properties" },
{ "$ref": "mixins.json#/uuid" },
+ { "$ref": "mixins.json#/aliases" },
{ "$ref": "mixins.json#/submitted"},
{ "$ref": "mixins.json#/standard_status"},
{ "$ref": "mixins.json#/assay" },
| 0 |
diff --git a/assets/js/util/date-range/string-to-date.js b/assets/js/util/date-range/string-to-date.js @@ -30,7 +30,7 @@ import { isValidDateString } from './is-valid-date-string';
/**
* Converts a valid date string to a Date instance.
*
- * @since n.e.x.t
+ * @since 1.38.0
*
* @param {string} dateString The date string to parse.
* @return {Date} Date instance.
| 14 |
diff --git a/articles/topics/guides.md b/articles/topics/guides.md @@ -13,6 +13,12 @@ description: Helpful docs for implementing Auth0
</div>
<ul class="topic-links">
+ <li>
+ <i class="icon icon-budicon-715"></i><a href="/architecture-scenarios">Architecture Scenarios</a>
+ <p>
+ Describes several architecture scenarios and how you can implement them using Auth0.
+ </p>
+ </li>
<li>
<i class="icon icon-budicon-715"></i><a href="/tokens">Tokens</a>
<p>
| 0 |
diff --git a/content/troubleshooting/common-issues.md b/content/troubleshooting/common-issues.md @@ -48,3 +48,30 @@ When building for iOS, the build gets stuck after showing `Xcode build done` in
* https://github.com/flutter/flutter/issues/35988
This issue is known to be fixed on the `master` channel.
+
+## Version inconsistency between local and Codemagic
+
+**Description**:
+Builds succeed locally but not on Codemagic and throw vague errors, such as `Gradle task bundleRelease failed with exit code 1`, or build is successful but some functions aren't working.
+
+**Cause**: These issues are likely caused because plugin and gradle versions used locally are different from the versions used on Codemagic. If you are using a gradle version that is different from Codemagic, you have to define it in `gradle wrapper`. Otherwise, Codemagic ignores your `build.gradle` file and your build won't work properly. See which [software versions Codemagic uses](../releases-and-versions/versions/).
+
+**Solution**: First, you need to make sure that the `gradlew` file isn't in `.gitignore`. Look for `**/android/gradlew`, and if it's in `.gitignore`, delete it from there. Then run `./gradlew wrapper --gradle-version [your gradle version]` locally to create `gradlew` and `gradle-wrapper.properties` files in your repository. Commit the changes and rerun your Codemagic build.
+
+**Additional steps**: Additional steps are required if you see the following error during the build process:
+
+`Error! Failed to check gradle version. Malformed executable tmpABCDEF/gradlew`
+
+Codemagic runs `./gradlew --version` on the builder side to check if it's suitable for execution. If you see the error message shown above, there is something wrong with checking the gradle version.
+
+**To investigate and fix the issues**:
+
+* Make a clean clone of the repository and execute the following commands:
+
+ cd <project_root>
+ chmod +x gradlew
+ ./gradlew --version
+
+* Make a fix for the issue found.
+* Commit changes to the repo.
+* Run the build again in Codemagic.
\ No newline at end of file
| 3 |
diff --git a/src/utilities/borders.less b/src/utilities/borders.less @default-border-color: @border-dark-soft;
-// Base
-@border-width-scale:
- '0' 0,
- default 1px,
- '2' 2px,
- '4' 4px,
- '8' 8px,
-;
-.define-border-widths(@border-width-scale; @default-border-color; @screens);
-
-// Colors
@border-colors:
'dark' @border-dark,
'dark-soft' @border-dark-soft,
| 1 |
diff --git a/test/functional/specs/desktop/C8118.js b/test/functional/specs/desktop/C8118.js -// import { t, Selector } from "testcafe";
-// import createNetworkLogger from "../../helpers/networkLogger";
-// import { responseStatus } from "../../helpers/assertions/index";
-// import testServerUrl from "../../helpers/constants/testServerUrl";
+import { t, Selector } from "testcafe";
+import createNetworkLogger from "../../helpers/networkLogger";
+import { responseStatus } from "../../helpers/assertions/index";
+import testServerUrl from "../../helpers/constants/testServerUrl";
-// const linkPageWithClickHandler = `${testServerUrl}/test/functional/sandbox/html/linkPageWithClickHandler.html`;
+const linkPageWithClickHandler = `${testServerUrl}/test/functional/sandbox/html/linkPageWithClickHandler.html`;
-// const networkLogger = createNetworkLogger();
+const networkLogger = createNetworkLogger();
-// fixture`C8118`
-// .page(linkPageWithClickHandler)
-// .requestHooks(
-// networkLogger.gatewayEndpointLogs,
-// networkLogger.sandboxEndpointLogs
-// );
+fixture`C8118`
+ .page(linkPageWithClickHandler)
+ .requestHooks(
+ networkLogger.edgeEndpointLogs,
+ networkLogger.sandboxEndpointLogs
+ );
-// test.meta({
-// ID: "C8118",
-// SEVERITY: "P0",
-// TEST_RUN: "Regression"
-// });
+test.meta({
+ ID: "C8118",
+ SEVERITY: "P0",
+ TEST_RUN: "Regression"
+});
-// test("Regression: Load page with link. Click link. Verify request.", async () => {
-// await t.click(Selector("#alloy-link-test"));
-// await responseStatus(networkLogger.gatewayEndpointLogs.requests, 200);
-// const gatewayRequest = networkLogger.gatewayEndpointLogs.requests[0];
-// const requestBody = JSON.parse(gatewayRequest.request.body);
-// const destinationUrl = requestBody.events[0].xdm.web.webinteraction.URL;
-// await t.expect(destinationUrl).contains("missing.html");
-// });
+test("Test C8118: Load page with link. Click link. Verify request.", async () => {
+ await t.click(Selector("#alloy-link-test"));
+ await responseStatus(networkLogger.edgeEndpointLogs.requests, 204);
+ const gatewayRequest = networkLogger.edgeEndpointLogs.requests[0];
+ const requestBody = JSON.parse(gatewayRequest.request.body);
+ const destinationUrl = requestBody.events[0].xdm.web.webInteraction.URL;
+ await t.expect(destinationUrl).contains("missing.html");
+});
| 1 |
diff --git a/karma.conf.js b/karma.conf.js process.env.CHROME_BIN = require('puppeteer').executablePath();
+let bundle = require('./package.json');
module.exports = (config) => {
@@ -119,6 +120,7 @@ module.exports = (config) => {
username: process.env.BROWSERSTACK_USERNAME,
accessKey: process.env.BROWSERSTACK_ACCESS_KEY,
video: false,
+ build: `@mojs/core ${bundle.version}`,
},
captureTimeout: 120000,
customLaunchers: customLaunchers,
| 0 |
diff --git a/src/styles/styles.js b/src/styles/styles.js @@ -762,7 +762,8 @@ const styles = {
color: themeColors.text,
paddingTop: 23,
paddingBottom: 8,
- paddingHorizontal: 0,
+ paddingLeft: 0,
+ paddingRight: 0,
borderWidth: 0,
},
| 12 |
diff --git a/OurUmbraco/NotificationsCore/Notifications/ScheduleHangfireJobs.cs b/OurUmbraco/NotificationsCore/Notifications/ScheduleHangfireJobs.cs @@ -144,29 +144,29 @@ namespace OurUmbraco.NotificationsCore.Notifications
RecurringJob.AddOrUpdate(() => gitHubService.DownloadAllLabels(context), Cron.MonthInterval(12));
}
- public void AddCommentToAwaitingFeedbackIssues(PerformContext context)
- {
- var gitHubService = new GitHubService();
- RecurringJob.AddOrUpdate(() => gitHubService.AddCommentToAwaitingFeedbackIssues(context), Cron.MinuteInterval(10));
- }
-
- public void AddCommentToStateHQDiscussionIssues(PerformContext context)
- {
- var gitHubService = new GitHubService();
- RecurringJob.AddOrUpdate(() => gitHubService.AddCommentToStateHQDiscussionIssues(context), Cron.MinuteInterval(10));
- }
-
- public void NotifyUnmergeablePullRequests(PerformContext context)
- {
- var gitHubService = new GitHubService();
- RecurringJob.AddOrUpdate(() => gitHubService.NotifyUnmergeablePullRequests(context), Cron.MonthInterval(12));
- }
-
- public void CheckContributorBadge(PerformContext context)
- {
- var contributors = new ContributorBadgeService();
- RecurringJob.AddOrUpdate(() => contributors.CheckContributorBadges(context), Cron.MinuteInterval(5));
- }
+ // public void AddCommentToAwaitingFeedbackIssues(PerformContext context)
+ // {
+ // var gitHubService = new GitHubService();
+ // RecurringJob.AddOrUpdate(() => gitHubService.AddCommentToAwaitingFeedbackIssues(context), Cron.MinuteInterval(10));
+ // }
+
+ // public void AddCommentToStateHQDiscussionIssues(PerformContext context)
+ // {
+ // var gitHubService = new GitHubService();
+ // RecurringJob.AddOrUpdate(() => gitHubService.AddCommentToStateHQDiscussionIssues(context), Cron.MinuteInterval(10));
+ // }
+
+ // public void NotifyUnmergeablePullRequests(PerformContext context)
+ // {
+ // var gitHubService = new GitHubService();
+ // RecurringJob.AddOrUpdate(() => gitHubService.NotifyUnmergeablePullRequests(context), Cron.MonthInterval(12));
+ // }
+
+ // public void CheckContributorBadge(PerformContext context)
+ // {
+ // var contributors = new ContributorBadgeService();
+ // RecurringJob.AddOrUpdate(() => contributors.CheckContributorBadges(context), Cron.MinuteInterval(5));
+ // }
public void GetNugetDownloads(PerformContext context)
{
| 2 |
diff --git a/articles/protocols/saml/saml-apps/cisco-webex.md b/articles/protocols/saml/saml-apps/cisco-webex.md @@ -23,6 +23,6 @@ ${include('./_header')}
Notice that Webex has an option to automatically provision new users. You will need to send that info along as claims (lastname, and so on).
-::: next-steps
-* [Single Sign-On with Cisco Spark Services](https://collaborationhelp.cisco.com/article/en-us/lfu88u)
+:::note
+If you integrate Auth0 with Cisco Spark services, you might find this article helpful: [Single Sign-On with Cisco Spark Services](https://collaborationhelp.cisco.com/article/en-us/lfu88u).
:::
| 14 |
diff --git a/lib/carto/bounding_box_helper.rb b/lib/carto/bounding_box_helper.rb @@ -18,13 +18,6 @@ module Carto::BoundingBoxHelper
maxlat: 90
}.freeze
- def self.calculate_bounding_box(db, table_name)
- get_table_bounds(db, table_name)
- rescue Sequel::DatabaseError => exception
- CartoDB::Logger.error(exception: exception, table: table_name)
- raise BoundingBoxError.new("Can't calculate the bounding box for table #{table_name}. ERROR: #{exception}")
- end
-
def self.get_table_bounds(db, table_name)
# (lon,lat) as comes out from postgis
result = current_bbox_using_stats(db, table_name)
| 2 |
diff --git a/index.js b/index.js +process.env.CALIBRE_HOST = process.env.CALIBRE_HOST || 'https://calibreapp.com'
+
const chalk = require('chalk')
const Site = require('./src/api/site')
@@ -5,8 +7,6 @@ const Snapshot = require('./src/api/snapshot')
const Test = require('./src/api/test')
const TestProfile = require('./src/api/test_profile')
-process.env.CALIBRE_HOST = process.env.CALIBRE_HOST || 'https://calibreapp.com'
-
if (!process.env.CALIBRE_API_TOKEN) {
console.log(
chalk.grey(
| 12 |
diff --git a/src/languages/jboss-cli.js b/src/languages/jboss-cli.js @@ -45,9 +45,8 @@ function(hljs) {
},
{
className: 'symbol',
- begin: /\B(\/[\w-/=]+)+/,
+ begin: /\B(\/[\w\-\/=]+)+/,
relevance: 1
-
},
{
className: 'params',
| 1 |
diff --git a/views/productform.blade.php b/views/productform.blade.php @section('content')
<div class="row">
<div class="col">
+ <div class="title-related-links">
<h2 class="title">@yield('title')</h2>
+ @if($mode == 'edit')
+ <div class="float-right">
+ <button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
+ type="button"
+ data-toggle="collapse"
+ data-target="#related-links">
+ <i class="fas fa-ellipsis-v"></i>
+ </button>
+ </div>
+ <div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
+ id="related-links">
+ <a class="btn btn-outline-secondary m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
+ href="{{ $U('/stockentries?embedded&product=') }}{{ $product->id }}">
+ {{ $__t('Stock entries') }}
+ </a>
+ <a class="btn btn-outline-secondary m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
+ href="{{ $U('/stockentries?embedded&product=') }}{{ $product->id }}">
+ {{ $__t('Stock journal') }}
+ </a>
+ </div>
+ @endif
+ </div>
</div>
</div>
| 0 |
diff --git a/public/less/main.less b/public/less/main.less padding-top: 20px;
}
+ #watcher-wizard .form-group .dropdown button {
+ width: 160px;
+ }
+
+ #watcher-wizard .form-group button {
+ width: 80px;
+ }
+
.search-bar {
padding-bottom: 10px;
}
| 12 |
diff --git a/app/controllers/TaskController.scala b/app/controllers/TaskController.scala @@ -134,18 +134,34 @@ class TaskController @Inject() (implicit val env: Environment[User, SessionAuthe
case _ => None
}
- // If the task was completed, update the street's priority.
+ val user = request.identity
+ val streetEdgeId = data.auditTask.streetEdgeId
+
if (data.auditTask.auditTaskId.isDefined) {
- if (AuditTaskTable.isAuditComplete(data.auditTask.auditTaskId.get)) {
+ user match {
+ case Some(user) =>
+ // Update the street's priority only if the user has not completed this street previously
+ if (!AuditTaskTable.userHasAuditedStreet(streetEdgeId, user.userId)) {
data.auditTask.completed.map { completed =>
- if (completed) { StreetEdgePriorityTable.partiallyUpdatePriority(data.auditTask.streetEdgeId) }
+ if (completed) {
+ StreetEdgePriorityTable.partiallyUpdatePriority(streetEdgeId)
+ }
}
}
+ case None =>
+ // Update the street's priority for anonymous user
+ data.auditTask.completed.map { completed =>
+ if (completed) {
+ StreetEdgePriorityTable.partiallyUpdatePriority(streetEdgeId)
}
+ }
+ }
+ }
+
// Update the AuditTaskTable and get auditTaskId
// Set the task to be completed and increment task completion count
- val auditTaskId: Int = updateAuditTaskTable(request.identity, data.auditTask, amtAssignmentId)
+ val auditTaskId: Int = updateAuditTaskTable(user, data.auditTask, amtAssignmentId)
updateAuditTaskCompleteness(auditTaskId, data.auditTask, data.incomplete)
// Insert the skip information or update task street_edge_assignment_count.completion_count
| 1 |
diff --git a/www/views/customAmount.html b/www/views/customAmount.html <div class="address" ng-if="address && amountBtc">
<div ng-show="showingPaymentReceived" ng-click="showingPaymentReceived = false">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
- <circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1"
- cy="65.1" r="62.1"/>
- <polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round"
- stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>
+ <circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
+ <polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>
</svg>
<p class="success animated fadeIn" style="text-align: center">
<br/>Payment Received!<br/>
</div>
<div ng-show="!showingPaymentReceived" ng-show="address && coin == 'bch'" class="address-types">
<div>
- <button ng-show="address && coin == 'bch' && bchAddressType != 'cashaddr'" class="button-address"
- ng-click="displayAddress('cashaddr')">
+ <button ng-show="address && coin == 'bch' && bchAddressType != 'cashaddr'" class="button-address" ng-click="displayAddress('cashaddr')">
<span translate>Display new style address</span>
</button>
</div>
<div>
- <button ng-show="address && coin == 'bch' && bchAddressType != 'legacy'" class="button-address"
- ng-click="displayAddress('legacy')">
+ <button ng-show="address && coin == 'bch' && bchAddressType != 'legacy'" class="button-address" ng-click="displayAddress('legacy')">
<span translate>Display legacy address</span>
</button>
</div>
<div>
- <button ng-show="address && coin == 'bch' && bchAddressType != 'bitpay'" class="button-address"
- ng-click="displayAddress('bitpay')">
+ <button ng-show="address && coin == 'bch' && bchAddressType != 'bitpay'" class="button-address" ng-click="displayAddress('bitpay')">
<span translate>Display BitPay address</span>
</button>
</div>
</div>
<div class="info">
- <div class="item single-line"
- copy-to-clipboard="(coin == 'bch' && bchAddressType == 'cashaddr' ? 'bitcoincash:' : '') + address">
+ <div class="item single-line" copy-to-clipboard="(coin == 'bch' && bchAddressType == 'cashaddr' ? 'bitcoincash:' : '') + address">
<span class="label" translate>Address</span>
<span class="item-note ellipsis">
{{address}}
| 13 |
diff --git a/src/matrix/e2ee/DeviceTracker.js b/src/matrix/e2ee/DeviceTracker.js @@ -123,17 +123,9 @@ export class DeviceTracker {
async _writeMember(member, txn) {
const {userIdentities} = txn;
const identity = await userIdentities.get(member.userId);
- if (!identity) {
- userIdentities.set({
- userId: member.userId,
- roomIds: [member.roomId],
- deviceTrackingStatus: TRACKING_STATUS_OUTDATED,
- });
- } else {
- if (!identity.roomIds.includes(member.roomId)) {
- identity.roomIds.push(member.roomId);
- userIdentities.set(identity);
- }
+ const updatedIdentity = addRoomToIdentity(identity, member.userId, member.roomId);
+ if (updatedIdentity) {
+ userIdentities.set(updatedIdentity);
}
}
| 4 |
diff --git a/src/settings.js b/src/settings.js @@ -24,7 +24,10 @@ export default class Settings {
/**
* Set the callback for returning the current timestamp.
+ * The function should return a number, which will be interpreted as an Epoch millisecond count
* @type {function}
+ * @example Settings.now = () => Date.now() + 3000 // pretend it is 3 seconds in the future
+ * @example Settings.now = () => 0 // always pretend it's Jan 1, 1970 at midnight in UTC time
*/
static set now(n) {
now = n;
| 7 |
diff --git a/framer/Color.coffee b/framer/Color.coffee @@ -303,10 +303,12 @@ class exports.Color extends BaseClass
colorA = new Color(colorA)
colorB = new Color(colorB)
- return false if Math.round(colorA.r) isnt Math.round(colorB.r)
- return false if Math.round(colorA.g) isnt Math.round(colorB.g)
- return false if Math.round(colorA.b) isnt Math.round(colorB.b)
- return false if Math.round(colorA.a) isnt Math.round(colorB.a)
+ tolerance = 1
+ alphaTolerance = 0.01
+ return false if Math.abs(colorA.r - colorB.r) >= tolerance
+ return false if Math.abs(colorA.g - colorB.g) >= tolerance
+ return false if Math.abs(colorA.b - colorB.b) >= tolerance
+ return false if Math.abs(colorA.a - colorB.a) >= alphaTolerance
return true
@rgbToHsl: (a, b, c) ->
| 7 |
diff --git a/OurUmbraco.Site/Views/Partials/Forum/Thread.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Thread.cshtml @@ -137,7 +137,7 @@ else
}
<!-- SignalR Stuff Starts-->
-<script src="http://ajax.aspnetcdn.com/ajax/signalr/jquery.signalr-2.2.2.js"></script>
+<script src="https://ajax.aspnetcdn.com/ajax/signalr/jquery.signalr-2.2.2.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.0/pnotify.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.0/pnotify.css" rel="stylesheet" type="text/css" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.0/pnotify.brighttheme.css" rel="stylesheet" type="text/css" />
| 3 |
diff --git a/src/compare-tree/index.js b/src/compare-tree/index.js @@ -121,14 +121,14 @@ CompareTree.prototype = {
node.disconnect(query)
- while (node) {
+ do {
if (node.isAlone()) {
node.orphan()
delete this.nodes[node.id]
}
node = node.parent
- }
+ } while (node)
}
delete this.nodes[query.id]
| 4 |
diff --git a/test/test_base.js b/test/test_base.js @@ -55,37 +55,37 @@ describe ('ccxt base code', () => {
})
})
- // it ('rate limiting works', async () => {
+ it.skip ('rate limiting works', async () => {
- // const calls = []
- // const rateLimit = 100
- // const exchange = new ccxt.Exchange ({
+ const calls = []
+ const rateLimit = 100
+ const exchange = new ccxt.Exchange ({
- // id: 'mock',
- // rateLimit,
- // enableRateLimit: true,
+ id: 'mock',
+ rateLimit,
+ enableRateLimit: true,
- // async executeRestRequest (...args) { calls.push ({ when: Date.now (), path: args[0], args }) }
- // })
+ async executeRestRequest (...args) { calls.push ({ when: Date.now (), path: args[0], args }) }
+ })
- // await exchange.fetch ('foo')
- // await exchange.fetch ('bar')
- // await exchange.fetch ('baz')
+ await exchange.fetch ('foo')
+ await exchange.fetch ('bar')
+ await exchange.fetch ('baz')
- // await Promise.all ([
- // exchange.fetch ('qux'),
- // exchange.fetch ('zap'),
- // exchange.fetch ('lol')
- // ])
+ await Promise.all ([
+ exchange.fetch ('qux'),
+ exchange.fetch ('zap'),
+ exchange.fetch ('lol')
+ ])
- // assert.deepEqual (calls.map (x => x.path), ['foo', 'bar', 'baz', 'qux', 'zap', 'lol'])
+ assert.deepEqual (calls.map (x => x.path), ['foo', 'bar', 'baz', 'qux', 'zap', 'lol'])
- // calls.reduce ((prevTime, call) => {
- // log ('delta T:', call.when - prevTime)
- // assert ((call.when - prevTime) >= rateLimit)
- // return call.when
- // }, 0)
- // })
+ calls.reduce ((prevTime, call) => {
+ log ('delta T:', call.when - prevTime)
+ assert ((call.when - prevTime) >= rateLimit)
+ return call.when
+ }, 0)
+ })
})
/* ------------------------------------------------------------------------ */
| 14 |
diff --git a/docs/permissions_list.md b/docs/permissions_list.md <tr>
<td> removeTransferLimitInPercentageMulti </td>
</tr>
+ <tr>
+ <td rowspan=16>Wallet</td>
+ <td rowspan=16>VestingEscrowWallet</td>
+ <td>depositTokens()</td>
+ <td rowspan=16>withPerm(ADMIN)</td>
+ </tr>
+ <tr>
+ <td>sendToTreasury()</td>
+ </tr>
+ <tr>
+ <td>pushAvailableTokens()</td>
+ </tr>
+ <tr>
+ <td>addTemplate()</td>
+ </tr>
+ <tr>
+ <td>removeTemplate()</td>
+ </tr>
+ <tr>
+ <td>addSchedule()</td>
+ </tr>
+ <tr>
+ <td>addScheduleFromTemplate()</td>
+ </tr>
+ <tr>
+ <td>modifySchedule()</td>
+ </tr>
+ <tr>
+ <td>revokeSchedule()</td>
+ </tr>
+ <tr>
+ <td>revokeAllSchedules()</td>
+ </tr>
+ <tr>
+ <td>trimBeneficiaries()</td>
+ </tr>
+ <tr>
+ <td>pushAvailableTokensMulti()</td>
+ </tr>
+ <tr>
+ <td>addScheduleMulti()</td>
+ </tr>
+ <tr>
+ <td>addScheduleFromTemplateMulti()</td>
+ </tr>
+ <tr>
+ <td>revokeSchedulesMulti()</td>
+ </tr>
+ <tr>
+ <td>modifyScheduleMulti()</td>
+ </tr>
</tbody>
</table>
| 3 |
diff --git a/build/datasources/states.js b/build/datasources/states.js @@ -13,7 +13,7 @@ const fixState = _.flow(
setFieldWith('dateChecked', 'checkTimeEt', totalDate),
_.set(
'notes',
- 'Please stop using the "total" field. Use "totalTestResults" instead. As of 4/24/20, "grade" is deprecated. Please use "comprehensiveGrade" instead.',
+ 'Please stop using the "total" field. Use "totalTestResults" instead. As of 4/24/20, "grade" is deprecated. Please use "dataQualityGrade" instead.',
),
)
@@ -53,7 +53,7 @@ const grade = {
),
_.set(
'notes',
- 'The following fields are deprecated: "positiveScore", "negativeScore", "negativeRegularScore", "commercialScore", and "score" as of 4/24/20. Please use "comprehensiveGrade" instead.',
+ 'The following fields are deprecated: "positiveScore", "negativeScore", "negativeRegularScore", "commercialScore", and "score" as of 4/24/20. Please use "dataQualityGrade" instead.',
),
// _.keyBy('state'),
),
| 10 |
diff --git a/bin/build b/bin/build @@ -16,9 +16,12 @@ echo "Converting SVG icons to PNG..."
echo "Compressing PNG icons..."
+set +e
+
optipng -quiet "src/icons/*.png"
optipng -quiet "src/icons/converted/*.png"
+set -e
# WebExtension
echo "Building WebExtension..."
| 8 |
diff --git a/assets/js/modules/tagmanager/setup.js b/assets/js/modules/tagmanager/setup.js @@ -44,7 +44,7 @@ import { isValidAccountID, isValidContainerID } from './util';
const ACCOUNT_CREATE = 'account_create';
const CONTAINER_CREATE = 'container_create';
-const UNSELECTED = 'unselected';
+const UNSELECTED = '';
class TagmanagerSetup extends Component {
constructor( props ) {
@@ -533,10 +533,6 @@ class TagmanagerSetup extends Component {
outlined
>
{ []
- .concat( {
- name: __( 'Select an account...', 'google-site-kit' ),
- accountId: UNSELECTED,
- } )
.concat( accounts )
.concat( ! hasExistingTag ? {
name: __( 'Set up a new account', 'google-site-kit' ),
@@ -566,10 +562,6 @@ class TagmanagerSetup extends Component {
outlined
>
{ []
- .concat( {
- name: __( 'Select a container', 'google-site-kit' ),
- publicId: UNSELECTED,
- } )
.concat( containers )
.concat( ! hasExistingTag ? {
name: __( 'Set up a new container', 'google-site-kit' ),
| 2 |
diff --git a/sparta_main_awsbinary.go b/sparta_main_awsbinary.go @@ -14,6 +14,7 @@ import (
"time"
"github.com/sirupsen/logrus"
+ "github.com/spf13/cobra"
"github.com/zcalusic/sysinfo"
)
@@ -47,6 +48,11 @@ func MainEx(serviceName string,
workflowHooks *WorkflowHooks,
useCGO bool) error {
+ // It's possible the user attached a custom command to the
+ // root command. If there is no command, then just run the
+ // Execute command...
+ CommandLineOptions.Root.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
+
// This can only run in AWS Lambda
formatter := &logrus.JSONFormatter{}
logger, loggerErr := NewLoggerWithFormatter("info", formatter)
@@ -64,9 +70,17 @@ func MainEx(serviceName string,
"BuildID": StampedBuildID,
"UTC": (time.Now().UTC().Format(time.RFC3339)),
}).Info(welcomeMessage)
-
- // All we can do is run the Execute call
- return Execute(serviceName, lambdaAWSInfos, logger)
+ OptionsGlobal.ServiceName = StampedServiceName
+ OptionsGlobal.Logger = logger
+ return nil
+ }
+ CommandLineOptions.Root.RunE = func(cmd *cobra.Command, args []string) error {
+ // By default run the Execute command
+ return Execute(StampedServiceName,
+ lambdaAWSInfos,
+ OptionsGlobal.Logger)
+ }
+ return CommandLineOptions.Root.Execute()
}
// Delete is not available in the AWS Lambda binary
| 11 |
diff --git a/RedactedScreenshots.user.js b/RedactedScreenshots.user.js // @description Masks and hides user-identifing info
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.4.2
+// @version 1.4.3
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
function cleanPage() {
// Reset UI (indication of votes/fav)
- $('.vote-up-on').removeClass('vote-up-on');
- $('.vote-down-on').removeClass('vote-down-on');
+ $('.vote-up-on, .vote-down-on').removeClass('vote-up-on vote-down-on');
$('.star-on').removeClass('star-on');
$('.favoritecount-selected').removeClass('favoritecount-selected');
// Remove/Reset other SOMU items
$('body').removeClass('usersidebar-open');
- $('.old-comment, .comment-summary b').css({
- 'color': 'inherit',
- 'font-weight': 'normal'
- });
+ $('.old-comment, .cmmt-rude, .cmmt-chatty').removeClass('old-comment cmmt-rude cmmt-chatty');
$('#usersidebar, #qtoc, .meta-mentioned, .post-stickyheader, .dissociate-post-link, .post-id').remove();
// Remove other userscript items
| 2 |
diff --git a/editor/js/vendor/ckeditor/plugins/xotlightbox/plugin.js b/editor/js/vendor/ckeditor/plugins/xotlightbox/plugin.js };
// Get references to the target dropdown and keep copy of the setup/commit functions
- var targetDropdown = linkDialogDefinition.contents[1].elements[0].children[0];
- var targetDropdownSetup = targetDropdown.setup;
- var targetDropdownCommit = targetDropdown.commit;
+ var linkTargetTypeDropdown = linkDialogDefinition.getContents('target').get("linkTargetType");
+ var linkTargetTypeDropdownSetup = linkTargetTypeDropdown.setup;
+ var linkTargetTypeDropdownCommit = linkTargetTypeDropdown.commit;
// Check if target dropdown should have Lightbox selected and fix
- targetDropdown.setup = function(data) {
+ linkTargetTypeDropdown.setup = function(data) {
if (featherlightAttribute) {
data.target.type = "_lightbox";
}
- targetDropdownSetup.apply(this, arguments);
+ linkTargetTypeDropdownSetup.apply(this, arguments);
};
// Check if link was Lightbox and remove target
- targetDropdown.commit = function(data) {
- targetDropdownCommit.apply(this, arguments);
+ linkTargetTypeDropdown.commit = function(data) {
+ linkTargetTypeDropdownCommit.apply(this, arguments);
if (data.target && data.target.type === "_lightbox") {
delete data.target;
};
// Add the Lightbox entry to the link dialog, target tab dropdown
- targetDropdown.items.push(["Lightbox", "_lightbox"]);
+ linkTargetTypeDropdown.items.push(["Lightbox", "_lightbox"]);
});
}
};
| 10 |
diff --git a/assets/js/components/user-input/UserInputQuestionnaire.js b/assets/js/components/user-input/UserInputQuestionnaire.js @@ -136,7 +136,7 @@ export default function UserInputQuestionnaire() {
// we need to select use a one-based index, hence the ` + 1` here for
// the `activeSlugIndex` selector.
global.document.getElementById( `googlesitekit-user-input-question-${ activeSlugIndex + 1 }` )?.scrollIntoView( { behavior: 'smooth' } );
- }, [ activeSlugIndex, shouldScrollToActiveQuestion ] );
+ }, [ activeSlugIndex ] );
// Update the callbacks and labels for the questions if the user is editing a *single question*.
let backCallback = back;
| 2 |
diff --git a/lib/core/engine.js b/lib/core/engine.js @@ -199,8 +199,6 @@ class Engine {
this.registerModule('swarm', {
addCheck: this.servicesMonitor.addCheck.bind(this.servicesMonitor),
storageConfig: this.config.storageConfig,
- host: _options.host,
- port: _options.port,
web3: _options.web3
});
}
| 2 |
diff --git a/src/module/actor/sheet/npc.js b/src/module/actor/sheet/npc.js @@ -88,7 +88,6 @@ export class ActorSheetSFRPGNPC extends ActorSheetSFRPG {
item.hasDamage = item.data.damage?.parts && item.data.damage.parts.length > 0 && (!["weapon", "shield"].includes(item.type) || item.data.equipped);
item.hasUses = item.data.uses && (item.data.uses.max > 0);
item.isCharged = !item.hasUses || item.data.uses?.value <= 0 || !item.isOnCooldown;
- console.log(item.type);
if (droneItemTypes.includes(item.type)) {
arr[3].push(item);
} else if (item.type === "spell") {
| 2 |
diff --git a/token-metadata/0x37737ad7E32ED440c312910CFc4A2e4D52867Caf/metadata.json b/token-metadata/0x37737ad7E32ED440c312910CFc4A2e4D52867Caf/metadata.json "symbol": "CMRA",
"address": "0x37737ad7E32ED440c312910CFc4A2e4D52867Caf",
"decimals": 3,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/docs/guides/building-a-minecraft-demo.md b/docs/guides/building-a-minecraft-demo.md @@ -370,8 +370,8 @@ responsible for teleporting around and the right hand responsible for spawning
and placing blocks.
```html
-<a-entity id="teleHand" hand-controls="left"></a-entity>
-<a-entity id="blockHand" hand-controls="right"></a-entity>
+<a-entity id="teleHand" hand-controls="hand: left"></a-entity>
+<a-entity id="blockHand" hand-controls="hand: right"></a-entity>
```
### Adding Teleportation to the Left Hand
@@ -396,8 +396,8 @@ component on the controller on the entity:
<!-- ... -->
-<a-entity id="teleHand" hand-controls="left" teleport-controls></a-entity>
-<a-entity id="blockHand" hand-controls="right"></a-entity>
+<a-entity id="teleHand" hand-controls="hand: left" teleport-controls></a-entity>
+<a-entity id="blockHand" hand-controls="hand: right"></a-entity>
```
Then we'll configure the `teleport-controls` component to use an arc `type` of
@@ -407,7 +407,7 @@ ground, but we can specify with `collisionEntities` to teleport on the blocks
`teleport-controls` component was created with:
```html
-<a-entity id="teleHand" hand-controls="left" teleport-controls="type: parabolic; collisionEntities: [mixin='voxel'], #ground"></a-entity>
+<a-entity id="teleHand" hand-controls="hand: left" teleport-controls="type: parabolic; collisionEntities: [mixin='voxel'], #ground"></a-entity>
```
That's it! **One script tag and one HTML attribute and we can teleport**. For
@@ -429,12 +429,12 @@ that attaches the clicking laser to VR tracked controllers. Like the
```html
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
-<script src="https://unpkg.com/[email protected]/dist/aframe-teleport-controls.min.js"></script>
+<script src="https://unpkg.com/[email protected]/dist/aframe-teleport-controls.min.js"></script>
<!-- ... -->
-<a-entity id="teleHand" hand-controls="left" teleport-controls="type: parabolic; collisionEntities: [mixin='voxel'], #ground"></a-entity>
-<a-entity id="blockHand" hand-controls="right" laser-controls></a-entity>
+<a-entity id="teleHand" hand-controls="hand: left" teleport-controls="type: parabolic; collisionEntities: [mixin='voxel'], #ground"></a-entity>
+<a-entity id="blockHand" hand-controls="hand: right" laser-controls></a-entity>
```
@@ -475,7 +475,7 @@ GitHub][intersection-spawn]. We attach `intersection-spawn` capabilities to the
right hand:
```html
-<a-entity id="blockHand" hand-controls="right" laser-controls intersection-spawn="event: click; mixin: voxel"></a-entity>
+<a-entity id="blockHand" hand-controls="hand: right" laser-controls intersection-spawn="event: click; mixin: voxel"></a-entity>
```
Now when we click, we spawn voxels!
@@ -490,7 +490,7 @@ component with the gaze-based `cursor` component so that we can also spawn
blocks on mobile and desktop, without changing a thing about the component!
```html
-<a-entity id="blockHand" hand-controls="right" laser-controls intersection-spawn="event: click; mixin: voxel"></a-entity>
+<a-entity id="blockHand" hand-controls="hand: right" laser-controls intersection-spawn="event: click; mixin: voxel"></a-entity>
<a-camera>
<a-cursor intersection-spawn="event: click; mixin: voxel"></a-cursor>
| 1 |
diff --git a/src/Header.module.css b/src/Header.module.css @@ -201,6 +201,30 @@ body {
overflow: hidden;
align-items: center;
}
+.header p
+{
+ display: block;
+ border-radius: 10px;
+ background-color: #333;
+ box-shadow: inset 0 10px 20px -10px #111;
+ /* background-image: linear-gradient(to bottom,#222222, #000000 20px); */
+ margin: 20px;
+ padding: 20px;
+ font-family: 'PlazaRegular';
+ /* font-family: 'WinchesterCaps'; */
+ font-size: 24px;
+ letter-spacing: 3px;
+}
+.header p b,
+.header p span
+{
+ display: block;
+ text-align: left;
+}
+.header p b {
+ margin-bottom: 10px;
+ font-size: 28px;
+}
.header input[type=range] {
margin: 0 10px;
}
| 0 |
diff --git a/src/createAuthScheme.js b/src/createAuthScheme.js @@ -5,6 +5,7 @@ const Boom = require('boom');
const createLambdaContext = require('./createLambdaContext');
const functionHelper = require('./functionHelper');
const debugLog = require('./debugLog');
+const utils = require('./utils');
const _ = require('lodash');
module.exports = function createAuthScheme(authFun, authorizerOptions, funName, endpointPath, options, serverlessLog, servicePath, serverless) {
@@ -31,18 +32,36 @@ module.exports = function createAuthScheme(authFun, authorizerOptions, funName,
debugLog(`Retrieved ${identityHeader} header ${authorization}`);
+ // Get path params
+ const pathParams = {};
+ Object.keys(request.params).forEach(key => {
+ // aws doesn't auto decode path params - hapi does
+ pathParams[key] = encodeURIComponent(request.params[key]);
+ });
+
+ let event, handler;
+
// Create event Object for authFunction
// methodArn is the ARN of the function we are running we are authorizing access to (or not)
// Account ID and API ID are not simulated
- const event = {
+ if (authorizerOptions.type === 'request') {
+ event = {
+ type: 'REQUEST',
+ headers: request.headers,
+ pathParameters: utils.nullIfEmpty(pathParams),
+ queryStringParameters: utils.nullIfEmpty(request.query),
+ methodArn: `arn:aws:execute-api:${options.region}:random-account-id:random-api-id/${options.stage}/${request.method.toUpperCase()}${request.path.replace(new RegExp(`^/${options.stage}`), '')}`,
+ };
+ }
+ else {
+ event = {
type: 'TOKEN',
authorizationToken: authorization,
methodArn: `arn:aws:execute-api:${options.region}:random-account-id:random-api-id/${options.stage}/${request.method.toUpperCase()}${request.path.replace(new RegExp(`^/${options.stage}`), '')}`,
};
+ }
// Create the Authorization function handler
- let handler;
-
try {
handler = functionHelper.createHandler(funOptions, options);
}
| 0 |
diff --git a/token-metadata/0xB4EFd85c19999D84251304bDA99E90B92300Bd93/metadata.json b/token-metadata/0xB4EFd85c19999D84251304bDA99E90B92300Bd93/metadata.json "symbol": "RPL",
"address": "0xB4EFd85c19999D84251304bDA99E90B92300Bd93",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/assets/js/components/data/index.js b/assets/js/components/data/index.js @@ -28,7 +28,7 @@ import {
getQueryParameter,
sortObjectProperties,
} from 'SiteKitCore/util';
-import { cloneDeep, each, sortBy } from 'lodash';
+import { cloneDeep, each, intersection, isEqual, sortBy } from 'lodash';
/**
* WordPress dependencies
@@ -231,14 +231,19 @@ const dataAPI = {
},
handleWPError( error ) {
- const { code, data } = error;
-
- if ( ! code || ! data ) {
+ const wpErrorKeys = [ 'code', 'data', 'message' ];
+ const commonKeys = intersection( wpErrorKeys, Object.keys( error ) );
+ if ( ! isEqual( wpErrorKeys, commonKeys ) ) {
return;
}
// eslint-disable-next-line no-console
console.warn( 'WP Error in data response', error );
+ const { data } = error;
+
+ if ( ! data.reason ) {
+ return;
+ }
let addedNoticeCount = 0;
| 7 |
diff --git a/src/js/services/shapeShiftApiService.js b/src/js/services/shapeShiftApiService.js @@ -23,15 +23,17 @@ var ShapeShift = (function() {
if (xmlhttp.status == 200) {
var parsedResponse = JP(xmlhttp.responseText);
cb.apply(null, [parsedResponse]);
- } else if (xmlhttp.status === 500) {
- var parsedResponse = JP(xmlhttp.responseText);
- if (typeof parsedResponse.error === 'string') {
- cb.apply(null, [parsedResponse]);
} else {
- cb.apply(null, [new Error('Request Failed')]);
+ var cbResponse = new Error('Request Failed');
+ if (xmlhttp.status === 500) {
+ try {
+ var errorResponse = JSON.parse(xmlhttp.responseText);
+ if (typeof errorResponse.error === 'string') {
+ cbResponse = errorResponse;
}
- } else {
- cb.apply(null, [new Error('Request Failed')])
+ } catch (e) { /* nop */ }
+ }
+ cb.apply(null, [cbResponse]);
}
}
};
| 9 |
diff --git a/app/app.js b/app/app.js @@ -78,9 +78,9 @@ module.exports = (options) => {
// Define middleware for all routes
app.use('*', function (request, response, next) {
- response.locals.legacy = request.query['legacy'] === '1'
+ response.locals.legacy = (request.query['legacy'] === '1' || request.query['legacy'] === 'true')
if (response.locals.legacy) {
- response.locals.legacyQuery = '?legacy=1'
+ response.locals.legacyQuery = '?legacy=' + request.query['legacy']
} else {
response.locals.legacyQuery = ''
}
| 9 |
diff --git a/app/models/daos/slick/DBTableDefinitions.scala b/app/models/daos/slick/DBTableDefinitions.scala @@ -7,7 +7,7 @@ object DBTableDefinitions {
case class DBUser (userId: String, username: String, email: String )
- class UserTable(tag: Tag) extends Table[DBUser](tag, Some("sidewalk"), "user") {
+ class UserTable(tag: Tag) extends Table[DBUser](tag, Some("sidewalk"), "sidewalk_user") {
def userId = column[String]("user_id", O.PrimaryKey)
def username = column[String]("username")
def email = column[String]("email")
| 3 |
diff --git a/example/README.md b/example/README.md @@ -16,9 +16,8 @@ Not a Mapbox user yet? [Sign up for an account here](https://www.mapbox.com/sign
## Installation
-* Make sure you are in the example directory under the `v6` branch
+* Make sure you are in the example directory
```
-git checkout v6
cd example
```
* Create a file called `accesstoken` in the root of the example project and just paste in your [Mapbox access token](https://www.mapbox.com/studio/account/tokens/).
| 3 |
diff --git a/src/components/topic/summary/TopicInfo.js b/src/components/topic/summary/TopicInfo.js @@ -21,7 +21,9 @@ const TopicInfo = (props) => {
// only show error ugly stack trace to admin users
stateMessage = (<Permissioned onlyTopic={PERMISSION_TOPIC_ADMIN}>{topic.message}</Permissioned>);
}
- const sourcesAndCollections = [...topic.media, ...topic.media_tags];
+ // TODO: make sure there is content in here
+ let sourcesAndCollections = topic.media ? [...topic.media] : [];
+ sourcesAndCollections = topic.media_tags ? [...sourcesAndCollections, ...topic.media_tags] : sourcesAndCollections;
return (
<DataCard className="topic-info">
<h2>
| 9 |
diff --git a/src/js/components/Drop/DropContainer.js b/src/js/components/Drop/DropContainer.js @@ -38,7 +38,7 @@ class DropContainer extends Component {
addScrollListener = () => {
const { target } = this.props;
- this.scrollParents = findScrollParents(target);
+ this.scrollParents = findScrollParents(findDOMNode(target));
this.scrollParents.forEach(scrollParent => scrollParent.addEventListener('scroll', this.place));
}
| 1 |
diff --git a/docs/basics/Rules.md b/docs/basics/Rules.md @@ -171,5 +171,5 @@ const rule = props => ({
* [FAQ - Rules](../FAQ.md#rules)
#### Tools
-**[fela-stylesheet](https://github.com/rofrischmann/fela-stylesheet)**<br>
+**[StyleSheet](https://github.com/rofrischmann/fela/blob/master/packages/fela-tools/docs/StyleSheet.md)**<br>
Organize your rules grouped StyleSheets
| 1 |
diff --git a/modules/@apostrophecms/login/index.js b/modules/@apostrophecms/login/index.js @@ -431,10 +431,18 @@ module.exports = {
middleware(self, options) {
return {
- passportInitialize: self.passport.initialize(),
- passportSession: self.passport.session(),
+ passportInitialize: {
+ before: '@apostrophecms/i18n',
+ middleware: self.passport.initialize()
+ },
+ passportSession: {
+ before: '@apostrophecms/i18n',
+ middleware: self.passport.session()
+ },
+ addUserToData: {
+ before: '@apostrophecms/i18n',
+ middleware(req, res, next) {
// Add the `user` property to `req.data` when a user is logged in.
- addUserToData(req, res, next) {
if (req.user) {
req.data.user = req.user;
return next();
@@ -442,6 +450,7 @@ module.exports = {
return next();
}
}
+ }
};
}
};
| 9 |
diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js @@ -174,6 +174,14 @@ Lbry.publishDeprecated = (params, fileListedCallback, publishedCallback, errorCa
Lbry.imagePath = file => `${staticResourcesPath}/img/${file}`;
+Lbry.getAppVersionInfo = () =>
+ new Promise(resolve => {
+ ipcRenderer.once('version-info-received', (event, versionInfo) => {
+ resolve(versionInfo);
+ });
+ ipcRenderer.send('version-info-requested');
+ });
+
Lbry.getMediaType = (contentType, fileName) => {
if (contentType) {
return /^[^/]+/.exec(contentType)[0];
| 13 |
diff --git a/app/assets/stylesheets/organization/organization_users_list.css.scss b/app/assets/stylesheets/organization/organization_users_list.css.scss @@ -99,7 +99,7 @@ $selectedItemPaddingOnSides: $sMargin-element - 1px;
.OrganizationList-userLink:hover {
cursor: pointer;
- .OrganizationList-userInfoName {
+ &:not(.is-disabled) .OrganizationList-userInfoName {
color: $cTypography-linkHover;
}
}
| 2 |
diff --git a/app/components/job/Index/index.js b/app/components/job/Index/index.js @@ -118,7 +118,7 @@ class AgentIndex extends React.Component {
}
handleAgentQueryRuleSearch = (event) => {
- const agentQueryRules = event.target.value == "" ? null : event.target.value;
+ const agentQueryRules = event.target.value == "" ? null : event.target.value.split(" ");
clearTimeout(this._timeout);
| 9 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,12 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.41.2] -- 2018-09-19
+
+### Fixed
+- Fix two-sided zoombox -> double-click -> one-sided zoombox behavior [#3028]
+
+
## [1.41.1] -- 2018-09-18
### Fixed
| 3 |
diff --git a/webaverse.js b/webaverse.js @@ -392,7 +392,7 @@ export default class Webaverse extends EventTarget {
cameraManager.update(timeDiffCapped);
const localPlayer = metaversefileApi.useLocalPlayer();
- if (this.contentLoaded) {
+ if (this.contentLoaded && physicsManager.getPhysicsEnabled()) {
//if(performance.now() - lastTimestamp < 1000/60) return; // There might be a better solution, we need to limit the simulate time otherwise there will be jitter at different FPS
physicsManager.simulatePhysics(timeDiffCapped);
localPlayer.updatePhysics(timestamp, timeDiffCapped);
| 0 |
diff --git a/examples/hello_ml.html b/examples/hello_ml.html <script src="FBXLoader.js"></script>
<script>
let container, scene, camera, display, model, controllerMeshes, eyeMesh;
- let mesher = null, planeTracker = null, eyeTracker = null;
+ let mesher = null, planeTracker = null, handTracker = null, eyeTracker = null;
const controllerGeometry = new THREE.BoxBufferGeometry(0.1, 0.2, 0.01);
const controllerMaterial = new THREE.MeshPhongMaterial({
indexAttribute.needsUpdate = true;
geometry.setDrawRange(0, indexIndex);
};
+ mesh.visible = false;
mesh.frustumCulled = false;
return mesh;
})();
scene.add(handMesh);
- const _onHand = hands => {
+ const _onHands = hands => {
handMesh.update(hands);
};
let enabled = false;
const _enable = () => {
- window.browser.nativeMl.RequestHand(_onHand);
mesher = window.browser.nativeMl.RequestMeshing();
mesher.onmesh = _onMesh;
planeTracker = window.browser.nativeMl.RequestPlaneTracking();
planeTracker.onplanes = _onPlanes;
+ handTracker = window.browser.nativeMl.RequestHandTracking();
+ handTracker.onhands = _onHands;
+ handMesh.visible = true;
eyeTracker = window.browser.nativeMl.RequestEyeTracking();
enabled = true;
};
const _disable = () => {
- window.browser.nativeMl.CancelHand(_onHand);
- handMeshes.forEach(handMesh => {
- handMesh.visible = false;
- });
mesher.destroy();
mesher = null;
_clearTerrainMeshes();
planeTracker.destroy();
planeTracker = null;
_clearPlanes();
+ handTracker.destroy();
+ handTracker = null;
+ handMesh.visible = false;
eyeTracker.destroy();
eyeTracker = null;
| 4 |
diff --git a/src/utils/file-handlers/use-aws-cognito/update-aws-storage.js b/src/utils/file-handlers/use-aws-cognito/update-aws-storage.js @@ -42,6 +42,7 @@ export default (file) => {
}
function createOrReplaceImages(file) {
+ // TODO you can't have async in a forEach loop
if (!isEmpty(file.content.samples)) {
file.content.samples.forEach(async (element) => {
try {
@@ -72,6 +73,12 @@ export default (file) => {
if (fileNameExist(file)) {
var dataset = file.content
+ // TODO datasetHelper.setSamplesName is returning an incorrect object, it
+ // should be returning an array of samples
+ console.log(
+ "this should be an array of samples",
+ datasetHelper.setSamplesName(dataset)
+ )
file = setIn(
file,
["content"],
| 12 |
diff --git a/package.json b/package.json "description": "The Apostrophe Content Management System.",
"main": "index.js",
"scripts": {
- "pretest": "npm run lint && npm audit",
+ "pretest": "npm run lint",
"test": "nyc --reporter=html mocha -t 10000",
+ "posttest": "npm audit",
"lint": "eslint . && node scripts/lint-i18n"
},
"repository": {
| 5 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.