code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/screens/SavedEventListScreen/component.js b/src/screens/SavedEventListScreen/component.js @@ -24,8 +24,16 @@ export type Props = {
class SavedEventListScreen extends Component<Props> {
shouldComponentUpdate(nextProps: Props) {
- // may want to omit navigation from this check
- return nextProps !== this.props;
+ // Intentionally do not check this.props.navigation
+ return (
+ nextProps.events !== this.props.events ||
+ nextProps.savedEvents !== this.props.savedEvents ||
+ nextProps.addSavedEvent !== this.props.addSavedEvent ||
+ nextProps.removeSavedEvent !== this.props.removeSavedEvent ||
+ nextProps.loading !== this.props.loading ||
+ nextProps.refreshing !== this.props.refreshing ||
+ nextProps.updateData !== this.props.updateData
+ );
}
render() {
| 3 |
diff --git a/userscript.user.js b/userscript.user.js @@ -52091,10 +52091,11 @@ var $$IMU_EXPORT$$;
var waitingsize = 200;
var current_chord = [];
+ var current_chord_timeout = {};
function resetifout(e) {
// doesn't work, as e doesn't contain ctrlKey etc.
- if (!trigger_complete(e)) {
+ if (!trigger_complete(settings.mouseover_trigger_key)) {
//current_chord = [];
stop_waiting();
resetpopups();
@@ -54356,14 +54357,28 @@ var $$IMU_EXPORT$$;
return keystr_in_trigger(str);
}
+ function key_would_modify_chord(str, value) {
+ if (value) {
+ if (current_chord.indexOf(str) < 0)
+ return true;
+ } else {
+ if (current_chord.indexOf(str) >= 0)
+ return true;
+ }
+
+ return false;
+ }
+
function set_chord_sub(str, value) {
if (value) {
+ current_chord_timeout[str] = Date.now();
if (current_chord.indexOf(str) < 0) {
current_chord.push(str);
//console_log("+" + str);
return true;
}
} else {
+ delete current_chord_timeout[str];
if (current_chord.indexOf(str) >= 0) {
current_chord.splice(current_chord.indexOf(str), 1);
//console_log("-" + str);
@@ -54375,7 +54390,7 @@ var $$IMU_EXPORT$$;
}
function event_in_chord(e, wanted_chord) {
- var map = get_keystrs_map(e, value)
+ var map = get_keystrs_map(e, true);
for (var key in map) {
if (keystr_in_trigger(key, wanted_chord))
@@ -54385,14 +54400,22 @@ var $$IMU_EXPORT$$;
return false;
}
- function set_chord(e, value, wanted_chord) {
- var map = get_keystrs_map(e, value)
+ function remove_old_keys() {
+ var now = Date.now();
+
+ for (var key in current_chord_timeout) {
+ if (now - current_chord_timeout[key] > 5000)
+ set_chord_sub(key, false);
+ }
+ }
+
+ function update_chord(e, value) {
+ var map = get_keystrs_map(e, value);
+
+ remove_old_keys();
var changed = false;
for (var key in map) {
- if (wanted_chord !== undefined && !keystr_in_trigger(key, wanted_chord))
- continue;
-
if (set_chord_sub(key, map[key]))
changed = true;
}
@@ -54400,7 +54423,21 @@ var $$IMU_EXPORT$$;
return changed;
}
- function trigger_complete(e, wanted_chord) {
+ function event_would_modify_chord(e, value, wanted_chord) {
+ var map = get_keystrs_map(e, value)
+
+ for (var key in map) {
+ if (wanted_chord !== undefined && !keystr_in_trigger(key, wanted_chord))
+ continue;
+
+ if (key_would_modify_chord(key, map[key]))
+ return true;
+ }
+
+ return false;
+ }
+
+ function trigger_complete(wanted_chord) {
if (wanted_chord === undefined)
wanted_chord = settings.mouseover_trigger_key;
@@ -54411,6 +54448,12 @@ var $$IMU_EXPORT$$;
return false;
}
+ // e.g. if the user presses shift+r, but the chord is r, then it should fail
+ for (var i = 0; i < current_chord.length; i++) {
+ if (wanted_chord.indexOf(current_chord[i]) < 0)
+ return false;
+ }
+
return true;
}
@@ -55366,8 +55409,12 @@ var $$IMU_EXPORT$$;
if (!mouseover_enabled())
return;
- if (settings.mouseover_trigger_behavior === "keyboard" && set_chord(event, true, settings.mouseover_trigger_key)) {
- if (trigger_complete(event, settings.mouseover_trigger_key) && !popups_active) {
+ update_chord(event, true);
+
+ if (settings.mouseover_trigger_behavior === "keyboard" && event_in_chord(event, settings.mouseover_trigger_key)) {
+ if (trigger_complete(settings.mouseover_trigger_key) && !popups_active) {
+ // clear timeout so that all/any close behavior works
+ current_chord_timeout = {};
if (!delay_handle) {
popup_trigger_reason = "keyboard";
trigger_popup();
@@ -55375,14 +55422,14 @@ var $$IMU_EXPORT$$;
}
var close_behavior = get_close_behavior();
- if (close_behavior === "all" || (close_behavior === "any" && trigger_complete(event, settings.mouseover_trigger_key))) {
+ if (close_behavior === "all" || (close_behavior === "any" && trigger_complete(settings.mouseover_trigger_key))) {
can_close_popup[0] = false;
}
}
if (popups_active && popup_trigger_reason === "mouse" &&
- settings.mouseover_use_hold_key && set_chord(event, true, settings.mouseover_hold_key)) {
- if (trigger_complete(event, settings.mouseover_hold_key)) {
+ settings.mouseover_use_hold_key && event_in_chord(event, settings.mouseover_hold_key)) {
+ if (trigger_complete(settings.mouseover_hold_key)) {
popup_hold = !popup_hold;
if (!popup_hold && can_close_popup[1])
@@ -55460,7 +55507,9 @@ var $$IMU_EXPORT$$;
if (!mouseover_enabled())
return;
- var condition = set_chord(event, false, settings.mouseover_trigger_key);
+ var condition = event_would_modify_chord(event, false, settings.mouseover_trigger_key);
+
+ update_chord(event, false);
var close_behavior = get_close_behavior();
if (condition && close_behavior === "all") {
| 7 |
diff --git a/src/Services/Terminal/Terminal.js b/src/Services/Terminal/Terminal.js @@ -15,7 +15,7 @@ const responseHasMoreData = response => (response.slice(-1).join('') === ')><');
module.exports = function (settings) {
const service = terminalService(settings);
- const emulatePcc = settings.emulatePcc || false;
+ const emulatePcc = settings.auth.emulatePcc || false;
const timeout = settings.timeout || false;
const state = {
terminalState: TERMINAL_STATE_NONE,
| 3 |
diff --git a/source/Grid/Grid.js b/source/Grid/Grid.js @@ -120,6 +120,11 @@ export default class Grid extends PureComponent {
*/
id: PropTypes.string,
+ /**
+ * Provide a way to override isScrolling through props. Useful for WindowScroller to use cell caching.
+ */
+ isScrolling: PropTypes.bool,
+
/**
* Optional renderer to be used in place of rows when either :rowCount or :columnCount is 0.
*/
@@ -751,13 +756,18 @@ export default class Grid extends PureComponent {
} = props
const {
- isScrolling,
scrollDirectionHorizontal,
scrollDirectionVertical,
scrollLeft,
scrollTop
} = state
+ let isScrolling = state.isScrolling;
+ if (Object.hasOwnProperty.call(props, 'isScrolling')) {
+ // If isScrolling is defined in props, use it to override the value in state
+ isScrolling = props.isScrolling
+ }
+
this._childrenToDisplay = []
// Render only enough columns and rows to cover the visible area of the grid.
| 11 |
diff --git a/js/bitmex.js b/js/bitmex.js @@ -374,7 +374,7 @@ module.exports = class bitmex extends Exchange {
symbol = id;
active = false;
}
- const positionId = this.safeString2 (market, 'positionCurrency', 'settlCurrency');
+ const positionId = this.safeString2 (market, 'positionCurrency', 'underlying');
const position = this.safeCurrencyCode (positionId);
const positionIsQuote = (position === quote);
const maxOrderQty = this.safeNumber (market, 'maxOrderQty');
| 4 |
diff --git a/src/scripts/parsers.js b/src/scripts/parsers.js @@ -278,30 +278,12 @@ function unstakeDetailsReducer(message, reducers) {
}
}
-function claimRewardsDetailsReducer(
- message,
- displayedProperties
- // reducers,
- // transaction,
- // stakingDenom
-) {
+function claimRewardsDetailsReducer(message, displayedProperties) {
return {
from: message.validators,
- amount: {
- amount: parseFloat(displayedProperties.claimableRewards[0].amount),
- denom: displayedProperties.claimableRewards[0].denom
+ amounts: displayedProperties.claimableRewards
}
}
-}
-
-// function claimRewardsAmountReducer(transaction, reducers, stakingDenom) {
-// return reducers.rewardCoinReducer(
-// transaction.events
-// .find(event => event.type === `transfer`)
-// .attributes.find(attribute => attribute.key === `amount`).value,
-// stakingDenom
-// )
-// }
function submitProposalDetailsReducer(message, reducers) {
return {
| 10 |
diff --git a/app/models/label/LabelTable.scala b/app/models/label/LabelTable.scala @@ -483,7 +483,7 @@ object LabelTable {
| -- This subquery counts how many of each users' labels have been validated. If it's less than 50, then we
| -- need more validations from them in order to infer worker quality, and they therefore get priority.
| SELECT mission.user_id,
- | COUNT(CASE WHEN label.correct IS NOT NULL THEN 1 END) < 50 AS needs_validations
+ | CASE WHEN COUNT(CASE WHEN label.correct IS NOT NULL THEN 1 END) < 50 THEN 100 ELSE 0 END AS needs_validations
| FROM mission
| INNER JOIN label ON label.mission_id = mission.mission_id
| WHERE label.deleted = FALSE
@@ -511,15 +511,19 @@ object LabelTable {
| AND audit_task.street_edge_id <> $tutorialStreetId
| AND gsv_data.expired = FALSE
| AND mission.user_id <> '$userIdStr'
- | AND user_stat.high_quality = TRUE
| AND label.label_id NOT IN (
| SELECT label_id
| FROM label_validation
| WHERE user_id = '$userIdStr'
| )
- |-- Prioritize labels that have been validated fewer times and from users who have had less than 50
- |-- validations of this label type, then randomize it.
- |ORDER BY label.agree_count + label.disagree_count + label.notsure_count, COALESCE(needs_validations, TRUE) DESC, RANDOM()
+ |-- Generate a priority value for each label that we sort by, between 0 and 251. A label gets 100 points if
+ |-- the labeler has fewer than 50 of their labels validated. Another 50 points if the labeler was marked as
+ |-- high quality. And up to 100 more points (100 / (1 + validation_count)) depending on the number of previous
+ |-- validations for the label. Then add a random number so that the max score for each label is 251.
+ |ORDER BY COALESCE(needs_validations, 100) +
+ | CASE WHEN user_stat.high_quality THEN 50 ELSE 0 END +
+ | 100.0 / (1 + label.agree_count + label.disagree_count + label.notsure_count) +
+ | RANDOM() * (251 - (COALESCE(needs_validations, 100) + CASE WHEN user_stat.high_quality THEN 50 ELSE 0 END + 100.0 / (1 + label.agree_count + label.disagree_count + label.notsure_count))) DESC
|LIMIT ${n * 5}""".stripMargin
)
potentialLabels = selectRandomLabelsQuery.list
| 3 |
diff --git a/components/system/components/GlobalCarousel.js b/components/system/components/GlobalCarousel.js @@ -166,7 +166,7 @@ export class GlobalCarousel extends React.Component {
}
};
- setWindowState = (data) => {
+ /* setWindowState = (cid, data) => {
let baseURL = window.location.pathname.split("/");
baseURL.length = 3;
baseURL = baseURL.join("/");
@@ -183,6 +183,31 @@ export class GlobalCarousel extends React.Component {
cid ? newURL : baseURL
);
}
+ }; */
+
+ setWindowState = (data) => {
+ let baseURL = window.location.pathname.split("/");
+ baseURL.length = 3;
+ baseURL = baseURL.join("/");
+
+ const isActivityCarousel = this.props.carouselType === "ACTIVITY";
+ if (isActivityCarousel) {
+ window.history.replaceState(
+ { ...window.history.state, cid: data && data.cid },
+ null,
+ data && data.cid
+ ? `/${data.owner}/${data.slate.slatename}/cid:${data.cid}`
+ : `/_?scene=NAV_ACTIVITY`
+ );
+
+ return;
+ }
+
+ window.history.replaceState(
+ { ...window.history.state, cid: data && data.cid },
+ null,
+ data && data.cid ? `${baseURL}/cid:${data.cid}` : baseURL
+ );
};
_handleOpen = (e) => {
| 1 |
diff --git a/token-metadata/0x88EF27e69108B2633F8E1C184CC37940A075cC02/metadata.json b/token-metadata/0x88EF27e69108B2633F8E1C184CC37940A075cC02/metadata.json "symbol": "DEGO",
"address": "0x88EF27e69108B2633F8E1C184CC37940A075cC02",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/core/renderers/block_rendering_rewrite/block_render_draw.js b/core/renderers/block_rendering_rewrite/block_render_draw.js @@ -325,8 +325,7 @@ Blockly.blockRendering.Drawer.prototype.layoutField_ = function(fieldInfo) {
}
if (fieldInfo.type == 'icon') {
svgGroup.setAttribute('display', 'block');
- svgGroup.setAttribute(
- 'transform','translate(' + xPos + ',' + yPos + ')' + scale);
+ svgGroup.setAttribute('transform','translate(' + xPos + ',' + yPos + ')');
fieldInfo.icon.computeIconLocation();
} else {
svgGroup.setAttribute(
| 2 |
diff --git a/lib/node_modules/@stdlib/_tools/eslint/rules/return-annotations-quotes/lib/main.js b/lib/node_modules/@stdlib/_tools/eslint/rules/return-annotations-quotes/lib/main.js @@ -33,52 +33,6 @@ var rule;
// FUNCTIONS //
-/**
-* Rule for validating that property names in return annotations are quoted.
-*
-* @param {Object} context - ESLint context
-* @returns {Object} validators
-*/
-function main( context ) {
- var source = context.getSourceCode();
-
- /**
- * Reports the error message.
- *
- * @private
- * @param {Object} loc - error location info
- * @param {string} msg - error message
- */
- function report( loc, msg ) {
- context.report({
- 'node': null,
- 'message': msg,
- 'loc': loc
- });
- }
-
- /**
- * Checks whether return annotations in the current program contain only quoted property names.
- *
- * @private
- * @param {ASTNode} node - node to examine
- */
- function validate( node ) {
- var comments;
- var current;
- var msg;
- var i;
-
- comments = source.getAllComments( node );
- for ( i = 0; i < comments.length; i++ ) {
- current = comments[ i ];
- msg = checkComment( current );
- if ( msg ) {
- report( current.loc, msg );
- }
- }
- }
-
/**
* Checks whether a node for an object expression contains only quoted properties.
*
@@ -166,6 +120,52 @@ function main( context ) {
return null;
}
+/**
+* Rule for validating that property names in return annotations are quoted.
+*
+* @param {Object} context - ESLint context
+* @returns {Object} validators
+*/
+function main( context ) {
+ var source = context.getSourceCode();
+
+ /**
+ * Reports the error message.
+ *
+ * @private
+ * @param {Object} loc - error location info
+ * @param {string} msg - error message
+ */
+ function report( loc, msg ) {
+ context.report({
+ 'node': null,
+ 'message': msg,
+ 'loc': loc
+ });
+ }
+
+ /**
+ * Checks whether return annotations in the current program contain only quoted property names.
+ *
+ * @private
+ * @param {ASTNode} node - node to examine
+ */
+ function validate( node ) {
+ var comments;
+ var current;
+ var msg;
+ var i;
+
+ comments = source.getAllComments( node );
+ for ( i = 0; i < comments.length; i++ ) {
+ current = comments[ i ];
+ msg = checkComment( current );
+ if ( msg ) {
+ report( current.loc, msg );
+ }
+ }
+ }
+
return {
'Program': validate
};
| 5 |
diff --git a/index.d.ts b/index.d.ts @@ -448,6 +448,9 @@ declare namespace R {
reject<T>(fn: (value: T) => boolean): (list: T[]) => T[]
reject<T>(fn: (value: T) => boolean, list: T[]): T[]
+ repeat<T>(x: T, numRepeat: number): T[]
+ repeat<T>(x: T): (numRepeat: number) => T[]
+
replace(pattern: RegExp | string, replacement: string, str: string): string
replace(pattern: RegExp | string, replacement: string): (str: string) => string
replace(pattern: RegExp | string): (replacement: string) => (str: string) => string
| 0 |
diff --git a/src/pages/Group/AppShareLoading.js b/src/pages/Group/AppShareLoading.js @@ -90,7 +90,7 @@ class ShareEvent extends React.Component {
status: res.bean.event_status
},
() => {
- this.handleStatus();
+ this.handleSendStatus();
setTimeout(() => {
this.getShareStatus();
}, 5000);
@@ -101,11 +101,16 @@ class ShareEvent extends React.Component {
});
};
handleStatus = () => {
- const { onSuccess, onFail } = this.props;
const { status } = this.state;
if (status === 'start') {
this.getShareStatus();
+ } else {
+ this.handleSendStatus();
}
+ };
+ handleSendStatus = () => {
+ const { status } = this.state;
+ const { onSuccess, onFail } = this.props;
if (status === 'success' && onSuccess) {
onSuccess();
}
| 1 |
diff --git a/diorama.js b/diorama.js @@ -470,8 +470,6 @@ const _ensureSideSceneCompiled = () => {
}
}; */
-const sideCamera = new THREE.PerspectiveCamera();
-
const _makeOutlineRenderTarget = (w, h) => new THREE.WebGLRenderTarget(w, h, {
minFilter: THREE.LinearFilter,
magFilter: THREE.LinearFilter,
@@ -493,6 +491,7 @@ const createPlayerDiorama = ({
lightningBackground = false,
radialBackground = false,
glyphBackground = false,
+ autoCamera = true,
} = {}) => {
// _ensureSideSceneCompiled();
@@ -501,11 +500,12 @@ const createPlayerDiorama = ({
const canvases = [];
let outlineRenderTarget = null;
let lastDisabledTime = 0;
- let aspect = 1;
+ const sideCamera = new THREE.PerspectiveCamera();
const diorama = {
width: 0,
height: 0,
+ camera: sideCamera,
// loaded: false,
setTarget(newTarget) {
target = newTarget;
@@ -535,9 +535,6 @@ const createPlayerDiorama = ({
canvases.splice(index, 1);
}
},
- setAspect(newAspect) {
- aspect = newAspect;
- },
toggleShader() {
const oldValues = {
grassBackground,
@@ -655,6 +652,7 @@ const createPlayerDiorama = ({
const oldClearAlpha = renderer.getClearAlpha();
const _render = () => {
+ if (autoCamera) {
// set up side camera
target.matrixWorld.decompose(localVector, localQuaternion, localVector2);
const targetPosition = localVector;
@@ -673,9 +671,6 @@ const createPlayerDiorama = ({
)
);
sideCamera.updateMatrixWorld();
- if (sideCamera.aspect !== aspect) {
- sideCamera.aspect = aspect;
- sideCamera.updateProjectionMatrix();
}
// set up side avatar scene
| 0 |
diff --git a/packages/insomnia/src/ui/routes/git-actions.tsx b/packages/insomnia/src/ui/routes/git-actions.tsx @@ -434,15 +434,13 @@ export const updateGitRepoAction: ActionFunction = async ({
oauth2format,
};
} else {
- const password = formData.get('password');
- invariant(typeof password === 'string', 'Password is required');
const token = formData.get('token');
invariant(typeof token === 'string', 'Token is required');
const username = formData.get('username');
invariant(typeof username === 'string', 'Username is required');
repoSettingsPatch.credentials = {
- password,
+ password: token,
username,
};
}
| 2 |
diff --git a/packages/react-jsx-highcharts/src/utils/events.js b/packages/react-jsx-highcharts/src/utils/events.js -import { forEach } from 'lodash-es';
import { lowerFirst } from 'lodash-es';
import { pickBy } from 'lodash-es';
import { omitBy } from 'lodash-es';
@@ -23,8 +22,8 @@ export const getEventsConfig = props => {
export const addEventHandlersManually = (Highcharts, context, props) => {
const eventProps = getEventsConfig(props);
- forEach(eventProps, (handler, eventName) => {
- Highcharts.addEvent(context, eventName, handler);
+ Object.keys(eventProps).forEach((eventName) => {
+ Highcharts.addEvent(context, eventName, eventProps[eventName]);
});
};
| 14 |
diff --git a/content-moderators/approving-peer-reviewers.md b/content-moderators/approving-peer-reviewers.md @@ -6,20 +6,42 @@ A lot of our students may speak English as a second language - which is perfectl
That is why we try to only train veteran authors - who are familiar with the level of quality we are looking for to help others get their work (portfolios) published.
-We can advise any potential Peer Reviewers to go through our resources page to see what resources can be shared with students who may need them.
+### Approval Process
+If a student show interest in becoming a peer reviewer. We should 1st see how many articles/tutorials the contributors has published with us. 3-4 is minimum number of articles needed, to able to determine that the student is familiar with our EngEd process and how to contribute/submit an article.
-We should see how many articles/tutorials the contributors has published with us. 3-4 is minimum number of articles to able to determine that the student is familiar with our EngEd process and how to contribute/submit an article.
+We advise any potential Peer Reviewers to go through our entire resources page to see what resources are available and what they can share with students who may need them during a review.
-If we determine that the contributor is an ideal candidate to become a Peer Reviewer we can share our peer reviewer folder documents to help them start the onboarding process.
+### Tryout
+We recently created the "tryout label" to let the team know that these students have NOT done a test review yet BUT have expressed interest in performing a test review to join the PR team.
+This new "tryout" extra step should help identify quality reviewers. By checking the quality of latest incoming article before allowing the student to do a test is should help us better evaluate potential peer reviewers.
-We can either look back at past published articles to gauge quality - or ask the student to perform a test review.
+Current labels:
+- *Tryout label: Student is interested in doing a test review.*
+- *Test review label: student is in the process of doing a test review to see if they are an ideal addition to the PR team.*
-With a test review we ask the potential peer reviewer to go through the list of pull requests (PRs) and find one (the older the better since we typically review 1st come 1st serve) they would like to review.
+The final decisions will be voted on by the CM team.
-We can add the "test reviewer" label to the PR via GitHub to help us keep track.
+### Test Review
+If we determine that the contributor is an ideal candidate to perform a test review we share our peer reviewer folder documents to help them start the onboarding process.
+
+>NOTE: In some case we can either look back at past published articles to gauge quality - or ask the student to perform a test review w/o a tryout phase.
+
+To perform a test review we ask the potential peer reviewer to go through the list of pull requests (PRs) and find one (**the older the better since we typically review 1st come 1st serve**) they would like to review.
+
+We then add the "test reviewer" label to the PR via GitHub to help us keep track.
After the test review - we can go over the PR with a Final Review and see where the student could improve their reviews.
+The final decisions will be voted on by the Content Moderator team.
+
+Criteria to approve a potential peer reviewer:
+- Attention to detail (grammar, formatting, etc.)
+- Pull requests are formatted correctly
+- Checking for quality content (closes sub par content)
+- Provides much value to the CM team
+- Improves quality of incoming content and great mentor to authors
+- Understands front matter
+
Once we have detrimined that the student is comfortable with the material provided and is ready to do real reviews - we can ping Hector or Molly to get the student set up with the proper GitHub permissions and invited into the proper Slack channel(s).
### Templated responses
| 7 |
diff --git a/Source/Widgets/Viewer/Viewer.js b/Source/Widgets/Viewer/Viewer.js @@ -2023,7 +2023,7 @@ Either specify options.terrainProvider instead or set options.baseLayerPicker to
boundingSphere = BoundingSphere.fromBoundingSpheres(boundingSpheres);
if (!viewer._zoomIsFlight) {
- camera.viewBoundingSphere(boundingSphere, viewer._zoomOptions.offset);
+ camera.viewBoundingSphere(boundingSphere, zoomOptions.offset);
camera.lookAtTransform(Matrix4.IDENTITY);
clearZoom(viewer);
zoomPromise.resolve(true);
| 3 |
diff --git a/token-metadata/0xc12d099be31567add4e4e4d0D45691C3F58f5663/metadata.json b/token-metadata/0xc12d099be31567add4e4e4d0D45691C3F58f5663/metadata.json "symbol": "AUC",
"address": "0xc12d099be31567add4e4e4d0D45691C3F58f5663",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/examples/linkedcat/config_example.php b/examples/linkedcat/config_example.php <?php
$HEADSTART_PATH = "../../";
-$PIWIK_ENABLED = false;
-$GA_ENABLED = false;
$WEBSITE_PATH = "http://localhost/linkedcat/";
$SNAPSHOT_PATH = $WEBSITE_PATH . "server/storage/";
?>
\ No newline at end of file
| 2 |
diff --git a/templates/customdashboard/publicdashboard/program_dashboard.html b/templates/customdashboard/publicdashboard/program_dashboard.html </div>
<!-- End of Monitoring Contents -->
- <div class="sidebar-pane" id="i_surveys">
- <h1 class="sidebar-header">
+ <div class="tab-pane" id="i_surveys">
+ {% if get_program_narrative %}
+ <h4 class="page-header">
{{ get_program_narrative.narrative_title }}
- </h1>
- <br />
+ </h4>
+
+ <div class="well well-sm">
<p>{{ get_program_narrative.narrative }}</p>
+ </div>
+
<div class="main_panel" id="main_panel"></div>
+
+ {% endif %}
</div>
<div class="tab-pane active" id="dashboard">
| 3 |
diff --git a/src/lib/substituteVariantsAtRules.js b/src/lib/substituteVariantsAtRules.js @@ -78,6 +78,9 @@ export default function(config, { variantGenerators: pluginVariantGenerators })
}
_.forEach(_.without(ensureIncludesDefault(variants), 'responsive'), variant => {
+ if (!variantGenerators[variant]) {
+ throw new Error(`Your config mentions the "${variant}" variant, but "${variant}" doesn't appear to be a variant. Did you forget or misconfigure a plugin that supplies that variant?`);
+ }
variantGenerators[variant](atRule, config)
})
| 7 |
diff --git a/packages/frontend/src/redux/reducers/account/index.js b/packages/frontend/src/redux/reducers/account/index.js @@ -8,7 +8,6 @@ import {
clearCode,
promptTwoFactor,
refreshUrl,
- refreshAccountOwner,
resetAccounts,
checkCanEnableTwoFactor,
get2faMethod,
@@ -23,6 +22,7 @@ import {
import {
staking
} from '../../actions/staking';
+import refreshAccountOwner from '../../sharedThunks/refreshAccountOwner';
const initialState = {
formLoader: false,
@@ -104,21 +104,15 @@ const ledgerKey = handleActions({
}, initialState);
const account = handleActions({
- [refreshAccountOwner]: (state, { payload, ready, meta }) => {
-
- if (!ready) {
- return {
- ...state,
- loader: meta.accountId !== state.accountId
- };
- }
-
+ [refreshAccountOwner.fulfilled]: (state, { payload }) => {
const resetAccountState = {
globalAlertPreventClear: payload && payload.globalAlertPreventClear,
- resetAccount: (state.resetAccount && state.resetAccount.preventClear) ? {
+ resetAccount: (state.resetAccount && state.resetAccount.preventClear)
+ ? {
...state.resetAccount,
preventClear: false
- } : payload && payload.resetAccount
+ }
+ : payload && payload.resetAccount
};
return {
| 9 |
diff --git a/articles/appliance/extensibility-node8.md b/articles/appliance/extensibility-node8.md @@ -22,7 +22,7 @@ The Auth0 PSaaS Appliance team has ported these changes to the Appliance environ
Auth0 has notified all PSaaS Appliance customers that this release is available.
::: warning
-Beginning with Release **201809**, Node.js v4 will no longer be supported on the PSaaS Appliance.
+Beginning with the September 2018 major release **16999**, Node.js v4 will no longer be supported on the PSaaS Appliance. Versions 16257 and 16793 support Node 4 and Node 8 so you should have tested in one of these versions before upgrading to 16999 or later.
:::
## Background
| 3 |
diff --git a/deepfence_ui/app/scripts/components/multi-cloud-table/nested-table.js b/deepfence_ui/app/scripts/components/multi-cloud-table/nested-table.js -import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
import ReactTable from 'react-table-6';
import { showTopologyPanel } from '../../actions';
@@ -7,6 +7,31 @@ import { ShimmerLoaderRow } from '../shimmer-loader/shimmer-row';
import './styles.scss';
import { addCheckbox, getColumnsForTypes } from './table-columns';
+
+const ShimmerWithTimeout = ({ message = 'No Data' }) => {
+ const [timeoutExpired, setTimeoutExpired] = useState(false);
+
+ useEffect(() => {
+ const timeoutId = setTimeout(() => {
+ setTimeoutExpired(true);
+ }, 15000);
+
+ return () => {
+ clearTimeout(timeoutId);
+ }
+ }, []);
+
+ if (timeoutExpired) {
+ return (
+ <div className="empty-row">
+ {message}
+ </div>
+ );
+ }
+ return <ShimmerLoaderRow numberOfRows={1} />
+}
+
+
let selectedItems = [];
const RecursiveTable = ({
data, onRowExpand, onRowCollapse, onNodeClicked, setAction, depth, metadata, parent = {}
@@ -26,7 +51,7 @@ const RecursiveTable = ({
);
}
return (
- <ShimmerLoaderRow numberOfRows={1} />
+ <ShimmerWithTimeout />
);
}
| 9 |
diff --git a/README.md b/README.md -
+
===================================
[](https://travis-ci.org/keystonejs/keystone)
### Documentation
-For Keystone v4 documentation and guides, see [keystonejs.netlify.com](https://keystonejs.netlify.com).
+For Keystone v4 documentation and guides, see [keystonejs.com](https://keystonejs.com).
-For Keystone v0.3 documentation, see [keystonejs.com](http://keystonejs.com).
+For Keystone v0.3 documentation, see [v3.keystonejs.com](https://v3.keystonejs.com).
### Keystone 4.0 Release Candidate (RC)
@@ -39,13 +39,13 @@ Please try out Keystone 4 and let us know what you think:
npm install --save keystone
```
-We'll be publishing a summary of the new features, changes, and improvements as we get closer to the final release. In the meantime, see the [v0.3 -> v4.0 Upgrade Guide](https://keystonejs.netlify.com/guides/v-0-3-to-v-4-0-upgrade-guide) for information on what's changed.
+We'll be publishing a summary of the new features, changes, and improvements as we get closer to the final release. In the meantime, see the [v0.3 -> v4.0 Upgrade Guide](https://keystonejs.com/guides/v-0-3-to-v-4-0-upgrade-guide) for information on what's changed.
Also check out our [demo site](http://demo.keystonejs.com), which has been updated to the new version!
## Getting Started
-This section provides a short intro to Keystone. Check out the [Getting Started Guide](https://keystonejs.netlify.com/getting-started) in the Keystone documentation for a more comprehensive introduction.
+This section provides a short intro to Keystone. Check out the [Getting Started Guide](https://keystonejs.com/getting-started) in the Keystone documentation for a more comprehensive introduction.
### Installation
@@ -60,13 +60,13 @@ Answer the questions, and the generator will create a new project based on the o
Alternatively, to include Keystone in an existing project or start from scratch (without Yeoman), specify `keystone: "4.0.0-rc.1"` in the `dependencies` array of your `package.json` file, and run `npm install` from your terminal.
-Then read through the [Documentation](https://keystonejs.netlify.com/documentation) and the [Example Projects](http://keystonejs.com/examples) to understand how to use it.
+Then read through the [Documentation](https://keystonejs.com/documentation) and the [Example Projects](http://v3.keystonejs.com/examples) to understand how to use it.
### Configuration
Config variables can be passed in an object to the `keystone.init` method, or can be set any time before `keystone.start` is called using `keystone.set(key, value)`. This allows for a more flexible order of execution. For example, if you refer to Lists in your routes you can set the routes after configuring your Lists.
-See the [KeystoneJS configuration documentation](https://keystonejs.netlify.com/documentation/configuration) for details and examples of the available options.
+See the [KeystoneJS configuration documentation](https://keystonejs.com/documentation/configuration) for details and examples of the available options.
### Database field types
@@ -74,7 +74,7 @@ Keystone builds on the basic data types provided by MongoDB and allows you to ea
You get helper methods on your models for dealing with each field type easily (such as formatting a date or number, resizing an image, getting an array of the available options for a select field, or using Google's Places API to improve addresses) as well as a beautiful, responsive admin UI to edit your data with.
-See the [KeystoneJS database documentation](https://keystonejs.netlify.com/documentation/database) for details and examples of the various field types, as well as how to set up and use database models in your application.
+See the [KeystoneJS database documentation](https://keystonejs.com/documentation/database) for details and examples of the various field types, as well as how to set up and use database models in your application.
### Running KeystoneJS in Production
| 1 |
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). */}}
-{{- $pages := where (where .Site.Pages "Section" (.Params.section | default .page.Section)) "Params.fragment" "eq" "content" -}}
+{{- $pages := where (where .Site.Pages.ByDate "Section" (.Params.section | default .page.Section)) "Params.fragment" "eq" "content" -}}
{{- $bg := .Params.background | default "light" }}
{{ "<!-- Blog -->" | safeHTML }}
| 0 |
diff --git a/src/traces/histogram2dcontour/index.js b/src/traces/histogram2dcontour/index.js @@ -14,7 +14,7 @@ var Histogram2dContour = {};
Histogram2dContour.attributes = require('./attributes');
Histogram2dContour.supplyDefaults = require('./defaults');
Histogram2dContour.calc = require('../contour/calc');
-Histogram2dContour.plot = require('../contour/plot');
+Histogram2dContour.plot = require('../contour/plot').plot;
Histogram2dContour.style = require('../contour/style');
Histogram2dContour.colorbar = require('../contour/colorbar');
Histogram2dContour.hoverPoints = require('../contour/hover');
| 3 |
diff --git a/server/publications/swimlanes.js b/server/publications/swimlanes.js @@ -4,19 +4,20 @@ Meteor.methods({
check(toBoardId, String);
const swimlane = Swimlanes.findOne(swimlaneId);
- const board = Boards.findOne(toBoardId);
+ const fromBoard = Boards.findOne(swimlane.boardId);
+ const toBoard = Boards.findOne(toBoardId);
- if (swimlane && board) {
+ if (swimlane && toBoard) {
swimlane.lists().forEach(list => {
- const boardList = Lists.findOne({
+ const toList = Lists.findOne({
boardId: toBoardId,
title: list.title,
archived: false,
});
let toListId;
- if (boardList) {
- toListId = boardList._id;
+ if (toList) {
+ toListId = toList._id;
} else {
toListId = Lists.insert({
title: list.title,
@@ -42,7 +43,7 @@ Meteor.methods({
});
// make sure there is a default swimlane
- this.board().getDefaultSwimline();
+ fromBoard.getDefaultSwimline();
return true;
}
| 1 |
diff --git a/examples/react-example/App.js b/examples/react-example/App.js @@ -18,11 +18,11 @@ module.exports = class App extends React.Component {
}
componentWillMount () {
- this.uppy = new Uppy({ autoProceed: false })
+ this.uppy = new Uppy({ id: 'uppy1', autoProceed: true, debug: true })
.use(Tus, { endpoint: 'https://master.tus.io/files/' })
.use(GoogleDrive, { host: 'https://server.uppy.io' })
- this.uppy2 = new Uppy({ autoProceed: false })
+ this.uppy2 = new Uppy({ id: 'uppy2', autoProceed: false, debug: true })
.use(Tus, { endpoint: 'https://master.tus.io/files/' })
}
@@ -93,6 +93,7 @@ module.exports = class App extends React.Component {
<h2>Progress Bar</h2>
<ProgressBar
uppy={this.uppy}
+ hideAfterFinish={false}
/>
</div>
)
| 7 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -640,6 +640,9 @@ metaversefile.setApi({
throw new Error('usePhysics cannot be called outside of render()');
}
},
+ useParticleSystem() {
+ return world.particleSystem;
+ },
useDefaultModules() {
return defaultModules;
},
| 0 |
diff --git a/sirepo/pkcli/job_cmd.py b/sirepo/pkcli/job_cmd.py @@ -14,6 +14,7 @@ from sirepo import simulation_db
from sirepo.template import template_common
import requests
import sirepo.template
+import sirepo.util
import subprocess
import sys
import time
@@ -95,6 +96,8 @@ def _do_compute(msg, template):
return PKDict(state=job.ERROR, error='non zero returncode={}'.format(r))
else:
return PKDict(state=job.COMPLETED)
+ except sirepo.util.UserAlert as e:
+ return PKDict(state=job.ERROR, error=e.sr_args.error, stack=pkdexc())
except Exception as e:
return PKDict(state=job.ERROR, error=str(e), stack=pkdexc())
# DOES NOT RETURN
| 9 |
diff --git a/collections/_blogs/2020-06-25-SMI-conformance-testing-with-meshery.md b/collections/_blogs/2020-06-25-SMI-conformance-testing-with-meshery.md layout: post
title: "Starting SMI Conformance Testing with Meshery"
date: 2020-06-25 10:30:05 -0530
-image: /assets/images/posts/2020-06-25-smi-conformance-testing-with-meshery/smi-conformance.svg
+image: /assets/images/posts/2020-06-25-SMI-conformance-testing-with-meshery/smi-conformance.svg
author: Naveen Kumar
category: community
permalink: /blog/:categories/:title
| 1 |
diff --git a/game.js b/game.js @@ -1029,12 +1029,14 @@ const _gameUpdate = (timestamp, timeDiff) => {
localEuler.z = 0;
const hitQuaternion = new THREE.Quaternion().setFromEuler(localEuler);
+ const willDie = object.willDieFrom(damage);
object.hit(damage, {
- collisionId: object.willDieFrom(damage) ? collisionId : null,
+ collisionId,
// collisionId,
hitPosition,
hitQuaternion,
hitDirection,
+ willDie,
});
lastHitTimes.set(object, now);
| 0 |
diff --git a/api/src/utils/personalization/index.js b/api/src/utils/personalization/index.js @@ -9,22 +9,34 @@ import { getStreamClient } from '../../utils/stream';
import config from '../../config';
+function createGlobalToken() {
+ const token = jwt.sign(
+ {
+ action: '*',
+ feed_id: '*',
+ resource: '*',
+ user_id: '*',
+ },
+ config.stream.apiSecret,
+ { algorithm: 'HS256', noTimestamp: true },
+ );
+ return token;
+}
+
export async function getRecommendations(userID, type, limit) {
if (!userID) {
throw Error('missing user id');
}
const streamClient = getStreamClient();
+ streamClient.personalizationToken = createGlobalToken();
+
const path = `winds_${type}_recommendations`;
- const queryParams = {
- user_id: userID,
- limit: limit,
- };
- let response = await streamClient.personalization.get(path, queryParams);
- let objectIDs = response.data.results.map(result => {
+ const queryParams = { user_id: userID, limit: limit };
+ const response = await streamClient.personalization.get(path, queryParams);
+
+ return response.results.map(result => {
return result.foreign_id.split(':')[1];
});
-
- return objectIDs;
}
export async function getRSSRecommendations(userID, limit = 20) {
| 4 |
diff --git a/tests/actions/ReimbursementAccountTest.js b/tests/actions/ReimbursementAccountTest.js @@ -169,7 +169,7 @@ describe('actions/BankAccounts', () => {
},
}));
- // And mock response to SetNameValuePair
+ // And mock resonse to SetNameValuePair
HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve({jsonCode: 200}));
// WHEN we call setupWithdrawalAccount on the RequestorStep
@@ -231,12 +231,11 @@ describe('actions/BankAccounts', () => {
it('should fetch the correct initial state for a user with an account in setup (bailed after RequestorStep - but completed Onfido)', () => {
// GIVEN a mock response for a call to Get&returnValueList=nameValuePairs&name=expensify_freePlanBankAccountID that returns a bankAccountID
- HttpUtils.xhr
- .mockImplementationOnce(() => Promise.resolve(FREE_PLAN_NVP_RESPONSE))
+ HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve(FREE_PLAN_NVP_RESPONSE));
// and a mock response for a call to Get&returnValueList=nameValuePairs,bankAccountList&nvpNames that should return a bank account
// that has completed both the RequestorStep and CompanyStep and has completed Onfido
- .mockImplementationOnce(() => Promise.resolve({
+ HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve({
jsonCode: 200,
nameValuePairs: [],
bankAccountList: [{
@@ -261,7 +260,7 @@ describe('actions/BankAccounts', () => {
expect(reimbursementAccount.achData.currentStep).toBe(CONST.BANK_ACCOUNT.STEP.ACH_CONTRACT);
HttpUtils.xhr.mockImplementation((command) => {
- // WHEN we mock a successful call to SetupWithdrawalAccount while on the ACHContractStep
+ // WHEN we mock a sucessful call to SetupWithdrawalAccount while on the ACHContractStep
switch (command) {
case 'BankAccount_SetupWithdrawal':
return Promise.resolve({
@@ -305,21 +304,13 @@ describe('actions/BankAccounts', () => {
});
it('should fetch the correct initial state for a user on the ACHContractStep in PENDING state', () => {
- HttpUtils.xhr.mockImplementation((command, data) => {
- if (command === 'Log') {
- return Promise.resolve({jsonCode: 200});
- }
-
- // Any remaining mocks should be calls to Get
- switch (data.returnValueList) {
- case 'nameValuePairs':
// GIVEN a mock response for a call to Get&returnValueList=nameValuePairs&name=expensify_freePlanBankAccountID that returns a bankAccountID
- return Promise.resolve(FREE_PLAN_NVP_RESPONSE);
+ HttpUtils.xhr.mockImplementationOnce(() => Promise.resolve(FREE_PLAN_NVP_RESPONSE));
- case 'nameValuePairs, bankAccountList':
- // and a mock response for a call to Get&returnValueList=nameValuePairs,bankAccountList&nvpNames that should return a bank account
- // that has completed both the RequestorStep and CompanyStep and has completed Onfido
- return Promise.resolve({
+ // and a mock response for a call to Get&returnValueList=nameValuePairs,bankAccountList&nvpNames that should return a bank account that has completed both
+ // the RequestorStep, CompanyStep, and ACHContractStep and is now PENDING
+ HttpUtils.xhr
+ .mockImplementationOnce(() => Promise.resolve({
jsonCode: 200,
nameValuePairs: [],
bankAccountList: [{
@@ -332,11 +323,7 @@ describe('actions/BankAccounts', () => {
state: BankAccount.STATE.PENDING,
routingNumber: TEST_BANK_ACCOUNT_ROUTING_NUMBER,
}],
- });
- default:
- return Promise.resolve({jsonCode: 200});
- }
- });
+ }));
// WHEN we fetch the account
BankAccounts.fetchFreePlanVerifiedBankAccount();
| 13 |
diff --git a/src/__experimental__/components/label/label.style.js b/src/__experimental__/components/label/label.style.js @@ -19,7 +19,7 @@ const LabelStyle = styled.label`
padding-bottom: 0;
padding-right: ${sizes[inputSize].padding};
text-align: ${align};
- width: ${width}%;
+ width: ${width === 0 ? LabelStyle.defaultProps.width : width}%;
${inputSize === 'small' && css`padding-top: 8px;`}
${inputSize === 'medium' && css`padding-top: 12px;`}
${inputSize === 'large' && css`padding-top: 16px;`}
| 12 |
diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js import React, {Component} from 'react';
+import {View, TouchableOpacity} from 'react-native';
import PropTypes from 'prop-types';
import {withOnyx} from 'react-native-onyx';
import CONST from '../../CONST';
@@ -10,7 +11,10 @@ import IOUAmountPage from './steps/IOUAmountPage';
import IOUParticipantsPage from './steps/IOUParticipantsPage';
import IOUConfirmPage from './steps/IOUConfirmPage';
import HeaderGap from '../../components/HeaderGap';
-import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
+import Header from '../../components/Header';
+import styles from '../../styles/styles';
+import Icon from '../../components/Icon';
+import {Close} from '../../components/Icon/Expensicons';
/**
* IOU modal for requesting money and splitting bills.
@@ -40,7 +44,7 @@ class IOUModal extends Component {
super(props);
this.state = {
- step: StepType.IOUConfirm,
+ step: StepType.IOUAmount,
};
this.getTitleForStep = this.getTitleForStep;
@@ -73,11 +77,27 @@ class IOUModal extends Component {
isVisible={this.props.currentURL === this.props.route}
backgroundColor={themeColors.componentBG}
>
- <HeaderGap />
- <HeaderWithCloseButton
- title={this.getTitleForStep()}
- onCloseButtonPress={redirectToLastReport}
- />
+ <View style={[styles.headerBar, true && styles.borderBottom]}>
+ <View style={[
+ styles.dFlex,
+ styles.flexRow,
+ styles.alignItemsCenter,
+ styles.flexGrow1,
+ styles.justifyContentBetween,
+ styles.overflowHidden,
+ ]}
+ >
+ <Header title={this.getTitleForStep()} />
+ <View style={[styles.reportOptions, styles.flexRow]}>
+ <TouchableOpacity
+ onPress={redirectToLastReport}
+ style={[styles.touchableButtonImage]}
+ >
+ <Icon src={Close} />
+ </TouchableOpacity>
+ </View>
+ </View>
+ </View>
{this.state.step === StepType.IOUAmount && <IOUAmountPage />}
{this.state.step === StepType.IOUParticipants && <IOUParticipantsPage />}
{this.state.step === StepType.IOUConfirm && <IOUConfirmPage />}
| 14 |
diff --git a/world.js b/world.js @@ -449,6 +449,43 @@ world.addEventListener('trackedobjectremove', async e => {
});
world.isObject = object => objects.includes(object);
+world.getWorldJson = async u => {
+ if (u) {
+ const id = parseInt(u, 10);
+ if (!isNaN(id)) {
+ const res = await fetch(`${tokensHost}/${id}`);
+ const j = await res.json();
+ const {hash} = j.properties;
+ if (hash) {
+ const {name, ext} = j.properties;
+ return {
+ objects: [
+ {
+ start_url: `${storageHost}/${hash}/${name}.${ext}`,
+ }
+ ],
+ };
+ } else {
+ return {
+ default: true,
+ };
+ }
+ } else {
+ return {
+ objects: [
+ {
+ start_url: u,
+ }
+ ],
+ };
+ }
+ } else {
+ return {
+ default: true,
+ };
+ }
+};
+
let animationMediaStream = null
let networkMediaStream = null;
const _latchMediaStream = async () => {
| 0 |
diff --git a/source/shaders/ibl_filtering.frag b/source/shaders/ibl_filtering.frag @@ -91,20 +91,24 @@ mat3 generateTBN(vec3 normal)
{
vec3 bitangent = vec3(0.0, 1.0, 0.0);
- float NdotUp = dot(normal, vec3(0.0, 1.0, 0.0));
- float epsilon = 0.0000001;
- if (1.0 - abs(NdotUp) <= epsilon)
- {
- // Sampling +Y or -Y, so we need a more robust bitangent.
- if (NdotUp > 0.0)
- {
- bitangent = vec3(0.0, 0.0, 1.0);
- }
- else
- {
- bitangent = vec3(0.0, 0.0, -1.0);
- }
- }
+ // we can omit the following elimination of singularities,
+ // as the output cube maps are power of two and therefore
+ // never generate a perfectly upright normal
+
+ // float NdotUp = dot(normal, vec3(0.0, 1.0, 0.0));
+ // float epsilon = 0.0000001;
+ // if (1.0 - abs(NdotUp) <= epsilon)
+ // {
+ // // Sampling +Y or -Y, so we need a more robust bitangent.
+ // if (NdotUp > 0.0)
+ // {
+ // bitangent = vec3(0.0, 0.0, 1.0);
+ // }
+ // else
+ // {
+ // bitangent = vec3(0.0, 0.0, -1.0);
+ // }
+ // }
vec3 tangent = normalize(cross(bitangent, normal));
bitangent = cross(normal, tangent);
| 2 |
diff --git a/scripts/job-publish-bintray.js b/scripts/job-publish-bintray.js const cfg = require('./config');
const fs = require('fs-extra');
+const https = require('https');
const path = require('path');
-const superagent = require('superagent');
async function run () {
@@ -27,16 +27,17 @@ function bintray ({ user, apiKey, subject, packageName }) {
return function ({ filepath, version }) {
const { ext, name: filename } = path.parse(filepath);
const repo = ext.slice(1);
- const url = `https://api.bintray.com/content/${subject}/${repo}/${packageName}/${version}/${filename}.${repo}`;
+ const host = `api.bintray.com`;
+ const requestPath = `/content/${subject}/${repo}/${packageName}/${version}/${filename}.${repo}?publish=1&override=1`;
const isStableVersion = cfg.isStableVersion();
const debianDistribution = isStableVersion ? 'stable' : 'unstable';
const debianComponent = isStableVersion ? 'main' : 'beta';
console.log(`Uploading ${repo} on Bintray...`);
console.log(`\tfile ${filepath}`);
- console.log(`\tto ${url}`);
+ console.log(`\tto ${host} ${requestPath}`);
return httpPut({
- url,
- qs: { publish: '1', override: '1' },
+ host,
+ requestPath,
body: fs.createReadStream(filepath),
headers: {
'Content-Type': 'application/zip',
@@ -50,19 +51,27 @@ function bintray ({ user, apiKey, subject, packageName }) {
};
}
-function httpPut ({ url, qs, body, headers }) {
+// We use https module directly because we had pb with streams and superagent
+function httpPut ({ host, requestPath, body, headers }) {
return new Promise((resolve, reject) => {
- const req = superagent
- .put(url)
- .set(headers)
- .query(qs)
- .end((err, res) => {
- if (err != null) {
- const error = new Error('Failed to do HTTP PUT\n' + res.statusCode + '\n' + res.body);
- return reject(error);
- }
- return resolve(res);
+
+ const opts = {
+ host,
+ path: requestPath,
+ method: 'put',
+ headers,
+ };
+
+ function onResp (resp) {
+ resp.on('data', () => {
});
+ resp.on('end', () => resolve());
+ }
+
+ const req = https
+ .request(opts, onResp)
+ .on('error', reject);
+
body.pipe(req);
});
}
| 14 |
diff --git a/src/level/tiled/TMXLayer.js b/src/level/tiled/TMXLayer.js this.preRender = me.sys.preRender;
}
- // if pre-rendering method is use, create an offline canvas/renderer
- if (this.preRender === true) {
- this.canvasRenderer = new me.CanvasRenderer(
- me.video.createCanvas(this.width, this.height),
- this.width, this.height,
- { transparent : true }
- );
- }
-
// initialize and set the layer data
setLayerData(this,
me.TMXUtils.decode(
}
// Resize the bounding rect
- this.getBounds().resize(this.width, this.height);
+ var bounds = this.getRenderer().getBounds(this);
+ this.getBounds().resize(bounds.width, bounds.height);
+
+ // if pre-rendering method is use, create an offline canvas/renderer
+ if ((this.preRender === true) && (!this.canvasRenderer)) {
+ this.canvasRenderer = new me.CanvasRenderer(
+ me.video.createCanvas(this.width, this.height),
+ this.width, this.height,
+ { transparent : true }
+ );
+ }
},
// called when the layer is removed from the game world or a container
*/
setRenderer : function (renderer) {
this.renderer = renderer;
- // update the layer bounds once the renderer is set
- this.renderer.getBounds(this);
},
/**
| 1 |
diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js @@ -218,7 +218,7 @@ define([
this._clippingPlaneOffsetMatrix = undefined;
this._clippingPlaneTransformMatrix = undefined;
- this._recomputeClippingPlaneMatrix = false;
+ this._recomputeClippingPlaneMatrix = true;
/**
* Optimization option. Whether the tileset should refine based on a dynamic screen space error. Tiles that are further
| 12 |
diff --git a/src/matrix/room/sending/SendQueue.js b/src/matrix/room/sending/SendQueue.js @@ -31,6 +31,7 @@ export class SendQueue {
this._isSending = false;
this._offline = false;
this._roomEncryption = null;
+ this._currentQueueIndex = 0;
}
_createPendingEvent(data, attachments = null) {
@@ -55,6 +56,7 @@ export class SendQueue {
await log.wrap("send event", async log => {
log.set("queueIndex", pendingEvent.queueIndex);
try {
+ this._currentQueueIndex = pendingEvent.queueIndex;
await this._sendEvent(pendingEvent, log);
} catch(err) {
if (err instanceof ConnectionError) {
@@ -75,6 +77,8 @@ export class SendQueue {
pendingEvent.setError(err);
}
}
+ } finally {
+ this._currentQueueIndex = 0;
}
});
}
@@ -274,7 +278,11 @@ export class SendQueue {
let pendingEvent;
try {
const pendingEventsStore = txn.pendingEvents;
- const maxQueueIndex = await pendingEventsStore.getMaxQueueIndex(this._roomId) || 0;
+ const maxStorageQueueIndex = await pendingEventsStore.getMaxQueueIndex(this._roomId) || 0;
+ // don't use the queueIndex of the pendingEvent currently waiting for /send to return
+ // if the remote echo already removed the pendingEvent in storage, as the send loop
+ // wouldn't be able to detect the remote echo already arrived and end up overwriting the new event
+ const maxQueueIndex = Math.max(maxStorageQueueIndex, this._currentQueueIndex);
const queueIndex = maxQueueIndex + 1;
const needsEncryption = eventType !== REDACTION_TYPE && !!this._roomEncryption;
pendingEvent = this._createPendingEvent({
| 1 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "5.3.0">
+<!ENTITY version-java-client "5.4.0">
<!ENTITY version-dotnet-client "5.0.1">
<!ENTITY version-server "3.7.7">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/handlers/awsJobs.js b/handlers/awsJobs.js @@ -214,7 +214,7 @@ let handlers = {
// check if job is already known to be completed
// there could be a scenario where we are polling before the AWS batch job has been setup. !jobs check handles this.
- if ((status === 'SUCCEEDED' && job.results && job.results.length > 0) || status === 'FAILED' || !jobs) {
+ if ((status === 'SUCCEEDED' && job.results && job.results.length > 0) || status === 'FAILED' || status === 'REJECTED' || !jobs) {
res.send(job);
} else {
let params = {
| 9 |
diff --git a/templates/small_site_profile_map.html b/templates/small_site_profile_map.html <script src="https://leaflet.github.io/Leaflet.heat/dist/leaflet-heat.js"></script>
-<script src="https://maps.google.com/maps/api/js?v=3.2&key=AIzaSyCcix2ucURnpMK9lWrcBtqlR6jc2qaVanQ&sensor=false"></script>
-<!-- <script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCcix2ucURnpMK9lWrcBtqlR6jc2qaVanQ&callback=initMap" -->
- <!-- type="text/javascript"></script> -->
+<script src="https://maps.google.com/maps/api/js?v=3.2&key=AIzaSyBnyFpqwIxiw03se0PC6-vWEey1mnOgFKU&sensor=false"></script>
+<!-- <script async defer
+ src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBnyFpqwIxiw03se0PC6-vWEey1mnOgFKU&callback=initMap">
+</script> -->
<script src="{{ STATIC_URL }}js/leaflet-google.js"></script>
<link rel="borders" type="application/json" href="{{ STATIC_URL }}js/world_borders.geojson">
| 3 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,18 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.44.2] -- 2019-02-04
+
+### Fixed
+- Fix vertical modebars in IE11 [@3491]
+- Fix `hovertemplate` for traces with blank `name` [#3480]
+- Fix 3D grid lines and tick labels colored by rgba color
+ with full transparency [#3494]
+- Fix white highlights rendering problems for `mesh3d` trace on
+ some devices (bug introduced in 1.44.0) [#3483]
+- Fix `fill.color` description for `table` traces [#3481]
+
+
## [1.44.1] -- 2019-01-24
### Fixed
| 3 |
diff --git a/src/display/api.js b/src/display/api.js @@ -708,11 +708,15 @@ class PDFDocumentProxy {
}
/**
- * @param {{num: number, gen: number}} ref - The page reference. Must have
- * the `num` and `gen` properties.
- * @returns {Promise<{num: number, gen: number}>} A promise that is resolved
- * with the page index (starting from zero) that is associated with the
- * reference.
+ * @typedef {Object} RefProxy
+ * @property {number} num
+ * @property {number} gen
+ */
+
+ /**
+ * @param {RefProxy} ref - The page reference.
+ * @returns {Promise<number>} A promise that is resolved with the page index,
+ * starting from zero, that is associated with the reference.
*/
getPageIndex(ref) {
return this._transport.getPageIndex(ref);
| 1 |
diff --git a/test/jasmine/tests/gl3d_hover_click_test.js b/test/jasmine/tests/gl3d_hover_click_test.js @@ -24,6 +24,7 @@ mock2.data[0].surfaceaxis = 2;
mock2.layout.showlegend = true;
var mock3 = require('@mocks/gl3d_autocolorscale');
+var mock4 = require('@mocks/gl3d_transparent_same-depth.json');
describe('Test gl3d trace click/hover:', function() {
var gd, ptData;
@@ -39,13 +40,16 @@ describe('Test gl3d trace click/hover:', function() {
destroyGraphDiv();
});
- function assertHoverText(xLabel, yLabel, zLabel, textLabel) {
+ function assertHoverText(xLabel, yLabel, zLabel, textLabel, traceName) {
var content = [];
if(xLabel) content.push(xLabel);
if(yLabel) content.push(yLabel);
if(zLabel) content.push(zLabel);
if(textLabel) content.push(textLabel);
- assertHoverLabelContent({nums: content.join('\n')});
+ assertHoverLabelContent({
+ name: traceName,
+ nums: content.join('\n')
+ });
}
function assertEventData(x, y, z, curveNumber, pointNumber, extra) {
@@ -539,4 +543,29 @@ describe('Test gl3d trace click/hover:', function() {
.catch(failTest)
.then(done);
});
+
+ it('@gl should pick latest & closest points on hover if two points overlap', function(done) {
+ var _mock = Lib.extendDeep({}, mock4);
+
+ function _hover() {
+ mouseEvent('mouseover', 0, 0);
+ mouseEvent('mouseover', 200, 200);
+ }
+
+ Plotly.plot(gd, _mock)
+ .then(delay(20))
+ .then(function() {
+ gd.on('plotly_hover', function(eventData) {
+ ptData = eventData.points[0];
+ });
+ })
+ .then(delay(20))
+ .then(_hover)
+ .then(delay(20))
+ .then(function() {
+ assertHoverText('x: 1', 'y: 1', 'z: 1', 'third above', 'trace 1');
+ })
+ .catch(failTest)
+ .then(done);
+ });
});
| 0 |
diff --git a/src/drawNode.js b/src/drawNode.js @@ -27,7 +27,7 @@ function completeAttributes(attributes, defaultAttributes=defaultNodeAttributes)
}
}
-export function drawNode(x1, y1, width, height, nodeId, shape='ellipse', attributes, options={}) {
+export function drawNode(x, y, width, height, nodeId, shape='ellipse', attributes, options={}) {
attributes = attributes || {};
completeAttributes(attributes);
var svg = d3.select("svg");
@@ -57,34 +57,34 @@ export function drawNode(x1, y1, width, height, nodeId, shape='ellipse', attribu
g: newNode,
nodeId: nodeId,
shape: shape,
- x1: x1,
- y1: y1,
+ x: x,
+ y: y,
width: width,
height: height,
attributes: attributes,
};
- _updateNode(newNode, x1, y1, width, height, nodeId, shape, attributes, options);
+ _updateNode(newNode, x, y, width, height, nodeId, shape, attributes, options);
return this;
}
-export function updateCurrentNode(x1, y1, width, height, nodeId, shape, attributes, options={}) {
+export function updateCurrentNode(x, y, width, height, nodeId, shape, attributes, options={}) {
var node = this._currentNode.g
attributes = attributes || {};
completeAttributes(attributes, this._currentNode.attributes);
this._currentNode.nodeId = nodeId;
this._currentNode.shape = shape;
- this._currentNode.x1 = x1;
- this._currentNode.y1 = y1;
+ this._currentNode.x = x;
+ this._currentNode.y = y;
this._currentNode.width = width;
this._currentNode.height = height;
this._currentNode.attributes = attributes;
- _updateNode(node, x1, y1, width, height, nodeId, shape, attributes, options);
+ _updateNode(node, x, y, width, height, nodeId, shape, attributes, options);
return this;
}
-function _updateNode(node, x1, y1, width, height, nodeId, shape, attributes, options) {
+function _updateNode(node, x, y, width, height, nodeId, shape, attributes, options) {
var id = attributes.id;
var fill = attributes.fillcolor;
@@ -106,13 +106,13 @@ function _updateNode(node, x1, y1, width, height, nodeId, shape, attributes, opt
var svgShape = svgShapes[shape];
if (svgShape == 'ellipse') {
svgElement
- .attr("cx", x1 + width / 2)
- .attr("cy", y1 + height/ 2)
+ .attr("cx", x + width / 2)
+ .attr("cy", y + height/ 2)
.attr("rx", width / 2)
.attr("ry", height / 2)
} else {
svgElement
- .attr("points", '' + (x1 + width) + ',' + (y1 - height) + ' ' + x1 + ',' + (y1 - height) + ' ' + x1 + ',' + y1 + ' ' + (x1 + width) + ',' + y1)
+ .attr("points", '' + (x + width) + ',' + (y - height) + ' ' + x + ',' + (y - height) + ' ' + x + ',' + y + ' ' + (x + width) + ',' + y)
}
svgElement
.attr("fill", fill)
@@ -122,8 +122,8 @@ function _updateNode(node, x1, y1, width, height, nodeId, shape, attributes, opt
var text = subParent.selectWithoutDataPropagation('text');
text
.attr("text-anchor", "middle")
- .attr("x", x1 + width / 2)
- .attr("y", y1 + height / 2)
+ .attr("x", x + width / 2)
+ .attr("y", y + height / 2)
.attr("font-family", "Times,serif")
.attr("font-size", "14.00")
.attr("fill", "#000000")
| 10 |
diff --git a/src/main.js b/src/main.js @@ -110,9 +110,9 @@ function buildMenu(disableAll = false) {
}
async function checkForUpdates(showFailDialogs) {
+ try {
let info = await updater.check(`SabakiHQ/${app.getName()}`)
- try {
if (info.hasUpdates) {
dialog.showMessageBox({
type: 'info',
| 9 |
diff --git a/AdditionalPostModActions.user.js b/AdditionalPostModActions.user.js // @description Adds a menu with mod-only quick actions in post sidebar
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 2.13
+// @version 2.13.1
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
font-family: Roboto,RobotoDraft,Helvetica,Arial,sans-serif;
letter-spacing: .2px;
line-height: 20px;
-
- user-select: none;
white-space: nowrap;
}
.post-mod-menu-header {
padding-right: 48px;
cursor: pointer;
color: var(--black-900);
+
+ user-select: none;
}
.post-mod-menu a.dno {
display: none;
| 11 |
diff --git a/packages/locale/lang/en-us.ts b/packages/locale/lang/en-us.ts @@ -110,6 +110,8 @@ export default {
},
},
drawing: {
+ expand: 'Expand',
+ collapse: 'Collapse',
point: {
tip: 'Drawing point',
drawTip1: 'Click the left button to draw a point.',
| 1 |
diff --git a/src/models/size.js b/src/models/size.js @@ -21,7 +21,7 @@ const SizeModel = Axis.extend({
extent: [0, 0.85],
scaleType: null,
allow: {
- scales: ["linear", "log", "genericLog", "pow"]
+ scales: ["ordinal", "linear", "log", "genericLog", "pow"]
}
};
return utils.deepExtend(this._super(), defaults);
| 11 |
diff --git a/gulpfile.js b/gulpfile.js @@ -351,6 +351,7 @@ async function cookWithOptions(options = { formattingCheck: true }) {
// Conditions cache and regular expression are generated during beginning of cooking and used during formatting checks
var conditionsCache = {};
var conditionsRegularExpression;
+var poisonAndDiseasesRegularExpression = new RegExp("(poison|disease)", "g");
var validArmorTypes = ["light", "power", "heavy", "shield"];
var validCreatureSizes = ["fine", "diminutive", "tiny", "small", "medium", "large", "huge", "gargantuan", "colossal"];
function formattingCheck(allItems) {
@@ -546,20 +547,29 @@ function formattingCheckItems(data, pack, file, options = { checkImage: true, ch
}
}
- // Check description for references to conditions
+ // Validate links
if (options.checkLinks) {
let description = data.data.description.value
if (description) {
- let result = searchDescriptionForUnlinkedCondition(description);
- if (result.found) {
- addWarningForPack(`${file}: Found reference to ${result.match} in description without link".`, pack);
+
+ // Check description for references to conditions
+ let conditionResult = serchDescriptionForUnlinkedReference(description, conditionsRegularExpression);
+ if (conditionResult.found) {
+ addWarningForPack(`${file}: Found reference to ${conditionResult.match} in description without link".`, pack);
+ }
+
+ // Check description for references to poisons / diseases
+ let poisonResult = serchDescriptionForUnlinkedReference(description, poisonAndDiseasesRegularExpression);
+ if (poisonResult.found) {
+ addWarningForPack(`${file}: Found reference to ${poisonResult.match} in description without link".`, pack);
}
}
else {
// Item has no description
}
}
+
}
function formattingCheckWeapons(data, pack, file) {
@@ -670,7 +680,13 @@ function formattingCheckSpell(data, pack, file, options = { checkLinks: true })
// Check if a description contains an unlinked reference to a condition
function searchDescriptionForUnlinkedCondition(description) {
- let matches = [...description.matchAll(conditionsRegularExpression)];
+ return serchDescriptionForUnlinkedReference(description, conditionsRegularExpression);
+}
+
+// Checks if a description contains an unlinked reference to any value found in the provided regular expression
+function serchDescriptionForUnlinkedReference(description, regularExpression) {
+
+ let matches = [...description.matchAll(regularExpression)];
//Found a potential reference to a condition
if (matches && matches.length > 0) {
// Capture the character before and after each match and use some basic heuristics to decide if it's an linked condition in the description
| 0 |
diff --git a/src/encoded/audit/antibody_lot.py b/src/encoded/audit/antibody_lot.py @@ -39,7 +39,10 @@ def audit_antibody_missing_characterizations(value, system):
primary_chars = []
secondary_chars = []
compliant_secondary = False
+ need_review = False
for char in value['characterizations']:
+ if char['status'] == 'pending dcc review':
+ need_review = True
if 'primary_characterization_method' in char:
primary_chars.append(char)
if 'secondary_characterization_method' in char:
@@ -55,6 +58,10 @@ def audit_antibody_missing_characterizations(value, system):
detail = '{} does not have any secondary characterizations submitted.'.format(value['@id'])
yield AuditFailure('no secondary characterizations', detail, level='NOT_COMPLIANT')
+ if need_review:
+ detail = '{} has characterization(s) needing review.'.format(value['@id'])
+ yield AuditFailure('characterization(s) pending review', detail, level='DCC_ACTION')
+
for lot_review in value['lot_reviews']:
if lot_review['detail'] in \
['Awaiting a compliant primary and pending review of a secondary characterization.',
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -9,6 +9,38 @@ To see all merged commits on the master branch that will be part of the next plo
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.58.0] -- 2020-12-02
+
+### Added
+ - Add `ticklabelposition` attribute to cartesian axes and colorbars [#5275],
+ this feature was anonymously sponsored: thank you to our sponsor!
+ - Add "strict" `autotypenumbers` to axes and `layout` [#5240]
+ - Add `itemwidth` to legends [#5212],
+ with thanks to @thierryVergult for the contribution!
+ - Add `root.color` attribute to `sunburst` and `treemap` traces [#5232, #5245],
+ with thanks to @thierryVergult for the contribution!
+
+### Changed
+ - Enable fast `image` rendering for all linear axes [#5307],
+ with thanks to @almarklein for the contribution!
+ - Rework `matches` and `scaleanchor` so they work together [#5287]
+
+### Fixed
+ - Fix hover on mobile and tablet devices for gl3d subplots [#5239]
+ (regression introduced in 1.34.0), with thanks to @jdpaterson for the contribution!
+ - Fix interactions when static/dynamic CSS transforms e.g. scale and translate are applied to the
+ graph div or its parents [#5193, #5302], with thanks to @alexhartstone for the contribution!
+ - Fix reordering of mapbox raster and image layers on update [#5269]
+ - Fix `categoryorder` for missing values in cartesian traces [#5268]
+ - Fix `automargin` bug to provide space for long axis labels [#5237]
+ - Avoid styling of backgrounds during `automargin` redraws [#5236]
+ - Fix displaying zero length bars with `staticPlot` config option [#5294]
+ - Fix setting false locale to "en-US" [#5293]
+ - Fix typo in Czech locale file [#5255],
+ with thanks to @helb for the contribution!
+ - Fix `gl3d` scene initialization [#5233]
+
+
## [1.57.1] -- 2020-10-20
### Changed
| 3 |
diff --git a/stories/module-analytics-setup.stories.js b/stories/module-analytics-setup.stories.js @@ -282,8 +282,6 @@ storiesOf( 'Analytics Module/Setup', module )
.add( 'Existing Tag w/o access, GTM property w/ access', usingGenerateGTMAnalyticsPropertyStory( { useExistingTag: true, gtmPermission: true, gaPermission: false } ) )
.add( 'Existing Tag w/o access, GTM property w/o access', usingGenerateGTMAnalyticsPropertyStory( { useExistingTag: true, gtmPermission: false, gaPermission: false } ) )
.add( 'Nothing selected', () => {
- filterAnalyticsSetup();
-
const { accounts, properties, profiles } = fixtures.accountsPropertiesProfiles;
const setupRegistry = ( { dispatch } ) => {
dispatch( STORE_NAME ).receiveGetSettings( {} );
| 2 |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml @@ -152,7 +152,7 @@ jobs:
uses: docker/metadata-action@v4
with:
images: jaedb/iris
- tags: ${{ github.ref##*/ }}
+ tags: ${{ GITHUB_REF_NAME }}
- name: Login to DockerHub
uses: docker/login-action@v1
| 4 |
diff --git a/pckgmgr/src/main/java/com/composum/sling/core/pckgmgr/PackageJobExecutor.java b/pckgmgr/src/main/java/com/composum/sling/core/pckgmgr/PackageJobExecutor.java @@ -230,7 +230,7 @@ public class PackageJobExecutor extends AbstractJobExecutor<String> {
options.setAutoSaveThreshold(getProperty(job, JOB_PROPERTY_SAVE_THRESHOLD, config.package_save_threshold()));
options.setImportMode(getProperty(job, JOB_PROPERTY_IMPORT_MODE, ImportMode.REPLACE));
options.setHookClassLoader(getDynamicClassLoaderManager().getDynamicClassLoader());
- options.setDependencyHandling(DependencyHandling.REQUIRED);
+ options.setDependencyHandling(DependencyHandling.BEST_EFFORT);
return options;
}
| 12 |
diff --git a/lib/assets/javascripts/new-dashboard/pages/Home/QuotaSection/QuotaSection.vue b/lib/assets/javascripts/new-dashboard/pages/Home/QuotaSection/QuotaSection.vue <template>
- <div class="section is-bgSoftBlue">
+ <div class="section is-bgSoftBlue section--noBorder">
<div class="container">
<div class="full-width">
<SectionTitle class="grid-cell" :title="$t(`QuotaSection.title`)">
| 2 |
diff --git a/ui/src/components/Collection/CollectionStatistics.scss b/ui/src/components/Collection/CollectionStatistics.scss @import "src/app/variables.scss";
.CollectionStatistics {
- margin: $aleph-content-padding/2;
+ padding: $aleph-content-padding/2;
flex: auto;
- max-width: 33%;
+ width: 33.33%;
+ max-width: 33.33%;
@media screen and (max-width: $aleph-screen-lg-max-width) {
+ width: 50%;
max-width: 50%;
}
| 12 |
diff --git a/src/plots/cartesian/layout_attributes.js b/src/plots/cartesian/layout_attributes.js @@ -523,7 +523,7 @@ module.exports = {
'top or bottom has no effect on x axes or when `ticklabelmode` is set to *period*.',
'Similarly',
'left or right has no effect on y axes or when `ticklabelmode` is set to *period*.',
- 'Has no effect on *multicategory* axes or when `tickson` is set *boundaries*.'
+ 'Has no effect on *multicategory* axes or when `tickson` is set to *boundaries*.'
].join(' ')
},
mirror: {
| 3 |
diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html <input type="checkbox" id="hidden" name="hidden"/>
<label for="hidden">Wifi is hidden</label>
</div>
+
+ <hr>
+ <p id="errors" style="color:Tomato;"></p>
+ <p>Try your QR Code: <div id="qrcode"></div></p>
+
<hr>
<p>Additional options:</p>
<input type="checkbox" id="preventIntegerScaling" name="preventIntegerScaling"/>
<option value="2">H - High - 30%</option>
</select>
</div>
-
- <hr>
- <p id="errors" style="color:Tomato;"></p>
- <p>Try your QR Code: <div id="qrcode"></div></p>
-
<p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
+
<script src="../../core/lib/customize.js"></script>
<script src="../../core/lib/qrcode.min.js"></script><!-- https://davidshimjs.github.io/qrcodejs/ -->
<script src="../../core/lib/heatshrink.js"></script>
| 5 |
diff --git a/js/background.js b/js/background.js @@ -127,9 +127,6 @@ chrome.contextMenus.create({
// Add ATB param
chrome.webRequest.onBeforeRequest.addListener(
function (e) {
- //localStorage[e.url] = "analyzing...";
- $this.trackers = JSON.parse(localStorage['response']);
- //localStorage['this_trackers'] = $this.trackers;
// Add ATB for DDG URLs, otherwise block trackers
if (e.url.search('/duckduckgo\.com') !== -1) {
| 2 |
diff --git a/assets/js/modules/analytics/components/common/GA4PropertyNotice.js b/assets/js/modules/analytics/components/common/GA4PropertyNotice.js @@ -32,11 +32,7 @@ import { __ } from '@wordpress/i18n';
import SettingsNotice, { TYPE_INFO } from '../../../../components/SettingsNotice';
import Link from '../../../../components/Link';
-export default function GA4PropertyNotice( { notice, children } ) {
- return (
- <SettingsNotice type={ TYPE_INFO }>
- { notice }
- { ' ' }
+const LearnMore = () => (
<Link
href="https://sitekit.withgoogle.com/documentation/ga4-analytics-property/"
external
@@ -44,6 +40,12 @@ export default function GA4PropertyNotice( { notice, children } ) {
>
{ __( 'Learn more here.', 'google-site-kit' ) }
</Link>
+);
+
+export default function GA4PropertyNotice( { notice, children } ) {
+ return (
+ <SettingsNotice type={ TYPE_INFO } LearnMore={ LearnMore }>
+ { notice }
{ children }
</SettingsNotice>
);
| 4 |
diff --git a/index.html b/index.html <input type="text" style="width: 15.625rem;" class="form__field" name="a"
id="exp"
placeholder="Enter a Polynomial expression"/><br><br>
- <button class="btn btn-outline-light" onclick="degcal()">Find</button>
- <button class="btn btn-outline-light" onclick="this.form.reset();">Reset</button>
+ <button type = "button" class="btn btn-outline-light" onclick="degcal()">Find</button>
+ <button type = "button" class="btn btn-outline-light" onclick="this.form.reset();">Reset</button>
<br><br><br>
<p class="stopwrap" style="color:var(--appimage); font-size: xx-large; text-decoration: underline; text-align: left;
font-family:mathfont;" id="deg"></p>
| 1 |
diff --git a/contracts/permissionless/OrderbookReserve.sol b/contracts/permissionless/OrderbookReserve.sol @@ -20,7 +20,7 @@ interface MedianizerInterface {
contract OrderbookReserve is OrderIdManager, Utils2, KyberReserveInterface, OrderbookReserveInterface {
- uint public constant BURN_TO_STAKE_FACTOR = 4; // stake per order must be x4 then expected burn amount.
+ uint public constant BURN_TO_STAKE_FACTOR = 5; // stake per order must be x4 then expected burn amount.
uint public constant MAX_BURN_FEE_BPS = 100; // 1%
uint public constant MIN_REMAINING_ORDER_RATIO = 2; // Ratio between min new order value and min order value.
uint public constant MAX_USD_PER_ETH = 100000; // Above this value price is surely compromised.
| 12 |
diff --git a/CHANGES.md b/CHANGES.md - See the official [AWS Blog Post](https://aws.amazon.com/blogs/compute/announcing-go-support-for-aws-lambda/) for more information.
- *ALL* Sparta Go Lambda function targets **MUST** now use the `sparta.HandleAWSLambda` creation function, a function pointer that satisfies one of the supported signatures.
- - Providing an invalid signature will produce a `provision` time error as in:
+ - Providing an invalid signature such as `func() string` will produce a `provision` time error as in:
```
Error: Invalid lambda returns: Hello World. Error: handler returns a single value, but it does not implement error
```
| 0 |
diff --git a/assets/js/modules/analytics/datastore/setup.js b/assets/js/modules/analytics/datastore/setup.js @@ -45,7 +45,7 @@ export const INITIAL_STATE = {
};
export const actions = {
- *submitChanges( onSuccess = () => {} ) {
+ *submitChanges() {
yield actions.startSubmitChanges();
const registry = yield Data.commonActions.getRegistry();
@@ -81,8 +81,6 @@ export const actions = {
return actions.submitChangesFailed( { error: payload.error } );
}
- onSuccess();
-
return actions.finishSubmitChanges();
},
submitPropertyCreate( accountID ) {
| 2 |
diff --git a/app/hotels/src/gallery/GalleryGrid.js b/app/hotels/src/gallery/GalleryGrid.js @@ -46,6 +46,10 @@ type State = {|
stripeImageIndex: number,
|};
+const getTileWidth = (width: number) => {
+ return (width - tileGap * (tilesInRow - 1)) / tilesInRow;
+};
+
export default class GalleryGrid extends React.Component<Props, State> {
state = {
/**
@@ -56,7 +60,7 @@ export default class GalleryGrid extends React.Component<Props, State> {
* images are loaded which is too late (works good on iOS). But it's
* still needed for portrait <-> layout changes.
*/
- tileWidth: this.getTileWidth(this.props.dimensions.width),
+ tileWidth: getTileWidth(this.props.dimensions.width),
stripeVisible: false,
stripeImageIndex: 0,
};
@@ -64,14 +68,10 @@ export default class GalleryGrid extends React.Component<Props, State> {
calculateTileWidth = (event: OnLayout) => {
const width = event.nativeEvent.layout.width;
this.setState({
- tileWidth: this.getTileWidth(width),
+ tileWidth: getTileWidth(width),
});
};
- getTileWidth = (width: number) => {
- return width - (tileGap * (tilesInRow - 1)) / tilesInRow;
- };
-
openStripe = (imageIndex: number) =>
this.setState({
stripeVisible: true,
| 0 |
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml @@ -15,7 +15,7 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs on Stripe SDKs
- if: ${{contains(steps.metadata.outputs.dependency-name, 'com.stripe:stripe-java') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+ if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'com.stripe:stripe-java', 'Stripe.net') && steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
| 0 |
diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js @@ -371,7 +371,6 @@ module.exports = function(RED) {
var server = net.createServer(function (socket) {
socket.setKeepAlive(true,120000);
if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
- var remoteDetails = socket.remoteAddress+":"+socket.remotePort;
node.log(RED._("tcpin.status.connection-from",{host:socket.remoteAddress, port:socket.remotePort}));
connectedSockets.push(socket);
node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
| 2 |
diff --git a/src/react/projects/spark-core-react/src/SprkMasthead/components/SprkMastheadSelector/SprkMastheadSelector.js b/src/react/projects/spark-core-react/src/SprkMasthead/components/SprkMastheadSelector/SprkMastheadSelector.js @@ -18,7 +18,7 @@ class SprkMastheadSelector extends Component {
this.updateTriggerText = this.updateTriggerText.bind(this);
this.closeOnEsc = this.closeOnEsc.bind(this);
this.closeOnClickOutside = this.closeOnClickOutside.bind(this);
- this.myRef = React.createRef();
+ this.dropDownRef = React.createRef();
}
componentDidMount() {
@@ -40,7 +40,7 @@ class SprkMastheadSelector extends Component {
}
closeOnClickOutside(e) {
- if (!this.myRef.current.contains(e.target)) {
+ if (!this.dropdownRef.current.contains(e.target)) {
this.closeDropdown();
}
}
@@ -82,7 +82,7 @@ class SprkMastheadSelector extends Component {
// eslint-disable-next-line
<div
role="dialog"
- ref={this.myRef}
+ ref={this.dropdownRef}
className={classNames({ 'sprk-c-MastheadMask': isOpen && isFlush })}
onClick={() => { if (isOpen) { this.closeDropdown(); } }}
>
| 10 |
diff --git a/src/Services/Air/AirParser.js b/src/Services/Air/AirParser.js @@ -288,7 +288,6 @@ const AirErrorHandler = function (rsp) {
} catch (err) {
throw new RequestRuntimeError.UnhandledError(null, new AirRuntimeError(rsp));
}
- // console.log(errorInfo, code)
switch (code) {
case '345':
throw new AirRuntimeError.NoAgreement({
| 2 |
diff --git a/examples/editor.js b/examples/editor.js @@ -56,12 +56,12 @@ class MyTextureEditor extends Component {
}
_init() {
- let archiveId = getQueryStringParam('archive')
- let storageType = getQueryStringParam('storage')
+ let archiveId = getQueryStringParam('archive') || 'kitchen-sink'
+ let storageType = getQueryStringParam('storage') || 'vfs'
let storageUrl = getQueryStringParam('storageUrl') || '/archives'
let storage
if (storageType==='vfs') {
- storage = new VfsClient(window.vfs, '/data/')
+ storage = new VfsClient(window.vfs, './data/')
} else {
storage = new HttpStorageClient(storageUrl)
}
| 4 |
diff --git a/src/2_storage.js b/src/2_storage.js @@ -162,13 +162,13 @@ var cookies = function(perm) {
return returnCookieObject;
},
get: function(key) {
- var keyEQ = prefix(key) + '=';
var cookieArray = document.cookie.split(';');
for (var i = 0; i < cookieArray.length; i++) {
- var cookie = cookieArray[i];
- cookie = cookie.substring(1, cookie.length);
- if (cookie.indexOf(keyEQ) === 0) {
- return retrieveValue(cookie.substring(keyEQ.length, cookie.length));
+ var cookie = cookieArray[i].trim();
+ var firstEqualSign = cookie.indexOf("=");
+ var cookieName = cookie.substring(0, firstEqualSign);
+ if (key === cookieName) {
+ return cookie.substring(firstEqualSign + 1, cookie.length);
}
}
return null;
| 1 |
diff --git a/token-metadata/0x00a8b738E453fFd858a7edf03bcCfe20412f0Eb0/metadata.json b/token-metadata/0x00a8b738E453fFd858a7edf03bcCfe20412f0Eb0/metadata.json "symbol": "ALBT",
"address": "0x00a8b738E453fFd858a7edf03bcCfe20412f0Eb0",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/styles/table.less b/src/styles/table.less border-bottom-width: 1px;
}
}
+ }
- > tr:last-child {
- > th,
+ > tbody > tr:last-child {
> td {
border-bottom-width: 0px;
}
}
- }
> tbody > tr > td.@{table-prefix}-ignore-bottom-border {
border-bottom: none;
| 1 |
diff --git a/src/gml/type/GmlTypeTools.hx b/src/gml/type/GmlTypeTools.hx @@ -269,7 +269,7 @@ import ace.extern.AceTokenType;
}
public static function patchTemplateItems(s:String, templateItems:Array<GmlTypeTemplateItem>):String {
- if (templateItems == null) return s;
+ if (s == null || templateItems == null) return s;
for (i => tn in templateItems) {
s = s.replaceExt(tn.regex, function() {
var ct = tn.constraint;
| 1 |
diff --git a/articles/api-auth/tutorials/silent-authentication.md b/articles/api-auth/tutorials/silent-authentication.md @@ -37,6 +37,10 @@ The `prompt=none` parameter will cause Auth0 to immediately redirect to the spec
* A successful authentication response if the user was already logged in via SSO
* An error response if the user is not logged in via SSO and therefore cannot be silently authenticated
+::: note
+Any applicable [rules](/rules) will be executed as part of the silent authentication process.
+:::
+
### Successful authentication response
If the user was already logged in via SSO, Auth0 will respond exactly as if the user had authenticated manually through the SSO login page.
| 0 |
diff --git a/packages/project-disaster-trail/src/components/atoms/OrbManager.js b/packages/project-disaster-trail/src/components/atoms/OrbManager.js @@ -95,9 +95,7 @@ const OrbManager = ({
const addOrbScore = useCallback(
orbId => {
const theOrb = _find(orbs, orb => orb.orbId === orbId);
- if (theOrb.good) {
onOrbSelection(theOrb);
- }
},
// update when orbs.length changes
// if we udpate when orbs changes, the addOrbScore will continuously be recreated,
| 2 |
diff --git a/lib/elementSearch.js b/lib/elementSearch.js @@ -9,7 +9,7 @@ const { handleRelativeSearch } = require('./proximityElementSearch');
function match(text, ...args) {
assertType(text);
- const get = async (e = '*') => {
+ const get = async (tagName = '*') => {
let elements;
let nbspChar = String.fromCharCode(160);
let textToTranslate = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + nbspChar;
@@ -18,14 +18,14 @@ function match(text, ...args) {
text,
)}), "${textToTranslate}", "${translateTo}")`;
elements = await matchExactElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
);
if (!elements || !elements.length)
elements = await matchContainsElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
@@ -39,20 +39,20 @@ function match(text, ...args) {
}
async function matchExactElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
) {
let elements = [];
- if (e === '*')
+ if (tagName === '*')
elements = await matchTextNode(
textToTranslate,
translateTo,
xpathText,
);
let valueAndTypeElements = await matchValueOrType(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
@@ -61,7 +61,7 @@ async function matchExactElements(
elements = elements.concat(valueAndTypeElements);
if (!elements || !elements.length)
elements = await matchTextAcrossElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
@@ -70,20 +70,20 @@ async function matchExactElements(
}
async function matchContainsElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
) {
let elements;
- if (e === '*')
+ if (tagName === '*')
elements = await containsTextNode(
textToTranslate,
translateTo,
xpathText,
);
let valueAndTypeElements = await containsValueOrType(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
@@ -92,14 +92,14 @@ async function matchContainsElements(
elements = elements.concat(valueAndTypeElements);
if (!elements || !elements.length)
elements = await containsTextAcrossElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
);
- if (e === 'button' && (!elements || !elements.length))
+ if (tagName === 'button' && (!elements || !elements.length))
elements = await containsTextInChildElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
@@ -128,33 +128,33 @@ async function containsTextNode(
}
async function matchValueOrType(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
) {
return await $$xpath(
'//' +
- e +
+ tagName +
`[translate(normalize-space(@value), "${textToTranslate}", "${translateTo}")=${xpathText} or translate(normalize-space(@type), "${textToTranslate}", "${translateTo}")=${xpathText}]`,
);
}
async function containsValueOrType(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
) {
return await $$xpath(
'//' +
- e +
+ tagName +
`[contains(translate(normalize-space(@value), "${textToTranslate}", "${translateTo}"), ${xpathText}) or contains(translate(normalize-space(@type), "${textToTranslate}", "${translateTo}"), ${xpathText})]`,
);
}
async function matchTextAcrossElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
@@ -162,33 +162,33 @@ async function matchTextAcrossElements(
const xpathToTranslateInnerText = `translate(normalize-space(.), "${textToTranslate}", "${translateTo}")`;
return await $$xpath(
'//' +
- e +
+ tagName +
`[not(descendant::*[${xpathToTranslateInnerText}=${xpathText}]) and ${xpathToTranslateInnerText}=${xpathText}]`,
);
}
async function containsTextAcrossElements(
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
) {
return await $$xpath(
'//' +
- e +
+ tagName +
`[not(descendant::*[contains(translate(normalize-space(.), '${textToTranslate}', '${translateTo}'), ${xpathText})]) and contains(translate(normalize-space(.), '${textToTranslate}', '${translateTo}'), ${xpathText})]`,
);
}
const containsTextInChildElements = async function (
- e,
+ tagName,
textToTranslate,
translateTo,
xpathText,
) {
return await $$xpath(
'//' +
- e +
+ tagName +
`[contains(translate(normalize-space(.), "${textToTranslate}", "${translateTo}"), ${xpathText})]`
)
}
| 10 |
diff --git a/lib/commands/platform.js b/lib/commands/platform.js @@ -46,7 +46,11 @@ module.exports = Command.extend({
throw new CorberError('no platform specified');
}
- if (!supportedPlatforms.includes(platform)) {
+ if (
+ !supportedPlatforms.some(supportedPlatform =>
+ platform.startsWith(supportedPlatform)
+ )
+ ) {
throw new CorberError(`'${platform}' is not a supported platform`);
}
| 11 |
diff --git a/packages/vulcan-forms/lib/components/FormComponent.jsx b/packages/vulcan-forms/lib/components/FormComponent.jsx @@ -341,6 +341,12 @@ class FormComponent extends Component {
formComponents: FormComponents,
};
+ // if there is no query, handle options here; otherwise they will be handled by
+ // the FormComponentLoader component
+ if (!this.props.query && typeof this.props.options === 'function') {
+ fciProps.options = this.props.options(fciProps);
+ }
+
const fci = <FormComponents.FormComponentInner {...fciProps} />;
return this.props.query ? <FormComponents.FormComponentLoader {...fciProps}>{fci}</FormComponents.FormComponentLoader> : fci;
| 9 |
diff --git a/rcloud.support/R/rcloud.support.R b/rcloud.support/R/rcloud.support.R @@ -376,9 +376,17 @@ rcloud.create.notebook <- function(content, is.current = TRUE) {
}
}
res <- rcloud.augment.notebook(res)
+ if(res$ok) {
ulog("INFO: rcloud.create.notebook (", res$content$id, ")")
+ } else {
+ if('code' %in% names(res)) {
+ ulog("ERROR: rcloud.create.notebook failed (", res$code, ")")
+ } else {
+ ulog("ERROR: rcloud.create.notebook failed")
+ }
+ }
res
- }, error = function(e) { list(ok = FALSE) })
+ }, error = function(e) { list(ok = FALSE, content = list (message = as.character(e))) })
}
rcloud.rename.notebook <- function(id, new.name) {
| 7 |
diff --git a/package.json b/package.json "test": "babel-node ./node_modules/mocha/bin/_mocha",
"test:watch": "chokidar 'src/*.js' 'test/*.js' -c 'npm t'",
"coverage": "nyc --require babel-core/register node_modules/.bin/mocha test",
- "cicoverage": "nyc --reporter=lcov --require babel-core/register --require babel-polyfill mocha test --reporter json > test-output.json",
+ "cicoverage": "nyc --reporter=lcov --require babel-core/register --require babel-polyfill mocha test --reporter json > test-results.json",
"lint": "eslint dangerfile.js src/*.js test/*.js",
"lint:ci": "npm run lint -- -o lint-results.json -f json",
"lint-fix": "eslint dangerfile.js src/*.js test/*.js --fix",
| 1 |
diff --git a/js/LayersConfig.js b/js/LayersConfig.js @@ -170,47 +170,57 @@ BR.LayersConfig = L.Class.extend({
'mapUrl': 'http://maps.sputnik.ru/?lat={lat}&lng={lon}&zoom={zoom}'
},
'MtbMap': {
- 'mapUrl': 'http://mtbmap.cz/#zoom={zoom}&lat={lat}&lon={lon}'
+ 'mapUrl': 'http://mtbmap.cz/#zoom={zoom}&lat={lat}&lon={lon}',
+ 'worldTiles': true // -z12
},
// MRI (maps.refuges.info)
'1069': {
'nameShort': 'Refuges.info',
- 'mapUrl': 'http://maps.refuges.info/?zoom={zoom}&lat={lat}&lon={lon}&layers=B'
+ 'mapUrl': 'http://maps.refuges.info/?zoom={zoom}&lat={lat}&lon={lon}&layers=B',
+ 'worldTiles': true
},
'osmfr-basque': {
'language_code': 'eu',
'nameShort': 'OSM Basque',
- 'mapUrl': 'http://tile.openstreetmap.fr/?layers=00000000BFFFFFF&zoom={zoom}&lat={lat}&lon={lon}'
+ 'mapUrl': 'http://tile.openstreetmap.fr/?layers=00000000BFFFFFF&zoom={zoom}&lat={lat}&lon={lon}',
+ 'worldTiles': true
},
'osmfr-breton': {
'language_code': 'br',
'nameShort': 'OSM Breton',
- 'mapUrl': 'https://kartenn.openstreetmap.bzh/#map={zoom}/{lat}/{lon}'
+ 'mapUrl': 'https://kartenn.openstreetmap.bzh/#map={zoom}/{lat}/{lon}',
+ 'worldTiles': true
},
'osmfr-occitan': {
'language_code': 'oc',
'nameShort': 'OSM Occitan',
- 'mapUrl': 'http://tile.openstreetmap.fr/?layers=0000000B0FFFFFF&zoom={zoom}&lat={lat}&lon={lon}'
+ 'mapUrl': 'http://tile.openstreetmap.fr/?layers=0000000B0FFFFFF&zoom={zoom}&lat={lat}&lon={lon}',
+ 'worldTiles': true
},
'osmbe': {
'nameShort': 'OSM Belgium',
- 'mapUrl': 'https://tile.osm.be/#map={zoom}/{lat}/{lon}'
+ 'mapUrl': 'https://tile.osm.be/#map={zoom}/{lat}/{lon}',
+ 'worldTiles': true // -z7
},
'osmbe-fr': {
'nameShort': 'OSM Belgium (fr)',
- 'mapUrl': 'https://tile.osm.be/#map={zoom}/{lat}/{lon}'
+ 'mapUrl': 'https://tile.osm.be/#map={zoom}/{lat}/{lon}',
+ 'worldTiles': true // -z7
},
'osmbe-nl': {
'nameShort': 'OSM Belgium (nl)',
- 'mapUrl': 'https://tile.osm.be/#map={zoom}/{lat}/{lon}'
+ 'mapUrl': 'https://tile.osm.be/#map={zoom}/{lat}/{lon}',
+ 'worldTiles': true // -z7
},
'OpenStreetMap.CH': {
'country_code': 'CH',
- 'mapUrl': 'https://osm.ch/#{zoom}/{lat}/{lon}'
+ 'mapUrl': 'https://osm.ch/#{zoom}/{lat}/{lon}',
+ 'worldTiles': true
},
'topplus-open': {
'country_code': 'DE',
- 'mapUrl': 'http://www.geodatenzentrum.de/geodaten/gdz_rahmen.gdz_div?gdz_spr=deu&gdz_user_id=0&gdz_akt_zeile=5&gdz_anz_zeile=1&gdz_unt_zeile=41'
+ 'mapUrl': 'http://www.geodatenzentrum.de/geodaten/gdz_rahmen.gdz_div?gdz_spr=deu&gdz_user_id=0&gdz_akt_zeile=5&gdz_anz_zeile=1&gdz_unt_zeile=41',
+ 'worldTiles': true // World -z9, Europe -z14
},
'OpenStreetMap-turistautak': {
@@ -238,7 +248,8 @@ BR.LayersConfig = L.Class.extend({
'osm-cambodia_laos_thailand_vietnam-bilingual': {
'country_code': 'TH+',
'nameShort': 'Thaimap',
- 'mapUrl': 'http://thaimap.osm-tools.org/?zoom={zoom}&lat={lat}&lon={lon}&layers=BT'
+ 'mapUrl': 'http://thaimap.osm-tools.org/?zoom={zoom}&lat={lat}&lon={lon}&layers=BT',
+ 'worldTiles': true
},
'HikeBike.HillShading': {
'name': i18next.t('map.layer.hikebike-hillshading'),
@@ -1871,7 +1882,8 @@ BR.LayersConfig = L.Class.extend({
var options = {
- maxZoom: this._map.getMaxZoom()
+ maxZoom: this._map.getMaxZoom(),
+ bounds: layerData.geometry && !props.worldTiles ? L.geoJson(layerData.geometry).getBounds() : null
};
if (props.mapUrl) {
options.mapLink = '<a target="_blank" href="' + props.mapUrl + '">' + (props.nameShort || props.name) + '</a>';
| 12 |
diff --git a/app/stylesheets/builtin-pages.less b/app/stylesheets/builtin-pages.less &.selected {
background: fadeout(@blue, 90%);
- border-color: tint(@blue, 65%);
+ border-color: tint(@blue, 72%);
+ .ll-row {
- border-top: 1px solid tint(@blue, 65%);
+ border-top: 1px solid tint(@blue, 72%);
}
&:hover {
| 4 |
diff --git a/src/screens/pinCode/container/pinCodeContainer.js b/src/screens/pinCode/container/pinCodeContainer.js @@ -51,9 +51,9 @@ class PinCodeContainer extends Component {
componentDidMount() {
this._getDataFromStorage().then(() => {
const { intl } = this.props;
- const { isOldPinVerified, isExistUser } = this.state;
+ const { isOldPinVerified } = this.state;
- if (!isOldPinVerified && isExistUser) {
+ if (!isOldPinVerified) {
this.setState({
informationText: intl.formatMessage({
id: 'pincode.enter_text',
@@ -391,7 +391,7 @@ class PinCodeContainer extends Component {
<PinCodeScreen
informationText={informationText}
setPinCode={(pin) => this._setPinCode(pin, isReset)}
- showForgotButton={!isOldPinVerified && isExistUser}
+ showForgotButton={!isOldPinVerified}
username={currentAccount.name}
intl={intl}
handleForgotButton={() => this._handleForgotButton()}
| 13 |
diff --git a/app/shared/components/Wallet/Modal/Content/Broadcast.js b/app/shared/components/Wallet/Modal/Content/Broadcast.js @@ -79,7 +79,7 @@ class WalletModalContentBroadcast extends Component<Props> {
importedESR
} = this.state;
if (!importedESR) return false;
- if (importedESR.startsWith('esr:') || importedESR.startsWith('eosio:') || importedESR.startsWith('esr-anchor:')) {
+ if (importedESR.startsWith('esr:') || importedESR.startsWith('eosio:') || importedESR.startsWith('esr-anchor:') || importedESR.startsWith('anchorcreate:')) {
ipcRenderer.send('openUri', importedESR);
} else {
ipcRenderer.send('openUri', `esr:${importedESR}`);
| 11 |
diff --git a/src/platform/web/ui/general/LazyListView.js b/src/platform/web/ui/general/LazyListView.js @@ -271,9 +271,15 @@ export class LazyListView extends ListView {
if (this._renderRange.containsIndex(idx)) {
const normalizedIdx = this._renderRange.normalize(idx);
if (bottomCount === 0) {
- // We're completely scrolled; so the extra element needs to be removed from top
- this._removeChild(this._childInstances.shift());
- this._renderRange = new ItemRange(topCount + 1, renderCount, bottomCount);
+ /*
+ If we're at the bottom of the list, we need to render the additional item
+ without removing another item from the list.
+ We can't increment topCount because the index topCount is not affected by the
+ add operation (and any modification will thus break ItemRange.normalize()).
+ We can't increment bottomCount because there's not enough items left to trigger
+ a further render.
+ */
+ this._renderRange = new ItemRange(topCount, renderCount + 1, bottomCount);
}
else {
// Remove the last element, render the new element
@@ -295,10 +301,8 @@ export class LazyListView extends ListView {
const normalizedIdx = this._renderRange.normalize(idx);
super.onRemove(normalizedIdx, value);
if (bottomCount === 0) {
- const child = this._childCreator(this._itemAtIndex(topCount - 1));
- this._childInstances.unshift(child);
- this._root.insertBefore(mountView(child, this._mountArgs), this._root.firstChild);
- this._renderRange = new ItemRange(topCount - 1, renderCount, bottomCount);
+ // See onAdd for explanation
+ this._renderRange = new ItemRange(topCount, renderCount - 1, bottomCount);
}
else {
const child = this._childCreator(this._itemAtIndex(this._renderRange.lastIndex - 1));
| 1 |
diff --git a/packages/build/src/error/monitor/normalize.js b/packages/build/src/error/monitor/normalize.js @@ -51,6 +51,9 @@ const NORMALIZE_REGEXPS = [
[/[0-9a-fA-F]{6,}/, 'hex'],
// On required inputs, we print the inputs
[/^Plugin inputs[^]*/gm, ''],
+ [/(Required inputs for plugin).*/gm, '$1'],
+ // Netlify Functions validation check
+ [/(should target a directory, not a regular file):.*/, '$1'],
// zip-it-and-ship-it error when there is a `require()` but dependencies
// were not installed
[/(Cannot find module) '([^']+)'/g, "$1 'moduleName'"],
@@ -63,6 +66,8 @@ const NORMALIZE_REGEXPS = [
// is highly build-specific
[/^(vers?ions|Plugin configuration|Subfont called with): \{[^}]+\}/gm, ''],
[/^Resolved entry points: \[[^\]]+\]/gm, ''],
+ // netlify-plugin-minify-html parse error
+ [/(Parse Error):[^]*/, '$1'],
// Multiple empty lines
[/^\s*$/gm, ''],
]
| 7 |
diff --git a/core/field_bound_variable.js b/core/field_bound_variable.js @@ -102,18 +102,6 @@ Blockly.FieldBoundVariable.prototype.getText = function() {
throw 'Not implemented yet.';
};
-/**
- * Get the variable model for the selected variable.
- * Not guaranteed to be in the variable map on the workspace (e.g. if accessed
- * after the variable has been deleted).
- * @return {?Blockly.VariableModel} the selected variable, or null if none was
- * selected.
- * @package
- */
-Blockly.FieldBoundVariable.prototype.getVariable = function() {
- return this.variable_;
-};
-
/**
* Set the variable ID.
* @param {string} id New variable ID, which must reference an existing
| 2 |
diff --git a/src/vis/vis.js b/src/vis/vis.js @@ -148,7 +148,7 @@ var VisModel = Backbone.Model.extend({
});
// Create the Map
- var allowDragging = util.isMobileDevice() || vizjson.hasZoomOverlay() || vizjson.scrollwheel;
+ var allowDragging = util.isMobileDevice() || vizjson.hasZoomOverlay() || vizjson.options.scrollwheel;
var renderMode = RenderModes.AUTO;
if (vizjson.vector === true) {
@@ -163,7 +163,7 @@ var VisModel = Backbone.Model.extend({
bounds: vizjson.bounds,
center: vizjson.center,
zoom: vizjson.zoom,
- scrollwheel: !!this.scrollwheel,
+ scrollwheel: !!vizjson.options.scrollwheel,
drag: allowDragging,
provider: vizjson.map_provider,
isFeatureInteractivityEnabled: this.get('interactiveFeatures'),
| 1 |
diff --git a/src/components/Widgets/Markdown/MarkdownControl/VisualEditor/keys.js b/src/components/Widgets/Markdown/MarkdownControl/VisualEditor/keys.js @@ -37,17 +37,6 @@ function onKeyDown(e, data, change) {
}
if (data.isMod) {
-
- if (data.key === 'y') {
- e.preventDefault();
- return state.transform().redo().focus().apply({ save: false });
- }
-
- if (data.key === 'z') {
- e.preventDefault();
- return state.transform()[data.isShift ? 'redo' : 'undo']().focus().apply({ save: false });
- }
-
const marks = {
b: 'bold',
i: 'italic',
| 2 |
diff --git a/src/components/small-item-table/index.js b/src/components/small-item-table/index.js @@ -342,7 +342,7 @@ function SmallItemTable(props) {
.filter(item => item.instaProfit !== 0)
.filter(item => item.lastLowPrice && item.lastLowPrice > 0)
.filter(item => item.bestSell && item.bestSell.price > 500)
- .filter(item => item.buyOnFleaPrice)
+ .filter(item => item.buyOnFleaPrice && item.buyOnFleaPrice.price > 0)
.map(item => {
return {
...item,
| 1 |
diff --git a/modules/README.md b/modules/README.md @@ -18,6 +18,24 @@ so you may see the error "Module <module_name> not found" in the IDE when sendin
To fix this you have three options:
+
+### Change the Web IDE search path to include Bangle.js modules
+
+This is nice and easy (and the results are the same as if the app was
+uploaded via the app loader), however you cannot then make/test changes
+to the module.
+
+* In the IDE, Click the `Settings` icon in the top right
+* Click `Communications` and scroll down to `Module URL`
+* Now change the module URL from the default of `https://www.espruino.com/modules`
+to `https://banglejs.com/apps/modules|https://www.espruino.com/modules`
+
+The next time you upload your app, the module will automatically be included.
+
+**Note:** You can optionally use `https://raw.githubusercontent.com/espruino/BangleApps/master/modules|https://www.espruino.com/modules`
+as the module URL to pull in modules direct from the development app loader (which could be slightly newer than the ones on https://banglejs.com/apps)
+
+
### Host your own App Loader and upload from that
This is reasonably easy to set up, but it's more difficult to make changes and upload:
@@ -27,6 +45,7 @@ This is reasonably easy to set up, but it's more difficult to make changes and u
* Refresh and upload your app from the app loader (you can have the IDE connected
at the same time so you can see any error messages)
+
### Upload the module to the Bangle's internal storage
This allows you to develop both the app and module very quickly, but the app is
@@ -41,18 +60,4 @@ or the method below:
You can now upload the app direct from the IDE. You can even leave a second Web IDE window open
(one for the app, one for the module) to allow you to change the module.
-### Change the Web IDE search path to include Bangle.js modules
-
-This is nice and easy (and the results are the same as if the app was
-uploaded via the app loader), however you cannot then make/test changes
-to the module.
-
-* In the IDE, Click the `Settings` icon in the top right
-* Click `Communications` and scroll down to `Module URL`
-* Now change the module URL from the default of `https://www.espruino.com/modules`
-to `https://banglejs.com/apps/modules|https://www.espruino.com/modules`
-The next time you upload your app, the module will automatically be included.
-
-**Note:** You can optionally use `https://raw.githubusercontent.com/espruino/BangleApps/master/modules|https://www.espruino.com/modules`
-as the module URL to pull in modules direct from the development app loader (which could be slightly newer than the ones on https://banglejs.com/apps)
| 3 |
diff --git a/src/pages/workshops/page.js b/src/pages/workshops/page.js @@ -107,15 +107,8 @@ function githubEditUrl(slug) {
return `https://github.com/hackclub/hackclub/edit/master${slug}/README.md`
}
-const twitterURL = (text, url) => {
- const baseUrl = 'https://twitter.com/intent/tweet'
- const params = [
- `text=${text.split(' ').join('%20')}`,
- `url=${url}`,
- `via=starthackclub`
- ].join('&')
- return `${baseUrl}?${params}`
-}
+const twitterURL = (text, url) =>
+ `https://twitter.com/intent/tweet?text=${text.split(' ').join('%20')}&url=${url}`
const facebookURL = (text, url) =>
`https://www.facebook.com/sharer/sharer.php?u=${url}`
@@ -211,7 +204,7 @@ export default ({ data: { markdownRemark } }) => {
</Text>
<ShareButton
service="Twitter"
- href={twitterURL(`I just built ${name}`, url)}
+ href={twitterURL(`I just built ${name} with a @starthackclub workshop. Make yours:`, url)}
bg="#1da1f2"
mr={3}
/>
| 7 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.