code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/packages/magda-web/src/UI/Star.js b/packages/magda-web/src/UI/Star.js @@ -22,7 +22,7 @@ class Star extends Component {
event.stopPropagation();
this.setState({
isActive: !this.state.isActive,
- showInfo: true
+ showInfo: !this.state.isActive
})
}
| 7 |
diff --git a/packages/fether-react/src/assets/sass/shared/_form.scss b/packages/fether-react/src/assets/sass/shared/_form.scss @@ -110,8 +110,6 @@ input.form_field_amount[type='number'] {
font-size: ms(6);
line-height: ms(6) * 1.1;
font-weight: 200;
- padding: 3rem 0;
- margin: 3rem 0;
text-align: center;
-webkit-appearance: none;
| 2 |
diff --git a/articles/api-auth/tutorials/authorization-code-grant.md b/articles/api-auth/tutorials/authorization-code-grant.md @@ -110,6 +110,11 @@ Once the `access_token` has been obtained it can be used to make calls to the AP
]
}
```
+## 4. Verify the Token
+
+Once your API receives a request with a Bearer `access_token`, the first thing to do is to validate the token. This consists of a series of steps, and if any of these fails then the request _must_ be rejected.
+
+For details on the validations that should be performed refer to [Verify Access Tokens](/api-auth/tutorials/verify-access-token).
## More reading
| 0 |
diff --git a/packages/app/test/cypress/integration/2-basic-features/access-to-page.spec.ts b/packages/app/test/cypress/integration/2-basic-features/access-to-page.spec.ts @@ -18,9 +18,11 @@ context('Access to page', () => {
it('/Sandbox with anchor hash is successfully loaded', () => {
cy.visit('/Sandbox#Headers');
- cy.screenshot(`${ssPrefix}-sandbox-headers`, {
- disableTimersAndAnimations: false,
- });
+
+ // wait until opacity is 1.
+ cy.getByTestid('grw-fab-create-page').should('have.css', 'opacity', '1')
+
+ cy.screenshot(`${ssPrefix}-sandbox-headers`);
});
it('/Sandbox/Math is successfully loaded', () => {
| 7 |
diff --git a/ext/abp-filter-parser-modified/abp-filter-parser.js b/ext/abp-filter-parser-modified/abp-filter-parser.js var separatorCharacters = ':?/=^'
+ var noSpecialCharactersRegex = /[a-zA-Z0-9]+/
+
/**
* Finds the first separator character in the input string
*/
if (!data) {
continue
}
+ if (data._d) {
+ substrings = substrings.concat(data._d)
+ }
for (var x = i + 1; x < string.length; x++) {
var char = string[x]
if (data[char]) {
*/
function parse (input, parserData) {
- var arrayFilterCategories = ['regex', 'leftAnchored', 'rightAnchored', 'bothAnchored', 'wildcard', 'indexOf']
+ var arrayFilterCategories = ['regex', 'leftAnchored', 'rightAnchored', 'bothAnchored', 'indexOf']
var objectFilterCategories = ['hostAnchored']
- var trieFilterCategories = ['plainString']
+ var trieFilterCategories = ['plainString', 'wildcard']
parserData.exceptionFilters = parserData.exceptionFilters || {}
object.hostAnchored[ending] = [parsedFilterData]
}
} else if (parsedFilterData.wildcardMatchParts) {
- object.wildcard.push(parsedFilterData)
+ var wildcardToken = noSpecialCharactersRegex.exec(parsedFilterData.wildcardMatchParts[0])
+ if (!wildcardToken || wildcardToken[0].length < 3) {
+ var wildcardToken2 = noSpecialCharactersRegex.exec(parsedFilterData.wildcardMatchParts[1])
+ if (wildcardToken2 && (!wildcardToken || wildcardToken2[0].length > wildcardToken[0].length)) {
+ wildcardToken = wildcardToken2
+ }
+ }
+ if (wildcardToken) {
+ object.wildcard.add(wildcardToken[0], parsedFilterData)
+ } else {
+ object.wildcard.add('', parsedFilterData)
+ }
} else if (parsedFilterData.data.indexOf('^') === -1) {
object.plainString.add(parsedFilterData.data, parsedFilterData.options)
} else {
}
}
- outer: for (i = 0, len = filters.wildcard.length; i < len; i++) {
- filter = filters.wildcard[i]
+ // check if the string matches a wildcard filter
+
+ var wildcardMatches = filters.wildcard.getSubstringsOf(input)
+
+ if (wildcardMatches.length !== 0) {
+ outer: for (i = 0, len = wildcardMatches.length; i < len; i++) {
+ filter = wildcardMatches[i]
// most filters won't match on the first part, so there is no point in entering the loop
if (indexOfFilter(input, filter.wildcardMatchParts[0], 0) === -1) {
if (matchOptions(filter.options, input, contextParams, currentHost)) {
// console.log(filter, 6)
- return true
+ }
}
}
| 4 |
diff --git a/token-metadata/0x11A2Ab94adE17e96197C78f9D5f057332a19a0b9/metadata.json b/token-metadata/0x11A2Ab94adE17e96197C78f9D5f057332a19a0b9/metadata.json "symbol": "ORBI",
"address": "0x11A2Ab94adE17e96197C78f9D5f057332a19a0b9",
"decimals": 9,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/application.js b/lib/application.js @@ -89,8 +89,8 @@ class Application extends events.EventEmitter {
async loadDomain(fileName) {
const rel = fileName.substring(this.domainPath.length + 1);
- const [name, ext] = rel.split('.');
- if (ext !== 'js' || name.startsWith('.')) return;
+ if (!rel.endsWith('.js')) return;
+ const name = path.basename(rel, '.js');
const script = await this.createScript(fileName);
if (!script) return;
const config = this.config.sections[name];
@@ -106,8 +106,10 @@ class Application extends events.EventEmitter {
async loadMethod(fileName) {
const rel = fileName.substring(this.apiPath.length + 1);
if (!rel.includes('/')) return;
- const [[iname, ver], [name, ext]] = rel.split('/').map(s => s.split('.'));
- if (ext !== 'js') return;
+ const [interfaceName, methodFile] = rel.split('/');
+ if (!methodFile.endsWith('.js')) return;
+ const name = path.basename(methodFile, '.js');
+ const [iname, ver] = interfaceName.split('.');
const version = parseInt(ver, 10);
const script = await this.createScript(fileName);
if (!script) return;
| 7 |
diff --git a/src/muncher/monster/legendary.js b/src/muncher/monster/legendary.js @@ -3,7 +3,7 @@ import { getRecharge, getActivation, getFeatSave, getDamage } from "./utils.js";
import { FEAT_TEMPLATE } from "./templates/feat.js";
function addPlayerDescription(monster, action) {
- let playerDescription = `</section>\nThe ${monster.name} performs a Legendary Action! Prepare for ${action.name}!`;
+ let playerDescription = `</section>\nThe ${monster.name} performs ${action.name}!`;
return playerDescription;
}
@@ -43,7 +43,10 @@ export function getLegendaryActions(monster, DDB_CONFIG, monsterActions) {
let feat = JSON.parse(JSON.stringify(FEAT_TEMPLATE));
feat.name = "Legendary Actions";
feat.data.source = getSource(monster, DDB_CONFIG);
- feat.data.description.value = dom.childNodes.textContent;
+ feat.data.description.value = "";
+ if (hideDescription) feat.data.description.value += "<section class=\"secret\">\n";
+ feat.data.description.value += monster.legendaryActionsDescription;
+ if (hideDescription) feat.data.description.value += "</section>\n Performing a Legendary Action.\n\n";
feat.flags.monsterMunch = {};
feat.flags.monsterMunch['actionCopy'] = false;
dynamicActions.push(feat);
@@ -88,8 +91,10 @@ export function getLegendaryActions(monster, DDB_CONFIG, monsterActions) {
}
const switchAction = dynamicActions.find((act) => node.textContent.startsWith(act.name));
+ if (action.name !== "Legendary Actions" || switchAction) {
+
if (switchAction) {
- if (action.data.description.value !== "" && hideDescription) {
+ if (action.data.description.value !== "" && hideDescription && action.name !== "Legendary Actions") {
action.data.description.value += addPlayerDescription(monster, action);
}
action = switchAction;
@@ -120,9 +125,10 @@ export function getLegendaryActions(monster, DDB_CONFIG, monsterActions) {
}
action.data.damage = getDamage(node.textContent);
}
+ }
});
- if (action && action.data.description.value !== "" && hideDescription) {
+ if (action && action.data.description.value !== "" && hideDescription && action.name !== "Legendary Actions") {
action.data.description.value += addPlayerDescription(monster, action);
}
| 7 |
diff --git a/package.json b/package.json "fs": "0.0.1-security",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.2",
- "neon-js": "git+https://github.com/hbibkrim/neon-js.git#update-api",
+ "neon-js": "git+https://github.com/CityOfZion/neon-js.git",
"qrcode": "^0.8.2",
"react": "^15.0.2",
"react-ace": "^5.0.1",
| 3 |
diff --git a/package.json b/package.json "eslint-plugin-react": "^7.1.0",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^0.11.2",
- "fileicon": "^0.1.8",
"filesize": "^3.5.5",
"find-cache-dir": "^1.0.0",
"flow-bin": "^0.52.0",
| 2 |
diff --git a/test/endtoend/create-react-app/src/App.js b/test/endtoend/create-react-app/src/App.js @@ -4,6 +4,7 @@ import Tus from '@uppy/tus'
import GoogleDrive from '@uppy/google-drive'
import { Dashboard, DashboardModal } from '@uppy/react'
// import { Dashboard, DashboardModal, DragDrop, ProgressBar } from '@uppy/react'
+import '@uppy/core/dist/style.css'
import '@uppy/dashboard/dist/style.css'
// import '@uppy/drag-drop/dist/style.css'
// import '@uppy/progress-bar/dist/style.css'
| 0 |
diff --git a/src/neat.js b/src/neat.js @@ -48,8 +48,8 @@ var config = require('./config');
*/
let Neat = function (dataset, {
generation = 0, // internal variable
- input = 0,
- output = 0,
+ input = 1,
+ output = 1,
equal = true,
clean = false,
popsize = 50,
| 12 |
diff --git a/components/component-docs.json b/components/component-docs.json "required": false,
"description": "A footer is an optional. Buttons are often placed here."
},
- "footerActions": {
+ "footerWalkthroughActions": {
"type": {
"name": "union",
"value": [
"required": false,
"description": "Used with `walkthrough` variant to provide action buttons (ex: \"Next\" / \"Skip\" / etc) for a walkthrough popover footer. Accepts either a single node or array of nodes for multiple buttons."
},
+ "hasCloseButton": {
+ "type": {
+ "name": "bool"
+ },
+ "required": false,
+ "description": "Determines if the popover has a close button or not. Default is `true`",
+ "defaultValue": {
+ "value": "true",
+ "computed": false
+ }
+ },
+ "hasNubbin": {
+ "type": {
+ "name": "bool"
+ },
+ "required": false,
+ "description": "Determines if the popover has a nubbin or not. Default is `true`",
+ "defaultValue": {
+ "value": "true",
+ "computed": false
+ }
+ },
"hasStaticAlignment": {
"type": {
"name": "bool"
"required": false,
"description": "This function is triggered when the user clicks outside the Popover or clicks the close button. You will want to define this if Popover is to be a controlled component. Most of the time you will want to set `isOpen` to `false` when this is triggered unless you need to validate something."
},
+ "onRequestTargetElement": {
+ "type": {
+ "name": "func"
+ },
+ "required": false,
+ "description": "Callback that returns an element or React `ref` to align the Popover with. If the target element has not been rendered yet, the popover will use the triggering element as the attachment target instead. NOTE: `position=\"relative\"` is not compatible with custom targets that are not the triggering element."
+ },
"position": {
"type": {
"name": "enum",
"required": false,
"description": "If `true`, adds a transparent overlay when the menu is open to handle outside clicks. Allows clicks on iframes to be captured, but also forces a double-click to interact with other elements. If a function is passed, custom overlay logic may be defined by the app."
},
- "target": {
- "type": {
- "name": "union",
- "value": [
- {
- "name": "node"
- },
- {
- "name": "string"
- }
- ]
- },
- "required": false,
- "description": "Causes the popover to attach itself next to the provided element ref or element matching the provided selector when open. If not provided the popover will use the triggering element as the attachment target instead. NOTE: `position=\"relative\"` is not compatible with custom targets outside the trigger"
- },
"triggerClassName": {
"type": {
"name": "union",
"params": [],
"returns": null
},
- {
- "name": "getVariant",
- "docblock": null,
- "modifiers": [],
- "params": [],
- "returns": null
- },
{
"name": "getSelectedId",
"docblock": null,
},
"required": false,
"description": "Triggered when the selection changes. It receives an event and an item object in the shape: `event, {item: [object] }`. _Tested with Mocha framework._"
- },
- "variant": {
- "type": {
- "name": "enum",
- "value": [
- {
- "value": "'default'",
- "computed": false
- },
- {
- "value": "'shade'",
- "computed": false
- }
- ]
- },
- "required": false,
- "description": "Determines component style:\n * Use `shade` when the component is placed on an existing background that is not lightly colored.\n_Tested with snapshot testing._",
- "defaultValue": {
- "value": "'default'",
- "computed": false
- }
}
},
"route": "vertical-navigation",
| 3 |
diff --git a/ts-defs-src/test-api/assertions.d.ts b/ts-defs-src/test-api/assertions.d.ts @@ -111,14 +111,14 @@ interface Assertion<E = any> {
* @param message - An assertion message that will be displayed in the report if the test fails.
* @param options - Assertion options.
*/
- typeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'regex', message?: string, options?: AssertionOptions): TestControllerPromise;
+ typeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'null' | 'regex', message?: string, options?: AssertionOptions): TestControllerPromise;
/**
* Asserts that type of `actual` is `typeName`.
*
* @param typeName - The expected type of an `actual` value.
* @param options - Assertion options.
*/
- typeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'regex', options?: AssertionOptions): TestControllerPromise;
+ typeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'null' | 'regex', options?: AssertionOptions): TestControllerPromise;
/**
* Asserts that type of `actual` is not `typeName`.
*
@@ -126,14 +126,14 @@ interface Assertion<E = any> {
* @param message - An assertion message that will be displayed in the report if the test fails.
* @param options - Assertion options.
*/
- notTypeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'regex', message?: string, options?: AssertionOptions): TestControllerPromise;
+ notTypeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'null' | 'regex', message?: string, options?: AssertionOptions): TestControllerPromise;
/**
* Asserts that type of `actual` is not `typeName`.
*
* @param typeName - An unexpected type of an `actual` value.
* @param options - Assertion options.
*/
- notTypeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'regex', options?: AssertionOptions): TestControllerPromise;
+ notTypeOf(typeName: 'function' | 'object' | 'number' | 'string' | 'boolean' | 'undefined' | 'null' | 'regex', options?: AssertionOptions): TestControllerPromise;
/**
* Asserts that `actual` is strictly greater than `expected`.
*
| 0 |
diff --git a/js/bittrex.js b/js/bittrex.js @@ -285,7 +285,7 @@ module.exports = class bittrex extends Exchange {
'ask': this.safeFloat (ticker, 'Ask'),
'askVolume': undefined,
'vwap': undefined,
- 'open': undefined,
+ 'open': previous,
'close': last,
'last': last,
'previousClose': undefined,
| 12 |
diff --git a/token-metadata/0x9Cb2f26A23b8d89973F08c957C4d7cdf75CD341c/metadata.json b/token-metadata/0x9Cb2f26A23b8d89973F08c957C4d7cdf75CD341c/metadata.json "symbol": "DZAR",
"address": "0x9Cb2f26A23b8d89973F08c957C4d7cdf75CD341c",
"decimals": 6,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/core/Animation.js b/src/core/Animation.js import {
+ isNil,
extend,
isNumber,
isString,
@@ -221,6 +222,14 @@ const Animation = {
for (const p in styles) {
if (styles.hasOwnProperty(p)) {
const values = styles[p];
+ // ignore null values
+ if (!values) {
+ continue;
+ } else if (Array.isArray(values)) {
+ if (isNil(values[0]) || isNil(values[1])) {
+ continue;
+ }
+ }
let childStyles;
if (isChild(values)) {
childStyles = resolveChild(values);
| 8 |
diff --git a/index.html b/index.html <div id="No ethical consumption" class="achievement achievementlocked" style="background-image: url(images/89.png)" ach-tooltip="Get 5 billion banked infinities. Reward: After eternity you permanently keep 5% of your infinities."><br></div>
</td>
<td>
- <div id="Unique snowflakes" class="achievement achievementlocked" style="background-image: url(images/90.png)" ach-tooltip="Get 540 galaxies without Replicated galaxies."><br></div>
+ <div id="Unique snowflakes" class="achievement achievementlocked" style="background-image: url(images/90.png)" ach-tooltip="Have 540 galaxies without having any Replicated galaxies."><br></div>
</td>
<td>
<div id="I never liked this infinity stuff anyway" class="achievement achievementlocked" style="background-image: url(images/91.png)" ach-tooltip="Reach 1e140,000 IP without buying IDs or IP multipliers."><br></div>
| 7 |
diff --git a/test/acceptance/ported/support/ported-server-options.js b/test/acceptance/ported/support/ported-server-options.js @@ -41,7 +41,7 @@ module.exports = _.extend({}, serverOptions, {
whitelist: ['http://127.0.0.1:8033/{s}/{z}/{x}/{y}.png'],
fallbackImage: {
type: 'fs',
- src: path.join(__dirname, '/../../test/fixtures/http/basemap.png')
+ src: path.join(__dirname, '/../../../fixtures/http/basemap.png')
}
}
},
| 1 |
diff --git a/lib/findProjectRoot.js b/lib/findProjectRoot.js import fs from 'fs';
import path from 'path';
+const NODE_MODULES_PATTERN = /\/node_modules$/;
+
function findRecursive(directory) {
if (directory === '/') {
throw new Error('No project root found');
}
const pathToPackageJson = path.join(directory, 'package.json');
const pathToNodeModulesFolder = path.join(directory, 'node_modules');
- const isPackageDependency = /\/node_modules$/.test(path.dirname(directory));
+ const isPackageDependency = NODE_MODULES_PATTERN.test(path.dirname(directory));
if (fs.existsSync(pathToPackageJson) &&
(fs.existsSync(pathToNodeModulesFolder) || isPackageDependency)) {
return directory;
| 5 |
diff --git a/.eslintrc.json b/.eslintrc.json "code": 100,
"tabWidth": 4,
"ignoreStrings": true,
- "ignoreRegExpLiterals": true
+ "ignoreRegExpLiterals": true,
+ "ignoreUrls": true
}
],
"no-trailing-spaces": ["error", { "skipBlankLines": true }],
| 8 |
diff --git a/core/block.js b/core/block.js @@ -2224,16 +2224,15 @@ Blockly.Blocks['let_typed'] = {
this.createDropDownChangeFunction());
this.appendDummyInput('VARIABLE')
.appendField('let')
- .appendField(variable_field, 'VAR')
- .setTypeExpr(A);
+ .appendField(variable_field, 'VAR');
this.appendValueInput('EXP1')
.setTypeExpr(A)
.appendField('=');
this.appendValueInput('EXP2')
.setTypeExpr(B)
- .appendField('in')
+ .appendField('in');
this.setOutput(true);
- this.setOutputTypeExpr(A);
+ this.setOutputTypeExpr(B);
this.setInputsInline(true);
},
| 1 |
diff --git a/src/views/thread/style.js b/src/views/thread/style.js @@ -22,6 +22,7 @@ export const View = styled(FlexCol)`
`}
flex: auto;
align-items: stretch;
+ overflow-y: scroll;
@media (max-width: 1024px) {
background-color: ${({ theme }) => theme.bg.default};
| 1 |
diff --git a/lib/route/calendar.js b/lib/route/calendar.js @@ -146,7 +146,7 @@ router.get('/teamview/', function(req, res){
);
var base_date = validator.isDate(req.param('date'))
- ? moment(req.param('date'), req.user.company.get_default_date_format())
+ ? moment(req.param('date'))
: moment();
var team_view = new TeamView({
| 1 |
diff --git a/edit.js b/edit.js @@ -1329,6 +1329,7 @@ const [
const idsStart = new Uint32Array(messageData.buffer, idsFreeEntry, 1)[0];
const skyLightsStart = new Uint32Array(messageData.buffer, skyLightsFreeEntry, 1)[0];
const torchLightsStart = new Uint32Array(messageData.buffer, torchLightsFreeEntry, 1)[0];
+ const peeksStart = new Uint32Array(messageData.buffer, peeksFreeEntry, 1)[0];
const positionsCount = new Uint32Array(messageData.buffer, positionsFreeEntry + Uint32Array.BYTES_PER_ELEMENT, 1)[0];
const normalsCount = new Uint32Array(messageData.buffer, normalsFreeEntry + Uint32Array.BYTES_PER_ELEMENT, 1)[0];
@@ -1338,6 +1339,7 @@ const [
const idsCount = new Uint32Array(messageData.buffer, idsFreeEntry + Uint32Array.BYTES_PER_ELEMENT, 1)[0];
const skyLightsCount = new Uint32Array(messageData.buffer, skyLightsFreeEntry + Uint32Array.BYTES_PER_ELEMENT, 1)[0];
const torchLightsCount = new Uint32Array(messageData.buffer, torchLightsFreeEntry + Uint32Array.BYTES_PER_ELEMENT, 1)[0];
+ const peeksCount = new Uint32Array(messageData.buffer, peeksFreeEntry + Uint32Array.BYTES_PER_ELEMENT, 1)[0];
allocator.freeAll();
@@ -1423,6 +1425,7 @@ const [
idsStart,
skyLightsStart,
torchLightsStart,
+ peeksStart,
positionsCount,
normalsCount,
@@ -1432,6 +1435,7 @@ const [
idsCount,
skyLightsCount,
torchLightsCount,
+ peeksCount
numOpaquePositions,
numTransparentPositions,
| 0 |
diff --git a/src/parser/templateStrings.js b/src/parser/templateStrings.js @@ -140,11 +140,11 @@ const applyConstraint = (value, constraint) => {
// min:1
// max:3
const splitConstraint = constraint.split(":");
- const match = splitConstraint[0];
+ const multiConstraint = splitConstraint[0].split("*");
+ const match = multiConstraint[0];
let result = value;
- if (splitConstraint.length > 1) {
switch (match) {
case "max": {
if (splitConstraint[1] < result) result = splitConstraint[1];
@@ -154,13 +154,6 @@ const applyConstraint = (value, constraint) => {
if (splitConstraint[1] > result) result = splitConstraint[1];
break;
}
- default: {
- utils.log(`Missed match is ${match}`);
- logger.warn(`ddb-importer does not know about template constraint {{@${constraint}}}. Please log a bug.`); // eslint-disable-line no-console
- }
- }
- } else {
- switch (match) {
case "roundup": {
result = Math.ceil(result);
break;
@@ -171,9 +164,16 @@ const applyConstraint = (value, constraint) => {
break;
}
default: {
+ logger.debug(`Missed match is ${match}`);
logger.warn(`ddb-importer does not know about template constraint {{@${constraint}}}. Please log a bug.`); // eslint-disable-line no-console
}
}
+
+ if (multiConstraint.length > 1) {
+ const evalStatement = `${result}*${multiConstraint[1]}`;
+ /* eslint-disable no-eval */
+ result = eval(evalStatement);
+ /* eslint-enable no-eval */
}
return result;
@@ -228,9 +228,9 @@ export default function parseTemplateString(ddb, character, text, feature) {
result = result.replace(replacePattern, getNumber(evalMatch));
}
} catch (err) {
- utils.log(err);
result = result.replace(replacePattern, `{{${match}}}`);
- logger.warn(`ddb-importer does not know about template value {{${match}}}. Please log a bug.`);
+ logger.warn(`ddb-importer does not know about template value {{${match}}}. Please log a bug.`, err);
+ logger.warn(err.stack);
}
}
});
| 7 |
diff --git a/books/templates/index.html b/books/templates/index.html <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="shortcut icon" href="/favicon.ico">
<title>Kamu</title>
+ <script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-101849453-1', 'auto');
+ ga('send', 'pageview');
+
+ </script>
</head>
<body>
<div id="app-bar"></div>
| 0 |
diff --git a/packages/app/src/server/middlewares/certify-shared-file.js b/packages/app/src/server/middlewares/certify-shared-file.js +import { AttachmentType } from '~/server/interfaces/attachment';
import loggerFactory from '~/utils/logger';
+
const url = require('url');
const logger = loggerFactory('growi:middleware:certify-shared-fire');
@@ -32,6 +34,12 @@ module.exports = (crowi) => {
return next();
}
+ const isBlandLogo = attachment.attachmentType === AttachmentType.BRAND_LOGO;
+ if (isBlandLogo) {
+ req.isSharedPage = true;
+ return next();
+ }
+
const shareLinks = await ShareLink.find({ relatedPage: attachment.page });
// If sharelinks don't exist, skip it
| 11 |
diff --git a/packages/gallery/src/components/item/loveButton/loveButton.js b/packages/gallery/src/components/item/loveButton/loveButton.js @@ -11,7 +11,6 @@ class LoveButton extends GalleryComponent {
this.onKeyPress = this.onKeyPress.bind(this);
this.state = {
- loveButtonToggledToLove: undefined,
animate: false,
};
}
@@ -32,8 +31,7 @@ class LoveButton extends GalleryComponent {
e.preventDefault();
this.props.actions.eventsListener(EVENTS.LOVE_BUTTON_CLICKED, this.props);
this.setState({
- animate: !this.isLoved(),
- loveButtonToggledToLove: !this.isLoved(),
+ animate: !this.props.isLoved,
});
}
@@ -59,7 +57,7 @@ class LoveButton extends GalleryComponent {
}
}
className.push(this.viewClassName());
- if (this.isLoved()) {
+ if (this.props.isLoved) {
className.push('progallery-svg-font-icons-love_full pro-gallery-loved');
} else {
className.push('progallery-svg-font-icons-love_empty');
@@ -94,30 +92,8 @@ class LoveButton extends GalleryComponent {
}
}
- isLoved() {
- return typeof this.state.loveButtonToggledToLove === 'undefined'
- ? this.props.isLoved
- : this.state.loveButtonToggledToLove;
- }
-
- localLoveCount() {
- if (
- this.props.isLoved === true &&
- this.state.loveButtonToggledToLove === false
- ) {
- return -1;
- } else if (
- !this.props.isLoved &&
- this.state.loveButtonToggledToLove === true
- ) {
- return 1;
- } else {
- return 0;
- }
- }
-
createLoveCounter() {
- const count = (this.props.loveCount || 0) + this.localLoveCount();
+ const count = (this.props.loveCount || 0);
return !!this.props.showCounter && count > 0 ? (
<i data-hook="love-counter" className={this.counterClassName()}>
{count}
@@ -131,7 +107,7 @@ class LoveButton extends GalleryComponent {
isSiteMode() || isSEOMode()
? utils.getMobileEnabledClick(this.toggleLove)
: { onClick: e => e.stopPropagation() };
- const loveColor = this.isLoved() ? { color: 'red' } : {};
+ const loveColor = this.props.isLoved ? { color: 'red' } : {};
return (
<span
@@ -150,7 +126,7 @@ class LoveButton extends GalleryComponent {
data-hook="love-icon"
className={this.buttonClasssName()}
role="checkbox"
- aria-checked={this.isLoved()}
+ aria-checked={this.props.isLoved}
style={loveColor}
tabIndex={-1}
/>
| 2 |
diff --git a/packages/mjml-image/src/index.js b/packages/mjml-image/src/index.js @@ -8,11 +8,11 @@ export default class MjImage extends BodyComponent {
static tagOmission = true
static allowedAttributes = {
- 'alt': 'string',
- 'href': 'string',
- 'src': 'string',
- 'srcset': 'string',
- 'title': 'string',
+ alt: 'string',
+ href: 'string',
+ src: 'string',
+ srcset: 'string',
+ title: 'string',
align: 'enum(left,center,right)',
border: 'string',
'border-bottom': 'string',
@@ -95,11 +95,12 @@ export default class MjImage extends BodyComponent {
renderImage() {
const height = this.getAttribute('height')
+
const img = `
<img
${this.htmlAttributes({
alt: this.getAttribute('alt'),
- height: height && parseInt(height, 10),
+ height: height && (height === 'auto' ? height : parseInt(height, 10)),
src: this.getAttribute('src'),
srcset: this.getAttribute('srcset'),
style: 'img',
| 9 |
diff --git a/Utilities.js b/Utilities.js @@ -28,6 +28,8 @@ function dynamicDecimals (value) {
if (Math.trunc(value * 100) < 1) { decimals = 6 }
if (Math.trunc(value * 10000) < 1) { decimals = 8 }
if (Math.trunc(value * 1000000) < 1) { decimals = 10 }
+ if (Math.trunc(value * 100000000) < 1) { decimals = 12 }
+ if (Math.trunc(value * 10000000000) < 1) { decimals = 0 }
return (value - Math.trunc(value)).toFixed(decimals)
}
@@ -203,7 +205,7 @@ function getMilisecondsFromPoint (point, container, coordinateSystem) {
return point.x
}
-function moveToUserPosition (container, currentDate, currentRate, coordinateSystem, ignoreX, ignoreY, mousePosition) {
+function moveToUserPosition (container, currentDate, currentRate, coordinateSystem, ignoreX, ignoreY, mousePosition, fitFunction) {
let targetPoint = {
x: currentDate.valueOf(),
y: currentRate
@@ -237,15 +239,42 @@ function removeTime (datetime) {
return dateOnly
}
-function printLabel (labelToPrint, x, y, opacity, fontSize, color) {
+function printLabel (labelToPrint, x, y, opacity, fontSize, color, center, container, fitFunction) {
let labelPoint
if (color === undefined) { color = UI_COLOR.DARK }
+ if (fontSize === undefined) { fontSize = 10 };
browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY
- let label = '' + labelToPrint
+ let label = labelToPrint
+ if (isNaN(label) === false && label !== '') {
+ label = dynamicDecimals(labelToPrint)
+ label = label.toLocaleString()
+ }
+
let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO
+
+ if (center === true) {
+ labelPoint = {
+ x: x - xOffset,
+ y: y
+ }
+ } else {
+ labelPoint = {
+ x: x,
+ y: y
+ }
+ }
+
+ if (container !== undefined) {
+ labelPoint = container.frame.frameThisPoint(labelPoint)
+ }
+
+ if (fitFunction !== undefined) {
+ labelPoint = fitFunction(labelPoint)
+ }
+
browserCanvasContext.fillStyle = 'rgba(' + color + ', ' + opacity + ')'
- browserCanvasContext.fillText(label, x, y)
+ browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y)
}
function newUniqueId () {
| 7 |
diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js @@ -3349,6 +3349,7 @@ function load(dataSource, entityCollection, data, options) {
* @property {Boolean} [clampToGround=false] true if we want the geometry features (Polygons, LineStrings and LinearRings) clamped to the ground.
* @property {Ellipsoid} [ellipsoid=Ellipsoid.WGS84] The global ellipsoid used for geographical calculations.
* @property {Credit|String} [credit] A credit for the data source, which is displayed on the canvas.
+ * @property {KmlTour} [KmlTours] The KmlTour that is used to guide the camera to specified destinations on given time intervals.
*/
/**
| 3 |
diff --git a/articles/libraries/lock/v11/configuration.md b/articles/libraries/lock/v11/configuration.md @@ -295,7 +295,9 @@ Options for the `window.open` [position and size][windowopen-link] features. Thi
```js
var options = {
- redirect: false,
+ auth: {
+ redirect: false
+ },
popupOptions: { width: 300, height: 400, left: 200, top: 300 }
};
```
| 1 |
diff --git a/sparta_constants.go b/sparta_constants.go @@ -73,6 +73,8 @@ const (
LambdaPrincipal = "lambda.amazonaws.com"
// @enum AWSPrincipal
ElasticLoadBalancingPrincipal = "elasticloadbalancing.amazonaws.com"
+ // @enum KinesisFirehosePrincipal
+ KinesisFirehosePrincipal = "firehose.amazonaws.com"
)
type contextKey int
| 0 |
diff --git a/src/traces/violin/hover.js b/src/traces/violin/hover.js 'use strict';
+var tinycolor = require('tinycolor2');
+
+var Color = require('../../components/color');
var Lib = require('../../lib');
var Axes = require('../../plots/cartesian/axes');
var boxHoverPoints = require('../box/hover');
@@ -75,7 +78,15 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, opts) {
closeData.push(kdePointData);
- violinLineAttrs = {stroke: pointData.color};
+ var strokeC = pointData.color;
+ var strokeColor = tinycolor(strokeC);
+ var strokeAlpha = strokeColor.getAlpha();
+ var strokeRGB = Color.tinyRGB(strokeColor);
+
+ violinLineAttrs = {
+ stroke: strokeRGB,
+ 'stroke-opacity': strokeAlpha
+ };
violinLineAttrs[pLetter + '1'] = Lib.constrain(paOffset + pOnPath[0], paOffset, paOffset + paLength);
violinLineAttrs[pLetter + '2'] = Lib.constrain(paOffset + pOnPath[1], paOffset, paOffset + paLength);
violinLineAttrs[vLetter + '1'] = violinLineAttrs[vLetter + '2'] = vAxis._offset + vValPx;
| 9 |
diff --git a/docs/README.md b/docs/README.md @@ -113,11 +113,11 @@ If it returns a descriptive answer, e.g. ``v8.9.0``, then Node is correctly inst
Once both Git and Node are set up, install the rest of the tools as follows: on MacOS or Linux open a terminal and type
- sudo npm install -g gulp mocha jsdoc eslint modclean webpack webpack-cli uglify-es rimraf
+ sudo npm install -g gulp mocha
or on Windows type
- npm install -g gulp mocha jsdoc eslint modclean webpack webpack-cli uglify-es rimraf
+ npm install -g gulp mocha rimraf
This will install the core
tools. Please note that the '-g' flag stands for 'global', which means these
@@ -130,7 +130,7 @@ Next install Electron and its associated tools. As of April 2018 there is bug in
the electron installer which requires a more complex command:
sudo npm install -g electron --unsafe-perm=true --allow-root
- sudo npm install -g electron-packager
+
The JS development environment is now complete.
| 2 |
diff --git a/lib/runtime/console2.js b/lib/runtime/console2.js @@ -74,7 +74,7 @@ export function activate (ink) {
// doesn't handle multiline URIs properly due to upstream bug (xterm.js#24)
terminal.terminal.registerLinkMatcher(uriRegex, linkHandler, {validationCallback: validator})
- proc.onExit(() => {
+ client.onDetached(() => {
terminal.detach()
terminal.write('\x1b[1m\r\x1b[31mJulia has exited.\x1b[0m Press Enter to start a new session.\n\r')
terminal.terminal.deregisterLinkMatcher(linkHandler)
| 9 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss @@ -166,7 +166,7 @@ $sprk-icon-custom-stroke-width-xl: 3px !default;
///
/// Width value for the Centered Column layout container.
-$sprk-centered-column-width: 77rem !default;
+$sprk-centered-column-width: 64rem !default;
//
// Layers
| 12 |
diff --git a/app/components/Wallet/BackupBrainkey.jsx b/app/components/Wallet/BackupBrainkey.jsx @@ -4,7 +4,7 @@ import Translate from "react-translate-component";
import WalletActions from "actions/WalletActions";
import WalletDb from "stores/WalletDb";
import {hash} from "bitsharesjs";
-import {Card} from "bitshares-ui-style-guide";
+import {Card, Input, Button} from "bitshares-ui-style-guide";
export default class BackupBrainkey extends Component {
constructor() {
@@ -83,18 +83,15 @@ export default class BackupBrainkey extends Component {
<Translate content="wallet.brainkey_w3" />
</div>
- <button
- className="button success"
+ <Button
+ type={"primary"}
onClick={this.onComplete.bind(this)}
>
<Translate content="wallet.verify" />
- </button>
- <button
- className="button cancel"
- onClick={this.reset.bind(this)}
- >
+ </Button>
+ <Button type={"default"} onClick={this.reset.bind(this)}>
<Translate content="wallet.cancel" />
- </button>
+ </Button>
</span>
);
}
@@ -111,7 +108,7 @@ export default class BackupBrainkey extends Component {
className="name-form"
noValidate
>
- <input
+ <Input
type="password"
id="password"
onChange={this.onPassword.bind(this)}
@@ -129,9 +126,9 @@ export default class BackupBrainkey extends Component {
{brainkey_backup_time}
<br />
</div>
- <button className="button success">
+ <Button type={"primary"}>
<Translate content="wallet.show_brainkey" />
- </button>
+ </Button>
</form>
</span>
);
| 14 |
diff --git a/src/tagui_parse.php b/src/tagui_parse.php @@ -245,7 +245,8 @@ else return $params.end_fi()."\n";}
function code_intent($raw_intent) {
$params = $raw_intent; // natural language handling for conditions
-if ((strpos($params,"if")!==false) or (strpos($params,"for")!==false) or (strpos($params,"while")!==false)) {
+if ((substr($params,0,3)=="if ") or (substr($params,0,8)=="else if ")
+or (substr($params,0,4)=="for ") or (substr($params,0,6)=="while ")) {
$params = str_replace(" more than or equal to "," >= ",$params);
$params = str_replace(" greater than or equal to "," >= ",$params);
$params = str_replace(" higher than or equal to "," >= ",$params);
@@ -256,7 +257,17 @@ $params = str_replace(" more than "," > ",$params); $params = str_replace(" grea
$params = str_replace(" higher than "," > ",$params); $params = str_replace(" less than "," < ",$params);
$params = str_replace(" lesser than "," < ",$params); $params = str_replace(" lower than "," < ",$params);
$params = str_replace(" not equal to "," != ",$params); $params = str_replace(" equal to "," == ",$params);
-$params = str_replace(" and "," && ",$params); $params = str_replace(" or "," || ",$params);
-$params = str_replace(" not "," ! ",$params);} return $params.end_fi()."\n";}
+// $params = str_replace(" not "," ! ",$params); // leaving not out until better or meaningful to implement
+$params = str_replace(" and ",") && (",$params); $params = str_replace(" or ",") || (",$params);
+
+// add simple opening and closing brackets to the condition if not present
+if ((substr($params,0,3)=="if ") and (substr(trim(substr($params,3)),0,1) != "("))
+$params = "if (" . trim(substr($params,3)) . ")";
+if ((substr($params,0,8)=="else if ") and (substr(trim(substr($params,8)),0,1) != "("))
+$params = "else if (" . trim(substr($params,8)) . ")";
+if ((substr($params,0,4)=="for ") and (substr(trim(substr($params,4)),0,1) != "("))
+$params = "for (" . trim(substr($params,4)) . ")";
+if ((substr($params,0,6)=="while ") and (substr(trim(substr($params,6)),0,1) != "("))
+$params = "while (" . trim(substr($params,6)) . ")";} return $params.end_fi()."\n";}
?>
| 7 |
diff --git a/core/workspace_svg.js b/core/workspace_svg.js @@ -1450,7 +1450,7 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
Blockly.Events.enable();
}
if (Blockly.Events.isEnabled()) {
- // TODO: Fire a Workspace Comment Create event.
+ Blockly.WorkspaceComment.fireCreateEvent(comment);
}
comment.select();
};
| 2 |
diff --git a/main/filtering.js b/main/filtering.js @@ -10,6 +10,43 @@ var enabledFilteringOptions = {
exceptionDomains: []
}
+const globalParamsToRemove = [
+ // microsoft
+ 'msclkid',
+ // google
+ 'gclid',
+ 'dclid',
+ // facebook
+ 'fbclid',
+ // yandex
+ 'yclid',
+ '_openstat',
+ // adobe
+ 'icid',
+ // instagram
+ 'igshid',
+ // mailchimp
+ 'mc_eid'
+]
+const siteParamsToRemove = {
+ 'www.amazon.com': [
+ '_ref',
+ 'ref_',
+ 'pd_rd_r',
+ 'pd_rd_w',
+ 'pf_rd_i',
+ 'pf_rd_m',
+ 'pf_rd_p',
+ 'pf_rd_r',
+ 'pf_rd_s',
+ 'pf_rd_t',
+ 'pd_rd_wg'
+ ],
+ 'www.ebay.com': [
+ '_trkparms'
+ ]
+}
+
// for tracking the number of blocked requests
var unsavedBlockedRequests = 0
@@ -76,11 +113,41 @@ function requestDomainIsException (domain) {
return enabledFilteringOptions.exceptionDomains.includes(domain)
}
+function removeTrackingParams (url) {
+ try {
+ var urlObj = new URL(url)
+ for (const param of urlObj.searchParams) {
+ if (globalParamsToRemove.includes(param[0]) ||
+ (siteParamsToRemove[urlObj.hostname] &&
+ siteParamsToRemove[urlObj.hostname].includes(param[0]))) {
+ urlObj.searchParams.delete(param[0])
+ }
+ }
+ return urlObj.toString()
+ } catch (e) {
+ console.warn(e)
+ return url
+ }
+}
+
function handleRequest (details, callback) {
+ /* eslint-disable standard/no-callback-literal */
+
+ // webContentsId may not exist if this request is a mainFrame or subframe
+ let domain
+ if (details.webContentsId) {
+ domain = parser.getUrlHost(webContents.fromId(details.webContentsId).getURL())
+ }
+
+ const isExceptionDomain = domain && requestDomainIsException(domain)
+
+ const modifiedURL = (enabledFilteringOptions.blockingLevel > 0 && !isExceptionDomain) ? removeTrackingParams(details.url) : details.url
+
if (!(details.url.startsWith('http://') || details.url.startsWith('https://')) || details.resourceType === 'mainFrame') {
callback({
cancel: false,
- requestHeaders: details.requestHeaders
+ requestHeaders: details.requestHeaders,
+ redirectURL: (modifiedURL !== details.url) ? modifiedURL : undefined
})
return
}
@@ -99,14 +166,7 @@ function handleRequest (details, callback) {
}
}
- if (details.webContentsId) {
- var domain = parser.getUrlHost(webContents.fromId(details.webContentsId).getURL())
- } else {
- // webContentsId may not exist if this request is for the main document of a subframe
- var domain = undefined
- }
-
- if (enabledFilteringOptions.blockingLevel > 0 && !(domain && requestDomainIsException(domain))) {
+ if (enabledFilteringOptions.blockingLevel > 0 && !isExceptionDomain) {
if (
(enabledFilteringOptions.blockingLevel === 1 && (!domain || requestIsThirdParty(domain, details.url))) ||
(enabledFilteringOptions.blockingLevel === 2)
@@ -130,8 +190,10 @@ function handleRequest (details, callback) {
callback({
cancel: false,
- requestHeaders: details.requestHeaders
+ requestHeaders: details.requestHeaders,
+ redirectURL: (modifiedURL !== details.url) ? modifiedURL : undefined
})
+ /* eslint-enable standard/no-callback-literal */
}
function setFilteringSettings (settings) {
| 2 |
diff --git a/articles/libraries/auth0js/v9/migration-guide.md b/articles/libraries/auth0js/v9/migration-guide.md @@ -14,9 +14,9 @@ Auth0.js can be used to implement authentication in different ways:
- Embedded Login, using the `.login()`, `popup.loginWithCredentials()`, `client.loginWithCredentials()` methods, where the login dialog is displayed in the application's website.
-- In the Hosted Login Page, where you can use the same methods as in Embedded Login but from inside a customized Auth0's Hosted Login page. Most customers don't customize Auth0 hosted pages with auth0.js, so your probably don't need to worry about this.
+- In the Hosted Login Page, where you can use the same methods as in Embedded Login but from inside a customized Auth0's Hosted Login page. Most customers don't customize Auth0 hosted pages with Auth0.js, so your probably don't need to worry about this.
-Depending on how you are using auth0.js, you have different options:
+Depending on how you are using Auth0.js, you have different options:
| Scenario | Migration to v9 |
| --- | --- |
@@ -32,9 +32,9 @@ If you are not using Centralized login, we recommend you to use it as [most secu
If you decide to keep using Embedded Login, you will need to migrate to v9. Before you update your code, make sure that you have reviewed these documents and made any necessary changes in your implementation.
-[Migrating from Auth0.js v6]()
+[Migrating from Auth0.js v6](migration-v6-v9.md)
-[Migrating from Auth0.js v7]()
+[Migrating from Auth0.js v7](migration-v7-v9.md)
[Migrating from Auth0.js v8](migration-v8-v9.md)
| 0 |
diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml @@ -20,9 +20,7 @@ jobs:
mysql:
image: mysql:5.7
env:
- MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: wordpress
- MYSQL_ROOT_PASSWORD: ''
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
@@ -43,7 +41,7 @@ jobs:
- name: Composer Install
run: docker run --rm -v "$PWD:/app" -v "${{ steps.composer-cache.outputs.dir }}:/tmp/cache" composer install --no-interaction --no-progress
- name: Set up PHP test data
- run: tests/bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+ run: tests/bin/install-wp-tests.sh wordpress_test root password localhost $WP_VERSION
env:
WP_VERSION: '5.6'
- name: Run Unit Tests
| 12 |
diff --git a/scripts/compile-sounds.sh b/scripts/compile-sounds.sh # input: directory of wav files
# output: mp3 data file and json metadata file
-ls {walk,run,jump,land,narutoRun,food}/*.wav | sort -n >sound-files.txt
+ls {walk,run,jump,land,narutoRun,food,combat}/*.wav | sort -n >sound-files.txt
# cat sounds.txt | awk '{print "file " $0}' >sounds-list.txt
sox $(< sound-files.txt) sounds.mp3
| 0 |
diff --git a/docs/elements/tip.html b/docs/elements/tip.html @@ -8,7 +8,7 @@ prev: "elements-tag"
<div class="siimple-h2">Tip</div>
<div class="siimple-p">
- Add <code class="siimple-code">siimple-tip</codde> to a <code class="siimple-code">div</code> tag to create a tip element.
+ Add <code class="siimple-code">siimple-tip</code> to a <code class="siimple-code">div</code> tag to create a tip element.
</div>
<div class="sd-snippet-demo">
<div class="siimple-tip siimple-tip--primary" style="margin-bottom:0px !important;">
| 1 |
diff --git a/tests/e2e/specs/StartTimerEvent.spec.js b/tests/e2e/specs/StartTimerEvent.spec.js @@ -20,30 +20,29 @@ describe('Start Timer Event', () => {
const now = new Date();
const today = now.getDate().toString().padStart(2, '0');
- it('can set a specific start date', () => {
- const toggledPeriod = moment(now).format('A') === 'AM' ? 'PM' : 'AM';
- const expectedStartDate = `${getPeriodicityStringUSFormattedDate(now)} 5:30 ${toggledPeriod}`;
-
- addStartTimerEventToPaper();
- waitToRenderAllShapes();
-
- cy.contains('Timing Control').click();
- cy.get('[data-test=start-date-picker]').click();
- cy.get('[title="Select Time"]').click();
- cy.get('[title="Pick Hour"]').click();
- cy.get('.hour').contains('05').click();
- cy.get('[title="Pick Minute"]').click();
- cy.get('.minute').contains('30').click();
- cy.get('[title="Toggle Period"]').click();
- cy.get('[data-test=start-date-picker]').should('have.value', expectedStartDate);
-
- });
+ // it('can set a specific start date', () => {
+ // const toggledPeriod = moment(now).format('A') === 'AM' ? 'PM' : 'AM';
+ // const expectedStartDate = `${getPeriodicityStringUSFormattedDate(now)} 5:30 ${toggledPeriod}`;
+ //
+ // addStartTimerEventToPaper();
+ // waitToRenderAllShapes();
+ //
+ // cy.contains('Timing Control').click();
+ // cy.get('[data-test=start-date-picker]').click();
+ // cy.get('[title="Select Time"]').click();
+ // cy.get('[title="Pick Hour"]').click();
+ // cy.get('.hour').contains('05').click();
+ // cy.get('[title="Pick Minute"]').click();
+ // cy.get('.minute').contains('30').click();
+ // cy.get('[title="Toggle Period"]').click();
+ // cy.get('[data-test=start-date-picker]').should('have.value', expectedStartDate);
+ //
+ // });
it('can set a specific end date', () => {
- const expectedEndDate = getPeriodicityStringUSFormattedDate(now, true);
-
addStartTimerEventToPaper();
waitToRenderAllShapes();
+ const expectedEndDate = getPeriodicityStringUSFormattedDate(now, true);
cy.contains('Timing Control').click();
cy.get('[data-test=end-date-picker]').click({ force: true });
| 12 |
diff --git a/components/base-adresse-nationale/tooltip.js b/components/base-adresse-nationale/tooltip.js @@ -22,7 +22,7 @@ function Tooltip({isCertified, message, direction, children}) {
color: #fff;
text-align: center;
border-radius: 4px;
- padding: 5px 0;
+ padding: 5px;
/* Position the tooltip */
position: absolute;
| 0 |
diff --git a/token-metadata/0x5Cf04716BA20127F1E2297AdDCf4B5035000c9eb/metadata.json b/token-metadata/0x5Cf04716BA20127F1E2297AdDCf4B5035000c9eb/metadata.json "symbol": "NKN",
"address": "0x5Cf04716BA20127F1E2297AdDCf4B5035000c9eb",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/bbs-plus-presentation.js b/src/bbs-plus-presentation.js @@ -79,20 +79,7 @@ export default class BbsPlusPresentation {
typeof credentialSchema === 'string'
? JSON.parse(credentialSchema)
: credentialSchema,
- ) : new CredentialSchema({
- ...CredentialSchema.essential(),
- type: 'object',
- properties: {
- credentialSubject: {
- type: 'object',
- properties: {
- id: {
- type: 'string',
- },
- },
- },
- },
- }, DEFAULT_PARSING_OPTS);
+ ) : new CredentialSchema(CredentialSchema.essential(), DEFAULT_PARSING_OPTS);
const credential = Credential.fromJSON({
credentialSchema: credSchema.toJSON(),
| 4 |
diff --git a/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/index.js b/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/index.js @@ -84,24 +84,19 @@ export default function ActivationBanner() {
[ accountID ]
);
- const setupBannerErrors = useSelect( ( select ) => {
- const errors = {};
-
- Object.keys( setupBannerSelectors ).forEach( ( selector ) => {
+ const setupBannerErrors = useSelect( ( select ) =>
+ Object.keys( setupBannerSelectors ).reduce( ( acc, selector ) => {
const { store, args } = setupBannerSelectors[ selector ];
-
const error = select( store ).getErrorForSelector(
selector,
args || []
);
-
- if ( error ) {
- errors[ selector ] = error;
- }
- } );
-
- return errors;
- } );
+ return {
+ ...acc,
+ ...( error ? { [ selector ]: error } : {} ),
+ };
+ }, {} )
+ );
const hasSetupBannerError = ! isEmpty( setupBannerErrors );
@@ -132,14 +127,16 @@ export default function ActivationBanner() {
const { store, args } =
setupBannerSelectors[ selector ];
- await dispatch( store ).clearError(
+ await Promise.all( [
+ dispatch( store ).clearError(
selector,
args || []
- );
- await dispatch( store ).invalidateResolution(
+ ),
+ dispatch( store ).invalidateResolution(
selector,
args || []
- );
+ ),
+ ] );
}
);
}
| 7 |
diff --git a/config/application.rb b/config/application.rb @@ -199,7 +199,7 @@ module CartoDB
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
- config.action_controller.relative_url_root = "/assets/#{frontend_version}"
+ config.action_controller.relative_url_root = "/assets"
custom_app_views_paths.reverse.each do |custom_views_path|
config.paths['app/views'].unshift(custom_views_path)
| 2 |
diff --git a/accessibility-checker-extension/src/ts/options/OptionsApp.tsx b/accessibility-checker-extension/src/ts/options/OptionsApp.tsx @@ -373,7 +373,15 @@ class OptionsApp extends React.Component<{}, OptionsAppState> {
</div>
);
} else {
- return <div>error: can not get archives or rulesets</div>;
+ return (
+ <div>
+ <p>An error occurred while loading this page. Please check your internet connection and try again.</p>
+ <br />
+ <p> Please also follow {" "}
+ <a href={chrome.runtime.getURL("usingAC.html")} target="_blank" rel="noopener noreferred">User Guide</a>
+ {" "} to give the browser permission to run the Option page. </p>
+ </div>
+ )
}
}
}
| 3 |
diff --git a/articles/client-auth/current/mobile-desktop.md b/articles/client-auth/current/mobile-desktop.md @@ -20,6 +20,7 @@ If you would like to implement this functionality using either Lock or one of th
* [Lock for Web](/libraries/lock)
* [Lock for iOS](/libraries/lock-ios)
* [Lock for Android](/libraries/lock-android)
+
* Auth0 SDK
* [Auth0 SDK for Web](/libraries/auth0js)
* [Auth0 SDK for iOS](/libraries/auth0-swift)
@@ -29,8 +30,8 @@ If you would like to implement this functionality using either Lock or one of th
Auth0 exposes OAuth 2.0 endpoints that you can use to authenticate users. You can call these endpoints through an embedded browser in your **native** application. After authentication completes, you can return an [ID Token](/tokens/id-token) that contains the user's profile information.
-::: panel-info Auth0 Quickstarts
-Please note that, instead of following this tutorial, you can use any of Auth0's client libraries. These encapsulate all the logic required and make it easier for your to implement authentication. Please refer to our [Native Quickstarts](/quickstart/native) to get started with any of these.
+::: note
+Instead of following this tutorial, you can use any of Auth0's client libraries. These encapsulate all the logic required and make it easier for your to implement authentication. Please refer to our [Native Quickstarts](/quickstart/native) to get started.
:::
## Register Your Client
@@ -43,7 +44,7 @@ Go to the [Auth0 Dashboard](${manage_url}) and click on [Clients](${manage_url}/
The **Create Client** window will open, allowing you to enter the name of your new Client. Choose **Native** as the **Client Type**. When done, click on **Create** to proceed.
-::: panel-danger Warning
+::: warning
The Authorization Code flow with PKCE can only be used for Native Clients.
:::
@@ -207,7 +208,7 @@ Note that the sample Authorization URL doesn't include an `audience` parameter.
Please see [this page](/api-auth/tutorials/authorization-code-grant-pkce#3-get-the-user-s-authorization) for detailed information on the User Authorization request parameters.
-::: panel-info Arbitrary Claims
+::: panel Arbitrary Claims
To improve Client application compatibility, Auth0 returns profile information using an [OIDC-defined structured claim format](https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims). This means that arbitrary claims to ID or access tokens must conform to a namespaced format to avoid collisions with standard OIDC claims. For example, if your namespace is `https://foo.com/` and you want to add an arbitrary claim named `myclaim`, you would name the claim `https://foo.com/myclaim`, not `myclaim`.
:::
@@ -266,7 +267,7 @@ If all goes well, you'll receive an HTTP 200 response with the following payload
}
```
-:::panel-info Access Tokens
+::: note
You can use the `access_token` to call the [Authentication API's `/userinfo` endpoint](/api/authentication#get-user-info).
:::
@@ -359,7 +360,7 @@ By extracting the `id_token`, which now contains the additional `name` and `pict
You can send a user directly to the GitHub authentication screen by passing the `connection` parameter and setting its value to `github`.
-:::panel-info Logins with Social Providers
+:::panel Logins with Social Providers
While this example shows how to log in users via GitHub, you can just as easily request that a user log in with other Social providers, such as Google or Facebook.
To do this, configure the appropriate Connection in the [Auth0 Dashboard](${manage_url}/#/connections/social) and change the `connection` value of the call to `/authorize` to the name of the Connection (`google-oauth2` for Google, `facebook` for Facebook, and so on). You can get the Connection's name from the *Settings* tab of the [Connections](${manage_url}/#/connections/social) page.
| 14 |
diff --git a/iris/mutations/channel/editChannel.js b/iris/mutations/channel/editChannel.js @@ -44,7 +44,9 @@ export default async (
if (
currentUserCommunityPermissions.isOwner ||
- currentUserChannelPermissions.isOwner
+ currentUserChannelPermissions.isOwner ||
+ currentUserCommunityPermissions.isModerator ||
+ currentUserChannelPermissions.isModerator
) {
// all checks passed
// if a channel is being converted from private to public, make
| 11 |
diff --git a/apps/viewer/uicallbacks.js b/apps/viewer/uicallbacks.js @@ -296,75 +296,6 @@ function draw(e) {
}
}
-// function drawLabel(e) {
-// if (!$CAMIC.viewer.canvasDrawInstance) {
-// alert('Draw Doesn\'t Initialize');
-// return;
-// }
-
-// if (e.status) {
-// if ($CAMIC.status == 'label') {
-// presetLabelOn.call(this, {...e.data});
-// return;
-// }
-// // turn off annotation
-// toolsOff();
-
-// var checkAllToolsOff = setInterval(
-// function() {
-// if ($CAMIC && $CAMIC.status == null) {
-// // all tool has turn off
-// clearInterval(checkAllToolsOff);
-// presetLabelOn.call(this, {...e.data});
-// }
-// }.bind(this),
-// 100,
-// );
-// } else {
-// // off preset label
-// presetLabelOff();
-// }
-// }
-
-// function presetLabelOn(label) {
-// console.log(label)
-// if (!$CAMIC.viewer.canvasDrawInstance) return;
-// const canvasDraw = $CAMIC.viewer.canvasDrawInstance;
-// canvasDraw.drawMode = label.mode;
-// if (label.mode == 'grid') {
-// canvasDraw.size = [parseInt(label.size), parseInt(label.size)];
-// }
-// canvasDraw.style.color = label.color;
-// canvasDraw.drawOn();
-// $CAMIC.status = 'label';
-// $UI.toolbar.getSubTool('preset_label').querySelector('label').style.color =
-// label.color;
-// // close layers menu
-// $UI.layersSideMenu.close();
-// }
-
-// function presetLabelOff() {
-// if (!$CAMIC.viewer.canvasDrawInstance) return;
-// const canvasDraw = $CAMIC.viewer.canvasDrawInstance;
-
-// if (
-// canvasDraw._draws_data_.length &&
-// confirm(`Do You Want To Save Annotation Label Before You Leave?`)
-// ) {
-// savePresetLabel();
-// } else {
-// canvasDraw.clear();
-// canvasDraw.drawOff();
-// $UI.appsSideMenu.close();
-// $UI.toolbar
-// .getSubTool('preset_label')
-// .querySelector('input[type=checkbox]').checked = false;
-// $UI.toolbar.getSubTool('preset_label').querySelector('label').style.color =
-// '';
-// $CAMIC.status = null;
-// }
-// }
-
/**
* utility function for switching off given tool
*/
@@ -2018,19 +1949,17 @@ function savePresetLabel() {
__data._id = {$oid:__data._id}
addAnnotation(
- $CAMIC,
- $UI.layersViewer.getDataItemById(execId),
- __data,
- saveLabelAnnotCallback
+ execId,
+ __data
);
- if ($minorCAMIC && $minorCAMIC.viewer) {
- addAnnotation(
- $minorCAMIC,
- $UI.layersViewerMinor.getDataItemById(execId),
- __data,
- null
- );
- }
+ // if ($minorCAMIC && $minorCAMIC.viewer) {
+ // addAnnotation(
+ // $minorCAMIC,
+ // $UI.layersViewerMinor.getDataItemById(execId),
+ // __data,
+ // null
+ // );
+ // }
})
.catch((e) => {
Loading.close();
@@ -2039,10 +1968,12 @@ function savePresetLabel() {
.finally(() => {$UI.message.addSmall(`Added The '${noteData.name}' Annotation.`)});
}
-function addAnnotation(camic, layerData, data, callback) {
+function addAnnotation(id, data) {
+ const layerData = $UI.layersViewer.getDataItemById(id)
+ const layerDataMinor = $UI.layersViewerMinor.getDataItemById(id)
const item = layerData.item;
data.geometries = VieweportFeaturesToImageFeatures(
- camic.viewer,
+ $CAMIC.viewer,
data.geometries,
);
if (data.provenance.analysis.isGrid) {
@@ -2055,18 +1986,26 @@ function addAnnotation(camic, layerData, data, callback) {
Math.round(size[0] * width),
Math.round(size[1] * height),
];
- } else {
}
item.data = data;
item.render = annoRender;
-
-
// create lay and update view
if (layerData.isShow) {
- layerData.layer = camic.viewer.omanager.addOverlay(item);
- camic.viewer.omanager.updateView();
+ layerData.layer = $CAMIC.viewer.omanager.addOverlay(item);
+ $CAMIC.viewer.omanager.updateView();
}
- if (callback) callback.call(layerData);
+ if($minorCAMIC && $minorCAMIC.viewer && layerDataMinor.isShow) {
+ layerDataMinor.layer = $minorCAMIC.viewer.omanager.addOverlay(item);
+ $minorCAMIC.viewer.omanager.updateView();
+ }
+
+ $CAMIC.drawContextmenu.off();
+ $CAMIC.viewer.canvasDrawInstance.clear();
+ // close app side
+ $UI.toolbar._mainTools[0].querySelector('[type=checkbox]').checked = false;
+ $UI.appsSideMenu.close();
+ $UI.layersViewer.update();
+ $UI.layersViewerMinor.update();
}
| 1 |
diff --git a/PostHeadersQuestionToc.user.js b/PostHeadersQuestionToc.user.js // @description Sticky post headers while you view each post (helps for long posts). Question ToC of Answers in sidebar.
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.7.3
+// @version 1.7.4
//
// @include https://*stackoverflow.com/questions/*
// @include https://*serverfault.com/questions/*
@@ -304,9 +304,6 @@ ${isQuestion ? 'Question' : 'Answer'} by ${postuserHtml}${postismod ? modflair :
top: 51px;
z-index: 2;
}
-.question:hover, .answer:hover {
- z-index: 1000; /* above "This post has been deleted" message, as well as the sidebar */
-}
.question:hover .post-stickyheader,
.answer:hover .post-stickyheader {
z-index: 7;
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,16 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.24.2] -- 2017-03-10
+
+### Fixed
+- Fix removal of last annotation or shape [#1451]
+- Fix shape and image clip path removal [#1453]
+- Fix overdrawing of data-referenced images [#1453]
+- Make handling of `layer: 'below'` shape more robust [#1453]
+- Allow multiple `parcoords` dimensions with the same label [#1457]
+
+
## [1.24.1] -- 2017-03-07
### Fixed
| 3 |
diff --git a/packages/browser-sync/package.json b/packages/browser-sync/package.json "etag": "^1.8.1",
"fresh": "^0.5.2",
"fs-extra": "3.0.1",
- "http-proxy": ">=1.18.1",
+ "http-proxy": "^1.18.1",
"immutable": "^3",
"localtunnel": "1.9.2",
"micromatch": "^3.1.10",
| 4 |
diff --git a/UI/src/app/_components/tally/tally.component.html b/UI/src/app/_components/tally/tally.component.html <h2 class="lead mt-5" *ngIf="devices.length == 0">No devices are available for tally monitoring at this time.</h2>
</div>
-<div [class]="'d-flex flex-column max-height container-fluid pt-5 ' + (mode_program ? mode_preview ? 'bg-warning' : 'bg-danger' : mode_preview ? 'bg-success text-white' : '')" class="text-center" *ngIf="currentDeviceIdx !== undefined">
+<div [class]="'d-flex flex-column max-height container-fluid pt-5 ' + (mode_program ? mode_preview ? 'bg-warning' : 'bg-danger' : mode_preview ? 'bg-success text-white' : 'bg-dark text-white')" class="text-center" *ngIf="currentDeviceIdx !== undefined">
<div>
<h1>{{devices[currentDeviceIdx].name}}</h1>
<small>{{devices[currentDeviceIdx].description }}</small>
</div>
- <div class="container flex-fill pb-4">
+ <div class="container flex-fill py-4">
<app-chat type="client"></app-chat>
</div>
</div>
\ No newline at end of file
| 12 |
diff --git a/token-metadata/0xDcfE18bc46f5A0Cd0d3Af0c2155d2bCB5AdE2fc5/metadata.json b/token-metadata/0xDcfE18bc46f5A0Cd0d3Af0c2155d2bCB5AdE2fc5/metadata.json "symbol": "HUE",
"address": "0xDcfE18bc46f5A0Cd0d3Af0c2155d2bCB5AdE2fc5",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/modules/core/src/lib/layer.js b/modules/core/src/lib/layer.js @@ -513,13 +513,12 @@ export default class Layer extends Component {
// Call subclass lifecycle methods
this.updateState(updateParams);
+ // End subclass lifecycle methods
- // Render or update previously rendered sublayers
if (this.isComposite) {
+ // Render or update previously rendered sublayers
this._renderLayers(updateParams);
- }
- // End subclass lifecycle methods
-
+ } else {
// Add any subclass attributes
this.updateAttributes(this.props);
this._updateBaseUniforms();
@@ -528,6 +527,7 @@ export default class Layer extends Component {
if (this.state.model) {
this.state.model.setInstanceCount(this.getNumInstances());
}
+ }
this.clearChangeFlags();
this.internalState.resetOldProps();
@@ -843,9 +843,6 @@ ${flags.viewportChanged ? 'viewport' : ''}\
for (const model of this.getModels()) {
model.setUniforms(uniforms);
}
-
- // TODO - set needsRedraw on the model(s)?
- this.setNeedsRedraw();
}
// DEPRECATED METHODS
| 2 |
diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js * @mixin @node-red/util_util
*/
-const clone = require("clone");
const clonedeep = require("lodash.clonedeep");
const jsonata = require("jsonata");
const safeJSONStringify = require("json-stringify-safe");
| 2 |
diff --git a/client/templates/topic/topicInfoItemList.js b/client/templates/topic/topicInfoItemList.js @@ -5,6 +5,7 @@ import { Minutes } from '/imports/minutes';
import { ReactiveVar } from 'meteor/reactive-var';
import { ConfirmationDialogFactory } from '../../helpers/confirmationDialogFactory';
import {InfoItemFactory} from "../../../imports/InfoItemFactory";
+import { handleError } from '../../helpers/handleError';
const INITIAL_ITEMS_LIMIT = 4;
@@ -141,9 +142,7 @@ Template.topicInfoItemList.helpers({
if (itemId && itemId === tmpl.data.items[index]._id) {
Session.set('topicInfoItem.triggerAddDetailsForItem', null);
Meteor.setTimeout(() => {
- addNewDetails(tmpl, index)
- // todo properly report errors
- .catch(console.error);
+ addNewDetails(tmpl, index).catch(handleError);
}, 1300); // we need this delay otherwise the input field will be made hidden immediately
}
// do not return anything! This will be rendered on the page!
@@ -285,15 +284,11 @@ Template.topicInfoItemList.events({
let action = () => {
if (isDeleteAllowed) {
- aTopic.removeInfoItem(infoItem._id)
- // todo properly report errors
- .catch(console.error);
+ aTopic.removeInfoItem(infoItem._id).catch(handleError);
} else {
if (item.isActionItem()) item.toggleState();
else item.toggleSticky();
- item.save()
- // todo properly report errors
- .catch(console.error);
+ item.save().catch(handleError);
}
};
@@ -331,9 +326,7 @@ Template.topicInfoItemList.events({
const aInfoItem = findInfoItem(context.topicParentId, infoItem.parentTopicId, infoItem._id);
if (aInfoItem instanceof ActionItem) {
aInfoItem.toggleState();
- aInfoItem.save()
- // todo properly report errors
- .catch(console.error);
+ aInfoItem.save().catch(handleError);
}
},
@@ -352,9 +345,7 @@ Template.topicInfoItemList.events({
let aInfoItem = findInfoItem(context.topicParentId, infoItem.parentTopicId, infoItem._id);
if (aInfoItem instanceof InfoItem) {
aInfoItem.toggleSticky();
- aInfoItem.save()
- // todo properly report errors
- .catch(console.error);
+ aInfoItem.save().catch(handleError);
}
},
@@ -426,9 +417,7 @@ Template.topicInfoItemList.events({
}
let index = $(evt.currentTarget).data('index');
- addNewDetails(tmpl, index)
- // todo properly report errors
- .catch(console.error);
+ addNewDetails(tmpl, index).catch(handleError);
},
'blur .detailInput'(evt, tmpl) {
@@ -457,15 +446,11 @@ Template.topicInfoItemList.events({
let detailIndex = detailId.split('_')[1]; // detail id is: <collapseId>_<index>
if (text !== '') {
aActionItem.updateDetails(detailIndex, text);
- aActionItem.save()
- // todo properly report errors
- .catch(console.error);
+ aActionItem.save().catch(handleError);
} else {
let deleteDetails = () => {
aActionItem.removeDetails(detailIndex);
- aActionItem.save()
- // todo properly report errors
- .catch(console.error);
+ aActionItem.save().catch(handleError);
let detailsCount = aActionItem.getDetails().length;
if (detailsCount === 0) {
tmpl.$('#collapse-' + infoItem._id).collapse('hide');
| 7 |
diff --git a/components/bases-locales/charte/partners-searchbar.js b/components/bases-locales/charte/partners-searchbar.js -import {useState, useCallback, useEffect} from 'react'
+import {useState, useCallback, useEffect, useMemo} from 'react'
import {debounce, intersection} from 'lodash'
import {getCommunes, getByCode} from '@/lib/api-geo'
@@ -11,6 +11,8 @@ import SearchInput from '@/components/search-input'
import Tags from '@/components/bases-locales/charte/tags'
import RenderCommune from '@/components/search-input/render-commune'
+const ALL_PARTNERS = [...partners.companies, ...partners.epci, ...partners.communes]
+
function PartnersSearchbar() {
const [input, setInput] = useState('')
const [results, setResults] = useState([])
@@ -20,9 +22,11 @@ function PartnersSearchbar() {
const [isLoading, setIsLoading] = useState(false)
const [error, setError] = useState(null)
- const communePartners = filteredPartners.filter(partner => partner.echelon === 0)
- const companyPartners = filteredPartners.filter(partner => partner.isCompany)
- const organizationPartners = filteredPartners.filter(partner => !partner.isCompany && partner.echelon !== 0)
+ const [communePartners, companyPartners, organizationPartners] = useMemo(() => [
+ filteredPartners.filter(partner => partner.echelon === 0),
+ filteredPartners.filter(partner => partner.isCompany),
+ filteredPartners.filter(partner => !partner.isCompany && partner.echelon !== 0)
+ ], [filteredPartners])
const handleSelectedTags = tag => {
setSelectedTags(prevTags => {
@@ -33,7 +37,7 @@ function PartnersSearchbar() {
}
const getAvailablePartners = useCallback((communeCodeDepartement, tags) => {
- const filteredByPerimeter = [...partners.companies, ...partners.epci, ...partners.communes].filter(({codeDepartement, isPerimeterFrance}) => (codeDepartement.includes(communeCodeDepartement) || isPerimeterFrance))
+ const filteredByPerimeter = ALL_PARTNERS.filter(({codeDepartement, isPerimeterFrance}) => (codeDepartement.includes(communeCodeDepartement) || isPerimeterFrance))
const filteredByTags = filteredByPerimeter.filter(({services}) => intersection(tags, services).length === tags.length)
return filteredByTags.sort((a, b) => {
| 7 |
diff --git a/cli/commands.js b/cli/commands.js @@ -111,12 +111,14 @@ const defaultCommands = {
By default everything is run in parallel. If you like to interact with the console use '--interactive' flag.`,
help: `
Arguments:
- jdlFiles # The JDL file names Type: String[] Required: true if --inline is not set
+ jdlFiles # The JDL file names or URL Type: String[] Required: true if --inline is not set
Example:
jhipster jdl myfile.jdl
- jhipster jdl myfile.jdl --interactive
+ jhipster jdl myfile.jdl --fork
jhipster jdl myfile1.jdl myfile2.jdl
+ jhipster jdl https://gist.githubusercontent.com/user/path/app.jdl
+ jhipster jdl jdl-name-from-jdl-samples-repo.jdl (just pass any file name from https://github.com/jhipster/jdl-samples)
jhipster jdl --inline "application { config { baseName jhapp, testFrameworks [protractor] }}"
jhipster jdl --inline \\
"application {
| 3 |
diff --git a/src/actions/posts.js b/src/actions/posts.js @@ -6,7 +6,7 @@ import { resetEditor } from '../actions/editor'
export function createPost(body, editorId, repostId, repostedFromId, artistInviteId) {
const data = body.length ? { body } : null
- if (data && artistInviteId) {
+ if (data && !repostId && !repostedFromId && artistInviteId) {
data.artist_invite_id = artistInviteId
}
return {
| 11 |
diff --git a/lib/carto/oauth_provider/scopes.rb b/lib/carto/oauth_provider/scopes.rb @@ -270,7 +270,7 @@ module Carto
end
end
- return [datasets, non_datasets]
+ [datasets, non_datasets]
end
def self.subtract_dataset_scopes(datasets1, datasets2)
| 2 |
diff --git a/packages/openneuro-app/src/client.jsx b/packages/openneuro-app/src/client.jsx @@ -24,7 +24,7 @@ ReactDOM.render(
<ApolloProvider
client={createClient(`${config.url}/crn/graphql`, {
clientVersion: version,
- enableWebsocket: false,
+ enableWebsocket: true,
cache: new InMemoryCache({
typePolicies: {
Query: {
| 1 |
diff --git a/ui/js/lbryio.js b/ui/js/lbryio.js @@ -57,18 +57,17 @@ lbryio.call = function(resource, action, params, method='get') {
console.log('loaded');
const response = JSON.parse(xhr.responseText);
- if (response.error) {
+ if (!response.success) {
if (reject) {
reject(new Error(response.error));
} else {
document.dispatchEvent(new CustomEvent('unhandledError', {
detail: {
connectionString: connectionString,
- method: method,
+ method: action,
params: params,
- code: response.error.code,
message: response.error.message,
- data: response.error.data,
+ ... response.error.data ? {data: response.error.data} : {},
}
}));
}
@@ -79,6 +78,11 @@ lbryio.call = function(resource, action, params, method='get') {
console.log('about to call xhr.open');
xhr.open(method, CONNECTION_STRING + resource + '/' + action, true);
+
+ if (method == 'post') {
+ xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ }
+
xhr.send(querystring.stringify(params));
});
};
| 7 |
diff --git a/src/docs/permalinks.md b/src/docs/permalinks.md @@ -119,7 +119,7 @@ Both of the above examples will write to `_site/this-is-a-new-path/subdirectory/
### `permalink: false`
-If you set the `permalink` value to be `false`, this will disable writing the file to disk in your output folder. The file will still be processed normally (and present in collections, with its [`url` and `outputPath` properties](/docs/data-eleventy-supplied.md) set to `false`) but will not be available in your output directory as a standalone template.
+If you set the `permalink` value to be `false`, this will disable writing the file to disk in your output folder. The file will still be processed normally (and present in collections, with its [`url` and `outputPath` properties](/docs/data-eleventy-supplied/) set to `false`) but will not be available in your output directory as a standalone template.
{% codetitle "YAML Front Matter", "Syntax" %}
| 1 |
diff --git a/source/views/menu/MenuOptionView.js b/source/views/menu/MenuOptionView.js import { Class } from '../../core/Core.js';
+import { create as el } from '../../dom/Element.js';
import { cancel, invokeAfterDelay } from '../../foundation/RunLoop.js';
import { PopOverView } from '../panels/PopOverView.js';
import { View } from '../View.js';
@@ -30,7 +31,9 @@ const MenuOptionView = Class({
}.property('isFocused'),
draw(/* layer */) {
- return this.get('content').get('button');
+ const button = this.get('content').get('button');
+ const title = button.get('sectionTitle');
+ return [title ? el('h2.v-MenuOption-title', [title]) : null, button];
},
_focusTimeout: null,
| 0 |
diff --git a/test/form.html b/test/form.html <textarea class="siimple-textarea siimple-textarea--fluid"></textarea>
<div class="siimple-field-helper">This field can't be empty</div>
</div>
+ <!-- Select a topic -->
+ <div class="siimple-field">
+ <div class="siimple-field-label">Select a topic</div>
+ <div class="siimple-radio">
+ <input type="radio" value="1" id="radio1" name="topic">
+ <label for="radio1"></label>
+ </div>
+ <label class="siimple-label">Games</label><br>
+ <div class="siimple-radio">
+ <input type="radio" value="1" id="radio2" name="topic">
+ <label for="radio2"></label>
+ </div>
+ <label class="siimple-label">Music</label><br>
+ </div>
<!-- Subscribe group -->
<div class="siimple-field">
<div class="siimple-label">Want to subscribe to our newsletter?</div>
| 1 |
diff --git a/includes/Modules/Analytics/Advanced_Tracking/Measurement_Code_Injector.php b/includes/Modules/Analytics/Advanced_Tracking/Measurement_Code_Injector.php @@ -47,6 +47,7 @@ final class Measurement_Code_Injector {
public function __construct( $event_configurations ) {
$this->event_configurations = Measurement_Event_Pipe::encode_measurement_event_list( $event_configurations );
$this->inject_script = <<<INJECT_SCRIPT
+( function() {
function matches(el, selector) {
const matcher =
el.matches ||
@@ -59,7 +60,6 @@ function matches(el, selector) {
}
return false;
}
-( function() {
var eventConfigurations = {$this->event_configurations};
var config;
for ( config of eventConfigurations ) {
@@ -67,15 +67,8 @@ function matches(el, selector) {
document.addEventListener( config.on, function( e ) {
var el = e.target;
if ( matches(el, thisConfig.selector) || matches(el, thisConfig.selector.concat( ' *' )) ) {
- alert( 'Got an event called: '.concat( thisConfig.action ) );
-
var params = {};
- if ( "metadata" in thisConfig && null !== thisConfig.metadata ) {
- params = thisConfig.metadata( params, el );
- }
params['event_category'] = thisConfig.category;
- console.log(params);
-
gtag( 'event', thisConfig.action, params );
}
}, true );
| 5 |
diff --git a/js/webcomponents/bisweb_grapherelement.js b/js/webcomponents/bisweb_grapherelement.js @@ -130,7 +130,7 @@ class GrapherModule extends HTMLElement {
<li><a class='dropdown-item' href='#'>Another Item<br></a></li>
<li><a class='dropdown-item' href='#'>One More Item<br></a></li>
<li><a class='dropdown-item' href='#'>An Item Too<br></a></li>
- </div>
+ </ul>
</div>
`);
@@ -230,10 +230,9 @@ class GrapherModule extends HTMLElement {
for (let key of Object.keys(imgdata)) {
let splitKey = key.split('_');
let keyNum = splitKey[1];
- if (keyNum < startingKey) { startingKey = splitKey.join('_'); console.log('starting key', startingKey); }
+ if (parseInt(keyNum) < startingKey) { startingKey = splitKey.join('_'); }
imgdata[key] = formatChart(imgdata[key], orthoElement.getobjectmap());
- console.log('chart', imgdata[key]);
}
this.createChart({ xaxisLabel : 'frame', yaxisLabel : 'intensity (average per-pixel value)', makeTaskChart : true, charts: imgdata, displayChart : startingKey });
@@ -598,8 +597,6 @@ class GrapherModule extends HTMLElement {
$(this.graphWindow.getHeader()).find('.task-selector').css('visibility', 'hidden');
}
-
- console.log('formatted tasks', tasks.formattedTasks, 'settings', settings);
//construct task labels and regions for tauchart
for (let task of tasks.formattedTasks) {
for (let item of data) {
| 1 |
diff --git a/jsdoc.json b/jsdoc.json "search": false,
"sort": true,
"outputSourceFiles": false,
- "outputSourcePath": false
+ "outputSourcePath": false,
+ "methodHeadingReturns": true
}
}
| 0 |
diff --git a/test/jasmine/tests/select_test.js b/test/jasmine/tests/select_test.js @@ -916,6 +916,16 @@ describe('Test select box and lasso per trace:', function() {
.then(function() {
return Plotly.relayout(gd, 'dragmode', 'select');
})
+ .then(function() {
+ // For some reason we need this to make the following tests pass
+ // on CI consistently. It appears that a double-click action
+ // is being confused with a mere click. See
+ // https://github.com/plotly/plotly.js/pull/2135#discussion_r148897529
+ // for more info.
+ return new Promise(function(resolve) {
+ setTimeout(resolve, 100);
+ });
+ })
.then(function() {
return _run(
[[350, 200], [370, 220]],
| 0 |
diff --git a/shared/graphql/queries/user/getCurrentUserEverythingFeed.js b/shared/graphql/queries/user/getCurrentUserEverythingFeed.js @@ -54,10 +54,11 @@ const getCurrentUserEverythingOptions = {
user,
networkStatus,
refetch,
- threads: user ? user.everything.edges : '',
+ threads: user && user.everything ? user.everything.edges : '',
feed: 'everything',
- threadConnection: user ? user.everything : null,
- hasNextPage: user ? user.everything.pageInfo.hasNextPage : false,
+ threadConnection: user && user.everything ? user.everything : null,
+ hasNextPage:
+ user && user.everything ? user.everything.pageInfo.hasNextPage : false,
subscribeToUpdatedThreads: () => {
return subscribeToMore({
document: subscribeToUpdatedThreads,
| 1 |
diff --git a/package.json b/package.json "@babel/polyfill": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"@babel/runtime": "^7.4.4",
- "@pact-foundation/pact": "10.0.0-beta.31",
+ "@pact-foundation/pact": "10.0.0-beta.33",
"babel-jest": "^26.6.3",
"babel-loader": "^8.0.5",
"chai": "^4.2.0",
| 3 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.34.0",
+ "version": "0.35.0",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/snippets/button-style.jsx b/snippets/button-style.jsx @@ -42,9 +42,12 @@ function toggleEnablement({value: checked}) {
}
function toggleCornerRadius({value: checked}) {
- contentView.find(Button).forEach((button) => button.cornerRadius = checked ? 40 : 4);
+ contentView.find(Button).forEach((button) => button.cornerRadius = checked ? 20 : 4);
}
function toggleImage({value: checked}) {
- contentView.find(Button).forEach((button) => button.image = checked ? 'resources/[email protected]' : null);
+ contentView.find(Button).forEach((button) => {
+ button.image = checked ? tabris.device.platform ===
+ 'android' ? 'resources/[email protected]' : 'resources/[email protected]' : null;
+ });
}
| 7 |
diff --git a/src/js/controller/dialogs/importwizard/steps/ImageImport.js b/src/js/controller/dialogs/importwizard/steps/ImageImport.js var name = this.extractFileNameFromPath_(this.file_.name);
// Remove extension from filename.
name = name.replace(/\.[a-zA-Z]+$/, '');
- return new Promise(function (resolve, reject) {
+
+ var deferred = Q.defer();
pskl.app.importService.newPiskelFromImage(
this.importedImage_,
{
smoothing: !!this.smoothResize.checked,
name: name
},
- resolve
+ deferred.resolve
);
- }.bind(this));
+ return deferred.promise;
};
ns.ImageImport.prototype.onImportTypeChange_ = function (evt) {
| 14 |
diff --git a/plugins/dns_service/app/controllers/dns_service/create_zone_wizard_controller.rb b/plugins/dns_service/app/controllers/dns_service/create_zone_wizard_controller.rb @@ -77,8 +77,8 @@ module DnsService
# 0. find project to get domain_id
requested_parent_zone_project = services.identity.find_project(requested_parent_zone.project_id)
- # 1. check zone quota for requested_parent_zone project where the zone is first created
- check_quotas(requested_parent_zone_project.domain_id, requested_parent_zone.project_id, 'zones')
+ # 1. check zone quota for requested_parent_zone project where the zone is first created that their is in any case enough zone quota free
+ check_and_increase_quotas(requested_parent_zone_project.domain_id, requested_parent_zone.project_id, 'zones')
# 2. zone will be created inside the project where the parent zone lives
@zone.project_id(requested_parent_zone.project_id)
# 3. zone transfer to destination project is needed
@@ -89,10 +89,10 @@ module DnsService
requested_parent_zone_name = requested_parent_zone_name.partition('.').last
end
- # check quotas for project
- check_quotas(@inquiry.domain_id, @inquiry.project_id, 'zones')
+ # check and increase zone quota for destination project
+ check_and_increase_quotas(@inquiry.domain_id, @inquiry.project_id, 'zones')
# make sure that recordset quota is increased at least by 2 as there are two recrodsets are created (NS + SOA)
- check_quotas(@inquiry.domain_id, @inquiry.project_id, 'recordsets', 2)
+ check_and_increase_quotas(@inquiry.domain_id, @inquiry.project_id, 'recordsets', 2)
if @zone.save
# we need zone transfer if the domain was created in cloud-admin project
@@ -155,7 +155,7 @@ module DnsService
cloud_admin.dns_service.find_pool(pool_id)
end
- def check_quotas(domain_id,project_id,resource,increase = 1)
+ def check_and_increase_quotas(domain_id,project_id,resource,increase = 1)
# get dns quota for resource and target project
dns_resource = cloud_admin.resource_management.find_project(
domain_id, project_id,
| 10 |
diff --git a/docker-compose.yml b/docker-compose.yml @@ -16,11 +16,11 @@ services:
- "9000:9000"
environment:
- DATABASE_URL=jdbc:postgresql://db:5432/sidewalk
- - SIDEWALK_CITY_ID=columbus-oh
+ - SIDEWALK_CITY_ID=DUMMY_CITY_ID
- SIDEWALK_EMAIL_ADDRESS=DUMMY_EMAIL_ADDRESS
- SIDEWALK_EMAIL_PASSWORD=DUMMY_EMAIL_PASSWORD
- - GOOGLE_MAPS_API_KEY=AIzaSyArLiUe53lfYAA3qB0rc0E9mtAvqsFRz7I
- - GOOGLE_MAPS_SECRET=HkWpKcxDcSDS8BWM-o0BCLB-8pw=
+ - GOOGLE_MAPS_API_KEY=DUMMY_GOOGLE_API_KEY
+ - GOOGLE_MAPS_SECRET=DUMMY_GOOGLE_SECRET
- INTERNAL_API_KEY=DUMMY_INTERNAL_API_KEY
- ENV_TYPE=test
| 13 |
diff --git a/src/renderer/scss/component/_button.scss b/src/renderer/scss/component/_button.scss @@ -62,7 +62,7 @@ button:disabled {
font-size: 1em;
color: var(--btn-color-inverse);
border-radius: 0;
- display: inline-block;
+ display: inline;
min-width: 0;
box-shadow: none;
text-align: left;
| 12 |
diff --git a/src/components/App.js b/src/components/App.js @@ -111,7 +111,7 @@ class App extends Component {
this.treeHash = this.generateTreeHash()
this.attachedEngineControllers = [null, null]
- this.engineBoards = [null, null]
+ this.engineStates = [null, null]
// Expose submodules
@@ -1891,7 +1891,7 @@ class App extends Component {
// Just swap engines
this.attachedEngineControllers.reverse()
- this.engineBoards.reverse()
+ this.engineStates.reverse()
this.setState({
engineCommands: engineCommands.reverse(),
@@ -1912,7 +1912,7 @@ class App extends Component {
controller.on('command-sent', this.handleCommandSent.bind(this))
this.attachedEngineControllers[i] = controller
- this.engineBoards[i] = null
+ this.engineStates[i] = null
controller.sendCommand(command('name'))
controller.sendCommand(command('version'))
@@ -1952,7 +1952,7 @@ class App extends Component {
if (controller != null) controller.stop()
}
- this.engineBoards = [null, null]
+ this.engineStates = [null, null]
}
async handleCommandSent({controller, command, getResponse}) {
@@ -2045,23 +2045,22 @@ class App extends Component {
let synced = false
let controller = this.attachedEngineControllers[i]
- if (this.engineBoards[i] != null && komi !== this.engineBoards[i].komi) {
+ if (this.engineStates[i] == null || komi !== this.engineStates[i].komi) {
// Update komi
controller.sendCommand(new gtp.Command(null, 'komi', komi))
- this.engineBoards[i].komi = komi
}
- if (this.engineBoards[i] != null
- && board.getPositionHash() !== this.engineBoards[i].getPositionHash()) {
+ if (this.engineStates[i] != null
+ && board.getPositionHash() !== this.engineStates[i].board.getPositionHash()) {
// Diff boards
- let diff = this.engineBoards[i].diff(board).filter(v => board.get(v) !== 0)
+ let diff = this.engineStates[i].board.diff(board).filter(v => board.get(v) !== 0)
if (diff.length === 1) {
let vertex = diff[0]
let sign = board.get(vertex)
- let move = this.engineBoards[i].makeMove(sign, vertex)
+ let move = this.engineStates[i].board.makeMove(sign, vertex)
if (move.getPositionHash() === board.getPositionHash()) {
// Incremental board update possible
@@ -2073,7 +2072,7 @@ class App extends Component {
synced = true
}
}
- } else if (this.engineBoards[i] != null) {
+ } else if (this.engineStates[i] != null) {
synced = true
}
@@ -2106,8 +2105,7 @@ class App extends Component {
// Update engine board state
- this.engineBoards[i] = board
- this.engineBoards[i].komi = komi
+ this.engineStates[i] = {board, komi}
}
this.setBusy(false)
@@ -2182,9 +2180,12 @@ class App extends Component {
playerController.sendCommand(new gtp.Command(null, 'sabaki-genmovelog'))
}
- let komi = this.engineBoards[playerIndex] && this.engineBoards[playerIndex].komi
- this.engineBoards[playerIndex] = gametree.getBoard(...this.state.treePosition)
- this.engineBoards[playerIndex].komi = komi
+ let komi = this.engineStates[playerIndex] != null && this.engineStates[playerIndex].komi
+
+ this.engineStates[playerIndex] = {
+ komi,
+ board: gametree.getBoard(...this.state.treePosition)
+ }
if (otherController != null && !doublePass) {
setTimeout(() => {
| 14 |
diff --git a/website/versioned_docs/version-0.5/running-on-device.md b/website/versioned_docs/version-0.5/running-on-device.md @@ -265,7 +265,7 @@ $ nslookup 10.0.1.123.xip.io
If it doesn't resolve your local IP address either the **xip.io** service is down or more likely your router prevents it.
-To still use xip.io behind your rooter:
+To still use xip.io behind your router:
- configure your phone to use Google DNS (8.8.8.8)
- disable the appropriate security feature in your router
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -50634,6 +50634,16 @@ var $$IMU_EXPORT$$;
return src.replace(/\/data\/upload\/[0-9]+\//, "/data/upload/");
}
+ if (domain === "img.hmv.co.jp") {
+ // thanks to Urkchar on discord
+ // https://img.hmv.co.jp/image/backimage.gif
+ if (/\/image\/+backimage\.gif(?:[?#].*)?$/.test(src))
+ return {
+ url: src,
+ bad: "mask"
+ };
+ }
+
if (domain_nowww === "buysmartjapan.com") {
// https://www.buysmartjapan.com/images/a59a9d8e5bfb26d558780441a0ad1152?original=https%3A%2F%2Fmelonbooks.akamaized.net%2Fuser_data%2Fpackages%2Fresize_image.php%3Fimage%3D213001024963.jpg%26width%3D450%26height%3D450
// https://melonbooks.akamaized.net/user_data/packages/resize_image.php?image=213001024963.jpg&width=450&height=450
| 8 |
diff --git a/tests/phpunit/integration/Core/Authentication/Clients/OAuth_ClientTest.php b/tests/phpunit/integration/Core/Authentication/Clients/OAuth_ClientTest.php @@ -49,8 +49,7 @@ class OAuth_ClientTest extends TestCase {
$client->refresh_token();
- // Google client must be initialized first
- $this->assertEquals( 'refresh_token_not_exist', get_user_option( OAuth_Client::OPTION_ERROR_CODE, $user_id ) );
+ $this->assertEquals( 'access_token_not_received', get_user_option( OAuth_Client::OPTION_ERROR_CODE, $user_id ) );
$client->get_client()->setHttpClient( new FakeHttpClient() );
$client->refresh_token();
| 3 |
diff --git a/articles/libraries/auth0js/v9/migration-guide.md b/articles/libraries/auth0js/v9/migration-guide.md @@ -30,7 +30,9 @@ Migration to v9 will depend on how you are using auth0.js:
| In your application, to implement embedded login | Required |
| In a customized hosted page | Not Supported |
-(*) There a certain usage patterns with centralized login and auth0.js v8 that don't require migration. However, given that for those scenarios just updating the library version will work, we recommend that you always migrate to v9 when embedding auth0.js.
+::: note
+There a certain usage patterns with centralized login and auth0.js v8 that don't require migration. However, given that for those scenarios just updating the library version will work, we recommend that you migrate auth0.js to v9 in your applications.
+:::
## Migration Instructions
| 3 |
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js @@ -167,7 +167,7 @@ module.exports = class SplitChunksPlugin {
// Filenames and paths can't be too long otherwise an
// ENAMETOOLONG error is raised. If the generated name if too
// long, it is truncated and a hash is appended. The limit has
- // been set to 100 to prevent `[name].[chunkhash].[ext]` from
+ // been set to 109 to prevent `[name].[chunkhash].[ext]` from
// generating a 256+ character string.
if (name.length > automaticNameMaxLength) {
const hashedFilename = hashFilename(name);
| 3 |
diff --git a/shared/js/content-scripts/click-to-load.js b/shared/js/content-scripts/click-to-load.js closeIcon = response
})
- /** TODO - Add message handler in message-handlers.js to return a Share Feedback Link
- * generated by `browserUIWrapper` ('../ui/base/ui-wrapper.es6.js')
- */
- sendMessage('getShareFeedbackLink', '').then(response => {
- shareFeedbackLink = response
- })
-
// Listen for events from surrogates
addEventListener('ddg-ctp', (event) => {
if (!event.detail) return
| 2 |
diff --git a/assets/js/modules/tagmanager/components/common/ContainerSelect.test.js b/assets/js/modules/tagmanager/components/common/ContainerSelect.test.js @@ -35,39 +35,6 @@ describe( 'ContainerSelect', () => {
registry.dispatch( MODULES_TAGMANAGER ).receiveGetExistingTag( null );
} );
- it( 'should be disabled if there is an existing tag', async () => {
- const account = factories.accountBuilder();
- const { accountId: accountID } = account; // eslint-disable-line sitekit/acronym-case
- registry
- .dispatch( MODULES_TAGMANAGER )
- .receiveGetAccounts( [ account ] );
- registry.dispatch( MODULES_TAGMANAGER ).setAccountID( accountID );
- registry
- .dispatch( MODULES_TAGMANAGER )
- .receiveGetContainers( [], { accountID } );
- registry
- .dispatch( MODULES_TAGMANAGER )
- .finishResolution( 'getAccounts', [] );
- registry
- .dispatch( MODULES_TAGMANAGER )
- .finishResolution( 'getContainers', [ accountID ] );
-
- const { container } = render( <ContainerSelect containers={ [] } />, {
- registry,
- } );
- const select = container.querySelector( '.mdc-select' );
-
- expect( select ).not.toHaveClass( 'mdc-select--disabled' );
-
- await act( () =>
- registry
- .dispatch( MODULES_TAGMANAGER )
- .receiveGetExistingTag( 'GTM-G000GL3' )
- );
-
- expect( select ).toHaveClass( 'mdc-select--disabled' );
- } );
-
it( 'should be disabled if the selected account is not a valid account', async () => {
const account = factories.accountBuilder();
const { accountId: accountID } = account; // eslint-disable-line sitekit/acronym-case
| 2 |
diff --git a/src/commands/view/ComponentDrag.js b/src/commands/view/ComponentDrag.js @@ -308,7 +308,7 @@ export default {
};
},
- onStart() {
+ onStart(event) {
const { target, editor, isTran, opts } = this;
const { center, onStart } = opts;
const { Canvas } = editor;
| 4 |
diff --git a/source/Renderer/shaders/ibl.glsl b/source/Renderer/shaders/ibl.glsl @@ -80,7 +80,6 @@ vec3 getIBLVolumeRefraction(vec3 normal, vec3 viewDirectionW, float perceptualRo
float NdotV = clampedDot(normal, viewDirectionW);
vec2 brdfSamplePoint = clamp(vec2(NdotV, perceptualRoughness), vec2(0.0, 0.0), vec2(1.0, 1.0));
vec2 brdf = texture(u_GGXLUT, brdfSamplePoint).rg;
- brdf= vec2(pow(brdf.xy,1.0/ vec2(2.2)));
vec3 specularColor = f0 * brdf.x + f90 * brdf.y;
vec3 transmittedLight = getTransmissionSample(refractionCoords.xy, perceptualRoughness);
| 2 |
diff --git a/views/stats.ejs b/views/stats.ejs @@ -2442,8 +2442,7 @@ const metaDescription = getMetaDescription()
<div>
<span class="stat-name">[</span>
<span class="stat-value"><%= helper.renderRaceTier(raceTier) %></span>
- <span class="stat-name">]</span>
- <span class="stat-name"> <%= raceName %>: </span>
+ <span class="stat-name">] <%= raceName %>: </span>
<span class="stat-value"><%= raceDuration %> </span>
</div>
<% } %>
@@ -2488,9 +2487,10 @@ const metaDescription = getMetaDescription()
raceDuration = '0.' + raceDuration;
%>
<div>
- <span class="stat-name"><%= helper.titleCase(type.split("_").join(" ")) %>: </span>
+ <span class="stat-name">[</span>
+ <span class="stat-value"><%= helper.renderRaceTier(raceTier) %></span>
+ <span class="stat-name">] <%= helper.titleCase(type.split("_").join(" ")) %>: </span>
<span class="stat-value"><%= raceDuration %> </span>
- <span class="stat-value" style="float:right"><%= helper.renderRaceTier(raceTier) %></span>
</div>
<% }
@@ -2512,9 +2512,10 @@ const metaDescription = getMetaDescription()
raceDuration = '0.' + raceDuration;
%>
<div>
- <span class="stat-name"><%= helper.titleCase(type.split("_").join(" ")) %>: </span>
+ <span class="stat-name">[</span>
+ <span class="stat-value"><%= helper.renderRaceTier(raceTier) %></span>
+ <span class="stat-name">] <%= helper.titleCase(type.split("_").join(" ")) %>: </span>
<span class="stat-value"><%= raceDuration %> </span>
- <span class="stat-value" style="float:right"><%= helper.renderRaceTier(raceTier) %></span>
</div>
<% } %>
</div>
| 5 |
diff --git a/lod.js b/lod.js @@ -287,6 +287,14 @@ const equalsNode = (a, b) => {
const equalsNodeLod = (a, b) => {
return equalsNode(a, b) && a.lodArray.every((lod, i) => lod === b.lodArray[i]);
};
+const containsPoint = (a, p) => {
+ return p.x >= a.min.x && p.x < a.min.x + a.lod &&
+ p.y >= a.min.y && p.y < a.min.y + a.lod &&
+ p.z >= a.min.z && p.z < a.min.z + a.lod;
+};
+const containsNode = (a, node) => {
+ return containsPoint(a, node.min);
+};
const isNop = taskSpec => {
// console.log('is nop', taskSpec);
return taskSpec.newNodes.length === taskSpec.oldNodes.length && taskSpec.newNodes.every(newNode => {
| 0 |
diff --git a/addon/templates/components/polaris-text-field.hbs b/addon/templates/components/polaris-text-field.hbs </div>
{{#if connectedLeft}}
- {{component connectedLeft}}
+ {{render-content connectedLeft}}
{{/if}}
<div
onblur={{action handleBlur}}
onclick={{action handleClick}}
>
- <!-- prefix -->
+
+ {{#if prefix}}
+ <div class="Polaris-TextField__Prefix" id="{{id}}Prefix">
+ {{render-content prefix}}
+ </div>
+ {{/if}}
{{component input
id=id
class="Polaris-TextField__Input"
- aria-labelledby=(concat {{id}}Label)
+ aria-labelledby=(concat id "Label")
aria-invalid="false"
value=""
}}
- <!-- suffix -->
+ {{#if suffix}}
+ <div class="Polaris-TextField__Suffix" id="{{id}}Suffix">
+ {{render-content suffix}}
+ </div>
+ {{/if}}
<!-- spinner -->
</div>
{{#if connectedRight}}
- {{component connectedRight}}
+ {{render-content connectedRight}}
{{/if}}
| 4 |
diff --git a/plugins/networking/app/models/networking/floating_ip.rb b/plugins/networking/app/models/networking/floating_ip.rb @@ -14,7 +14,7 @@ module Networking
@subnet_object if @subnet_object
subnets = Rails.cache.fetch("network_#{self.floating_network_id}_subnets", expires_in: 1.hours) do
- services.networking.subnets(network_id: self.floating_network_id)
+ @driver.map_to(Networking::Subnet).subnets(network_id: self.floating_network_id)
end || []
@subnet_object = subnets.find{|subnet| IPAddr.new(subnet.cidr).include?(self.floating_ip_address) }
| 1 |
diff --git a/src/mavoscript.js b/src/mavoscript.js @@ -136,6 +136,23 @@ var _ = Mavo.Script = {
return operatorDefinition && operatorDefinition.comparison;
}
},
+
+ isStatic: node => {
+ if (node.type === "Identifier") {
+ return false;
+ }
+
+ for (let property of _.childProperties) {
+ if (node[property] && property !== "callee") {
+ if (!_.isStatic(node[property])) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ },
+
/**
* Operations for elements and scalars.
* Operations between arrays happen element-wise.
@@ -337,7 +354,7 @@ var _ = Mavo.Script = {
var object = node.arguments[0];
for (let i=1; i<node.arguments.length; i++) {
- if (node.arguments[i].type != "Literal") {
+ if (!_.isStatic(node.arguments[i])) {
node.arguments[i] = Object.assign(_.parse("scope()"), {
arguments: [
object,
| 9 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.