code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss // Colors
-$color-black: #000;
-$color-gray: #939393;
-$color-pink: #e02177;
-$color-red: #D32F2F;
-$color-green: #7AC824;
-$color-orange: #F6A623;
-$color-yellow: #FFD600;
-$color-white: #fff;
-$color-almost-white: #FAFAFA;
-$color-cornflower-blue: #4A90E2;
-$color-asphalt-gray: #525252;
+$color-black: #000 !default;
+$color-gray: #939393 !default;
+$color-pink: #e02177 !default;
+$color-red: #D32F2F !default;
+$color-green: #7AC824 !default;
+$color-orange: #F6A623 !default;
+$color-yellow: #FFD600 !default;
+$color-white: #fff !default;
+$color-almost-white: #FAFAFA !default;
+$color-cornflower-blue: #4A90E2 !default;
+$color-asphalt-gray: #525252 !default;
// Z-index
-$zIndex-negative: -1000;
-$zIndex-1: 100;
-$zIndex-2: 1001;
-$zIndex-3: 1002;
-$zIndex-3: 1003;
-$zIndex-4: 1004;
-$zIndex-5: 1005;
+$zIndex-negative: -1000 !default;
+$zIndex-1: 100 !default;
+$zIndex-2: 1001 !default;
+$zIndex-3: 1002 !default;
+$zIndex-3: 1003 !default;
+$zIndex-4: 1004 !default;
+$zIndex-5: 1005 !default;
// Media Queries
-$screen-medium: 'only screen and (min-width: 768px)';
+$screen-medium: 'only screen and (min-width: 768px)' !default;
| 11 |
diff --git a/lib/ferryman/lib/ferryman.js b/lib/ferryman/lib/ferryman.js @@ -741,7 +741,10 @@ class Ferryman {
}
- if (self.settings.DATAHUB_BASE_URL && passedCfg.nodeSettings.idLinking) {
+ if (self.settings.DATAHUB_BASE_URL
+ && passedCfg.nodeSettings
+ && passedCfg.nodeSettings.idLinking
+ ) {
log.info('In onData ID Linking!');
log.info('oihUid:', data.metadata.oihUid);
log.info('recordUid:', data.metadata.recordUid);
@@ -776,7 +779,9 @@ class Ferryman {
// Create new oihUid if none found
const { recordUid } = data.metadata;
const oihUid = (getIdMetaResult.oihUid) ? getIdMetaResult.oihUid : null;
- const applicationUid = passedCfg.nodeSettings.applicationUid || self.oihMeta.applicationUid;
+ const applicationUid = (passedCfg.nodeSettings && passedCfg.nodeSettings.applicationUid)
+ ? passedCfg.nodeSettings.applicationUid
+ : (self.oihMeta ? self.oihMeta.applicationUid : null);
log.info('About to upsert data entry with: ');
log.info('applicationUid: ', applicationUid);
| 9 |
diff --git a/semantics-3.0/Semantics.hs b/semantics-3.0/Semantics.hs @@ -445,11 +445,11 @@ processTransaction tx state contract = let
inputs = txInputs tx
in case fixInterval (txInterval tx) state of
IntervalTrimmed env fixState -> case applyAllInputs env fixState contract inputs of
- ApplyAllSuccess warnings effects newState cont -> let
- outcomes = getOutcomes effects inputs
+ ApplyAllSuccess warnings payments newState cont -> let
+ outcomes = getOutcomes payments inputs
in if contract == cont
then ProcessError PEUselessTransaction
- else Processed warnings effects outcomes newState cont
+ else Processed warnings payments outcomes newState cont
ApplyAllNoMatchError -> ProcessError PEApplyNoMatchError
ApplyAllAmbiguousSlotIntervalError -> ProcessError PEAmbiguousSlotIntervalError
IntervalError error -> ProcessError (PEIntervalError error)
| 10 |
diff --git a/app/scripts/TiledPlot.js b/app/scripts/TiledPlot.js @@ -932,7 +932,7 @@ class TiledPlot extends React.Component {
}
}
} else {
- if (this.props.tracks.center[0].uid == uid) {
+ if (this.props.tracks.center && this.props.tracks.center.length && this.props.tracks.center[0].uid == uid) {
trackObj.is2d = true;
}
}
| 1 |
diff --git a/packages/yoga/src/Feedback/web/StyledFeedback.jsx b/packages/yoga/src/Feedback/web/StyledFeedback.jsx @@ -18,7 +18,10 @@ export const TextContainer = styled.div`
},
}) =>
css`
+ max-width: 100%;
+ @media (min-width: 769px) {
max-width: ${feedback.text.maxWidth}px;
+ }
`}}
`;
| 1 |
diff --git a/token-metadata/0x5c4ac68aAc56eBe098D621Cd8CE9F43270Aaa355/metadata.json b/token-metadata/0x5c4ac68aAc56eBe098D621Cd8CE9F43270Aaa355/metadata.json "symbol": "BXIOT",
"address": "0x5c4ac68aAc56eBe098D621Cd8CE9F43270Aaa355",
"decimals": 6,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package.json b/package.json "memleak": "node benchmark/memleak-test.js",
"proto": "pbjs -t static-module -w commonjs -o src/serializers/proto/packets.proto.js src/serializers/proto/packets.proto",
"thrift": "thrift -gen js:node -o src\\serializers\\thrift src\\serializers\\thrift\\packets.thrift",
- "test": "node --max-old-space-size=4096 ./node_modules/.bin/jest --coverage --all --forceExit --logHeapUsage",
+ "test": "node --max-old-space-size=4096 ./node_modules/jest-cli/bin/jest.js --coverage --all --forceExit --logHeapUsage",
"test:travis": "npm test && npm run test:trans && npm run test:amqp && npm run test:ts",
"test:unit": "jest --testMatch \"**/unit/**spec.js\" --coverage",
"test:int": "jest --testMatch \"**/integration/**spec.js\" --coverage",
| 1 |
diff --git a/templates/master/index.js b/templates/master/index.js @@ -112,8 +112,7 @@ module.exports={
"Type":"String",
"Description":"Email address for the admin user. Will be used for loging in and for setting the admin password. This email will receive the temporary password for the admin user.",
"AllowedPattern":".+\\@.+\\..+",
- "ConstraintDescription":"Must be valid email address eg. [email protected]",
- "Default":"[email protected]"
+ "ConstraintDescription":"Must be valid email address eg. [email protected]"
},
"Username":{
"Type":"String",
| 2 |
diff --git a/packages/server/public/saltcorn.js b/packages/server/public/saltcorn.js @@ -184,7 +184,7 @@ var logged_errors = [];
function globalErrorCatcher(message, source, lineno, colno, error) {
if (logged_errors.includes(message)) return;
logged_errors.push(message);
- var data = { message, stack: error.stack || "" };
+ var data = { message, stack: (error && error.stack) || "" };
$.ajax("/crashlog/", {
dataType: "json",
type: "POST",
| 11 |
diff --git a/package.json b/package.json "react-addons-test-utils": "^15.4.2",
"react-dom": "^15.4.0",
"reify": "^0.4.4",
+ "source-map-loader": "^0.2.1",
"spy": "^1.0.0",
"tap-browser-color": "^0.1.2",
"tape": "^4.5.1",
| 0 |
diff --git a/redactions/partnerDetail.js b/redactions/partnerDetail.js @@ -4,15 +4,23 @@ import 'isomorphic-fetch';
/**
* CONSTANTS
*/
-const GET_PARTNER_SUCCESS = 'explore/GET_PARTNER_SUCCESS';
-const GET_PARTNER_ERROR = 'explore/GET_PARTNER_ERROR';
-const GET_PARTNER_LOADING = 'explore/GET_PARTNER_LOADING';
+const GET_PARTNER_SUCCESS = 'partnerDetail/GET_PARTNER_SUCCESS';
+const GET_PARTNER_ERROR = 'partnerDetail/GET_PARTNER_ERROR';
+const GET_PARTNER_LOADING = 'partnerDetail/GET_PARTNER_LOADING';
+const GET_DATASETS_SUCCESS = 'partnerDetail/GET_DATASETS_SUCCESS';
+const GET_DATASETS_ERROR = 'partnerDetail/GET_DATASETS_ERROR';
+const GET_DATASETS_LOADING = 'partnerDetail/GET_DATASETS_LOADING';
/**
* REDUCER
*/
const initialState = {
- data: {}
+ data: {},
+ datasets: {
+ loading: false,
+ error: null,
+ list: []
+ }
};
export default function (state = initialState, action) {
@@ -33,6 +41,36 @@ export default function (state = initialState, action) {
}
case GET_PARTNER_LOADING: {
+ return Object.assign({}, state, {
+ datasets: {
+ list: [],
+ loading: true,
+ error: null
+ }
+ });
+ }
+
+ case GET_DATASETS_SUCCESS: {
+ return Object.assign({}, state, {
+ datasets: {
+ list: action.payload,
+ loading: false,
+ error: null
+ }
+ });
+ }
+
+ case GET_DATASETS_ERROR: {
+ return Object.assign({}, state, {
+ datasets: {
+ list: [],
+ loading: false,
+ error: true
+ }
+ });
+ }
+
+ case GET_DATASETS_LOADING: {
return Object.assign({}, state, {
loading: true,
error: false
| 6 |
diff --git a/README.md b/README.md @@ -21,12 +21,20 @@ A Plugin for the popular java web framework struts2 to provide ajax functionalit
* Add the Tag-Lib to your JSP `<%@ taglib prefix="sj" uri="/struts-jquery-tags"%>`
* Place the [HeadTag Head Tag] inside your html head tags
+### versions and compatibility
+| `struts2-jquery` version | `struts2` version |
+|--------------------------|---------------------------------|
+| `4.0.2` | version >= `2.5` |
+| `3.7.1` | `2.3.16` <= version <= `2.3.31` |
+
+As a general rule of thumb, it's advised to upgrade to the latest version within the same major version range. This should avoid bugs and vulnerabilities that already got fixed in more recent versions.
+
+See [Changelog](https://github.com/struts-community-plugins/struts2-jquery/wiki/Changelog) for more information
+
### How can I use the Plugin from Maven?
Since version 1.8.3 the plugin is found in the central Maven repository. Just add to your dependencies section:
-Latest version which is compatible to Struts 2.3.x is version [3.7.1].
-
```xml
<dependencies>
...
| 3 |
diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js @@ -10,7 +10,7 @@ const xmlFolder = __dirname + '/../FakeResponses/Air';
describe('#AirParser', function () {
describe('AIR_LOW_FARE_SEARCH()', () => {
it('should test parsing of low fare search request', () => {
- const uParser = new ParserUapi('air:LowFareSearchRsp', 'v_33_0', {});
+ const uParser = new ParserUapi('air:LowFareSearchRsp', 'v33_0', {});
const parseFunction = airParser.AIR_LOW_FARE_SEARCH_REQUEST;
const xml = fs.readFileSync(`${xmlFolder}/LowFaresSearch.2ADT1CNNIEVBKK.xml`).toString();
@@ -44,7 +44,7 @@ describe('#AirParser', function () {
});
it('should compare xml with parsed json', () => {
- const uParser = new ParserUapi('air:LowFareSearchRsp', 'v_33_0', {});
+ const uParser = new ParserUapi('air:LowFareSearchRsp', 'v33_0', {});
const parseFunction = airParser.AIR_LOW_FARE_SEARCH_REQUEST;
const xml = fs.readFileSync(`${xmlFolder}/LowFaresSearch.2ADT1CNNIEVBKK.xml`).toString();
const jsonResult = require('../FakeResponses/Air/LowFaresSearch.2ADT1CNNIEVBKK.json');
@@ -55,7 +55,7 @@ describe('#AirParser', function () {
});
it('should compare xml with parsed json', () => {
- const uParser = new ParserUapi('air:LowFareSearchRsp', 'v_33_0', {});
+ const uParser = new ParserUapi('air:LowFareSearchRsp', 'v33_0', {});
const parseFunction = airParser.AIR_LOW_FARE_SEARCH_REQUEST;
const xml = fs.readFileSync(`${xmlFolder}/LowFaresSearch.1ADTIEVPAR.xml`).toString();
const jsonResult = require('../FakeResponses/Air/LowFaresSearch.1ADTIEVPAR.json');
@@ -111,7 +111,7 @@ describe('#AirParser', function () {
ageCategory: 'ADT',
}];
- const uParser = new ParserUapi(null, 'v_36_0', { passengers });
+ const uParser = new ParserUapi(null, 'v36_0', { passengers });
const parseFunction = airParser.AIR_PRICE_REQUEST_PRICING_SOLUTION_XML;
const xml = fs.readFileSync(`${xmlFolder}/AirPricingSolution.IEVPAR.xml`).toString();
const jsonSaved = require('../FakeResponses/Air/AirPricingSolution.IEVPAR.json');
@@ -134,7 +134,7 @@ describe('#AirParser', function () {
ageCategory: 'ADT',
}];
- const uParser = new ParserUapi(null, 'v_36_0', { passengers });
+ const uParser = new ParserUapi(null, 'v36_0', { passengers });
const parseFunction = airParser.AIR_PRICE_REQUEST_PRICING_SOLUTION_XML;
const xml = fs.readFileSync(`${xmlFolder}/AirPricingSolution.IEVPAR.2ADT1CNN.xml`).toString();
const jsonSaved = require('../FakeResponses/Air/AirPricingSolution.IEVPAR.2ADT1CNN.json');
@@ -157,7 +157,7 @@ describe('#AirParser', function () {
ageCategory: 'ADT',
}];
- const uParser = new ParserUapi(null, 'v_36_0', { passengers });
+ const uParser = new ParserUapi(null, 'v36_0', { passengers });
const parseFunction = airParser.AIR_PRICE_REQUEST_PRICING_SOLUTION_XML;
const xml = fs.readFileSync(`${xmlFolder}/AirPricingSolution.2AirPrice.xml`).toString();
// const jsonSaved = require('../FakeResponses/Air/AirPricingSolution.2AirPrice.xml.json');
| 14 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -2237,15 +2237,14 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
+ isPosition,
} = spec;
- if (isTop) {
const isCombo = Array.isArray(this.useAnimation);
const useAnimationName = isCombo ? this.useAnimation[this.useAnimationIndex] : this.useAnimation;
const useAnimation = (useAnimationName && useAnimations[useAnimationName]);
_handleDefault(spec);
- if (useAnimation) {
const t2 = (() => {
if (isCombo) {
return Math.min(this.useTime/1000, useAnimation.duration);
@@ -2253,6 +2252,8 @@ class Avatar {
return (this.useTime/1000) % useAnimation.duration;
}
})();
+ if (!isPosition) {
+ if (useAnimation) {
const src2 = useAnimation.interpolants[k];
const v2 = src2.evaluate(t2);
@@ -2268,7 +2269,17 @@ class Avatar {
_handleDefault(spec);
} */
} else {
- _handleDefault(spec);
+ const src2 = useAnimation.interpolants[k];
+ const v2 = src2.evaluate(t2);
+
+ const idleAnimation = _getIdleAnimation('walk');
+ const t3 = 0;
+ const src3 = idleAnimation.interpolants[k];
+ const v3 = src3.evaluate(t3);
+
+ dst
+ .sub(localVector2.fromArray(v3))
+ .add(localVector2.fromArray(v2));
}
};
} else if (this.aimAnimation) {
@@ -2276,14 +2287,15 @@ class Avatar {
const {
animationTrackName: k,
dst,
- isTop,
+ // isTop,
+ isPosition,
} = spec;
- if (isTop) {
const aimAnimation = (this.aimAnimation && aimAnimations[this.aimAnimation]);
_handleDefault(spec);
- if (aimAnimation) {
const t2 = (this.aimTime/aimMaxTime) % aimAnimation.duration;
+ if (!isPosition) {
+ if (aimAnimation) {
const src2 = aimAnimation.interpolants[k];
const v2 = src2.evaluate(t2);
@@ -2299,7 +2311,17 @@ class Avatar {
_handleDefault(spec);
} */
} else {
- _handleDefault(spec);
+ const src2 = aimAnimation.interpolants[k];
+ const v2 = src2.evaluate(t2);
+
+ const idleAnimation = _getIdleAnimation('walk');
+ const t3 = 0;
+ const src3 = idleAnimation.interpolants[k];
+ const v3 = src3.evaluate(t3);
+
+ dst
+ .sub(localVector2.fromArray(v3))
+ .add(localVector2.fromArray(v2));
}
};
}
| 0 |
diff --git a/js/bitmex.js b/js/bitmex.js @@ -1539,7 +1539,7 @@ module.exports = class bitmex extends Exchange {
const side = this.safeStringLower (trade, 'side');
// price * amount doesn't work for all symbols (e.g. XBT, ETH)
let fee = undefined;
- const feeCostString = Precise.stringDiv (this.safeString (trade, 'execComm'), '1e6');
+ const feeCostString = Precise.stringDiv (this.safeString (trade, 'execComm'), '1e8');
if (feeCostString !== undefined) {
const currencyId = this.safeString (trade, 'settlCurrency');
const feeCurrencyCode = this.safeCurrencyCode (currencyId);
| 13 |
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml @@ -72,7 +72,6 @@ jobs:
BUILD_NUMBER: ${{ github.run_number }}
run: |
echo "Creating release number ${BUILD_NUMBER}"
- b:929 929 x: y:${GITHUB_RUN_NUMBER} 929 929 gh: 929 929
echo "ENV=development" >> $GITHUB_ENV
echo "BRANCH=${{ github.ref }}" >> $GITHUB_ENV
echo "SECRET_NAME=DEV_ENV" >> $GITHUB_ENV
| 3 |
diff --git a/src/utils/innerSliderUtils.js b/src/utils/innerSliderUtils.js @@ -45,24 +45,3 @@ export const slidesOnRight = spec => (
? Math.floor((spec.slidesToShow - 1) / 2) + 1 + (parseInt(spec.centerPadding) > 0 ? 1 : 0)
: spec.slidesToShow
)
-
-export const elementInViewport = el => {
- var top = el.offsetTop;
- var left = el.offsetLeft;
- var width = el.offsetWidth;
- var height = el.offsetHeight;
-
- while(el.offsetParent) {
- el = el.offsetParent;
- top += el.offsetTop;
- left += el.offsetLeft;
- }
-
- if (!window) return false
- return (
- top >= window.pageYOffset &&
- left >= window.pageXOffset &&
- (top + height) <= (window.pageYOffset + window.innerHeight) &&
- (left + width) <= (window.pageXOffset + window.innerWidth)
- );
-}
| 2 |
diff --git a/src/pages/auth.js b/src/pages/auth.js import React, { Component } from "react";
import PropTypes from "prop-types";
+import { Router } from "routes";
class AuthPage extends Component {
static propTypes = {
- url: PropTypes.object.isRequired
- }
-
- state = {
- isAuthenticating: true
+ router: PropTypes.object.isRequired
}
getUrlParams() {
- const hashObj = this.props.url.asPath
+ const hashObj = this.props.router.asPath
.substring(6)
.split("&")
.map((el) => el.split("="))
@@ -30,19 +27,13 @@ class AuthPage extends Component {
if (typeof window !== "undefined" && params.access_token) {
localStorage.setItem("kc-token", params.access_token);
+ Router.pushRoute("/");
}
}
render() {
this.setToken();
- return (
- <div>
- <h4>Successful OAuth response:</h4>
- <pre>
- {JSON.stringify(this.getUrlParams(), null, 2)}
- </pre>
- </div>
- );
+ return <div>Logging in...</div>;
}
}
| 3 |
diff --git a/karma.conf.js b/karma.conf.js @@ -181,6 +181,7 @@ module.exports = (config) => {
} else {
options.concurrency = 1;
options.captureTimeout = 300000;
+ options.browserNoActivityTimeout = 300000;
options.reporters.push("BrowserStack");
options.customLaunchers = {
"Chrome 26 on Windows 7": {
| 12 |
diff --git a/js/views/Map.js b/js/views/Map.js @@ -193,7 +193,13 @@ function points(el, props) {
var intersects = raycaster.intersectObjects(pointGroups, false);
if (intersects.length) {
- var i = intersects[0].index;
+ var i;
+ if (twoD) {
+ // lower index is always on the bottom
+ i = _.maxWith(intersects, (a, b) => b.index - a.index).index;
+ } else {
+ i = intersects[0].index;
+ }
lastColorI = i;
lastColor = [
color[i * 3],
| 7 |
diff --git a/pages/evenements.js b/pages/evenements.js @@ -50,12 +50,14 @@ function Evenements() {
<div className='events-container'>
{futureEvents.length > 0 ? (
futureEvents.map(event => {
+ const id = `${event.titre}-${event.date}`
return (
<Event
key={`${event.titre}-${event.date}`}
event={event}
- id={`${event.titre}-${event.date}`}
- activeEvent={activeEvent}
+ id={id}
+ isOpen={activeEvent === id}
+ isAllClose={activeEvent === null}
handleOpen={handleActiveEvent}
/>
)
@@ -73,14 +75,16 @@ function Evenements() {
<div className='events-container'>
{futureEvents.length > 0 ? (
passedEvents.map(event => {
+ const id = `${event.titre}-${event.date}`
return (
<Event
key={`${event.titre}-${event.date}`}
- id={`${event.titre}-${event.date}`}
+ id={id}
event={event}
background='grey'
isPassed
- activeEvent={activeEvent}
+ isOpen={activeEvent === id}
+ isAllClose={activeEvent === null}
handleOpen={handleActiveEvent}
/>
)
| 7 |
diff --git a/PostBanDeletedPosts.user.js b/PostBanDeletedPosts.user.js // @description When user posts on SO Meta regarding a post ban, fetch and display deleted posts (must be mod) and provide easy way to copy the results into a comment
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 2.4.1
+// @version 2.4.2
//
// @include https://meta.stackoverflow.com/questions/*
//
// If post is not within past three days, or has more than 20 links, do not auto-post anything!
if(!isSuperuser || !isRelativelyNew || hyperlinks2.length > 20) return;
- // If there are more comments or comments by myself, ignore
+ // If there are more comments or comments by myself, or deleted comments, ignore
const hasMyComments = post.find(`.comment-user[href*="/users/${StackExchange.options.user.userId}/"]`).length > 0;
- if(post.find('.js-show-link:visible').length !== 0 || hasMyComments) return;
+ const hasDeletedComments = post.find('.js-fetch-deleted-comments, .js-show-deleted-comments-link').length > 0;
+ if(post.find('.js-show-link:visible').length !== 0 || hasMyComments || hasDeletedComments) return;
debugger;
if(comment.length <= 600) {
addComment(pid, comment).then(() => location.reload());
}
- else {
- const spl = comment.split(' [11]');
- addComment(pid, spl[0] + '...').then(() => {
- addComment(pid, '... [11]' + spl[1]).then(() => location.reload());
- });
- }
}
});
}
| 8 |
diff --git a/test/test.js b/test/test.js @@ -176,7 +176,7 @@ module.exports = function (redom) {
});
});
t.test('lifecycle with shadow root', function (t) {
- t.plan(1);
+ t.plan(2);
var div = document.createElement('div');
var root = div.createShadowRoot();
var eventsFired = {};
@@ -186,11 +186,19 @@ module.exports = function (redom) {
this.onmount = function () {
eventsFired.onmount = true;
};
+ this.onunmount = function () {
+ eventsFired.onunmount = true;
+ };
}
- mount(root, new Test());
+ var test = new Test();
+
+ mount(root, test);
t.equals(eventsFired.onmount, true);
+ unmount(root, test);
+
+ t.equals(eventsFired.onunmount, true);
});
t.test('component lifecycle events inside node element', function (t) {
t.plan(1);
| 0 |
diff --git a/src/utility/index.jsx b/src/utility/index.jsx @@ -846,5 +846,6 @@ export function getColStyle(column) {
borderLeft: column.borderLeft,
borderRight: column.borderRight,
backgroundColor: column.backgroundColor,
+ direction: column.textAlign === 'right' && 'rtl',
};
}
| 13 |
diff --git a/icons/mdi.js b/icons/mdi.js @@ -7,10 +7,10 @@ export default {
warning: 'mdi-exclamation'
},
arrow: {
- up: 'mdi-arrow-upward',
- right: 'mdi-arrow-forward',
- down: 'mdi-arrow-downward',
- left: 'mdi-arrow-back'
+ up: 'mdi-arrow-up',
+ right: 'mdi-arrow-right',
+ down: 'mdi-arrow-down',
+ left: 'mdi-arrow-left'
},
chevron: {
left: 'mdi-chevron-left',
@@ -18,7 +18,7 @@ export default {
},
pullToRefresh: {
- arrow: 'mdi-arrow-downward',
+ arrow: 'mdi-arrow-down',
refresh: 'mdi-refresh'
},
search: {
@@ -90,7 +90,7 @@ export default {
font: 'mdi-format-font'
},
fab: {
- icon: 'mdi-add',
+ icon: 'mdi-plus',
activeIcon: 'mdi-close'
},
input: {
@@ -131,7 +131,7 @@ export default {
right: 'mdi-chevron-right'
},
table: {
- arrowUp: 'mdi-arrow-upward',
+ arrowUp: 'mdi-arrow-up',
warning: 'mdi-alert',
prevPage: 'mdi-chevron-left',
nextPage: 'mdi-chevron-right'
@@ -140,7 +140,7 @@ export default {
icon: 'mdi-play'
},
uploader: {
- done: 'mdi-done',
+ done: 'mdi-check',
clear: 'mdi-close-circle',
clearInverted: 'mdi-close',
add: 'mdi-plus',
| 1 |
diff --git a/components/Discussion/DiscussionComposer/DiscussionComposer.tsx b/components/Discussion/DiscussionComposer/DiscussionComposer.tsx @@ -83,12 +83,6 @@ const DiscussionComposer = ({
response = await editCommentHandler(commentId, value, tags)
}
- setActive(false)
-
- if (onClose) {
- onClose()
- }
-
return response
} catch (err) {
return {
@@ -115,10 +109,9 @@ const DiscussionComposer = ({
: t('submitComment/rootSubmitLabel')
}
onClose={() => {
+ setActive(false)
if (onClose) {
onClose()
- } else {
- setActive(false)
}
}}
onOpenPreferences={() =>
| 9 |
diff --git a/docs/plugins/syntaxhighlight.md b/docs/plugins/syntaxhighlight.md @@ -61,10 +61,10 @@ const syntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight");
module.exports = function(eleventyConfig) {
eleventyConfig.addPlugin(syntaxHighlight, {
- // Change which syntax highlighters are installed
+ // Change which Eleventy template formats use syntax highlighters
templateFormats: ["*"], // default
- // Or, just njk and md syntax highlighters (do not install liquid)
+ // e.g. Use syntax highlighters in njk and md Eleventy templates (not liquid)
// templateFormats: ["njk", "md"],
// init callback lets you customize Prism
| 3 |
diff --git a/src/apps.json b/src/apps.json },
"cpe": "cpe:/a:kentico:kentico_cms",
"icon": "Kentico CMS.png",
+ "js": {
+ "CMS.Application": ""
+ },
+ "script": "/CMSPages/GetResource\\.ashx",
"meta": {
"generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1"
},
| 7 |
diff --git a/lib/models/base_token.js b/lib/models/base_token.js @@ -90,7 +90,7 @@ module.exports = function getBaseToken(provider) {
static async find(token = '', { ignoreExpiration = false } = {}) {
try {
- const jti = this.getJtiFromToken(token);
+ const jti = this.getTokenId(token);
assert(jti);
const stored = await this.adapter.find(jti);
assert(stored);
@@ -107,6 +107,11 @@ module.exports = function getBaseToken(provider) {
/**
* @name getValueAndPayload
* @api public
+ *
+ * Return an Array instance with the first member being a string representation of the token as
+ * it should be returned to the client. Second member being an Object that should be passed to
+ * the adapter for storage.
+ *
*/
async getValueAndPayload() {
const [jwt, random] = await Promise.all([
@@ -126,21 +131,40 @@ module.exports = function getBaseToken(provider) {
}
/**
- * @name getJtiFromToken
+ * @name getTokenId
* @api public
+ *
+ * Return the Token instance ID related of the presented token. This ID will be passed to the
+ * adapter for lookup.
+ *
+ * @param token - the presented token string value
+ *
*/
- static getJtiFromToken(token) {
+ static getTokenId(token) {
return token.substring(0, 48);
}
/**
* @name verify
* @api public
+ *
+ * A verify function that asserts that the presented token is valid, not expired,
+ * or otherwise manipulated with.
+ *
+ * @param token - the presented token string value
+ * @param stored - data returned from the adapter token lookup
+ * @param options - options object
+ * @param options.ignoreExpiration - Boolean indicating whether expired but still stored
+ * tokens should pass this verification.
+ *
*/
- static async verify(token, stored, { ignoreExpiration }) {
+ static async verify(token, stored, options) {
assert(constantEquals(Buffer.from(token.substring(48)), Buffer.from(stored.signature)));
const { payload } = JWT.decode([stored.header, stored.payload, stored.signature].join('.'));
- JWT.assertPayload(payload, { ignoreExpiration, issuer: provider.issuer });
+ JWT.assertPayload(payload, {
+ ignoreExpiration: options.ignoreExpiration,
+ issuer: provider.issuer,
+ });
return payload;
}
};
| 10 |
diff --git a/src/pdf.image_decoders.js b/src/pdf.image_decoders.js */
import { getVerbosityLevel, setVerbosityLevel } from "./shared/util.js";
-import { Jbig2mage } from "./core/jbig2.js";
+import { Jbig2Image } from "./core/jbig2.js";
import { JpegImage } from "./core/jpg.js";
import { JpxImage } from "./core/jpx.js";
@@ -37,4 +37,10 @@ const pdfjsVersion = PDFJSDev.eval("BUNDLE_VERSION");
// eslint-disable-next-line no-unused-vars
const pdfjsBuild = PDFJSDev.eval("BUNDLE_BUILD");
-export { getVerbosityLevel, Jbig2mage, JpegImage, JpxImage, setVerbosityLevel };
+export {
+ getVerbosityLevel,
+ Jbig2Image,
+ JpegImage,
+ JpxImage,
+ setVerbosityLevel,
+};
| 1 |
diff --git a/app/renderer/assets/locales/en-US/tools.json b/app/renderer/assets/locales/en-US/tools.json "tools_menu_keyvalidator": "Key Validator",
"tools_menu_permissions": "Permissions",
"tools_menu_proxy": "Register Voting Proxy",
- "tools_menu_recommendation": "Recommendations",
+ "tools_menu_recommendation": "Security / Best Practices",
"tools_menu_reset": "Reset Application",
"tools_menu_state": "Wallet State",
"tools_menu_state_chain": "Chain State",
| 10 |
diff --git a/src/components/organisms/RecentBlogPosts/index.js b/src/components/organisms/RecentBlogPosts/index.js @@ -2,7 +2,7 @@ import React from 'react'
import { useStaticQuery, graphql } from 'gatsby'
import { CardGrid, Container } from 'components/atoms'
import { CardDefault } from 'components/molecules'
-const { kebabCase } = require(`lodash`)
+import {makeAuthorSlug, avatarPath} from 'utils'
export default ( {teammate, currentPost, ...props} ) => {
const data = useStaticQuery(graphql`
@@ -35,7 +35,7 @@ export default ( {teammate, currentPost, ...props} ) => {
`)
const Posts = data.allMdx.edges
- .filter(edges => kebabCase(edges.node.frontmatter.author.id) === teammate && edges.node.id !== currentPost)
+ .filter(edges => makeAuthorSlug(edges.node.frontmatter.author.id) === teammate && edges.node.id !== currentPost)
.slice(0,3)
.map(({ node }) => (
<CardDefault
@@ -45,7 +45,7 @@ export default ( {teammate, currentPost, ...props} ) => {
link={node.fields.slug}
title={node.frontmatter.title}
subtitle={`${node.timeToRead}` + ' Min Read'}
- avatarImageURL={`${'/images/headshots/' + kebabCase(node.frontmatter.author.id) + '-h.jpg'}`}
+ avatarImageURL={avatarPath(node.frontmatter.author.id)}
/>
))
| 4 |
diff --git a/metaverse_modules/land/index.js b/metaverse_modules/land/index.js @@ -118,6 +118,14 @@ export default e => {
}
return result;
};
+ app.getChunkForPhysicsObject = physicsObject => {
+ for (const subApp of subApps) {
+ if (subApp.getChunkForPhysicsObject) {
+ return subApp.getChunkForPhysicsObject(physicsObject);
+ }
+ }
+ return null;
+ }
useCleanup(() => {
for (const subApp of subApps) {
| 0 |
diff --git a/src/screens/ParadeNavigator/component.js b/src/screens/ParadeNavigator/component.js // @flow
-import React from "react";
-import { View, StyleSheet } from "react-native";
import { createMaterialTopTabNavigator } from "react-navigation";
import { PARADE_INFORMATION, PARADE_MAP } from "../../constants/routes";
import ParadeInformationScreen from "../ParadeInformationScreen";
import ParadeMapScreen from "../ParadeMapScreen";
-import Text from "../../components/Text";
+import TopTabBar from "../../components/TopTabBar";
import { lightTealColor, darkBlueGreyColor } from "../../constants/colors";
import text from "../../constants/text";
+export const getTabTestId = (routeName: string) => {
+ switch (routeName) {
+ case PARADE_INFORMATION:
+ return "parade-information-button";
+ case PARADE_MAP:
+ return "parade-map-button";
+ default:
+ return "";
+ }
+};
+
const ParadeTabNav = createMaterialTopTabNavigator(
{
[PARADE_MAP]: {
screen: ParadeMapScreen,
navigationOptions: {
- tabBarLabel: () => (
- <View style={styles.view}>
- <Text testID="parade-map-button" type="xSmall" style={styles.text}>
- {text.tabParadeMap}
- </Text>
- </View>
- )
+ tabBarLabel: text.tabParadeMap
}
},
[PARADE_INFORMATION]: {
screen: ParadeInformationScreen,
navigationOptions: {
- tabBarLabel: () => (
- <View style={styles.view}>
- <Text
- testID="parade-information-button"
- type="xSmall"
- style={styles.text}
- >
- {text.tabParadeStages}
- </Text>
- </View>
- )
+ tabBarLabel: text.tabParadeStages
}
}
},
{
+ tabBarComponent: TopTabBar,
swipeEnabled: false,
animationEnabled: false,
initialRouteName: PARADE_MAP,
@@ -53,20 +47,10 @@ const ParadeTabNav = createMaterialTopTabNavigator(
style: {
backgroundColor: darkBlueGreyColor
},
- upperCaseLabel: false
+ upperCaseLabel: false,
+ getTabTestID: getTabTestId
}
}
);
-const styles = StyleSheet.create({
- view: {
- height: 33,
- justifyContent: "center",
- alignItems: "center"
- },
- text: {
- color: lightTealColor
- }
-});
-
export default ParadeTabNav;
| 4 |
diff --git a/components/Discussion/graphql/enhancers/withDiscussionComments.js b/components/Discussion/graphql/enhancers/withDiscussionComments.js @@ -19,7 +19,7 @@ import { discussionQuery, commentsSubscription } from '../documents'
export const withDiscussionComments = graphql(discussionQuery, {
props: ({
- ownProps: { discussionId, orderBy, tag, parentId: initialParentId },
+ ownProps: { discussionId, orderBy, activeTag, parentId: initialParentId },
data: { fetchMore, subscribeToMore, ...data }
}) => ({
discussionComments: {
@@ -37,7 +37,7 @@ export const withDiscussionComments = graphql(discussionQuery, {
parentId,
after,
orderBy,
- tag,
+ activeTag,
depth: depth || 3,
includeParent
},
| 10 |
diff --git a/scenes/shadows.scn b/scenes/shadows.scn },
{
"type": "application/quest",
+ "position": [19.5, -4, 59.5],
+ "components": [
+ {
+ "key": "size",
+ "value": [10, 2, 4]
+ },
+ {
+ "key": "cameraPosition",
+ "value": [0, 5, 10]
+ },
+ {
+ "key": "cameraQuaternion",
+ "value": [-0.19509032201612825, -0, -0, 0.9807852804032304]
+ }
+ ],
"content": {
"name": "Reaver slay",
"description": "Destroy all reavers in the area",
| 0 |
diff --git a/README.md b/README.md @@ -13,5 +13,8 @@ Public demo of the latest version → [https://grocy.projectdemos.berrnd.org]
## How to install
Just unpack the [latest release](https://github.com/berrnd/grocy/releases/latest) on your PHP enabled webserver, copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go. Alternatively clone this repository and install Composer and Bower dependencies manually.
+## Notes about barcode readers
+Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter this is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+
## License
The MIT License (MIT)
| 0 |
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts @@ -483,6 +483,73 @@ export const fetchCoinActivities = async (
};
};
+
+const fetchEngineTokensData = async (username:string, hivePrice:number, vsCurrency:string) => {
+
+ const engineCoinData:{ [key: string]: CoinData } = {};
+
+ try{
+ const engineData = await fetchHiveEngineTokenBalances(username);
+ if (engineData) {
+ engineData.forEach((item) => {
+ if (item) {
+ const balance = item.balance;
+ const ppToken = hivePrice * (item.tokenPrice || 1);
+
+ const actions = [`${EngineActions.TRANSFER}_engine`]
+
+ if(item.delegationEnabled){
+ actions.push(`${EngineActions.DELEGATE}_engine`);
+ }
+
+ if(item.delegationEnabled && item.delegationsOut){
+ actions.push(`${EngineActions.UNDELEGATE}_engine`);
+ }
+
+ if(item.stakingEnabled && item.balance > 0){
+ actions.push(`${EngineActions.STAKE}_engine`)
+ }
+
+ if(item.stake){
+ actions.push(`${EngineActions.UNSTAKE}_engine`)
+ }
+
+ engineCoindData[item.symbol] = {
+ name: item.name || '',
+ symbol: item.symbol,
+ iconUrl: item.icon || '',
+ balance: balance,
+ estimateValue: balance * ppToken,
+ vsCurrency: vsCurrency,
+ currentPrice: ppToken,
+ unclaimedBalance: item.unclaimedBalance,
+ isEngine: true,
+ percentChange: item.percentChange,
+ actions,
+ extraDataPairs:[{
+ dataKey: 'staked',
+ value: item.stake !== 0 ? `${item.stake}` : '0.00'
+ },{
+ dataKey: 'delegations_in',
+ value: item.delegationsIn !== 0 ? `${item.delegationsIn}` : '0.00'
+ },{
+ dataKey: 'delegations_out',
+ value: item.delegationsOut !== 0 ? `${item.delegationsOut}` : '0.00'
+ }]
+ };
+ }
+ });
+ }
+ } catch(err){
+ console.warn("failed to get engine tokens data", err);
+ }
+
+ return engineCoinData;
+
+
+}
+
+
export const fetchCoinsData = async ({
coins,
currentAccount,
@@ -501,7 +568,7 @@ export const fetchCoinsData = async ({
refresh: boolean;
}): Promise<{ [key: string]: CoinData }> => {
const username = currentAccount.username;
- const coinData = {} as { [key: string]: CoinData };
+ let coinData = {} as { [key: string]: CoinData };
const walletData = {} ;
if (!username) {
@@ -680,57 +747,10 @@ export const fetchCoinsData = async ({
}
});
- const engineData = await fetchHiveEngineTokenBalances(username);
- if (engineData) {
- engineData.forEach((item) => {
- if (item) {
- const balance = item.balance;
- const ppToken = _prices.hive.price * (item.tokenPrice || 1);
- const actions = [`${EngineActions.TRANSFER}_engine`]
+ const engineCoinsData = await fetchEngineTokensData(username, _prices.hive.price, vsCurrency);
+ coinData = {...coinData, ...engineCoinsData};
- if(item.delegationEnabled){
- actions.push(`${EngineActions.DELEGATE}_engine`);
- }
-
- if(item.delegationEnabled && item.delegationsOut){
- actions.push(`${EngineActions.UNDELEGATE}_engine`);
- }
-
- if(item.stakingEnabled && item.balance > 0){
- actions.push(`${EngineActions.STAKE}_engine`)
- }
-
- if(item.stake){
- actions.push(`${EngineActions.UNSTAKE}_engine`)
- }
-
- coinData[item.symbol] = {
- name: item.name || '',
- symbol: item.symbol,
- iconUrl: item.icon || '',
- balance: balance,
- estimateValue: balance * ppToken,
- vsCurrency: vsCurrency,
- currentPrice: ppToken,
- unclaimedBalance: item.unclaimedBalance,
- isEngine: true,
- percentChange: item.percentChange,
- actions,
- extraDataPairs:[{
- dataKey: 'staked',
- value: item.stake !== 0 ? `${item.stake}` : '0.00'
- },{
- dataKey: 'delegations_in',
- value: item.delegationsIn !== 0 ? `${item.delegationsIn}` : '0.00'
- },{
- dataKey: 'delegations_out',
- value: item.delegationsOut !== 0 ? `${item.delegationsOut}` : '0.00'
- }]
- };
- }
- });
- }
//TODO:discard unnessacry data processings towards the end of PR
walletData.rewardHiveBalance = parseToken(userdata.reward_hive_balance);
| 9 |
diff --git a/src/lib/svg_text_utils.js b/src/lib/svg_text_utils.js @@ -252,7 +252,13 @@ var TAG_CLOSE = {
sub: '<tspan dy="-0.21em">​</tspan>'
};
-var PROTOCOLS = ['http:', 'https:', 'mailto:'];
+/*
+ * Whitelist of protocols in user-supplied urls. Mostly we want to avoid javascript
+ * and related attack vectors. The empty string is there for IE, that treats
+ * relative paths as having no protocol, while other browsers have these explicitly
+ * inherit the protocol of the page they're in.
+ */
+var PROTOCOLS = ['http:', 'https:', 'mailto:', ''];
var STRIP_TAGS = new RegExp('</?(' + Object.keys(TAG_STYLES).join('|') + ')( [^>]*)?/?>', 'g');
| 0 |
diff --git a/app/components/namespace-resource-quota/template.hbs b/app/components/namespace-resource-quota/template.hbs <thead>
<tr>
<th>{{t 'formResourceQuota.table.type.label'}}</th>
- <th width="200px">{{t 'formResourceQuota.table.resources.label'}}</th>
+ <th>{{t 'formResourceQuota.table.resources.label'}}</th>
<th>{{t 'formResourceQuota.table.value.label'}}</th>
</tr>
</thead>
| 2 |
diff --git a/packages/angular/src/flyout-menu/flyout-menu-pane.component.ts b/packages/angular/src/flyout-menu/flyout-menu-pane.component.ts @@ -128,7 +128,7 @@ export class FlyoutMenuPane extends Dialog {
let topFix =
(closestRel ? closestRel.getBoundingClientRect().top * -1 : 0) -
chevronHeight / 2 +
- 1.5 * borderWidth;
+ 1 * borderWidth;
const leftFix = closestRel ? closestRel.getBoundingClientRect().left * -1 : 0;
if (this.dialogConfig.placement === 'top') {
| 1 |
diff --git a/src/components/Calendar.js b/src/components/Calendar.js @@ -82,6 +82,14 @@ class Calendar extends React.Component {
}
}
+ componentDidUpdate (prevProps, prevState) {
+ if (prevState.focusedDay !== this.state.focusedDay) {
+ const focusedDayRef = this[this.state.focusedDay];
+
+ if (focusedDayRef && focusedDayRef.focus) focusedDayRef.focus();
+ }
+ }
+
_handleNextClick = () => {
const currentDate = moment
.unix(this.state.currentDate)
| 9 |
diff --git a/app/src/scripts/dataset/tools/jobs/index.js b/app/src/scripts/dataset/tools/jobs/index.js @@ -461,10 +461,10 @@ class JobMenu extends React.Component {
_applyDefaults(parameters, metadata) {
Object.keys(metadata).forEach(param => {
- if ('defaultChecked' in metadata[param]) {
+ const type = metadata[param].type
+ if (type in ['multi', 'select'] && 'defaultChecked' in metadata[param]) {
parameters[param] = metadata[param].defaultChecked
- }
- if (metadata[param].type === 'radio') {
+ } else if (type === 'radio') {
// Sets a default for a radio parameter if none is configured
if (metadata[param].options) {
// Current schema
| 1 |
diff --git a/packages/bitcore-lib-doge/test/networks.js b/packages/bitcore-lib-doge/test/networks.js @@ -18,16 +18,15 @@ describe('Networks', function() {
it('will enable/disable regtest Network', function() {
networks.enableRegtest();
networks.testnet.networkMagic.should.deep.equal(new Buffer('fabfb5da', 'hex'));
- networks.testnet.port.should.equal(19444);
+ networks.testnet.port.should.equal(18444);
networks.testnet.dnsSeeds.should.deep.equal([]);
networks.testnet.regtestEnabled.should.equal(true);
networks.disableRegtest();
- networks.testnet.networkMagic.should.deep.equal(new Buffer('fdd2c8f1', 'hex'));
- networks.testnet.port.should.equal(19335);
+ networks.testnet.networkMagic.should.deep.equal(new Buffer('fcc1b7dc', 'hex'));
+ networks.testnet.port.should.equal(44556);
networks.testnet.dnsSeeds.should.deep.equal([
- 'testnet-seed.litecointools.com',
- 'seed-b.litecoin.loshan.co.uk'
+ 'testseed.jrn.me.uk',
]);
});
@@ -100,14 +99,14 @@ describe('Networks', function() {
});
it('tests only for the specified key', function() {
- expect(networks.get(0x6f, 'pubkeyhash')).to.equal(networks.testnet);
- expect(networks.get(0x6f, 'privatekey')).to.equal(undefined);
+ expect(networks.get(0x71, 'pubkeyhash')).to.equal(networks.testnet);
+ expect(networks.get(0x71, 'privatekey')).to.equal(undefined);
});
it('can test for multiple keys', function() {
- expect(networks.get(0x6f, ['pubkeyhash', 'scripthash'])).to.equal(networks.testnet);
- expect(networks.get(0x3a, ['pubkeyhash', 'scripthash'])).to.equal(networks.testnet);
- expect(networks.get(0x6f, ['privatekey', 'port'])).to.equal(undefined);
+ expect(networks.get(0x71, ['pubkeyhash', 'scripthash'])).to.equal(networks.testnet);
+ expect(networks.get(0xc4, ['pubkeyhash', 'scripthash'])).to.equal(networks.testnet);
+ expect(networks.get(0x71, ['privatekey', 'port'])).to.equal(undefined);
});
it('converts to string using the "name" property', function() {
| 3 |
diff --git a/controllers/BaseController.php b/controllers/BaseController.php @@ -219,7 +219,6 @@ class BaseController
}
$requestBody = $request->getParsedBody();
- return $requestBody;
foreach ($requestBody as $key => &$value)
{
// HTMLPurifier removes boolean values (true/false) and arrays, so explicitly keep them
| 2 |
diff --git a/package.json b/package.json "immutable": "^3.8.1",
"jest": "^19.0.2",
"jquery": "3.1.1",
- "js-interpreter": "^1.2.0",
+ "js-interpreter": "^1.4.0-alpha.3",
"json-loader": "^0.5.4",
"loader-utils": "^1.0.3",
"lz-string": "^1.4.4",
| 3 |
diff --git a/content/articles/docker-push-for-publishing-images-to-docker-hub/index.md b/content/articles/docker-push-for-publishing-images-to-docker-hub/index.md @@ -6,7 +6,7 @@ url: /docker-push-for-publishing-images-to-docker-hub/
title: Docker Push for Publishing Images to Docker Hub
description: This article guides the reader on how to create a Dockerfile, create an account in Docker Hub,and how to push Docker images to a registry.
author: oruko-pius
-date: 2021-07-30T00:00:00-17:00
+date: 2021-07-31T00:00:00-06:00
topics: [Containers]
excerpt_separator: <!--more-->
images:
| 1 |
diff --git a/tests/playgrounds/advanced_playground.html b/tests/playgrounds/advanced_playground.html <script src="../../blocks/procedures.js"></script>
<script src="../themes/test_themes.js"></script>
<script src="./screenshot.js"></script>
-<script src="./test_blocks_toolbox.js"></script>
<script src="https://unpkg.com/@blockly/[email protected]/dist/index.js"></script>
<script src="https://unpkg.com/@blockly/theme-modern/dist/index.js"></script>
| 2 |
diff --git a/web3swift.xcodeproj/project.pbxproj b/web3swift.xcodeproj/project.pbxproj 3AA815F52276E44100F5DB52 /* Promise+Web3+Eth+GetBlockByNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA8157C2276E44100F5DB52 /* Promise+Web3+Eth+GetBlockByNumber.swift */; };
3AA815F62276E44100F5DB52 /* Promise+Web3+Eth+SendRawTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA8157D2276E44100F5DB52 /* Promise+Web3+Eth+SendRawTransaction.swift */; };
3AA815F72276E44100F5DB52 /* Promise+Web3+Eth+GetTransactionCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA8157E2276E44100F5DB52 /* Promise+Web3+Eth+GetTransactionCount.swift */; };
- 3AA815F82276E44100F5DB52 /* Promise+Web3+Contract+GetIndexedEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA8157F2276E44100F5DB52 /* Promise+Web3+Contract+GetIndexedEvents.swift */; };
3AA815F92276E44100F5DB52 /* Promise+Web3+TxPool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA815802276E44100F5DB52 /* Promise+Web3+TxPool.swift */; };
3AA815FA2276E44100F5DB52 /* Promise+Web3+Eth+GetAccounts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA815812276E44100F5DB52 /* Promise+Web3+Eth+GetAccounts.swift */; };
3AA815FB2276E44100F5DB52 /* Promise+Web3+Personal+UnlockAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA815822276E44100F5DB52 /* Promise+Web3+Personal+UnlockAccount.swift */; };
3AA8157C2276E44100F5DB52 /* Promise+Web3+Eth+GetBlockByNumber.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Eth+GetBlockByNumber.swift"; sourceTree = "<group>"; };
3AA8157D2276E44100F5DB52 /* Promise+Web3+Eth+SendRawTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Eth+SendRawTransaction.swift"; sourceTree = "<group>"; };
3AA8157E2276E44100F5DB52 /* Promise+Web3+Eth+GetTransactionCount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Eth+GetTransactionCount.swift"; sourceTree = "<group>"; };
- 3AA8157F2276E44100F5DB52 /* Promise+Web3+Contract+GetIndexedEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Contract+GetIndexedEvents.swift"; sourceTree = "<group>"; };
3AA815802276E44100F5DB52 /* Promise+Web3+TxPool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+TxPool.swift"; sourceTree = "<group>"; };
3AA815812276E44100F5DB52 /* Promise+Web3+Eth+GetAccounts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Eth+GetAccounts.swift"; sourceTree = "<group>"; };
3AA815822276E44100F5DB52 /* Promise+Web3+Personal+UnlockAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Personal+UnlockAccount.swift"; sourceTree = "<group>"; };
3AA8157C2276E44100F5DB52 /* Promise+Web3+Eth+GetBlockByNumber.swift */,
3AA8157D2276E44100F5DB52 /* Promise+Web3+Eth+SendRawTransaction.swift */,
3AA8157E2276E44100F5DB52 /* Promise+Web3+Eth+GetTransactionCount.swift */,
- 3AA8157F2276E44100F5DB52 /* Promise+Web3+Contract+GetIndexedEvents.swift */,
3AA815802276E44100F5DB52 /* Promise+Web3+TxPool.swift */,
3AA815812276E44100F5DB52 /* Promise+Web3+Eth+GetAccounts.swift */,
3AA815822276E44100F5DB52 /* Promise+Web3+Personal+UnlockAccount.swift */,
3AA815CF2276E44100F5DB52 /* Web3+Eth+Websocket.swift in Sources */,
3A7EA35E2280EA9A005120C2 /* Encodable+Extensions.swift in Sources */,
3AA815D22276E44100F5DB52 /* Web3+JSONRPC.swift in Sources */,
- 3AA815F82276E44100F5DB52 /* Promise+Web3+Contract+GetIndexedEvents.swift in Sources */,
3AA815E42276E44100F5DB52 /* Data+Extension.swift in Sources */,
3AA815C62276E44100F5DB52 /* ABI.swift in Sources */,
3AA815D02276E44100F5DB52 /* Web3+Utils.swift in Sources */,
| 3 |
diff --git a/layouts/partials/fragments/list.html b/layouts/partials/fragments/list.html where functions achieving this. First where gets all the pages in blog
section, the second one removes current page from the mix and the last one
removes the section (.Site.Pages returns the current section as a page). */}}
-{{- .page_scratch.Set "pages" (.Site.GetPage "Section" (.Params.section | default .root.Section)).Pages -}}
-{{- .page_scratch.Add "pages" (.Site.GetPage "Section" (.Params.section | default .root.Section)).Sections -}}
{{- if and (not .Params.section) (eq .root.CurrentSection.Kind "section") -}}
- {{- .page_scratch.Set "pages" (.root.CurrentSection.Pages) -}}
+ {{- .page_scratch.Set "pages" .root.CurrentSection.Pages -}}
{{- if (ne .Params.subsections false) -}}
{{- .page_scratch.Add "pages" .root.CurrentSection.Sections -}}
{{- end -}}
{{- $self.page_scratch.Add "pages" .Pages -}}
{{- end -}}
{{- end -}}
+{{- else -}}
+ {{- $page := .Site.GetPage "Section" (.Params.section | default .root.Section) -}}
+ {{- .page_scratch.Set "pages" $page.Pages -}}
+ {{- .page_scratch.Add "pages" $page.Sections -}}
+ {{- if (ne .Params.subsections false) -}}
+ {{- .page_scratch.Add "pages" $page.Sections -}}
+ {{- end -}}
+ {{- if .Params.subsection_leaves -}}
+ {{- range $page.Sections -}}
+ {{- $self.page_scratch.Add "pages" .Pages -}}
+ {{- end -}}
+ {{- end -}}
{{- end -}}
{{- $bg := .Params.background | default "light" }}
| 1 |
diff --git a/src/containers/FlightDirector/SoftwarePanels/draggingLine.js b/src/containers/FlightDirector/SoftwarePanels/draggingLine.js @@ -19,14 +19,14 @@ const DraggingLine = ({
x = toComp.x * width;
y = toComp.y * height;
}
+ const offset = 5;
return (
<path
className="drag-line"
onClick={() => {
onClick(id);
}}
- d={`M${comp.x * width + 10} ${comp.y * height + 10} L ${x + 10} ${y +
- 10}`}
+ d={`M${comp.x * width + 5} ${comp.y * height + 5} L ${x + 5} ${y + 5}`}
fill="transparent"
stroke={color || "white"}
strokeWidth={selected ? 7 : stroke || 3}
| 1 |
diff --git a/layouts/_default/list.html b/layouts/_default/list.html {{- define "main" -}}
+ {{- if .CurrentSection -}}
{{- $list_page := .Site.GetPage "page" (printf "%s%s" .CurrentSection.Dir "_index") -}}
{{- partial "helpers/fragments.html" (dict "root" $ "real_page" . "page" $list_page "page_scratch" $.Scratch) -}}
{{- end -}}
+{{- end -}}
| 1 |
diff --git a/config/vars.yml b/config/vars.yml -lock_url: 'https://cdn.auth0.com/js/lock/11.2.2/lock.min.js'
-lock_urlv10: 'https://cdn.auth0.com/js/lock/10.24.1/lock.min.js'
-lock_urlv11: 'https://cdn.auth0.com/js/lock/11.2.2/lock.min.js'
+lock_url: 'https://cdn.auth0.com/js/lock/11.3.0/lock.min.js'
+lock_urlv10: 'https://cdn.auth0.com/js/lock/10.24.3/lock.min.js'
+lock_urlv11: 'https://cdn.auth0.com/js/lock/11.3.0/lock.min.js'
lock_passwordless_url: 'https://cdn.auth0.com/js/lock-passwordless-2.2.min.js'
-auth0js_url: 'https://cdn.auth0.com/js/auth0/9.2.2/auth0.min.js'
-auth0js_urlv9: 'https://cdn.auth0.com/js/auth0/9.2.2/auth0.min.js'
-auth0js_urlv8: 'https://cdn.auth0.com/js/auth0/8.12.1/auth0.min.js'
+auth0js_url: 'https://cdn.auth0.com/js/auth0/9.3.1/auth0.min.js'
+auth0js_urlv9: 'https://cdn.auth0.com/js/auth0/9.3.1/auth0.min.js'
+auth0js_urlv8: 'https://cdn.auth0.com/js/auth0/8.12.3/auth0.min.js'
auth0js_urlv7: 'https://cdn.auth0.com/w2/auth0-7.6.1.min.js'
auth0_community: 'https://community.auth0.com/'
| 3 |
diff --git a/common/components/componentsBySection/FindProjects/ProjectSearchContainer.jsx b/common/components/componentsBySection/FindProjects/ProjectSearchContainer.jsx @@ -34,9 +34,11 @@ class ProjectSearchContainer extends React.PureComponent<{||}, State> {
render(): React$Node {
return (
<div>
- <p className="IntroText">
+ <div className="IntroText">
+ <p>
Welcome to DemocracyLab! Use the filters and search bar below to find volunteer opportunities with tech-for-good projects.
</p>
+ </div>
<AlertSignupModal
searchFilters={this.state.searchFilters}
| 5 |
diff --git a/api/dist/apihelp/apihelp.html b/api/dist/apihelp/apihelp.html @@ -126,7 +126,7 @@ var map = new demo.Map({
div: 'map4',
zoom: 0,
center: [2590000, 1170000],
- layers: ['ch.astra.ausnahmetransportrouten', 'polygon', 'point']
+ layers: ['ch.astra.hauptstrassennetz', 'polygon', 'point']
});
</pre>
</div>
| 14 |
diff --git a/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs @@ -113,7 +113,6 @@ import org.slf4j.LoggerFactory;
import tech.jhipster.config.JHipsterProperties;
import java.util.concurrent.TimeUnit;
import org.hibernate.cfg.AvailableSettings;
-import org.infinispan.eviction.EvictionType;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.spring.starter.embedded.InfinispanCacheConfigurer;
import org.infinispan.spring.starter.embedded.InfinispanGlobalConfigurer;
@@ -521,17 +520,17 @@ public class CacheConfiguration {
manager.defineConfiguration("local-app-data", new ConfigurationBuilder()
.clustering().cacheMode(CacheMode.LOCAL)
.statistics().enabled(cacheInfo.isStatsEnabled())
- .memory().evictionType(EvictionType.COUNT).size(cacheInfo.getLocal().getMaxEntries()).expiration()
+ .memory().maxCount(cacheInfo.getLocal().getMaxEntries()).expiration()
.lifespan(cacheInfo.getLocal().getTimeToLiveSeconds(), TimeUnit.SECONDS).build());
manager.defineConfiguration("dist-app-data", new ConfigurationBuilder()
.clustering().cacheMode(CacheMode.DIST_SYNC).hash().numOwners(cacheInfo.getDistributed().getInstanceCount())
.statistics().enabled(cacheInfo.isStatsEnabled())
- .memory().evictionType(EvictionType.COUNT).size(cacheInfo.getDistributed().getMaxEntries()).expiration()
+ .memory().maxCount(cacheInfo.getDistributed().getMaxEntries()).expiration()
.lifespan(cacheInfo.getDistributed().getTimeToLiveSeconds(), TimeUnit.SECONDS).build());
manager.defineConfiguration("repl-app-data", new ConfigurationBuilder()
.clustering().cacheMode(CacheMode.REPL_SYNC)
.statistics().enabled(cacheInfo.isStatsEnabled())
- .memory().evictionType(EvictionType.COUNT).size(cacheInfo.getReplicated().getMaxEntries()).expiration()
+ .memory().maxCount(cacheInfo.getReplicated().getMaxEntries()).expiration()
.lifespan(cacheInfo.getReplicated().getTimeToLiveSeconds(), TimeUnit.SECONDS).build());
// initialize Hibernate L2 cache configuration templates
@@ -569,7 +568,7 @@ public class CacheConfiguration {
manager.defineConfiguration("oAuth2Authentication", new ConfigurationBuilder()
.clustering().cacheMode(CacheMode.LOCAL)
.statistics().enabled(cacheInfo.isStatsEnabled())
- .memory().evictionType(EvictionType.COUNT).size(cacheInfo.getLocal().getMaxEntries()).expiration()
+ .memory().maxCount(cacheInfo.getLocal().getMaxEntries()).expiration()
.lifespan(cacheInfo.getLocal().getTimeToLiveSeconds(), TimeUnit.SECONDS).build());
<%_ } _%>
| 14 |
diff --git a/src/connectors/monstercat.js b/src/connectors/monstercat.js 'use strict';
-const playerBar = '.controls';
+const mainPlayerBar = '.controls';
-Connector.playerSelector = playerBar;
+if (isMainPlayer()) {
+ Util.debugLog('Setup the connector for main player');
-Connector.artistTrackSelector = `${playerBar} .scroll-title`;
+ setupMainPlayer();
+} else {
+ Util.debugLog('Setup the connector for Gold player');
-Connector.pauseButtonSelector = `${playerBar} .fa-pause`;
+ setupGoldPlayer();
+}
+
+function isMainPlayer() {
+ return document.querySelector(mainPlayerBar) !== null;
+}
+
+function setupMainPlayer() {
+ Connector.playerSelector = mainPlayerBar;
+
+ Connector.artistTrackSelector = `${mainPlayerBar} .scroll-title`;
+
+ Connector.pauseButtonSelector = `${mainPlayerBar} .fa-pause`;
Connector.useMediaSessionApi();
+}
+
+function setupGoldPlayer() {
+ Connector.playerSelector = '#controlbar';
+
+ Connector.trackSelector = '.song-info .song-title';
+
+ Connector.getArtist = () => {
+ const artists = Util.queryElements('.song-info .artist-name');
+
+ if (artists !== null) {
+ return Util.joinArtists(artists.toArray());
+ }
+
+ return null;
+ };
+
+ Connector.trackArtSelector = '.album-art';
+
+ Connector.timeInfoSelector = '.active-song-time';
+
+ Connector.pauseButtonSelector = '.play-pause-btn .fa-pause';
+}
| 7 |
diff --git a/src/draw.js b/src/draw.js @@ -56,6 +56,7 @@ function _updateEdge(edge, x1, y1, x2, y2, shortening, attributes) {
var arrowHeadLength = 10;
var arrowHeadWidth = 7;
+ var margin = 0.174;
var arrowHeadPoints = [
[0, -arrowHeadWidth / 2],
@@ -69,8 +70,8 @@ function _updateEdge(edge, x1, y1, x2, y2, shortening, attributes) {
var length = Math.sqrt(dx * dx + dy * dy);
var cosA = dx / length;
var sinA = dy / length;
- x2 = x1 + (length - shortening) * cosA;
- y2 = y1 + (length - shortening) * sinA;
+ x2 = x1 + (length - shortening - arrowHeadLength - margin) * cosA;
+ y2 = y1 + (length - shortening - arrowHeadLength - margin) * sinA;
var a = edge.selectWithoutDataPropagation("g").selectWithoutDataPropagation("a");
var line = a.selectWithoutDataPropagation("path");
@@ -86,9 +87,11 @@ function _updateEdge(edge, x1, y1, x2, y2, shortening, attributes) {
.attr("stroke", stroke)
.attr("strokeWidth", strokeWidth);
+ x2 = x1 + (length - shortening - arrowHeadLength) * cosA;
+ y2 = y1 + (length - shortening - arrowHeadLength) * sinA;
for (var i = 0; i < arrowHeadPoints.length; i++) {
var point = arrowHeadPoints[i];
- arrowHeadPoints[i] = rotate(point[0] - arrowHeadLength, point[1], cosA, sinA);
+ arrowHeadPoints[i] = rotate(point[0], point[1], cosA, sinA);
}
for (var i = 0; i < arrowHeadPoints.length; i++) {
var point = arrowHeadPoints[i];
| 4 |
diff --git a/src/util/resolveConfig.js b/src/util/resolveConfig.js @@ -12,13 +12,8 @@ function resolveFunctionKeys(object) {
}, {})
}
-function without(object, key) {
- /* eslint-disable no-unused-vars */
- return (({ [key]: _, ...rest }) => rest)(object)
-}
-
-function mergeExtensions(theme) {
- return mergeWith({}, without(theme, 'extend'), theme.extend, (_, extensions, key) => {
+function mergeExtensions({ extend, ...theme }) {
+ return mergeWith({}, theme, extend, (_, extensions, key) => {
return isFunction(theme[key])
? mergedTheme => ({
...theme[key](mergedTheme),
| 2 |
diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue @@ -24,7 +24,7 @@ export default {
definition: null,
sourceShape: null,
target: null,
- anchorPadding: 30,
+ anchorPadding: 40,
};
},
computed: {
@@ -128,7 +128,11 @@ export default {
this.updateCrownPosition();
},
updateRouter() {
- this.shape.router('orthogonal', { padding: this.anchorPadding });
+ this.shape.router('manhattan', {
+ padding: this.anchorPadding,
+ maximumLoops: 1,
+ maxAllowedDirectionChange: 1,
+ });
},
updateLinkTarget({ clientX, clientY }) {
const localMousePosition = this.paper.clientToLocalPoint({ x: clientX, y: clientY });
@@ -214,9 +218,11 @@ export default {
mounted() {
this.shape = new joint.shapes.standard.Link({
router: {
- name: 'orthogonal',
+ name: 'manhattan',
args: {
padding: this.anchorPadding,
+ maximumLoops: 1,
+ maxAllowedDirectionChange: 1,
},
},
});
| 14 |
diff --git a/ot-node.js b/ot-node.js @@ -374,7 +374,7 @@ class OTNode {
async executeCleanOperationalDatabaseMigration() {
const repositoryModuleManager = this.container.resolve('repositoryModuleManager');
const cleanOperationalDatabaseMigration = new CleanOperationalDatabaseMigration(
- 'CleanOperationalDatabaseMigration',
+ 'CleanOperationalDatabaseMigration1',
this.logger,
this.config,
repositoryModuleManager,
| 3 |
diff --git a/packages/material-ui-shell/src/providers/Filter/Provider.js b/packages/material-ui-shell/src/providers/Filter/Provider.js @@ -72,7 +72,6 @@ const Provider = ({ children, persistKey = 'mui_filter' }) => {
Provider.propTypes = {
children: PropTypes.any,
- firebaseApp: PropTypes.any,
}
export default Provider
| 2 |
diff --git a/src/library/managers/SortieManager.js b/src/library/managers/SortieManager.js @@ -947,13 +947,15 @@ Stores and manages states and functions during sortie of fleets (including PvP b
// If new enemy and not in sim yet, fill stats
if (masterId > simAbyssMasterIdMax) {
+ const master = KC3Master.ship(masterId) || {};
KC3Database.get_enemyInfo(masterId, function (stats) {
obj.stats = {
HP: stats.hp,
FP: stats.fp,
TP: stats.tp,
AA: stats.aa,
- AR: stats.ar
+ AR: stats.ar,
+ type: master.api_stype
};
// Likely that new enemy will also be using new equips, so fill that too
| 1 |
diff --git a/index.js b/index.js @@ -108,7 +108,8 @@ nativeBindings.nativeGl.onconstruct = (gl, canvas) => {
nativeWindow.setWindowTitle(windowHandle, title);
if (document.hidden) {
- const [framebuffer, colorTexture, depthStencilTexture] = nativeWindow.createRenderTarget(gl, canvasWidth, canvasHeight, 1, sharedColorTexture, sharedDepthStencilTexture);
+ const [framebuffer, colorTexture, depthStencilTexture, msFramebuffer, msColorTexture, msDepthStencilTexture] = nativeWindow.createRenderTarget(gl, canvasWidth, canvasHeight, sharedColorTexture, sharedDepthStencilTexture);
+
gl.setDefaultFramebuffer(framebuffer);
canvas.on('attribute', (name, value) => {
| 4 |
diff --git a/dist/uPlot.esm.d.ts b/dist/uPlot.esm.d.ts @@ -276,7 +276,7 @@ declare namespace uPlot {
max?: number,
}
- export type SpanGap = [number, number]
+ export type DataGap = [number, number]
export interface Series {
/** series on/off. when off, it will not affect its scale */
@@ -289,7 +289,7 @@ declare namespace uPlot {
scale?: string;
/** when true, null data values will not cause line breaks. when fn, should filter and return gaps to span */
- spanGaps?: boolean | ((self: uPlot, foundGaps: Array<SpanGap>, seriesIdx: number) => Array<SpanGap>);
+ spanGaps?: boolean | ((self: uPlot, foundGaps: Array<DataGap>, seriesIdx: number) => Array<DataGap>);
/** legend label */
label?: string;
| 10 |
diff --git a/package.json b/package.json "name": "find-and-replace",
"main": "./lib/find",
"description": "Find and replace within buffers and across the project.",
- "version": "0.215.6",
+ "version": "0.215.7",
"license": "MIT",
"activationCommands": {
"atom-workspace": [
| 6 |
diff --git a/src/userscript.ts b/src/userscript.ts @@ -88945,6 +88945,14 @@ var $$IMU_EXPORT$$;
// https://4.img-dpreview.com/files/w/TC16x9S280x157?url=https%3A%2F%2Fi.ytimg.com%2Fvi%2Fkd7wdYetKbY%2Fhqdefault.jpg&signature=dm28vBZUdFr6S2adlJT4X0Wj3Ak%3D&v=5105
newsrc = src.replace(/^[a-z]+:\/\/[^/]+\/+files\/+w\/+[^/?]+\?(?:.*&)?url=([^&]+).*?$/, "$1");
+
+ // thanks to doio on github: https://github.com/qsniyg/maxurl/issues/1064
+ // https://1.img-dpreview.com/files/g/TS940x940~4245981.jpg -- via https://www.dpreview.com/forums/post/65771195
+ // https://1.img-dpreview.com/files/g/4245981.jpg
+ // https://4.img-dpreview.com/files/g/TS940x940~4245993.jpg
+ // https://4.img-dpreview.com/files/g/4245993.jpg
+ newsrc = src.replace(/(\/files\/g\/)TS\d+x\d+~(\d+\.)/, "$1$2");
+
if (newsrc !== src)
return decodeuri_ifneeded(newsrc);
| 7 |
diff --git a/token-metadata/0x8727c112C712c4a03371AC87a74dD6aB104Af768/metadata.json b/token-metadata/0x8727c112C712c4a03371AC87a74dD6aB104Af768/metadata.json "symbol": "JET",
"address": "0x8727c112C712c4a03371AC87a74dD6aB104Af768",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/docs/appstate.md b/docs/appstate.md @@ -48,7 +48,7 @@ const AppStateExample = () => {
return () => {
AppState.removeEventListener("change", _handleAppStateChange);
};
- }, []);
+ }, [_handleAppStateChange]);
const _handleAppStateChange = (nextAppState) => {
if (appState.current.match(/inactive|background/) && nextAppState === "active") {
| 1 |
diff --git a/tools/markdown/tex-equation-to-svg/test/test.cli.js b/tools/markdown/tex-equation-to-svg/test/test.cli.js @@ -137,17 +137,17 @@ tape( 'the function converts a TeX or LaTeX string to an SVG (no options)', opts
t.fail( error.message );
} else {
svg = stdout.toString();
- t.equal( typeof svg, 'string', 'returns a string' );
- t.equal( svg.substring( 0, 4 ), '<svg', 'svg tag' );
- t.equal( svg.substring( svg.length-7, svg.length-1 ), '</svg>', 'closing svg tag' );
- t.equal( svg.substring( svg.length-1 ), '\n', 'new line' );
+ t.strictEqual( typeof svg, 'string', 'returns a string' );
+ t.strictEqual( svg.substring( 0, 4 ), '<svg', 'svg tag' );
+ t.strictEqual( svg.substring( svg.length-7, svg.length-1 ), '</svg>', 'closing svg tag' );
+ t.strictEqual( svg.substring( svg.length-1 ), '\n', 'new line' );
t.strictEqual( stderr.toString(), '', 'does not print to `stderr`' );
}
t.end();
}
});
-tape( 'the function converts a TeX or LaTeX string to an SVG (no options)', opts, function test( t ) {
+tape( 'the function converts a TeX or LaTeX string to an SVG (options)', opts, function test( t ) {
var cmd = [
process.execPath,
fpath,
@@ -164,10 +164,10 @@ tape( 'the function converts a TeX or LaTeX string to an SVG (no options)', opts
t.fail( error.message );
} else {
svg = stdout.toString();
- t.equal( typeof svg, 'string', 'returns a string' );
- t.equal( svg.substring( 0, 4 ), '<svg', 'svg tag' );
- t.equal( svg.substring( svg.length-7, svg.length-1 ), '</svg>', 'closing svg tag' );
- t.equal( svg.substring( svg.length-1 ), '\n', 'new line' );
+ t.strictEqual( typeof svg, 'string', 'returns a string' );
+ t.strictEqual( svg.substring( 0, 4 ), '<svg', 'svg tag' );
+ t.strictEqual( svg.substring( svg.length-7, svg.length-1 ), '</svg>', 'closing svg tag' );
+ t.strictEqual( svg.substring( svg.length-1 ), '\n', 'new line' );
t.strictEqual( stderr.toString(), '', 'does not print to `stderr`' );
}
t.end();
| 4 |
diff --git a/src/transitions/Collapse.spec.js b/src/transitions/Collapse.spec.js @@ -85,21 +85,87 @@ describe('<Collapse />', () => {
});
describe('handleEntering()', () => {
+ let heightMock;
let element;
before(() => {
- element = { style: { height: 0 } };
- instance.wrapper = { clientHeight: 666 };
+ heightMock = 666;
+ element = { style: { height: heightMock } };
instance.handleEntering(element);
});
- it('should set element transition duration', () => {
- assert.strictEqual(element.style.transitionDuration, '300ms',
- 'should have the default 300ms duration');
+ it('should set height to the 0', () => {
+ assert.strictEqual(element.style.height, '0px', 'should have 0px height');
});
- it('should set height to the wrapper height', () => {
- assert.strictEqual(element.style.height, '666px', 'should have 666px height');
+ it('should call handleEntering', () => {
+ const onEnteringStub = spy();
+ wrapper.setProps({ onEntering: onEnteringStub });
+ instance = wrapper.instance();
+ instance.handleEntering(element);
+
+ assert.strictEqual(onEnteringStub.callCount, 1);
+ assert.strictEqual(onEnteringStub.calledWith(element), true);
+ });
+
+ describe('transitionDuration', () => {
+ let styleManagerMock;
+ let transitionDurationMock;
+
+ before(() => {
+ styleManagerMock = wrapper.context('styleManager');
+ styleManagerMock.theme.transitions.getAutoHeightDuration = stub().returns('woof');
+ wrapper.setContext({ styleManager: styleManagerMock });
+ wrapper.setProps({ transitionDuration: 'auto' });
+ instance = wrapper.instance();
+ });
+
+ it('no wrapper', () => {
+ instance.wrapper = false;
+ instance.handleEntering(element);
+ assert.strictEqual(
+ element.style.transitionDuration,
+ `${styleManagerMock.theme.transitions.getAutoHeightDuration(0)}ms`,
+ );
+ });
+
+ it('has wrapper', () => {
+ const clientHeightMock = 10;
+ instance.wrapper = { clientHeight: clientHeightMock };
+ instance.handleEntering(element);
+ assert.strictEqual(
+ element.style.transitionDuration,
+ `${styleManagerMock.theme.transitions.getAutoHeightDuration(clientHeightMock)}ms`,
+ );
+ });
+
+ it('number should set transitionDuration to ms', () => {
+ transitionDurationMock = 3;
+ wrapper.setProps({ transitionDuration: transitionDurationMock });
+ instance = wrapper.instance();
+ instance.handleEntering(element);
+
+ assert.strictEqual(element.style.transitionDuration, `${transitionDurationMock}ms`);
+ });
+
+ it('string should set transitionDuration to string', () => {
+ transitionDurationMock = 'woof';
+ wrapper.setProps({ transitionDuration: transitionDurationMock });
+ instance = wrapper.instance();
+ instance.handleEntering(element);
+
+ assert.strictEqual(element.style.transitionDuration, transitionDurationMock);
+ });
+
+ it('nothing should not set transitionDuration', () => {
+ const elementBackup = element;
+ wrapper.setProps({ transitionDuration: undefined });
+ instance = wrapper.instance();
+ instance.handleEntering(element);
+
+ assert.strictEqual(
+ element.style.transitionDuration, elementBackup.style.transitionDuration);
+ });
});
});
| 0 |
diff --git a/src/web/index.js b/src/web/index.js @@ -23,7 +23,7 @@ function createLocalization(defaultLocale, availableLangs, resIds, name) {
// `ResourceBundle`s.
function requestBundles(requestedLangs = navigator.languages) {
const newLangs = negotiateLanguages(
- availableLangs, requestedLangs, { defaultLocale }
+ requestedLangs, availableLangs, { defaultLocale }
);
const bundles = newLangs.map(
| 1 |
diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js @@ -104,10 +104,6 @@ export class stepFour extends React.Component {
this.setState({ showModal: false })
}
- userHideModal = () => {
- this.hideModal()
- }
-
handleContentByParent(content, index = 0) {
const { parent } = content
@@ -452,7 +448,6 @@ export class stepFour extends React.Component {
</div>
<ModalContainer
title={'Tx Status'}
- hideModal={this.userHideModal}
showModal={this.state.showModal}
>
<TxProgressStatus txMap={deploymentStore.txMap} deployCrowdsale={this.deployCrowdsale} />
| 2 |
diff --git a/src/functions.js b/src/functions.js @@ -545,7 +545,7 @@ var _ = Mavo.Functions = {
return array.filter(number => !isNaN(number) && val(number) !== "" && val(number) !== null).map(n => +n);
},
aggregateCaller: function(array, computation) {
- if (array[Mavo.groupedBy]) { // grouped structures
+ if (Mavo.in(Mavo.groupedBy, array)) { // grouped structures
return array.map(e => $u.aggregateCaller(e.$items, computation));
}
| 1 |
diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx @@ -21,19 +21,19 @@ import makeymakeyInsetIconURL from './makeymakey/makeymakey-small.svg';
import microbitIconURL from './microbit/microbit.png';
import microbitInsetIconURL from './microbit/microbit-small.svg';
-import microbitPeripheralImage from './microbit/microbit-illustration.svg';
-import microbitSmallPeripheralImage from './microbit/microbit-small.svg';
+import microbitConnectionIconURL from './microbit/microbit-illustration.svg';
+import microbitConnectionSmallIconURL from './microbit/microbit-small.svg';
import ev3IconURL from './ev3/ev3.png';
import ev3InsetIconURL from './ev3/ev3-small.svg';
-import ev3PeripheralImage from './ev3/ev3-hub-illustration.svg';
-import ev3SmallPeripheralImage from './ev3/ev3-small.svg';
+import ev3ConnectionIconURL from './ev3/ev3-hub-illustration.svg';
+import ev3ConnectionSmallIconURL from './ev3/ev3-small.svg';
-import wedo2IconURL from './wedo2/wedo.png'; // TODO: Rename wedo2Icon.png ??
-import wedo2InsetIconURL from './wedo2/wedo-small.svg'; // TODO: Rename wedo2InsetIcon.png ??
-import wedo2PeripheralImage from './wedo2/wedo-illustration.svg'; // TODO: Rename wedo2ConnectionIcon.png ??
-import wedo2SmallPeripheralImage from './wedo2/wedo-small.svg'; // TODO: Rename wedo2ConnectionSmallIcon.png ??
-import wedo2PeripheralButtonImage from './wedo2/wedo-button-illustration.svg'; // TODO: Rename wedo2ConnectionInstructionIcon.png ??
+import wedo2IconURL from './wedo2/wedo.png'; // TODO: Rename file names to match variable/prop names?
+import wedo2InsetIconURL from './wedo2/wedo-small.svg';
+import wedo2ConnectionIconURL from './wedo2/wedo-illustration.svg';
+import wedo2ConnectionSmallIconURL from './wedo2/wedo-small.svg';
+import wedo2ConnectionTipIconURL from './wedo2/wedo-button-illustration.svg';
import boostIconURL from './boost/boost.png';
import boostInsetIconURL from './boost/boost-small.svg';
@@ -177,8 +177,8 @@ export default [
internetConnectionRequired: true,
launchPeripheralConnectionFlow: true,
useAutoScan: false,
- peripheralImage: microbitPeripheralImage,
- smallPeripheralImage: microbitSmallPeripheralImage,
+ peripheralImage: microbitConnectionIconURL,
+ smallPeripheralImage: microbitConnectionSmallIconURL,
connectingMessage: (
<FormattedMessage
defaultMessage="Connecting"
@@ -207,8 +207,8 @@ export default [
internetConnectionRequired: true,
launchPeripheralConnectionFlow: true,
useAutoScan: false,
- peripheralImage: ev3PeripheralImage,
- smallPeripheralImage: ev3SmallPeripheralImage,
+ peripheralImage: ev3ConnectionIconURL,
+ smallPeripheralImage: ev3ConnectionSmallIconURL,
connectingMessage: (
<FormattedMessage
defaultMessage="Connecting. Make sure the pin on your EV3 is set to 1234."
@@ -237,9 +237,9 @@ export default [
internetConnectionRequired: true,
launchPeripheralConnectionFlow: true,
useAutoScan: true,
- peripheralImage: wedo2PeripheralImage, // TODO: Rename connectionIconURL ??
- smallPeripheralImage: wedo2SmallPeripheralImage, // TODO: Rename connectionSmallIconURL ??
- peripheralButtonImage: wedo2PeripheralButtonImage, // TODO: Rename connectionInstructionIconURL ??
+ peripheralImage: wedo2ConnectionIconURL,
+ smallPeripheralImage: wedo2ConnectionSmallIconURL,
+ peripheralButtonImage: wedo2ConnectionTipIconURL,
connectingMessage: (
<FormattedMessage
defaultMessage="Connecting"
| 10 |
diff --git a/src/scripts/interactive-video.js b/src/scripts/interactive-video.js @@ -280,6 +280,11 @@ function InteractiveVideo(params, id, contentData) {
return;
}
+ // Handle video container loaded
+ self.video.on('containerLoaded', function () {
+ self.trigger('resize');
+ });
+
// Handle video source loaded events (metadata)
self.video.on('loaded', function () {
isLoaded = true;
| 9 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ## [1.9](https://github.com/ericmdantas/generator-ng-fullstack/releases/tag/v1.9.0)
-Stuff for 1.9. Coming soon.
+### New Stuff
+
+#### Server
+
+- Added Koa web framework for Node servers
+- Added Gin web framework for Go servers
+- Added Nodemon as a module to restart the Node server when the files change
+
+
+#### Client
+
+- Added Less and Sass support for the client side
+- Added Aurelia as a client framework
+- Added Vue as a client framework
+- Added compilation/uglify step with Babili
+
+
+#### Fullstack
+
+- Added an option to choose a different git server, other than github
+- Added option to work with tests and source code side by side
+
+
+### Breaking change
+
+- When in dev, always use `npm run dev` to start both server and client
## [1.8](https://github.com/ericmdantas/generator-ng-fullstack/releases/tag/v1.8.0)
| 3 |
diff --git a/components/post.js b/components/post.js @@ -10,8 +10,15 @@ import Section from '@/components/section'
function Post({title, published_at, feature_image, html, backLink}) {
useEffect(() => {
if (html) {
+ const videoPlayer = [...document.querySelectorAll('video')]
const dropdownDiv = [...document.querySelectorAll('div.kg-card.kg-toggle-card')]
+ if (videoPlayer) {
+ videoPlayer.forEach(m => {
+ m.setAttribute('controls', true)
+ })
+ }
+
if (dropdownDiv) {
dropdownDiv.forEach(d => {
d.addEventListener('click', () => {
@@ -259,6 +266,35 @@ function Post({title, published_at, feature_image, html, backLink}) {
top: -.5em;
position: relative;
}
+
+ .kg-video-overlay {
+ display: none;
+ }
+
+ .kg-video-container video {
+ width: 100%;
+ height: 100%;
+ }
+
+ video {
+ controls: true;
+ }
+
+ .kg-video-large-play-icon, .kg-video-player {
+ display: none;
+ }
+
+ .kg-video-player-container {
+ display: none;
+ }
+
+ .kg-video-player {
+ display: none;
+ }
+
+ .kg-video-play-icon svg {
+ display: none;
+ }
`}</style>
</Section>
)
| 0 |
diff --git a/lib/windshaft/models/mapconfig.js b/lib/windshaft/models/mapconfig.js @@ -129,7 +129,13 @@ MapConfig.prototype.hasIncompatibleLayers = function () {
MapConfig.prototype.isVectorLayergroup = function () {
const layers = this._cfg.layers;
- let isVectorLayergroup = true;
+ let isVectorLayergroup = false;
+
+ if (!layers.length) {
+ return isVectorLayergroup;
+ }
+
+ isVectorLayergroup = true;
for (const layer of layers) {
if (!this.isVectorLayer(layer)) {
@@ -162,6 +168,7 @@ MapConfig.prototype.isVectorLayer = function (layer) {
}
return getType(layer.type) === 'mapnik' &&
+ typeof layer.options.sql === 'string' &&
layer.options.cartocss === undefined &&
layer.options.cartocss_version === undefined;
};
| 7 |
diff --git a/Source/Core/EllipsoidOutlineGeometry.js b/Source/Core/EllipsoidOutlineGeometry.js @@ -41,10 +41,10 @@ define([
* @param {Object} [options] Object with the following properties:
* @param {Cartesian3} [options.radii=Cartesian3(1.0, 1.0, 1.0)] The radii of the ellipsoid in the x, y, and z directions.
* @param {Cartesian3} [options.innerRadii=options.radii] The inner radii of the ellipsoid in the x, y, and z directions.
- * @param {Number} [options.minimumAzimuth=0.0] The minimum azimuth in radians (0 is north, +CW).
- * @param {Number} [options.maximumAzimuth=2*PI] The maximum azimuth in radians (0 is north, +CW).
- * @param {Number} [options.minimumElevation=-PI/2] The minimum elevation in radians (0 is tangential to earth surface, +UP).
- * @param {Number} [options.maximumElevation=PI/2] The maximum elevation in radians (0 is tangential to earth surface, +UP).
+ * @param {Number} [options.minimumAzimuth=0.0] The minimum azimuth in radians.
+ * @param {Number} [options.maximumAzimuth=2*PI] The maximum azimuth in radians.
+ * @param {Number} [options.minimumElevation=-PI/2] The minimum elevation in radians.
+ * @param {Number} [options.maximumElevation=PI/2] The maximum elevation in radians.
* @param {Number} [options.stackPartitions=10] The count of stacks for the ellipsoid (1 greater than the number of parallel lines).
* @param {Number} [options.slicePartitions=8] The count of slices for the ellipsoid (Equal to the number of radial lines).
* @param {Number} [options.subdivisions=128] The number of points per line, determining the granularity of the curvature.
@@ -228,14 +228,8 @@ define([
return;
}
- // The azimuth input assumes 0 is north with CW+. The geometry uses an
- // ENU frame where 0 is east with CCW+. We have to convert the azimuth
- // to ENU here.
- var azMin = (Math.PI * 2.5) - ellipsoidGeometry._maximumAzimuth;
- var azMax = (Math.PI * 2.5) - ellipsoidGeometry._minimumAzimuth;
-
- var minimumAzimuth = azMin;
- var maximumAzimuth = azMax;
+ var minimumAzimuth = ellipsoidGeometry._minimumAzimuth;
+ var maximumAzimuth = ellipsoidGeometry._maximumAzimuth;
var minimumElevation = ellipsoidGeometry._minimumElevation;
var maximumElevation = ellipsoidGeometry._maximumElevation;
var inclination1 = (CesiumMath.PI_OVER_TWO - maximumElevation);
| 3 |
diff --git a/contracts/modules/LoanMaintenance.sol b/contracts/modules/LoanMaintenance.sol @@ -73,10 +73,10 @@ contract LoanMaintenance is LoanOpeningsEvents, LoanMaintenanceEvents, VaultCont
}
/**
- * @notice Deposit the loan collateral.
+ * @notice Increase the margin of a position by depositing additional collateral.
*
* @param loanId A unique ID representing the loan.
- * @param depositAmount The amount to be deposited.
+ * @param depositAmount The amount to be deposited in collateral tokens.
*
* @return actualWithdrawAmount The amount withdrawn taking into account drawdowns.
* */
@@ -106,11 +106,11 @@ contract LoanMaintenance is LoanOpeningsEvents, LoanMaintenanceEvents, VaultCont
}
/**
- * @notice Withdraw the loan collateral.
+ * @notice Withdraw from the collateral. This reduces the margin of a position.
*
* @param loanId A unique ID representing the loan.
* @param receiver The account getting the withdrawal.
- * @param withdrawAmount The amount to be withdrawn.
+ * @param withdrawAmount The amount to be withdrawn in collateral tokens.
*
* @return actualWithdrawAmount The amount withdrawn taking into account drawdowns.
* */
@@ -166,11 +166,12 @@ contract LoanMaintenance is LoanOpeningsEvents, LoanMaintenanceEvents, VaultCont
}
/**
- * @notice Extend the loan duration.
+ * @notice Extend the loan duration by as much time as depositAmount can buy.
*
* @param loanId A unique ID representing the loan.
- * @param depositAmount The amount to be deposited.
- * @param useCollateral Whether pay interests w/ the collateral.
+ * @param depositAmount The amount to be deposited in loan tokens. Used to pay the interest for the new duration.
+ * @param useCollateral Whether pay interests w/ the collateral. If true, depositAmount of loan tokens
+ * will be purchased with the collateral.
* // param calldata The payload for the call. These loan DataBytes are additional loan data (not in use for token swaps).
*
* @return secondsExtended The amount of time in seconds the loan is extended.
@@ -246,11 +247,11 @@ contract LoanMaintenance is LoanOpeningsEvents, LoanMaintenanceEvents, VaultCont
}
/**
- * @notice Reduce the loan duration.
+ * @notice Reduce the loan duration by withdrawing from the deposited interest.
*
* @param loanId A unique ID representing the loan.
* @param receiver The account getting the withdrawal.
- * @param withdrawAmount The amount to be withdrawn.
+ * @param withdrawAmount The amount to be withdrawn in loan tokens.
*
* @return secondsReduced The amount of time in seconds the loan is reduced.
* */
| 7 |
diff --git a/token-metadata/0x4922a015c4407F87432B179bb209e125432E4a2A/metadata.json b/token-metadata/0x4922a015c4407F87432B179bb209e125432E4a2A/metadata.json "symbol": "XAUT",
"address": "0x4922a015c4407F87432B179bb209e125432E4a2A",
"decimals": 6,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/package.json b/package.json "log-update-async-hook": "^2.0.6",
"make-dir": "^3.0.0",
"mime-db": "^1.41.0",
- "moment": "^2.10.3",
+ "moment": "^2.29.3",
"moment-duration-format-commonjs": "^1.0.0",
"mustache": "^2.1.2",
"nanoid": "^3.1.31",
| 3 |
diff --git a/backend/import/keyCards.js b/backend/import/keyCards.js @@ -7,7 +7,7 @@ const keyBy = (getGroup, getValue, cards = []) => (
const groupCardsBy = (getGroup, getValue, baseSetSize = 0, cards = []) => (
cards.reduce((acc, card) => {
- if (baseSetSize >= card.number) {
+ if (baseSetSize >= parseInt(card.number)) {
const group = getGroup(card);
(acc[group] = acc[group] || []).push(getValue(card));
}
| 11 |
diff --git a/index.d.ts b/index.d.ts @@ -14,7 +14,7 @@ declare module 'informed' {
[key: string]: FormValue
}
- export type FormError = string | undefined
+ export type FormError = any
export interface FormStateBasic<V = FormValues> {
values: V
| 11 |
diff --git a/core/server/api/canary/utils/permissions.js b/core/server/api/canary/utils/permissions.js @@ -2,9 +2,13 @@ const debug = require('@tryghost/debug')('api:canary:utils:permissions');
const Promise = require('bluebird');
const _ = require('lodash');
const permissions = require('../../../services/permissions');
-const i18n = require('../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const errors = require('@tryghost/errors');
+const messages = {
+ noPermissionToCall: 'You do not have permission to {method} {docName}'
+};
+
/**
* @description Handle requests, which need authentication.
*
@@ -55,7 +59,7 @@ const nonePublicAuth = (apiConfig, frame) => {
}
}).catch((err) => {
if (err instanceof errors.NoPermissionError) {
- err.message = i18n.t('errors.api.utils.noPermissionToCall', {
+ err.message = tpl(messages.noPermissionToCall, {
method: apiConfig.method,
docName: apiConfig.docName
});
| 14 |
diff --git a/src/index.js b/src/index.js @@ -35,7 +35,7 @@ if (style.styleSheet) {
* decide if we need to clear storage
*/
const upgradeVersion = async () => {
- const required = Config.isEToro ? 'etoro' : 'beta.11'
+ const required = Config.isEToro ? 'etoro' : 'alphav3'
const version = await AsyncStorage.getItem('GD_version')
AsyncStorage.removeItem('gun/')
if (version === required) {
| 0 |
diff --git a/.travis.yml b/.travis.yml @@ -14,6 +14,7 @@ before_install:
- sudo dpkg -i google-chrome*.deb
# Install yarn
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.17.3
+ - export PATH=$HOME/.yarn/bin:$PATH
before_script:
- export PATH="`pwd`/node_modules/.bin:$PATH"
script: gulp presubmit
| 12 |
diff --git a/packages/laconia-acceptance-test/serverless.yml b/packages/laconia-acceptance-test/serverless.yml @@ -6,9 +6,9 @@ plugins:
provider:
name: aws
- runtime: ${env:NODE_RUNTIME}
- stage: ${env:NODE_VERSION}
- region: ${env:AWS_REGION}
+ runtime: ${env:NODE_RUNTIME, 'nodejs8.10' }
+ stage: ${env:NODE_VERSION, 'node8' }
+ region: ${env:AWS_REGION, 'eu-west-1'}
iamRoleStatements:
- Effect: "Allow"
Action:
| 12 |
diff --git a/components/lookup/lookup.jsx b/components/lookup/lookup.jsx @@ -85,7 +85,7 @@ const Lookup = createReactClass({
* * `overflowBoundaryElement` - The dialog will overflow scrolling parents. Use on elements that are aligned to the left or right of their target and don't care about the target being within a scrolling parent. Typically this is a popover or tooltip. Dropdown menus can usually open up and down if no room exists. In order to achieve this a portal element will be created and attached to `body`. This element will render into that detached render tree.
* * `relative` - No styling or portals will be used. Menus will be positioned relative to their triggers. This is a great choice for HTML snapshot testing.
*/
- dialogPosition: PropTypes.string,
+ menuPosition: PropTypes.string,
/**
* This prop is passed onto the `input`. Prevents dropdown menu from opening. Also applies disabled styling to input.
*/
@@ -206,7 +206,7 @@ const Lookup = createReactClass({
filterWith: defaultFilter,
iconPosition: 'right',
searchTerm: '',
- dialogPosition: 'absolute'
+ menuPosition: 'absolute'
};
},
@@ -613,7 +613,7 @@ const Lookup = createReactClass({
hasStaticAlignement={!this.props.flippable}
constrainToScrollParent={this.props.constrainToScrollParent}
onRequestTargetElement={() => this.input}
- position={this.props.dialogPosition}
+ position={this.props.menuPosition}
>
{this.renderMenuContent()}
</Dialog>
| 10 |
diff --git a/src/module/dice.js b/src/module/dice.js @@ -613,7 +613,6 @@ export class DiceSFRPG {
finalFormula.formula = finalFormula.formula.endsWith("+") ? finalFormula.formula.substring(0, finalFormula.formula.length - 1).trim() : finalFormula.formula;
const preparedRollExplanation = DiceSFRPG.formatFormula(finalFormula.formula);
- console.log(finalFormula.finalRoll);
const rollObject = Roll.create(finalFormula.finalRoll, { tags: tags, breakdown: preparedRollExplanation });
let roll = await rollObject.evaluate({async: true});
| 2 |
diff --git a/localization/en/strings.php b/localization/en/strings.php @@ -307,7 +307,6 @@ return array(
'Add #3 #1 of #2 to stock' => 'Add #3 #1 of #2 to stock',
'Adding shopping list item #1 of #2' => 'Adding shopping list item #1 of #2',
'Use a specific stock item' => 'Use a specific stock item',
- 'Expires on #1; bought on #2' => 'Expires on #1; bought on #2',
'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"',
'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)' => 'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)',
| 2 |
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.js b/packages/node_modules/@node-red/nodes/core/logic/15-change.js @@ -304,7 +304,6 @@ module.exports = function(RED) {
return done(undefined,msg);
}
var r = node.rules[currentRule];
- var rulePromise;
if (r.t === "move") {
if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
| 2 |
diff --git a/contracts/KyberNetwork.sol b/contracts/KyberNetwork.sol @@ -115,9 +115,7 @@ contract KyberNetwork is Withdrawable, Utils2, KyberNetworkInterface, Reentrancy
tradeInput.walletId = walletId;
tradeInput.hint = hint;
- uint actualDestAmount = trade(tradeInput);
-
- return actualDestAmount;
+ return trade(tradeInput);
}
event AddReserveToNetwork(KyberReserveInterface reserve, bool add);
| 13 |
diff --git a/config/router.js b/config/router.js @@ -12,6 +12,7 @@ FlowRouter.route('/', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Filter.reset();
Session.set('sortBy', '');
@@ -34,6 +35,7 @@ FlowRouter.route('/public', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Filter.reset();
Session.set('sortBy', '');
@@ -56,6 +58,7 @@ FlowRouter.route('/b/:id/:slug', {
const previousBoard = Session.get('currentBoard');
Session.set('currentBoard', currentBoard);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
// If we close a card, we'll execute again this route action but we don't
// want to excape every current actions (filters, etc.)
@@ -84,6 +87,7 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
Session.set('currentBoard', params.boardId);
Session.set('currentCard', params.cardId);
+ Session.set('popupCard', null);
Utils.manageCustomUI();
Utils.manageMatomo();
@@ -212,6 +216,7 @@ FlowRouter.route('/import/:source', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Session.set('importSource', params.source);
Filter.reset();
@@ -232,6 +237,7 @@ FlowRouter.route('/setting', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Filter.reset();
Session.set('sortBy', '');
@@ -255,6 +261,7 @@ FlowRouter.route('/information', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Filter.reset();
Session.set('sortBy', '');
@@ -277,6 +284,7 @@ FlowRouter.route('/people', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Filter.reset();
Session.set('sortBy', '');
@@ -299,6 +307,7 @@ FlowRouter.route('/admin-reports', {
Session.set('currentBoard', null);
Session.set('currentList', null);
Session.set('currentCard', null);
+ Session.set('popupCard', null);
Filter.reset();
Session.set('sortBy', '');
| 12 |
diff --git a/package-lock.json b/package-lock.json "karma-viewport": "^1.0.8",
"lodash": "^4.17.21",
"madge": "^5.0.1",
- "mathjax-v2": "npm:mathjax@^2.7.5",
+ "mathjax-v2": "npm:[email protected]",
"mathjax-v3": "npm:mathjax@^3.2.0",
"minify-stream": "^2.1.0",
"npm-link-check": "^4.0.0",
| 3 |
diff --git a/server/views/sources/collectionedit.py b/server/views/sources/collectionedit.py @@ -229,7 +229,7 @@ def _create_or_update_sources(source_list_from_csv, create_new):
results.append(src)
# process all the entries we think are updates in parallel so it happens quickly
if len(sources_to_update) > 0:
- use_pool = False
+ use_pool = True
if use_pool:
pool = Pool(processes=MEDIA_UPDATE_POOL_SIZE) # process updates in parallel with worker function
update_responses = pool.map(_update_source_worker, sources_to_update) # blocks until they are all done
@@ -324,7 +324,7 @@ def update_metadata_for_sources(source_list):
# now do all the tags in parallel batches so it happens quickly
if len(tags) > 0:
chunks = [tags[x:x + 50] for x in xrange(0, len(tags), 50)] # do 50 tags in each request
- use_pool = False
+ use_pool = True
if use_pool:
pool = Pool(processes=MEDIA_METADATA_UPDATE_POOL_SIZE ) # process updates in parallel with worker function
pool.map(_tag_media_worker, chunks) # blocks until they are all done
| 12 |
diff --git a/common/lib/client/realtimechannel.ts b/common/lib/client/realtimechannel.ts @@ -422,7 +422,7 @@ class RealtimeChannel extends Channel {
const [event, listener, callback] = RealtimeChannel.processListenerArgs(args);
if (!callback && this.realtime.options.promises) {
- return Utils.promisify(this, 'subscribe', arguments);
+ return Utils.promisify(this, 'subscribe', [event, listener]);
}
if (this.state === 'failed') {
| 1 |
diff --git a/Sources/Proxy/Core/ViewProxy/index.js b/Sources/Proxy/Core/ViewProxy/index.js @@ -68,10 +68,10 @@ function vtkViewProxy(publicAPI, model) {
AnnotatedCubePresets.applyPreset('default', model.orientationAxesCube);
AnnotatedCubePresets.applyPreset('lps', model.orientationAxesCube);
- model.orientationAxesList = [
- { name: 'arrow', actor: model.orientationAxesArrow },
- { name: 'cube', actor: model.orientationAxesCube },
- ];
+ model.orientationAxesMap = {
+ arrow: model.orientationAxesArrow,
+ cube: model.orientationAxesCube,
+ };
model.orientationWidget = vtkOrientationMarkerWidget.newInstance({
actor: model.orientationAxesArrow,
interactor: model.renderWindow.getInteractor(),
@@ -115,12 +115,10 @@ function vtkViewProxy(publicAPI, model) {
// --------------------------------------------------------------------------
publicAPI.setOrientationAxesType = (type) => {
- const orientationAxis = model.listOrientationAxis.find(
- (element) => element.name === type
- );
- if (orientationAxis !== undefined) {
- model.orientationAxesType = orientationAxis.name;
- model.orientationWidget.setActor(orientationAxis.actor);
+ const actor = model.orientationAxesMap[type];
+ if (actor) {
+ model.orientationAxesType = type;
+ model.orientationWidget.setActor(actor);
publicAPI.renderLater();
}
};
@@ -128,27 +126,21 @@ function vtkViewProxy(publicAPI, model) {
// --------------------------------------------------------------------------
publicAPI.registerOrientationAxis = (name, actor) => {
- const orientationAxisIndex = model.listOrientationAxis.findIndex(
- (element) => element.name === name
- );
- if (orientationAxisIndex === -1) {
- model.listOrientationAxis.push({ name, actor });
- }
+ model.orientationAxesMap[name] = actor;
};
// --------------------------------------------------------------------------
publicAPI.unregisterOrientationAxis = (name) => {
- const orientationAxisIndex = model.listOrientationAxis.findIndex(
- (element) => element.name === name
- );
- if (orientationAxisIndex !== -1) {
- model.listOrientationAxis.splice(orientationAxisIndex, 1);
- }
+ delete model.orientationAxesMap[name];
};
// --------------------------------------------------------------------------
+ publicAPI.listOrientationAxis = () => Object.keys(model.orientationAxesMap);
+
+ // --------------------------------------------------------------------------
+
publicAPI.setPresetToOrientationAxes = (nameOrDefinitions) => {
let changeDetected = false;
if (typeof nameOrDefinitions === 'string') {
@@ -563,7 +555,6 @@ function extend(publicAPI, model, initialValues = {}) {
'interactor',
'interactorStyle2D',
'interactorStyle3D',
- 'listOrientationAxis',
'openglRenderWindow',
'orientationAxesType',
'presetToOrientationAxes',
| 14 |
diff --git a/src/containers/tags/tags.gql b/src/containers/tags/tags.gql #import "./tagFragment.gql"
-query tagsQuery($shopId: ID!) {
- tags(shopId: $shopId) {
+query tagsQuery($shopId: ID!, $cursor: ConnectionCursor) {
+ tags(shopId: $shopId, first: 50, after: $cursor) {
+ pageInfo {
+ endCursor
+ startCursor
+ hasNextPage
+ }
edges {
cursor
node {
| 3 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.