code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js b/public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js @@ -181,10 +181,10 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) {
*/
status.shiftDown = e.shiftKey;
if (!status.focusOnTextField) {
- // "e": "Walk", "c": "CurbRamp", "m": "NoCurbRamp", "o": "Obstacle", "s": "SurfaceProblem": "n": "NoSideawlk", "o": "Occlusion"
+ // e: Walk, c: CurbRamp, m: NoCurbRamp, o: Obstacle, s: SurfaceProblem: n: NoSidewalk, o: Occlusion
for (const mode of ['Walk', 'CurbRamp', 'NoCurbRamp', 'Obstacle', 'SurfaceProblem', 'NoSidewalk', 'Occlusion']) {
- if (e.keyCode == util.misc.getLabelDescriptions(mode)['shortcut']['keyNumber']) {
- _closeContextMenu(e.keyCode);
+ if (e.keyCode === util.misc.getLabelDescriptions(mode)['shortcut']['keyNumber']) {
+ if (mode !== 'Walk') _closeContextMenu(e.keyCode);
ribbon.modeSwitch(mode);
svl.tracker.push("KeyboardShortcut_ModeSwitch_" + mode, {
keyCode: e.keyCode
| 1 |
diff --git a/electron/offscreen.js b/electron/offscreen.js @@ -7,6 +7,9 @@ const path = require('path');
const open = require('open');
const fs = require('fs');
+const defaultModel = "assets/models/2.0/BoomBox/glTF/BoomBox.gltf";
+const outputFile = "output.png";
+
let mainWindow;
let argv = process.argv;
@@ -97,10 +100,22 @@ parser.addArgument(
parser.addArgument(
'gltf_path',
{
+ nargs: "?",
help: "The path of the glTF file."
}
)
args = parser.parseArgs(args);
+
+if (args.gltf_path === null)
+{
+ console.log("%s\n", parser.description);
+ console.info("IMPORTANT NOTICE: \n\
+ Add '-- --' to get your arguments through to the tool. \n\
+ Example: 'npm run start-offscreen -- -- --help'");
+ console.error("\nNo gltf_path was given, defaulting to '%s'\n", defaultModel);
+ args.gltf_path = defaultModel;
+}
+
global.sharedObject = {args: args}
function createWindow () {
@@ -140,9 +155,9 @@ function createWindow () {
lastImage = image;
- fs.writeFile('output.png', lastImage.toPNG(), (err) => {
+ fs.writeFile(outputFile, lastImage.toPNG(), (err) => {
if (err) throw err;
- console.log('The file has been saved!');
+ console.log("The file has been saved to '%s'", outputFile);
app.quit();
});
| 7 |
diff --git a/app/.eslintrc.json b/app/.eslintrc.json "allowImportExportEverywhere": false,
"codeFrame": false
},
- "plugins": [
- "react"
- ],
+ "plugins": ["react"],
"rules": {
- "indent": [
- "error",
- 4
- ],
- "linebreak-style": [
- "error",
- "unix"
- ],
- "quotes": [
- "error",
- "single"
- ],
- "semi": [
- "error",
- "never"
- ]
+ "indent": ["error", 4],
+ "linebreak-style": ["error", "unix"],
+ "quotes": ["error", "single", { "avoidEscape": true }],
+ "semi": ["error", "never"]
},
"settings": {
"react": {
| 11 |
diff --git a/src/compare-tree/index.js b/src/compare-tree/index.js @@ -31,8 +31,9 @@ CompareTree.prototype = {
let query = this.addQuery(id, dependencies)
- dependencies.map(this.track, this)
- .forEach(node => node.connect(query))
+ for (var i = 0; i < dependencies.length; i++) {
+ this.addBranch(dependencies[i], query)
+ }
query.on('change', callback, scope)
@@ -147,11 +148,13 @@ CompareTree.prototype = {
},
/**
- * Build up a branch of nodes given a path of keys
+ * Build up a branch of nodes given a path of keys, appending a query
+ * to the end.
* @private
* @param {String} path A list of keys
+ * @param {Query} query Query to append to the end of the branch
*/
- track (path) {
+ addBranch (path, query) {
let last = this.addNode(ROOT_KEY, ROOT_PATH, null)
let keyBase = ''
@@ -161,7 +164,7 @@ CompareTree.prototype = {
last = this.addNode(keyBase, path[i], last)
}
- return last
+ last.connect(query)
},
/**
| 10 |
diff --git a/test/unit/cartodb/lzmaMiddleware.test.js b/test/unit/cartodb/lzmaMiddleware.test.js @@ -20,6 +20,9 @@ describe('lzma-middleware', function() {
query: {
api_key: 'test',
lzma: data
+ },
+ profiler: {
+ done: function () {}
}
};
| 1 |
diff --git a/src/server/service/page.js b/src/server/service/page.js @@ -105,7 +105,7 @@ class PageService {
if (updateMetadata) {
unorderedBulkOp
.find({ _id: page._id })
- .update({ $set: { path: newPagePath, lastUpdateUser: user._id, updatedAt: Date.now().toISOString() } });
+ .update({ $set: { path: newPagePath, lastUpdateUser: user._id, updatedAt: new Date() } });
}
else {
unorderedBulkOp.find({ _id: page._id }).update({ $set: { path: newPagePath } });
| 4 |
diff --git a/packages/vite-plugin-imba/src/index.imba b/packages/vite-plugin-imba/src/index.imba import type { CompileData } from './utils/compile.ts'
import svgPlugin from "./svg-plugin";
import type { Plugin, HmrContext } from "vite";
-import { buildIdParser, IdParser, ImbaRequest, normalize } from "./utils/id";
+import { parseRequest, buildIdParser, IdParser, ImbaRequest, normalize } from "./utils/id";
import { log, logCompilerWarnings } from "./utils/log";
import { CompileData, createCompileImba } from "./utils/compile";
import {
@@ -115,6 +115,21 @@ export def imba(inlineOptions\Partial<Options> = {})
log.debug "resolved imba to imba/server"
return imbaSSR
return resolvedImbaSSR
+
+ if test?
+ const req = parseRequest(id, ssr)
+ if req..external !== undefined
+ let keys = []
+ for k,v in Object.keys(req)
+ keys.push "{k}={v}" unless k == 'external'
+ if keys.length
+ id = id.split("?")[0] + "?{keys.join('&')}"
+ else
+ id = id.split("?")[0]
+ return id
+
+
+
try
const resolved = resolveViaPackageJsonImba(importee, importer, cache)
if resolved
| 8 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "5.1.0">
+<!ENTITY version-java-client "5.1.1">
<!ENTITY version-dotnet-client "5.0.1">
<!ENTITY version-server "3.7.0">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/web/adminManager-editModal.html b/web/adminManager-editModal.html </label>
<div class="col-sm-9">
<div class="input-group">
- <input type="text" class="form-control" id="modEditAdmin-citizenfxID" maxlength="16"
+ <input type="text" class="form-control" id="modEditAdmin-citizenfxID" maxlength="20"
autocomplete="off" value="{{it.citizenfx_id}}">
</div>
<span class="form-text text-muted">
| 3 |
diff --git a/config/cards.yml b/config/cards.yml articles:
- title: "Rules"
- url: "/rules"
+ url: "/rules/current"
- title: "Extensions"
url: "/extensions"
- title: "Webtasks"
url: "https://webtask.io/docs/101"
+ external: true
- id: "identity-providers"
| 0 |
diff --git a/README.md b/README.md [](http://travis-ci.org/gokr/canoe)
-Canoe is a cross platform RaiBlocks Wallet application. It's based upon the [Copay](https://copay.io) Bitcoin wallet source code released under the MIT license. For binary downloads, see [canoe.krampe.se](https://canoe.krampe.se).
+Canoe is a cross platform RaiBlocks Wallet application. It's based upon the [Copay](https://copay.io) Bitcoin wallet source code released under the MIT license. For binary downloads, when available, see [getcanoe.io](https://getcanoe.io).
## Main Features
| 10 |
diff --git a/scripts/feeHandler.js b/scripts/feeHandler.js @@ -7,6 +7,8 @@ const wallets = {"olympus": "0x09227deaeE08a5Ba9D6Eb057F922aDfAd191c36c",
"imtoken": "0xb9E29984Fe50602E7A619662EBED4F90D93824C7",
"trust": "0xf1aa99c69715f423086008eb9d06dc1e35cc504d",
"cipher": "0xDD61803d4a56C597E0fc864F7a20eC7158c6cBA5" }
+const KNC_MINIMAL_TX_AMOUNT = 10
+const RETRIALS = 60
const Web3 = require("web3");
const fs = require("fs");
@@ -50,7 +52,8 @@ function sleep(ms){
}
async function waitForTx(txHash) {
- while(true) {
+ let retrials = RETRIALS;
+ while(retrials--) {
const reciept = await web3.eth.getTransactionReceipt(txHash)
if(reciept != null) {
// tx is mined
@@ -112,14 +115,14 @@ async function sendTx(txObject) {
async function enoughReserveFeesToBurn(reserve_address) {
let reserveFeeToBurn = (await FeeBurner.methods.reserveFeeToBurn(reserve_address).call()).toLowerCase();
console.log("reserveFeeToBurn", reserveFeeToBurn)
- return (reserveFeeToBurn.toString() >= 10)
+ return (reserveFeeToBurn.toString() >= KNC_MINIMAL_TX_AMOUNT)
}
async function enoughWalletFeesToBurn(reserve_address, wallet_address)
{
let walletFeeToSend = (await FeeBurner.methods.reserveFeeToWallet(reserve_address, wallet_address).call()).toLowerCase();
console.log("walletFeeToSend", walletFeeToSend)
- return (walletFeeToSend.toString() >= 10)
+ return (walletFeeToSend.toString() >= KNC_MINIMAL_TX_AMOUNT)
}
async function burnReservesFees(reserve_address) {
@@ -172,7 +175,6 @@ async function main() {
for (let reserve_index in reserves) {
let reserve_address = reserves[reserve_index];
console.log("reserve_address", reserve_address)
- continue
await burnReservesFees(reserve_address);
await sendFeesToWallets(reserve_address);
}
| 12 |
diff --git a/src/components/general/map-gen/MapGen.jsx b/src/components/general/map-gen/MapGen.jsx @@ -887,7 +887,7 @@ export const MapGen = () => {
const chunk = terrainApp?.getChunkForPhysicsObject(hoveredPhysicsObject);
if (chunk) {
console.log('got chunk', chunk, hoveredPhysicsObject);
- setSelectedPhysicsObject(hoveredPhysicsObject);
+ setSelectedPhysicsObject(selectedPhysicsObject !== hoveredPhysicsObject ? hoveredPhysicsObject : null);
} else {
console.log('did not get chunk', hoveredPhysicsObject);
setSelectedPhysicsObject(null);
| 0 |
diff --git a/web/app/components/DepositWithdraw/openledger/OpenLedgerFiatDepositWithdrawal.jsx b/web/app/components/DepositWithdraw/openledger/OpenLedgerFiatDepositWithdrawal.jsx @@ -100,7 +100,7 @@ class OpenLedgerFiatDepositWithdrawCurrency extends React.Component {
withdraw_fragment =
<td>
<button className={"button outline"} onClick={this.onWithdraw.bind(this)}> <Translate content="gateway.withdraw" /> </button>
- <Modal id={withdraw_modal_id} overlay={true}>
+ <BaseModal id={withdraw_modal_id} overlay={true}>
<Trigger close={withdraw_modal_id}>
<a href="#" className="close-button">×</a>
</Trigger>
@@ -114,7 +114,7 @@ class OpenLedgerFiatDepositWithdrawCurrency extends React.Component {
deposit_asset={this.props.deposit_asset}
modal_id={withdraw_modal_id} />
</div>
- </Modal>
+ </BaseModal>
</td>;
}
else
| 14 |
diff --git a/src/shaderlib/index.js b/src/shaderlib/index.js @@ -24,7 +24,7 @@ import project from '../shaderlib/project/project';
import project64 from '../shaderlib/project64/project64';
import lighting from '../shaderlib/lighting/lighting';
-import {registerShaderModules} from 'luma.gl';
+import {registerShaderModules, setDefaultShaderModules} from 'luma.gl';
registerShaderModules([
fp32, fp64,
@@ -32,6 +32,8 @@ registerShaderModules([
lighting
]);
+setDefaultShaderModules([project]);
+
export {
fp32, fp64,
project, project64,
| 0 |
diff --git a/viewer/js/config/viewer.js b/viewer/js/config/viewer.js @@ -175,14 +175,6 @@ define([
iconClass: 'fa fa-smile-o'
}]
}
- }, {
- type: 'dynamic',
- url: 'http://sampleserver6.arcgisonline.com/arcgis/rest/services/SampleWorldCities/MapServer',
- title: i18n.viewer.operationalLayers.cities,
- options: {
- id: 'cities',
- visible: false
- }
}, {
type: 'dynamic',
url: 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/PublicSafety/PublicSafetyOperationalLayers/MapServer',
@@ -232,6 +224,14 @@ define([
iconClass: 'fa fa-smile-o'
}]
}
+ }, {
+ type: 'dynamic',
+ url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/SampleWorldCities/MapServer',
+ title: i18n.viewer.operationalLayers.cities,
+ options: {
+ id: 'cities',
+ visible: false
+ }
/*
//examples of vector tile layers (beta in v3.15)
}, {
| 4 |
diff --git a/Source/Scene/Cesium3DTileFeature.js b/Source/Scene/Cesium3DTileFeature.js @@ -258,23 +258,6 @@ Cesium3DTileFeature.prototype.getPropertyInherited = function (name) {
return undefined;
};
-// getPropertyInherited()
-// 1. check for batch table, and try batchTable.getProperty()
-// (this will change with new feature table)
-// 1.5 get content.tile.metadata.getPropertyBySemantic()
-// 2. get content.tile.metadata.getProperty()
-// 2.5 get content.groupMetadata.getPropertyBySemantic()
-// 3. content.groupMetadata.getProperty()
-// 4. content.tileset.metadata.getProperty()
-// TODO: Write an issue about things to be added, namely:
-// - semantics (see existing issue)
-// - ${feature.property} ${group.property} ${tileset.property} syntax (or ${classId.property})?
-// - feature tables, esp. multiple feature tables.
-// - how to handle group and class IDs? function? built-in variables?
-// - how to handle built-in variables in general? or only on GPU?
-// - ability for glTFs to refer to vertex attributes in styling: color ramp based on primitive POSITION
-// - for spec checklist: list styling changes in 3DTILES_metadata
-
/**
* Sets the value of the feature's property with the given name.
* <p>
| 5 |
diff --git a/bin/enforcers/Items.js b/bin/enforcers/Items.js * limitations under the License.
**/
'use strict';
-const EnforcerRef = require('../enforcer-ref');
+const Base = require('../validator-parameter-base');
module.exports = {
init: function (data) {
-
+ // TODO: need to test this, maybe create schema for each item
+ throw Error('TODO');
},
prototype: {},
validator: function (data) {
- const Base = require('../validator-parameter-base');
- const base = Base(data);
+ const base = Base.validator(data);
return base.properties.items;
}
};
| 4 |
diff --git a/src/haxe/io/Bytes.hx b/src/haxe/io/Bytes.hx @@ -701,7 +701,7 @@ class Bytes {
setInt32(pos + 4, v.high);
}
- public function getString( pos : Int, len : Int ) : String {
+ public function getString( pos : Int, len : Int, ?encoding : Dynamic ) : String {
if( pos < 0 || len < 0 || pos + len > length ) throw Error.OutsideBounds;
var s = "";
var b = b;
@@ -763,7 +763,7 @@ class Bytes {
return new Bytes(new BytesData(length));
}
- public static function ofString( s : String ) : Bytes {
+ public static function ofString( s : String, ?encoding : Dynamic ) : Bytes {
var a = new Array();
// utf16-decode and utf8-encode
var i = 0;
@@ -920,7 +920,7 @@ class Bytes {
setInt32(pos, v.low);
}
- public function getString( pos : Int, len : Int ) : String {
+ public function getString( pos : Int, len : Int, ?encoding : Dynamic ) : String {
if( outRange(pos,len) ) throw Error.OutsideBounds;
var b = new hl.Bytes(len + 1);
@@ -963,7 +963,7 @@ class Bytes {
return new Bytes(b,length);
}
- public static function ofString( s : String ) : Bytes @:privateAccess {
+ public static function ofString( s : String, ?encoding : Dynamic ) : Bytes @:privateAccess {
var size = 0;
var b = s.bytes.utf16ToUtf8(0, size);
return new Bytes(b,size);
@@ -1002,13 +1002,13 @@ extern class Bytes {
public function getInt64( pos : Int ) : haxe.Int64;
public function setInt32( pos : Int, v : Int ) : Void;
public function setInt64( pos : Int, v : haxe.Int64 ) : Void;
- public function getString( pos : Int, len : Int ) : String;
+ public function getString( pos : Int, len : Int, ?encoding : Dynamic ) : String;
public function toString() : String;
public function toHex() : String;
public function getData() : BytesData;
public static function alloc( length : Int ) : Bytes;
@:pure
- public static function ofString( s : String ) : Bytes;
+ public static function ofString( s : String, ?encoding : Dynamic ) : Bytes;
public static function ofData( b : BytesData ) : Bytes;
public static function fastGet( b : BytesData, pos : Int ) : Int;
static function __init__():Void {
| 7 |
diff --git a/svc/scenarios.js b/svc/scenarios.js @@ -22,12 +22,12 @@ async function processScenarios(matchID, cb) {
epoch_week: currentWeek,
wins: row.wins ? '1' : '0',
});
- const values = Object.keys(row).map(() => '?').join(',');
+ const values = Object.keys(row).map(() => '?');
const query = util.format(
'INSERT INTO %s (%s) VALUES (%s) ON CONFLICT (%s) DO UPDATE SET wins = %s.wins + EXCLUDED.wins, games = %s.games + 1',
table,
Object.keys(row).join(','),
- values,
+ values.join(','),
Object.keys(row).filter(column => column !== 'wins').join(','),
table,
table,
| 5 |
diff --git a/token-metadata/0xf0Bc1ae4eF7ffb126A8347D06Ac6f8AdD770e1CE/metadata.json b/token-metadata/0xf0Bc1ae4eF7ffb126A8347D06Ac6f8AdD770e1CE/metadata.json "symbol": "1MT",
"address": "0xf0Bc1ae4eF7ffb126A8347D06Ac6f8AdD770e1CE",
"decimals": 7,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/assets/stylesheets/editor-3/_mosaic.scss b/app/assets/stylesheets/editor-3/_mosaic.scss .Mosaic-list {
- @include display-flex();
- @include flex-wrap(wrap);
+ display: flex;
+ flex-wrap: wrap;
}
+
.Mosaic-item {
position: relative;
width: 40px;
box-sizing: border-box;
cursor: pointer;
- &:hover {
&::before {
- @include transition(all, 300ms);
- border: 2px solid $cBlueHover;
- }
-
- .Mosaic-remove {
- opacity: 1;
- }
- }
-}
-.Mosaic-item::before {
position: absolute;
top: 0;
right: 0;
pointer-events: none;
content: '';
}
-.Mosaic-item--dashed::before {
- border: 1px dashed rgba(0, 0, 0, 0.08);
+
+ &:hover {
+ &::before {
+ transition: all 300ms;
+ border: 2px solid $cBlueHover;
}
-.Mosaic-item.is-selected::before {
+
+ .Mosaic-remove {
+ opacity: 1;
+ }
+ }
+
+ &.is-selected::before {
top: -1px;
right: -1px;
bottom: -1px;
left: -1px;
border: 2px solid #000;
}
+}
+
+
+.Mosaic-item--dashed::before {
+ border: 1px dashed rgba(0, 0, 0, 0.08);
+}
+
.Mosaic-image {
display: block;
width: 100%;
height: 100%;
}
+
.Mosaic-inner {
border-radius: $halfBaseSize;
overflow: hidden;
pointer-events: none;
}
+
.Mosaic-button {
width: 40px;
color: #1785FB;
line-height: 40px;
}
+
.Mosaic-remove {
- @include transition(opacity, 100ms);
+ transition: opacity 100ms;
position: absolute;
right: 4px;
bottom: 4px;
| 2 |
diff --git a/OurUmbraco.Site/Views/Partials/Navigation/TopNavigation.cshtml b/OurUmbraco.Site/Views/Partials/Navigation/TopNavigation.cshtml {
<a href="https://github.com/umbraco/Umbraco-CMS/blob/v8/dev/.github/CONTRIBUTING.md" target="_blank" rel="noreferrer noopener">@page.Name</a>
}
- else if (page.Name == "Packages")
- {
- <a href="/about-packages">@page.Name</a>
- }
else
{
<a href="@page.Url">@page.Name</a>
| 2 |
diff --git a/package/src/components/InlineAlert/v1/InlineAlert.js b/package/src/components/InlineAlert/v1/InlineAlert.js @@ -47,7 +47,9 @@ const StyledDiv = styled.div`
border-color: ${applyTheme("InlineAlert.borderColor_warning")};
`;
default:
- return "";
+ return css`
+ display: none;
+ `;
}
}};
`;
@@ -117,8 +119,8 @@ class InlineAlert extends Component {
};
static defaultProps = {
- actionType: "information",
- message: "Alert",
+ actionType: "",
+ message: "",
isAutoClosing: false,
isClosed: false,
isDismissable: false
| 1 |
diff --git a/src/js/routes.js b/src/js/routes.js @@ -1037,6 +1037,39 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
abstract: true
})
+ /* Explore Bitcoin.com */
+ .state('tabs.bitcoin-com', {
+ url: '/bitcoincom',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'bitcoincomController',
+ templateUrl: 'views/bitcoincom.html'
+ }
+ }
+ })
+
+ /* buy.Bitcoin.com */
+ .state('tabs.buyandsell.bitcoindotcom', {
+ url: '/buyBitcoindotcom',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'buyBitcoindotcomController',
+ templateUrl: 'views/buyBitcoindotcom.html'
+ }
+ }
+ })
+
+ /* Price Chart */
+ .state('tabs.pricechart', {
+ url: '/pricechart',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'pricechartController',
+ templateUrl: 'views/pricechart.html'
+ }
+ }
+ })
+
/*
*
* Mercado Libre Gift Card
@@ -1200,7 +1233,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
});
})
- .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ coinbaseService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService) {
+ .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService) {
uxLanguage.init();
| 1 |
diff --git a/src/components/form/form.stories.js b/src/components/form/form.stories.js import React from 'react';
import { storiesOf } from '@storybook/react';
-import { boolean, text } from '@storybook/addon-knobs';
+import { boolean, text, select } from '@storybook/addon-knobs';
+import OptionsHelper from '../../utils/helpers/options-helper';
import notes from './notes.md';
import Form from './form';
import Textbox from '../textbox';
@@ -10,7 +11,7 @@ storiesOf('Form', module)
const unsavedWarning = boolean('unsavedWarning', false);
const save = boolean('save', true);
const cancel = boolean('cancel', true);
- const buttonAlign = text('buttonAlign', '');
+ const buttonAlign = select('buttonAlign', OptionsHelper.alignBinary);
const saving = boolean('saving', false);
const cancelText = text('cancelText', '');
const stickyFooter = boolean('stickyFooter', false);
| 14 |
diff --git a/src/components/IntlTelInputApp.js b/src/components/IntlTelInputApp.js @@ -72,6 +72,7 @@ class IntlTelInputApp extends Component {
this.setInitialState = this.setInitialState.bind(this);
this.setNumber = this.setNumber.bind(this);
this.scrollTo = this.scrollTo.bind(this);
+ this.updateDialCode = this.updateDialCode.bind(this);
this.notifyPhoneNumberChange = this.notifyPhoneNumberChange.bind(this);
this.isValidNumber = this.isValidNumber.bind(this);
this.isUnknownNanp = this.isUnknownNanp.bind(this);
@@ -269,7 +270,10 @@ class IntlTelInputApp extends Component {
this.tel.focus();
}
+ const newNumber = this.updateDialCode(this.selectedCountryData.dialCode, !isInit);
+
this.setState({
+ value: newNumber,
showDropdown: false,
highlightedCountry: selectedIndex,
countryCode,
@@ -844,6 +848,40 @@ class IntlTelInputApp extends Component {
}
}
+ // replace any existing dial code with the new one
+ // Note: called from _setFlag
+ updateDialCode(newDialCode, hasSelectedListItem) {
+ const currentNumber = this.state.value;
+ let newNumber = currentNumber;
+
+ // save having to pass this every time
+ newDialCode = `+${newDialCode}`;
+
+ if (currentNumber.charAt(0) === '+') {
+ // there's a plus so we're dealing with a replacement (doesn't matter if nationalMode or not)
+ const prevDialCode = this.getDialCode(currentNumber);
+
+ if (prevDialCode) {
+ // current number contains a valid dial code, so replace it
+ newNumber = currentNumber.replace(prevDialCode, newDialCode);
+ } else {
+ // current number contains an invalid dial code, so ditch it
+ // (no way to determine where the invalid dial code ends and the rest of the number begins)
+ newNumber = newDialCode;
+ }
+ } else if (this.nationalMode || this.separateDialCode) {
+ // don't do anything
+ } else if (currentNumber) { // nationalMode is disabled
+ // there is an existing value with no dial code: prefix the new dial code
+ newNumber = newDialCode + currentNumber;
+ } else if (hasSelectedListItem || !this.autoHideDialCode) {
+ // no existing value and either they've just selected a list item, or autoHideDialCode is disabled: insert new dial code
+ newNumber = newDialCode;
+ }
+
+ return newNumber;
+ }
+
generateMarkup() {
this.wrapperClass['allow-dropdown'] = this.allowDropdown;
this.wrapperClass['separate-dial-code'] = this.props.separateDialCode;
| 3 |
diff --git a/content/components/_all.yml b/content/components/_all.yml @@ -694,7 +694,7 @@ keyword-list:
hasJs: false # <-- auto generated, don't change
hasReact: true # <-- auto generated, don't change
link-list:
- name: Link list
+ name: Link List
description: >
The link list style is a simple list of vertical or horizontal links used
for site navigation. It is used to order information for users.
| 10 |
diff --git a/devices/camera.js b/devices/camera.js @@ -501,7 +501,17 @@ export default class Camera extends RingPolledDevice {
if (deviceHealth) {
const attributes = {}
if (this.device.hasBattery) {
- attributes.batteryLevel = deviceHealth.battery_percentage
+ attributes.batteryLevel = this.device.batteryLevel === null ? 0 : this.device.batteryLevel
+ if (this.device.data.hasOwnProperty('battery_life') || this.device.data.hasOwnProperty('battery_voltage')) {
+ attributes.batteryLife = this.device.data.hasOwnProperty('battery_life') && isNaN(this.device.data.battery_life)
+ ? 0
+ : Number.parseFloat(this.device.data.battery_life)
+ }
+ if (this.device.data.hasOwnProperty('battery_life_2') || this.device.data.hasOwnProperty('battery_voltage_2')) {
+ attributes.batteryLife2 = this.device.data.hasOwnProperty('battery_life_2') && isNaN(this.device.data.battery_life_2)
+ ? 0
+ : Number.parseFloat(this.device.data.battery_life_2)
+ }
}
attributes.firmwareStatus = deviceHealth.firmware
attributes.lastUpdate = deviceHealth.updated_at.slice(0,-6)+"Z"
| 7 |
diff --git a/tests/unit/components/LMap.spec.js b/tests/unit/components/LMap.spec.js @@ -213,13 +213,12 @@ describe('component: LMap.vue', () => {
noBlockingAnimations: true,
});
- expect(wrapper).toBeDefined();
-
- /*
// Move the map several times in a short timeperiod
wrapper.setProps({ center: { lat: 0, lng: 170 } });
wrapper.setProps({ zoom: 15 });
+ expect(wrapper).toBeDefined();
+ /*
wrapper.setProps({ center: { lat: 80, lng: 0 } });
wrapper.setProps({ zoom: 10 });
| 12 |
diff --git a/src/http.js b/src/http.js @@ -65,7 +65,7 @@ export default function http(url, request = {}) {
}
// exported for testing
-export const shouldDownloadAsText = (contentType = '') => /json|xml|yaml|text/.test(contentType)
+export const shouldDownloadAsText = (contentType = '') => /(json|xml|yaml|text)\b/.test(contentType)
function parseBody(body, contentType) {
if (contentType === 'application/json') {
| 7 |
diff --git a/data.js b/data.js @@ -4104,6 +4104,14 @@ module.exports = [{
url: "https://github.com/MikeMcl/big.js/",
source: "https://raw.githubusercontent.com/MikeMcl/big.js/master/big.js"
},
+ {
+ name: "FAT",
+ github: "nextapps-de/fat",
+ tags: ["fast", "animation", "tool", "tween", "transform", "transition", "filter", "effect", "slide", "animate"],
+ description: "Web's fastest and most lightweight animation tool. This is a compact version including: Animation, Easing, Bezier, Transform, Colors.",
+ url: "https://github.com/nextapps-de/fat",
+ source: "https://raw.githubusercontent.com/nextapps-de/fat/0.6.4/fat.compact.js"
+ },
{
name: "PicoModal",
github: "Nycto/PicoModal",
| 0 |
diff --git a/game.js b/game.js @@ -856,15 +856,70 @@ world.appManager.addEventListener('objectadd', e => {
hitTracker.parent.remove(hitTracker);
world.appManager.removeEventListener('frame', frame);
});
-
app.addEventListener('die', () => {
metaversefileApi.removeApp(app);
app.destroy();
});
+ app.hit = (damage, opts = {}) => {
+ const result = hitTracker.hit(damage);
+ const {hit, died} = result;
+ if (hit) {
+ /* if (damagePhysicsMesh.physicsId !== collisionId) {
+ const physicsGeometry = physicsManager.getGeometryForPhysicsId(collisionId);
+ let geometry = new THREE.BufferGeometry();
+ geometry.setAttribute('position', new THREE.BufferAttribute(physicsGeometry.positions, 3));
+ geometry.setIndex(new THREE.BufferAttribute(physicsGeometry.indices, 1));
+ geometry = geometry.toNonIndexed();
+ geometry.computeVertexNormals();
+
+ damagePhysicsMesh.geometry.dispose();
+ damagePhysicsMesh.geometry = geometry;
+ damagePhysicsMesh.physicsId = collisionId;
+ } */
+
+ const {collisionId} = opts;
+ if (collisionId) {
+ hpManager.triggerDamageAnimation(collisionId);
+ }
+
+ app.dispatchEvent({
+ type: 'hit',
+ // position: cylinderMesh.position,
+ // quaternion: cylinderMesh.quaternion,
+ hp: hitTracker.hp,
+ totalHp: hitTracker.totalHp,
+ });
+ }
+ if (died) {
+ app.dispatchEvent({
+ type: 'die',
+ // position: cylinderMesh.position,
+ // quaternion: cylinderMesh.quaternion,
+ });
+ }
+ return result;
+ };
+ app.willDieFrom = damage => (hitTracker.hp - damage) <= 0;
};
_bindHitTracker();
});
+const hitboxOffsetDistance = 0.3;
+const cylinderMesh = (() => {
+ const radius = 1;
+ const height = 0.2;
+ const halfHeight = height/2;
+ const cylinderMesh = new THREE.Mesh(
+ new THREE.CylinderBufferGeometry(radius, radius, height),
+ new THREE.MeshBasicMaterial({
+ color: 0x00FFFF,
+ })
+ );
+ cylinderMesh.radius = radius;
+ cylinderMesh.halfHeight = halfHeight;
+ return cylinderMesh;
+})();
+
let lastDraggingRight = false;
let dragRightSpec = null;
const _updateWeapons = (timestamp) => {
@@ -1510,6 +1565,32 @@ const _updateWeapons = (timestamp) => {
};
_updateUses();
+ const _updateHits = () => {
+ const localPlayer = useLocalPlayer();
+
+ cylinderMesh.position.copy(localPlayer.position)
+ .add(localVector.set(0, 0, -hitboxOffsetDistance).applyQuaternion(localPlayer.quaternion));
+ cylinderMesh.quaternion.copy(localPlayer.quaternion);
+ // cylinderMesh.startPosition.copy(localPlayer.position);
+
+ const useAction = localPlayer.actions.find(action => action.type === 'use');
+ if (useAction && useAction.animation === 'combo') {
+ const collision = physx.physxWorker.collidePhysics(physx.physics, cylinderMesh.radius, cylinderMesh.halfHeight, cylinderMesh.position, cylinderMesh.quaternion, 1);
+ if (collision) {
+ const collisionId = collision.objectId;
+ const object = world.appManager.getObjectFromPhysicsId(collisionId);// || world.getNpcFromPhysicsId(collisionId);
+ if (object) {
+ // const worldPosition = object.getWorldPosition(localVector);
+ const damage = typeof useAction.damage === 'number' ? useAction.damage : 30;
+ object.hit(damage, {
+ collisionId,
+ });
+ }
+ }
+ }
+ };
+ _updateHits();
+
const _updateEyes = () => {
if (rigManager.localRig) {
if (!document.pointerLockElement && lastMouseEvent) {
| 4 |
diff --git a/scripts/compile-fx.sh b/scripts/compile-fx.sh @@ -5,7 +5,7 @@ for f2 in *.webm; do
ffmpeg -i "$f2" -f image2 -vf fps=fps=24 lol%03d.png
for f in lol0*.png; do
echo alpha "$f"
- convert "$f" -transparent '#494949' "$f"-transparent.png
+ convert "$f" -transparent '#494949' -transparent "#225458" "$f"-transparent.png
done;
echo montage "$f2"
montage lol0*-transparent.png -background none -tile 8x8 -geometry 512x512+0+0 spritesheet.png
| 0 |
diff --git a/reference/features/language.md b/reference/features/language.md @@ -26,7 +26,7 @@ If you'd like us to add or improve support for a language that isn't in the abov
### What do you mean when you say MeiliSearch offers *optimized* support for a language?
-Under the hood, MeiliSearch relies on tokenizers that identify the most important parts of each document in a given dataset. Currently, MeiliSearch has two tokenization pipelines: one for languages that separate words with spaces and one specifically tailored for Chinese. Languages that delimit their words in other ways will still work, but the quality and relevancy of search results may vary significantly.
+Under the hood, MeiliSearch relies on tokenizers that identify the most important parts of each document in a given dataset. We currently use two tokenization pipelines: one for languages that separate words with spaces and one specifically tailored for Chinese. Languages that delimit their words in other ways will still work, but the quality and relevancy of search results may vary significantly.
### My language does not use whitespace to separate words. Can I still use MeiliSearch?
| 7 |
diff --git a/app/models/daos/UserDAOImpl.scala b/app/models/daos/UserDAOImpl.scala @@ -256,7 +256,7 @@ object UserDAOImpl {
|from (select anonProfile.ip_address, count(anonProfile.audit_task_id) as audit_count,
| sum (anonProfile.n_labels) as label_count
| from (select anonUsersTable.ip_address, anonUsersTable.audit_task_id , count (l.label_id) as n_labels
- | from (select ip_address, audit_task_id
+ | from (select distinct ip_address, audit_task_id
| from sidewalk.audit_task_environment
| where audit_task_id in (select audit_task_id
| from sidewalk.audit_task
@@ -273,7 +273,7 @@ object UserDAOImpl {
|
| (select ip_address, max(timestamp) as new_timestamp
| from (select ip_address, anonUsersTable.audit_task_id as task_id, task_end as timestamp
- | from (select ip_address, audit_task_id
+ | from (select distinct ip_address, audit_task_id
| from sidewalk.audit_task_environment
| where audit_task_id in (select audit_task_id
| from sidewalk.audit_task
| 3 |
diff --git a/spec/requests/carto/api/geocodings_controller_spec.rb b/spec/requests/carto/api/geocodings_controller_spec.rb require_relative '../../../spec_helper'
require_relative '../../api/json/geocodings_controller_shared_examples'
require_relative '../../../../app/controllers/carto/api/geocodings_controller'
+require 'mock_redis'
describe Carto::Api::GeocodingsController do
it_behaves_like 'geocoding controllers' do
@@ -42,7 +43,9 @@ describe 'legacy behaviour tests' do
describe 'GET /api/v1/geocodings/:id' do
it 'returns a geocoding' do
- user_geocoder_metrics = CartoDB::GeocoderUsageMetrics.new(@user.username, nil)
+ redis_mock = MockRedis.new
+ user_geocoder_metrics = CartoDB::GeocoderUsageMetrics.new(@user.username, _orgname = nil, _redis = redis_mock)
+ CartoDB::GeocoderUsageMetrics.stubs(:new).returns(user_geocoder_metrics)
user_geocoder_metrics.incr(:geocoder_here, :success_responses, 100)
geocoding = FactoryGirl.create(:geocoding, table_id: UUIDTools::UUID.timestamp_create.to_s, formatter: 'b', user: @user, used_credits: 100, processed_rows: 100, kind: 'high-resolution')
| 1 |
diff --git a/components/Gallery/ArticleGallery.js b/components/Gallery/ArticleGallery.js import React, { Component, Fragment } from 'react'
import PropTypes from 'prop-types'
import Gallery from './Gallery'
-import get from 'lodash/get'
import { imageSizeInfo } from 'mdast-react-render/lib/utils'
import { postMessage } from '../../lib/withInNativeApp'
import { removeQuery } from '../../lib/utils/link'
@@ -41,11 +40,11 @@ const findFigures = (node, acc = []) => {
}
const getImageProps = node => {
- const url = get(node, 'children[0].children[0].url', '')
- const urlDark = get(node, 'children[0].children[2].url')
- const captionMdast = get(node, 'children[1].children', [])
+ const url = node?.children[0]?.children[0]?.url || ''
+ const urlDark = node?.children[0]?.children[2]?.url
+ const captionMdast = node?.children[1]?.children
const included =
- !get(node, 'data.excludeFromGallery', false) &&
+ !node?.data?.excludeFromGallery &&
imageSizeInfo(url) &&
imageSizeInfo(url).width > MIN_GALLERY_IMG_WIDTH
@@ -137,7 +136,7 @@ class ArticleGallery extends Component {
const { children } = this.props
const { article } = this.props
const { show, startItemSrc, galleryItems } = this.state
- const enabled = get(article, 'content.meta.gallery', true)
+ const enabled = article?.content?.meta?.gallery !== false
return (
<Fragment>
{article.content && enabled && show && (
| 14 |
diff --git a/test/row-details.html b/test/row-details.html <dom-module id="x-grid">
<template>
<vaadin-grid id="grid" style="width: 50px; height: 400px;">
- <slot></slot>
+ <template class="row-details"><span>[[index]]</span>-details</template>
<vaadin-grid-column>
<template>[[index]]</template>
</vaadin-grid-column>
<test-fixture id="with-scope">
<template>
- <x-grid>
+ <x-grid></x-grid>
+ </template>
+ </test-fixture>
+
+ <dom-module id="slotted-grid">
+ <template>
+ <vaadin-grid id="grid" style="width: 50px; height: 400px;">
+ <slot></slot>
+ <vaadin-grid-column>
+ <template>[[index]]</template>
+ </vaadin-grid-column>
+ </vaadin-grid>
+ </template>
+ <script>
+ HTMLImports.whenReady(() => {
+ Polymer({
+ is: 'slotted-grid'
+ });
+ });
+ </script>
+ </dom-module>
+
+ <test-fixture id="slotted-template">
+ <template>
+ <slotted-grid>
<template class="row-details"><span>[[index]]</span>-details</template>
- </x-grid>
+ </slotted-grid>
</template>
</test-fixture>
});
describe('inside a parent scope', () => {
- let xGrid;
beforeEach(() => {
- xGrid = fixture('with-scope');
- grid = xGrid.$.grid;
+ grid = fixture('with-scope').$.grid;
grid.items = ['foo', 'bar', 'baz'];
flushGrid(grid);
bodyRows = getRows(grid.$.items);
expect(getCellContent(firstRowCells[1]).textContent.trim()).to.equal('0-details');
expect(getCellContent(secondRowCells[1]).textContent.trim()).to.equal('1-details');
});
+ });
+
+ describe('slotted template', () => {
+ let slottedGrid;
+
+ beforeEach(() => {
+ slottedGrid = fixture('slotted-template');
+ grid = slottedGrid.$.grid;
+ grid.items = ['foo', 'bar', 'baz'];
+ flushGrid(grid);
+ bodyRows = getRows(grid.$.items);
+ });
+
+ it('should support slotted details templates', () => {
+ grid.openItemDetails('foo');
+ expect(getBodyCellContent(grid, 0, 1).textContent.trim()).to.equal('0-details');
+ });
it('should change the details template', () => {
grid.openItemDetails('foo');
- xGrid.innerHTML = '<template class="row-details">[[item]]-bar</template>';
+
+ const newTemplate = document.createElement('template');
+ newTemplate.classList.add('row-details');
+ newTemplate.innerHTML = '[[item]]-bar';
+
+ slottedGrid.innerHTML = '';
+ slottedGrid.appendChild(newTemplate);
flushGrid(grid);
expect(getBodyCellContent(grid, 0, 1).textContent.trim()).to.equal('foo-bar');
});
| 7 |
diff --git a/src/plot_api/to_image.js b/src/plot_api/to_image.js @@ -90,15 +90,15 @@ function toImage(gd, opts) {
config = gd._context;
}
- function isBadlySet(attr) {
+ function isImpliedOrValid(attr) {
return !(attr in opts) || Lib.validate(opts[attr], attrs[attr]);
}
- if(!isBadlySet('width') || !isBadlySet('height')) {
+ if(!isImpliedOrValid('width') || !isImpliedOrValid('height')) {
throw new Error('Height and width should be pixel values.');
}
- if(!isBadlySet('format')) {
+ if(!isImpliedOrValid('format')) {
throw new Error('Image format is not jpeg, png, svg or webp.');
}
| 10 |
diff --git a/src/og/scene/planet.js b/src/og/scene/planet.js @@ -24,8 +24,8 @@ import { Node } from '../quadTree/Node.js';
import { NormalMapCreator } from '../utils/NormalMapCreator.js';
import { PlanetCamera } from '../camera/PlanetCamera.js';
import { RenderNode } from './RenderNode.js';
-import { Segment } from '../planetSegment/Segment.js';
-import { SegmentLonLat } from '../planetSegment/SegmentLonLat.js';
+import { Segment } from '../segment/Segment.js';
+import { SegmentLonLat } from '../segment/SegmentLonLat.js';
import { TerrainWorker } from '../utils/TerrainWorker.js';
import { VectorTileCreator } from '../utils/VectorTileCreator.js';
import { wgs84 } from '../ellipsoid/wgs84.js';
| 10 |
diff --git a/doc/includes/API.md b/doc/includes/API.md @@ -2736,9 +2736,13 @@ const context = builder.context();
Person
.query()
.context({
- runBefore: (result, builder) => {},
- runAfter: (result, builder) => {},
- onBuild: (builder) => {}
+ runBefore: (result, builder) => {
+ return result;
+ },
+ runAfter: (result, builder) => {
+ return result;
+ },
+ onBuild: builder => {}
});
```
@@ -2750,7 +2754,7 @@ Person
.query()
.eager('[movies, children.movies]')
.context({
- onBuild: (builder) => {
+ onBuild: builder => {
builder.withSchema('someSchema');
}
});
@@ -3153,15 +3157,17 @@ const builder = queryBuilder.runBefore(runBefore);
const query = Person.query();
query
- .runBefore(async () => {
+ .runBefore(async result => {
console.log('hello 1');
await Promise.delay(10);
console.log('hello 2');
+ return result
})
- .runBefore(() => {
+ .runBefore(result => {
console.log('hello 3');
+ return result
});
await query;
@@ -3177,7 +3183,7 @@ chained like [`then`](#then) methods of a promise.
Argument|Type|Description
--------|----|--------------------
-runBefore|function(any, [`QueryBuilder`](#querybuilder))|The function to be executed.
+runBefore|function(result, [`QueryBuilder`](#querybuilder))|The function to be executed. This function can be async. Note that it needs to return the result used for further processing in the chain of calls.
##### Return value
@@ -3245,6 +3251,7 @@ query
})
.runAfter(async (models, queryBuilder) => {
models.push(Person.fromJson({firstName: 'Jennifer'}));
+ return models;
});
const models = await query;
@@ -3260,7 +3267,7 @@ registered using the [`then`](#then) method. Multiple functions can be chained l
Argument|Type|Description
--------|----|--------------------
-runAfter|function(*, [`QueryBuilder`](#querybuilder))|The function to be executed.
+runAfter|function(result, [`QueryBuilder`](#querybuilder))|The function to be executed. This function can be async. Note that it needs to return the result used for further processing in the chain of calls.
##### Return value
| 7 |
diff --git a/edit.js b/edit.js @@ -589,10 +589,10 @@ ${land ? '' : `\
void main() {
vec2 worldUv = vWorldUv;
- ${land ? '' : `\
+ /* ${land ? '' : `\
vec3 view_dir = normalize(ts_view_pos - ts_frag_pos);
worldUv = parallaxMap(vUv, worldUv, view_dir);
- `}
+ `} */
worldUv = mod(worldUv, 1.0);
vec3 c = fourTapSample3(vUv, worldUv, tex);
| 2 |
diff --git a/react/package-lock.json b/react/package-lock.json {
"name": "@sparkdesignsystem/spark-react",
- "version": "4.1.1-alpha.0",
+ "version": "4.1.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"dev": true
},
"@sparkdesignsystem/spark-styles": {
- "version": "1.1.1-alpha.0",
- "resolved": "https://registry.npmjs.org/@sparkdesignsystem/spark-styles/-/spark-styles-1.1.1-alpha.0.tgz",
- "integrity": "sha512-6n5Q1oTHuHXbP1tpQDOojH2XxamDNr2AvdB27AcR+Hrljy37EwEJPpLc2DlQsEinknpoAYHi+IwQosPZuOLQoQ=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@sparkdesignsystem/spark-styles/-/spark-styles-1.1.1.tgz",
+ "integrity": "sha512-KYCHmLSjY2ao0nn+Il7wx6LYTLy0QmyVGrW7Mqu4fLNA5PMYoXf4apjydJUji1katqwpKefjpReg/sANEwSTlg=="
},
"@storybook/addon-a11y": {
"version": "5.3.19",
| 3 |
diff --git a/assets/js/app/certificates/certificates-controller.js b/assets/js/app/certificates/certificates-controller.js $scope.openUploadCertsModal = function (certificate) {
- var modalInstance = $uibModal.open({
+ const modalInstance = $uibModal.open({
animation: true,
ariaLabelledBy: 'modal-title',
ariaDescribedBy: 'modal-body',
$scope.openAddSniModal = function () {
- var modalInstance = $uibModal.open({
+ const _modalInstance = $uibModal.open({
animation: true,
ariaLabelledBy: 'modal-title',
ariaDescribedBy: 'modal-body',
});
- modalInstance.result.then(function (data) {
+ _modalInstance.result.then(function (data) {
if (data && data.data) $scope.data.snis.push(data.data);
}, function (data) {
});
$scope.errorMessage = ""
-
- var data = angular.copy($scope.data);
+ let data = angular.copy($scope.data);
if(!data.cert || !data.key) {
$scope.errorMessage = "The `Certificate` and/or `Key` fields cannot be empty"
data.snis = data.snis.split(",")
}
-
CertificateModel.create(data)
.then(function (resp) {
console.log('Success', resp.data);
function handleErrors(err) {
$scope.errors = {}
- if (err.data) {
- if (err.data.customMessage) {
+ const errorBody = _.get(err, 'data.body');
- for (var key in err.data.customMessage) {
- $scope.errors[key] = err.data.customMessage[key]
- }
- }
+ if (errorBody) {
+ if (errorBody.fields) {
- if (err.data.message) {
- $scope.errorMessage = err.data.message
+ for (let key in errorBody.fields) {
+ $scope.errors[key] = errorBody.fields[key]
+ }
}
+ $scope.errorMessage = errorBody.message || '';
} else {
$scope.errorMessage = "An unknown error has occured"
}
| 9 |
diff --git a/src/client/js/app.jsx b/src/client/js/app.jsx @@ -27,6 +27,7 @@ import MyDraftList from './components/MyDraftList/MyDraftList';
import SeenUserList from './components/User/SeenUserList';
import LikerList from './components/User/LikerList';
import TableOfContents from './components/TableOfContents';
+import TopOfTableContents from './components/TopOfTableContents';
import PersonalSettings from './components/Me/PersonalSettings';
import NavigationContainer from './services/NavigationContainer';
@@ -78,6 +79,7 @@ Object.assign(componentMappings, {
'page-timeline': <PageTimeline />,
'personal-setting': <PersonalSettings crowi={personalContainer} />,
+
});
// additional definitions if data exists
@@ -87,8 +89,8 @@ if (pageContainer.state.pageId != null) {
'page-comment-write': <CommentEditorLazyRenderer />,
'page-attachment': <PageAttachment />,
'page-management': <PageManagement />,
-
'revision-toc': <TableOfContents />,
+ 'top-of-table-contents': <TopOfTableContents />,
'seen-user-list': <SeenUserList />,
'liker-list': <LikerList />,
| 12 |
diff --git a/app/src/scripts/dataset/dataset.store.js b/app/src/scripts/dataset/dataset.store.js @@ -1980,7 +1980,8 @@ let datasetStore = Reflux.createStore({
let datasetId = this.data.dataset.original
? this.data.dataset.original
: this.data.dataset._id
- let userId = this.data.currentUser
+ let userId =
+ this.data.currentUser && this.data.currentUser.profile
? this.data.currentUser.profile._id
: null
crn.createSubscription(datasetId, userId).then(res => {
@@ -2003,7 +2004,8 @@ let datasetStore = Reflux.createStore({
let datasetId = this.data.dataset.original
? this.data.dataset.original
: this.data.dataset._id
- let userId = this.data.currentUser
+ let userId =
+ this.data.currentUser && this.data.currentUser.profile
? this.data.currentUser.profile._id
: null
crn.deleteSubscription(datasetId, userId).then(res => {
@@ -2029,7 +2031,8 @@ let datasetStore = Reflux.createStore({
let datasetId = this.data.dataset.original
? this.data.dataset.original
: this.data.dataset._id
- let userId = this.data.currentUser
+ let userId =
+ this.data.currentUser && this.data.currentUser.profile
? this.data.currentUser.profile._id
: null
if (datasetId && userId) {
| 1 |
diff --git a/src/items/class-features/drone_technomancy.json b/src/items/class-features/drone_technomancy.json }
},
"effects": [],
- "flags": {
- "exportSource": {
- "world": "sf",
- "system": "sfrpg",
- "coreVersion": "9.235",
- "systemVersion": "0.16.0"
- }
- },
+ "flags": {},
"_id": "g3SC6Rr9iJNubQYQ"
}
| 2 |
diff --git a/lib/commands/query.js b/lib/commands/query.js @@ -33,7 +33,7 @@ function Query(options, callback) {
util.inherits(Query, Command);
Query.prototype.then = Query.prototype.catch = function() {
- var err = "Error: you have tried to call .then(), .catch(), or invoked await on the result of query that is not a promise, which is a programming error. Throwing an error.";
+ var err = "Error: you have tried to call .then(), .catch(), or invoked await on the result of query that is not a promise, which is a programming error. Try calling con.promise().query(), or require('mysql2/promise') instead of 'mysql2' for a promise-compatible version of the query interface. To learn how to use async/await or Promises check out documentation at https://www.npmjs.com/package/mysql2#using-promise-wrapper, or the mysql2 documentation at https://github.com/sidorares/node-mysql2/tree/master/documentation/Promise-Wrapper.md";
console.log(err);
throw err;
};
| 3 |
diff --git a/components/Account/Memberships/Claim.js b/components/Account/Memberships/Claim.js @@ -172,8 +172,7 @@ class ClaimMembership extends Component {
const claim = () => {
const code = sanitizeVoucherCode(values.voucherCode)
- const claimWith = (fn, { code, context = 'unknown' }) =>
- fn(code)
+ const claimWith = (mutation, { code, context = 'unknown' }) => mutation(code)
.then(() => {
track([
'trackEvent',
@@ -188,7 +187,7 @@ class ClaimMembership extends Component {
if (isAccessGrantVoucherCode(code)) {
claimWith(this.props.claimAccess, { code, context: 'access' })
} else {
- claimWith(this.props.claimMembership, { code, context: 'membership' })
+ claimWith(this.props.claimMembership, { code, context: 'claim' })
}
}
| 10 |
diff --git a/.travis.yml b/.travis.yml @@ -16,11 +16,12 @@ language: node_js
before_script:
- npm install node-sass -g
+- npm ci
script:
- npm run lint
- npm run build
-- travis_wait npx electron-builder --publish onTag
+- travis_wait 30 npx electron-builder --publish onTag
cache: npm
| 12 |
diff --git a/src/ServerlessOffline.js b/src/ServerlessOffline.js @@ -66,7 +66,7 @@ module.exports = class ServerlessOffline {
// Some users would like to know their environment outside of the handler
process.env.IS_OFFLINE = true;
- return Promise.resolve(this._buildServer())
+ return this._buildServer()
.then(() => this.apiGateway._listen())
.then(() => this.hasWebsocketRoutes && this.apiGatewayWebSocket._listen())
.then(() =>
| 2 |
diff --git a/client/NewGame.jsx b/client/NewGame.jsx @@ -15,7 +15,7 @@ class InnerNewGame extends React.Component {
this.state = {
spectators: true,
- selectedGameFormat: 'joust',
+ selectedGameFormat: 'duel',
selectedGameType: 'casual',
password: ''
};
@@ -67,30 +67,6 @@ class InnerNewGame extends React.Component {
return this.state.selectedGameType === gameType;
}
- getMeleeOptions() {
- if(!this.props.allowMelee) {
- return;
- }
-
- return (
- <div className='row'>
- <div className='col-sm-12'>
- <b>Game Format</b>
- </div>
- <div className='col-sm-10'>
- <label className='radio-inline'>
- <input type='radio' onChange={ this.onGameFormatChange.bind(this, 'joust') } checked={ this.state.selectedGameFormat === 'joust' } />
- Joust
- </label>
- <label className='radio-inline'>
- <input type='radio' onChange={ this.onGameFormatChange.bind(this, 'melee') } checked={ this.state.selectedGameFormat === 'melee' } />
- Melee
- </label>
- </div>
- </div>
- );
- }
-
render() {
let charsLeft = 140 - this.state.gameName.length;
return this.props.socket ? (
@@ -115,7 +91,6 @@ class InnerNewGame extends React.Component {
</label>
</div>
</div>
- { this.getMeleeOptions() }
<div className='row'>
<div className='col-sm-12'>
<b>Game Type</b>
| 2 |
diff --git a/test/functional/fixtures/api/es-next/speed/test.js b/test/functional/fixtures/api/es-next/speed/test.js @@ -4,6 +4,10 @@ describe('[API] Test Speed', function () {
});
it('Should run test with different speed in iframe', function () {
- return runTests('./testcafe-fixtures/speed-test.js', 'Speed in iframe', { only: 'chrome', speed: 0.5 });
+ return runTests('./testcafe-fixtures/speed-test.js', 'Speed in iframe', {
+ only: 'chrome',
+ speed: 0.5,
+ selectorTimeout: 10000
+ });
});
});
| 1 |
diff --git a/src/constants/text.js b/src/constants/text.js @@ -36,7 +36,7 @@ export default {
tabSaved: "Saved",
tabSupportUs: "Support us",
tabParadeMap: "Map",
- tabParadeStages: "Stages",
+ tabParadeGroups: "Groups",
featuredEventListTitle: "Featured events",
filterByInterest: "All event types",
categoryFilterButton: "Filter by event type",
@@ -144,6 +144,17 @@ export default {
homeViewAll: "View all",
homeSupportUs: "Support us",
homeSupportUsDescription: "Be part of the movement",
+ paradeGroups: {
+ title:
+ "The Pride in London Parade takes place on Saturday 7 July 2018 from 12pm.",
+ description:
+ "Parade groups are split into sections. The first groups are in section A, whilst those near the end are in section G. Below you can find the section that each parade group belongs to. During the parade our presenters will announce each section passing by.",
+ linkLabelFacebook: "Facebook",
+ linkLabelTwitter: "Twitter",
+ linkLabelWebsite: "Website",
+ expandAccessibilityLabel: "Show more",
+ collapseAccessibilityLabel: "Show less"
+ },
paradeInformationScreen: {
headerTitle: "Parade Day - 7th July",
pageHeading: "London Parade",
| 0 |
diff --git a/core/workspace.js b/core/workspace.js @@ -513,7 +513,18 @@ Blockly.Workspace.prototype.remainingCapacity = function() {
if (isNaN(this.options.maxBlocks)) {
return Infinity;
}
- return this.options.maxBlocks - this.getAllBlocks().length;
+
+ // Insertion markers exist on the workspace for rendering reasons, but should
+ // be ignored in capacity calculation because they dissolve at the end of a
+ // drag.
+ var allBlocks = this.getAllBlocks();
+ var allBlocksCount = allBlocks.length;
+ for (var i = 0; i < allBlocks.length; i++) {
+ if (allBlocks[i].isInsertionMarker()) {
+ allBlocksCount--;
+ }
+ }
+ return this.options.maxBlocks - allBlocksCount;
};
/**
| 8 |
diff --git a/packages/stockflux-chart/src/styles/app.css b/packages/stockflux-chart/src/styles/app.css @@ -19,6 +19,7 @@ body {
right: 0;
bottom: 0;
left: 0;
+ padding: 20px;
}
#showcase-container .row.primary-row {
@@ -46,7 +47,7 @@ body {
#showcase-title {
color: var(--chart-teal);
position: relative;
- top: 5px;
+ bottom: 10px;
left: 25px;
z-index: 10;
display: flex;
| 3 |
diff --git a/_data/conferences.yml b/_data/conferences.yml place: Rhodes, Greece
date: Jul 08-13, 2023
start: 2023-09-02
- end: 2022-09-08
+ end: 2023-09-08
hindex: -1
sub: KR
note: Mandatory abstract deadline on March 07, 2023. More info <a href='https://kr.org/KR2023/'>here</a>.
| 3 |
diff --git a/src/pages/index.js b/src/pages/index.js @@ -223,7 +223,7 @@ const IndexPage = () => (
<SprkStackItem>
<SprkButton
- href="https://github.com/sparkdesignsystem/spark-design-system/blob/staging/CONTRIBUTING.md"
+ href="https://github.com/sparkdesignsystem/spark-design-system/blob/master/CONTRIBUTING.md"
variant="secondary"
>
Learn More
| 3 |
diff --git a/lib/protocol/protocol.js b/lib/protocol/protocol.js @@ -492,7 +492,7 @@ function parseProtocol (driverRes) {
return {isW3C, isMJSONWP, value: driverRes.value};
}
- if (_.isError(driverRes.error)) {
+ if (_.has(driverRes, 'error')) {
return {isW3C, isMJSONWP, error: driverRes.error};
}
| 14 |
diff --git a/src/pages/MobileRegionTable/MobileRegionTable.js b/src/pages/MobileRegionTable/MobileRegionTable.js @@ -5,44 +5,27 @@ import type { ComponentType } from 'react';
import useLoadData from 'hooks/useLoadData';
import PageTitle from 'components/PageTitle';
-// import RegionTable from 'components/RegionTable';
import MapTable from "components/MapTable";
+import { MainLoading, timestamp } from "pages/Regional/Regional";
+
import type { Props } from './MobileRegionTable.types';
import * as Styles from './MobileRegionTable.styles';
-const formatAMPM = date => {
- var hours = date.getHours();
- var minutes = date.getMinutes();
- var ampm = hours >= 12 ? 'pm' : 'am';
- hours = hours % 12;
- hours = hours ? hours : 12; // the hour '0' should be '12'
- minutes = minutes < 10 ? '0'+minutes : minutes;
- var strTime = hours + ':' + minutes + ' ' + ampm;
- return strTime;
-};
-const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-const formatDate = (d: Date) => `${d.getDate()} ${monthNames[d.getMonth()]} ${d.getFullYear()} ${formatAMPM(d)}`;
const MobileRegionTable: ComponentType<Props> = ({}: Props) => {
const data = useLoadData();
- if (!data) {
- return null;
- }
+ if ( !data ) return <MainLoading/>;
return (
<Styles.Container className="govuk-width-container" role="main">
<PageTitle
caption="Regional view"
title="Coronavirus (COVID-19) in the UK"
- subtitle={`Last updated ${formatDate(new Date(data?.lastUpdatedAt))}`}
+ subtitle={ `Last updated on ${ timestamp(data) }` }
/>
<MapTable isMobile={ true }/>
- {/* countryData={data?.countries}*/}
- {/* regionData={data?.regions}*/}
- {/* utlaData={data?.utlas}*/}
- {/*/>*/}
</Styles.Container>
);
};
| 4 |
diff --git a/src/extras/timeSeries.js b/src/extras/timeSeries.js @@ -92,12 +92,11 @@ module.exports = class TimeSeries {
* Returns the series
*/
get() {
- let currTs = now();
- this.log.filter((point) => {
- return (now - point.timestamp < this.window);
+ let outList = this.log.filter((point) => {
+ return (now() - point.timestamp < this.window);
});
- return clone(this.log);
+ return outList;
}
| 1 |
diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js import React, { useState, useEffect, useRef } from 'react';
import type { ComponentType } from 'react';
+import { withRouter } from 'react-router';
import mapboxgl from 'mapbox-gl';
import axios from 'axios';
import * as topojson from 'topojson';
@@ -25,10 +26,10 @@ const zoomLayers = {
},
nhsRegion: {
min: 5,
- max: 6,
+ max: 7,
},
localAuthority: {
- min: 6,
+ min: 7,
max: 22, // Default max
},
};
@@ -43,10 +44,26 @@ const Map: ComponentType<Props> = ({
localAuthority,
setLocalAuthority,
localAuthorityData,
+ history: { push },
+ location: { pathname, hash },
}: Props) => {
const [map, setMap] = useState<?mapboxgl.Map>(null);
const mapContainer = useRef(null);
+ useEffect(() => {
+ if (map){
+ if (hash === '#countries') {
+ map.zoomTo(zoomLayers.country.max - 0.5);
+ }
+ if (hash === '#nhs-regions') {
+ map.zoomTo(zoomLayers.nhsRegion.min);
+ }
+ if (hash === '#local-authorities') {
+ map.zoomTo(zoomLayers.localAuthority.min);
+ }
+ }
+ }, [hash, map]);
+
useEffect(() => {
if (map) {
if (country) {
@@ -140,42 +157,90 @@ const Map: ComponentType<Props> = ({
const nhsRegionMax = max(nhsRegionGeojson.features, d => d.properties.nhsRegionCount);
const localAuthorityMax = max(englandGeojson.features, d => d.properties.count);
- // Layer 1 countries
+ map.addSource('countries-latlong', {
+ type: 'geojson',
+ data: {
+ type: "FeatureCollection",
+ features: [
+ ['England', [-1.1743, 52.3555]],
+ ['Scotland', [-4.2026, 56.4907]],
+ ['Wales', [-3.7837, 52.1307]],
+ ['Northern Ireland', [-6.4923, 54.7877]],
+ ].map(c => ({
+ type: 'Feature',
+ properties: {
+ count: countryData?.[c[0]]?.totalCases?.value ?? 0,
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: c[1],
+ },
+ })),
+ },
+ });
map.addLayer({
- 'id': 'countries-fill',
- 'type': 'fill',
- 'source': 'nhs-regions',
+ 'id': 'countries-circle',
+ 'type': 'circle',
+ 'source': 'countries-latlong',
'minzoom': zoomLayers.country.min,
'maxzoom': zoomLayers.country.max,
'layout': {},
'paint': {
- 'fill-color': '#1D70B8',
- 'fill-opacity': [
+ 'circle-color': '#1D70B8',
+ 'circle-opacity': 0.6,
+ 'circle-radius': [
'interpolate',
['linear'],
- ['get', 'countryCount'],
+ ['get', 'count'],
0, 0,
- countryMax, 0.7,
+ 1, 5,
+ countryMax, 40,
],
},
});
// Layer 2 nhs regions
+ map.addSource('nhs-regions-latlong', {
+ type: 'geojson',
+ data: {
+ type: "FeatureCollection",
+ features: [
+ ['London', [-0.1278, 51.5074]],
+ ['Midlands', [-1.9718, 52.3449]],
+ ['South East', [-0.5596, 51.1781]],
+ ['North West', [-2.5945, 53.6221]],
+ ['North East and Yorkshire', [-1.9480, 54.9456]],
+ ['East of England', [0.1927, 52.1911]],
+ ['South West', [-3.9995, 50.7772]],
+ ].map(c => ({
+ type: 'Feature',
+ properties: {
+ count: nhsRegionData?.[c[0]]?.totalCases?.value ?? 10,
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: c[1],
+ },
+ })),
+ },
+ });
map.addLayer({
- 'id': 'nhs-regions-fill',
- 'type': 'fill',
- 'source': 'nhs-regions',
+ 'id': 'nhs-regions-circles',
+ 'type': 'circle',
+ 'source': 'nhs-regions-latlong',
'minzoom': zoomLayers.nhsRegion.min,
'maxzoom': zoomLayers.nhsRegion.max,
'layout': {},
'paint': {
- 'fill-color': '#1D70B8',
- 'fill-opacity': [
+ 'circle-color': '#1D70B8',
+ 'circle-opacity': 0.6,
+ 'circle-radius': [
'interpolate',
['linear'],
- ['get', 'nhsRegionCount'],
+ ['get', 'count'],
0, 0,
- nhsRegionMax, 1,
+ 1, 5,
+ nhsRegionMax, 40,
],
},
});
@@ -196,21 +261,42 @@ const Map: ComponentType<Props> = ({
});
// Layer 3 local authorities
+ map.addSource('england-latlong', {
+ type: 'geojson',
+ data: {
+ type: "FeatureCollection",
+ features: localAuthorities.map(la => {
+ const count = localAuthorityData?.[la.name]?.totalCases?.value ?? 0;
+ return {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [la.long, la.lat],
+ },
+ "properties": {
+ count,
+ },
+ }
+ }),
+ },
+ });
map.addLayer({
- 'id': 'england-auths-fill',
- 'type': 'fill',
- 'source': 'england-auths',
+ 'id': 'england-auths-circles',
+ 'type': 'circle',
+ 'source': 'england-latlong',
'minzoom': zoomLayers.localAuthority.min,
'maxzoom': zoomLayers.localAuthority.max,
'layout': {},
'paint': {
- 'fill-color': '#1D70B8',
- 'fill-opacity': [
+ 'circle-color': '#1D70B8',
+ 'circle-opacity': 0.6,
+ 'circle-radius': [
'interpolate',
['linear'],
['get', 'count'],
0, 0,
- localAuthorityMax, 1,
+ 1, 5,
+ localAuthorityMax, 25,
],
},
});
@@ -229,6 +315,17 @@ const Map: ComponentType<Props> = ({
}
},
});
+ map.addLayer({
+ 'id': 'england-auths-fill',
+ 'type': 'fill',
+ 'source': 'england-auths',
+ 'minzoom': zoomLayers.localAuthority.min,
+ 'maxzoom': zoomLayers.localAuthority.max,
+ 'layout': {},
+ 'paint': {
+ 'fill-opacity': 0,
+ },
+ });
map.on('click', 'england-auths-fill', e => {
setCountry(null);
setNhsRegion(null);
@@ -395,4 +492,4 @@ const Map: ComponentType<Props> = ({
);
};
-export default Map;
+export default withRouter(Map);
| 4 |
diff --git a/lambda_permissions.go b/lambda_permissions.go @@ -232,13 +232,25 @@ func (perm S3Permission) descriptionInfo() ([]descriptionNode, error) {
for _, eachEvent := range perm.Events {
s3Events = fmt.Sprintf("%s\n%s", eachEvent, s3Events)
}
-
- nodes := []descriptionNode{
- {
+ nodes := make([]descriptionNode, 0)
+ if perm.Filter.Key == nil || len(perm.Filter.Key.FilterRules) == 0 {
+ nodes = append(nodes, descriptionNode{
Name: describeInfoValue(perm.SourceArn),
Relation: s3Events,
- },
+ })
+ } else {
+ for _, eachFilter := range perm.Filter.Key.FilterRules {
+ filterRel := fmt.Sprintf("%s (%s = %s)",
+ s3Events,
+ *eachFilter.Name,
+ *eachFilter.Value)
+ nodes = append(nodes, descriptionNode{
+ Name: describeInfoValue(perm.SourceArn),
+ Relation: filterRel,
+ })
}
+ }
+
return nodes, nil
}
| 0 |
diff --git a/packages/fether-react/src/assets/sass/modules/_reset.scss b/packages/fether-react/src/assets/sass/modules/_reset.scss @mixin reset {
@viewport {
- zoom: 1.0;
+ zoom: 1;
width: extend-to-zoom;
}
@-ms-viewport {
width: extend-to-zoom;
- zoom: 1.0;
+ zoom: 1;
}
- html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, font, img, ins, kbd, q, s, samp, small, strike, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+ html,
+ body,
+ div,
+ span,
+ applet,
+ object,
+ iframe,
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6,
+ p,
+ blockquote,
+ pre,
+ a,
+ abbr,
+ acronym,
+ address,
+ big,
+ cite,
+ code,
+ del,
+ dfn,
+ font,
+ img,
+ ins,
+ kbd,
+ q,
+ s,
+ samp,
+ small,
+ strike,
+ sub,
+ sup,
+ tt,
+ var,
+ b,
+ u,
+ i,
+ center,
+ dl,
+ dt,
+ dd,
+ ol,
+ ul,
+ li,
+ fieldset,
+ form,
+ label,
+ legend,
+ table,
+ caption,
+ tbody,
+ tfoot,
+ thead,
+ tr,
+ th,
+ td {
margin: 0;
padding: 0;
font-size: 100%;
border: 0;
outline: 0;
background: transparent;
- font-feature-settings: "kern", "liga", "pnum";
+ font-feature-settings: 'kern', 'liga', 'pnum';
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
webkit-text-size-adjust: 100%;
text-size-adjust: 100%;
}
- blockquote, q {
+ blockquote,
+ q {
quotes: none;
}
- input:focus, select:focus, button:focus {
+ button:focus,
+ input:focus,
+ select:focus,
+ textarea:focus {
outline: 0;
}
border-spacing: 0;
}
- ul, ol {
+ ul,
+ ol {
list-style: none;
}
| 2 |
diff --git a/config/redirects.js b/config/redirects.js @@ -1135,6 +1135,8 @@ module.exports = [
{
from: [
+ '/clients/client-settings',
+ '/dashboard/reference/settings-application',
'/get-started/dashboard/application-settings',
'/best-practices/application-settings',
'/best-practices/app-settings-best-practices'
@@ -2150,10 +2152,6 @@ module.exports = [
from: ['/dashboard/reference/settings-api','/api-auth/references/dashboard/api-settings'],
to: '/get-started/dashboard/api-settings'
},
- {
- from: ['/dashboard/reference/settings-application','/clients/client-settings','/applications/application-settings'],
- to: '/get-started/dashboard/application-settings'
- },
{
from: ['/dashboard-access/dashboard-roles','/dashboard-access/manage-dashboard-users','/dashboard/manage-dashboard-admins','/tutorials/manage-dashboard-admins','/get-started/dashboard/manage-dashboard-users'],
to: '/dashboard-access'
| 1 |
diff --git a/server/preprocessing/other-scripts/linkedcat.R b/server/preprocessing/other-scripts/linkedcat.R @@ -100,7 +100,7 @@ build_query <- function(query, params, limit){
'main_title', 'subtitle', 'pub_year',
'host_label', 'host_maintitle', 'host_pubplace', 'host_pubyear',
'author100_a', 'author100_d', 'author100_0', 'author100_4',
- 'ddc_a', 'ddc_2', 'bkl_a',
+ 'bkl_caption', 'bkl_top_caption',
'keyword_a', 'tags', 'category', 'bib', 'language_code',
'ocrtext_good', 'ocrtext')
q <- paste(paste(q_fields, query, sep = ":"), collapse = " ")
| 2 |
diff --git a/src/pages/guides/Suppressors.jsx b/src/pages/guides/Suppressors.jsx @@ -6,8 +6,9 @@ import ItemsTable from '../../components/item-table';
import { selectAllItems, fetchItems } from '../../features/items/itemsSlice';
import {
Filter,
- ButtonGroupFilter,
- ButtonGroupFilterButton,
+ // ButtonGroupFilter,
+ // ButtonGroupFilterButton,
+ SelectFilter,
} from '../../components/filter';
const getGuns = (items, targetItem) => {
@@ -188,8 +189,10 @@ function Suppressors(props) {
Escape from Tarkov Suppressors
</h1>
</div>
- <Filter>
- <ButtonGroupFilter>
+ <Filter
+ center
+ >
+ {/* <ButtonGroupFilter>
{activeGuns.map((activeGun) => {
return <ButtonGroupFilterButton
key = {`trader-tooltip-${activeGun.name}`}
@@ -217,7 +220,20 @@ function Suppressors(props) {
content = {'All'}
onClick = {setSelectedGun.bind(undefined, false)}
/>
- </ButtonGroupFilter>
+ </ButtonGroupFilter> */}
+ <SelectFilter
+ label = 'Filter by gun'
+ options = {activeGuns.map((activeGun) => {
+ return {
+ label: activeGun.name,
+ value: activeGun.id,
+ };
+ })}
+ onChange = {(event) => {
+ setSelectedGun(activeGuns.find(activeGun => activeGun.id === event.value))
+ }}
+ wide
+ />
</Filter>
<ItemsTable
columns = {columns}
| 14 |
diff --git a/core/type_infer.js b/core/type_infer.js @@ -16,10 +16,9 @@ goog.require('goog.asserts');
* @constructor
*/
Blockly.Scheme = function(names, type) {
- var inst = type.instantiate(names);
-
// Clone the type expression except free type variables, so that bound
- // variables would be changed.
+ // variables would not be changed accidentally.
+ var inst = type.instantiate(names);
this.type = inst.instance;
var newBoundVariables = inst.bounds;
| 1 |
diff --git a/token-metadata/0x4a220E6096B25EADb88358cb44068A3248254675/metadata.json b/token-metadata/0x4a220E6096B25EADb88358cb44068A3248254675/metadata.json "symbol": "QNT",
"address": "0x4a220E6096B25EADb88358cb44068A3248254675",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/examples/experimental/sun/src/shadow-effect/shadow-module.js b/examples/experimental/sun/src/shadow-effect/shadow-module.js @@ -27,9 +27,9 @@ uniform vec4 shadow_color;
varying vec3 shadow_vPosition;
-const vec4 bitPackShift = vec4(1.0, 256.0, 256.0 * 256.0, 256.0 * 256.0 * 256.0);
+const vec4 bitPackShift = vec4(1.0, 255.0, 65025.0, 16581375.0);
const vec4 bitUnpackShift = 1.0 / bitPackShift;
-const vec4 bitMask = vec4(1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0, 0.0);
+const vec4 bitMask = vec4(1.0 / 255.0, 1.0 / 255.0, 1.0 / 255.0, 0.0);
float shadow_getShadowWeight(vec2 texCoords) {
vec4 rgbaDepth = texture2D(shadow_shadowMap, texCoords);
| 7 |
diff --git a/components/open-licence-ribbon.js b/components/open-licence-ribbon.js @@ -14,8 +14,6 @@ const OpenLicenceRibbon = () => (
.ribbon{
display: flex;
background-color: rgb(180,225,250);
- border-radius: 5px;
- margin: auto;
min-height: 50px;
}
| 2 |
diff --git a/src/Select/Select.js b/src/Select/Select.js @@ -4,7 +4,7 @@ import Downshift from 'downshift';
import {
StyledSelectWrapper,
- StyledSelectInput,
+ StyledSelectButton,
StyledSelectMenu
} from './Select-styled';
import Menu from '../Menu';
@@ -41,14 +41,17 @@ const Select = props => {
}
}
return (
- <StyledSelectInput
+ <StyledSelectButton
{...getButtonProps()}
{...getInputProps()}
- type="text"
- placeholder={placeholder}
fullWidth={props.fullWidth}
minimal={props.minimal}
- />
+ style={{ ...props.style }}
+ >
+ {itemToString(selectedItem)
+ ? itemToString(selectedItem)
+ : props.placeholder}
+ </StyledSelectButton>
);
}
| 4 |
diff --git a/ios/RCTMGL-v10/RCTMGLMapView.swift b/ios/RCTMGL-v10/RCTMGLMapView.swift @@ -117,11 +117,6 @@ open class RCTMGLMapView : MapView {
var reactOnPress : RCTBubblingEventBlock? = nil
var reactOnMapChange : RCTBubblingEventBlock? = nil
- var reactZoomEnabled : Bool = true
- var reactScrollEnabled : Bool = true
- var reactRotateEnabled : Bool = true
- var reactPitchEnabled : Bool = true
-
var reactCamera : RCTMGLCamera? = nil
var images : [RCTMGLImages] = []
var sources : [RCTMGLSource] = []
| 2 |
diff --git a/backend/lib/index.js b/backend/lib/index.js const Ajv = require("ajv");
const cors = require("cors");
const fastify = require("fastify");
+const logStream = require("./logger");
const auth = require("./endpoints/auth");
const feedback = require("./endpoints/feedback");
@@ -14,7 +15,10 @@ const version = require("./endpoints/version");
module.exports = function createApp(config) {
const app = fastify({
- logger: true,
+ logger: {
+ level: config.logger.level,
+ stream: logStream(config.logger),
+ },
});
const ajv = new Ajv({
allErrors: true,
| 12 |
diff --git a/src/post/AuthorBio.js b/src/post/AuthorBio.js @@ -48,13 +48,13 @@ class AuthorBio extends Component {
if (author) {
const isFollowing = author ? author.followers.indexOf(loggedInUser) >= 0 : false;
const onClickFollowFn = isFollowing ? this.props.unfollowUser : this.props.followUser;
- const { about, location, name } = author.json_metadata.profile || {};
+ const { about, name } = author.json_metadata.profile || {};
const displayName = name || `@${authorName}`;
return (
<div className="col-md-4">
<div>
- <Avatar md username={authorName} />
+ <Avatar lg username={authorName} />
{displayName}
<Follow
hasFollow={authorName !== loggedInUser}
@@ -63,8 +63,6 @@ class AuthorBio extends Component {
/>
</div>
<div style={{ display: 'inline-block' }}>
- <span>From: {location}</span>
- <br />
<span>{about}</span>
</div>
</div>
| 2 |
diff --git a/src/Editor/index.js b/src/Editor/index.js @@ -32,10 +32,8 @@ import { ReflexContainer, ReflexSplitter, ReflexElement } from "../Reflex";
import { flatMap, map, filter, pick, camelCase } from "lodash";
import ToolBar from "../ToolBar";
-import CircularView, {
- CircularView as CircularViewUnconnected
-} from "../CircularView";
-import LinearView, { LinearView as LinearViewUnconnected } from "../LinearView";
+import CircularView from "../CircularView";
+import LinearView from "../LinearView";
import RowView from "../RowView";
import StatusBar from "../StatusBar";
import DropHandler from "./DropHandler";
@@ -46,6 +44,7 @@ import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
import DigestTool from "../DigestTool/DigestTool";
import { insertItem, removeItem } from "../utils/arrayUtils";
import Mismatches from "../AlignmentView/Mismatches";
+import SimpleCircularOrLinearView from "../SimpleCircularOrLinearView";
// if (process.env.NODE_ENV !== 'production') {
// const {whyDidYouUpdate} = require('why-did-you-update');
@@ -359,16 +358,14 @@ export class Editor extends React.Component {
};
if (withPreviewMode && !previewModeFullscreen) {
- const Panel = sequenceData.circular
- ? CircularViewUnconnected
- : LinearViewUnconnected;
return (
<div style={{ ...style }} className="preview-mode-container">
<div style={{ position: "relative" }}>
- <Panel
+ <SimpleCircularOrLinearView
sequenceData={sequenceData}
tabHeight={tabHeight}
editorName={editorName}
+ height={null}
annotationLabelVisibility={{
features: false,
parts: false,
| 14 |
diff --git a/demo/main.js b/demo/main.js @@ -565,6 +565,13 @@ class ShakaDemoMain {
}
}
+ // See if it's a custom asset saved here.
+ for (const asset of shakaDemoCustom.assets()) {
+ if (asset.manifestUri == manifest) {
+ return asset;
+ }
+ }
+
// Construct a new asset.
const asset = new ShakaDemoAssetInfo(
/* name= */ 'loaded asset',
| 11 |
diff --git a/app/models/carto/api_key.rb b/app/models/carto/api_key.rb @@ -284,13 +284,5 @@ module Carto
self.name = NAME_DEFAULT_PUBLIC
self.grants = GRANTS_ALL_APIS
end
-
- def exists_master_key?(user_id)
- Carto::ApiKey.exists?(id: user_id, type: TYPE_MASTER)
- end
-
- def exists_default_public_key?(user_id)
- Carto::ApiKey.exists?(id: user_id, type: TYPE_DEFAULT_PUBLIC)
- end
end
end
| 2 |
diff --git a/planet.js b/planet.js @@ -733,7 +733,15 @@ const _connectRoom = async (roomName, worldURL) => {
microphoneMediaStream = new MediaStream([track]);
const audio = document.createElement('audio');
audio.srcObject = microphoneMediaStream;
- audio.play();
+ const _tryPlay = async () => {
+ try {
+ await audio.play();
+ } catch(err) {
+ console.warn('play failed', err);
+ setTimeout(_tryPlay, 1000);
+ }
+ };
+ _tryPlay();
if (peerRig) {
rigManager.setPeerMicMediaStream(microphoneMediaStream, peerConnection.connectionId);
track.addEventListener('ended', e => {
| 0 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -47,6 +47,7 @@ import debug from './debug.js';
import * as sceneCruncher from './scene-cruncher.js';
import * as scenePreviewer from './scene-previewer.js';
import * as sounds from './sounds.js';
+import * as lodder from './lod.js';
import hpManager from './hp-manager.js';
import particleSystemManager from './particle-system.js';
import domRenderEngine from './dom-renderer.jsx';
@@ -539,6 +540,9 @@ metaversefile.setApi({
useLoaders() {
return loaders;
},
+ useLodder() {
+ return lodder;
+ },
useMeshLodder() {
return meshLodManager;
},
| 0 |
diff --git a/token-metadata/0x75231F58b43240C9718Dd58B4967c5114342a86c/metadata.json b/token-metadata/0x75231F58b43240C9718Dd58B4967c5114342a86c/metadata.json "symbol": "OKB",
"address": "0x75231F58b43240C9718Dd58B4967c5114342a86c",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/Story/StoryLoading.less b/src/components/Story/StoryLoading.less max-width: @width;
border-radius: 4px;
background-color: @white;
- margin-top: 1em;
color: #353535;
border: solid 1px #e9e7e7;
+ &:not(:first-child) {
+ margin-top: 12px;
+ }
+
&__header {
padding: 16px;
display: flex;
| 2 |
diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl @@ -33,7 +33,7 @@ $spaceBetweenTiles = 16px
overflow: hidden;
background-color: #999
color: #f6f6f6
- height: 90px
+ height: auto
font-size: 16px
line-height: 22px
border-radius: 3px
| 11 |
diff --git a/articles/quickstart/spa/vuejs/_includes/_centralized_login.md b/articles/quickstart/spa/vuejs/_includes/_centralized_login.md @@ -11,12 +11,12 @@ Create a service and instantiate `auth0.WebAuth`. Provide a method called `login
import auth0 from 'auth0-js';
import EventEmitter from 'events';
-import { AUTH_CONFIG } from './auth0-variables';
+import authConfig from '../../auth_config.json';
const webAuth = new auth0.WebAuth({
- domain: AUTH_CONFIG.domain,
- redirectUri: AUTH_CONFIG.callbackUrl,
- clientID: AUTH_CONFIG.clientId,
+ domain: authConfig.domain,
+ redirectUri: authConfig.callbackUrl,
+ clientID: authConfig.clientId,
responseType: 'id_token',
scope: 'openid profile email'
});
@@ -39,14 +39,14 @@ export default new AuthService();
The `login` method has been setup to support specifing custom state that will be returned to the application after authentication. This will come into play later when you start adding protected routes.
:::
-To provide the values for `clientID` and `domain`, create a new file `auth0-variables.js` in the same directory as `authService.js` and populate it with your tenant values:
+To provide the values for `clientID`, `callbackUrl`, and `domain`, create a new file `auth_config.json` in the root directory of the application alongside your `package.json` file, and populate it with your tenant values:
-```js
-export const AUTH_CONFIG = {
- domain: '${account.tenant}',
- clientId: '${account.clientId}',
- callbackUrl: `<%= "${window.location.origin}" %>/callback`
-};
+```json
+{
+ "domain": "${account.tenant}",
+ "clientId": "${account.clientId}",
+ "callbackUrl": "http://localhost:3000/callback"
+}
```
::: note
@@ -62,6 +62,8 @@ Add some additional methods to `AuthService` to fully handle authentication in t
```js
// src/auth/authService.js
+// Other imports and WebAuth declaration..
+
const localStorageKey = 'loggedIn';
const loginEvent = 'loginEvent';
@@ -94,6 +96,8 @@ class AuthService extends EventEmitter {
localLogin(authResult) {
this.idToken = authResult.idToken;
this.profile = authResult.idTokenPayload;
+
+ // Convert the JWT expiry time from seconds to milliseconds
this.tokenExpiry = new Date(this.profile.exp * 1000);
localStorage.setItem(localStorageKey, 'true');
@@ -150,7 +154,7 @@ export default new AuthService();
The service now includes several other methods for handling authentication.
- `handleCallback` - looks for an authentication result in the URL hash and processes it with the `parseHash` method from auth0.js
-- `localLogin` - sets the user's ID Token, and a time at which the ID Token will expire
+- `localLogin` - sets the user's ID Token, and a time at which the ID Token will expire. The expiry time is converted to milliseconds so that we can more easily work with the native JavaScript `Date` object
- `renewTokens` - uses the `checkSession` method from auth0.js to renew the user's authentication status, and calls `localLogin` if the login session is still valid
- `logout` - removes the user's tokens from memory. It also calls `webAuth.logout` to log the user out at the authorization server
- `isAuthenticated` - checks whether the local storage flag is present and equals "true", and that the expiry time for the ID Token has passed
| 3 |
diff --git a/js/templates/modals/orderDetail/summaryTab/orderDetails.html b/js/templates/modals/orderDetail/summaryTab/orderDetails.html <div class="col6">
<div class="txB rowTn"><%= ob.polyT('orderDetail.summaryTab.orderDetails.quantityHeading') %></div>
<%
- let quantity = typeof item.quantity === 'number' ?
+ let quantity = item.quantity !== 0 ?
item.quantity : item.quantity64;
if (isCrypto) {
| 8 |
diff --git a/sox.css b/sox.css }
/* stickyVoteButtons -- for the vote buttons on the left of the post */
+.sox-stickyVoteButtons {
+ z-index: 1;
+}
+
.sox-stickyVoteButtons > .js-voting-container {
position: -webkit-sticky;
position: sticky;
| 12 |
diff --git a/src/utilities/date_range.js b/src/utilities/date_range.js @@ -10,8 +10,8 @@ const moment = require('moment');
module.exports = q => {
let start;
let end;
- // See if date is unix, if so, add milliseconds
- if (/^[0-9]*$/.test(q.start && (q.final || q.end))) {
+ // If the number is more than 5 digits long, it's likely unix
+ if (/\d{5,}/.test(q.start && (q.final || q.end))) {
start = moment.utc(q.start * 1000);
end = moment.utc(q.final * 1000 || q.end * 1000);
} else {
| 3 |
diff --git a/lib/application.js b/lib/application.js @@ -84,9 +84,9 @@ class Application extends events.EventEmitter {
const { name, ext } = path.parse(fileName);
if (ext !== '.js' || name.startsWith('.')) return;
const script = await this.createScript(fileName);
- const map = this[place];
+ const scripts = this[place];
if (!script) {
- map.delete(name);
+ scripts.delete(name);
return;
}
if (place === 'domain') {
@@ -98,7 +98,7 @@ class Application extends events.EventEmitter {
this.sandboxInject(name, exp);
if (exp.start) exp.start();
} else {
- map.set(name, script);
+ scripts.set(name, script);
}
}
| 10 |
diff --git a/components/CurrencyExRate/CurrencyExRate.js b/components/CurrencyExRate/CurrencyExRate.js @@ -124,7 +124,6 @@ var CurrencyExRate = function (_props)
};
//component prototype
CurrencyExRate.prototype.ctor = "CurrencyExRate";
-CurrencyExRate.prototype.valueProp = 'value';
DependencyContainer.getInstance().register(
"CurrencyExRate",
CurrencyExRate,
| 13 |
diff --git a/articles/libraries/lock/v11/migration-legacy-flows.md b/articles/libraries/lock/v11/migration-legacy-flows.md @@ -117,3 +117,55 @@ The new user profile conforms to the OIDC specification, which allows for certai
```
The contents will vary depending on which [scopes](/scopes) are requested. You will need to adjust the scopes you request when configuring Auth0.js or Lock so all the claims you need are available in your application. Note that you can add custom claims to return whatever data you want (e.g. user metadata), as described in [this example](/scopes/current#example-add-custom-claims).
+
+Another approach to get the full user profile is to use the [Management API](https://auth0.com/docs/api/management/v2) instead of getting through the authentication flow, as described in the next section.
+
+## User Profile with Management API
+
+In the legacy flows, the [Management API](https://auth0.com/docs/api/management/v2) supported authentication with an `id_token`. This approach has been deprecated, and now you need to call it with an `access_token`.
+
+To get an get an `access_token`, you need to ask Auth0 for one using the `https://'${account.namespace}/api/v2/` audience. Auth0 does not currently support specifying two audiences when authenticating. You will need to still use your application's API audience when initializing Lock or auth0.js. Once the user is authenticated, you can use `checkSession` to retrieve a Management API `access_token`, and then call the [getUser() endpoint](/api/management/v2#!/Users/get_users_by_id).
+
+```js
+function getUserUsingManagementApi() {
+ webAuth.checkSession(
+ {
+ audience: `https://${account.namespace}/api/v2/',
+ scope: 'read:current_user'
+ },
+ function(err, result) {
+ if (!err) {
+ var auth0Manage = new auth0.Management({
+ domain: AUTH0_DOMAIN,
+ token: result.accessToken
+ });
+ auth0Manage.getUser(result.idTokenPayload.sub, function(err, userInfo) {
+ if (!err) {
+ // use userInfo
+ }
+ else {
+ // handle error
+ }
+ });
+ }
+ else {
+ // handle error
+ }
+ }
+ );
+ }
+ ```
+
+You can can ask for the following scopes:
+
+* `read:current_user`
+* `update:current_user_identities`
+* `create:current_user_metadata`
+* `update:current_user_metadata`
+* `delete:current_user_metadata`
+* `create:current_user_device_credentials`
+* `delete:current_user_device_credentials`
+
+You could get a `consent_required` error when calling `checksession()`. If you do, make sure you have "Allow Skipping User Consent" enabled for the Management API and that you are not running from localhost. Check the [consent documentation](/api-auth/user-consent) for more information.
+
+
\ No newline at end of file
| 0 |
diff --git a/src/components/DropList/DropList.togglers.jsx b/src/components/DropList/DropList.togglers.jsx -import React, { forwardRef } from 'react'
+import React, { useRef, forwardRef } from 'react'
import { classNames } from '../../utilities/classNames'
import { noop } from '../../utilities/other'
import ControlGroup from '../ControlGroup'
@@ -242,6 +242,8 @@ export const MeatButton = forwardRef(
},
ref
) => {
+ const tooltipRef = useRef()
+
return (
<MeatButtonUI
aria-label="toggle menu"
@@ -264,8 +266,14 @@ export const MeatButton = forwardRef(
<Tooltip
animationDelay={0}
animationDuration={0}
+ getTippyInstance={instance => {
+ tooltipRef.current = instance.reference
+ }}
placement="top-end"
title={a11yLabel}
+ triggerTarget={
+ tooltipRef.current && tooltipRef.current.parentElement
+ }
>
<Icon name={meatIcon} size={iconSize} />
</Tooltip>
@@ -296,6 +304,8 @@ export const IconBtn = forwardRef(
},
ref
) => {
+ const tooltipRef = useRef()
+
return (
<IconButtonUI
aria-label="toggle menu"
@@ -318,8 +328,14 @@ export const IconBtn = forwardRef(
<Tooltip
animationDelay={0}
animationDuration={0}
+ getTippyInstance={instance => {
+ tooltipRef.current = instance.reference
+ }}
placement="top-end"
title={a11yLabel}
+ triggerTarget={
+ tooltipRef.current && tooltipRef.current.parentElement
+ }
>
<Icon name={iconName} size={iconSize} />
</Tooltip>
| 7 |
diff --git a/localization/demo_data.pot b/localization/demo_data.pot @@ -156,9 +156,6 @@ msgstr ""
msgid "Italian"
msgstr ""
-msgid "Demo in different language"
-msgstr ""
-
msgid "This is the note content of the recipe ingredient"
msgstr ""
@@ -310,3 +307,21 @@ msgstr ""
msgid "Dutch"
msgstr ""
+msgid "Norwegian"
+msgstr ""
+
+msgid "Demo"
+msgstr ""
+
+msgid "Stable version"
+msgstr ""
+
+msgid "Preview version"
+msgstr ""
+
+msgid "current release"
+msgstr ""
+
+msgid "not yet released"
+msgstr ""
+
| 0 |
diff --git a/lambda/kendra-crawler/package-lock.json b/lambda/kendra-crawler/package-lock.json "license": "MIT"
},
"node_modules/pdf2json/node_modules/lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ "version": "4.17.15",
+ "license": "MIT"
},
"node_modules/pdf2json/node_modules/minimist": {
"version": "0.0.10",
"node": ">=0.4.0"
}
},
+ "node_modules/pdf2json/node_modules/xmldom": {
+ "version": "0.3.0",
+ "license": "(LGPL-2.0 OR MIT)",
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
"node_modules/pdfreader": {
"version": "1.2.10",
"resolved": "https://registry.npmjs.org/pdfreader/-/pdfreader-1.2.10.tgz",
"node": ">=8.3.0"
}
},
- "node_modules/xmldom": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
- "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
- },
"node_modules/yauzl": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
"bundled": true
},
"lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ "version": "4.17.15"
},
"minimist": {
"version": "0.0.10",
"wordwrap": {
"version": "0.0.3",
"bundled": true
+ },
+ "xmldom": {
+ "version": "0.3.0"
}
}
},
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz",
"integrity": "sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="
},
- "xmldom": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
- "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
- },
"yauzl": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
| 3 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ### Chores
-- Replaces all default exports in the theme directory with constants and exports them. Puts all properties of SimpleTheme and ROOT_THEME_API objects in ABC and uses IDENTIFIERS constants for safety. [77](https://github.com/input-output-hk/react-polymorph/pull/77)
+- Replaces all default exports in the theme directory with constants and exports them. Additionally, all import statements previously importing a default export are replaced with an appropriate named import. Defines all properties of the SimpleTheme and ROOT_THEME_API objects using IDENTIFIERS and arranges their properties in ABC order for better readability. [77](https://github.com/input-output-hk/react-polymorph/pull/77)
- Adds support for React v15 - v16.4.1. Upgrades devDependencies to latest versions of react, jest, and enzyme related libraries. Adds Autocomplete simulation test for deleting a selected option via backspace key. [PR 65](https://github.com/input-output-hk/react-polymorph/pull/65)
- Refactor npm scripts to colon style [PR 66](https://github.com/input-output-hk/react-polymorph/pull/66)
| 7 |
diff --git a/package.json b/package.json {
"name": "nativescript-doctor",
- "version": "0.3.2",
+ "version": "0.3.3",
"description": "Library that helps identifying if the environment can be used for development of {N} apps.",
"main": "lib/index.js",
"types": "./typings/nativescript-doctor.d.ts",
| 12 |
diff --git a/docs/local-setup/local-dev-node.md b/docs/local-setup/local-dev-node.md ---
id: local-dev-node
-title: Local Development on Local Node
-sidebar_label: Local Development on Local Node
+title: Local Development on Local Network
+sidebar_label: Local Development on Local Network
---
## Requirements
| 10 |
diff --git a/test/integration/diffs.spec.js b/test/integration/diffs.spec.js @@ -7,7 +7,7 @@ var fs = require('fs');
var getDiffs = helpers.getDiffs;
function getExpectedOutput () {
- var output = fs.readFileSync('test/integration/fixtures/diffs/output', 'UTF8');
+ var output = fs.readFileSync('test/integration/fixtures/diffs/output', 'UTF8').replace(/\r\n/g, '\n');
// Diffs are delimited in file by "// DIFF"
return output.split(/\s*\/\/ DIFF/).slice(1).map(function (diff) {
@@ -21,7 +21,7 @@ describe('diffs', function () {
before(function (done) {
run('diffs/diffs.fixture.js', ['-C'], function (err, res) {
expected = getExpectedOutput();
- diffs = getDiffs(res.output);
+ diffs = getDiffs(res.output.replace(/\r\n/g, '\n'));
done(err);
});
});
| 8 |
diff --git a/ui/app/components/NavBar.js b/ui/app/components/NavBar.js @@ -88,17 +88,15 @@ const NavBar = ({ isLoggedIn, login, logout }) => (
</NavLink>
</li>
<li>
- <NavLink
- to={{
- pathname:
- "https://hotosm.atlassian.net/servicedesk/customer/portal/4",
- }}
+ <a
+ href="https://hotosm.atlassian.net/servicedesk/customer/portal/4"
target="_blank"
+ rel="noopener noreferrer"
>
<span title="For technical support click here">
<FormattedMessage id="ui.support" defaultMessage="Support" />
</span>
- </NavLink>
+ </a>
</li>
<NavItem>
<LocaleSelector />
| 4 |
diff --git a/.github/workflows/orm-check.yml b/.github/workflows/orm-check.yml name: Check ORM (Sequel) usage
-on: [pull_request]
+on:
+ push:
+ branches-ignore:
+ - master
jobs:
orm-check:
runs-on: ubuntu-latest
@@ -9,9 +12,6 @@ jobs:
uses: actions/checkout@v2
- name: Check if the last commit modified deprecated Sequel models
- env:
- DEST_BRANCH: ${{ github.base_ref }}
- SOURCE_BRANCH: ${{ github.head_ref }}
run: |
# This script will exit if any of these files is found in the head branch.
ORM_FILES=$(git grep -l 'class.*Sequel::Model' -- app/models)
@@ -28,7 +28,7 @@ jobs:
fi
done
fi
- done < <(git diff --name-status origin/${DEST_BRANCH}...origin/${SOURCE_BRANCH})
+ done < <(git diff $(git merge-base $(git rev-parse HEAD) origin/master) --name-status)
if [ ${#MODIFIED_FILES[@]} -gt 0 ]; then
for i in ${MODIFIED_FILES[@]}; do
| 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.