code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/console_web/controllers/router/device_controller.ex b/lib/console_web/controllers/router/device_controller.ex @@ -153,8 +153,8 @@ defmodule ConsoleWeb.Router.DeviceController do
Devices.update_device(device, %{
"last_connected" => event.reported_at_naive,
- "frame_up" => event.data["frame_up"],
- "frame_down" => event.data["frame_down"],
+ "frame_up" => event.frame_up,
+ "frame_down" => event.frame_down,
"total_packets" => device.total_packets + packet_count,
"dc_usage" => device.dc_usage + dc_used,
}, "router")
| 4 |
diff --git a/src/core/config/Categories.json b/src/core/config/Categories.json "Encode text",
"Decode text",
"Remove Diacritics",
- "Unescape Unicode Characters"
+ "Unescape Unicode Characters",
+ "Convert to NATO alphabet"
]
},
{
| 0 |
diff --git a/templates/copyedit/note.txt b/templates/copyedit/note.txt @@ -3,7 +3,7 @@ This graphic accompanies __AUTHOR__'s story, running __TIME__, about __SUBJECT__
{% pluralize %}
These graphics accompany __AUTHOR__'s story, running __TIME__, about __SUBJECT__.
{% endtrans %}
-Story URL (not yet published): http://seamus.npr.org/templates/story/story.php?storyId=__SEAMUS_ID__&live=1
+Story URL (not yet published): http://www.npr.org/templates/story/story.php?storyId=__SEAMUS_ID__&live=1
Expected run date: __TIME__
| 3 |
diff --git a/blockchain.js b/blockchain.js @@ -9,10 +9,10 @@ const {Transaction, Common} = ethereumJsTx;
import addresses from 'https://contracts.webaverse.com/ethereum/address.js';
import abis from 'https://contracts.webaverse.com/ethereum/abi.js';
let {
- main: {Account: AccountAddress, FT: FTAddress, NFT: NFTAddress, FTProxy: FTProxyAddress, NFTProxy: NFTProxyAddress, Trade: TradeAddress},
- sidechain: {Account: AccountAddressSidechain, FT: FTAddressSidechain, NFT: NFTAddressSidechain, FTProxy: FTProxyAddressSidechain, NFTProxy: NFTProxyAddressSidechain, Trade: TradeAddressSidechain},
+ main: {Account: AccountAddress, FT: FTAddress, NFT: NFTAddress, FTProxy: FTProxyAddress, NFTProxy: NFTProxyAddress, Trade: TradeAddress, LAND: LANDAddress, LANDProxy: LANDProxyAddress},
+ sidechain: {Account: AccountAddressSidechain, FT: FTAddressSidechain, NFT: NFTAddressSidechain, FTProxy: FTProxyAddressSidechain, NFTProxy: NFTProxyAddressSidechain, Trade: TradeAddressSidechain, LAND: LANDAddressSidechain, LANDProxy: LANDProxyAddressSidechain},
} = addresses;
-let {Account: AccountAbi, FT: FTAbi, FTProxy: FTProxyAbi, NFT: NFTAbi, NFTProxy: NFTProxyAbi, Trade: TradeAbi} = abis;
+let {Account: AccountAbi, FT: FTAbi, FTProxy: FTProxyAbi, NFT: NFTAbi, NFTProxy: NFTProxyAbi, Trade: TradeAbi, LAND: LANDAbi, LANDProxy: LANDProxyAbi} = abis;
const web3 = {
main: new Web3(window.ethereum),
@@ -27,6 +27,8 @@ const contracts = {
NFT: new web3['main'].eth.Contract(NFTAbi, NFTAddress),
NFTProxy: new web3['main'].eth.Contract(NFTProxyAbi, NFTProxyAddress),
Trade: new web3['main'].eth.Contract(TradeAbi, TradeAddress),
+ LAND: new web3['main'].eth.Contract(LANDAbi, LANDAddress),
+ LANDProxy: new web3['main'].eth.Contract(LANDProxyAbi, LANDProxyAddress),
},
sidechain: {
Account: new web3['sidechain'].eth.Contract(AccountAbi, AccountAddressSidechain),
@@ -35,6 +37,8 @@ const contracts = {
NFT: new web3['sidechain'].eth.Contract(NFTAbi, NFTAddressSidechain),
NFTProxy: new web3['sidechain'].eth.Contract(NFTProxyAbi, NFTProxyAddressSidechain),
Trade: new web3['sidechain'].eth.Contract(TradeAbi, TradeAddressSidechain),
+ LAND: new web3['sidechain'].eth.Contract(LANDAbi, LANDAddressSidechain),
+ LANDProxy: new web3['sidechain'].eth.Contract(LANDProxyAbi, LANDProxyAddressSidechain),
},
};
| 0 |
diff --git a/packages/app/src/components/Sidebar/PageTree/Item.tsx b/packages/app/src/components/Sidebar/PageTree/Item.tsx @@ -216,7 +216,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
if (monitor.isOver()) {
setIsOpen(true);
}
- }, 1000);
+ }, 600);
}
},
canDrop: (item) => {
@@ -410,7 +410,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
className={`grw-pagetree-button btn ${isOpen ? 'grw-pagetree-open' : ''}`}
onClick={onClickLoadChildren}
>
- <div className="grw-triangle-icon d-flex justify-content-center">
+ <div className="d-flex justify-content-center">
<TriangleIcon />
</div>
</button>
| 7 |
diff --git a/index.js b/index.js @@ -20,10 +20,10 @@ class Option {
constructor(flags, description) {
this.flags = flags;
- this.required = flags.indexOf('<') >= 0; // A value must be supplied when the option is specified.
- this.optional = flags.indexOf('[') >= 0; // A value is optional when the option is specified.
+ this.required = flags.includes('<'); // A value must be supplied when the option is specified.
+ this.optional = flags.includes('['); // A value is optional when the option is specified.
this.mandatory = false; // The option must have a value after parsing, which usually means it must be specified on command line.
- this.negate = flags.indexOf('-no-') !== -1;
+ this.negate = flags.includes('-no-');
const flagParts = flags.split(/[ ,|]+/);
if (flagParts.length > 1 && !/^[[<]/.test(flagParts[1])) this.short = flagParts.shift();
this.long = flagParts.shift();
@@ -1722,8 +1722,9 @@ function incrementNodeInspectorPort(args) {
// --inspect-brk[=[host:]port]
// --inspect-port=[host:]port
return args.map((arg) => {
- let result = arg;
- if (arg.indexOf('--inspect') === 0) {
+ if (!arg.startsWith('--inspect')) {
+ return arg;
+ }
let debugOption;
let debugHost = '127.0.0.1';
let debugPort = '9229';
@@ -1748,9 +1749,8 @@ function incrementNodeInspectorPort(args) {
}
if (debugOption && debugPort !== '0') {
- result = `${debugOption}=${debugHost}:${parseInt(debugPort) + 1}`;
- }
+ return `${debugOption}=${debugHost}:${parseInt(debugPort) + 1}`;
}
- return result;
+ return arg;
});
}
| 14 |
diff --git a/assets/js/components/adminbar/AdminBarImpressions.js b/assets/js/components/adminbar/AdminBarImpressions.js @@ -65,7 +65,7 @@ function AdminBarImpressions( { WidgetReportZero } ) {
}
if ( isZeroReport( searchConsoleData ) ) {
- return <WidgetReportZero moduleSlug="search-console" widgetSlug={ WIDGET_SLUG } />;
+ return <WidgetReportZero moduleSlug="search-console" />;
}
// Split the data in two chunks.
| 2 |
diff --git a/src/sections/target/MolecularInteractions/IntactTab.js b/src/sections/target/MolecularInteractions/IntactTab.js @@ -79,6 +79,7 @@ function IntactTab({ ensgId, symbol, query }) {
</Typography>
</>
),
+ exportValue: row => row.targetB?.approvedSymbol || row.intB,
width: '40%',
},
{
@@ -106,6 +107,8 @@ function IntactTab({ ensgId, symbol, query }) {
</MethodIconText>
</>
),
+ exportValue: row =>
+ `A: ${row.intABiologicalRole}, B: ${row.intBBiologicalRole}`,
width: '23%',
},
{
@@ -119,8 +122,8 @@ function IntactTab({ ensgId, symbol, query }) {
</span>
</>
),
+ exportValue: row => row.count,
width: '23%',
- // exportValue: row => (row.disease ? label(row.disease.name) : naLabel),
},
],
| 1 |
diff --git a/src/core/Utils.test.js b/src/core/Utils.test.js @@ -168,11 +168,21 @@ describe('core/utils', () => {
})
it('should determine the filetype from the extension', () => {
- const file = {
+ const fileMP3 = {
name: 'foo.mp3',
data: 'sdfsfhfh329fhwihs'
}
- expect(utils.getFileType(file)).toEqual('audio/mp3')
+ const fileYAML = {
+ name: 'bar.yaml',
+ data: 'sdfsfhfh329fhwihs'
+ }
+ const fileMKV = {
+ name: 'bar.mkv',
+ data: 'sdfsfhfh329fhwihs'
+ }
+ expect(utils.getFileType(fileMP3)).toEqual('audio/mp3')
+ expect(utils.getFileType(fileYAML)).toEqual('text/yaml')
+ expect(utils.getFileType(fileMKV)).toEqual('video/x-matroska')
})
it('should fail gracefully if unable to detect', () => {
| 0 |
diff --git a/ui/app/app.js b/ui/app/app.js @@ -395,7 +395,7 @@ App.prototype.renderDropdown = function () {
h(DropdownMenuItem, {
closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
onClick: () => { this.props.dispatch(actions.lockMetamask()) },
- }, 'Lock'),
+ }, 'Log Out'),
h(DropdownMenuItem, {
closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
| 10 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.4.0
- Added: `ignore:["delay"]` to `time-min-milliseconds` ([#4743](https://github.com/stylelint/stylelint/pull/4743)).
- Added: `ignoreFunctions: []` to `value-keyword-case` ([#4733](https://github.com/stylelint/stylelint/pull/4733)).
| 6 |
diff --git a/src/resources/views/crud/filters/date_range.blade.php b/src/resources/views/crud/filters/date_range.blade.php "{{trans('backpack::crud.november')}}",
"{{trans('backpack::crud.december')}}"
],
- "firstDay": {{var_export($filterOptions['weekFirstDay'] ?? 0)}}
+ "firstDay": {{var_export($filterOptions['firstDay'] ?? 0)}}
},
alwaysShowCalendars: true,
autoUpdateInput: true
| 1 |
diff --git a/src/react/projects/spark-react/src/SprkPagination/SprkPagination.js b/src/react/projects/spark-react/src/SprkPagination/SprkPagination.js @@ -70,7 +70,7 @@ const SprkPagination = (props) => {
>
<li>
<SprkLink
- href="#"
+ href="#nogo"
onClick={e => goToPage(e, currentPage - 1)}
additionalClasses={leftLinkClasses}
variant="plain"
@@ -86,7 +86,7 @@ const SprkPagination = (props) => {
<li key={uniqueId('sprk_page_')}>
<SprkLink
onClick={e => goToPage(e, 1)}
- href="#"
+ href="#nogo"
additionalClasses={
classnames(
'sprk-c-Pagination__link',
@@ -111,7 +111,7 @@ const SprkPagination = (props) => {
<li key={uniqueId('sprk_page_')}>
<SprkLink
onClick={e => goToPage(e, currentPage)}
- href="#"
+ href="#nogo"
additionalClasses={
classnames(
'sprk-c-Pagination__link',
@@ -137,7 +137,7 @@ const SprkPagination = (props) => {
<li key={uniqueId('sprk_page_')}>
<SprkLink
onClick={e => goToPage(e, totalPages)}
- href="#"
+ href="#nogo"
additionalClasses={
classnames(
'sprk-c-Pagination__link',
@@ -157,7 +157,7 @@ const SprkPagination = (props) => {
<li key={uniqueId('sprk_page_')}>
<SprkLink
onClick={e => goToPage(e, 2)}
- href="#"
+ href="#nogo"
additionalClasses={
classnames(
'sprk-c-Pagination__link',
@@ -176,7 +176,7 @@ const SprkPagination = (props) => {
<li key={uniqueId('sprk_page_')}>
<SprkLink
onClick={e => goToPage(e, 3)}
- href="#"
+ href="#nogo"
additionalClasses={
classnames(
'sprk-c-Pagination__link',
@@ -193,7 +193,7 @@ const SprkPagination = (props) => {
<li>
<SprkLink
- href="#"
+ href="#nogo"
onClick={e => goToPage(e, currentPage + 1)}
additionalClasses={rightLinkClasses}
variant="plain"
| 3 |
diff --git a/lib/GoogleHome.js b/lib/GoogleHome.js @@ -1376,7 +1376,7 @@ class GoogleHome {
let smartName = this.getSmartName(objects, id);
if (!(smartName === undefined) && (smartName === 'ignore' || smartName === false)) {
- this.adapter.log.warn(id +" is ignored because the property smartName is false or ignore. To use this state again, remove the property smartName in Object explorer or add it manually in Google Devices")
+ this.adapter.log.warn(id +" is ignored because the property smartName is false or ignore. To use this state again, remove the property smartName in Object explorer or add it manually under Google Devices")
return;
}
@@ -1525,10 +1525,17 @@ class GoogleHome {
this.adapter.log.debug("SmartEnum is equal child skip child detection")
return;
}
+
+ if ( result[childID] && !result[childID].smartEnum) {
+ result[childID].parentId = id;
+ this.adapter.log.warn(childID + " has custom settings this is overriding autodetected settings. To use autodetected settings please delete this state in the instance settings under Google Devices.")
+ return;
+ }
const trait = customToTraitEnum[element.substring(4)]
result[childID] = {}
result[childID].traits = [trait]
result[childID].roomHint = roomName
+ result[childID].smartEnum = 'X';
result[childID].type = result[id].type
result[childID].ioType = objects[childID] ? objects[childID].type : "";
| 7 |
diff --git a/dual-contouring.js b/dual-contouring.js @@ -185,25 +185,48 @@ const _parseTerrainVertexBuffer = (arrayBuffer, bufferAddress) => {
const biomes = new Int32Array(arrayBuffer, bufferAddress + index, numBiomes * 4);
index += Int32Array.BYTES_PER_ELEMENT * numBiomes * 4;
- // biome weights
+ // biomes weights
const numBiomesWeights = dataView.getUint32(index, true);
index += Uint32Array.BYTES_PER_ELEMENT;
const biomesWeights = new Float32Array(arrayBuffer, bufferAddress + index, numBiomesWeights * 4);
index += Float32Array.BYTES_PER_ELEMENT * numBiomesWeights * 4;
+ // biomes uvs
+ const numBiomesUvs = dataView.getUint32(index, true);
+ index += Uint32Array.BYTES_PER_ELEMENT;
+ const biomesUvs = new Float32Array(arrayBuffer, bufferAddress + index, numBiomesUvs * 8);
+ index += Float32Array.BYTES_PER_ELEMENT * numBiomesUvs * 8;
+
// indices
const numIndices = dataView.getUint32(index, true);
index += Uint32Array.BYTES_PER_ELEMENT;
const indices = new Uint32Array(arrayBuffer, bufferAddress + index, numIndices);
index += Uint32Array.BYTES_PER_ELEMENT * numIndices;
+ // skylights
+ const numSkylights = dataView.getUint32(index, true);
+ index += Uint32Array.BYTES_PER_ELEMENT;
+ const skylights = new Uint8Array(arrayBuffer, bufferAddress + index, numSkylights);
+ index += Uint8Array.BYTES_PER_ELEMENT * numSkylights;
+ index = align4(index);
+
+ // aos
+ const numAos = dataView.getUint32(index, true);
+ index += Uint32Array.BYTES_PER_ELEMENT;
+ const aos = new Uint8Array(arrayBuffer, bufferAddress + index, numAos);
+ index += Uint8Array.BYTES_PER_ELEMENT * numAos;
+ index = align4(index);
+
return {
bufferAddress,
positions,
normals,
biomes,
biomesWeights,
+ biomesUvs,
indices,
+ skylights,
+ aos,
};
};
w.createTerrainChunkMeshAsync = async (inst, x, y, z, lods) => {
| 0 |
diff --git a/src/index.js b/src/index.js @@ -66,9 +66,4 @@ const plugin = postcss.plugin('tailwind', config => {
])
})
-plugin.defaultConfig = function() {
- // prettier-ignore
- throw new Error("`require('tailwindcss').defaultConfig()` is no longer a function, access it instead as `require('tailwindcss/defaultConfig')()`.")
-}
-
module.exports = plugin
| 2 |
diff --git a/docs/README.md b/docs/README.md @@ -193,12 +193,9 @@ Next Install Prerequisites: Open a command line and type
This is similar to Linux. First install Xcode and [homebrew](https://brew.sh/)
if you do not already have these installed.
-Then install the pre-requisite packages using brew -- the instructions below
-are for Node V.10.
+Also install node v12 or v14.
- brew install python2 python3 nodejs cmake node@10 doxygen graphviz
- brew link python2
- brew link --force node@10
+ brew install cmake doxygen graphviz
brew cask install java
| 2 |
diff --git a/editor/sanitize.js b/editor/sanitize.js @@ -162,7 +162,7 @@ svgedit.sanitize.sanitizeSvg = function(node) {
// TODO(codedread): Programmatically add the se: attributes to the NS-aware whitelist.
// Bypassing the whitelist to allow se: prefixes.
// Is there a more appropriate way to do this?
- if (attrName.indexOf('se:') === 0) {
+ if (attrName.indexOf('se:') === 0 || attrName.indexOf('data-') === 0) {
seAttrs.push([attrName, attr.value]);
}
node.removeAttributeNS(attrNsURI, attrLocalName);
| 11 |
diff --git a/content/publishing-yaml/distribution.md b/content/publishing-yaml/distribution.md @@ -85,6 +85,10 @@ publishing:
rollout_fraction: 0.25 # Rollout fraction (set only if releasing to a fraction of users): value between (0, 1)
```
+If you are getting a 400 error related to app being in draft status it means you need to promote your draft build to the next level up of testing tracks. Play Console will show you how to do this. You'll need to go through the steps, fill out questionnaires, upload various screen shots and then after approval you can move to the Alpha testing track and Codemagic will publish (publishing builds on Draft status is not supported).
+
+If you are getting an error related to permissions then it is likely an issue related to the service account that has been created. Go through the steps of creating a service account once more carefully see how to [set up a service account](../knowledge-base/google-play-api/).
+
{{<notebox>}}
You can override the publishing track specified in the configuration file using the environment variable `GOOGLE_PLAY_TRACK`. This is useful if you're starting your builds via [Codemagic API](../rest-api/overview/) and want to build different configurations without editing the configuration file.
{{</notebox>}}
| 3 |
diff --git a/edit.js b/edit.js @@ -6430,7 +6430,7 @@ for (let i = 0; i < tools.length; i++) {
break;
}
case 'firstperson': {
- document.dispatchEvent(new MouseEvent('mouseup'));
+ // document.dispatchEvent(new MouseEvent('mouseup'));
renderer.domElement.requestPointerLock();
break;
}
@@ -6438,7 +6438,7 @@ for (let i = 0; i < tools.length; i++) {
camera.position.sub(localVector.copy(avatarCameraOffset).applyQuaternion(camera.quaternion));
camera.updateMatrixWorld();
- document.dispatchEvent(new MouseEvent('mouseup'));
+ // document.dispatchEvent(new MouseEvent('mouseup'));
renderer.domElement.requestPointerLock();
decapitate = false;
break;
@@ -6449,7 +6449,7 @@ for (let i = 0; i < tools.length; i++) {
camera.position.sub(localVector.copy(isometricCameraOffset).applyQuaternion(camera.quaternion));
camera.updateMatrixWorld();
- document.dispatchEvent(new MouseEvent('mouseup'));
+ // document.dispatchEvent(new MouseEvent('mouseup'));
renderer.domElement.requestPointerLock();
decapitate = false;
break;
@@ -6460,7 +6460,7 @@ for (let i = 0; i < tools.length; i++) {
camera.position.y -= -birdsEyeHeight + _getAvatarHeight();
camera.updateMatrixWorld();
- document.dispatchEvent(new MouseEvent('mouseup'));
+ // document.dispatchEvent(new MouseEvent('mouseup'));
renderer.domElement.requestPointerLock();
decapitate = false;
break;
| 2 |
diff --git a/app/models/geocoding.rb b/app/models/geocoding.rb @@ -37,10 +37,6 @@ class Geocoding < Sequel::Model
attr_reader :started_at, :finished_at
attr_reader :log
- def self.get_geocoding_calls(dataset, date_from, date_to)
- dataset.where(kind: 'high-resolution').where('geocodings.created_at >= ? and geocodings.created_at <= ?', date_from, date_to + 1.days).sum("processed_rows + cache_hits".lit).to_i
- end
-
def self.get_not_aggregated_user_geocoding_calls(db, user_id, date_from, date_to)
geocoding_calls_sql = "SELECT date(created_at), sum(processed_rows) as processed_rows, " \
"sum(cache_hits) as cache_hits FROM geocodings WHERE kind = 'high-resolution' " \
| 2 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -520,12 +520,6 @@ articles:
- title: View Signing Certificates
url: /config/tenant-settings/signing-keys/view-signing-certificates
hidden: true
- - title: Copy Signing Certificates
- url: /config/tenant-settings/signing-keys/copy-signing-certificates
- hidden: true
- - title: Download Signing Certificates
- url: /config/tenant-settings/signing-keys/download-signing-certificates
- hidden: true
- title: Configure Session Lifetime Settings
url: /get-started/dashboard/configure-session-lifetime-settings
- title: Enable SSO for Legacy Tenants
| 2 |
diff --git a/token-metadata/0xB4742e2013f96850a5CeF850A3bB74cF63B9a5D5/metadata.json b/token-metadata/0xB4742e2013f96850a5CeF850A3bB74cF63B9a5D5/metadata.json "symbol": "EAN",
"address": "0xB4742e2013f96850a5CeF850A3bB74cF63B9a5D5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/Makefile b/Makefile @@ -75,8 +75,8 @@ test-browser: create-html-runners ${TARGETS}
travis-chewbacca:
./node_modules/.bin/chewbacca --threshold ${CHEWBACCA_THRESHOLD} `echo ${TRAVIS_COMMIT_RANGE} | sed -e 's/\.\.\..*//;'` -- test/benchmark.spec.js
-.PHONY: travis-old
-travis-old: test-transpiled coverage
+.PHONY: travis-secondary
+travis-secondary: test-transpiled coverage
.PHONY: travis-main
travis-main: clean lint test travis-chewbacca test-jasmine test-jest coverage
@@ -88,7 +88,7 @@ travis:
ifeq (${TRAVIS_NODE_VERSION}, $(shell cat .nvmrc))
make travis-main
else
- make travis-old
+ make travis-secondary
endif
.PHONY: git-dirty-check
| 10 |
diff --git a/lib/utils.js b/lib/utils.js @@ -74,7 +74,8 @@ function hasAlreadyProcessedMessage(msg, ID=null, key=null) {
return false;
}
-const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1, pm25: 0, power: 2, voltage: 2, current: 2};
+const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1, pm25: 0, power: 2, current: 2, current_phase_b: 2, current_phase_c: 2,
+ voltage: 2, voltage_phase_b: 2, voltage_phase_c: 2};
function calibrateAndPrecisionRoundOptions(number, options, type) {
// Calibrate
const calibrateKey = `${type}_calibration`;
| 12 |
diff --git a/src/nodejs/systemHandler.js b/src/nodejs/systemHandler.js @@ -27,11 +27,12 @@ class SystemHandler {
process() {
let promise;
if (this.declaration.licsene) {
- if (this.declaration.license.regKey) {
+ if (this.declaration.license.regKey || this.declaration.license.addOnKeys) {
promise = this.bigIp.onboard.license(
{
registrationKey: this.declaration.license.regKey,
- addOnKeys: this.declaration.license.addOnKeys
+ addOnKeys: this.declaration.license.addOnKeys,
+ overwrite: true
}
);
}
| 11 |
diff --git a/core/server/web/site/middleware/serve-public-file.js b/core/server/web/site/middleware/serve-public-file.js @@ -4,7 +4,11 @@ const path = require('path');
const errors = require('@tryghost/errors');
const config = require('../../../../shared/config');
const urlUtils = require('../../../../shared/url-utils');
-const i18n = require('../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+ imageNotFound: 'Image not found'
+};
function createPublicFileMiddleware(file, type, maxAge) {
let content;
@@ -24,7 +28,7 @@ function createPublicFileMiddleware(file, type, maxAge) {
if (err && err.status === 404) {
// ensure we're triggering basic asset 404 and not a templated 404
return next(new errors.NotFoundError({
- message: i18n.t('errors.errors.imageNotFound'),
+ message: tpl(messages.imageNotFound),
code: 'STATIC_FILE_NOT_FOUND',
property: err.path
}));
| 14 |
diff --git a/src/templates/security-scheme-template.js b/src/templates/security-scheme-template.js @@ -189,8 +189,8 @@ async function onInvokeOAuthFlow(securitySchemeId, flowType, authUrl, tokenUrl,
const sendClientSecretIn = authFlowDivEl.querySelector('.oauth-send-client-secret-in') ? authFlowDivEl.querySelector('.oauth-send-client-secret-in').value.trim() : 'header';
const checkedScopeEls = [...authFlowDivEl.querySelectorAll('.scope-checkbox:checked')];
const pkceCheckboxEl = authFlowDivEl.querySelector(`#${securitySchemeId}-pkce`);
- const state = (`${Math.random().toString(36)}random`).slice(2, 9);
- const nonce = (`${Math.random().toString(36)}random`).slice(2, 9);
+ const state = (`${Math.random().toString(36).slice(2, 9)}random${Math.random().toString(36).slice(2, 9)}`);
+ const nonce = (`${Math.random().toString(36).slice(2, 9)}random${Math.random().toString(36).slice(2, 9)}`);
// const codeChallenge = await generateCodeChallenge(codeVerifier);
const redirectUrlObj = new URL(`${window.location.origin}${window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/'))}/${this.oauthReceiver}`);
let grantType = '';
@@ -258,6 +258,7 @@ async function onInvokeOAuthFlow(securitySchemeId, flowType, authUrl, tokenUrl,
function oAuthFlowTemplate(flowName, clientId, clientSecret, securitySchemeId, authFlow, defaultScopes = [], receiveTokenIn = 'header') {
let { authorizationUrl, tokenUrl, refreshUrl } = authFlow;
+ const pkceOnly = authFlow['x-pkce-only'] || false;
const isUrlAbsolute = (url) => (url.indexOf('://') > 0 || url.indexOf('//') === 0);
if (refreshUrl && !isUrlAbsolute(refreshUrl)) {
refreshUrl = `${this.selectedServer.computedUrl}/${refreshUrl.replace(/^\//, '')}`;
@@ -326,7 +327,7 @@ function oAuthFlowTemplate(flowName, clientId, clientSecret, securitySchemeId, a
${flowName === 'authorizationCode'
? html`
<div style="margin: 16px 0 4px">
- <input type="checkbox" part="checkbox checkbox-auth-scope" id="${securitySchemeId}-pkce" checked>
+ <input type="checkbox" part="checkbox checkbox-auth-scope" id="${securitySchemeId}-pkce" checked ?disabled=${pkceOnly}>
<label for="${securitySchemeId}-pkce" style="margin:0 16px 0 4px; line-height:24px; cursor:pointer">
Send Proof Key for Code Exchange (PKCE)
</label>
@@ -337,16 +338,18 @@ function oAuthFlowTemplate(flowName, clientId, clientSecret, securitySchemeId, a
<input type="text" part="textbox textbox-auth-client-id" value = "${clientId || ''}" placeholder="client-id" spellcheck="false" class="oauth2 ${flowName} ${securitySchemeId} oauth-client-id">
${flowName === 'authorizationCode' || flowName === 'clientCredentials' || flowName === 'password'
? html`
- <input type="password" part="textbox textbox-auth-client-secret" value = "${clientSecret || ''}" placeholder="client-secret" spellcheck="false" class="oauth2 ${flowName} ${securitySchemeId} oauth-client-secret" style = "margin:0 5px;">
- ${flowName === 'authorizationCode' || flowName === 'clientCredentials' || flowName === 'password'
- ? html`
- <select style="margin-right:5px;" class="${flowName} ${securitySchemeId} oauth-send-client-secret-in">
+ <input
+ type="password" part="textbox textbox-auth-client-secret"
+ value = "${clientSecret || ''}" placeholder="client-secret" spellcheck="false"
+ class="oauth2 ${flowName} ${securitySchemeId}
+ oauth-client-secret"
+ style = "margin:0 5px;${pkceOnly ? 'display:none;' : ''}"
+ >
+ <select style="margin-right:5px;${pkceOnly ? 'display:none;' : ''}" class="${flowName} ${securitySchemeId} oauth-send-client-secret-in">
<option value = 'header' .selected = ${receiveTokenIn === 'header'} > Authorization Header </option>
<option value = 'request-body' .selected = ${receiveTokenIn === 'request-body'}> Request Body </option>
</select>`
: ''
- }`
- : ''
}
${flowName === 'authorizationCode' || flowName === 'clientCredentials' || flowName === 'implicit' || flowName === 'password'
? html`
@@ -466,7 +469,17 @@ export default function securitySchemeTemplate() {
? html`
<tr>
<td style="border:none; padding-left:48px">
- ${Object.keys(v.flows).map((f) => oAuthFlowTemplate.call(this, f, v['x-client-id'], v['x-client-secret'], v.securitySchemeId, v.flows[f], v['x-default-scopes'], v['x-receive-token-in']))}
+ ${Object.keys(v.flows).map((f) => oAuthFlowTemplate
+ .call(
+ this,
+ f,
+ (v.flows[f]['x-client-id'] || v['x-client-id'] || ''),
+ (v.flows[f]['x-client-secret'] || v['x-client-secret'] || ''),
+ v.securitySchemeId,
+ v.flows[f],
+ (v.flows[f]['x-default-scopes'] || v['x-default-scopes']),
+ (v.flows[f]['x-receive-token-in'] || v['x-receive-token-in']),
+ ))}
</td>
</tr>
`
| 7 |
diff --git a/src/encoded/schemas/changelogs/analysis_step.md b/src/encoded/schemas/changelogs/analysis_step.md Change log for analysis_step.json
=================================
+Schema version 4
+----------------
+
+* *analysis_step_types*, *input_file_types*, *output_file_types*, *qa_stats_generated*, *parents*, *aliases*, *documents* arrays must contain unique elements.
+
Schema version 3
----------------
| 0 |
diff --git a/main.go b/main.go @@ -37,7 +37,7 @@ func main() {
//content security policy
csp := map[string][]string{
- "default-src": {"'self'", "'unsafe-inline'"},
+ "default-src": {"'self'", "'unsafe-inline'", "*.uservoice.com"},
"script-src": {
"'self'",
"'unsafe-inline'",
@@ -48,7 +48,7 @@ func main() {
"*.epam.com",
"*.uservoice.com",
},
- "img-src": {"'self'", "data:", "www.google-analytics.com", "stats.g.doubleclick.net", "*.epam.com"},
+ "img-src": {"'self'", "data:", "www.google-analytics.com", "stats.g.doubleclick.net", "*.epam.com", "*.uservoice.com"},
"object-src": {"'self'"},
}
@@ -58,6 +58,9 @@ func main() {
ContentTypeNosniff: true,
BrowserXssFilter: true,
ContentSecurityPolicy: buildCSP(csp),
+ STSSeconds: 315360000,
+ STSIncludeSubdomains: true,
+ STSPreload: true,
}).Handler(next)
})
| 1 |
diff --git a/src/components/pagination/README.md b/src/components/pagination/README.md @@ -26,7 +26,7 @@ For pagination that changes to a new URL, use the
:per-page="perPage"
:current-page="currentPage"
small
- ></b-pagination>
+ ></b-table>
</div>
</template>
| 1 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -21,6 +21,12 @@ jobs:
environment:
- CODECLIMATE_REPO_TOKEN: c92188dcdeaca7d9732f8ea38fdd41d6bff18dc27a8d6f8b64a5b1311b7b6c21
steps: *defaults
+ "node-14":
+ docker:
+ - image: circleci/node:14-browsers
+ environment:
+ - CODECLIMATE_REPO_TOKEN: c92188dcdeaca7d9732f8ea38fdd41d6bff18dc27a8d6f8b64a5b1311b7b6c21
+ steps: *defaults
workflows:
version: 2
@@ -28,3 +34,4 @@ workflows:
jobs:
- "node-10"
- "node-12"
+ - "node-14"
| 3 |
diff --git a/source/indexer/test/Index-unit.js b/source/indexer/test/Index-unit.js @@ -244,7 +244,7 @@ contract('Index Unit Tests', async accounts => {
it('should allow an entry to be updated by the owner', async () => {
// set an entry from the owner
- let result = await index.setLocator(aliceAddress, 2000, aliceLocator, {
+ let result = await index.setLocator(aliceAddress, 2000, bobLocator, {
from: owner,
})
@@ -253,12 +253,12 @@ contract('Index Unit Tests', async accounts => {
return (
event.identifier === aliceAddress &&
event.score.toNumber() === 2000 &&
- event.locator === aliceLocator
+ event.locator === bobLocator
)
})
// now update the locator
- result = await index.updateLocator(aliceAddress, 200, bobLocator, {
+ result = await index.updateLocator(aliceAddress, 200, aliceLocator, {
from: owner,
})
@@ -267,7 +267,7 @@ contract('Index Unit Tests', async accounts => {
return (
event.identifier === aliceAddress &&
event.score.toNumber() === 200 &&
- event.locator === bobLocator
+ event.locator === aliceLocator
)
})
@@ -275,7 +275,7 @@ contract('Index Unit Tests', async accounts => {
result = await index.getLocators(EMPTY_ADDRESS, 10)
equal(result[LOCATORS].length, 1, 'locators list should have 1 slots')
- equal(result[LOCATORS][0], bobLocator, 'Alice should be in list')
+ equal(result[LOCATORS][0], aliceLocator, 'Alice should be in list')
equal(result[SCORES].length, 1, 'scores list should have 1 slots')
equal(result[SCORES][0], 200, 'Alices score is incorrect')
@@ -286,6 +286,36 @@ contract('Index Unit Tests', async accounts => {
const listLength = await index.length()
equal(listLength, 1, 'list length should be 1')
})
+
+ it('should update the list order on updated score', async () => {
+ // set an entry from the owner
+ await index.setLocator(aliceAddress, 2000, aliceLocator, {
+ from: owner,
+ })
+ // set an entry from the owner
+ await index.setLocator(bobAddress, 1000, bobLocator, {
+ from: owner,
+ })
+
+ // Check its been updated correctly
+ result = await index.getLocators(EMPTY_ADDRESS, 10)
+
+ equal(result[LOCATORS].length, 2, 'locators list should have 2 slots')
+ equal(result[LOCATORS][0], aliceLocator, 'Alice should be first in list')
+ equal(result[LOCATORS][1], bobLocator, 'Bob should be second in list')
+
+ // now update the locator for alice to a lower score
+ await index.updateLocator(aliceAddress, 500, aliceLocator, {
+ from: owner,
+ })
+
+ result = await index.getLocators(EMPTY_ADDRESS, 10)
+
+ // Alice is now AFTER Bob
+ equal(result[LOCATORS].length, 2, 'locators list should have 2 slots')
+ equal(result[LOCATORS][0], bobLocator, 'Bob should be first in list')
+ equal(result[LOCATORS][1], aliceLocator, 'Alice should be second in list')
+ })
})
describe('Test getting entries', async () => {
| 3 |
diff --git a/src/libs/Authentication.js b/src/libs/Authentication.js +/* eslint-disable rulesdir/no-api-in-views,rulesdir/no-api-side-effects-method */
+
import requireParameters from './requireParameters';
import * as Network from './Network';
import * as NetworkStore from './Network/NetworkStore';
import updateSessionAuthTokens from './actions/Session/updateSessionAuthTokens';
-import CONFIG from '../CONFIG';
import redirectToSignIn from './actions/SignInRedirect';
import CONST from '../CONST';
import Log from './Log';
import * as ErrorUtils from './ErrorUtils';
+import * as API from './API';
+import ONYXKEYS from '../ONYXKEYS';
/**
* @param {Object} parameters
@@ -55,20 +58,48 @@ function Authenticate(parameters) {
* Reauthenticate using the stored credentials and redirect to the sign in page if unable to do so.
*
* @param {String} [command] command name for logging purposes
- * @returns {Promise}
*/
function reauthenticate(command = '') {
- // Prevent any more requests from being processed while authentication happens
- NetworkStore.setIsAuthenticating(true);
+ const optimisticData = [
+ {
+ onyxMethod: CONST.ONYX.METHOD.MERGE,
+ key: ONYXKEYS.ACCOUNT,
+ value: {
+ ...CONST.DEFAULT_ACCOUNT_DATA,
+ isLoading: true,
+ },
+ },
+ ];
+
+ const successData = [
+ {
+ onyxMethod: CONST.ONYX.METHOD.MERGE,
+ key: ONYXKEYS.ACCOUNT,
+ value: {
+ isLoading: false,
+ },
+ },
+ ];
+
+ const failureData = [
+ {
+ onyxMethod: CONST.ONYX.METHOD.MERGE,
+ key: ONYXKEYS.ACCOUNT,
+ value: {
+ isLoading: false,
+ },
+ },
+ ];
const credentials = NetworkStore.getCredentials();
- return Authenticate({
- useExpensifyLogin: false,
- partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
- partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
+ API.makeRequestWithSideEffects(
+ 'ReauthenticateUser',
+ {
partnerUserID: credentials.autoGeneratedLogin,
partnerUserSecret: credentials.autoGeneratedPassword,
- })
+ },
+ {optimisticData, successData, failureData},
+ )
.then((response) => {
if (response.jsonCode === CONST.JSON_CODE.UNABLE_TO_RETRY) {
// If authentication fails, then the network can be unpaused
| 4 |
diff --git a/src/core/operations/ParseQRCode.mjs b/src/core/operations/ParseQRCode.mjs @@ -33,6 +33,14 @@ class ParseQRCode extends Operation {
"value": false
}
];
+ this.patterns = [
+ {
+ "match": "^(?:\\xff\\xd8\\xff|\\x89\\x50\\x4e\\x47|\\x47\\x49\\x46|.{8}\\x57\\x45\\x42\\x50|\\x42\\x4d)",
+ "flags": "",
+ "args": [false],
+ "useful": true
+ }
+ ];
}
/**
| 0 |
diff --git a/src/MUIDataTable.js b/src/MUIDataTable.js @@ -260,6 +260,8 @@ class MUIDataTable extends React.Component {
componentDidMount() {
this.setHeadResizeable(this.headCellRefs, this.tableRef);
+ this.setState({ pagination: this.options.pagination });
+
// When we have a search, we must reset page to view it unless on serverSide since paging is handled by the user.
if (this.props.options.searchText && !this.props.options.serverSide) this.setState({ page: 0 });
}
@@ -285,10 +287,10 @@ class MUIDataTable extends React.Component {
isGoingToPrint = () =>
new Promise((resolve, reject) => {
- this.setState({ isPrinting: true }, () => setTimeout(() => resolve(), 500));
+ this.setState({ isPrinting: true, pagination: false }, () => setTimeout(() => resolve(), 500));
});
- hasPrintted = () => this.setState({ isPrinting: false });
+ hasPrintted = () => this.setState({ isPrinting: false, pagination: this.options.pagination });
updateOptions(options, props) {
this.options = assignwith(options, props.options, (objValue, srcValue, key) => {
@@ -435,7 +437,7 @@ class MUIDataTable extends React.Component {
// assigning it as arrow function in the JSX would cause hard to track re-render errors
getTableContentRef = () => {
this.setState({ isPrinting: true });
- return this.tableRef ? this.tableRef.current : this.tableContent.current;
+ return this.tableRef ? this.tableRef.current : this.tableRef.current;
};
/*
@@ -1360,7 +1362,7 @@ class MUIDataTable extends React.Component {
} = this.state;
const rowCount = this.state.count || displayData.length;
- const rowsPerPage = this.options.pagination ? this.state.rowsPerPage : displayData.length;
+ const rowsPerPage = this.state.pagination ? this.state.rowsPerPage : displayData.length;
const showToolbar = hasToolbarItem(this.options, title);
const columnNames = columns.map(column => ({
name: column.name,
@@ -1464,7 +1466,7 @@ class MUIDataTable extends React.Component {
setResizeable={fn => (this.setHeadResizeable = fn)}
/>
)}
- <MuiTable ref={this.tableRef} tabIndex={'0'} role={'grid'} className={tableClassNames} {...tableProps}>
+ <MuiTable innerRef={this.tableRef} tabIndex={'0'} role={'grid'} className={tableClassNames} {...tableProps}>
<caption className={classes.caption}>{title}</caption>
<TableHead
columns={columns}
| 2 |
diff --git a/src/og/control/index.js b/src/og/control/index.js @@ -16,6 +16,7 @@ import { Sun } from "./Sun.js";
import { ZoomControl } from "./ZoomControl.js";
import { MouseWheelZoomControl } from "./MouseWheelZoomControl.js";
import { Lighting } from "./Lighting.js";
+import { LayerAnimation } from "./LayerAnimation.js";
export {
Control,
@@ -35,5 +36,6 @@ export {
ZoomControl,
MouseWheelZoomControl,
Lighting,
- Ruler
+ Ruler,
+ LayerAnimation
};
| 0 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -616,7 +616,6 @@ def check_file(config, session, url, job):
file_stat = os.stat(local_path)
except FileNotFoundError:
errors['file_not_found'] = 'File has not been uploaded yet.'
- update_content_error(errors, 'File was not uploaded to S3')
if job['run'] < job['upload_expiration']:
job['skip'] = True
return job
@@ -812,6 +811,10 @@ def patch_file(session, url, job):
'status': 'content error',
'content_error_detail': errors['content_error']
}
+ if 'file_not_found' in errors:
+ data = {
+ 'status': 'upload failed'
+ }
if data:
item_url = urljoin(url, job['@id'])
r = session.patch(
| 0 |
diff --git a/src/data/image.test.js b/src/data/image.test.js @@ -38,6 +38,15 @@ describe("image", () => {
});
});
+ it("returns correctly when dimensions are provided but there is no image details for image id", () => {
+ const imageDimensions = { width: 500, height: 200 };
+ const imageId = "image-id";
+
+ const getter = getImageDetails({});
+
+ expect(getter(imageId, imageDimensions)).toBeUndefined();
+ });
+
describe("decodeImageDetails", () => {
it("correctly decodes valid CMS image", () => {
const data: mixed = sampleOne(generateCMSImage);
| 0 |
diff --git a/js/monogatari.js b/js/monogatari.js @@ -244,9 +244,11 @@ $_ready(function() {
function loadFromSlot(slot) {
document.body.style.cursor = "wait";
playing = true;
+
+ resetGame ();
+
$_("section").hide();
$_("#game").show();
- $_("[data-character]").remove();
var data = JSON.parse(Storage.get(slot));
engine = data["Engine"];
storage = data["Storage"];
@@ -582,11 +584,7 @@ $_ready(function() {
break;
case "close-video":
- var video_player = document.querySelector("[data-ui='player']");
- video_player.pause();
- video_player.currentTime = 0;
- video_player.setAttribute("src", "");
- $_("[data-component='video']").removeClass("active");
+ stopVideo();
break;
case "quit":
@@ -772,11 +770,53 @@ $_ready(function() {
}
}
+ function resetGame () {
+ stopVideo();
+ silence();
+ hideGameElements();
+
+ // Reset Storage
+ storage = JSON.parse(storageStructure);
+
+ // Reset Conditions
+ engine["Label"] = "Start";
+ label = game[engine["Label"]];
+ engine["Step"] = -1;
+
+ // Reset History
+ engine.MusicHistory = [];
+ engine.SoundHistory = [];
+ engine.ImageHistory = [];
+ engine.CharacterHistory = [];
+ engine.SceneHistory = [];
+ }
+
function hideCentered() {
$_("[data-ui='centered']").remove();
$_("[data-ui='text']").show();
}
+ function hideGameElements () {
+ // Hide in-game elements
+ $_("[data-ui='choices']").hide();
+ $_("[data-ui='choices']").html("");
+
+ $_("[data-component='modal']").removeClass("active");
+ $_("[data-ui='messages']").removeClass("active");
+ $_("[data-component='video']").removeClass("active");
+
+ $_("[data-ui='centered']").remove();
+ $_("#game [data-character]").remove();
+ $_("#game [data-image]").remove();
+
+ $_("[data-ui='input'] [data-ui='warning']").text("");
+
+ $_("#game").style({
+ "background": "initial"
+ });
+ whipeText();
+ }
+
function playAmbient() {
if (engine["MenuMusic"] != "") {
var ambient_player = document.querySelector("[data-component='ambient']");
@@ -795,6 +835,25 @@ $_ready(function() {
}
}
+ // Stop any playing music or sound
+ function silence () {
+ for (var i = 0; i < document.getElementsByTagName("audio").length; i++) {
+ var v = document.getElementsByTagName("audio");
+ if (!v[i].paused && v[i].src != null && v[i].src != "") {
+ v[i].pause();
+ v[i].currentTime = 0;
+ }
+ }
+ }
+
+ function stopVideo () {
+ var video_player = document.querySelector("[data-ui='player']");
+ video_player.pause();
+ video_player.currentTime = 0;
+ video_player.setAttribute("src", "");
+ $_("[data-component='video']").removeClass("active");
+ }
+
// Stop the main menu's music
function stopAmbient() {
var a_player = document.querySelector("[data-component='ambient']");
@@ -815,36 +874,11 @@ $_ready(function() {
// Function to end the game.
function endGame() {
playing = false;
- // Stop any playing music
- for (var i = 0; i < document.getElementsByTagName("audio").length; i++) {
- var v = document.getElementsByTagName("audio");
- if (!v[i].paused && v[i].src != null && v[i].src != "") {
- v[i].pause();
- v[i].currentTime = 0;
- }
- }
- // Hide in-game elements
- $_("[data-ui='choices']").hide();
- $_("[data-ui='choices']").html("");
- $_("[data-component='modal']").removeClass("active");
- $_("[data-ui='messages']").removeClass("active");
- $_("[data-ui='centered']").remove();
- $_("#game img").hide();
- $_("[data-ui='input'] [data-ui='warning']").text("");
- $_("#game").style({
- "background": "initial"
- });
- whipeText();
- // Reset conditions
- engine["Label"] = "Start";
- label = game[engine["Label"]];
- engine["Step"] = -1;
- $_("section").hide();
+ resetGame ();
- // Reset Storage
- storage = JSON.parse(storageStructure);
// Show main menu
+ $_("section").hide();
playAmbient();
$_("[data-menu='main']").show();
}
| 7 |
diff --git a/src/components/svg/SVGComponents.js b/src/components/svg/SVGComponents.js @@ -28,7 +28,7 @@ SVGIcon.defaultProps = {
onClick: null,
}
-export const SVGBox = ({ children, className, size = '40' }) =>
+export const SVGBox = ({ children, className, size }) =>
<SVGComponent
className={classNames(className, 'SVGBox')}
width={size}
@@ -42,6 +42,6 @@ SVGBox.propTypes = {
size: PropTypes.string,
}
SVGBox.defaultProps = {
- size: null,
+ size: 40,
}
| 12 |
diff --git a/articles/multifactor-authentication/google-auth/dev-guide.md b/articles/multifactor-authentication/google-auth/dev-guide.md @@ -37,7 +37,6 @@ function (user, context, callback) {
context.multifactor = {
provider: 'google-authenticator',
// issuer: 'Label on Google Authenticator App', // optional
- // key: 'YOUR_KEY_HERE', // optional, the key to use for TOTP. by default one is generated for you
// optional, defaults to true. Set to false to force Google Authenticator every time.
// See https://auth0.com/docs/multifactor-authentication/custom#change-the-frequency-of-authentication-requests for details
| 2 |
diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js @@ -325,7 +325,7 @@ function rateLimitAndVectorTilesTest(usePostGIS) {
redisClient.SELECT(5, () => {
redisClient.del('user:localhost:mapviews:global');
- done();
+ setTimeout(done, 1000);
});
});
});
| 1 |
diff --git a/src/hooks/getSceneNavigationContext/extendSceneNavigationContext.js b/src/hooks/getSceneNavigationContext/extendSceneNavigationContext.js @@ -65,6 +65,7 @@ const collectSceneData = (scene) => {
const data = {
flags: scene.data.flags,
name: scene.data.name,
+ navName: scene.data.navName,
// dimensions
width: scene.data.width,
height: scene.data.height,
@@ -116,7 +117,8 @@ export default (html, contextOptions) => {
},
condition: (li) => {
const scene = game.scenes.get(li.data("sceneId"));
- return game.user.isGM && !!scene.data.flags.ddb.ddbId;
+ const allowDownload = game.user.isGM && (scene.data.flags.ddb.ddbId || !!scene.data.flags.vtta);
+ return allowDownload;
},
icon: '<i class="fas fa-share-alt"></i>',
});
| 11 |
diff --git a/src/client/js/components/CustomNavigation.jsx b/src/client/js/components/CustomNavigation.jsx @@ -7,8 +7,6 @@ import {
const CustomNavigation = (props) => {
const [activeTab, setActiveTab] = useState('');
- // const [activeComponents] = useState(new Set([]));
-
// [TODO: set default active tab by gw4079]
const [sliderWidth, setSliderWidth] = useState(null);
const [sliderMarginLeft, setSliderMarginLeft] = useState(null);
@@ -24,25 +22,25 @@ const CustomNavigation = (props) => {
const random = Math.random().toString(32).substring(2);
- const navTitleId = `custom-navtitle-${random}`;
- const grwNavTab = `custom-navtab-${random}`;
+ const grwNavBar = `grw-custom-navbar-${random}`;
+ const grwNavTab = `grw-custom-navtab-${random}`;
useEffect(() => {
if (activeTab === '') {
return;
}
- const navTitle = document.getElementById(navTitleId);
+ const navBar = document.getElementById(grwNavBar);
const navTabs = document.querySelectorAll(`li.${grwNavTab}`);
- if (navTitle == null || navTabs == null) {
+ if (navBar == null || navTabs == null) {
return;
}
let tempML = 0;
const styles = [].map.call(navTabs, (el) => {
- const width = getPercentage(el.offsetWidth, navTitle.offsetWidth);
+ const width = getPercentage(el.offsetWidth, navBar.offsetWidth);
const marginLeft = tempML;
tempML += width;
return { width, marginLeft };
@@ -57,7 +55,7 @@ const CustomNavigation = (props) => {
return (
<React.Fragment>
- <Nav className="nav-title" id={navTitleId}>
+ <Nav className="nav-title" id={grwNavBar}>
{Object.entries(props.navTabMapping).map(([key, value]) => {
return (
<NavItem key={key} type="button" className={`p-0 ${grwNavTab} ${activeTab === key && 'active'}`}>
| 10 |
diff --git a/packages/app/src/components/Page/DisplaySwitcher.jsx b/packages/app/src/components/Page/DisplaySwitcher.jsx @@ -15,6 +15,7 @@ import PageAccessories from '../PageAccessories';
import PageEditorByHackmd from '../PageEditorByHackmd';
import EditorNavbarBottom from '../PageEditor/EditorNavbarBottom';
import HashChanged from '../EventListeneres/HashChanged';
+import { useIsEditable } from '~/stores/context';
const DisplaySwitcher = (props) => {
@@ -23,6 +24,7 @@ const DisplaySwitcher = (props) => {
} = props;
const { isPageExist, pageUser } = pageContainer.state;
+ const { data: isEditable } = useIsEditable();
const { data: editorMode } = useEditorMode();
const isViewMode = editorMode === EditorMode.View;
@@ -55,20 +57,24 @@ const DisplaySwitcher = (props) => {
</div>
</TabPane>
+ { isEditable && (
<TabPane tabId={EditorMode.Editor}>
<div id="page-editor">
<Editor />
</div>
</TabPane>
+ ) }
+ { isEditable && (
<TabPane tabId={EditorMode.HackMD}>
<div id="page-editor-with-hackmd">
<PageEditorByHackmd />
</div>
</TabPane>
+ ) }
</TabContent>
- {!isViewMode && <EditorNavbarBottom /> }
+ { isEditable && !isViewMode && <EditorNavbarBottom /> }
- <HashChanged></HashChanged>
+ { isEditable && <HashChanged></HashChanged> }
</>
);
};
| 7 |
diff --git a/dual-contouring.js b/dual-contouring.js @@ -240,6 +240,43 @@ w.getHeightfieldRange = (x, z, w, h, lod) => {
allocator.freeAll();
}
};
+w.getChunkSkylight = (x, y, z, lod) => {
+ const allocator = new Allocator(Module);
+
+ // const gridPoints = chunkSize + 3 + lod;
+ const skylights = allocator.alloc(Uint8Array, chunkSize * chunkSize * chunkSize);
+
+ try {
+ Module._getChunkSkylight(
+ x,
+ y,
+ z,
+ lod,
+ skylights.byteOffset
+ );
+ return skylights.slice();
+ } finally {
+ allocator.freeAll();
+ }
+};
+w.getChunkAo = (x, y, z, lod) => {
+ const allocator = new Allocator(Module);
+
+ const aos = allocator.alloc(Uint8Array, chunkSize * chunkSize * chunkSize);
+
+ try {
+ Module._getChunkAo(
+ x,
+ y,
+ z,
+ lod,
+ aos.byteOffset
+ );
+ return aos.slice();
+ } finally {
+ allocator.freeAll();
+ }
+};
w.getSkylightFieldRange = (x, y, z, w, h, d, lod) => {
const allocator = new Allocator(Module);
| 0 |
diff --git a/client/components/at-internet/at-internet.config.js b/client/components/at-internet/at-internet.config.js @@ -28,9 +28,7 @@ angular.module("managerApp")
.then(me => {
config.countryCode = me.country;
config.currencyCode = me.currency && me.currency.code;
- })
- .catch(err => console.log(err))
- .finally(() => {
+ config.visitorId = me.customerCode;
atInternet.setDefaults(config);
});
});
| 12 |
diff --git a/assets/js/googlesitekit/datastore/modules/modules.js b/assets/js/googlesitekit/datastore/modules/modules.js @@ -35,7 +35,6 @@ const START_FETCH_SET_MODULE_STATUS = 'START_FETCH_SET_MODULE_STATUS';
const FETCH_SET_MODULE_STATUS = 'FETCH_SET_MODULE_STATUS';
const FINISH_FETCH_SET_MODULE_STATUS = 'FINISH_FETCH_SET_MODULE_STATUS';
const CATCH_FETCH_SET_MODULE_STATUS = 'CATCH_FETCH_SET_MODULE_STATUS';
-const RECEIVE_SET_MODULE_STATUS = 'RECEIVE_SET_MODULE_STATUS';
const START_FETCH_MODULES = 'START_FETCH_MODULES';
const FETCH_MODULES = 'FETCH_MODULES';
const FINISH_FETCH_MODULES = 'FINISH_FETCH_MODULES';
@@ -98,14 +97,16 @@ export const actions = {
let response, error;
+ const params = { active, slug };
+
yield {
- payload: { active, slug },
+ payload: { params },
type: START_FETCH_SET_MODULE_STATUS,
};
try {
response = yield {
- payload: { active, slug },
+ payload: { params },
type: FETCH_SET_MODULE_STATUS,
};
@@ -115,13 +116,13 @@ export const actions = {
}
yield {
- payload: { active, slug },
+ payload: { params },
type: FINISH_FETCH_SET_MODULE_STATUS,
};
} catch ( e ) {
error = e;
yield {
- payload: { active, slug, error },
+ payload: { params, error },
type: CATCH_FETCH_SET_MODULE_STATUS,
};
}
@@ -170,26 +171,6 @@ export const actions = {
return { response, error };
},
- /**
- * Receive the API respond for module (de)activation.
- *
- * @since n.e.x.t
- * @private
- *
- * @param {string} slug Name of slug to activate/deactivate.
- * @param {boolean} active `true` to activate; `false` to deactivate.
- * @return {Object} Redux-style action.
- */
- receiveSetModuleStatus( slug, active ) {
- invariant( slug, 'slug is required.' );
- invariant( active, 'active is required.' );
-
- return {
- payload: { active, slug },
- type: RECEIVE_SET_MODULE_STATUS,
- };
- },
-
/**
* Stores modules received from the REST API.
*
@@ -210,8 +191,8 @@ export const actions = {
};
export const controls = {
- [ FETCH_SET_MODULE_STATUS ]: ( { payload: { active, slug } } ) => {
- return API.set( 'core', 'modules', 'activation', { active, slug } );
+ [ FETCH_SET_MODULE_STATUS ]: ( { payload: { params } } ) => {
+ return API.set( 'core', 'modules', 'activation', params );
},
[ FETCH_MODULES ]: () => {
return API.get( 'core', 'modules', 'list', null, { useCache: false } );
@@ -221,7 +202,7 @@ export const controls = {
export const reducer = ( state, { type, payload } ) => {
switch ( type ) {
case START_FETCH_SET_MODULE_STATUS: {
- const { slug } = payload;
+ const { slug } = payload.params;
return {
...state,
@@ -233,7 +214,7 @@ export const reducer = ( state, { type, payload } ) => {
}
case FINISH_FETCH_SET_MODULE_STATUS: {
- const { slug } = payload;
+ const { slug } = payload.params;
return {
...state,
@@ -245,7 +226,7 @@ export const reducer = ( state, { type, payload } ) => {
}
case CATCH_FETCH_SET_MODULE_STATUS: {
- const { slug } = payload;
+ const { slug } = payload.params;
return {
...state,
| 2 |
diff --git a/js/webcomponents/bisweb_grapherelement.js b/js/webcomponents/bisweb_grapherelement.js @@ -58,7 +58,6 @@ class GrapherModule extends HTMLElement {
this.graphWindow=null;
this.resizingTimer=null;
this.buttons=[];
- this.extrawidth = 0;
}
/** create the GUI (or modifiy it if it exists)
@@ -88,6 +87,7 @@ class GrapherModule extends HTMLElement {
this.buttons[i].css({ "visibility": "hidden" });
}
}
+ $('.bisweb-taucharts-container').empty();
this.graphWindow.hide();
});
@@ -177,14 +177,12 @@ class GrapherModule extends HTMLElement {
* Opening the file tree panel will shrink the canvas, so we need to add the width to the desired size of the graph window to render properly.
*
* @param {HTMLElement} orthoElement - The orthagonal element to take image data from.
- * @param {Number} extraWidth - Extra width to add to the container that will hold the graph.
*/
- parsePaintedAreaAverageTimeSeries(orthoElement, extraWidth = 0) {
+ parsePaintedAreaAverageTimeSeries(orthoElement) {
if (!orthoElement)
return;
- this.extrawidth = extraWidth; //set the extra width for the graph drawing and future resize events
this.currentdata = null;
let image = orthoElement.getimage();
let objectmap = orthoElement.getobjectmap();
@@ -425,7 +423,6 @@ class GrapherModule extends HTMLElement {
}
//set chart to fade slightly on hover so the tooltip is more visible
- console.log('tau chart svg', $('svg.tau-chart__svg'));
$('svg.tau-chart__svg').hover(() => {
$('.tau-chart__svg').css('opacity', 0.5);
}, () => {
@@ -675,7 +672,16 @@ class GrapherModule extends HTMLElement {
dim=[ window.innerWidth,window.innerHeight ];
}
- dim[0] += this.extrawidth;
+
+ //search HTML for a dock open on the left
+ //if it exists, we want to make sure the graph is displayed over it so we add extra width
+ let docks = $('.biswebdock');
+ for (let dock of docks) {
+ console.log('dock', $(dock));
+ if ( $(dock).css('left') === '0px') {
+ dim[0] += parseInt( $(dock).css('width'));
+ }
+ }
let width=dim[0]-20;
let height=dim[1]-20;
| 1 |
diff --git a/package.json b/package.json },
"dependencies": {
"@projectstorm/react-diagrams": "^5.3.2",
- "@ufx-ui/bfx-containers": "0.8.5",
- "@ufx-ui/core": "0.8.5",
+ "@ufx-ui/bfx-containers": "0.8.6",
+ "@ufx-ui/core": "0.8.6",
"axios": "^0.21.1",
"bfx-api-node-models": "^1.2.4",
"bfx-api-node-util": "^1.0.8",
| 3 |
diff --git a/shared/graphql/queries/community/getCommunity.js b/shared/graphql/queries/community/getCommunity.js @@ -71,10 +71,23 @@ export const getCommunityByMatchQuery = gql`
`;
const getCommunityByMatchOptions = {
- options: ({ match: { params: { communitySlug } } }) => ({
+ options: ({
+ match: {
+ params: { communitySlug },
+ },
+ }) => ({
variables: {
slug: communitySlug,
},
+ /*
+ don't change this fetch policy
+ its required to make the new community creation flow work
+ after a user creates their community, they have a button to view
+ the community or go to settings - if this does not follow a cache hit
+ with a network request, the client will think the community does
+ not exist
+ */
+ fetchPolicy: 'cache-and-network',
}),
};
| 1 |
diff --git a/src/components/KeyboardSpacer/BaseKeyboardSpacerPropTypes.js b/src/components/KeyboardSpacer/BaseKeyboardSpacerPropTypes.js @@ -7,11 +7,12 @@ const propTypes = {
/** Callback to update the value of keyboard status along with keyboard height + top spacing. */
onToggle: PropTypes.func,
- /** Platform specific keyboard event to show/hide keyboard https://reactnative.dev/docs/keyboard#addlistener */
- /** Pass event name for keyboardShow since iOS and android both has different event to show keyboard. */
+ /** Platform specific keyboard event to show keyboard https://reactnative.dev/docs/keyboard#addlistener */
+ /** Pass keyboardShow event name as a param, since iOS and android both have different event names show keyboard. */
keyboardShowMethod: PropTypes.string,
- /** Pass event name for keyboardHide since iOS and android both has different event to hide keyboard. */
+ /** Platform specific keyboard event to hide keyboard https://reactnative.dev/docs/keyboard#addlistener */
+ /** Pass keyboardHide event name as a param, since iOS and android both have different event names show keyboard. */
keyboardHideMethod: PropTypes.string,
};
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ## 7.14.3 (unreleased)
-### Breaking
-
### Feature
- Added missing components for Email and Url widgets #1246 @rexalex
-
- Show backend validation errors on corresponding fields #1246 @rexalex
-
- Validation implemented for add user/group @rexalex
- Show Username when Firstname attr is missing in UsersControlPanelUser @iFlameing
### Bugfix
- Fixed front-end field validation #1246 @rexalex
-
- Fixed date only widget rendering #1246 @rexalex
-
- Fix errors with SelectWidget when removing the only element @rexalex
-### Internal
-
## 7.14.2 (2020-09-10)
### Bugfix
| 6 |
diff --git a/CHANGELOG.md b/CHANGELOG.md #### Improvements and Bug Fixes
+- [#599](https://github.com/marklogic/node-client-api/issues/599) - Expose the 3rd parameter of op.fromSPARQL.
- [#638](https://github.com/marklogic/node-client-api/issues/638) - (Documentation Fix) - Parameters "start" and "length" have no effect for db.graphs.sparql call.
- [#647](https://github.com/marklogic/node-client-api/issues/647) - QueryToReadAll on a Query with no results produces no response.
| 0 |
diff --git a/token-metadata/0xFbC1473E245b8AfBbA3b46116e0B01f91A026633/metadata.json b/token-metadata/0xFbC1473E245b8AfBbA3b46116e0B01f91A026633/metadata.json "symbol": "CRU",
"address": "0xFbC1473E245b8AfBbA3b46116e0B01f91A026633",
"decimals": 0,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/scripts/npm_scripts/generateCerts.js b/scripts/npm_scripts/generateCerts.js @@ -6,38 +6,36 @@ const runShellCommand = require('./runShellCommand').runShellCommand;
const binariesPath = '/tmp/fabric-binaries';
const version = '1.4.0';
-const darwinTarFile = 'hyperledger-fabric-darwin-amd64-' + version + '.tar.gz';
-const amd64TarFile = 'hyperledger-fabric-linux-amd64-' + version + '.tar.gz';
-const darwin = 'darwin-amd64-' + version + '/' + darwinTarFile;
-const amd64 = 'linux-amd64-' + version + '/' + amd64TarFile;
-const binariesRoot = 'https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/';
-const darwinBinaries = binariesRoot + darwin;
-const amd64Binaries = binariesRoot + amd64;
+const darwinTarFile = `hyperledger-fabric-darwin-amd64-${version}.tar.gz`;
+const amd64TarFile = `hyperledger-fabric-linux-amd64-${version}.tar.gz`;
+const darwin = `darwin-amd64-${version}/${darwinTarFile}`;
+const amd64 = `linux-amd64-${version}/${amd64TarFile}`;
+const binariesRoot = 'https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric';
+const darwinBinaries = `${binariesRoot}/${darwin}`;
+const amd64Binaries = `${binariesRoot}/${amd64}`;
module.exports.installAndGenerateCertsamd64 = async function() {
// Retrieve the cryptogen material binaries, pinned at 1.4
// Download and extract binaries from tar file
// Set to path via export
- await runShellCommand('mkdir -p ' + binariesPath + ';');
- await runShellCommand('wget ' + amd64Binaries + ' -P ' + binariesPath + ';');
- await runShellCommand('tar xvzf ' + binariesPath + '/' + amd64TarFile + ' -C ' + binariesPath + ';');
+ await runShellCommand(`mkdir -p ${binariesPath}`, null);
+ await runShellCommand(`wget ${amd64Binaries} -P ${binariesPath}`, null);
+ await runShellCommand(`tar xvzf ${binariesPath}/${amd64TarFile} -C ${binariesPath}`, null);
await generateTestCerts();
- return;
};
module.exports.installAndGenerateCertsMac = async function() {
- await runShellCommand('curl --create-dirs --output ' + binariesPath + '/' + darwinTarFile + ' ' + darwinBinaries + ';');
- await runShellCommand('tar xvzf ' + binariesPath + '/' + darwinTarFile + ' -C ' + binariesPath + ';');
+ await runShellCommand(`curl --create-dirs --output ${binariesPath}/${darwinTarFile} ${darwinBinaries}`, null);
+ await runShellCommand(`tar xvzf ${binariesPath}/${darwinTarFile} -C ${binariesPath}`, null);
await generateTestCerts();
- return;
};
async function generateTestCerts() {
// Generate required crypto material, channel tx blocks, and fabric ca certs
- await runShellCommand('./test/fixtures/crypto-material/generateAll.sh ' + binariesPath + '/bin;');
- await runShellCommand('./test/ts-fixtures/crypto-material/generateAll.sh ' + binariesPath + '/bin;');
- await runShellCommand('./test/fixtures/fabricca/generateCSR.sh;');
+ await runShellCommand(`./test/fixtures/crypto-material/generateAll.sh ${binariesPath}/bin`, null);
+ await runShellCommand(`./test/ts-fixtures/crypto-material/generateAll.sh ${binariesPath}/bin`, null);
+ await runShellCommand('./test/fixtures/fabricca/generateCSR.sh', null);
}
| 7 |
diff --git a/.travis.yml b/.travis.yml @@ -8,6 +8,6 @@ before_install:
- docker pull cartoimages/windshaft-testing
script:
- - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-testing
+ - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-testing bash docker-test.sh
language: generic
| 4 |
diff --git a/CHANGELOG.md b/CHANGELOG.md +# v3.10.1
+
+- This is the first patch release after master diverged for release 4.0.0.
+ This change reintroduces explicit versions of binary dependencies since the
+ postinstall hook interfered with some build systems because these binary
+ dependencies would be pruned.
+
# v3.10.0
- Now builds properly in versions of Node.js as old as 0.10 and as new as
| 6 |
diff --git a/articles/libraries/auth0js/index.md b/articles/libraries/auth0js/index.md @@ -220,6 +220,59 @@ webAuth.passwordlessVerify({
);
```
+## Extract the authResult and get user info
+
+After authentication occurs, the `parseHash` method parses a URL hash fragment to extract the result of an Auth0 authentication response.
+
+::: panel-info RS256 Requirement
+This method requires that your tokens are signed with RS256 rather than HS256. For more information about this, check the [Auth0.js v8 Migration Guide](/libraries/auth0js/migration-guide#the-parsehash-method).
+:::
+
+The contents of the authResult object returned by `parseHash` depend upon which authentication parameteres were used. It can include:
+
+* `accessToken` - an access token for the API, specified by the `audience`
+* `expiresIn` - a string containing the expiration time (in seconds) of the `accessToken`
+* `idToken` - an ID Token JWT containing user profile information
+
+```js
+auth0.parseHash(window.location.hash, function(err, authResult) {
+ if (err) {
+ return console.log(err);
+ }
+
+ auth0.client.userInfo(authResult.accessToken, function(err, user) {
+ // Now you have the user's information
+ });
+});
+```
+
+As shown above, the `client.userInfo` method can be called passing the returned `authResult.accessToken`. It will make a request to the `/userinfo` endpoint and return the `user` object, which contains the user's information, similar to the below example.
+
+```json
+{
+ "email_verified": "false",
+ "email": "[email protected]",
+ "clientID": "AAAABBBBCCCCDDDDEEEEFFFFGGGGHHHH",
+ "updated_at": "2017-02-07T20:50:33.563Z",
+ "name": "[email protected]",
+ "picture": "https://gravatar.com/avatar/example.png",
+ "user_id": "auth0|123456789012345678901234",
+ "nickname": "tester9",
+ "identities": [
+ {
+ "user_id": "123456789012345678901234",
+ "provider": "auth0",
+ "connection": "Username-Password-Authentication",
+ "isSocial": "false"
+ }
+ ],
+ "created_at": "2017-01-20T20:06:05.008Z",
+ "sub": "auth0|123456789012345678901234"
+}
+```
+
+You can now do something else with this information as your application needs, such as acquire the user's entire set of profile information with the Management API, as described below.
+
## Logout
To log out a user, use the `logout` method. This accepts an options object, which can include a `client_id`, and a `returnTo` URL. If you want to navigate the user to a specific URL after the logout, set that URL at the `returnTo` parameter.
@@ -341,7 +394,7 @@ var auth0Manage = new auth0.Management({
### Get the User Profile
-In order to get the user profile data, use the `getUser()` method, with the `userId` and a callback as parameters. The method returns the user profile.
+In order to get the user profile data, use the `getUser()` method, with the `userId` and a callback as parameters. The method returns the user profile. Note that the `userID` required here will be the part after the delimiter if using the `user_id` fetched from the `client.userInfo` method.
```js
auth0Manage.getUser(userId, cb);
| 0 |
diff --git a/Source/Scene/ModelExperimental/PntsLoader.js b/Source/Scene/ModelExperimental/PntsLoader.js @@ -282,12 +282,13 @@ function processDracoAttributes(loader, draco, result) {
// Transcode Batch ID (3D Tiles 1.0) -> Feature ID (3D Tiles Next)
if (defined(result.BATCH_ID)) {
+ var batchIds = result.BATCH_ID.array;
parsedContent.batchIds = {
name: "BATCH_ID",
semantic: VertexAttributeSemantic.FEATURE_ID,
setIndex: 0,
- typedArray: result.BATCH_ID.array,
- componentDatatype: ComponentDatatype.UNSIGNED_SHORT,
+ typedArray: batchIds,
+ componentDatatype: ComponentDatatype.fromTypedArray(batchIds),
type: AttributeType.SCALAR,
};
}
| 9 |
diff --git a/userscript.user.js b/userscript.user.js @@ -34438,16 +34438,22 @@ var $$IMU_EXPORT$$;
return src.replace(/(\/uploads\/news\/[^/]*\/)thumb(\/[0-9]+\.[^/.]*)$/, "$1images$2");
}
- if (domain === "c6oxm85c.cloudimg.io" ||
+ if (domain_nosub === "cloudimg.io" ||
// https://mediaproxy.salon.com/width/354/https://media.salon.com/2019/05/Game_Of_Thrones_Finale_Dany.jpg
// https://media.salon.com/2019/05/Game_Of_Thrones_Finale_Dany.jpg
- domain === "mediaproxy.salon.com" ||
- // https://ce8737e8c.cloudimg.io/width/359/q90/https://twg-live.s3.amazonaws.com/artist_image/twg_11_1519846018_0.jpg
- // https://twg-live.s3.amazonaws.com/artist_image/twg_11_1519846018_0.jpg
- domain === "ce8737e8c.cloudimg.io") {
+ domain === "mediaproxy.salon.com") {
+ // https://docs.cloudimage.io/go/cloudimage-documentation-v7/en/introduction (thanks to https://github.com/qsniyg/maxurl/issues/312)
// https://c6oxm85c.cloudimg.io/cdno/n/q10/https://az617363.vo.msecnd.net/imgmodels/models/MD30001282/gallery-1502272667-cara1a74d8ff2128d26eea7a6b74247a45669_thumb.jpg
// https://az617363.vo.msecnd.net/imgmodels/models/MD30001282/gallery-1502272667-cara1a74d8ff2128d26eea7a6b74247a45669_thumb.jpg
- return src.replace(/^[a-z]+:\/\/[^/]*\/(?:cdn[a-z]\/n\/)?(?:(?:width|height)\/[0-9]+\/)*(?:q[0-9]*\/)?([a-z]*:\/\/)/, "$1");
+ // https://ce8737e8c.cloudimg.io/width/359/q90/https://twg-live.s3.amazonaws.com/artist_image/twg_11_1519846018_0.jpg
+ // https://twg-live.s3.amazonaws.com/artist_image/twg_11_1519846018_0.jpg
+ // https://doc.cloudimg.io/v7/sample.li/paris.jpg?width=400&wat=1&wat_scale=35&wat_gravity=northeast&wat_pad=10&grey=1
+ // https://doc.cloudimg.io/v7/sample.li/paris.jpg
+ newsrc = src.replace(/^[a-z]+:\/\/[^/]*\/(?:cdn[a-z]\/n\/)?(?:(?:width|height)\/[0-9]+\/)*(?:q[0-9]*\/)?([a-z]*:\/\/)/, "$1");
+ if (newsrc !== src)
+ return newsrc;
+
+ return src.replace(/\?.*/, "");
}
if (domain_nowww === "kinataka.ru") {
| 7 |
diff --git a/src/containers/plugins/SimpleRestContainer.js b/src/containers/plugins/SimpleRestContainer.js @@ -110,7 +110,7 @@ module.exports = class SimpleRestContainer {
const retries = this.caps[Capabilities.SIMPLEREST_PING_RETRIES] || Defaults[Capabilities.SIMPLEREST_PING_RETRIES]
this._waitForPingUrl(pingConfig, retries).then((response) => {
- if (botiumUtils.isJson(response)) {
+ if (botiumUtils.isStringJson(response)) {
const body = JSON.parse(response)
debug(`Ping Uri ${uri} returned JSON response ${util.inspect(response)}, using it as session context`)
Object.assign(this.view.context, body)
@@ -236,7 +236,7 @@ module.exports = class SimpleRestContainer {
const messageTexts = (_.isArray(responseTexts) ? _.flattenDeep(responseTexts) : [responseTexts])
for (const messageText of messageTexts) {
- if (!messageText) return
+ if (!messageText) continue
hasMessageText = true
const botMsg = { sourceData: body, messageText, media, buttons }
| 11 |
diff --git a/app/models/carto/visualization.rb b/app/models/carto/visualization.rb @@ -218,7 +218,9 @@ class Carto::Visualization < ActiveRecord::Base
end
def partially_dependent_on?(user_table)
- derived? && layers_dependent_on(user_table).instance_eval { any? && !all? }
+ return false unless derived?
+ layer_dependencies = layers_dependent_on(user_table)
+ layer_dependencies.any? && !layer_dependencies.all?
end
def layers_dependent_on(user_table)
| 2 |
diff --git a/experimental/adaptive-tool/resources/lg/lg.tmLanguage.json b/experimental/adaptive-tool/resources/lg/lg.tmLanguage.json },
"template_name_line":{
"patterns": [{
- "match": "(^\\s*#\\s*[a-zA-Z0-9_]+)(\\(.*\\))?",
+ "match": "(^\\s*#\\s*[a-zA-Z0-9_.]+)(\\(.*\\))?",
"captures": {
"1": {
"name":"markup.bold.templateName"
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -96236,7 +96236,9 @@ var $$IMU_EXPORT$$;
// https://i.rtings.com/assets/products/t90JF7wr/lg-48-cx-oled/design-small.jpg -- 693x390
// https://i.rtings.com/assets/products/t90JF7wr/lg-48-cx-oled/design-medium.jpg -- 1778x1000
// https://i.rtings.com/assets/products/t90JF7wr/lg-48-cx-oled/design-large.jpg -- 5189x2919
- return src.replace(/(\/assets\/+products\/+[^/]+\/+[^/]+\/+[^/]+)-(?:small|medium)\./, "$1-large.");
+ // https://i.rtings.com/assets/pages/gjZEc8Xt/best-mirrorless-cameras-for-travel-medium.jpg
+ // https://i.rtings.com/assets/pages/gjZEc8Xt/best-mirrorless-cameras-for-travel-large.jpg
+ return src.replace(/(\/assets\/+[^/]+\/+[A-Za-z0-9]{5,10}\/+(?:[^/]+\/+)?[^/]+)-(?:small|medium)\./, "$1-large.");
}
if (domain === "img.yts.mx") {
| 7 |
diff --git a/CommentFlagsHelper.user.js b/CommentFlagsHelper.user.js // @description Always expand comments (with deleted) and highlight expanded flagged comments, Highlight common chatty and rude keywords
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 4.7.1
+// @version 4.7.2
//
// @updateURL https://github.com/samliew/SO-mod-userscripts/raw/master/CommentFlagsHelper.user.js
// @downloadURL https://github.com/samliew/SO-mod-userscripts/raw/master/CommentFlagsHelper.user.js
@@ -699,15 +699,6 @@ table.flagged-posts tr.js-flagged-post:first-child > td {
.js-flagged-post .bc-black-3 {
border-color: #e3e3e3 !important;
}
-.js-post-flag-group > .grid--cell {
- padding: 8px 12px;
-}
-.js-post-flag-group > .grid--cell.ta-right {
- padding: 18px 8px !important;
-}
-.js-post-flag-group > .grid--cell > div {
- padding: 2px 0;
-}
.js-admin-dashboard span[title]:hover {
cursor: help !important;
}
| 2 |
diff --git a/flinkx/src/main/scala/edp/wormhole/flinkx/eventflow/UmsProcessElement.scala b/flinkx/src/main/scala/edp/wormhole/flinkx/eventflow/UmsProcessElement.scala @@ -48,7 +48,7 @@ class UmsProcessElement(sourceSchemaMap: Map[String, (TypeInformation[_], Int)],
override def processElement(value: (String, String, String, Int, Long),
ctx: ProcessFunction[(String, String, String, Int, Long), Row]#Context,
out: Collector[Row]): Unit = {
- logger.info("in UmsProcessElement source data from kafka " + value._2)
+ logger.debug("in UmsProcessElement source data from kafka " + value._2)
try {
val (protocolType, namespace) = UmsCommonUtils.getTypeNamespaceFromKafkaKey(value._1)
if (config.feedback_enabled) startMetricsMoinitoring(protocolType.toString)
| 3 |
diff --git a/lib/node_modules/@stdlib/ml/incr/kmeans/lib/init_kmeansplusplus.js b/lib/node_modules/@stdlib/ml/incr/kmeans/lib/init_kmeansplusplus.js @@ -41,25 +41,27 @@ var squaredCorrelation = require( './squared_correlation.js' );
* @param {Array} out - output array
* @param {Function} dist - distance function to apply
* @param {PositiveInteger} npts - number of data points
+* @param {PositiveInteger} ndims - number of dimensions
* @param {ndarray} matrix - data point matrix
* @param {NonNegativeInteger} ci - centroid row index
* @returns {Array} output array
*/
-function dapply( out, dist, npts, matrix, ci ) {
+function dapply( out, dist, npts, ndims, matrix, ci ) {
var offsetC;
- var stride;
- var offset;
+ var offsetD;
+ var strideD;
var buf;
- var N;
var i;
buf = matrix.data;
- N = matrix.shape[ 1 ];
- stride = matrix.strides[ 0 ];
- offsetC = stride * ci;
+
+ strideD = matrix.strides[ 0 ];
+ offsetC = strideD * ci;
+ offsetD = 0;
+
for ( i = 0; i < npts; i++ ) {
- offset = stride * i;
- out[ i ] = dist( N, buf, 1, offset, buf, 1, offsetC ); // Magic number `1` for stride is based on knowing that the matrix is row-major single-segment contiguous
+ out[ i ] = dist( ndims, buf, 1, offsetD, buf, 1, offsetC ); // Magic number `1` for stride is based on knowing that the matrix is row-major single-segment contiguous
+ offsetD += strideD;
}
return out;
}
@@ -203,7 +205,7 @@ function kmeansplusplus( out, buffer, metric, normalize, trials, seed ) {
// 2-5. For each data point, compute the distances to each centroid, find the closest centroid, and, based on the distance to the closest centroid, assign a probability to the data point to be chosen as centroid `c_j`...
for ( j = 1; j < k; j++ ) {
// Note: instead of repeatedly computing centroid distances for each data point, we only need to compute the distances for the most recent centroid and to maintain a hash of closest distance results...
- dapply( d2, dist, npts, buffer, centroids[ j-1 ] );
+ dapply( d2, dist, npts, ndims, buffer, centroids[ j-1 ] );
csum = 0.0; // total cumulative distance
for ( i = 0; i < npts; i++ ) {
ind = 2 * i;
| 14 |
diff --git a/core/algorithm-builder/environments/nodejs/wrapper/package.json b/core/algorithm-builder/environments/nodejs/wrapper/package.json "author": "",
"license": "ISC",
"dependencies": {
- "@hkube/nodejs-wrapper": "^2.0.21"
+ "@hkube/nodejs-wrapper": "^2.0.22"
},
"devDependencies": {}
}
\ No newline at end of file
| 3 |
diff --git a/src/lib/wallet/GoodWalletClass.js b/src/lib/wallet/GoodWalletClass.js @@ -172,7 +172,7 @@ export class GoodWallet {
// UBI Contract
this.UBIContract = new this.wallet.eth.Contract(
UBIABI.abi,
- get(ContractsAddress, `${this.network}.FixedUBI`, UBIABI.networks[this.networkId].address),
+ get(ContractsAddress, `${this.network}.UBI`, UBIABI.networks[this.networkId].address),
{ from: this.account }
)
abiDecoder.addABI(UBIABI.abi)
@@ -270,7 +270,7 @@ export class GoodWallet {
} else {
log.info('subscribeOTPL got event', { event })
- if (event && event.event && ['PaymentWithdrawn', 'PaymentCancelled'].includes(event.event)) {
+ if (event && event.event && ['PaymentWithdraw', 'PaymentCancel'].includes(event.event)) {
this.getReceiptWithLogs(event.transactionHash)
.then(receipt => this.sendReceiptWithLogsToSubscribers(receipt, ['otplUpdated']))
.catch(err => log.error('send event get/send receipt failed:', err.message, err))
@@ -282,8 +282,8 @@ export class GoodWallet {
}
}
- this.oneTimePaymentsContract.events.PaymentWithdrawn({ fromBlock, filter }, handler)
- this.oneTimePaymentsContract.events.PaymentCancelled({ fromBlock, filter }, handler)
+ this.oneTimePaymentsContract.events.PaymentWithdraw({ fromBlock, filter }, handler)
+ this.oneTimePaymentsContract.events.PaymentCancel({ fromBlock, filter }, handler)
}
/**
@@ -343,7 +343,7 @@ export class GoodWallet {
}
async checkEntitlement(): Promise<number> {
- const entitlement = await this.UBIContract.methods.checkEntitlement({ from: this.account }).call()
+ const entitlement = await this.UBIContract.methods.checkEntitlement().call()
return entitlement
}
@@ -641,7 +641,7 @@ export class GoodWallet {
*/
async cancelOTLByTransactionHash(transactionHash: string, txCallbacks: {} = {}): Promise<TransactionReceipt> {
const { logs } = await this.getReceiptWithLogs(transactionHash)
- const paymentDepositLog = logs.filter(({ name }) => name === 'PaymentDeposited')[0]
+ const paymentDepositLog = logs.filter(({ name }) => name === 'PaymentDeposit')[0]
if (paymentDepositLog && paymentDepositLog.events) {
const eventHashParam = paymentDepositLog.events.filter(({ name }) => name === 'hash')[0]
| 0 |
diff --git a/src/base/tool.js b/src/base/tool.js @@ -134,6 +134,7 @@ const Tool = Component.extend({
return utils.extend(
this.model_binds,
{
+ "readyOnce": () => this.setResizeHandler(),
"change": function(evt, path) {
if (_this._ready) {
_this.model.validate();
| 12 |
diff --git a/public/app/js/cbus-data.js b/public/app/js/cbus-data.js @@ -805,7 +805,7 @@ cbus.broadcast.listen("updateFeedArtworks", function(e) {
});
cbus.broadcast.listen("queueChanged", function() {
- localforage.setItem("cbus-last-queue-urls", cbus.audio.queue.map(elem => elem.src));
+ localforage.setItem("cbus-last-queue-urls", cbus.audio.queue.map(elem => elem.dataset.id));
localforage.getItem("cbus_feeds_qnp").then(function(feedsQNP) {
if (!feedsQNP) { feedsQNP = [] }
| 1 |
diff --git a/package.json b/package.json "test:styles": "docker run --rm -v $(pwd):/src backstopjs/backstopjs test --configPath=backstop.config.js",
"test:watch": "lerna run --parallel test:watch",
"test": "lerna run test",
- "ci:styles": "backstop test --configPath=backstop.config.js",
+ "ci:styles": "backstop test --configPath=backstop.config.js --report=ci",
"visual:reference": "docker run --rm -v $(pwd):/src backstopjs/backstopjs reference --i --configPath=backstop.config.js",
"visual:reset": "docker run --rm -v $(pwd):/src backstopjs/backstopjs reference --configPath=backstop.config.js",
"visual:test": "docker run --rm -v $(pwd):/src backstopjs/backstopjs test --configPath=backstop.config.js && open ./backstop_data/html_report/index.html"
| 12 |
diff --git a/src/__tests__/integration/handler/handlerPayload.test.js b/src/__tests__/integration/handler/handlerPayload.test.js @@ -105,17 +105,19 @@ describe('handler payload tests', () => {
// path: 'callback-with-context-done-handler',
// },
- {
- description: 'when handler calls callback and returns Promise',
- expected: 'Hello Callback!',
- path: 'callback-with-promise-handler',
- },
+ // TODO: reactivate!
+ // {
+ // description: 'when handler calls callback and returns Promise',
+ // expected: 'Hello Callback!',
+ // path: 'callback-with-promise-handler',
+ // },
- {
- description: 'when handler calls callback inside returned Promise',
- expected: 'Hello Callback!',
- path: 'callback-inside-promise-handler',
- },
+ // TODO: reactivate!
+ // {
+ // description: 'when handler calls callback inside returned Promise',
+ // expected: 'Hello Callback!',
+ // path: 'callback-inside-promise-handler',
+ // },
].forEach(({ description, expected, path }) => {
test(description, async () => {
url.pathname = path;
| 2 |
diff --git a/react/package.json b/react/package.json },
"scripts": {
"test": "jest --config ./src/jest-config.js --coverage --verbose",
- "test:watch": "jest --config ./src/jest-config.js --verbose --watch",
+ "test:watch": "jest --config ./src/jest-config.js --coverage --verbose --watch",
"test:generate-output": "jest --config ./src/jest-config.js --json --outputFile=./src/.jest-test-results.json",
"build": "rollup -c rollup.config.js",
"build-css": "node-sass ./_spark.scss web/css/spark.min.css --output-style compressed",
| 13 |
diff --git a/assets/js/modules/analytics/datastore/properties.js b/assets/js/modules/analytics/datastore/properties.js @@ -154,6 +154,7 @@ const baseActions = {
if ( PROPERTY_CREATE === propertyID ) {
registry.dispatch( STORE_NAME ).setSettings( {
propertyID,
+ internalWebPropertyID: '',
profileID: PROFILE_CREATE,
} );
| 12 |
diff --git a/articles/quickstart/native/ios-objc/dashboard-default.md b/articles/quickstart/native/ios-objc/dashboard-default.md @@ -7,7 +7,7 @@ budicon: 715
<%= include('../../../_includes/_package', {
org: 'auth0-samples',
repo: 'auth0-ios-objc-sample',
- path: '00-Login',
+ path: '01-Login',
requirements: [
'CocoaPods 1.2.1',
'Version 8.3.2 (8E2002)',
| 1 |
diff --git a/src/screens/ParadeMapScreen/__snapshots__/component.test.js.snap b/src/screens/ParadeMapScreen/__snapshots__/component.test.js.snap @@ -24,6 +24,8 @@ exports[`renders correctly 1`] = `
"longitudeDelta": 4.1e-8,
}
}
+ showsMyLocationButton={true}
+ showsUserLocation={true}
style={
Object {
"bottom": 0,
| 3 |
diff --git a/index.js b/index.js @@ -43,15 +43,6 @@ exports.clean = async function() {
console.log('Clean complete.');
};
-async function connect(options) {
- const keyStore = new UnencryptedFileSystemKeyStore('./neardev');
- options.deps = {
- keyStore,
- };
- // TODO: search for key store.
- return await nearjs.connect(options);
-}
-
exports.createAccount = async function(options) {
let near = await connect(options);
let keyPair;
| 1 |
diff --git a/struts2-jquery-grid-showcase/pom.xml b/struts2-jquery-grid-showcase/pom.xml <spring.version>5.3.21</spring.version>
<hibernate.version>5.6.9.Final</hibernate.version>
<javax.inject.vesion>1</javax.inject.vesion>
- <javassist.version>3.17.1-GA</javassist.version>
- <velocity.version>1.7</velocity.version>
- <velocity-tools.version>2.0</velocity-tools.version>
<derby.version>10.14.2.0</derby.version>
<c3p0.version>0.9.5.5</c3p0.version>
<hibernate-validator.version>4.3.2.Final</hibernate-validator.version>
<artifactId>struts2-spring-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<artifactId>javax.servlet.jsp-api</artifactId>
</dependency>
- <!-- Velocity -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- </dependency>
-
<!-- Derby JDBC Driver -->
<dependency>
<groupId>org.apache.derby</groupId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <!-- Velocity -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>${velocity-tools.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>struts-tiles</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>struts-core</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>struts-taglib</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Derby JDBC Driver -->
<dependency>
<groupId>org.apache.derby</groupId>
| 2 |
diff --git a/app/components/email-unsubscribe.js b/app/components/email-unsubscribe.js @@ -51,7 +51,7 @@ export default Component.extend({
yield repo && repo.auth.currentUser._rawPermissions;
} catch (e) {}
- return repo && repo.isCurrentUserACollaborator ? repo : null;
+ return repo;
}).drop(),
didInsertElement() {
| 11 |
diff --git a/package.json b/package.json "codecov": "cat coverage/*/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js",
"prebuild": "rimraf es lib dist",
"build": "run-p build:** && run-p css:**",
- "css:prod": "node-sass --output-style compressed src/stylesheets/datepicker.scss > dist/datepicker.min.css",
- "css:modules:prod": "node-sass --output-style compressed src/stylesheets/datepicker-cssmodules.scss > dist/datepicker-cssmodules.min.css",
- "css:dev": "node-sass --output-style expanded src/stylesheets/datepicker.scss > dist/datepicker.css",
- "css:modules:dev": "node-sass --output-style expanded src/stylesheets/datepicker-cssmodules.scss > dist/datepicker-cssmodules.css",
+ "css:prod": "node-sass --output-style compressed src/stylesheets/datepicker.scss > dist/react-datepicker.min.css",
+ "css:modules:prod": "node-sass --output-style compressed src/stylesheets/datepicker-cssmodules.scss > dist/react-datepicker-cssmodules.min.css",
+ "css:dev": "node-sass --output-style expanded src/stylesheets/datepicker.scss > dist/react-datepicker.css",
+ "css:modules:dev": "node-sass --output-style expanded src/stylesheets/datepicker-cssmodules.scss > dist/react-datepicker-cssmodules.css",
"build:es": "cross-env BABEL_ENV=es rollup -c -i src/index.jsx -o es/index.js",
"build:cjs": "cross-env BABEL_ENV=cjs rollup -c -i src/index.jsx -o lib/index.js",
"build:umd:prod": "cross-env BABEL_ENV=es NODE_ENV=production rollup -c rollup.umd.config.js -i src/index.jsx -o dist/react-datepicker.min.js",
| 13 |
diff --git a/examples/src/examples/animation/locomotion.tsx b/examples/src/examples/animation/locomotion.tsx @@ -26,8 +26,7 @@ class LocomotionExample extends Example {
<AssetLoader name='walkAnim' type='container' url='static/assets/animations/bitmoji/walk.glb' />
<AssetLoader name='jogAnim' type='container' url='static/assets/animations/bitmoji/run.glb' />
<AssetLoader name='jumpAnim' type='container' url='static/assets/animations/bitmoji/jump-flip.glb' />
- <AssetLoader name='helipad.dds' type='cubemap' url='static/assets/cubemaps/helipad.dds' data={{ type: pc.TEXTURETYPE_RGBM }}/>
- <AssetLoader name='bloom' type='script' url='static/scripts/posteffects/posteffect-bloom.js' />
+ <AssetLoader name='cubemap' type='cubemap' url='static/assets/cubemaps/helipad.dds' data={{ type: pc.TEXTURETYPE_RGBM }}/>
</>;
}
@@ -55,7 +54,10 @@ class LocomotionExample extends Example {
// setup skydome
app.scene.skyboxMip = 2;
- app.scene.setSkybox(assets['helipad.dds'].resources);
+ app.scene.skyboxIntensity = 0.7;
+ app.scene.setSkybox(assets.cubemap.resources);
+ app.scene.gammaCorrection = pc.GAMMA_SRGB;
+ app.scene.toneMapping = pc.TONEMAP_ACES;
// Create an Entity with a camera component
const cameraEntity = new pc.Entity();
@@ -64,34 +66,23 @@ class LocomotionExample extends Example {
clearColor: new pc.Color(0.1, 0.15, 0.2)
});
- // add bloom postprocessing (this is ignored by the picker)
- cameraEntity.addComponent("script");
- cameraEntity.script.create("bloom", {
- attributes: {
- bloomIntensity: 1,
- bloomThreshold: 0.7,
- blurAmount: 4
- }
- });
-
- cameraEntity.translateLocal(0, 5, 15);
- cameraEntity.rotateLocal(-20, 0, 0);
+ cameraEntity.translateLocal(0.5, 3, 8);
+ cameraEntity.rotateLocal(-30, 0, 0);
app.root.addChild(cameraEntity);
- app.scene.ambientLight = new pc.Color(0.5, 0.5, 0.5);
// Create an entity with a light component
const light = new pc.Entity();
light.addComponent("light", {
type: "directional",
color: new pc.Color(1, 1, 1),
castShadows: true,
- intensity: 1,
+ intensity: 2,
shadowBias: 0.2,
- shadowDistance: 5,
+ shadowDistance: 16,
normalOffsetBias: 0.05,
shadowResolution: 2048
});
- light.setLocalEulerAngles(45, 30, 0);
+ light.setLocalEulerAngles(60, 30, 0);
app.root.addChild(light);
app.start();
| 7 |
diff --git a/src/module/actor/mixins/actor-damage.js b/src/module/actor/mixins/actor-damage.js @@ -507,16 +507,16 @@ export const ActorDamageMixin = (superclass) => class extends superclass {
let actorUpdate = {};
const newData = duplicate(originalData);
- const damageRoundingAdvantage = game.settings.get("sfrpg", "damageRoundingAdvantage");
- const isRoundingDefender = (damageRoundingAdvantage === "defender");
-
let remainingUndealtDamage = damage.amount;
- if (isRoundingDefender) {
+ if (remainingUndealtDamage % 1 !== 0) {
+ const damageRoundingAdvantage = game.settings.get("sfrpg", "damageRoundingAdvantage");
+ if (damageRoundingAdvantage === "defender") {
remainingUndealtDamage = Math.floor(remainingUndealtDamage);
} else {
remainingUndealtDamage = Math.ceil(remainingUndealtDamage);
}
+ }
const hasDeflectorShields = this.data.data.hasDeflectorShields;
const hasAblativeArmor = this.data.data.hasAblativeArmor;
| 7 |
diff --git a/shared/js/background/classes/score.es6.js b/shared/js/background/classes/score.es6.js @@ -76,7 +76,7 @@ class Score {
isaMajorTrackingNetwork () {
let result = 0
if (this.specialPage || !this.domain) return result
- const parentCompany = utils.findParent(this.domain.split('.'))
+ const parentCompany = utils.findParent(this.domain)
if (!parentCompany) return result
const isMajorNetwork = pagesSeenOn[parentCompany.toLowerCase()]
if (isMajorNetwork) {
| 3 |
diff --git a/package.json b/package.json "name": "find-and-replace",
"main": "./lib/find",
"description": "Find and replace within buffers and across the project.",
- "version": "0.215.12",
+ "version": "0.215.13",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/src/backend/mode_gpu.js b/src/backend/mode_gpu.js function flatten(arr) {
if (GPUUtils.isArray(arr[0])) {
if (GPUUtils.isArray(arr[0][0])) {
+ // Annoyingly typed arrays do not have concat so we turn them into arrays first
+ if (!Array.isArray(arr[0][0])) {
+ return [].concat.apply([], [].concat.apply([], arr).map(function(x) {
+ return Array.prototype.slice.call(x);
+ }));
+ }
+
return [].concat.apply([], [].concat.apply([], arr));
} else {
return [].concat.apply([], arr);
| 1 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -2787,4 +2787,15 @@ class Avatar {
Avatar.waitForLoad = () => loadPromise;
Avatar.getAnimations = () => animations;
Avatar.getAnimationMappingConfig = () => animationMappingConfig;
+let avatarAudioContext = null;
+const getAudioContext = () => {
+ if (!avatarAudioContext) {
+ avatarAudioContext = new AudioContext();
+ }
+ return avatarAudioContext;
+};
+Avatar.getAudioContext = getAudioContext;
+Avatar.setAudioContext = newAvatarAudioContext => {
+ avatarAudioContext = newAvatarAudioContext;
+};
export default Avatar;
| 0 |
diff --git a/world.js b/world.js @@ -272,7 +272,7 @@ appManager.addEventListener('appadd', e => {
const _bindHitTracker = () => {
const hitTracker = hpManager.makeHitTracker();
- scene.add(hitTracker);
+ app.parent.add(hitTracker);
hitTracker.add(app);
app.hitTracker = hitTracker;
@@ -287,7 +287,7 @@ appManager.addEventListener('appadd', e => {
};
app.addEventListener('die', die);
app.addEventListener('destroy', () => {
- scene.remove(hitTracker);
+ hitTracker.parent.remove(hitTracker);
world.appManager.removeEventListener('frame', frame);
world.appManager.removeEventListener('die', die);
});
| 11 |
diff --git a/examples/website/trips/package.json b/examples/website/trips/package.json },
"dependencies": {
"deck.gl": "^6.2.0",
+ "@deck.gl/experimental-layers": "^6.2.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^3.3.0"
"buble-loader": "^0.5.0",
"webpack": "^4.20.2",
"webpack-cli": "^3.1.2",
+ "html-webpack-plugin": "^3.0.7",
"webpack-dev-server": "^3.1.1"
}
}
| 1 |
diff --git a/core/quill.js b/core/quill.js @@ -622,7 +622,7 @@ function shiftRange(range, index, length, source) {
if (range == null) return null;
let start;
let end;
- if (index instanceof Delta) {
+ if (index.transformPosition) {
[start, end] = [range.index, range.index + range.length].map(pos =>
index.transformPosition(pos, source !== Emitter.sources.USER),
);
| 11 |
diff --git a/examples/CenterMode.js b/examples/CenterMode.js @@ -8,12 +8,26 @@ export default class CenterMode extends Component {
centerMode: true,
infinite: true,
centerPadding: '60px',
- slidesToShow: 3,
- speed: 500
+ slidesToShow: 4,
+ speed: 500,
};
+ const settings2 = {
+ ...settings,
+ infinite: false
+ }
+ const settings3 = {
+ ...settings,
+ slidesToShow: 3
+ }
+ const settings4 = {
+ ...settings,
+ slidesToShow: 3,
+ infinite: false
+ }
return (
<div>
<h2>Center Mode</h2>
+ <h4>Infinite, Even</h4>
<Slider {...settings}>
<div><h3>1</h3></div>
<div><h3>2</h3></div>
@@ -21,9 +35,31 @@ export default class CenterMode extends Component {
<div><h3>4</h3></div>
<div><h3>5</h3></div>
<div><h3>6</h3></div>
- <div><h3>7</h3></div>
- <div><h3>8</h3></div>
- <div><h3>9</h3></div>
+ </Slider>
+ <h4>Finite, Even</h4>
+ <Slider {...settings2}>
+ <div><h3>1</h3></div>
+ <div><h3>2</h3></div>
+ <div><h3>3</h3></div>
+ <div><h3>4</h3></div>
+ <div><h3>5</h3></div>
+ <div><h3>6</h3></div>
+ </Slider>
+ <h4>Infinite, Odd</h4>
+ <Slider {...settings3}>
+ <div><h3>1</h3></div>
+ <div><h3>2</h3></div>
+ <div><h3>3</h3></div>
+ <div><h3>4</h3></div>
+ <div><h3>5</h3></div>
+ </Slider>
+ <h4>Finite, Odd</h4>
+ <Slider {...settings4}>
+ <div><h3>1</h3></div>
+ <div><h3>2</h3></div>
+ <div><h3>3</h3></div>
+ <div><h3>4</h3></div>
+ <div><h3>5</h3></div>
</Slider>
</div>
);
| 0 |
diff --git a/Source/Shaders/CloudCollectionFS.glsl b/Source/Shaders/CloudCollectionFS.glsl @@ -42,7 +42,7 @@ vec2 voxelToUV(vec3 voxelIndex) {
// Interpolate a voxel with its neighbor (along the positive X-axis)
vec4 lerpSamplesX(vec3 voxelIndex, float x) {
vec2 uv0 = voxelToUV(voxelIndex);
- vec2 uv1 = uv0 + vec2(inverseNoiseTextureDimensions.x, 0.0);
+ vec2 uv1 = voxelToUV(voxelIndex + vec3(1.0, 0.0, 0.0));
vec4 sample0 = texture2D(u_noiseTexture, uv0);
vec4 sample1 = texture2D(u_noiseTexture, uv1);
return mix(sample0, sample1, x);
| 1 |
diff --git a/packages/core/src/computePosition.ts b/packages/core/src/computePosition.ts @@ -15,8 +15,13 @@ export const computePosition: ComputePosition = async (
if (__DEV__) {
if (platform == null) {
- throw new Error(
- ['Floating UI Core: `platform` property was not passed.'].join(' ')
+ console.error(
+ [
+ 'Floating UI: `platform` property was not passed to config. If you',
+ 'want to use Floating UI on the web, install @floating-ui/dom',
+ 'instead of the /core package. Otherwise, you can create your own',
+ '`platform`: https://floating-ui.com/docs/platform',
+ ].join(' ')
);
}
| 1 |
diff --git a/src/lib/services/PhysicalKeyboard.ts b/src/lib/services/PhysicalKeyboard.ts @@ -55,7 +55,6 @@ class PhysicalKeyboard {
if (options.physicalKeyboardHighlightPress) {
if (options.physicalKeyboardHighlightPressUsePointerEvents) {
buttonDOM.onpointerdown();
- buttonDOM.onpointerup();
} else if (options.physicalKeyboardHighlightPressUseClick) {
buttonDOM.click();
} else {
@@ -67,6 +66,7 @@ class PhysicalKeyboard {
}
handleHighlightKeyUp(event: KeyboardEvent) {
+ const options = this.getOptions();
const buttonPressed = this.getSimpleKeyboardLayoutKey(event);
this.dispatch((instance: any) => {
@@ -76,6 +76,9 @@ class PhysicalKeyboard {
if (buttonDOM && buttonDOM.removeAttribute) {
buttonDOM.removeAttribute("style");
+ if (options.physicalKeyboardHighlightPressUsePointerEvents) {
+ buttonDOM.onpointerup();
+ }
}
});
}
| 12 |
diff --git a/src/Widgets/GoogleMapsWidget/GoogleMapsWidgetComponent.js b/src/Widgets/GoogleMapsWidget/GoogleMapsWidgetComponent.js @@ -29,7 +29,7 @@ function GoogleMapsWidgetComponent(props) {
);
}
-function InteractiveMap({ address, apiKey, zoom, children }) {
+function InteractiveGoogleMap({ address, apiKey, zoom, children }) {
const url = `https://www.google.com/maps/embed/v1/place?q=${address}&key=${apiKey}&zoom=${zoom}`;
return (
<div className="google-maps-widget">
@@ -45,8 +45,8 @@ function InteractiveMap({ address, apiKey, zoom, children }) {
);
}
-function StaticMap({ address, apiKey, zoom, children }) {
- const [mapBoundary, setMapBoundary] = React.useState({
+function StaticGoogleMap({ address, apiKey, zoom, children }) {
+ const [mapSize, setMapSize] = React.useState({
elementHeight: 0,
elementWidth: 0,
height: null,
@@ -64,8 +64,8 @@ function StaticMap({ address, apiKey, zoom, children }) {
const elementHeight = currentRef.offsetHeight;
if (
- mapBoundary.elementWidth !== elementWidth ||
- mapBoundary.elementHeight !== elementHeight
+ mapSize.elementWidth !== elementWidth ||
+ mapSize.elementHeight !== elementHeight
) {
let width = elementWidth;
let height = elementHeight;
@@ -77,7 +77,7 @@ function StaticMap({ address, apiKey, zoom, children }) {
height = Math.round(maxWidth * factor);
}
- setMapBoundary({
+ setMapSize({
elementHeight,
elementWidth,
height,
@@ -94,7 +94,7 @@ function StaticMap({ address, apiKey, zoom, children }) {
return () => {
window.removeEventListener("resize", handleResize);
};
- }, [mapBoundary]);
+ }, [mapSize]);
return (
<div
@@ -103,8 +103,8 @@ function StaticMap({ address, apiKey, zoom, children }) {
style={{
background: "no-repeat center / cover",
backgroundImage: `url(${getMapUrl({
- width: mapBoundary.width,
- height: mapBoundary.height,
+ width: mapSize.width,
+ height: mapSize.height,
address,
apiKey,
zoom,
| 10 |
diff --git a/apps/agpsdata/settings.js b/apps/agpsdata/settings.js @@ -35,7 +35,7 @@ function buildMainMenu() {
},
"Refresh every" : {
value : settings.refresh / 60,
- min : 12,
+ min : 6,
max : 168,
step : 1,
format : v => v + "h",
| 12 |
diff --git a/appveyor.yml b/appveyor.yml @@ -80,7 +80,7 @@ build_script:
Copy-Item "output\${PACKAGE_NAME} Setup ${PACKAGE_VERSION}.exe" "releases\${env:RELEASE}-win-ia32.exe"
Get-ChildItem releases
if ($env:APPVEYOR_REPO_TAG -eq 'false' -or $env:APPVEYOR_REPO_TAG -eq 'False') {
- npm run github-release -- --owner=cheton --repo=cnc --tag="${env:APPVEYOR_REPO_BRANCH}-latest" --name="${env:APPVEYOR_REPO_BRANCH}" --body="${env:COMMIT_LOG}" "releases\${env:RELEASE}-win-ia32.exe"
+ npm run github-release -- --owner=cncjs --repo=cncjs --tag="${env:APPVEYOR_REPO_BRANCH}-latest" --name="${env:APPVEYOR_REPO_BRANCH}" --body="${env:COMMIT_LOG}" "releases\${env:RELEASE}-win-ia32.exe"
}
}
| 10 |
diff --git a/lib/waterline/collection.js b/lib/waterline/collection.js @@ -6,7 +6,6 @@ var _ = require('@sailshq/lodash');
var extend = require('./utils/system/extend');
var LifecycleCallbackBuilder = require('./utils/system/lifecycle-callback-builder');
var TransformerBuilder = require('./utils/system/transformer-builder');
-var DatastoreMapping = require('./utils/system/datastore-mapping');
var hasSchemaCheck = require('./utils/system/has-schema-check');
| 2 |
Subsets and Splits