code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/Source/Scene/ModelOutlineLoader.js b/Source/Scene/ModelOutlineLoader.js @@ -307,6 +307,7 @@ function addOutline(
// Hackily update it, or else we'll end up creating the wrong type
// of index buffer later.
loadResources.indexBuffersToCreate._array.forEach(function (toCreate) {
+ if (toCreate === undefined) return;
if (toCreate.id === triangleIndexAccessorGltf.bufferView) {
toCreate.componentType = triangleIndexAccessorGltf.componentType;
}
| 1 |
diff --git a/src/config/backpack/base.php b/src/config/backpack/base.php @@ -31,15 +31,23 @@ return [
// CSS files that are loaded in all pages, using Laravel's asset() helper
'styles' => [
- 'packages/@digitallyhappy/backstrap/css/style.min.css',
+ 'packages/backpack/base/css/bundle.css',
+
+ // Here's what's inside the bundle:
+ // 'packages/@digitallyhappy/backstrap/css/style.min.css',
+ // 'packages/animate.css/animate.min.css',
+ // 'packages/noty/noty.css',
+
+ // Load the fonts separately (so that you can replace them at will):
'packages/source-sans-pro/source-sans-pro.css',
'packages/line-awesome/css/line-awesome.min.css',
- 'packages/animate.css/animate.min.css',
- 'packages/noty/noty.css',
- // Examples (the fonts above, loaded from CDN instead)
+ // Example (the fonts above, loaded from CDN instead)
// 'https://maxcdn.icons8.com/fonts/line-awesome/1.1/css/line-awesome-font-awesome.min.css',
// 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic',
+
+ // Example (load font-awesome instead of line-awesome):
+ // 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.10.2/css/all.min.css',
],
// CSS files that are loaded in all pages, using Laravel's mix() helper
| 3 |
diff --git a/lib/assets/javascripts/unpoly/classes/change/update_layer.coffee b/lib/assets/javascripts/unpoly/classes/change/update_layer.coffee @@ -224,6 +224,7 @@ class up.Change.UpdateLayer extends up.Change.Addition
unless @layer.isRoot() && up.fragment.targetsBody(selector)
oldElement = @layer.element.children[0]
+ # Each step inherits all options of this change.
return u.merge(@options, { selector, placement, reveal, oldElement })
findOld: ->
@@ -258,7 +259,7 @@ class up.Change.UpdateLayer extends up.Change.Addition
if @focus == 'keep'
for step in @steps
if step.placement == 'swap'
- step.focus = up.Focus.preserveWithin(step.oldElement)
+ step.focus ?= up.Focus.preserveWithin(step.oldElement)
containedByRivalStep: (steps, candidateStep) ->
return u.some steps, (rivalStep) ->
| 11 |
diff --git a/examples/compare-edge-options.html b/examples/compare-edge-options.html @@ -43,7 +43,7 @@ function render(graphviz, id, master) {
transition1
.transition()
- .duration(0)
+ .duration(50) // Allow time to finish transition
.on('end', function () {
if (master) {
dotIndex += 1;
| 11 |
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml @@ -61,7 +61,7 @@ jobs:
npm install -g npm@latest && npm install && npm run build && docker build -t sphinxlightning/sphinx-relay .
- name: Checkout stack
run: |
- git clone https://github.com/stakwork/sphinx-stack.git stack
+ git clone -b sphinx_jitsi https://github.com/stakwork/sphinx-stack.git stack
- name: give permissions
working-directory: ./stack
run: |
| 0 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -743,6 +743,19 @@ const _unequip = () => {
appManager.equippedObjects[0] = null;
};
+const grabUseMesh = (() => {
+ const o = new THREE.Object3D();
+
+ (async () => {
+ const app = await metaversefile.load('./metaverse_modules/button/');
+ o.add(app);
+ })();
+
+ return o;
+})();
+grabUseMesh.visible = false;
+scene.add(grabUseMesh);
+
let lastDraggingRight = false;
let dragRightSpec = null;
const _updateWeapons = () => {
@@ -851,6 +864,7 @@ const _updateWeapons = () => {
const _updateGrab = () => {
// moveMesh.visible = false;
+ grabUseMesh.visible = false;
for (let i = 0; i < 2; i++) {
const grabbedObject = appManager.grabbedObjects[i];
if (grabbedObject) {
@@ -885,9 +899,10 @@ const _updateWeapons = () => {
}
}
- grabbedObject.position.copy(grabbedObject.position);
- grabbedObject.quaternion.copy(grabbedObject.quaternion);
- grabbedObject.scale.copy(grabbedObject.scale);
+ grabUseMesh.position.copy(grabbedObject.position);
+ grabUseMesh.quaternion.copy(grabbedObject.quaternion);
+ grabUseMesh.scale.copy(grabbedObject.scale);
+ grabUseMesh.visible = true;
/* if (handSnap) {
moveMesh.position.copy(grabbedObject.position);
| 0 |
diff --git a/src/pipeline/bundle-js.js b/src/pipeline/bundle-js.js @@ -14,7 +14,7 @@ const getTransform = (opts) => {
return (opts[name] || []).map(d => require(d));
};
- return [[ babelify, { presets: [ reactPreset, es2015Preset ] } ]]
+ return [[ babelify, { presets: [ reactPreset, es2015Preset ], ignore: ['node_modules/**/*'] } ]]
.concat(_getTransform('transform'))
.concat([[ brfs ]]);
};
| 8 |
diff --git a/src/rapidoc.js b/src/rapidoc.js @@ -905,6 +905,7 @@ export default class RapiDoc extends LitElement {
// for focused mode update this.focusedElementId to update the rendering, else it wont find the needed html elements
// focusedElementId will get validated in the template
this.focusedElementId = elementId;
+ await sleep(0);
}
if (this.renderStyle === 'view') {
this.expandAndGotoOperation(elementId, expandPath, true);
| 13 |
diff --git a/src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx b/src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx @@ -118,7 +118,7 @@ const SlackIntegration = (props) => {
onSetSlackSigningSecret={setSlackSigningSecret}
onSetSlackBotToken={setSlackBotToken}
onSetIsSendTestMessage={setIsSendTestMessage}
- fetchData={fetchData}
+ fetcSlackIntegrationhData={fetchData}
/>
);
break;
| 10 |
diff --git a/src/article/shared/InsertFootnoteCommand.js b/src/article/shared/InsertFootnoteCommand.js @@ -27,8 +27,6 @@ export default class InsertFootnoteCommand extends AddEntityCommand {
}
}
- // TODO: rethink this. Struggling with trying to generalize this collection stuff
- // probably it is better to go with a bare metal implementation instead
_addItemToCollection (params, context) {
let collectionPath = this._getCollectionPath(params, context)
context.editorSession.transaction(tx => {
@@ -38,7 +36,10 @@ export default class InsertFootnoteCommand extends AddEntityCommand {
tx.setSelection({
type: 'property',
path: p.getPath(),
- startOffset: 0
+ startOffset: 0,
+ // TODO: adapt ArticleAPI._getSurfaceId()
+ surfaceId: `${node.id}.content`,
+ containerPath: [node.id, 'content']
})
})
}
| 12 |
diff --git a/character-controller.js b/character-controller.js @@ -234,7 +234,7 @@ class Player extends THREE.Object3D {
const avatarHeight = this.avatar.height;
const radius = 0.3/1.6 * avatarHeight;
const halfHeight = Math.max(avatarHeight * 0.5 - radius, 0);
- const physicsMaterial = new THREE.Vector3(0.5, 0.5, 0);
+ const physicsMaterial = new THREE.Vector3(0, 0, 0);
const physicsObject = physicsManager.addCapsuleGeometry(
new THREE.Vector3(0, -avatarHeight * 0.5, 0),
new THREE.Quaternion(),
| 2 |
diff --git a/source/Overture/io/HttpRequest.js b/source/Overture/io/HttpRequest.js @@ -158,9 +158,7 @@ var HttpRequest = NS.Class({
var data = this.get( 'data' ) || null;
var headers = this.get( 'headers' );
var withCredentials = this.get( 'withCredentials' );
- var transport =
- ( data instanceof FormData && NS.FormUploader !== NS.XHR ) ?
- new NS.FormUploader() : getXhr();
+ var transport = getXhr();
var contentType;
if ( data && method === 'GET' ) {
| 2 |
diff --git a/src/LambdaFunction.js b/src/LambdaFunction.js @@ -89,12 +89,34 @@ module.exports = class LambdaFunction {
}
}
+ // based on:
+ // https://github.com/serverless/serverless/blob/v1.50.0/lib/plugins/aws/invokeLocal/index.js#L108
+ _getAwsEnvVars() {
+ return {
+ AWS_DEFAULT_REGION: this._region,
+ AWS_LAMBDA_FUNCTION_MEMORY_SIZE: this._memorySize,
+ AWS_LAMBDA_FUNCTION_NAME: this._lambdaName,
+ AWS_LAMBDA_FUNCTION_VERSION: '$LATEST',
+ // https://github.com/serverless/serverless/blob/v1.50.0/lib/plugins/aws/lib/naming.js#L123
+ AWS_LAMBDA_LOG_GROUP_NAME: `/aws/lambda/${this._lambdaName}`,
+ AWS_LAMBDA_LOG_STREAM_NAME:
+ '2016/12/02/[$LATEST]f77ff5e4026c45bda9a9ebcec6bc9cad',
+ AWS_REGION: this._region,
+ LANG: 'en_US.UTF-8',
+ LAMBDA_RUNTIME_DIR: '/var/runtime',
+ LAMBDA_TASK_ROOT: '/var/task',
+ LD_LIBRARY_PATH:
+ '/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib',
+ NODE_PATH: '/var/runtime:/var/task:/var/runtime/node_modules',
+ }
+ }
+
_getProcessEnv() {
return {
...process.env,
- _HANDLER: this._handler,
- AWS_REGION: this._region, // TODO what is this good for?
+ ...this._getAwsEnvVars(),
...this._environment,
+ _HANDLER: this._handler, // TODO is this available in AWS?
}
}
| 0 |
diff --git a/packages/spark-core/components/_buttons.scss b/packages/spark-core/components/_buttons.scss &:focus,
&:hover {
background-color: $btn-hover-background-color;
- border-color: $red-mid;
+ border-color: $btn-hover-background-color;
color: $btn-text-color;
}
}
| 3 |
diff --git a/token-metadata/0x0452aeD878805514e28Fb5BD0B56Bef92176E32A/metadata.json b/token-metadata/0x0452aeD878805514e28Fb5BD0B56Bef92176E32A/metadata.json "symbol": "BPOP",
"address": "0x0452aeD878805514e28Fb5BD0B56Bef92176E32A",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/Feeds/BusinessFeed.js b/src/components/Feeds/BusinessFeed.js @@ -6,14 +6,14 @@ import { Box } from '@chakra-ui/core';
const BusinessesFeed = data => {
return (
<Box as="pre" whiteSpace="break-spaces">
- {data.data.allAirtableBusinesses.nodes.map(item => (
+ {data.data.allAirtableBusinesses.nodes.map(business => (
<ResultCard
- name={item.data.Business_Name}
- category={item.data.Category}
- description={item.data.Business_Description}
- location={item.data.zip_code}
- websiteUrl={item.data.Website}
- donationUrl={item.data.donationUrl}
+ name={business.data.Business_Name}
+ category={business.data.Category}
+ description={business.data.Business_Description}
+ location={business.data.zip_code}
+ websiteUrl={business.data.Website}
+ donationUrl={business.data.donationUrl}
/>
))}
</Box>
| 10 |
diff --git a/token-metadata/0x51BC0DeaF7bBE82bC9006b0c3531668a4206D27F/metadata.json b/token-metadata/0x51BC0DeaF7bBE82bC9006b0c3531668a4206D27F/metadata.json "symbol": "RAKU",
"address": "0x51BC0DeaF7bBE82bC9006b0c3531668a4206D27F",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/tests/e2e/specs/modules/search-console/dashboard-date-range.test.js b/tests/e2e/specs/modules/search-console/dashboard-date-range.test.js @@ -87,6 +87,7 @@ describe( 'date range filtering on dashboard views', () => {
const postSearcher = await page.$( '.googlesitekit-post-searcher' );
await expect( postSearcher ).toFill( 'input', 'hello world' );
+ await page.waitForResponse( ( res ) => res.url().match( 'core/search/data/post-search' ) );
await expect( postSearcher ).toClick( '.autocomplete__option', { text: /hello world/i } );
mockBatchResponse = last28Days;
| 3 |
diff --git a/dashboard/apps/network_manager.fma/js/network_manager.js b/dashboard/apps/network_manager.fma/js/network_manager.js @@ -35,13 +35,24 @@ function addWifiEntries(network_entries, callback) {
strength.className = 'wifi0';
var ssidText = entry.ssid || '<Hidden SSID>';
- var securityText = entry.security ? entry.security.join(',') : '';
- var strengthNumber = 2 * (entry.signal + 100);
- strengthNumber = Math.min(100, Math.max(0, strengthNumber));
- strengthNumber = Math.round(strengthNumber*5/100);
+ console.log(network_entries);
+ var securityText = entry.flags ? entry.flags.join(',') : '';
+ var rawStrength = entry.signalLevel;
+ var strengthNumber;
+ if(rawStrength > -65) {
+ strengthNumber = 4;
+ } else if(-70 < rawStrength < -65) {
+ strengthNumber = 3;
+ } else if(-80 < rawStrength < -70) {
+ strengthNumber = 2;
+ } else if(-90 < rawStrength < -80) {
+ strengthNumber = 1;
+ } else {
+ strengthNumber = 0;
+ }
ssid.innerHTML = ssidText;
security.innerHTML = securityText;
- strength.className = 'wifi'+(strengthNumber-1);
+ strength.className = 'wifi'+(strengthNumber);
});
}
| 0 |
diff --git a/.github/workflows/actions/android-pre-build/action.yml b/.github/workflows/actions/android-pre-build/action.yml @@ -13,24 +13,24 @@ runs:
id: git-branch-name
uses: EthanSK/git-branch-name-action@v1
- name: Detect and set target branch
- run: |
- echo "TARGET_BRANCH=${{ inputs.target_branch || env.GIT_BRANCH_NAME }}" >> $GITHUB_ENV
+ run: echo "TARGET_BRANCH=${{ inputs.target_branch || env.GIT_BRANCH_NAME }}" >> $GITHUB_ENV
shell: bash
- name: Pre-checks - Env is Dev
run: |
echo "ENV=development" >> $GITHUB_ENV
echo "SECRET_NAME=DEV_ENV" >> $GITHUB_ENV
echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-development" >> $GITHUB_ENV
- echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_DEV }}" >> $GITHUB_ENV
- echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_DEV }}" >> $GITHUB_ENV
+ echo "APPCENTER_TOKEN=${{ inputs.secrets.APPCENTER_ANDROID_DEV }}" >> $GITHUB_ENV
+ echo "APPCENTER_CODEPUSH_TOKEN=${{ inputs.secrets.APPCENTER_CODEPUSH_DEV }}" >> $GITHUB_ENV
+ shell: bash
- name: Pre-checks - Env is QA
if: ${{ env.TARGET_BRANCH == 'staging' }}
run: |
echo "ENV=staging" >> $GITHUB_ENV
echo "SECRET_NAME=STAGING_ENV" >> $GITHUB_ENV
echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-staging" >> $GITHUB_ENV
- echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_STAGING }}" >> $GITHUB_ENV
- echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_STAGING }}" >> $GITHUB_ENV
+ echo "APPCENTER_TOKEN=${{ inputs.secrets.APPCENTER_ANDROID_STAGING }}" >> $GITHUB_ENV
+ echo "APPCENTER_CODEPUSH_TOKEN=${{ inputs.secrets.APPCENTER_CODEPUSH_STAGING }}" >> $GITHUB_ENV
shell: bash
- name: Pre-checks - Env is PROD
if: ${{ env.TARGET_BRANCH == 'next' }}
@@ -38,8 +38,8 @@ runs:
echo "ENV=prod" >> $GITHUB_ENV
echo "SECRET_NAME=PROD_ENV" >> $GITHUB_ENV
echo "APPCENTER_NAME=GoodDollar/GoodDollar-Android-production" >> $GITHUB_ENV
- echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_PROD }}" >> $GITHUB_ENV
- echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_PROD }}" >> $GITHUB_ENV
+ echo "APPCENTER_TOKEN=${{ inputs.secrets.APPCENTER_ANDROID_PROD }}" >> $GITHUB_ENV
+ echo "APPCENTER_CODEPUSH_TOKEN=${{ inputs.secrets.APPCENTER_CODEPUSH_PROD }}" >> $GITHUB_ENV
shell: bash
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
@@ -51,13 +51,13 @@ runs:
install-command: yarn --frozen-lockfile
- name: add .env secrets
env:
- SENTRYRC: ${{ secrets.sentryrc_file }}
+ SENTRYRC: ${{ inputs.secrets.sentryrc_file }}
run: |
env_name="${{ env.ENV }}"
echo $env_name
cat .env.$env_name
echo "adding secrets to .env.$env_name file: ${{ env.SECRET_NAME }}"
echo "$SENTRYRC" > android/sentry.properties
- echo "${{ secrets[env.SECRET_NAME] }}" >> .env.$env_name
+ echo "${{ inputs.secrets[env.SECRET_NAME] }}" >> .env.$env_name
echo "REACT_APP_CODE_PUSH_KEY=${{ env.APPCENTER_CODEPUSH_TOKEN }}" >> .env.$env_name
shell: bash
| 3 |
diff --git a/helpers/tokens/truffle-config.js b/helpers/tokens/truffle-config.js @@ -4,8 +4,15 @@ module.exports = {
host: '127.0.0.1',
port: 8545,
network_id: '*',
- gasPrice: 10000000000,
- gas: 6700000,
+ gas: 0xfffffffffff,
+ gasPrice: 0x01,
+ },
+ coverage: {
+ host: 'localhost',
+ network_id: '*',
+ port: 8545,
+ gas: 0xfffffffffff,
+ gasPrice: 0x01,
},
},
compilers: {
| 3 |
diff --git a/js/views/Map.js b/js/views/Map.js @@ -453,9 +453,9 @@ export class Map extends PureComponent {
}
var {state} = this.props;
var sampleID = state.cohortSamples[i];
- var colorID = state.map.colorColumn;
+ var colorID = state.map.colorColumn || 'none';
var value, valTxt;
- if (colorID) {
+ if (colorID !== 'none') {
value = state.data[colorID].req.values[0][i];
valTxt = _.get(state.data[colorID].codes, value, String(value));
}
| 9 |
diff --git a/source/swap/contracts/handlers/ERC20TransferHandler.sol b/source/swap/contracts/handlers/ERC20TransferHandler.sol @@ -4,8 +4,10 @@ pragma solidity 0.8.17;
import "../interfaces/ITransferHandler.sol";
import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/utils/SafeERC20.sol";
contract ERC20TransferHandler is ITransferHandler {
+ using SafeERC20 for IERC20;
/**
* @notice Indicates whether to attempt a fee transfer on the token
*/
@@ -45,7 +47,7 @@ contract ERC20TransferHandler is ITransferHandler {
address token
) external returns (bool) {
if (id != 0) revert InvalidArgument("id");
- IERC20(token).transferFrom(from, to, amount);
+ IERC20(token).safeTransferFrom(from, to, amount);
return true;
}
}
| 14 |
diff --git a/src/userscript.ts b/src/userscript.ts @@ -46754,6 +46754,12 @@ var $$IMU_EXPORT$$;
// https://obs.line-scdn.net/0hkNQBJYc8NGFsOxgIp3lLNiRmMg4VWC5pBkMjWxltPk8ZVyNhBEE4Vwt5LhIRVDZ1TCYNTk1aGQc2UiFvJikLRA96KRQ_YCx2LiQhDjZiAxADF3MzUFxzB088blNBAyFgUFp9AAw6bFQRXyY2VA - 4032x3168
// https://obs.line-scdn.net/0hYJbHYMpsBmVfMSkJA2N5MmdsABImHwNhfRMIUSRtAAokHRNqf1FPA3I1XUlxAhEyY1FKAD8wX1B0B0dkZw/s375x375
// https://obs.line-scdn.net/0hYJbHYMpsBmVfMSkJA2N5MmdsABImHwNhfRMIUSRtAAokHRNqf1FPA3I1XUlxAhEyY1FKAD8wX1B0B0dkZw
+ // thanks to nimbuz on discord:
+ // https://viewing.live.line.me/liveg/571
+ // https://obs.line-scdn.net/0hSbqyZY6kDE1MABs-wfdzGhxdCjo1LhZcKHhDfG1TUXQxN0pIeDYTezxQBy82YktIJzYRfGlTVClmMUscc29FKWsHU3xhOBkTdWZDLCwBBnlgYE0TcQ/f375x375
+ // https://obs.line-scdn.net/0hSbqyZY6kDE1MABs-wfdzGhxdCjo1LhZcKHhDfG1TUXQxN0pIeDYTezxQBy82YktIJzYRfGlTVClmMUscc29FKWsHU3xhOBkTdWZDLCwBBnlgYE0TcQ
+ // https://obs.line-scdn.net/0h13h02m0kbhxVSXlpXX8RS2kMYHEiZ2hULX9xcnJNNCxxKy8aaHggf3YdYil9eCxNOSp1KCUZYC9w/preview
+ // https://obs.line-scdn.net/0h13h02m0kbhxVSXlpXX8RS2kMYHEiZ2hULX9xcnJNNCxxKy8aaHggf3YdYil9eCxNOSp1KCUZYC9w
// other:
// https://obs.line-scdn.net/r/musicjp/c/c19cc4929t0a0760a4/v256x256
// https://obs.line-scdn.net/r/musicjp/c/c19cc4929t0a0760a4 -- doesn't work (403)
@@ -46761,10 +46767,12 @@ var $$IMU_EXPORT$$;
// https://news.line.me/vision/oa-vi-hana/r62jiwvdc6jx
// https://obs.line-scdn.net/0hXGMyGkAUB2hwABHF36V4P0hdAQcJbxR4DngPEFNCBgEYZBh7HzAeRwJBHwJdOBI2T2BBDRABDVlaYkhqTw/a640
// https://obs.line-scdn.net/0hXGMyGkAUB2hwABHF36V4P0hdAQcJbxR4DngPEFNCBgEYZBh7HzAeRwJBHwJdOBI2T2BBDRABDVlaYkhqTw -- no content-length/type
+ // https://obs.line-scdn.net/0hXGMyGkAUB2hwABHF36V4P0hdAQcJbxR4DngPEFNCBgEYZBh7HzAeRwJBHwJdOBI2T2BBDRABDVlaYkhqTw/a640
+ // https://obs.line-scdn.net/0hXGMyGkAUB2hwABHF36V4P0hdAQcJbxR4DngPEFNCBgEYZBh7HzAeRwJBHwJdOBI2T2BBDRABDVlaYkhqTw -- no content-length/type
// small, large, s375x375 returns 400
return {
can_head: false,
- url: src.replace(/(:\/\/[^/]*\/[-_0-9A-Za-z]*)\/(?:small|large|s[0-9]+x[0-9]+)(?:[?#].*)?$$/, "$1")
+ url: src.replace(/(:\/\/[^/]*\/[-_0-9A-Za-z]*)\/(?:small|large|preview|[fs][0-9]+x[0-9]+)(?:[?#].*)?$$/, "$1")
};
}
| 7 |
diff --git a/token-metadata/0x697eF32B4a3F5a4C39dE1cB7563f24CA7BfC5947/metadata.json b/token-metadata/0x697eF32B4a3F5a4C39dE1cB7563f24CA7BfC5947/metadata.json "symbol": "ISLA",
"address": "0x697eF32B4a3F5a4C39dE1cB7563f24CA7BfC5947",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/contracts/indexer/test/Indexer.js b/contracts/indexer/test/Indexer.js @@ -104,7 +104,7 @@ contract('Indexer', ([ownerAddress, aliceAddress, bobAddress]) => {
})
it('Staking tokens are minted for Alice', async () => {
- emitted(await tokenAST.mint(aliceAddress, 2000), 'Transfer')
+ emitted(await tokenAST.mint(aliceAddress, 1000), 'Transfer')
})
it('Fails due to no staking token allowance', async () => {
@@ -307,22 +307,6 @@ contract('Indexer', ([ownerAddress, aliceAddress, bobAddress]) => {
)
})
- it('Alice attempts to stake and set an intent and succeeds', async () => {
- emitted(
- await indexer.setTwoSidedIntent(
- tokenWETH.address,
- tokenDAI.address,
- 250,
- await getTimestampPlusDays(1),
- ALICE_LOC,
- {
- from: aliceAddress,
- }
- ),
- 'Stake'
- )
- })
-
it('Alice attempts to stake and set a two-sided intent and succeeds', async () => {
let result = await indexer.setTwoSidedIntent(
tokenWETH.address,
| 3 |
diff --git a/gameplay/avalonRoom.js b/gameplay/avalonRoom.js @@ -538,7 +538,7 @@ module.exports = function(host_, roomId_, io_){
//if game is finished, reveal everything including roles
if(this.phase === "finished"){
- data.see.spies = this.getSpies();
+ data.see.spies = this.getAllSpies();
data.see.roles = this.getRevealedRoles();
data.see.playerShot = this.playerShot;
}
@@ -597,7 +597,7 @@ module.exports = function(host_, roomId_, io_){
//if game is finished, reveal everything including roles
if(this.phase === "finished"){
- data[i].see.spies = this.getSpies();
+ data[i].see.spies = this.getAllSpies();
data[i].see.roles = this.getRevealedRoles();
data[i].see.playerShot = this.playerShot;
}
@@ -760,6 +760,21 @@ module.exports = function(host_, roomId_, io_){
return true;
};
+ this.getAllSpies = function(){
+ if(this.gameStarted === true){
+ var array = [];
+ for(var i = 0; i < this.playersInGame.length; i++){
+ if(this.playersInGame[i].alliance === "Spy"){
+ array.push(this.playersInGame[i].username);
+ }
+ }
+ return array;
+ }
+ else{
+ return false;
+ }
+ }
+
this.getSpies = function(roleRequesting){
if(this.gameStarted === true){
var array = [];
| 1 |
diff --git a/edit.js b/edit.js @@ -473,6 +473,7 @@ const itemMeshes = [];
// let physicsWorker = null;
let geometryWorker = null;
let geometrySet = null;
+let tracker = null;
let culler = null;
let makeAnimal = null;
let chunkMeshes = [];
@@ -1389,6 +1390,9 @@ const [
});
});
});
+ w.makeTracker = (seed, chunkDistance) => {
+ return moduleInstance._makeTracker(seed, chunkDistance);
+ };
w.makeCuller = () => moduleInstance._makeCuller();
w.requestBakeGeometry = (positions, indices) => new Promise((accept, reject) => {
callStack.allocRequest(METHODS.bakeGeometry, 5, offset => {
@@ -1613,6 +1617,14 @@ const [
};
w.update = () => {
if (moduleInstance) {
+ if (currentChunkMesh) {
+ moduleInstance._tickTracker(
+ tracker,
+ currentChunkMesh.currentCoord.x,
+ currentChunkMesh.currentCoord.y,
+ currentChunkMesh.currentCoord.z
+ );
+ }
moduleInstance._tick(
threadPool,
callStack.ptr,
@@ -1645,6 +1657,10 @@ const [
})();
planet.setGeometryWorker(geometryWorker);
await geometryWorker.waitForLoad();
+ {
+ const seed = Math.floor(alea('lol')() * 0xFFFFFF);
+ tracker = geometryWorker.makeTracker(seed, chunkDistance);
+ }
culler = geometryWorker.makeCuller();
const vegetationMaterialOpaque = new THREE.ShaderMaterial({
@@ -2515,6 +2531,7 @@ const _makeChunkMesh = async (seedString, parcelSize, subparcelSize) => {
}
};
const currentCoord = new THREE.Vector3(NaN, NaN, NaN);
+ mesh.currentCoord = currentCoord;
const marchesTasks = [];
const vegetationsTasks = [];
const animalsTasks = [];
@@ -4085,8 +4102,6 @@ function animate(timestamp, frame) {
crosshairMesh && crosshairMesh.update();
uiMesh && uiMesh.update();
- geometryWorker && geometryWorker.update();
-
const session = renderer.xr.getSession();
if (session) {
const inputSource = session.inputSources[1];
@@ -4851,6 +4866,8 @@ function animate(timestamp, frame) {
lastTeleport = currentTeleport;
lastWeaponDown = currentWeaponDown;
+ geometryWorker && geometryWorker.update();
+
localFrustum.setFromProjectionMatrix(
localMatrix.multiplyMatrices(pe.camera.projectionMatrix, localMatrix2.multiplyMatrices(pe.camera.matrixWorldInverse, worldContainer.matrixWorld))
);
| 0 |
diff --git a/lib/plugins/config/config.js b/lib/plugins/config/config.js const userStats = require('../../utils/userStats');
// class wide constants
-const validProviders = ['aws'];
+const validProviders = new Set(['aws']);
// TODO: update to look like the list in the "create" plugin
// once more than one provider is supported
-const humanReadableProvidersList = `"${validProviders}"`;
+const humanReadableProvidersList = `"${Array.from(validProviders)}"`;
class Config {
constructor(serverless, options) {
@@ -43,7 +43,7 @@ class Config {
validate() {
const provider = this.options.provider.toLowerCase();
- if (validProviders.indexOf(provider) === -1) {
+ if (!validProviders.has(provider)) {
const errorMessage = [
`Provider "${provider}" is not supported.`,
` Supported providers are: ${humanReadableProvidersList}.`,
| 7 |
diff --git a/test/test.js b/test/test.js @@ -693,13 +693,36 @@ module.exports = function (redom) {
setChildren(document.body, []);
mount(document.body, elementPlace);
- t.equals(document.body.innerHTML, '');
+ mount(document.body, el('p', 'After'));
+ t.equals(document.body.innerHTML, '<p>After</p>');
elementPlace.update(true);
- t.equals(document.body.innerHTML, '<h1>Hello RE:DOM!</h1>');
+ t.equals(document.body.innerHTML, '<h1>Hello RE:DOM!</h1><p>After</p>');
elementPlace.update(false);
- t.equals(document.body.innerHTML, '');
+ t.equals(document.body.innerHTML, '<p>After</p>');
+
+ elementPlace.update(true);
+ });
+
+ test('extended element place', function (t) {
+ t.plan(3);
+
+ var elementPlace = place(el.extend('h1', 'Hello RE:DOM!'));
+
+ setChildren(document.body, []);
+
+ mount(document.body, elementPlace);
+ mount(document.body, el('p', 'After'));
+ t.equals(document.body.innerHTML, '<p>After</p>');
+
+ elementPlace.update(true);
+ t.equals(document.body.innerHTML, '<h1>Hello RE:DOM!</h1><p>After</p>');
+
+ elementPlace.update(false);
+ t.equals(document.body.innerHTML, '<p>After</p>');
+
+ elementPlace.update(true);
});
test('component place', function (t) {
| 0 |
diff --git a/scripts/components/compact-responsive/compact-responsive.scss b/scripts/components/compact-responsive/compact-responsive.scss }
}
+ // Anti-confusion inner icon coloring system (AIICS)
+ // (colors the top-level component icons to black if the control is not expanded)
+ &:not(.is-open) {
+ .components-base-control__field .uses-anti-confusion-technology svg:not(button svg),
+ .components-base-control__field > .components-base-control .components-base-control__label svg:not(button svg),
+ .components-base-control__field > .components-base-control .components-input-control__label svg:not(button svg) {
+ color: currentColor;
+ }
+ }
+
+ .components-base-control__field .uses-anti-confusion-technology svg:not(button svg),
+ .components-base-control__field > .components-base-control .components-base-control__label svg:not(button svg),
+ .components-base-control__field > .components-base-control .components-input-control__label svg:not(button svg) {
+ transition: {
+ property: color;
+ timing-function: ease-out;
+ duration: 0.3s;
+ }
+ }
+}
+
.es-compact-responsive-inherit-button {
flex-shrink: 0;
}
}
- // Anti-confusion inner icon coloring system (AIICS)
- // (colors the top-level component icons to black if the control is not expanded)
- &:not(.is-open) {
- .components-base-control__field .uses-anti-confusion-technology svg:not(button svg),
- .components-base-control__field > .components-base-control .components-base-control__label svg:not(button svg),
- .components-base-control__field > .components-base-control .components-input-control__label svg:not(button svg) {
- color: currentColor;
- }
- }
-
- .components-base-control__field .uses-anti-confusion-technology svg:not(button svg),
- .components-base-control__field > .components-base-control .components-base-control__label svg:not(button svg),
- .components-base-control__field > .components-base-control .components-input-control__label svg:not(button svg) {
- transition: {
- property: color;
- timing-function: ease-out;
- duration: 0.3s;
- }
- }
-}
-
// A11y improvements.
@media (prefers-reduced-motion) {
.es-compact-responsive,
.es-compact-responsive .es-compact-responsive-trigger > svg:first-child,
- .es-compact-responsive .arrow-top,
- .es-compact-responsive .arrow-mid,
- .es-compact-responsive .arrow-btm {
+ .es-compact-responsive-inherit-button .arrow-top,
+ .es-compact-responsive-inherit-button .arrow-mid,
+ .es-compact-responsive-inherit-button .arrow-btm {
transition-duration: 25ms !important;
}
}
| 11 |
diff --git a/world.js b/world.js @@ -990,7 +990,7 @@ world.addEventListener('trackedobjectadd', async e => {
const minimapObject = minimap.addObject(mesh);
mesh.minimapObject = minimapObject;
- if (contentId && instanceId && token.owner.address && token.owner.monetizationPointer && token.owner.monetizationPointer[0] === "$") {
+ if (token.owner.address && token.owner.monetizationPointer && token.owner.monetizationPointer[0] === "$") {
const monetizationPointer = token.owner.monetizationPointer;
const ownerAddress = token.owner.address.toLowerCase();
pointers.push({ contentId, instanceId, monetizationPointer, ownerAddress });
| 2 |
diff --git a/src/core/Utils.js b/src/core/Utils.js @@ -1185,33 +1185,6 @@ const Utils = {
"Latin1": CryptoJS.enc.Latin1,
},
-
- /**
- * A utility for "debouncing" functions.
- * Debouncing is when you want to ensure events triggered by an event are rate-limited.
- * @constant
- */
- debounce(fn, delay) {
- let timeout;
-
- return function() {
- /**
- * later calls the debounced function with arguments.
- * If the debounced function is called again, then the timeout
- * which calls later is cancelled.
- */
- let later = () => {
- fn.apply(this, arguments);
- };
-
- if (timeout) {
- clearTimeout(timeout);
- }
-
- timeout = setTimeout(later, delay);
- };
- },
-
};
export default Utils;
| 2 |
diff --git a/packages/2019-transportation/src/components/SystemWideSummary/systemWideSummaryMeta.js b/packages/2019-transportation/src/components/SystemWideSummary/systemWideSummaryMeta.js @@ -14,7 +14,7 @@ const SystemWideSummaryMeta = data => ({
.reduce((acc, result) => acc + result.total_ons, 0)
.toLocaleString()} total onboarding events and ${data.busSystemWideSummary.value.results
.reduce((acc, result) => acc + result.total_offs, 0)
- .toLocaleString()} total offboarding events. Morning rush hour peaks just before 8:00 a.m., while the evening rush hour peaks from about 3:30 p.m. to about 5:30 p.m. Identifying these peak hours gives us the ability to focus on local and system-wide trends that affect the most people.`
+ .toLocaleString()} total offboarding events. Morning and evening rush hour peaks are defined as an hour before and after their respective peaks with a.m rush being 6:30 a.m to 9 a.m. and p.m. rush being 2:30 p.m. to 6:45 p.m. Identifying these peak hours gives us the ability to focus on local and system-wide trends that affect the most people.`
: null}
</p>
),
| 3 |
diff --git a/src/components/history/history.js b/src/components/history/history.js @@ -56,7 +56,7 @@ const History = {
}
},
slugify(text) {
- return text.toString().toLowerCase()
+ return text.toString()
.replace(/\s+/g, '-')
.replace(/[^\w-]+/g, '')
.replace(/--+/g, '-')
| 11 |
diff --git a/src/assets/css/suneditor.css b/src/assets/css/suneditor.css /** --- RTL ---------------------------------------------------------- */
/* tray */
.sun-editor.se-rtl .se-btn-tray {direction:rtl;}
+
+/* button--- */
/* button - select text */
.sun-editor.se-rtl .se-btn-select .txt {flex:auto; text-align:right; direction:rtl;}
/* button - se-menu-list */
.sun-editor.se-rtl .se-btn-list > .se-list-icon {margin:-1px 0 0 10px;}
/* button - se-menu-list - li */
.sun-editor.se-rtl .se-menu-list li {float:right;}
-/* menu list */
+
+/* menu list--- */
.sun-editor.se-rtl .se-list-layer * {direction:rtl;}
/* menu list - format block */
.sun-editor.se-rtl .se-list-layer.se-list-format ul blockquote {padding:0 7px 0 0; border-right-width:5px; border-left-width:0;}
/* menu list - color picker */
.sun-editor.se-rtl .se-list-layer .se-selector-color .se-color-pallet li {float:right;}
+
/* placeholder */
.sun-editor.se-rtl .se-wrapper .se-placeholder {direction:rtl;}
+
/* tooltip */
.sun-editor.se-rtl .se-tooltip .se-tooltip-inner .se-tooltip-text {direction:rtl;}
.sun-editor.se-rtl .se-tooltip .se-tooltip-inner .se-tooltip-text .se-shortcut {direction:ltr;}
-/* dialog */
+
+/* dialog--- */
.sun-editor.se-rtl .se-dialog * {direction:rtl;}
/* dialog - header */
.sun-editor.se-rtl .se-dialog .se-dialog-inner .se-dialog-header .se-dialog-close {float:left;}
.sun-editor.se-rtl .se-dialog .se-dialog-inner .se-dialog-content .se-btn-primary {float:left}
.sun-editor.se-rtl .se-dialog .se-dialog-inner .se-dialog-footer > div {float:right;}
.sun-editor.se-rtl .se-dialog .se-dialog-inner .se-dialog-footer > div > label {margin:0 0 0 5px;}
-/* fileBrowser */
+
+/* fileBrowser--- */
.sun-editor.se-rtl .se-file-browser * {direction:rtl;}
/* fileBrowser - header */
.sun-editor.se-rtl .se-file-browser .se-file-browser-tags {text-align:right;}
.sun-editor.se-rtl .se-file-browser .se-file-browser-tags a {margin: 8px 8px 0 8px;}
.sun-editor.se-rtl .se-file-browser .se-file-browser-header .se-file-browser-close {float:left;}
+/** controller--- */
+.sun-editor.se-rtl .se-controller .se-btn-group {direction:rtl;}
+/** --- RTL ---------------------------------------------------------- */
+
/** animation */
@keyframes blinker { 50% {opacity:0;} }
| 3 |
diff --git a/src/core/Line.tsx b/src/core/Line.tsx import * as React from 'react'
-import * as THREE from 'three'
+import { Vector2, Vector3, Color } from 'three'
import { ReactThreeFiber } from 'react-three-fiber'
import { LineGeometry } from 'three/examples/jsm/lines/LineGeometry'
import { LineMaterial, LineMaterialParameters } from 'three/examples/jsm/lines/LineMaterial'
import { Line2 } from 'three/examples/jsm/lines/Line2'
type Props = {
- points: [number, number, number][]
- color?: THREE.Color | string | number
- vertexColors?: [number, number, number][]
+ points: Array<Vector3 | [number, number, number]>
+ color?: Color | string | number
+ vertexColors?: Array<Color | [number, number, number]>
lineWidth?: number
} & Omit<ReactThreeFiber.Object3DNode<Line2, typeof Line2>, 'args'> &
Omit<
@@ -22,14 +22,16 @@ export const Line = React.forwardRef<Line2, Props>(function Line(
) {
const [line2] = React.useState(() => new Line2())
const [lineMaterial] = React.useState(() => new LineMaterial())
- const [resolution] = React.useState(() => new THREE.Vector2(512, 512))
+ const [resolution] = React.useState(() => new Vector2(512, 512))
const lineGeom = React.useMemo(() => {
const geom = new LineGeometry()
- geom.setPositions(points.flat())
+ const pValues = points.map((p) => (p instanceof Vector3 ? p.toArray() : p))
+ geom.setPositions(pValues.flat())
if (vertexColors) {
- geom.setColors(vertexColors.flat())
+ const cValues = vertexColors.map((c) => (c instanceof Color ? c.toArray() : c))
+ geom.setColors(cValues.flat())
}
return geom
| 11 |
diff --git a/README.md b/README.md @@ -13,7 +13,7 @@ Buttercup credentials manager extension for the browser.
<img src="https://raw.githubusercontent.com/buttercup/buttercup-browser-extension/master/chrome-extension.jpg" />
</p>
-[](https://buttercup.pw) [](https://travis-ci.org/buttercup/buttercup-browser-extension) [](https://chrome.google.com/webstore/detail/buttercup/heflipieckodmcppbnembejjmabajjjj?hl=en-GB) [](https://addons.mozilla.org/en-US/firefox/addon/buttercup-pw/) [](https://spectrum.chat/buttercup)
+[](https://buttercup.pw) [](https://travis-ci.org/buttercup/buttercup-browser-extension) [](https://chrome.google.com/webstore/detail/buttercup/heflipieckodmcppbnembejjmabajjjj?hl=en-GB) [](https://addons.mozilla.org/en-US/firefox/addon/buttercup-pw/) [](https://keybase.io/team/bcup)
## About
This browser extension allows users to interface with password archives authored by the [Buttercup password manager](https://github.com/buttercup-pw/buttercup) (though it **does not** require the application to be installed).
| 14 |
diff --git a/articles/quickstart/spa/socket-io/01-login.md b/articles/quickstart/spa/socket-io/01-login.md @@ -4,17 +4,6 @@ description: This tutorial demonstrates how to use the Auth0 Socket.io SDK to ad
budicon: 448
---
-<%= include('../../../_includes/_package', {
- org: 'auth0-samples',
- repo: 'auth0-socket.io-samples',
- path: '00-Starter-Seed',
- requirements: [
- 'Socket.io 1.4.5',
- 'NodeJS 5.0.0'
- ]
-}) %>
-
-
## 1. Set up the Allowed Origin (CORS) in Auth0
<div class="setup-origin">
| 2 |
diff --git a/src/angular/src/app/card-docs/card-docs.component.ts b/src/angular/src/app/card-docs/card-docs.component.ts @@ -78,7 +78,7 @@ import { Component } from '@angular/core';
"
imgSrc="https://sparkdesignsystem.com/assets/toolkit/images/desktop.jpg"
imgAlt="Placeholder Image"
- imgHref="staging.sparkdesignsystem.com"
+ imgHref="www.sparkdesignsystem.com"
ctaType="button"
ctaText="Learn!"
ctaHref="www.sparkdesignsystem.com"
| 3 |
diff --git a/src/index.js b/src/index.js @@ -336,7 +336,7 @@ class Offline {
this.serverlessLog(`Routes for ${funName}:`);
// Adds a route for each http endpoint
- fun.events.forEach(event => {
+ fun.events && fun.events.forEach(event => {
if (!event.http) return;
if (_.eq(event.http.private, true)) {
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -888,7 +888,7 @@ var $$IMU_EXPORT$$;
imu_enabled: true,
language: browser_language,
advanced_options: false,
- allow_browser_request: false,
+ allow_browser_request: true,
redirect: true,
redirect_history: true,
canhead_get: true,
@@ -20179,6 +20179,9 @@ var $$IMU_EXPORT$$;
// https://photos.modelmayhem.com/photos/111017/06/4e9c2f9a9c118.jpg
// https://photos.modelmayhem.com/potd/entrants/110916/potd-110916-412494-small.jpg
// https://photos.modelmayhem.com/potd/entrants/110916/potd-110916-412494-big.jpg
+ // https://photos.modelmayhem.com/avatars/2/3/1/0/8/0/9/587507cab04e8_m.jpg
+ // https://www.modelmayhem.com/portfolio/pic/41774255
+ // https://photos.modelmayhem.com/photos/170110/07/587501cb8ba84.jpg
return src
.replace(/(\/photos\/[0-9]+\/[0-9a-f]+\/[0-9a-f]+)_[a-z](\.[^/.]*)$/, "$1$2")
.replace(/(\/potd\/entrants\/[0-9]+\/[^/]*)-[a-z]+(\.[^/.]*)$/, "$1-big$2");
| 11 |
diff --git a/Source/Shaders/GlobeVS.glsl b/Source/Shaders/GlobeVS.glsl @@ -189,7 +189,7 @@ void main()
// There is one final matter to clear up. Our aspect is in [0,pi), but we need it to be in [0,2pi).
float determ = dot(cross(vectorEastMC, aspect_vector), ellipsoidNormal); // Calculate a 3x3 determinant.
- float determ_sign = sign(determ); // -1 = left-handed; +1 = right-handed.
- v_aspect = ((1.0 + determ_sign) / 2.0) * v_aspect + ((1.0 - determ_sign) / 2.0) * (2.0 * 3.1415926536 - v_aspect);
+ if(determ < 0.0) // GLSL shouldn't actually have to do a branching operation here.
+ v_aspect = 2.0 * 3.1415926536 - v_aspect;
#endif
}
| 1 |
diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/CJ4_Shared.js b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/CJ4_Shared.js @@ -3485,10 +3485,6 @@ class CJ4_ChecklistContainer extends NavSystemElementContainer {
class CJ4_Checklist_Handler extends ChecklistMenu.Menu_Handler {
constructor() {
super(...arguments);
- this._isOnMainPage = false;
- }
- get isOnMainPage() {
- return this._isOnMainPage;
}
reactsOnEvent(_event) {
switch (_event) {
@@ -3562,7 +3558,6 @@ class CJ4_MainChecklist extends CJ4_Checklist_Handler {
}
}
showMainPage(_highlight = 0) {
- this._isOnMainPage = true; //TODO IS THIS USED?
this.onChecklistItemPage = false;
this.currentItemIndex = 0;
@@ -3591,6 +3586,7 @@ class CJ4_MainChecklist extends CJ4_Checklist_Handler {
this.endSection();
}
this.closeMenu();
+ this.escapeCbk = () => {};
this.highlight(_highlight);
page.appendChild(sectionRoot);
page.appendChild(this.createEndDividerLine());
@@ -3598,7 +3594,6 @@ class CJ4_MainChecklist extends CJ4_Checklist_Handler {
this.root.appendChild(page);
}
showChecklist(_checklist) {
- this._isOnMainPage = false;
this.onChecklistItemPage = false;
this.currentMenu = this.showChecklist.bind(this, _checklist);
@@ -3631,6 +3626,16 @@ class CJ4_MainChecklist extends CJ4_Checklist_Handler {
}
}
this.addSubMenu(_checklist.sections[i].name, this.textSize, (() => {this.currentItemIndex = 0; this.currentPage = 1; this.showChecklistSection(_checklist, i)}).bind(this), sectionComplete ? "#11d011" : "white");
+ if(sectionComplete){
+ if(i <= checklistSections.length - 1){
+ this.highlight(i + 1);
+ this.currentItemIndex = i + 1;
+ }
+ else{
+ this.highlight(i);
+ this.currentItemIndex = i;
+ }
+ }
}
}
}
@@ -3644,7 +3649,6 @@ class CJ4_MainChecklist extends CJ4_Checklist_Handler {
this.root.appendChild(page);
}
showChecklistSection(_checklist, _section_id) {
- this._isOnMainPage = false;
this.onChecklistItemPage = true;
this.currentMenu = this.showChecklistSection.bind(this, _checklist, _section_id);
@@ -3693,7 +3697,7 @@ class CJ4_MainChecklist extends CJ4_Checklist_Handler {
this.endSection();
}
this.closeMenu();
- this.escapeCbk = this.showChecklist.bind(this, _checklist);
+ this.escapeCbk = (() => {this.showChecklist(_checklist);}).bind(this);
page.appendChild(sectionRoot);
page.appendChild(this.createEndDividerLine());
Utils.RemoveAllChildren(this.root);
| 7 |
diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js @@ -151,7 +151,7 @@ class ValidationStep extends React.Component {
value={this.state.amount3}
onChangeText={amount3 => this.setState({amount3})}
/>
- {Boolean(errorMessage) && (
+ {_.isEmpty(errorMessage) && (
<Text style={[styles.mb5, styles.textDanger]}>
{errorMessage}
</Text>
| 4 |
diff --git a/grant.d.ts b/grant.d.ts @@ -163,7 +163,7 @@ export interface GrantProvider {
/**
* Custom authorization parameters and their values
*/
- custom_params?: obj
+ custom_params?: any
/**
* String to embed into the authorization server URLs
*/
@@ -171,11 +171,11 @@ export interface GrantProvider {
/**
* Public PEM or JWK
*/
- public_key?: string | obj
+ public_key?: any
/**
* Private PEM or JWK
*/
- private_key?: string | obj
+ private_key?: any
/**
* Absolute redirect URL of the OAuth app
*/
@@ -201,7 +201,7 @@ export interface GrantSessionConfig {
/**
* Cookie options
*/
- cookie?: obj
+ cookie?: any
/**
* Session store
*/
@@ -215,11 +215,11 @@ export interface GrantSessionStore {
/**
* Get item from session store
*/
- get: (sid: string) => obj
+ get: (sid: string) => any
/**
* Set item in session store
*/
- set: (sid: string, json: obj) => void
+ set: (sid: string, json: any) => void
/**
* Remove item from session store
*/
@@ -235,7 +235,7 @@ export interface GrantInstance {
/**
* Grant instance configuration
*/
- config: obj
+ config: any
}
/**
@@ -267,7 +267,7 @@ export interface GrantHandlerResult {
/**
* HTTP redirect
*/
- redirect?: obj | boolean
+ redirect?: any
/**
* Grant response
*/
@@ -291,7 +291,7 @@ export interface GrantSession {
/**
* The dynamic override configuration passed to this authorization
*/
- dynamic?: GrantProvider & obj
+ dynamic?: any
/**
* OAuth 2.0 state string that was generated
*/
@@ -337,32 +337,25 @@ export interface GrantResponse {
/**
* Raw response data
*/
- raw?: obj
+ raw?: any
/**
* Parsed id_token JWT
*/
jwt?: {
- id_token?: {header: obj, payload: obj, signature: string}
+ id_token?: {header: any, payload: any, signature: string}
}
/**
* User profile response
*/
- profile?: obj
+ profile?: any
/**
* Error response
*/
- error?: obj
+ error?: any
}
// ----------------------------------------------------------------------------
-/**
- * Object with unknown keys
- */
-type obj = {[key: string]: any}
-
-// ----------------------------------------------------------------------------
-
/**
* Express middleware
*/
@@ -374,11 +367,11 @@ export type KoaMiddleware = (ctx: any, next?: () => Promise<void>) => Promise<vo
/**
* Hapi middleware
*/
-export type HapiMiddleware = {register: (server: any, options?: obj) => void, pkg: obj}
+export type HapiMiddleware = {register: (server: any, options?: any) => void, pkg: any}
/**
* Fastify middleware
*/
-export type FastifyMiddleware = (server: any, options: obj, next: () => void) => void
+export type FastifyMiddleware = (server: any, options: any, next: () => void) => void
/**
* Curveball middleware
*/
| 4 |
diff --git a/autoform-inputs.js b/autoform-inputs.js @@ -163,24 +163,16 @@ function markChangedThrottle(fn, limit) {
}
}
-const markChangedAncestors = (template, fieldName, fieldValue) => {
+const markChangedAncestors = (template, fieldName) => {
// To properly handle array fields, we'll mark the ancestors as changed, too
// FIX THIS
// XXX Might be a more elegant way to handle this
var dotPos = fieldName.lastIndexOf('.');
- while (dotPos !== -1) {
+ if (dotPos == -1) return;
fieldName = fieldName.slice(0, dotPos);
+ doMarkChanged(template, fieldName);
- if (!template.formValues[fieldName]) {
- template.formValues[fieldName] = new Tracker.Dependency();
- }
-
- template.formValues[fieldName].isMarkedChanged = true;
- template.formValues[fieldName].changed()
-
- dotPos = fieldName.lastIndexOf('.');
- }
}
const doMarkChanged = (template, fieldName, fieldValue) => {
@@ -189,13 +181,10 @@ const doMarkChanged = (template, fieldName, fieldValue) => {
template.view._domrange &&
!template.view.isDestroyed &&
template.formValues[fieldName]) {
-
template.formValues[fieldName].isMarkedChanged = true;
template.formValues[fieldName].changed()
-
- markChangedAncestors(template, fieldName)
-
}
+ markChangedAncestors(template, fieldName);
}
const markChanged = markChangedThrottle(function (template, fieldName, fieldValue) {
| 7 |
diff --git a/src/public/disease/sections/RelatedDiseases/Section.js b/src/public/disease/sections/RelatedDiseases/Section.js @@ -4,6 +4,14 @@ import { Link, significantFigures } from 'ot-ui';
import Table from '../../../common/Table/Table';
import LinearVenn, { LinearVennLegend } from '../../../common/LinearVenn';
+const aLabel = String.fromCodePoint('9398');
+const bLabel = String.fromCodePoint('9399');
+const difference = String.fromCodePoint('8726');
+const intersection = String.fromCodePoint('8898');
+const countANotBLabel = ['|', aLabel, difference, bLabel, '|'].join(' ');
+const countBNotALabel = ['|', bLabel, difference, aLabel, '|'].join(' ');
+const countAAndBLabel = ['|', aLabel, intersection, bLabel, '|'].join(' ');
+
const columns = (name, maxCountAOrB) => [
{
id: 'B.name',
@@ -19,20 +27,20 @@ const columns = (name, maxCountAOrB) => [
},
{
id: 'countANotB',
- label: `${String.fromCodePoint('9398')} - ${String.fromCodePoint('9399')}`,
+ label: countANotBLabel,
tooltip: `Diseases associated with ${name} but not the related disease`,
numeric: true,
hidden: ['mdDown'],
},
{
id: 'countAAndB',
- label: `${String.fromCodePoint('9398')} + ${String.fromCodePoint('9399')}`,
+ label: countAAndBLabel,
tooltip: 'Shared disease associations',
numeric: true,
},
{
id: 'countBNotA',
- label: `${String.fromCodePoint('9399')} - ${String.fromCodePoint('9398')}`,
+ label: countBNotALabel,
tooltip: `Diseases associated with the related disease but not ${name}`,
numeric: true,
hidden: ['mdDown'],
@@ -41,11 +49,9 @@ const columns = (name, maxCountAOrB) => [
id: 'chart',
label: (
<LinearVennLegend
- a={`${String.fromCodePoint('9398')} - ${String.fromCodePoint('9399')}`}
- aAndB={`${String.fromCodePoint('9398')} + ${String.fromCodePoint(
- '9399'
- )}`}
- b={`${String.fromCodePoint('9399')} - ${String.fromCodePoint('9398')}`}
+ a={countANotBLabel}
+ aAndB={countAAndBLabel}
+ b={countBNotALabel}
/>
),
tooltip: (
| 7 |
diff --git a/app/components/toolpallete.element.js b/app/components/toolpallete.element.js @@ -84,11 +84,11 @@ export default class ToolPallete extends HTMLElement {
${list}
<li aria-label="${value.label} Tool (${key})" aria-description="${value.description}" data-tool="${value.tool}" data-active="${key == 'g'}">${value.icon}</li>
`,'')}
- <li style="display: none;" class="color" id="foreground" aria-label="Text" aria-description="Change the text color">
+ <li style="display: none;" class="color" id="foreground" aria-label="Text or Stroke" aria-description="Change the text color or stroke of svg">
<input type="color" value="">
${Icons.color_text}
</li>
- <li style="display: none;" class="color" id="background" aria-label="Background" aria-description="Change the background color">
+ <li style="display: none;" class="color" id="background" aria-label="Background or Fill" aria-description="Change the background color or fill of svg">
<input type="color" value="">
${Icons.color_background}
</li>
| 7 |
diff --git a/src/PDF.js b/src/PDF.js @@ -111,6 +111,8 @@ export default class PDF extends Webform {
this.appendChild(this.refs.iframeContainer, this.iframeElement);
// Post the form to the iframe
+ this.form.base = Formio.getBaseUrl();
+ this.form.projectUrl = Formio.getProjectUrl();
this.postMessage({ name: 'form', data: this.form });
// Hide the submit button if the associated component is hidden
| 12 |
diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/filedropper/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/filedropper/template.vue @@ -35,6 +35,7 @@ export default {
components: {
Icon
},
+ emits: ['upload-done'],
props: {
dropContext: {
default() {
@@ -59,13 +60,6 @@ export default {
dragging: false
}
},
- watch: {
- progress(val) {
- if (val === 100) {
- this.onUploadDone()
- }
- }
- },
mounted() {
this.$nextTick(() => { //ensure that this.dropContext element is present
this.dropContext.addEventListener('dragenter', this.onDropContextDragEnter)
@@ -91,10 +85,11 @@ export default {
cb: this.setProgress
}).then((data) => {
$perAdminApp.getApi().populateNodesForBrowser(this.path, 'pathBrowser')
- })
for (let i = 0; i < files.length; i++) {
this.files.uploaded.push(files[i])
}
+ this.$emit('upload-done', this.files.uploaded)
+ })
},
setProgress(percentCompleted) {
this.progress = percentCompleted
| 7 |
diff --git a/data.js b/data.js @@ -1685,7 +1685,14 @@ module.exports = [{
tags: ["date", "calendar", "picker", "datepicker"],
description: "Small, zero-dependency date picker (~1500 bytes min+zipped)",
url: "https://github.com/chrisdavies/tiny-date-picker",
- source: "https://raw.githubusercontent.com/chrisdavies/tiny-date-picker/master/tiny-date-picker.js"
+ source: "https://raw.githubusercontent.com/chrisdavies/tiny-date-picker/master/dist/tiny-date-picker.js"
+ },
+ {
+ name: "vanilla-picker-mini",
+ tags: ["ux", "ui", "color", "colour", "picker", "color picker", "color-picker", "colorpicker", "rgb", "rgba", "hsl", "hsla", "hex", "alpha"],
+ description: "A simple, easy to use color picker with alpha selection.",
+ url: "https://github.com/Sphinxxxx/vanilla-picker-mini",
+ source: "https://raw.githubusercontent.com/Sphinxxxx/vanilla-picker-mini/master/dist/vanilla-picker-mini.js"
},
{
name: "Backbone",
| 0 |
diff --git a/includes/Modules/Thank_With_Google.php b/includes/Modules/Thank_With_Google.php @@ -134,18 +134,6 @@ final class Thank_With_Google extends Module
}
);
- add_filter(
- 'googlesitekit_apifetch_preload_paths',
- function ( $paths ) {
- return array_merge(
- $paths,
- array(
- '/' . REST_Routes::REST_ROOT . '/modules/thank-with-google/data/supporter-wall-prompt',
- )
- );
- }
- );
-
if ( ! $this->is_connected() ) {
return;
}
@@ -171,6 +159,18 @@ final class Thank_With_Google extends Module
}
);
+ add_filter(
+ 'googlesitekit_apifetch_preload_paths',
+ function ( $paths ) {
+ return array_merge(
+ $paths,
+ array(
+ '/' . REST_Routes::REST_ROOT . '/modules/thank-with-google/data/supporter-wall-prompt',
+ )
+ );
+ }
+ );
+
add_filter(
'rest_pre_dispatch',
function( $result, $server, $request ) {
| 5 |
diff --git a/Specs/Core/EllipsoidOutlineGeometrySpec.js b/Specs/Core/EllipsoidOutlineGeometrySpec.js @@ -38,6 +38,14 @@ defineSuite([
}).toThrowDeveloperError();
});
+ it('constructor throws if offset attribute is equal to GeometryOffsetAttribute.TOP', function () {
+ expect(function() {
+ return new EllipsoidOutlineGeometry({
+ offsetAttribute: GeometryOffsetAttribute.TOP
+ });
+ }).toThrowDeveloperError();
+ });
+
it('constructor rounds floating-point slicePartitions', function() {
var m = new EllipsoidOutlineGeometry({
slicePartitions: 3.5,
@@ -112,6 +120,19 @@ defineSuite([
expect(offset).toEqual(expected);
});
+ it('computes partitions to default to 2 if less than 2', function() {
+ var geometry = new EllipsoidOutlineGeometry({
+ radii: new Cartesian3(0.5, 0.5, 0.5),
+ });
+
+ geometry._slicePartitions = 0;
+ geometry._stackPartitions = 0;
+
+ var m = EllipsoidOutlineGeometry.createGeometry(geometry);
+
+ expect(m.indices.length).toEqual(1016);
+ });
+
it('undefined is returned if the x, y, or z radii are equal or less than zero', function() {
var ellipsoidOutline0 = new EllipsoidOutlineGeometry({
radii : new Cartesian3(0.0, 500000.0, 500000.0)
| 3 |
diff --git a/source/datastore/store/Store.js b/source/datastore/store/Store.js @@ -1251,6 +1251,9 @@ const Store = Class({
return this;
}
+ if ( !accountId ) {
+ accountId = this._defaultAccountId;
+ }
const account = this.getAccount( accountId );
const typeId = guid( Type );
const typeToStatus = account.status;
| 11 |
diff --git a/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts b/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts @@ -949,12 +949,14 @@ async function convertStateToDatasetRecord(
}));
}
+ const authPolicy = authnReadPolicyId
+ ? authnReadPolicyId
+ : DEFAULT_POLICY_ID;
+
const inputDataset = {
id: datasetId,
name: dataset.title,
- authnReadPolicyId: authnReadPolicyId
- ? authnReadPolicyId
- : DEFAULT_POLICY_ID,
+ authnReadPolicyId: authPolicy,
aspects: {
publishing: getPublishingAspectData(state),
"dcat-dataset-strings": buildDcatDatasetStrings(dataset),
@@ -1010,9 +1012,15 @@ async function convertStateToDatasetRecord(
return inputDataset;
}
-async function convertStateToDistributionRecords(state: State) {
+async function convertStateToDistributionRecords(
+ state: State,
+ authnReadPolicyId?: string
+) {
const { dataset, distributions, licenseLevel } = state;
+ const authPolicy = authnReadPolicyId
+ ? authnReadPolicyId
+ : DEFAULT_POLICY_ID;
const distributionRecords = distributions.map((distribution) => {
const aspect =
licenseLevel === "dataset"
@@ -1027,7 +1035,8 @@ async function convertStateToDistributionRecords(state: State) {
name: distribution.title,
aspects: {
"dcat-distribution-strings": aspect
- }
+ },
+ authnReadPolicyId: authPolicy
};
});
@@ -1048,7 +1057,10 @@ export async function createDatasetFromState(
state.ckanExport[config.defaultCkanServer].exportRequired = false;
}
- const distributionRecords = await convertStateToDistributionRecords(state);
+ const distributionRecords = await convertStateToDistributionRecords(
+ state,
+ authnReadPolicyId
+ );
const datasetRecord = await convertStateToDatasetRecord(
datasetId,
distributionRecords,
@@ -1074,7 +1086,10 @@ export async function updateDatasetFromState(
state.ckanExport[config.defaultCkanServer].exportRequired = true;
- const distributionRecords = await convertStateToDistributionRecords(state);
+ const distributionRecords = await convertStateToDistributionRecords(
+ state,
+ authnReadPolicyId
+ );
const datasetRecord = await convertStateToDatasetRecord(
datasetId,
distributionRecords,
| 12 |
diff --git a/token-metadata/0x7D2D3688Df45Ce7C552E19c27e007673da9204B8/metadata.json b/token-metadata/0x7D2D3688Df45Ce7C552E19c27e007673da9204B8/metadata.json "symbol": "ALEND",
"address": "0x7D2D3688Df45Ce7C552E19c27e007673da9204B8",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/execute_awsbinary.go b/execute_awsbinary.go @@ -112,8 +112,6 @@ func tappedHandler(handlerSymbol interface{},
ctx = context.WithValue(ctx, ContextKeyRequestLogger, logrusEntry)
ctx = applyInterceptors(ctx, msg, interceptors.AfterSetup)
- ctx = applyInterceptors(ctx, msg, interceptors.BeforeDispatch)
-
// construct arguments
var args []reflect.Value
if takesContext {
@@ -129,6 +127,7 @@ func tappedHandler(handlerSymbol interface{},
}
args = append(args, event.Elem())
}
+ ctx = applyInterceptors(ctx, msg, interceptors.BeforeDispatch)
response := handler.Call(args)
ctx = applyInterceptors(ctx, msg, interceptors.AfterDispatch)
| 5 |
diff --git a/README.md b/README.md [](https://david-dm.org/bustlelabs/mobiledoc-kit/master)
[](https://david-dm.org/bustlelabs/mobiledoc-kit/master#info=devDependencies)
-
-
-[](https://gitter.im/bustlelabs/mobiledoc-kit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
Mobiledoc Kit (warning: beta) is a library for building WYSIWYG editors
supporting rich content via cards.
| 1 |
diff --git a/index.js b/index.js @@ -221,6 +221,4 @@ program.parse(process.argv);
if (!program.args.length) {
program.help();
-} else {
- console.error('Error: Unknown command "%s". Use "sfcc-ci --help".', program.args[0]);
}
\ No newline at end of file
| 13 |
diff --git a/packages/nova-routing/lib/server/router.jsx b/packages/nova-routing/lib/server/router.jsx @@ -68,6 +68,7 @@ function generateSSRData(options, req, res, renderProps) {
css = req.css;
} catch (err) {
+ console.log(err) // eslint-disable-line no-console
console.error(new Date(), 'error while server-rendering', err.stack); // eslint-disable-line no-console
}
| 7 |
diff --git a/packages/spark-core/settings/_settings.scss b/packages/spark-core/settings/_settings.scss @@ -283,7 +283,6 @@ $btn-padding: $space-inset-short-l !default;
$btn-text-color: $white !default;
$btn-breakpoint-xs: 30rem !default;
$btn-breakpoint-s: 42.5rem !default;
-$btn-breakpoint: 30rem !default;
$btn-transition-speed: 0.3s !default;
// Disabled
$btn-disabled-opacity: 1 !default;
| 1 |
diff --git a/packages/cx/src/widgets/form/LookupField.scss b/packages/cx/src/widgets/form/LookupField.scss );
height: 100%;
- display: flex;
- flex-wrap: wrap;
- align-items: center;
+ display: block;
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
.#{$state}multiple > & {
padding: 0 cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-input-tag-spacing)
$cx-default-input-tag-spacing 0;
+ align-items: center;
+ flex-wrap: wrap;
+ display: flex;
}
.#{$state}icon > & {
| 0 |
diff --git a/rig-aux.js b/rig-aux.js @@ -57,6 +57,10 @@ class RigAux {
// hacks
{
root.position.y = 0;
+ localEuler.setFromQuaternion(root.quaternion, 'YXZ');
+ localEuler.x = 0;
+ localEuler.z = 0;
+ root.quaternion.setFromEuler(localEuler);
}
const mixer = new THREE.AnimationMixer(root);
| 0 |
diff --git a/modules/@apostrophecms/page/views/notFound.html b/modules/@apostrophecms/page/views/notFound.html <p class="apos-not-found__error-code">{{ __t('apostrophe:notFoundPageStatusCode') }}</p>
<h1 class="apos-not-found__message">
{{ __t('apostrophe:notFoundPageMessage') }}
- <a class="apos-not-found__home-link" href="/">{{ at('backToHome') }}</a>
+ <a class="apos-not-found__home-link" href="/">{{ __t('apostrophe:backToHome') }}</a>
</h1>
</div>
</div>
| 4 |
diff --git a/src/web/store/index.js b/src/web/store/index.js import isElectron from 'is-electron';
import path from 'path';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
+import difference from 'lodash/difference';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import merge from 'lodash/merge';
+import uniq from 'lodash/uniq';
import semver from 'semver';
import settings from '../config/settings';
import ImmutableStore from '../lib/immutable-store';
+import ensureArray from '../lib/ensure-array';
import log from '../lib/log';
let userData = null;
@@ -13,7 +19,7 @@ if (isElectron()) {
const electron = window.require('electron');
const app = electron.remote.app;
userData = {
- path: path.join(app.getPath('userData'), 'cnc.json')
+ path: path.resolve(app.getPath('userData'), 'cnc.json')
};
}
@@ -198,38 +204,34 @@ export const defaultState = {
const normalizeState = (state) => {
// Keep default widgets unchanged
- const defaultList = _.get(defaultState, 'workspace.container.default.widgets');
- _.set(state, 'workspace.container.default.widgets', defaultList);
+ const defaultList = get(defaultState, 'workspace.container.default.widgets');
+ set(state, 'workspace.container.default.widgets', defaultList);
// Update primary widgets
- let primaryList = _.get(cnc.state, 'workspace.container.primary.widgets');
+ let primaryList = get(cnc.state, 'workspace.container.primary.widgets');
if (primaryList) {
- _.set(state, 'workspace.container.primary.widgets', primaryList);
+ set(state, 'workspace.container.primary.widgets', primaryList);
} else {
- primaryList = _.get(state, 'workspace.container.primary.widgets');
+ primaryList = get(state, 'workspace.container.primary.widgets');
}
// Update secondary widgets
- let secondaryList = _.get(cnc.state, 'workspace.container.secondary.widgets');
+ let secondaryList = get(cnc.state, 'workspace.container.secondary.widgets');
if (secondaryList) {
- _.set(state, 'workspace.container.secondary.widgets', secondaryList);
+ set(state, 'workspace.container.secondary.widgets', secondaryList);
} else {
- secondaryList = _.get(state, 'workspace.container.secondary.widgets');
+ secondaryList = get(state, 'workspace.container.secondary.widgets');
}
- primaryList = _(primaryList) // Keep the order of primaryList
- .uniq()
- .difference(defaultList) // exclude defaultList
- .value();
+ primaryList = uniq(ensureArray(primaryList)); // Use the same order in primaryList
+ primaryList = difference(primaryList, defaultList); // Exclude defaultList
- secondaryList = _(secondaryList) // Keep the order of secondaryList
- .uniq()
- .difference(primaryList) // exclude primaryList
- .difference(defaultList) // exclude defaultList
- .value();
+ secondaryList = uniq(ensureArray(secondaryList)); // Use the same order in secondaryList
+ secondaryList = difference(secondaryList, primaryList); // Exclude primaryList
+ secondaryList = difference(secondaryList, defaultList); // Exclude defaultList
- _.set(state, 'workspace.container.primary.widgets', primaryList);
- _.set(state, 'workspace.container.secondary.widgets', secondaryList);
+ set(state, 'workspace.container.primary.widgets', primaryList);
+ set(state, 'workspace.container.secondary.widgets', secondaryList);
return state;
};
@@ -246,10 +248,12 @@ const getUserConfig = () => {
if (userData) {
const fs = window.require('fs'); // Use window.require to require fs module in Electron
if (fs.existsSync(userData.path)) {
- data = JSON.parse(fs.readFileSync(userData.path, 'utf8') || '{}');
+ const content = fs.readFileSync(userData.path, 'utf8') || '{}';
+ data = JSON.parse(content);
}
} else {
- data = JSON.parse(localStorage.getItem('cnc') || '{}');
+ const content = localStorage.getItem('cnc') || '{}';
+ data = JSON.parse(content);
}
if (typeof data === 'object') {
@@ -264,10 +268,11 @@ const getUserConfig = () => {
};
const cnc = getUserConfig() || {};
-const state = normalizeState(_.merge({}, defaultState, cnc.state || {}));
+const state = normalizeState(merge({}, defaultState, cnc.state || {}));
const store = new ImmutableStore(state);
-store.on('change', (state) => {
+// Debouncing enforces that a function not be called again until a certain amount of time (e.g. 100ms) has passed without it being called.
+store.on('change', debounce((state) => {
try {
const value = JSON.stringify({
version: settings.version,
@@ -276,18 +281,14 @@ store.on('change', (state) => {
if (userData) {
const fs = window.require('fs'); // Use window.require to require fs module in Electron
- fs.writeFile(userData.path, value, (err) => {
- if (err) {
- throw err;
- }
- });
+ fs.writeFileSync(userData.path, value);
}
localStorage.setItem('cnc', value);
} catch (e) {
log.error(e);
}
-});
+}, 100));
//
// Migration
| 4 |
diff --git a/api/buildout.cfg b/api/buildout.cfg @@ -25,7 +25,7 @@ zcml-additional =
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:plone="http://namespaces.plone.org/plone">
<plone:CORSPolicy
- allow_origin="http://localhost:4300,http://127.0.0.1:4300"
+ allow_origin="http://localhost:3000,http://127.0.0.1:3000"
allow_methods="DELETE,GET,OPTIONS,PATCH,POST,PUT"
allow_credentials="true"
expose_headers="Content-Length,X-My-Header"
@@ -53,7 +53,7 @@ zcml-additional =
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:plone="http://namespaces.plone.org/plone">
<plone:CORSPolicy
- allow_origin="http://localhost:4300,http://127.0.0.1:4300"
+ allow_origin="http://localhost:3000,http://127.0.0.1:3000"
allow_methods="DELETE,GET,OPTIONS,PATCH,POST,PUT"
allow_credentials="true"
expose_headers="Content-Length,X-My-Header"
| 12 |
diff --git a/lib/assets/test/spec/new-dashboard/unit/specs/components/DatasetCard.spec.js b/lib/assets/test/spec/new-dashboard/unit/specs/components/DatasetCard.spec.js @@ -11,7 +11,7 @@ import UserModel from 'dashboard/data/user-model';
const localVue = createLocalVue();
localVue.use(Vuex);
-let $cartoModels, actions, store;
+let $cartoModels;
const $t = key => key;
function configCartoModels (attributes = {}) {
@@ -23,15 +23,6 @@ function configCartoModels (attributes = {}) {
describe('DatasetCard.vue', () => {
beforeEach(() => {
$cartoModels = configCartoModels();
-
- // actions = {
- // 'maps/deleteLikeMap': jest.fn(),
- // 'maps/likeMap': jest.fn()
- // };
-
- // store = new Vuex.Store({
- // actions
- // });
});
it('should render correct contents', () => {
| 2 |
diff --git a/resources/quiz_data/numbers.json b/resources/quiz_data/numbers.json "scoreAnswerStrategy": "ONE_ANSWER_ONE_POINT",
"additionalAnswerWaitStrategy": "JAPANESE_SETTINGS",
"discordIntermediateAnswerListElementStrategy": "CORRECT_ANSWERS",
- "answerCompareStrategy": "STRICT",
+ "answerCompareStrategy": "CONVERT_KANA",
"commentFieldName": "Comment",
"cards": [
{
| 4 |
diff --git a/src/assets/drizzle/styles/components/_navigation.scss b/src/assets/drizzle/styles/components/_navigation.scss overflow: auto;
padding-top: 1rem;
position: fixed;
+ z-index: 4;
}
.#{$app-namespace}-c-Navigation__menu {
| 3 |
diff --git a/app/views/users/logix/favourites.html.erb b/app/views/users/logix/favourites.html.erb <a href="<%= create_fork_project_path(project) %>" class="btn btn-about" target="_blank">Fork</a>
<% end %>
<a href="#" id="<%= project.id %>" class="previewButton btn btn-about" data-toggle="modal" data-target="#myModal">View</a>
- <a href="<%= user_project_path(@user,project) %>" class="btn btn-about" target="_blank">More</a>
+ <a href="<%= user_project_path(project.author, project) %>" class="btn btn-about" target="_blank">More</a>
</div>
</div>
</div>
| 1 |
diff --git a/templates/inventory-sheet.html b/templates/inventory-sheet.html {{#if (isUserCreated this)}}
<i class="far fa-bookmark" style="float: right; color: steelblue; font-weight: 900; padding-top: 3px;"></i>
{{/if}}
+ {{#if (ignoreImportQty this)}}
+ <i class="fas fa-file" style="float: right; color: steelblue; font-weight: 900; padding-top: 3px;"></i>
+ {{/if}}
{{#if (isFoundryItem this)}}
- <i class="far fas fa-star" style="float: right; color: olivedrab; font-weight: 900; padding-top: 3px;"></i>
+ <i class="fas fa-star" style="float: right; color: olivedrab; font-weight: 900; padding-top: 3px;"></i>
{{/if}}
+ {{#if (displayItemHover this)}}<div class="tooltippic"><img src="{{this.img}}"/></div>{{/if}}
<div class="list_note satisfiedY eqtdraggable" data-key="data.equipment.carried.{{@key}}">
{{{gurpslink this.notes}}}
</div>
{{#if (notEmpty this.collapsed)}}<i class='fas fa-caret-right expandcollapseicon'></i>{{/if}}
{{{gurpslink this.name}}}{{#if (isUserCreated this)}} <i class="far fa-bookmark"
style="float: right; color: steelblue; font-weight: 900; padding-top: 3px;"></i>{{/if}}
- {{#if (isFoundryItem this)}} <i class="far fas fa-star"
+ {{#if (ignoreImportQty this)}}
+ <i class="far fa-file" style="float: right; color: steelblue; font-weight: 900; padding-top: 3px;"></i>
+ {{/if}}
+ {{#if (isFoundryItem this)}} <i class="fas fa-star"
style="float: right; color: olivedrab; font-weight: 900; padding-top: 3px;"></i>{{/if}}
<div class="list_note satisfiedY eqtdraggable" data-key="data.equipment.other.{{@key}}">
- {{{gurpslink this.notes}}}</div>
+ {{{gurpslink this.notes}}}
+ </div>
</div>
<div class="uses satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">{{#if (or (ne this.maxuses "0")
(ne this.uses "0"))}}{{this.uses}}{{/if}}</div>
<div class="cost satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">{{this.cost}}</div>
- <div class="weight satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">{{this.weight}} lb</div>
- <div class="sum_cost satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">{{round this.costsum}}
+ <div class="weight satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">{{this.weight}} lb
+ </div>
+ <div class="sum_cost satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">
+ {{round this.costsum}}
</div>
<div class="sum_weight satisfiedY equipmenuother" data-key="data.equipment.other.{{@key}}">
{{round this.weightsum}}
<div id="footer">{{localize "GURPS.copyrightGCS"}}
<a href="https://gurpscharactersheet.com">gurpscharactersheet.com</a>
</div>
- {{#if navigateVisible}}
- <div class='navigate-bar'>
- <div class='navigation-link' data-value="personal">TOP</div>
- <div class='navigation-link' data-value="stats">STATS</div>
- <div class='navigation-link' data-value="melee">MELEE</div>
- <div class='navigation-link' data-value="ranged">RANGED</div>
- <div class='navigation-link' data-value="advantages">ADVANTAGES</div>
- <div class='navigation-link' data-value="skills">SKILLS</div>
- <div class='navigation-link' data-value="equipment">EQUIPMENT</div>
- <div class='navigation-link' data-value="other_equipment">OTHER</div>
- <div class='navigation-link' data-value="notes">NOTES</div>
- <div class='navigation-link' data-value="CLOSE"><i class="fas fa-times"></i></div>
- </div>
- {{/if}}
</form>
\ No newline at end of file
| 3 |
diff --git a/bake.html b/bake.html document.body.appendChild(renderer.domElement);
+ window.addEventListener('resize', e => {
+ renderer.setSize(window.innerWidth, window.innerHeight);
+ renderer.clear();
+ app.render();
+ });
+
const oldGeometries = Object.keys(oldGeometryMap).map(k => oldGeometryMap[k]);
const oldMaterials = Object.keys(oldMaterialMap).map(k => oldMaterialMap[k]);
const geometries = Object.keys(geometryMap).map(k => geometryMap[k]);
| 0 |
diff --git a/articles/tokens/refresh-token/current/index.md b/articles/tokens/refresh-token/current/index.md @@ -69,6 +69,8 @@ The response should contain an access token and a refresh token.
}
```
+If you are requesting a `refresh_token` for a mobile app using the corresponding Native Client (which is public) then you don't need to send the `client_secret` in the request since it's only needed for confidential clients (which are those that have a Token Endpoint Authentication Method different than `None`).
+
::: warning
Refresh tokens must be stored securely by an application since they allow a user to remain authenticated essentially forever.
:::
@@ -106,7 +108,7 @@ To refresh your token, using the `refresh_token` you already got during authoriz
Where:
- `grant_type`: The type of grant to execute (the `/token` endpoint is used for various grants, for more information refer to the [Authentication API](/api/authentication#get-token)). To refresh a token use `refresh_token`.
- `client_id`: Your application's Client ID.
-- `client_secret`: Your application's Client Secret.
+- `client_secret` (optional): Your application's Client Secret. Only required for confidential clients
- `refresh_token`: The refresh token to use.
The response will include a new `access_token`, its type, its lifetime (in seconds), and the granted scopes. If the scope of the initial token included `openid`, then a new `id_token` will be in the response as well.
| 0 |
diff --git a/src/profile-image/index.js b/src/profile-image/index.js @@ -125,7 +125,16 @@ class ProfileImage extends Tonic { /* global Tonic */
if (e.data) return
e.stopPropagation()
+ const {
+ size,
+ type,
+ path,
+ lastModifiedDate
+ } = data
+
this.getPictureData(data, (err, data) => {
+ if (!this.root) return
+
if (err) {
const event = new window.Event('error')
event.message = err.message
@@ -133,13 +142,19 @@ class ProfileImage extends Tonic { /* global Tonic */
return
}
- const slot = this.root.querySelector('.tonic--image')
+ const slot = this.root && this.root.querySelector('.tonic--image')
- this.setState(state => Object.assign({}, state, { data }))
+ this.setState(state => Object.assign({}, state, {
+ size,
+ path,
+ mime: type,
+ mtime: lastModifiedDate,
+ data
+ }))
slot.style.backgroundImage = 'url("' + data + '")'
const event = new window.Event('change', { bubbles: true })
- event.data = data
+ event.data = true // prevent recursion
this.root.dispatchEvent(event)
})
}
| 12 |
diff --git a/democracylab/emails.py b/democracylab/emails.py @@ -236,21 +236,20 @@ def notify_project_owners_volunteer_concluded_email(volunteer_relation, comments
def send_email(email_msg, email_acct=None):
if not settings.FAKE_EMAILS:
email_msg.connection = email_acct['connection'] if email_acct is not None else settings.EMAIL_SUPPORT_ACCT['connection']
- email_msg.send()
else:
test_email_subject = 'TEST EMAIL: ' + email_msg.subject
- test_email_body = 'Environment:{environment}\nTO: {to_line}\nREPLY-TO: {reply_to}\n---\n{body}'.format(
+ test_email_body = '<!--\n Environment:{environment}\nTO: {to_line}\nREPLY-TO: {reply_to}\n -->\n{body}'.format(
environment=settings.PROTOCOL_DOMAIN,
to_line=email_msg.to,
reply_to=email_msg.reply_to,
body=email_msg.body
)
- test_email_msg = EmailMessage(
- subject=test_email_subject,
- body=test_email_body,
- to=[settings.ADMIN_EMAIL]
- )
- test_email_msg.send()
+ email_msg.subject = test_email_subject
+ email_msg.body = test_email_body
+ email_msg.to = [settings.ADMIN_EMAIL]
+ if settings.EMAIL_SUPPORT_ACCT:
+ email_msg.connection = settings.EMAIL_SUPPORT_ACCT['connection']
+ email_msg.send()
def _get_co_owner_emails(project):
| 11 |
diff --git a/ui/scss/component/_markdown-preview.scss b/ui/scss/component/_markdown-preview.scss }
h1 {
- font-size: 2.2em;
+ font-size: 1.7em;
}
h2 {
- font-size: 1.6em;
+ font-size: 1.5em;
}
h3 {
- font-size: 1.3em;
+ font-size: 1.4em;
}
h4 {
- font-size: 1.2em;
+ font-size: 1.3em;
}
h5 {
- font-size: 1.1em;
+ font-size: 1.2em;
}
h6 {
font-size: 1em;
| 13 |
diff --git a/pages/articles.js b/pages/articles.js @@ -58,10 +58,10 @@ const LIST_STAT = gql`
`;
/**
- * @param {object} query
+ * @param {object} urlQuery - URL query object
* @returns {object} ListArticleFilter
*/
-function query2Filter({
+function urlQuery2Filter({
filter,
q,
replyRequestCount,
@@ -94,10 +94,10 @@ function query2Filter({
}
/**
- * @param {object} query
+ * @param {object} urlQuery - URL query object
* @returns {object[]} ListArticleOrderBy array
*/
-function query2OrderBy({ q, orderBy = 'createdAt' } = {}) {
+function urlQuery2OrderBy({ q, orderBy = 'createdAt' } = {}) {
// If there is query text, sort by _score first
if (q) {
@@ -108,10 +108,10 @@ function query2OrderBy({ q, orderBy = 'createdAt' } = {}) {
}
/**
- * @param {object} query
+ * @param {object} urlQuery
*/
-function goToQuery(query) {
- Router.push(`${location.pathname}${url.format({ query })}`);
+function goToUrlQuery(urlQuery) {
+ Router.push(`${location.pathname}${url.format({ query: urlQuery })}`);
}
function ArticleFilter({ filter = 'unsolved', onChange = () => {} }) {
@@ -135,8 +135,8 @@ function ArticleFilter({ filter = 'unsolved', onChange = () => {} }) {
function ArticleListPage({ query }) {
const listQueryVars = {
- filter: query2Filter(query),
- orderBy: query2OrderBy(query),
+ filter: urlQuery2Filter(query),
+ orderBy: urlQuery2OrderBy(query),
};
const {
@@ -165,7 +165,7 @@ function ArticleListPage({ query }) {
<main>
<ArticleFilter
filter={query.filter}
- onChange={newFilter => goToQuery({ ...query, filter: newFilter })}
+ onChange={newFilter => goToUrlQuery({ ...query, filter: newFilter })}
/>
<p>
{statsLoading
| 10 |
diff --git a/test/api/promise.spec.js b/test/api/promise.spec.js @@ -282,8 +282,6 @@ describe('expect.promise', () => {
.promise(function() {
expect(2, 'to equal', 2);
})
- // standard and prettier battle each other on this one
- // eslint-disable-next-line no-unexpected-multiline
[inspectMethodName](),
'to equal',
'Promise (fulfilled)'
@@ -296,8 +294,6 @@ describe('expect.promise', () => {
.promise(function() {
return 123;
})
- // standard and prettier battle each other on this one
- // eslint-disable-next-line no-unexpected-multiline
[inspectMethodName](),
'to equal',
'Promise (fulfilled) => 123'
| 2 |
diff --git a/src/public/client.js b/src/public/client.js import { WeakMap } from 'cross-domain-safe-weakmap/src';
import { ZalgoPromise } from 'zalgo-promise/src';
-import { getAncestor, isAncestor, isWindowClosed } from 'cross-domain-utils/src';
+import { getAncestor, isAncestor, isWindowClosed, getDomain } from 'cross-domain-utils/src';
import { CONFIG, CONSTANTS } from '../conf';
import { sendMessage, addResponseListener, deleteResponseListener, markResponseListenerErrored } from '../drivers';
@@ -180,10 +180,10 @@ export function request(options : RequestOptionsType) : ZalgoPromise<ResponseMes
cycleTime = Math.min(resTimeout, 2000);
} else if (ackTimeout <= 0) {
- return reject(new Error(`No ack for postMessage ${name} in ${CONFIG.ACK_TIMEOUT}ms`));
+ return reject(new Error(`No ack for postMessage ${name} in ${ getDomain() } in ${CONFIG.ACK_TIMEOUT}ms`));
} else if (resTimeout <= 0) {
- return reject(new Error(`No response for postMessage ${name} in ${options.timeout || CONFIG.RES_TIMEOUT}ms`));
+ return reject(new Error(`No response for postMessage ${name} in ${ getDomain() } in ${options.timeout || CONFIG.RES_TIMEOUT}ms`));
}
setTimeout(cycle, cycleTime);
| 7 |
diff --git a/frontend/src/config.js b/frontend/src/config.js @@ -13,12 +13,6 @@ export const STRINGS = {
FOOTER:
<div style={{ padding: 10 }}>
- <div style={{ marginBottom: 5 }}>
- <strong>dr4ft</strong> is a fork of
- the <code>drafts.ninja</code> arxanas fork of
- the <code>draft</code> project by aeosynth.
- </div>
- <div>
Contributions welcome!
<a href='https://github.com/dr4fters/dr4ft'>
<img
@@ -29,6 +23,5 @@ export const STRINGS = {
dr4fters/dr4ft
</a>
</div>
- </div>
}
};
| 5 |
diff --git a/web-stories.php b/web-stories.php * Plugin URI: https://wp.stories.google/
* Author: Google
* Author URI: https://opensource.google.com/
- * Version: 1.7.0-rc.1
+ * Version: 1.7.0-rc.2
* Requires at least: 5.3
* Requires PHP: 5.6
* Text Domain: web-stories
@@ -40,7 +40,7 @@ if ( ! defined( 'ABSPATH' ) ) {
exit;
}
-define( 'WEBSTORIES_VERSION', '1.7.0-rc.1' );
+define( 'WEBSTORIES_VERSION', '1.7.0-rc.2' );
define( 'WEBSTORIES_DB_VERSION', '3.0.8' );
define( 'WEBSTORIES_AMP_VERSION', '2.1.1' ); // Version of the AMP library included in the plugin.
define( 'WEBSTORIES_PLUGIN_FILE', __FILE__ );
| 6 |
diff --git a/app/hotels/src/filter/order/OrderPopup.js b/app/hotels/src/filter/order/OrderPopup.js @@ -69,7 +69,10 @@ export default class OrderPopup extends React.Component<Props, State> {
<React.Fragment key={option.key}>
{index !== 0 && (
<View style={styles.separator}>
- <SeparatorFullWidth color={defaultTokens.paletteInkLighter} />
+ <SeparatorFullWidth
+ color={defaultTokens.paletteInkLighter}
+ height={0.5}
+ />
</View>
)}
<OrderCheckbox
| 12 |
diff --git a/src/common/blockchain/interface-blockchain/blocks/Interface-Blockchain-Block.js b/src/common/blockchain/interface-blockchain/blocks/Interface-Blockchain-Block.js @@ -211,8 +211,8 @@ class InterfaceBlockchainBlock {
medianTimestamp = medianTimestamp / consts.BLOCKCHAIN.TIMESTAMP.VALIDATION_NO_BLOCKS;
if ( timestamp < medianTimestamp )
- throw {message: "Block Timestamp is not bigger than the previous 10 blocks", medianTimestamp: medianTimestamp };
//throw {message: "Block Timestamp is not bigger than the previous 10 blocks", medianTimestamp: medianTimestamp };
+ throw {message: "Block Timestamp is not bigger than the previous 10 blocks", medianTimestamp: this.blockValidation.getTimeStampCallback(this.height) };
}
| 13 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -15,6 +15,7 @@ import {teleportMeshes} from './teleport.js';
import {appManager, renderer, scene, orthographicScene, camera, dolly} from './app-object.js';
import buildTool from './build-tool.js';
import * as notifications from './notifications.js';
+import * as popovers from './popovers.js';
import {getExt, bindUploadFileButton} from './util.js';
import {storageHost} from './constants.js';
@@ -784,69 +785,25 @@ const _updateWeapons = timeDiff => {
crosshairEl.classList.toggle('visible', ['camera', 'firstperson', 'thirdperson'].includes(cameraManager.getTool()) && !appManager.grabbedObjects[0]);
- _updatePopover();
+ popovers.update();
};
-const popoverMesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(2, 2), new THREE.MeshBasicMaterial({
- color: 0x000000,
-}));
-popoverMesh.width = 600;
-popoverMesh.height = 200;
-popoverMesh.position.z = -1; // needed for othro camera
-popoverMesh.target = new THREE.Object3D();
-popoverMesh.target.position.set(0, 2.5, -2);
-popoverMesh.textMesh = (() => {
+const popoverWidth = 600;
+const popoverHeight = 200;
+const popoverTextMesh = (() => {
const textMesh = makeTextMesh('This is your mirror.\nTake a look at yourself!', undefined, 0.5, 'center', 'middle');
textMesh.position.z = 0.1;
- textMesh.scale.x = popoverMesh.height/popoverMesh.width;
+ textMesh.scale.x = popoverHeight / popoverWidth;
textMesh.color = 0xFFFFFF;
return textMesh;
})();
-popoverMesh.add(popoverMesh.textMesh);
-orthographicScene.add(popoverMesh);
-const context = renderer.getContext();
-function toScreenPosition(obj, camera, vector) {
- var widthHalf = 0.5*context.canvas.width;
- var heightHalf = 0.5*context.canvas.height;
-
- obj.updateMatrixWorld();
- vector.setFromMatrixPosition(obj.matrixWorld);
- vector.project(camera);
-
- vector.x = ( vector.x * widthHalf ) + widthHalf;
- vector.y = - ( vector.y * heightHalf ) + heightHalf;
-
- return vector;
-}
-const _updatePopover = () => {
- const n = localVector.set(0, 0, -1)
- .applyQuaternion(camera.quaternion)
- .dot(
- localVector2.copy(popoverMesh.target.position)
- .sub(camera.position)
- );
- toScreenPosition(popoverMesh.target, camera, localVector);
- popoverMesh.position.x = -1 + localVector.x/(window.innerWidth*window.devicePixelRatio)*2;
- popoverMesh.position.y = 1 - localVector.y/(window.innerHeight*window.devicePixelRatio)*2;
- const distance = popoverMesh.position.distanceTo(camera.position);
- const maxSoftDistance = 3;
- const maxHardDistance = 8;
- if (n > 0 && distance < maxHardDistance) {
- const halfWidthFactor = popoverMesh.width/(window.innerWidth*window.devicePixelRatio);
- const halfHeightFactor = popoverMesh.height/(window.innerHeight*window.devicePixelRatio);
- popoverMesh.scale.set(popoverMesh.width/(window.innerWidth*window.devicePixelRatio), popoverMesh.height/(window.innerHeight*window.devicePixelRatio), 1);
- if (distance > maxSoftDistance) {
- popoverMesh.scale.multiplyScalar(1 / (distance - maxSoftDistance + 1));
- }
- /* if (distance > maxDistance / 2) {
- popoverMesh.position.x = Math.min(Math.max(popoverMesh.position.x, -0.99 + halfWidthFactor), 0.99 - halfWidthFactor);
- popoverMesh.position.y = Math.min(Math.max(popoverMesh.position.y, -0.99 + halfHeightFactor), 0.99 - halfHeightFactor);
- } */
- popoverMesh.visible = true;
- } else {
- popoverMesh.visible = false;
- }
-};
+const popoverTarget = new THREE.Object3D();
+popoverTarget.position.set(0, 2.5, -2);
+const popoverMesh = popovers.addPopover(popoverTextMesh, {
+ width: popoverWidth,
+ height: popoverHeight,
+ target: popoverTarget,
+});
/* renderer.domElement.addEventListener('wheel', e => {
if (document.pointerLockElement) {
| 4 |
diff --git a/articles/quickstart/spa/_includes/_auth_service_method_description_auth0js.md b/articles/quickstart/spa/_includes/_auth_service_method_description_auth0js.md When you set up the `AuthService` service, you create an instance of the `auth0.WebAuth` object. In that instance, you can define the following:
<%= include('_auth_service_configure_client_details') %>
+::: note
+In this tutorial, the route is `/callback`, which is implemented in the [Add a Callback Component](#add-a-callback-component) step.
+:::
+
<%= include('_auth_service_hash_fragment_information') %>
<%= include('_auth_service_using_json_web_tokens') %>
| 5 |
diff --git a/Source/Renderer/ModernizeShader.js b/Source/Renderer/ModernizeShader.js @@ -174,7 +174,7 @@ define([
for (var care in variableMap) {
if (variableMap.hasOwnProperty(care)) {
var matchVar = new RegExp('(layout)[^]+(out)[^]+(' + care + ')[^]+', 'g');
- if (matchVar.exec(l) !== null) {
+ if (matchVar.test(l)) {
lineAdds[l] = care;
}
}
| 14 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -956,6 +956,21 @@ export default () => {
removeTrackedApp(app) {
return world.appManager.removeTrackedApp.apply(world.appManager, arguments);
},
+ getPlayerByAppInstanceId(instanceId) {
+ let result = localPlayer.appManager.getAppByInstanceId(instanceId);
+ if (result) {
+ return localPlayer;
+ } else {
+ const remotePlayers = useRemotePlayers();
+ for (const remotePlayer of remotePlayers) {
+ const remoteApp = remotePlayer.appManager.getAppByInstanceId(instanceId);
+ if (remoteApp) {
+ return remotePlayer;
+ }
+ }
+ return null;
+ }
+ },
getAppByInstanceId(instanceId) {
// local
const localPlayer = getLocalPlayer();
| 0 |
diff --git a/app/components/Features/ProxyTable/index.js b/app/components/Features/ProxyTable/index.js @@ -75,6 +75,7 @@ const ProxyTable = props => {
icon={AssignmentTurnedIn}
header="Registered Proxies"
subheader=" - Select one to vote for you!">
+ <h5>Click the account name to view more info at bloks.io. Select a proxy to make it your proxy!</h5>
<ReactTable
data={data}
filterable
@@ -84,6 +85,13 @@ const ProxyTable = props => {
Header: 'Account',
accessor: 'owner',
width: 150,
+ Cell: row => {
+ return (
+ <a href={`https://bloks.io/account/${row.value}#voter-info`} target="new" style={{color:'black'}}>
+ {row.value}
+ </a>
+ )
+ }
},
{
Header: 'Name',
| 0 |
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss @@ -29,8 +29,11 @@ $wallet-view-bg: $wild-sand;
.wallet-view {
flex: 33.5 0 33.5%;
background: $wallet-view-bg;
+
+ @media screen and (min-width: 576px) {
overflow-y: scroll;
}
+}
.wallet-view-title-wrapper {
height: 25px;
@@ -129,7 +132,6 @@ $wallet-view-bg: $wild-sand;
.main-container {
margin-top: 35px;
width: 100%;
- height: 100%;
}
button.btn-clear {
| 11 |
diff --git a/app/controllers/samples_controller.rb b/app/controllers/samples_controller.rb @@ -216,8 +216,8 @@ class SamplesController < ApplicationController
unless users.empty?
results["Uploader"] = {
"name" => "Uploader",
- "results" => users.index_by(&:name).map do |_, u|
- { "category" => "Uploader", "title" => u.name, "id" => u.id }
+ "results" => users.group_by(&:name).map do |val, records|
+ { "category" => "Uploader", "title" => val, "id" => records.pluck(:id) }
end
}
end
| 9 |
diff --git a/server/game/conflict.js b/server/game/conflict.js @@ -292,8 +292,6 @@ class Conflict {
return;
}
- this.game.reapplyStateDependentEffects();
-
this.attackerSkill = this.calculateSkillFor(this.attackers) + this.attackerSkillModifier;
this.defenderSkill = this.calculateSkillFor(this.defenders) + this.defenderSkillModifier;
| 2 |
diff --git a/public/index.html b/public/index.html <link rel="shortcut icon" href="__ROOT_PATH__/favicon.ico" >
<link rel="shortcut icon" href="/images/icon.png" >
<title>ungit</title>
+ <!-- these are broken even in google official datalab tutorial! -->
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css">
</head>
<body>
| 1 |
diff --git a/OurUmbraco/Community/Controllers/TwitterSearchController.cs b/OurUmbraco/Community/Controllers/TwitterSearchController.cs @@ -60,7 +60,8 @@ namespace OurUmbraco.Community.Controllers
x.CreatedBy.UserIdentifier.ScreenName.ToLowerInvariant().ContainsAny(usernameFilter) ==
false
&& x.UserMentions.Any(m => m.ScreenName.ContainsAny(usernameFilter)) == false
- && x.Text.ToLowerInvariant().ContainsAny(wordFilter) == false)
+ && x.Text.ToLowerInvariant().ContainsAny(wordFilter) == false
+ && x.Text.StartsWith("RT ") == false)
.Take(numberOfResults)
.ToArray();
}
| 2 |
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js @@ -99,7 +99,7 @@ function getOrderedReportIDs(reportIDFromRoute) {
// However, this code needs to be very performant to handle thousands of reports, so in the interest of speed, we're just going to disable this lint rule and add
// the reportDisplayName property to the report object directly.
// eslint-disable-next-line no-param-reassign
- report.reportDisplayName = ReportUtils.getReportName(report, policies);
+ report.displayName = ReportUtils.getReportName(report, policies);
});
// The LHN is split into five distinct groups, and each group is sorted a little differently. The groups will ALWAYS be in this order:
@@ -143,11 +143,11 @@ function getOrderedReportIDs(reportIDFromRoute) {
});
// Sort each group of reports accordingly
- pinnedReports = _.sortBy(pinnedReports, 'reportDisplayName');
+ pinnedReports = _.sortBy(pinnedReports, report => report.displayName.toLowerCase());
outstandingIOUReports = _.sortBy(outstandingIOUReports, 'iouReportAmount').reverse();
- draftReports = _.sortBy(draftReports, 'reportDisplayName');
- nonArchivedReports = _.sortBy(nonArchivedReports, isInDefaultMode ? 'lastMessageTimestamp' : 'reportDisplayName');
- archivedReports = _.sortBy(archivedReports, isInDefaultMode ? 'lastMessageTimestamp' : 'reportDisplayName');
+ draftReports = _.sortBy(draftReports, report => report.displayName.toLowerCase());
+ nonArchivedReports = _.sortBy(nonArchivedReports, report => (isInDefaultMode ? report.lastMessageTimestamp : report.displayName.toLowerCase()));
+ archivedReports = _.sortBy(archivedReports, report => (isInDefaultMode ? report.lastMessageTimestamp : report.displayName.toLowerCase()));
// For archived and non-archived reports, ensure that most recent reports are at the top by reversing the order of the arrays because underscore will only sort them in ascending order
if (isInDefaultMode) {
| 8 |
diff --git a/CHANGES.md b/CHANGES.md @@ -5,6 +5,7 @@ Change Log
##### Fixes :wrench:
* Fix Geocoder auto-complete suggestions when hosted inside Web Components. [#8425](https://github.com/AnalyticalGraphicsInc/cesium/pull/8425)
+* `TileMapServiceImageryProvider` will now reject the `readyPromise` if the `tilemapresource.xml` metadata request fails [#8448](https://github.com/AnalyticalGraphicsInc/cesium/pull/8448)
### 1.64.0 - 2019-12-02
| 3 |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
publish:
- needs: [version, draft]
+ needs: [version, notes]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
| 1 |
diff --git a/test/jasmine/tests/plotschema_test.js b/test/jasmine/tests/plotschema_test.js @@ -76,7 +76,7 @@ describe('plot schema', function() {
var valObject = valObjects[attr.valType],
opts = valObject.requiredOpts
.concat(valObject.otherOpts)
- .concat(['valType', 'description', 'role']);
+ .concat(['valType', 'description', 'role', 'recalc']);
Object.keys(attr).forEach(function(key) {
expect(opts.indexOf(key) !== -1).toBe(true, key, attr);
| 0 |
diff --git a/package.json b/package.json {
"name": "minimap",
"main": "./lib/main",
- "version": "4.29.3",
+ "version": "4.29.4",
"private": true,
"description": "A preview of the full source code.",
"author": "Fangdun Cai <[email protected]>",
| 6 |
diff --git a/game.js b/game.js @@ -1903,6 +1903,9 @@ const gameManager = {
const localPlayer = metaversefileApi.useLocalPlayer();
localPlayer.removeAction('activate');
},
+ setAvatarQuality(quality) {
+ localPlayer.avatar.setQuality(quality);
+ },
playerDiorama: null,
async bindPreviewCanvas(canvas) {
await rendererWaitForLoad();
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.