code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/scss/layout/_breadcrumb.scss b/scss/layout/_breadcrumb.scss $siimple-breadcrumb-height: 30px;
$siimple-breadcrumb-margin-top: 0px;
-//Breadcrumb crumb variables
-$siimple-breadcrumb-crumb-margin-right: 5px;
-$siimple-breadcrumb-crumb-padding-left: 25px;
-$siimple-breadcrumb-crumb-padding-right: 10px;
+//Breadcrumb item variables
+$siimple-breadcrumb-item-margin-right: 5px;
+$siimple-breadcrumb-item-padding-left: 25px;
+$siimple-breadcrumb-item-padding-right: 10px;
-//Breadcrumb crumb first variables
-$siimple-breadcrumb-crumb-first-padding: 10px;
+//Breadcrumb item first variables
+$siimple-breadcrumb-item-first-padding: 10px;
-//Breadcrumb crumb last variables
-$siimple-breadcrumb-crumb-last-padding: 10px;
+//Breadcrumb item last variables
+$siimple-breadcrumb-item-last-padding: 10px;
.siimple-breadcrumb {
display: block;
@@ -30,7 +30,7 @@ $siimple-breadcrumb-crumb-last-padding: 10px;
margin-bottom: $siimple-default-margin-bottom;
margin-top: $siimple-breadcrumb-margin-top;
- &-crumb {
+ &-crumb, &-item {
display: inline-block;
float: left;
position: relative;
@@ -43,9 +43,9 @@ $siimple-breadcrumb-crumb-last-padding: 10px;
font-weight: bold;
text-decoration: none;
color: $siimple-navy-4;
- margin-right: $siimple-breadcrumb-crumb-margin-right;
- padding-left: $siimple-breadcrumb-crumb-padding-left;
- padding-right: $siimple-breadcrumb-crumb-padding-right;
+ margin-right: $siimple-breadcrumb-item-margin-right;
+ padding-left: $siimple-breadcrumb-item-padding-left;
+ padding-right: $siimple-breadcrumb-item-padding-right;
transition: all 0.3s;
//Crumb hover
@@ -82,7 +82,7 @@ $siimple-breadcrumb-crumb-last-padding: 10px;
&:first-of-type {
border-top-left-radius: $siimple-default-border-radius;
border-bottom-left-radius: $siimple-default-border-radius;
- padding-left: $siimple-breadcrumb-crumb-first-padding;
+ padding-left: $siimple-breadcrumb-item-first-padding;
}
//First of type before
@@ -94,7 +94,7 @@ $siimple-breadcrumb-crumb-last-padding: 10px;
&:last-of-type {
border-top-right-radius: $siimple-default-border-radius;
border-bottom-right-radius: $siimple-default-border-radius;
- padding-right: $siimple-breadcrumb-crumb-last-padding;
+ padding-right: $siimple-breadcrumb-item-last-padding;
}
//Last of type after
| 10 |
diff --git a/src/components/selections/select.js b/src/components/selections/select.js 'use strict';
+var tinycolor = require('tinycolor2');
var polybool = require('polybooljs');
var pointInPolygon = require('point-in-polygon/nested'); // could we use contains lib/polygon instead?
@@ -112,17 +113,30 @@ function prepSelect(evt, startX, startY, dragOptions, mode) {
fullLayout.newshape :
fullLayout.newselection;
+ var fillC = (isDrawMode && !isOpenMode) ? newStyle.fillcolor : 'rgba(0,0,0,0)';
+ var fillColor = tinycolor(fillC);
+ var fillAlpha = fillColor.getAlpha();
+ var fillRGB = Color.tinyRGB(fillColor);
+
+ var strokeC = newStyle.line.color || (
+ isCartesian ?
+ Color.contrast(gd._fullLayout.plot_bgcolor) :
+ '#7f7f7f' // non-cartesian subplot
+ );
+
+ var strokeColor = tinycolor(strokeC);
+ var strokeAlpha = strokeColor.getAlpha();
+ var strokeRGB = Color.tinyRGB(strokeColor);
+
outlines.enter()
.append('path')
.attr('class', 'select-outline select-outline-' + plotinfo.id)
.style({
opacity: isDrawMode ? newStyle.opacity / 2 : 1,
- fill: (isDrawMode && !isOpenMode) ? newStyle.fillcolor : 'none',
- stroke: newStyle.line.color || (
- isCartesian ?
- Color.contrast(gd._fullLayout.plot_bgcolor) :
- '#7f7f7f' // non-cartesian subplot
- ),
+ fill: fillRGB,
+ 'fill-opacity': fillAlpha,
+ stroke: strokeRGB,
+ 'stroke-opacity': strokeAlpha,
'stroke-dasharray': dashStyle(newStyle.line.dash, newStyle.line.width),
'stroke-width': newStyle.line.width + 'px',
'shape-rendering': 'crispEdges'
| 9 |
diff --git a/module/actor-sheet.js b/module/actor-sheet.js @@ -117,7 +117,7 @@ export class GurpsActorSheet extends ActorSheet {
const sheet = this.actor.getFlag("core", "sheetClass")
// Token Configuration
- const canConfigure = game.user.isGM || (this.actor.owner && game.user.can("TOKEN_CONFIGURE"));
+ const canConfigure = game.user.isGM || this.actor.owner;
if (this.options.editable && canConfigure) {
buttons = [
{
| 11 |
diff --git a/token-metadata/0x10bA8C420e912bF07BEdaC03Aa6908720db04e0c/metadata.json b/token-metadata/0x10bA8C420e912bF07BEdaC03Aa6908720db04e0c/metadata.json "symbol": "RAISE",
"address": "0x10bA8C420e912bF07BEdaC03Aa6908720db04e0c",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/server/game/drawcard.js b/server/game/drawcard.js @@ -44,18 +44,6 @@ class DrawCard extends BaseCard {
return this.hasKeyword('Stealth');
}
- isTerminal() {
- return this.hasKeyword('Terminal');
- }
-
- isBestow() {
- return !_.isUndefined(this.bestowMax);
- }
-
- isRenown() {
- return this.hasKeyword('renown');
- }
-
isRestricted() {
return this.hasKeyword('restricted');
}
@@ -237,9 +225,7 @@ class DrawCard extends BaseCard {
return attachment.getSummary(activePlayer, hideWhenFaceup);
}),
baseSkill: _.isNull(this.cardData.skill) ? 0 : this.cardData.skill,
- iconsAdded: this.getIconsAdded(),
- iconsRemoved: this.getIconsRemoved(),
- inChallenge: this.inChallenge,
+ inConflict: this.inConflict,
inDanger: this.inDanger,
bowed: this.bowed,
saved: this.saved,
| 2 |
diff --git a/src/schema/util.js b/src/schema/util.js @@ -12,7 +12,13 @@ exports.anyOneOf = function (schema, value, exception, map, action, isSerialize,
const mapCopy = new Map(map);
// if serializing make sure the value validates against this schema before serialize
- if (isSerialize && subSchema.validate(value)) return;
+ if (isSerialize) {
+ const error = subSchema.validate(value)
+ if (error) {
+ exceptions.push(error)
+ return
+ }
+ }
// serialize or deserialize
const result = action(childException, mapCopy, subSchema, util.copy(value), options);
| 7 |
diff --git a/client/src/components/views/Login/index.js b/client/src/components/views/Login/index.js @@ -139,8 +139,9 @@ class Login extends Component {
</Col>
</Col>
<Tour
+ client={{}}
steps={this.generateTraining()}
- isOpen={this.state.training}
+ training={this.state.training}
onRequestClose={() => this.setState({ training: false })}
/>
</Row>
| 1 |
diff --git a/src/Powercord/index.js b/src/Powercord/index.js +const { shell: { openExternal } } = require('electron');
const EventEmitter = require('events');
const { get } = require('powercord/http');
const { sleep } = require('powercord/util');
const { WEBSITE } = require('powercord/constants');
-const modules = require('./modules');
+
const PluginManager = require('./managers/plugins');
const APIManager = require('./managers/apis');
+const modules = require('./modules');
module.exports = class Powercord extends EventEmitter {
constructor () {
@@ -111,6 +113,28 @@ module.exports = class Powercord extends EventEmitter {
.catch(e => e);
if (resp.statusCode === 401) {
+ if (!resp.body.error && resp.body.error !== 'DISCORD_REVOKED') {
+ const announcements = powercord.pluginManager.get('pc-announcements');
+ if (announcements) {
+ // even if the plugin is not ready yet, we can perform actions
+ announcements.sendNotice({
+ id: 'pc-account-discord-unlinked',
+ type: announcements.Notice.TYPES.RED,
+ message: 'Your Powercord account is no longer linked to your Discord account! Some integration will be disabled.',
+ button: {
+ text: 'Link it back',
+ onClick: () => {
+ announcements.closeNotice('pc-account-discord-unlinked');
+ openExternal(`${WEBSITE}/oauth/discord`);
+ }
+ },
+ alwaysDisplay: true
+ });
+ }
+
+ this.isLinking = false;
+ return; // keep token stored
+ }
this.settings.set('powercordToken', null);
this.account = null;
this.isLinking = false;
| 9 |
diff --git a/src/gml/type/GmlTypeParser.hx b/src/gml/type/GmlTypeParser.hx @@ -95,7 +95,9 @@ class GmlTypeParser {
}
if (isTIN) warnAboutMissing = typeWarn;
}
- if (kind == KTemplateItem) {
+ if (name == "either") { // Either<A,B> -> (A|B)
+ result = TEither(params);
+ } else if (kind == KTemplateItem) {
if (params.length < 2) return parseError("Malformed parameters for " + GmlTypeTools.templateItemName, q);
var tn = switch (params[0]) {
case null: "?";
| 11 |
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js @@ -5431,3 +5431,77 @@ describe('Test template:', function() {
.then(done);
});
});
+
+describe('more react tests', function() {
+ var gd;
+
+ beforeEach(function() {
+ gd = createGraphDiv();
+ });
+
+ afterEach(destroyGraphDiv);
+
+ it('should sort catgories on matching axes using react', function(done) {
+ var fig = {
+ data: [{
+ yaxis: 'y',
+ xaxis: 'x',
+ y: [0, 0],
+ x: ['A', 'Z']
+ }, {
+ yaxis: 'y2',
+ xaxis: 'x2',
+ y: [0, 0],
+ x: ['A', 'Z']
+ }],
+ layout: {
+ width: 400,
+ height: 300,
+ showlegend: false,
+ xaxis: {
+ matches: 'x2',
+ domain: [ 0, 1]
+ },
+ yaxis: {
+ domain: [0.6, 1],
+ anchor: 'x'
+ },
+ xaxis2: {
+ domain: [0, 1],
+ anchor: 'y2'
+ },
+ yaxis2: {
+ domain: [0, 0.4],
+ anchor: 'x2'
+ }
+ }
+ };
+
+ Plotly.newPlot(gd, fig)
+ .then(function() {
+ expect(gd._fullLayout.xaxis._categories).toEqual(['A', 'Z']);
+ expect(gd._fullLayout.xaxis2._categories).toEqual(['A', 'Z']);
+ expect(gd._fullLayout.xaxis._categoriesMap).toEqual({A: 0, Z: 1});
+ expect(gd._fullLayout.xaxis2._categoriesMap).toEqual({A: 0, Z: 1});
+ })
+ .then(function() {
+ var newFig = JSON.parse(JSON.stringify(fig));
+
+ // flip order
+ newFig.data[0].x.reverse();
+ newFig.data[0].y.reverse();
+ newFig.data[1].x.reverse();
+ newFig.data[1].y.reverse();
+
+ return Plotly.react(gd, newFig);
+ })
+ .then(function() {
+ expect(gd._fullLayout.xaxis._categories).toEqual(['Z', 'A']);
+ expect(gd._fullLayout.xaxis2._categories).toEqual(['Z', 'A']);
+ expect(gd._fullLayout.xaxis._categoriesMap).toEqual({Z: 0, A: 1});
+ expect(gd._fullLayout.xaxis2._categoriesMap).toEqual({Z: 0, A: 1});
+ })
+ .catch(failTest)
+ .then(done);
+ });
+});
| 0 |
diff --git a/src/components/appNavigation/stackNavigation.js b/src/components/appNavigation/stackNavigation.js @@ -18,7 +18,6 @@ const log = logger.child({ from: 'stackNavigation' })
* if there is not in a correct navigation flow.
* Example: doesn't makes sense to navigate to Amount if there is no nextRoutes
* @param {React.Component} Component
- * @memberof StackNavigation
*/
const getComponent = (Component, props) => {
const { shouldNavigateToComponent } = Component
@@ -37,8 +36,8 @@ const getComponent = (Component, props) => {
* It holds the pop, push, gotToRoot and goToParent navigation logic and inserts on top the NavBar component.
* Params are passed as initial state for next screen.
* This navigation actions are being passed via navigationConfig to children components
- * @memberof StackNavigation
*/
+
class AppView extends Component<{ descriptors: any, navigation: any, navigationConfig: any, screenProps: any }, any> {
state = {
stack: [],
| 2 |
diff --git a/src/QuickMenu.jsx b/src/QuickMenu.jsx @@ -210,11 +210,18 @@ export default function QuickMenu() {
}
registerIoEventHandler('mouseup', mouseup);
+ function wheel(e) {
+ // nothing
+ return false;
+ }
+ registerIoEventHandler('wheel', wheel);
+
return () => {
unregisterIoEventHandler('keyup', keyup);
unregisterIoEventHandler('mousemove', mousemove);
unregisterIoEventHandler('mousedown', mousedown);
unregisterIoEventHandler('mouseup', mouseup);
+ unregisterIoEventHandler('wheel', wheel);
};
}
}, [open, coords]);
| 0 |
diff --git a/README.md b/README.md Renders SVG from graphs described in the [DOT](https://www.graphviz.org/doc/info/lang.html) language using the [@hpcc-js/wasm](https://github.com/hpcc-systems/hpcc-js-wasm) port of [Graphviz](http://www.graphviz.org) and does animated transitions between graphs.
-[](https://travis-ci.org/magjac/d3-graphviz)
+[](https://github.com/magjac/d3-graphviz/actions/workflows/node.js.yml)
[](https://codecov.io/gh/magjac/d3-graphviz)
[](https://www.npmjs.com/package/d3-graphviz)
[](https://unpkg.com/d3-graphviz/build/d3-graphviz.js)
| 14 |
diff --git a/src/connectors/bbc-sounds.js b/src/connectors/bbc-sounds.js 'use strict';
+const trackItemSelector = '.sc-c-basic-tile';
+
+setupConnector();
+
+function setupConnector() {
+ if (isLiveRadio()) {
+ setupPropertiesForLiveRadio();
+ } else {
+ setupPropertierForOfflineRecord();
+ }
+}
+
+function isLiveRadio() {
+ return document.querySelector(trackItemSelector) === null;
+}
+
+function setupPropertiesForLiveRadio() {
Connector.playerSelector = '.radio-main';
Connector.artistSelector = '.sc-c-track__artist';
Connector.trackSelector = '.sc-c-track__title';
+}
+
+function setupPropertierForOfflineRecord() {
+ const equalizerIconSelector = '.sc-c-equalizer';
+
+ const artistSelector = '.sc-c-basic-tile__artist';
+ const trackSelector = '.sc-c-basic-tile__title';
+
+ Connector.playerSelector = '.sc-o-scrollable';
+
+ Connector.getArtistTrack = () => {
+ const artistTrackElement = document.querySelector(
+ equalizerIconSelector
+ );
+ if (!artistTrackElement) {
+ return null;
+ }
+
+ const trackItem = artistTrackElement.closest(trackItemSelector);
+ const artist = trackItem.querySelector(artistSelector).textContent;
+ const track = trackItem.querySelector(trackSelector).textContent;
-Connector.onReady = Connector.onStateChanged;
+ return { artist, track };
+ };
+}
| 7 |
diff --git a/index.html b/index.html var originalTask = '';
var options = {
- serverUrl: "/snowstorm/snomed-ct/v2",
- queryServerUrl: "/snowstorm/snomed-ct/v2",
+ serverUrl: "/snowstorm/",
+ queryServerUrl: "/snowstorm/",
queryBranch: "MAIN/2019-07-31",
edition: "MAIN",
release: "2019-07-31",
on July 31, 2019.</p>
<h3><span class="i18n" data-i18n-id="i18n_international_editions">International Edition</span></h3>
<p>
- <a class="btn btn-primary btn-lg" role="button" onclick="switchRelease('International Edition 2019-07-31', '', 'MAIN/2019-07-31', '2019-07-31','900000000000509007', '/snowstorm/snomed-ct/v2');
+ <a class="btn btn-primary btn-lg" role="button" onclick="switchRelease('International Edition 2019-07-31', '', 'MAIN/2019-07-31', '2019-07-31','900000000000509007', '/snowstorm/');
switchToFullHeight(404684003, 138875005);"></img src="/img/logo.png" style="height:20px"> <span class="i18n" data-i18n-id="i18n_go_browsing">Go browsing...</span><br><span class="small ">International edition<br>Members release<br><br>July 2019</span></a>
</p>
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -100426,7 +100426,22 @@ var $$IMU_EXPORT$$;
}
}
- if (!varvalue) {
+ var usevar = !!varvalue;
+
+ if (typeof varvalue === "object") {
+ var varobj = varvalue;
+ varvalue = "";
+
+ if ("usable" in varobj) {
+ usevar = varobj.usable;
+ }
+
+ if ("value" in varobj) {
+ varvalue = varobj.value;
+ }
+ }
+
+ if (!usevar) {
if (default_value) {
varvalue = default_value;
} else {
@@ -106623,9 +106638,15 @@ var $$IMU_EXPORT$$;
return;
}
+ var our_vars = deepcopy(popup_obj.format_vars);
+ our_vars.is_screenshot = {usable: true};
+ our_vars.ext = ".png";
+ our_vars.filename = our_vars.filename_noext + our_vars.ext;
+ var screenshot_filename = get_filename_from_format(settings.filename_format, our_vars);
+
do_download({
url: data
- }, "screenshot.png");
+ }, screenshot_filename);
});
};
| 11 |
diff --git a/src/inner-slider.js b/src/inner-slider.js @@ -386,7 +386,6 @@ export class InnerSlider extends React.Component {
autoPlay = (playType) => {
if (this.autoplayTimer) {
- console.warn("autoPlay is triggered more than once")
clearInterval(this.autoplayTimer)
}
const autoplaying = this.state.autoplaying
| 2 |
diff --git a/en/tutorial/getting-started.md b/en/tutorial/getting-started.md ## Get ECharts
-You can get ECharts through the following ways.
+First, install ECharts using one of the following methods:
-1. Choose the version you need and download from [official download page](http://echarts.baidu.com/download.html). Based on developer's varied need of function and package size, we provide different download packages. If you have concern about package size, you can download [full version](http://echarts.baidu.com/dist/echarts.min.js) directly.
+1. The [official download page](https://ecomfe.github.io/echarts-doc/public/en/download.html), which has different builds for common needs. If you want to include all packages, you can download [the full minified version](http://echarts.baidu.com/dist/echarts.min.js).
-2. Download the latest `release` version in ECharts [GitHub](https://github.com/echarts), and you can find the latest version of echarts in `dist` directory of the unzipped files.
+2. From the latest [GitHub](https://github.com/echarts) release, you can find the latest version of echarts in `dist` directory of the unzipped files.
-3. Alternatively, you may get echarts through npm by `npm install echarts --save`. See detail in [use echarts in webpack](http://echarts.baidu.com/tutorial.html#%E5%9C%A8%20webpack%20%E4%B8%AD%E4%BD%BF%E7%94%A8%20ECharts)
+3. Using npm: `npm install echarts --save`. [Using ECharts with webpack](https://ecomfe.github.io/echarts-doc/public/en/tutorial.html#Use%20ECharts%20with%20webpack)
+
+4. Using the [online build tool](http://echarts.baidu.com/builder.html) (Chinese).
## Including ECharts
-ECharts 3 no longer emphysis on using AMD to load packages on need, and AMD loader is no longer included in ECharts. Therefore, it is much easier to include ECharts, in that you only need to include ECharts in script label like most other JavaScript libraries require.
+ECharts 3 no longer requires using AMD to load packages, and the AMD loader is no longer included in ECharts. Instead, ECharts should be included using a traditonal `<script>` tag:
```html
<!DOCTYPE html>
@@ -37,7 +39,7 @@ Before drawing charts, we need to prepare a DOM container with width and height
</body>
```
-Then we can initialize an echarts instance through [echarts.init](api.html#echarts.init), and create a simple bar chart through [setOption](api.html#echartsInstance.setOption). Below is the complete code.
+Then we can initialize an ECharts instance using [echarts.init](api.html#echarts.init), and create a simple bar chart with [setOption](api.html#echartsInstance.setOption). Below is the complete code.
```html
@@ -83,8 +85,8 @@ Then we can initialize an echarts instance through [echarts.init](api.html#echar
</html>
```
-Here is your first chart!
+You've made your first chart!
~[600x300](${galleryViewPath}doc-example/getting-started&reset=1&edit=1)
-You can also go to [ECharts Gallery](${galleryEditorPath}doc-example/getting-started) to view examples.
+For more examples, go to the [ECharts Gallery](${galleryEditorPath}doc-example/getting-started)
| 7 |
diff --git a/src/pages/crafts/index.js b/src/pages/crafts/index.js @@ -199,6 +199,8 @@ function Crafts() {
totalCost = totalCost + requiredItem.item.avg24hPrice * requiredItem.count;
if(requiredItem.item.avg24hPrice * requiredItem.count === 0){
+ console.log(`Found a zero cost item! ${requiredItem.item.name}`);
+
hasZeroCostItem = true;
}
@@ -231,8 +233,8 @@ function Crafts() {
}
if(hasZeroCostItem){
- console.log('Found a zero cost item!');
- console.log(craftRow);
+ // console.log('Found a zero cost item!');
+ // console.log(craftRow);
return false;
}
| 7 |
diff --git a/.vscode/settings.json b/.vscode/settings.json },
"eslint.alwaysShowStatus": true,
"eslint.lintTask.enable": true,
- "eslint.enable": true,
+ "eslint.format.enable": true,
+ "editor.defaultFormatter": "dbaeumer.vscode-eslint",
"typescript.tsdk": "./node_modules/typescript/lib"
}
| 12 |
diff --git a/src/botPage/view/react-components/HeaderWidgets.js b/src/botPage/view/react-components/HeaderWidgets.js @@ -14,8 +14,8 @@ const ServerTime = ({ api }) => {
const month = `0${date.getMonth() + 1}`.slice(-2);
const day = `0${date.getUTCDate()}`.slice(-2);
const hours = `0${date.getUTCHours()}`.slice(-2);
- const minutes = `0${date.getMinutes()}`.slice(-2);
- const seconds = `0${date.getSeconds()}`.slice(-2);
+ const minutes = `0${date.getUTCMinutes()}`.slice(-2);
+ const seconds = `0${date.getUTCSeconds()}`.slice(-2);
setDateString(`${year}-${month}-${day} ${hours}:${minutes}:${seconds} GMT`);
};
| 3 |
diff --git a/Source/Scene/GroundPrimitive.js b/Source/Scene/GroundPrimitive.js @@ -85,7 +85,7 @@ define([
* </p>
* <p>
* Because of the cutting edge nature of this feature in WebGL, it requires the EXT_frag_depth extension, which is currently only supported in Chrome,
- * Firefox, and Edge. Apple support is expected in iOS 9 and MacOS Safari 9. Android support varies by hardware and IE11 will most likely never support
+ * Firefox, Edge, and Safari 10. It's not yet supported in iOS 10. Android support varies by hardware and IE11 will most likely never support
* it. You can use webglreport.com to verify support for your hardware.
* </p>
* <p>
| 3 |
diff --git a/src/encoded/upgrade/upgrade_data/analysis_step_5_to_6.py b/src/encoded/upgrade/upgrade_data/analysis_step_5_to_6.py @@ -118,7 +118,7 @@ label_mapping = {
'j-michael-cherry:208715a1-1998-4191-9f00-16378333ccb1': 'dnase-bed-to-bigbed-step',
'j-michael-cherry:22dee925-30d9-4b01-ba3c-ea5cbfb15c98': 'deleted-lrna-pe-star-stranded-signals-for-tophat-step',
'j-michael-cherry:33c5bca6-5338-45b9-b837-04441d4b582c': 'alignment-subsampling-step',
- 'j-michael-cherry:359d63f3-8e92-4731-a719-58fb7053bdb9': 'deleted-lrna-index-star-step',
+ # 'j-michael-cherry:359d63f3-8e92-4731-a719-58fb7053bdb9': 'deleted-lrna-index-star-step',
'j-michael-cherry:3fa67405-fa88-4627-b3eb-04f789eb5d29': 'deleted-lrna-pe-star-alignment-step',
'j-michael-cherry:579e77ce-2594-42c1-82da-5f03ea2bb91b': 'deleted-lrna-se-star-unstranded-signals-for-tophat-step',
'j-michael-cherry:5dfa4f70-7c1c-4684-846d-4e823e584349': 'dnase-seq-mapping-step',
| 2 |
diff --git a/LightboxImages.user.js b/LightboxImages.user.js // @description Opens image links in a lightbox instead of new window/tab in main & chat. Lightbox images that are displayed smaller than it's original size.
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.4.1
+// @version 1.4.2
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
// If unlinked images' width is greater than displayed width of at least 100px, also lightbox the image
$('img').filter(function() {
- return typeof this.parentNode.href === 'undefined' && !this.parentNode.className.includes('avatar');
+ return typeof this.parentNode.href === 'undefined' && !this.parentNode.className.includes('avatar') && !this.parentNode.className.includes('hat');
}).wrap(function() {
return `<a class="unlinked-image" data-src="${this.src}"></a>`;
});
| 8 |
diff --git a/core/keyboard_nav/key_map.js b/core/keyboard_nav/key_map.js @@ -78,7 +78,9 @@ Blockly.user.keyMap.setKeyMap = function(keyMap) {
* @package
*/
Blockly.user.keyMap.getKeyMap = function() {
- return Object.assign({}, Blockly.user.keyMap.map_);
+ var map = {};
+ Blockly.utils.object.mixin(map, Blockly.user.keyMap.map_);
+ return map;
};
/**
| 2 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -209,7 +209,7 @@ jobs:
bundle exec fastlane release \
submit:true \
apk_path:$APK_PATH \
- upload_key:$UPLOAD_KEY_PATH
+ upload_key:$PLAY_STORE_UPLOAD_KEY_PATH
alpha-ios:
macos:
| 4 |
diff --git a/test/jasmine/tests/parcoords_test.js b/test/jasmine/tests/parcoords_test.js @@ -792,6 +792,36 @@ describe('parcoords', function() {
});
});
+ it('Calling `Plotly.restyle` with zero panels left should erase lines', function(done) {
+
+ var mockCopy = Lib.extendDeep({}, mock2);
+ var gd = createGraphDiv();
+ Plotly.plot(gd, mockCopy.data, mockCopy.layout);
+
+ function restyleDimension(key, dimIndex, setterValue) {
+ var value = Lib.isArray(setterValue) ? setterValue[0] : setterValue;
+ return function() {
+ return Plotly.restyle(gd, 'dimensions[' + dimIndex + '].' + key, setterValue).then(function() {
+ expect(gd.data[0].dimensions[dimIndex][key]).toEqual(value, 'for dimension attribute \'' + key + '\'');
+ });
+ };
+ }
+
+ restyleDimension('values', 1, [[]])()
+ .then(function() {
+ d3.selectAll('.parcoords-lines').each(function(d) {
+ var imageArray = d.lineLayer.readPixels(0, 0, d.model.canvasWidth, d.model.canvasHeight);
+ var foundPixel = false;
+ var i = 0;
+ do {
+ foundPixel = foundPixel || imageArray[i++] !== 0;
+ } while(!foundPixel && i < imageArray.length);
+ expect(foundPixel).toEqual(false);
+ });
+ done();
+ });
+ });
+
describe('Having two datasets', function() {
it('Two subsequent calls to Plotly.plot should create two parcoords rows', function(done) {
| 0 |
diff --git a/src/index.js b/src/index.js @@ -35,8 +35,8 @@ if (style.styleSheet) {
* decide if we need to clear storage
*/
const upgradeVersion = async () => {
- const valid = ['etoro', 'beta.11', 'alphav3']
- const required = Config.isEToro ? 'etoro' : 'alphav3'
+ const valid = ['etoro', 'phase0']
+ const required = Config.isEToro ? 'etoro' : 'phase0'
const version = await AsyncStorage.getItem('GD_version')
if (valid.includes(version)) {
return
| 0 |
diff --git a/server.js b/server.js @@ -20,9 +20,10 @@ async.series([
if(cluster.isMaster) {
var router = require('./lib/routes');
app.use(router);
- app.listen(3000, function() {
+ var server = app.listen(3000, function() {
console.log('api server listening on port 3000!');
});
+ server.timeout = 600000;
}
});
| 12 |
diff --git a/src/lib/expandTailwindAtRules.js b/src/lib/expandTailwindAtRules.js @@ -235,7 +235,6 @@ export default function expandTailwindAtRules(context) {
if (env.DEBUG) {
console.log('Potential classes: ', candidates.size)
console.log('Active contexts: ', sharedState.contextSourcesMap.size)
- console.log('Content match entries', contentMatchCache.size)
}
// Clear the cache for the changed files
| 2 |
diff --git a/src/reducers/account/index.js b/src/reducers/account/index.js @@ -114,15 +114,16 @@ const account = handleActions({
...state,
loginResetAccounts: true
}),
- [getProfileBalance]: (state, { payload, ready, error }) => {
- if (!ready || error) {
- return state
- }
-
- return {
+ [updateStakingAccount]: (state, { error, meta, payload, ready }) =>
+ (!ready || error)
+ ? state
+ : ({
...state,
balance: {
...state.balance,
+ account: payload
+ }
+ }),
...payload
}
}
| 9 |
diff --git a/src/plots/cartesian/axis_autotype.js b/src/plots/cartesian/axis_autotype.js @@ -69,14 +69,18 @@ function moreDates(a, calendar) {
// are the (x,y)-values in gd.data mostly text?
// require twice as many DISTINCT categories as distinct numbers
function category(a) {
+ var len = a.length;
+ if(!len) return false;
+
// test at most 1000 points
- var inc = Math.max(1, (a.length - 1) / 1000);
+ var inc = Math.max(1, (len - 1) / 1000);
var curvenums = 0;
var curvecats = 0;
var seen = {};
- for(var i = 0; i < a.length; i += inc) {
- var ai = a[Math.round(i)];
+ for(var f = 0; f < len; f += inc) {
+ var i = Math.round(f);
+ var ai = a[i];
var stri = String(ai);
if(seen[stri]) continue;
seen[stri] = 1;
| 0 |
diff --git a/docs/articles/documentation/index.md b/docs/articles/documentation/index.md @@ -9,3 +9,4 @@ permalink: /documentation/
* [Test API](test-api/index.md)
* [Using TestCafe](using-testcafe/index.md)
* [Extending TestCafe](extending-testcafe/index.md)
+* [Recipes](recipes/index.md)
\ No newline at end of file
| 0 |
diff --git a/src/structs/ClientManager.js b/src/structs/ClientManager.js @@ -2,10 +2,10 @@ process.env.DRSS = true
const config = require('../config.js')
const connectDb = require('../rss/db/connect.js')
const dbOpsGeneral = require('../util/db/general.js')
-const dbOpsVips = require('../util/db/vips.js')
const ScheduleManager = require('./ScheduleManager.js')
const FeedScheduler = require('../util/FeedScheduler.js')
const redisIndex = require('../structs/db/Redis/index.js')
+const Patron = require('./db/Patron.js')
const log = require('../util/logger.js')
const EventEmitter = require('events')
const ArticleModel = require('../models/Article.js')
@@ -89,7 +89,7 @@ class ClientManager extends EventEmitter {
}
async _shardReadyEvent (shard, message) {
- await FeedScheduler.assignSchedules(shard.id, message.guildIds, await dbOpsVips.getValidServers())
+ await FeedScheduler.assignSchedules(shard.id, message.guildIds)
this.shardingManager.broadcast({ _drss: true, type: 'startInit', shardId: shard.id }) // Send the signal for first shard to initialize
}
@@ -128,23 +128,35 @@ class ClientManager extends EventEmitter {
if (++this.shardsDone === this.shardingManager.totalShards) {
// Drop the ones not in the current collections
dbOpsGeneral.cleanDatabase(this.currentCollections).catch(err => log.general.error(`Unable to clean database`, err))
- this.shardingManager.broadcast({ _drss: true, type: 'finishedInit' })
log.general.info(`All shards have initialized by the Sharding Manager.`)
+ // Remove broken guilds
this.brokenGuilds.forEach(guildId => {
log.init.warning(`(G: ${guildId}) Guild is declared missing by the Sharding Manager, removing`)
GuildProfile.get(guildId)
.then(profile => profile ? profile.delete() : null)
.catch(err => log.init.warning(`(G: ${guildId}) Guild deletion error based on missing guild declared by the Sharding Manager`, err))
})
+ // Remove broken feeds
this.brokenFeeds.forEach(feedId => {
log.init.warning(`(F: ${feedId}) Feed is declared missing by the Sharding Manager, removing`)
Feed.get(feedId)
.then(feed => feed ? feed.delete() : null)
.catch(err => log.init.warning(`(F: ${feedId}) Feed deletion error based on missing guild declared by the Sharding Manager`, err))
})
+ Patron.refresh()
+ .then(() => {
+ // Create feed schedule intervals
this.createIntervals()
- if (config.web.enabled === true) this.webClientInstance.enableCP()
+ // Start the web UI
+ if (config.web.enabled === true) {
+ this.webClientInstance.enableCP()
+ }
+ this.shardingManager.broadcast({ _drss: true, type: 'finishedInit' })
this.emit('finishInit')
+ })
+ .catch(err => {
+ log.general.error(`Failed to refresh supporters after initialization in sharding manager`, err, true)
+ })
} else if (this.shardsDone < this.shardingManager.totalShards) {
this.shardingManager.broadcast({ _drss: true, type: 'startInit', shardId: this.activeshardIds[this.shardsDone], vipServers: message.vipServers }).catch(err => this._handleErr(err, message)) // Send signal for next shard to init
}
@@ -191,14 +203,12 @@ class ClientManager extends EventEmitter {
this.refreshRates.forEach((refreshRate, i) => {
this.scheduleIntervals.push(setInterval(initiateCycles(refreshRate).bind(this), refreshRate * 60000))
})
- initiateCycles(config.feeds.refreshRateMinutes)() // Immediately start the default retrieval cycles with the specified refresh rate
-
- // Refresh VIPs on a schedule
+ // Immediately start the default retrieval cycles with the specified refresh rate
+ initiateCycles(config.feeds.refreshRateMinutes)()
setInterval(() => {
- // Only needs to be run on a single shard since dbOps uniformizes it across all shards
- this.shardingManager.broadcast({ _drss: true, type: 'cycleVIPs', shardId: this.activeshardIds[0] }).catch(err => log.general.error('Unable to cycle VIPs from Sharding Manager', err))
+ Patron.refresh()
+ .catch(err => log.general.error(`Failed to refresh patrons on timer`, err))
}, 900000)
- // this.shardingManager.broadcast({ _drss: true, type: 'cycleVIPs', shardId: this.activeshardIds[0] }).catch(err => log.general.error('Unable to cycle VIPs from Sharding Manager', err)) // Manually run this to update the names
}
}
| 4 |
diff --git a/build/Bundler.js b/build/Bundler.js @@ -16,15 +16,31 @@ export default class Bundler{
this.version = "/* Tabulator v" + version + " (c) Oliver Folkerd <%= moment().format('YYYY') %> */";
}
- _suppressCircularWarnings(warn, defaultHandler){
- var ignoredCircularFiles = [
+ _suppressUnnecessaryWarnings(warn, defaultHandler){
+ const ignoredCodes = {
+ "FILE_NAME_CONFLICT": true,
+ "CIRCULAR_DEPENDENCY": this._suppressCircularDependencyWarnings,
+ };
+
+ var suppressed = false,
+ codeHandler = ignoredCodes[warn.code];
+
+ if(codeHandler){
+ suppressed = typeof codeHandler === "function" ? codeHandler(warn) : codeHandler;
+ }
+
+ if(!suppressed){
+ defaultHandler(warn);
+ }
+ }
+
+ _suppressCircularDependencyWarnings(warn){
+ const ignoredCircularFiles = [
"Column.js",
"Tabulator.js",
];
- if(!(warn.code === "CIRCULAR_DEPENDENCY" && ignoredCircularFiles.some(file => warn.importer.includes(file)))){
- defaultHandler(warn);
- }
+ return ignoredCircularFiles.some(file => warn.importer.includes(file));
}
bundle(){
@@ -112,7 +128,8 @@ export default class Bundler{
sourceMap: true,
plugins: [require('postcss-prettify')]
}),
- ]
+ ],
+ onwarn:this._suppressUnnecessaryWarnings.bind(this),
};
}));
}
@@ -138,7 +155,7 @@ export default class Bundler{
sourcemap: true,
},
],
- onwarn:this._suppressCircularWarnings,
+ onwarn:this._suppressUnnecessaryWarnings.bind(this),
});
}
@@ -163,7 +180,7 @@ export default class Bundler{
exports: "default",
sourcemap: true,
},
- onwarn:this._suppressCircularWarnings,
+ onwarn:this._suppressUnnecessaryWarnings.bind(this),
});
}
}
\ No newline at end of file
| 7 |
diff --git a/token-metadata/0xD83A162d4808c370A1445646e64CC4861eB60b92/metadata.json b/token-metadata/0xD83A162d4808c370A1445646e64CC4861eB60b92/metadata.json "symbol": "OXY",
"address": "0xD83A162d4808c370A1445646e64CC4861eB60b92",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/LandingPage/LandingPage.scss b/src/components/LandingPage/LandingPage.scss overflow: hidden;
position: relative;
color: $white;
- background: linear-gradient(180deg, #1f6cbf 0%, rgba(255, 255, 255, 0) 100%), #007bff;
+ background: linear-gradient(180deg, #206bbd 2%, rgba(249, 252, 255, 0) 80%),
+ linear-gradient(180deg, #007bff00 5%, #007bff 80%);
padding: 84px 84px 10vw;
min-height: 450px;
max-height: 60vh;
| 7 |
diff --git a/edit.js b/edit.js @@ -2609,45 +2609,6 @@ const geometryWorker = (() => {
const _getSlabTorchLightOffset = spec => spec.torchLightsStart/Uint8Array.BYTES_PER_ELEMENT;
const _getSlabIndexOffset = spec => spec.indicesStart/Uint32Array.BYTES_PER_ELEMENT;
- mesh.addSlab = (x, y, z, spec) => {
- const index = planet.getSubparcelIndex(x, y, z);
- let slab = slabs[index];
- if (slab) {
- slab.free();
- slab.spec = spec;
- slab.group.start = _getSlabIndexOffset(spec);
- slab.group.count = spec.indicesCount/Uint32Array.BYTES_PER_ELEMENT;
- } else {
- const group = {
- start: _getSlabIndexOffset(spec),
- count: spec.indicesCount/Uint32Array.BYTES_PER_ELEMENT,
- materialIndex: 0,
- boundingSphere: new THREE.Sphere(
- new THREE.Vector3(x*SUBPARCEL_SIZE + SUBPARCEL_SIZE/2, y*SUBPARCEL_SIZE + SUBPARCEL_SIZE/2, z*SUBPARCEL_SIZE + SUBPARCEL_SIZE/2),
- slabRadius
- ),
- };
- geometry.groups.push(group);
- slab = slabs[index] = {
- x,
- y,
- z,
- index,
- spec,
- group,
- free() {
- allocators.positions.free(this.spec.positionsFreeEntry);
- allocators.uvs.free(this.spec.uvsFreeEntry);
- allocators.ids.free(this.spec.idsFreeEntry);
- allocators.skyLights.free(this.spec.skyLightsFreeEntry);
- allocators.torchLights.free(this.spec.torchLightsFreeEntry);
- allocators.indices.free(this.spec.indicesFreeEntry);
- this.spec = null;
- },
- };
- }
- return slab;
- };
mesh.updateGeometry = (/*slab,*/ spec) => {
geometry.attributes.position.updateRange.offset = _getSlabPositionOffset(spec);
geometry.attributes.position.needsUpdate = true;
@@ -3592,12 +3553,6 @@ const _makeChunkMesh = async (seedString, parcelSize, subparcelSize) => {
mesh.vegetationMeshes = {};
mesh.objects = [];
- const slabs = {};
- const _makeGroup = materialIndex => ({
- start: 0,
- count: 0,
- materialIndex,
- });
const _getSlabPositionOffset = spec => spec.positionsStart/Float32Array.BYTES_PER_ELEMENT;
const _getSlabNormalOffset = spec => spec.normalsStart/Float32Array.BYTES_PER_ELEMENT;
const _getSlabUvOffset = spec => spec.uvsStart/Float32Array.BYTES_PER_ELEMENT;
@@ -3606,41 +3561,6 @@ const _makeChunkMesh = async (seedString, parcelSize, subparcelSize) => {
const _getSlabSkyLightOffset = spec => spec.skyLightsStart/Uint8Array.BYTES_PER_ELEMENT;
const _getSlabTorchLightOffset = spec => spec.torchLightsStart/Uint8Array.BYTES_PER_ELEMENT;
- mesh.addSlab = (x, y, z, spec) => {
- const index = planet.getSubparcelIndex(x, y, z);
- let slab = slabs[index];
- if (slab) {
- slab.free();
- slab.spec = spec;
- } else {
- slab = slabs[index] = {
- x,
- y,
- z,
- index,
- spec,
- groupSet: {
- groups: [_makeGroup(0), _makeGroup(1)],
- boundingSphere: new THREE.Sphere(new THREE.Vector3(x*SUBPARCEL_SIZE + SUBPARCEL_SIZE/2, y*SUBPARCEL_SIZE + SUBPARCEL_SIZE/2, z*SUBPARCEL_SIZE + SUBPARCEL_SIZE/2), slabRadius),
- slab: this,
- },
- physxGeometry: 0,
- physxGroupSet: 0,
- free() {
- allocators.positions.free(this.spec.positionsFreeEntry);
- allocators.normals.free(this.spec.normalsFreeEntry);
- allocators.uvs.free(this.spec.uvsFreeEntry);
- allocators.aos.free(this.spec.aosFreeEntry);
- allocators.ids.free(this.spec.idsFreeEntry);
- allocators.skyLights.free(this.spec.skyLightsFreeEntry);
- allocators.torchLights.free(this.spec.torchLightsFreeEntry);
- allocators.peeks.free(this.spec.peeksFreeEntry);
- this.spec = null;
- },
- };
- }
- return slab;
- };
mesh.updateGeometry = spec => {
geometry.attributes.position.updateRange.offset = _getSlabPositionOffset(spec);
geometry.attributes.position.needsUpdate = true;
| 2 |
diff --git a/docs/blog/100days/index.md b/docs/blog/100days/index.md @@ -5,8 +5,6 @@ author: "Hashim Warren"
tags: ["learning-to-code", "contest", "100-Days-of-Gatsby"]
---
-import EmailCaptureForm100Days from "../../../www/src/components/email-capture-form-100days"
-
### If you're looking for a fun way to explore how to build blazing fast websites with Gatsby, our #100DaysOfGatsby challenge is for you!
@@ -17,7 +15,7 @@ Udemy named Gatsby [the #1 emerging tech skill](https://www.cnbc.com/2019/12/02/
Register below to join the #100daysofGatsby coding challenge!
-<EmailCaptureForm100Days signupMessage="Get weekly updates on new challenges, ideas for where to start, and step-by-step documentation for completing the challenge." />
+<EmailCaptureForm formId="6157faa3-5474-48b1-b7e4-e0f45237327f" signupMessage="Get weekly updates on new challenges, ideas for where to start, and step-by-step documentation for completing the challenge." />
## Use #100DaysOfGatsby on Social Media
| 14 |
diff --git a/assets/js/modules/analytics/common/account-create/create-account-field.js b/assets/js/modules/analytics/common/account-create/create-account-field.js @@ -32,7 +32,8 @@ export default function CreateAccountField( {
name,
label,
} ) {
- if ( 'undefined' === typeof value ) {
+ // Ensure field doesn't render until default value is available, fixing a potential render bug.
+ if ( value === undefined ) {
return null;
}
| 7 |
diff --git a/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs @@ -36,6 +36,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.test.web.reactive.server.WebTestClient;
<%_ } _%>
import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.utility.DockerImageName;
import java.time.Duration;
import java.util.Collections;
@@ -72,7 +73,7 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
private static void startTestcontainer() {
// TODO: withNetwork will need to be removed soon
// See discussion at https://github.com/jhipster/generator-jhipster/issues/11544#issuecomment-609065206
- kafkaContainer = new KafkaContainer("<%= KAFKA_VERSION %>").withNetwork(null);
+ kafkaContainer = new KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>")).withNetwork(null);
kafkaContainer.start();
}
@@ -170,4 +171,3 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
return consumerProps;
}
}
-
| 14 |
diff --git a/Source/Core/BingMapsGeocoderService.js b/Source/Core/BingMapsGeocoderService.js /*global define*/
define([
'./BingMapsApi',
+ './Check',
'./defaultValue',
'./defined',
'./defineProperties',
- './DeveloperError',
'./loadJsonp',
'./Rectangle'
], function(
BingMapsApi,
+ Check,
defaultValue,
defined,
defineProperties,
- DeveloperError,
loadJsonp,
Rectangle) {
'use strict';
@@ -25,15 +25,13 @@ define([
* @constructor
*
* @param {Object} options Object with the following properties:
- * @param {String} options.scene The scene
+ * @param {Scene} options.scene The scene
* @param {String} [options.key] A key to use with the Bing Maps geocoding service
*/
function BingMapsGeocoderService(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
//>>includeStart('debug', pragmas.debug);
- if (!defined(options.scene)) {
- throw new DeveloperError('options.scene is required.');
- }
+ Check.typeOf.object('options.scene', options.scene);
//>>includeEnd('debug');
var key = options.key;
@@ -81,9 +79,7 @@ define([
*/
BingMapsGeocoderService.prototype.geocode = function(query) {
//>>includeStart('debug', pragmas.debug);
- if (!defined(query)) {
- throw new DeveloperError('query must be defined');
- }
+ Check.typeOf.string('query', query);
//>>includeEnd('debug');
var key = this.key;
| 14 |
diff --git a/packages/idyll-components/src/generateHeaders.js b/packages/idyll-components/src/generateHeaders.js @@ -25,7 +25,7 @@ const GenerateHeaders = props => {
attributeProps.id = generateId(headerText);
}
- return <HeaderTag {...attributeProps}>{headerText}</HeaderTag>;
+ return <HeaderTag {...attributeProps}>{children}</HeaderTag>;
};
export default GenerateHeaders;
| 1 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.23.0",
+ "version": "0.23.1",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/test/unit/authCanExecuteResourceTest.js b/test/unit/authCanExecuteResourceTest.js @@ -154,6 +154,23 @@ describe('authCanExecuteResource', () => {
}]
);
+ const canExecute = authCanExecuteResource(policy, resourceTwo);
+ expect(canExecute).to.eq(false);
+ });
+ });
+ context('and there is also an Allow statement', () => {
+ it('returns false', () => {
+ const policy = setup(
+ [{
+ Effect: 'Allow',
+ Resource: [resourceTwo],
+ },
+ {
+ Effect: 'Deny',
+ Resource: [resourceTwo],
+ }]
+ );
+
const canExecute = authCanExecuteResource(policy, resourceTwo);
expect(canExecute).to.eq(false);
});
| 0 |
diff --git a/content/authors/tom-leposo/index.md b/content/authors/tom-leposo/index.md @@ -3,6 +3,6 @@ title: Tom Leposo
type: authors
github: https://github.com/tomleposo
images:
- - url: /engineering-education/authors/tom-leposo/avatar.jpg
+ - url: /engineering-education/authors/tom-leposo/avatar.jpeg
---
-Tom is an undergraduate student, pursuing a degree in Information Technology. He loves Android Development and is passionate about developer communities. He loves gaming and travelling.
+Tom is an undergraduate student pursuing a degree in Information Technology. He loves Android Development and is passionate about developer communities. He loves gaming and travelling.
| 10 |
diff --git a/packages/web/src/styles/Base.js b/packages/web/src/styles/Base.js @@ -6,7 +6,7 @@ const Base = styled("div")`
font-size: ${props => props.theme.fontSize};
color: ${props => props.theme.textColor};
- input {
+ input, button, textarea, select {
font-family: ${props => props.theme.fontFamily};
}
| 3 |
diff --git a/src/scss/includes/panels/poi_panel.scss b/src/scss/includes/panels/poi_panel.scss @@ -330,7 +330,6 @@ $HEADER_SIZE: 30px;
.poi_panel__actions {
width: 100%;
position: relative;
- overflow: hidden;
margin-bottom: 10px;
}
@@ -338,7 +337,7 @@ $HEADER_SIZE: 30px;
float: left;
text-decoration: none;
text-align: center;
- min-width: 60px;
+ min-width: 45px;
&:not(:last-child){
margin-right: 15px;
@@ -383,7 +382,8 @@ $HEADER_SIZE: 30px;
}
.poi_panel__actions__text {
- display: inline-block;
+ display: flex;
+ justify-content: center;
height: 25px;
font-size: 12px;
color: $secondary_text;
| 7 |
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.5.3">
+<!ENTITY version-java-client "5.6.0">
<!ENTITY version-dotnet-client "5.1.0">
<!ENTITY version-server "3.7.10">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/client/src/components/views/TractorBeam/style.scss b/client/src/components/views/TractorBeam/style.scss }
.stressBar {
position: absolute;
- top: 60%;
+ bottom: 5%;
right: 33%;
}
.strengthBar {
position: absolute;
- top: 60%;
+ bottom: 5%;
right: 0%;
}
.barLabel {
| 1 |
diff --git a/src/content/cli-wrangler/authentication.md b/src/content/cli-wrangler/authentication.md @@ -25,24 +25,16 @@ To set up `wrangler` to work with your Cloudflare user, use the following comman
You can also configure your global user with environment variables. This is the preferred method for using Wrangler in CI.
-You can deploy with authentication tokens (recommended):
+You can deploy with authentication tokens (recommended). Obtain `CF_ACCOUNT_ID` and `CF_API_TOKEN` from the Cloudflare dashboard and run:
```sh
-# e.g.
-CF_ACCOUNT_ID=youraccountid
-CF_API_TOKEN=superlongapitoken wrangler publish
-# where
-# $CF_API_TOKEN -> a Cloudflare API token
+$ CF_ACCOUNT_ID=accountID CF_API_TOKEN=veryLongAPIToken wrangler publish
```
-Or you can deploy with your email and your global API key:
+Or you can deploy with your email and your global API key. Obtain `CF_EMAIL` and `CF_API_KEY` from the Cloudflare dashboard and run:
```sh
-# e.g.
[email protected] CF_API_KEY=superlongapikey wrangler publish
-# where
-# $CF_EMAIL -> your Cloudflare account email
-# $CF_API_KEY -> your Cloudflare API key
+$ CF_EMAIL=cloudflareEmail CF_API_KEY=veryLongAPI wrangler publish
```
Note environment variables will override whatever credentials you configured in `wrangler config` or in your `wrangler.toml`.
| 7 |
diff --git a/src/reducers/event-filters.js b/src/reducers/event-filters.js @@ -74,7 +74,7 @@ const EventFilters = (now: void => DateTime) => {
case NAVIGATION:
if (routesWithoutEvents.includes(action.route)) {
const newTime = now();
- const diff = now()
+ const diff = newTime
.diff(state.showEventsAfter, "minutes")
.as("minutes");
if (diff >= 30) {
| 2 |
diff --git a/components/base-adresse-nationale/tooltip.js b/components/base-adresse-nationale/tooltip.js @@ -13,6 +13,8 @@ function Tooltip({message, direction, children}) {
position: relative;
display: inline-block;
cursor: help;
+ display: flex;
+ align-self: center;
}
.tooltip-bottom .tooltip-text, .tooltip-left .tooltip-text, .tooltip-right .tooltip-text {
| 0 |
diff --git a/src/pages/Armor.jsx b/src/pages/Armor.jsx @@ -121,8 +121,16 @@ function Armor() {
if(!materialDestructabilityMap[item.itemProperties.ArmorMaterial]){
console.log(`Missing ${item.itemProperties.ArmorMaterial}`);
}
+
+ const match = item.name.match(/(.*)\s\(.+?$/);
+ let itemName = item.name;
+
+ if(match){
+ itemName = match[1].trim();
+ }
+
return {
- name: item.name,
+ name: itemName,
armorClass: item.itemProperties.armorClass,
material: item.itemProperties.ArmorMaterial,
maxDurability: item.itemProperties.MaxDurability,
| 7 |
diff --git a/devices/camera.js b/devices/camera.js @@ -665,7 +665,7 @@ class Camera extends RingPolledDevice {
await this.updateEventStreamUrl()
this.publishEventSelectState()
- if (this.data.event_select.recordingUrl === '<URL Not Found>') {
+ if (this.data.event_select.recordingUrl === '<No Valid URL>') {
this.debug(`No valid recording was found for the ${(index==1?"":index==2?"2nd ":index==3?"3rd ":index+"th ")}most recent ${kind} event!`)
this.data.stream.event.status = 'failed'
this.data.stream.event.session = false
@@ -772,20 +772,21 @@ class Camera extends RingPolledDevice {
const eventSelect = this.data.event_select.state.split(' ')
const eventType = eventSelect[0].toLowerCase().replace('-', '_')
const eventNumber = eventSelect[1]
- let selectedEvent
+ const urlExpired = Math.floor(Date.now()/1000) - this.data.event_select.recordingUrlExpire > 0 ? true : false
let recordingUrl
try {
const events = await(this.getRecordedEvents(eventType, eventNumber))
- selectedEvent = events[eventNumber-1]
+ const selectedEvent = events[eventNumber-1]
if (selectedEvent) {
if (selectedEvent.event_id !== this.data.event_select.eventId) {
+ this.data.event_select.eventId = selectedEvent.event_id
if (this.data.event_select.recordingUrl) {
this.debug(`New ${this.data.event_select.state} event detected, updating the recording URL`)
}
recordingUrl = await this.device.getRecordingUrl(selectedEvent.event_id, { transcoded: false })
- } else if (Math.floor(Date.now()/1000) - this.data.event_select.recordingUrlExpire > 0) {
+ } else if (urlExpired) {
this.debug(`Previous ${this.data.event_select.state} URL has expired, updating the recording URL`)
recordingUrl = await this.device.getRecordingUrl(selectedEvent.event_id, { transcoded: false })
}
@@ -796,7 +797,6 @@ class Camera extends RingPolledDevice {
}
if (recordingUrl) {
- this.data.event_select.eventId = selectedEvent.event_id
this.data.event_select.recordingUrl = recordingUrl
// Try to parse URL parameters to set expire time
@@ -809,8 +809,8 @@ class Camera extends RingPolledDevice {
} else {
this.data.event_select.recordingUrlExpire = Math.floor(Date.now()/1000) + 600
}
- } else {
- this.data.event_select.recordingUrl = '<URL Not Found>'
+ } else if (urlExpired) {
+ this.data.event_select.recordingUrl = '<No Valid URL>'
this.data.event_select.eventId = '0'
return false
}
| 7 |
diff --git a/assets/sass/components/setup/_googlesitekit-setup-module.scss b/assets/sass/components/setup/_googlesitekit-setup-module.scss > .googlesitekit-setup-module__input {
margin: 1em 0;
}
+
+ div[name="optimizeID"] {
+ margin-bottom: 0;
+
+ + .mdc-text-field-helper-line {
+ margin-bottom: 0;
+ }
+ }
}
.googlesitekit-setup-module__switch {
| 2 |
diff --git a/site/gatsby-config.js b/site/gatsby-config.js @@ -72,7 +72,7 @@ module.exports = {
{
resolve: `gatsby-plugin-google-analytics`,
options: {
- trackingId: '101206186',
+ trackingId: 'UA-101206186-1',
// Puts tracking script in the head instead of the body
head: false,
// Setting this parameter is optional
| 12 |
diff --git a/src/components/MapPanel/index.js b/src/components/MapPanel/index.js @@ -7,8 +7,8 @@ class MapPanel extends Component {
console.log('rendered map panel');
const stats = this.props.fmaPanelData.stats;
return (
- <div style={{ backgroundColor: '#DEDCDC', padding: '50px 25px 50px 25px', textAlign: 'left' }}>
- <h1>Fire Management Area {stats.fma}</h1>
+ <div style={{ backgroundColor: '#DEDCDC', padding: '25px', textAlign: 'left' }}>
+ <h1 style={{ margin: '0' }}>Fire Management Area {stats.fma}</h1>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div className="panel-column-1" style={{ display: 'flex', flexDirection: 'column', textAlign: 'left' }}>
<h3>Area Demographics</h3>
| 2 |
diff --git a/contributors.json b/contributors.json "twitter": "https://twitter.com/eDangol901",
"website": "https://www.quora.com/q/abettercommunity"
},
+ "femakin": {
+ "country": "Nigeria",
+ "linkedin": "https://www.linkedin.com/in/oluwafemi-tosin-akinyemi-6b028270/",
+ "name": "Femi Akinyemi",
+ "twitter": "https://twitter.com/akinyemi_t"
+ },
"hambali999": {
"country": "Singapore",
"linkedin": "https://www.linkedin.com/in/nur-hambali-064126131/",
"xxx32": {
"country": "India",
"name": "Aarushi"
- },
- "femakin": {
- "country": "Nigeria",
- "linkedin": "https://www.linkedin.com/in/oluwafemi-tosin-akinyemi-6b028270/",
- "name": "Femi Akinyemi",
- "twitter": "https://twitter.com/akinyemi_t"
}
}
| 3 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -193,7 +193,8 @@ def check_format(encValData, job, path):
['validateFiles'] + validate_args + [path], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
errors['validateFiles'] = e.output.decode(errors='replace').rstrip('\n')
- update_content_error(errors, 'File failed file format specific validation (encValData)')
+ update_content_error(errors, 'File failed file format specific ' +
+ 'validation (encValData) ' + errors['validateFiles'])
else:
result['validateFiles'] = output.decode(errors='replace').rstrip('\n')
@@ -919,7 +920,7 @@ def run(out, err, url, username, password, encValData, mirror, search_query,
except multiprocessing.NotImplmentedError:
nprocesses = 1
- version = '1.10'
+ version = '1.11'
out.write("STARTING Checkfiles version %s (%s): with %d processes %s at %s\n" %
(version, search_query, nprocesses, dr, datetime.datetime.now()))
| 0 |
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js @@ -385,6 +385,19 @@ function _hover(gd, evt, subplot, noHoverEvent) {
yval = yvalArray[subploti];
}
+ var showSpikes = fullLayout.xaxis && fullLayout.xaxis.showspikes && fullLayout.yaxis && fullLayout.yaxis.showspikes;
+ var showCrosslines = fullLayout.xaxis && fullLayout.xaxis.showcrossline || fullLayout.yaxis && fullLayout.yaxis.showcrossline;
+
+ // Find the points for the crosslines first to avoid overwriting the hoverLabels data.
+ if(fullLayout._has('cartesian') && showCrosslines && !(showSpikes && hovermode === 'closest')) {
+ if(fullLayout.yaxis.showcrossline) {
+ crosslinePoints.hLinePoint = findCrosslinePoint(pointData, xval, yval, 'y', crosslinePoints.hLinePoint);
+ }
+ if(fullLayout.xaxis.showcrossline) {
+ crosslinePoints.vLinePoint = findCrosslinePoint(pointData, xval, yval, 'x', crosslinePoints.vLinePoint);
+ }
+ }
+
// Now find the points.
if(trace._module && trace._module.hoverPoints) {
var newPoints = trace._module.hoverPoints(pointData, xval, yval, mode, fullLayout._hoverlayer);
@@ -408,22 +421,11 @@ function _hover(gd, evt, subplot, noHoverEvent) {
hoverData.splice(0, closedataPreviousLength);
distance = hoverData[0].distance;
}
-
- var showSpikes = fullLayout.xaxis && fullLayout.xaxis.showspikes && fullLayout.yaxis && fullLayout.yaxis.showspikes;
- var showCrosslines = fullLayout.xaxis && fullLayout.xaxis.showcrossline || fullLayout.yaxis && fullLayout.yaxis.showcrossline;
-
- if(fullLayout._has('cartesian') && showCrosslines && !(showSpikes && hovermode === 'closest')) {
- // Now find the points for the crosslines.
- if(fullLayout.yaxis.showcrossline) {
- crosslinePoints.hLinePoint = findCrosslinePoint(pointData, xval, yval, 'y', crosslinePoints.hLinePoint);
- }
- if(fullLayout.xaxis.showcrossline) {
- crosslinePoints.vLinePoint = findCrosslinePoint(pointData, xval, yval, 'x', crosslinePoints.vLinePoint);
- }
- }
}
function findCrosslinePoint(pointData, xval, yval, mode, endPoint) {
+ var tmpDistance = pointData.distance;
+ var tmpIndex = pointData.index;
var resultPoint = endPoint;
pointData.distance = Infinity;
pointData.index = false;
@@ -447,6 +449,8 @@ function _hover(gd, evt, subplot, noHoverEvent) {
}
}
}
+ pointData.index = tmpIndex;
+ pointData.distance = tmpDistance;
return resultPoint;
}
@@ -1145,7 +1149,7 @@ function cleanPoint(d, hovermode) {
return d;
}
-function createCrosslines(hoverData, fullLayout) {
+function createCrosslines(closestPoints, fullLayout) {
var showXSpikeline = fullLayout.xaxis && fullLayout.xaxis.showspikes;
var showYSpikeline = fullLayout.yaxis && fullLayout.yaxis.showspikes;
var showH = fullLayout.yaxis && fullLayout.yaxis.showcrossline;
@@ -1168,7 +1172,7 @@ function createCrosslines(hoverData, fullLayout) {
// do not draw a crossline if there is a spikeline
if(showV && !(showXSpikeline && hovermode === 'closest')) {
- vLinePoint = hoverData.vLinePoint;
+ vLinePoint = closestPoints.vLinePoint;
xa = vLinePoint.xa;
vLinePointX = xa._offset + (vLinePoint.x0 + vLinePoint.x1) / 2;
@@ -1192,7 +1196,7 @@ function createCrosslines(hoverData, fullLayout) {
}
if(showH && !(showYSpikeline && hovermode === 'closest')) {
- hLinePoint = hoverData.hLinePoint;
+ hLinePoint = closestPoints.hLinePoint;
ya = hLinePoint.ya;
hLinePointY = ya._offset + (hLinePoint.y0 + hLinePoint.y1) / 2;
| 5 |
diff --git a/docs/content/examples/charts/column/AutoWidth.js b/docs/content/examples/charts/column/AutoWidth.js -import { HtmlElement, Grid, Repeater } from 'cx/widgets';
+import { HtmlElement, Grid, Repeater, Content, Tab } from 'cx/widgets';
import { Controller, KeySelection } from 'cx/ui';
import { Svg, Rectangle, Text } from 'cx/svg';
import { Gridlines, NumericAxis, CategoryAxis, Chart, Column, Legend } from 'cx/charts';
@@ -116,7 +116,14 @@ export const AutoWidth = <cx>
</div>
</div>
- <CodeSnippet putInto="code" fiddle="oXFtcGiA">{`
+ <Content name="code">
+ <div>
+ <Tab value-bind="$page.code.tab" tab="controller" mod="code"><code>Controller</code></Tab>
+ <Tab value-bind="$page.code.tab" tab="chart" mod="code" default><code>Chart</code></Tab>
+ </div>
+
+
+ <CodeSnippet fiddle="oXFtcGiA" visible-expr="{$page.code.tab}=='controller'">{`
var categories = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
class PageController extends Controller {
@@ -134,7 +141,8 @@ export const AutoWidth = <cx>
})));
}
}
- ...
+ `}</CodeSnippet>
+ <CodeSnippet fiddle="oXFtcGiA" visible-expr="{$page.code.tab}=='chart'">{`
<Svg style="width:600px; height:400px;">
<Chart offset="20 -20 -40 40" axes={{
x: { type: CategoryAxis, uniform: true, labelAnchor: "end", labelRotation: -90, labelDy: '0.35em' },
@@ -213,6 +221,7 @@ export const AutoWidth = <cx>
</Svg>
<Legend />
`}</CodeSnippet>
+ </Content>
</CodeSplit>
</Md>
</cx>;
| 0 |
diff --git a/src/main/webapp/org/cboard/controller/config/widgetCtrl.js b/src/main/webapp/org/cboard/controller/config/widgetCtrl.js @@ -142,12 +142,12 @@ cBoard.controller('widgetCtrl', function ($scope, $state, $stateParams, $http, $
$scope.value_series_types = [
{name: translate('CONFIG.WIDGET.LINE'), value: 'line'},
- {name: translate('CONFIG.WIDGET.BAR'), value: 'bar'},
- {name: translate('CONFIG.WIDGET.STACKED_BAR'), value: 'stackbar'},
- {name: translate('CONFIG.WIDGET.PERCENT_BAR'), value: 'percentbar'},
{name: translate('CONFIG.WIDGET.AREA_LINE'),value:'arealine'},
{name: translate('CONFIG.WIDGET.STACKED_LINE'),value:'stackline'},
- {name: translate('CONFIG.WIDGET.PERCENT_LINE'),value:'percentline'}
+ {name: translate('CONFIG.WIDGET.PERCENT_LINE'),value:'percentline'},
+ {name: translate('CONFIG.WIDGET.BAR'), value: 'bar'},
+ {name: translate('CONFIG.WIDGET.STACKED_BAR'), value: 'stackbar'},
+ {name: translate('CONFIG.WIDGET.PERCENT_BAR'), value: 'percentbar'}
];
$scope.china_map_types = [
| 3 |
diff --git a/src/commands/orgs/collaborators/list.ts b/src/commands/orgs/collaborators/list.ts @@ -19,7 +19,7 @@ export default class OrgCollaboratorsListCommand extends Command {
async run(client: MobileCenterClient, portalBaseUrl: string): Promise<CommandResult> {
const users: models.OrganizationUserResponse[] = await getOrgUsers(client, this.name, debug);
- out.table(out.getNoTableBordersOptions(), users.map((user) => [user.name, user.email]));
+ out.table(out.getNoTableBordersCollapsedVerticallyOptions(""), [["Name", "Display Name", "Email"]].concat(users.map((user) => [user.name, user.displayName, user.email])));
return success();
}
| 7 |
diff --git a/src/entities/styles/_metadata-editor.css b/src/entities/styles/_metadata-editor.css .sc-metadata-editor {
display: flex;
- width: 100%;
+ flex-direction: row;
+ height: 100%;
+ overflow: auto;
+ flex-grow: 1;
+}
+
+.sc-metadata-editor > .se-main-section {
+ flex: 1 1 600px;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+}
+
+.sc-metadata-editor > .se-main-section > .se-toolbar-wrapper {
+ flex: 0 0 40px;
+ z-index: 1000;
+ padding: 3px;
+ padding-bottom: 4px;
+ padding-left: 270px;
+ box-shadow: 0 0 0 0.75pt #d1d1d1, 0 0 3pt 0.75pt #ccc;
+}
+
+.sc-metadata-editor > .se-main-section > .se-content-section {
+ flex: 1 1 0;
+ display: flex;
+ flex-direction: row;
}
-.sc-metadata-editor .se-toc {
+.sc-metadata-editor > .se-main-section > .se-content-section > .se-toc-pane {
flex: 0 0 250px;
overflow: auto;
padding: 30px;
}
+.sc-metadata-editor > .se-main-section > .se-content-section > .sc-scroll-pane {
+ flex: 1 1 600px;
+ position: relative;
+}
+
.sc-metadata-editor .se-toc .se-toc-item {
position: relative;
display: block;
color: #111;
}
-.sc-metadata-editor .se-sections {
- flex: auto;
- position: relative;
- top: 0px;
- bottom: 0px;
- left: 0px;
- right: 0px;
- overflow: auto;
-}
-
.sc-metadata-editor .se-collections {
max-width: 760px;
padding: 30px;
| 4 |
diff --git a/articles/api/management/v2/user-search.md b/articles/api/management/v2/user-search.md @@ -99,7 +99,6 @@ Below are some example queries to illustrate the kinds of queries that are possi
Use Case | Query
---------|----------
-Search across all fields for "john" | `john`
Search for all users whose name _contains_ "john" | `name:"john"`
Search all users whose name _is_ exactly "john" | `name.raw:"john"`
Search for all user names starting with "john" | `name:john*`
| 2 |
diff --git a/docs/articles/documentation/using-testcafe/using-testcafe-docker-image.md b/docs/articles/documentation/using-testcafe/using-testcafe-docker-image.md @@ -47,16 +47,44 @@ This command takes the following parameters:
You can run tests in the Chromium and Firefox browsers preinstalled to the Docker image. Add the `--no-sandbox` flag to Chromium if the container is run in the unprivileged mode.
- Use the [remote browser](command-line-interface.md#remote-browsers) to run tests on a mobile device. To do this, you need to add the `-P` flag to the `docker run` command and specify the `remote` keyword as the browser name.
-
- `docker run -v //d/tests:/tests -P -it testcafe/testcafe remote /tests/test.js`
-
You can pass a glob instead of the directory path in TestCafe parameters.
`docker run -v //d/tests:/tests -it testcafe/testcafe firefox /tests/**/*.js`
> If tests use other Node.js modules, these modules should be located in the tests directory or its child directories. TestCafe will not be able to find modules in the parent directories.
+## Testing in Remote Browsers
+
+You need to add the following options to the `docker run` command to run tests in a [remote browser](command-line-interface.md#remote-browsers), e.g. on a mobile device.
+
+* add the `-P` flag to publish all exposed ports;
+* use the [--hostname](command-line-interface.md#--hostname-name) TestCafe flag to specify the host machine name;
+* specify the `remote` keyword as the browser name.
+
+The example below shows a command that runs tests in a remote browser.
+
+```sh
+docker run -v /d/tests:/tests -P -it testcafe/testcafe --hostname $EXTERNAL_HOSTNAME remote /tests/test.js
+```
+
+where `$EXTERNAL_HOSTNAME` is the host machine name.
+
+If Docker reports that the default ports `1337` and `1338` are occupied by some other process, kill this process or choose different ports. Use the `netstat` command to determine which process occupies the default ports.
+
+OS | Command
+------- | ---------
+Windows | `netstat -ano`
+macOS | `netstat -anv`
+Linux | `netstat -anp`
+
+If you choose to use different ports, publish them in the Docker container (use the `-p` flag) and specify them to TestCafe (use the [--ports](command-line-interface.md#--ports-port1port2) option).
+
+```sh
+docker run -v /d/tests:/tests -p $PORT1 -p $PORT2 -it testcafe/testcafe --hostname $EXTERNAL_HOSTNAME --ports $PORT1,$PORT2 remote /tests/test.js
+```
+
+where `$PORT1` and `$PORT2` are vacant container's ports, `$EXTERNAL_HOSTNAME` is the host machine name.
+
## Testing Heavy Websites
If you are testing a heavy website, you may need to allocate extra resources for the Docker image.
| 0 |
diff --git a/src/components/Modeler.vue b/src/components/Modeler.vue @@ -236,14 +236,17 @@ export default {
/* Add all other elements */
+ const flowElements = process.get('flowElements');
+ const artifacts = process.get('artifacts');
+
+
/* First load the flow elements */
- process.get('flowElements')
+ flowElements
.filter(definition => definition.$type !== 'bpmn:SequenceFlow')
- .forEach(this.setNode);
+ .forEach((definition) => this.setNode(definition, flowElements, artifacts));
/* Then the sequence flows */
- process
- .get('flowElements')
+ flowElements
.filter(definition => {
if (definition.$type !== 'bpmn:SequenceFlow') {
return false;
@@ -251,17 +254,15 @@ export default {
return this.hasSourceAndTarget(definition);
})
- .forEach(this.setNode);
+ .forEach((definition) => this.setNode(definition, flowElements, artifacts));
/* Then the artifacts */
- process
- .get('artifacts')
+ artifacts
.filter(definition => definition.$type !== 'bpmn:Association')
- .forEach(this.setNode);
+ .forEach((definition) => this.setNode(definition, flowElements, artifacts));
/* Then the associations */
- process
- .get('artifacts')
+ artifacts
.filter(definition => {
if (definition.$type !== 'bpmn:Association') {
return false;
@@ -269,18 +270,29 @@ export default {
return this.hasSourceAndTarget(definition);
})
- .forEach(this.setNode);
+ .forEach((definition) => this.setNode(definition, flowElements, artifacts));
});
store.commit('highlightNode', this.processNode);
},
- setNode(definition) {
+ setNode(definition, flowElements, artifacts) {
+ /* Get the diagram element for the corresponding flow element node. */
+ const diagram = this.planeElements.find(diagram => diagram.bpmnElement.id === definition.id);
+
if (!this.parsers[definition.$type]) {
if (process.env.NODE_ENV !== 'production') {
/* eslint-disable-next-line no-console */
console.warn(`Unsupported element type in parse: ${definition.$type}`);
}
+ pull(flowElements, [
+ definition,
+ ...definition.get('incoming'),
+ ...definition.get('outgoing'),
+ ]);
+ pull(artifacts, definition);
+ pull(this.planeElements, diagram);
+
return;
}
@@ -294,9 +306,6 @@ export default {
definition.set('name', '');
}
- /* Get the diagram element for the corresponding flow element node. */
- const diagram = this.planeElements.find(diagram => diagram.bpmnElement.id === definition.id);
-
store.dispatch('addNode', {
type,
definition,
| 2 |
diff --git a/public/javascripts/SVValidate/src/data/Form.js b/public/javascripts/SVValidate/src/data/Form.js @@ -71,12 +71,12 @@ function Form(url) {
svv.panoramaContainer.reset();
svv.panoramaContainer.setLabelList(result.labels);
svv.panoramaContainer.loadNewLabelOntoPanorama();
- svv.modalMissionComplete.setProperty('clickable', true);
}
} else {
// Otherwise, display popup that says there are no more labels left.
svv.modalNoNewMission.show();
}
+ svv.modalMissionComplete.setProperty('clickable', true);
}
},
error: function (xhr, status, result) {
| 1 |
diff --git a/README.md b/README.md @@ -42,6 +42,7 @@ GET https://api.spacexdata.com/v2/launches/latest
"cores": [
{
"core_serial": "B1033",
+ "flight": 1,
"reused": false,
"land_success": false,
"landing_type": "ASDS",
@@ -49,6 +50,7 @@ GET https://api.spacexdata.com/v2/launches/latest
},
{
"core_serial": "B1025",
+ "flight": 2,
"reused": true,
"land_success": true,
"landing_type": "RTLS",
@@ -56,6 +58,7 @@ GET https://api.spacexdata.com/v2/launches/latest
},
{
"core_serial": "B1023",
+ "flight": 2,
"reused": true,
"land_success": true,
"landing_type": "RTLS",
@@ -102,7 +105,7 @@ GET https://api.spacexdata.com/v2/launches/latest
"reddit_recovery": null,
"reddit_media": "https://www.reddit.com/r/spacex/comments/7vimtm/rspacex_falcon_heavy_test_flight_media_thread/",
"presskit": "http://www.spacex.com/sites/spacex/files/falconheavypresskit_v1.pdf",
- "article_link": "",
+ "article_link": "https://spaceflightnow.com/2018/02/07/spacex-debuts-worlds-most-powerful-rocket-sends-tesla-toward-the-asteroid-belt/",
"video_link": "https://www.youtube.com/watch?v=wbSwFU6tY1c"
},
"details": "The launch was a success, and the side boosters landed simultaneously at adjacent ground pads. Drone ship landing of the central core is unconfirmed. Final burn to heliocentric mars-earth orbit is expected after the second stage and payload pass through the Van Allen belts, followed by payload separation."
| 3 |
diff --git a/scripts/create-secrets/prompts/inquirer-fuzzy-path.js b/scripts/create-secrets/prompts/inquirer-fuzzy-path.js @@ -53,11 +53,11 @@ class InquirerFuzzyPath extends InquirerAutocomplete {
const choice = this.currentChoices.getChoice(this.selected);
if (!choice) {
this.render(
- "You need to select a file. Make sure the json file is in current directory or its sub-directory"
+ "You need to select a file. Make sure the json file is in the current directory or its sub-directory"
);
return;
}
- var validationResult = this.opt.validate(
+ const validationResult = this.opt.validate(
this.currentChoices.getChoice(this.selected)
);
if (validationResult !== true) {
| 7 |
diff --git a/spec/models/carto/oauth_app_user_spec.rb b/spec/models/carto/oauth_app_user_spec.rb @@ -156,19 +156,22 @@ module Carto
@user = FactoryGirl.create(:valid_user)
@carto_user = Carto::User.find(@user.id)
@app = FactoryGirl.create(:oauth_app, user: @carto_user)
- @table = create_table(user_id: @carto_user.id)
+ @table1 = create_table(user_id: @carto_user.id)
+ @table2 = create_table(user_id: @carto_user.id)
end
after(:all) do
- @table.destroy
+ @table1.destroy
+ @table2.destroy
@app.destroy
@user.destroy
@carto_user.destroy
end
it 'creation and update' do
- dataset_scope = "datasets:rw:#{@table.name}"
- scopes = ['user:profile', dataset_scope]
+ dataset_scope1 = "datasets:rw:#{@table1.name}"
+ dataset_scope2 = "datasets:r:#{@table2.name}"
+ scopes = ['user:profile', dataset_scope1, dataset_scope2]
oau = OauthAppUser.create!(user: @carto_user, oauth_app: @app, scopes: scopes)
expect(oau.scopes).to(eq(scopes))
@@ -176,7 +179,7 @@ module Carto
oau.upgrade!([])
expect(oau.scopes).to(eq(scopes))
- oau.upgrade!([dataset_scope])
+ oau.upgrade!([dataset_scope1])
expect(oau.scopes).to(eq(scopes))
end
end
| 7 |
diff --git a/web/webpack.config.js b/web/webpack.config.js @@ -60,8 +60,7 @@ module.exports = function(env) {
__BASE_URL__: JSON.stringify("baseUrl" in env ? env.baseUrl : "/"),
__UI_API__: JSON.stringify(env.apiUrl || "https://ui.bitshares.eu/api"),
__TESTNET__: !!env.testnet
- }),
- new webpack.optimize.ModuleConcatenationPlugin()
+ })
];
if (env.prod) {
@@ -97,6 +96,7 @@ module.exports = function(env) {
minimize: true,
debug: false
}));
+ plugins.push(new webpack.optimize.ModuleConcatenationPlugin());
if (!env.noUgly) {
plugins.push(new webpack.optimize.UglifyJsPlugin({
| 5 |
diff --git a/articles/libraries/lock/v11/configuration.md b/articles/libraries/lock/v11/configuration.md @@ -525,10 +525,6 @@ For more details about supported parameters check the [Authentication Parameters
Defaults to true. When set to true, redirect mode will be used. If set to false, [popup mode](/libraries/lock/v11/authentication-modes#popup-mode) is chosen.
-::: warning
-There is a known bug that prevents popup mode from functioning properly in Android or Firefox on iOS, and in Internet Explorer under certain circumstances. As such we recommend either only using redirect mode or detecting these special cases and selectively enabling redirect mode.
-:::
-
```js
var options = {
auth: {
| 2 |
diff --git a/src/templates/workshop.js b/src/templates/workshop.js import React, { Component, Fragment } from 'react'
+import styled from 'styled-components'
import {
Box,
Container,
@@ -32,20 +33,16 @@ import Footer from 'components/Footer'
import { lowerCase, camelCase, isEmpty } from 'lodash'
import { org } from 'data.json'
-const NotOnPrint = Box.extend`
+const NotOnPrint = styled(Box)`
@media print {
- {
display: none !important;
}
- }
`
-const OnlyOnPrint = Box.extend`
+const OnlyOnPrint = styled(Box)`
display: none !important;
@media print {
- {
- display: initial !important;
- }
+ display: block !important;
}
`
@@ -53,23 +50,30 @@ const Header = Box.withComponent('header').extend`
li a,
h2,
p {
- text-shadow: 0 1px 2px rgba(0, 0, 0, 0.32);
+ text-shadow: 0 1px 2px rgba(0, 0, 0, 0.375);
}
`
-const Name = Heading.h1.extend`
- background-color: white;
- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.32);
+const Name = styled(Heading.h1)`
+ background-color: ${({ theme }) => theme.colors.white};
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
clip-path: polygon(4% 0%, 100% 0%, 96% 100%, 0% 100%);
color: black;
display: inline-block;
mix-blend-mode: screen;
padding-left: ${({ theme }) => theme.space[4]}px;
padding-right: ${({ theme }) => theme.space[4]}px;
+ width: min-content;
+ ${({ theme }) => theme.mediaQueries.sm} {
width: max-content;
+ }
`
-const Body = Container.withComponent(MarkdownBody)
+const Body = Container.withComponent(MarkdownBody).extend`
+ @media print {
+ max-width: none !important;
+ }
+`
A.link = A.withComponent(Link)
Section.h = Section.withComponent('header')
@@ -228,7 +232,7 @@ export default ({ data }) => {
style={{ backgroundImage: `url('${bg}')`, position: 'relative' }}
>
<Container pt={5} pb={3} px={2}>
- <Breadcrumbs align="center" justify="center" my={3} wrap>
+ <Breadcrumbs align="center" justify="center" mt={3} wrap>
<Breadcrumb to="/workshops" name="Workshops" position={1} />
<BreadcrumbDivider />
<Breadcrumb
@@ -239,7 +243,7 @@ export default ({ data }) => {
<BreadcrumbDivider />
<Breadcrumb to={slug} name={name} position={3} bold={false} />
</Breadcrumbs>
- <Name f={6} mb={2} children={name} />
+ <Name f={6} my={3} children={name} />
<Heading.h2 f={4} children={description} />
<Text f={2} caps mt={3} children={linkAuthor(author)} />
</Container>
@@ -258,23 +262,22 @@ export default ({ data }) => {
</Flex>
</Header>
</NotOnPrint>
- <OnlyOnPrint>
- <Text align="right">
+ <OnlyOnPrint p={3}>
+ <Flex align="center" justify="flex-end" my={3}>
<Image
src="/logo-red.svg"
w={`${theme.space[6]}px`}
- style={{ display: 'inline' }}
+ mr={3}
alt="Hack Club logo"
- />{' '}
+ />
<strong>Computer Science Tutorials</strong>
+ </Flex>
+ <Heading.h1 mt={4} mb={3} children={name} />
+ <Heading.h2 f={4} children={description} />
+ <Text color="muted" my={3} children={linkAuthor(author)} />
+ <Text color="muted">
+ You can find this tutorial online at <u>{url}</u>
</Text>
- <Heading.h1 pt={4}>{name}</Heading.h1>
- <Heading.h4 color="gray.7">{description}</Heading.h4>
- <Text color="gray.5">{linkAuthor(author)}</Text>
- <Text color="gray.9" py={2}>
- You can find this tutorial online at <em>{url}</em>
- </Text>
- <hr />
</OnlyOnPrint>
<Box w={1} className="invert">
<Body maxWidth={48} p={3} dangerouslySetInnerHTML={{ __html: html }} />
| 7 |
diff --git a/src/extensions/default/HTMLCodeHints/HtmlAttributes.json b/src/extensions/default/HTMLCodeHints/HtmlAttributes.json "dir": { "attribOption": ["ltr", "rtl"], "global": "true"},
"draggable": { "attribOption": ["auto", "false", "true"], "global": "true" },
"dropzone": { "attribOption": ["copy", "move", "link"], "global": "true" },
- "hidden": { "attribOption": ["hidden"], "global": "true" },
+ "hidden": { "attribOption": [], "type": "flag", "global": "true" },
"id": { "attribOption": [], "global": "true", "type": "cssId" },
"lang": { "attribOption": ["ab", "aa", "af", "sq", "am", "ar", "an", "hy", "as", "ay", "az", "ba", "eu", "bn", "dz", "bh", "bi", "br",
"bg", "my", "be", "km", "ca", "zh", "co", "hr", "cs", "da", "nl", "en", "eo", "et", "fo", "fa", "fi", "fr",
| 12 |
diff --git a/scene-previewer.js b/scene-previewer.js @@ -95,8 +95,6 @@ class ScenePreviewer {
this.cubeCamera.update(renderer, this.previewScene);
}
};
-// const createScenePreviewer = () => new ScenePreviewer();
export {
ScenePreviewer,
- // createScenePreviewer,
};
\ No newline at end of file
| 2 |
diff --git a/tests/typed_blocks/type_unification_test.js b/tests/typed_blocks/type_unification_test.js @@ -343,8 +343,8 @@ function test_type_unification_lambdaStructure() {
var block = workspace.newBlock('lambda_typed');
var var1 = workspace.newBlock('variables_get_typed');
// Set the same variable name with the name of lambda's argument.
- var variableName = block.getField('VAR').getVariableName();
- setVariableName(var1, 'VAR', variableName);
+ setVariableName(block, 'VAR', 'x');
+ setVariableName(var1, 'VAR', 'x');
block.getInput('RETURN').connection.connect(var1.outputConnection);
assertEquals(var1.getField('VAR').getText(),
block.getField('VAR').getText());
| 1 |
diff --git a/layouts/partials/head.html b/layouts/partials/head.html <meta property="og:image" content="{{ .Site.Params.image }}">
<meta property="og:site_name" content="{{ .Site.Title }}">
<meta property="og:type" content="website">
+ <meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:title" content="{{ $title }}" />
+ <meta name="twitter:description" content="{{ .Site.Params.Description }}" />
+ <meta name="twitter:url" content="{{ .URL | absURL }}" />
+ <meta name="twitter:image" content="{{ .Site.Params.image }}">
{{ with .Site.Params.name -}}<meta name="author" content="{{ . }}">{{- end }}
{{ .Hugo.Generator }}
| 0 |
diff --git a/src/Expression.js b/src/Expression.js @@ -21,6 +21,7 @@ export class Expression {
this.params = params
this.table = model.table
+ this.already = {} // Fields already processed
this.conditions = [] // Condition expressions
this.filters = [] // Filter expressions
this.key = {} // Primary key attribute
@@ -62,10 +63,32 @@ export class Expression {
prepare() {
let {op, properties} = this
let fields = this.model.block.fields
+ if (op == 'find') {
+ this.addFilters()
+
+ } else if (op == 'delete' || op == 'put' || op == 'update') {
+ this.addConditions(op)
+
+ } else if (op == 'scan') {
+ this.addFilters()
+ /*
+ Setup scan filters for properties outside the model.
+ Use the property name here as there can't be a mapping.
+ */
+ for (let [name, value] of Object.entries(this.properties)) {
+ if (fields[name] == null && value != null) {
+ this.addFilter(name, value)
+ }
+ }
+ }
+
/*
Parse the API properties. Only accept properties defined in the schema unless generic.
*/
for (let [name, value] of Object.entries(properties)) {
+ if (this.already[name]) {
+ continue
+ }
if (fields[name]) {
this.add(fields[name], value)
} else if (this.model.generic) {
@@ -86,24 +109,6 @@ export class Expression {
this.add({attribute: [k], name: k, filter: false}, v, properties)
}
}
- if (op == 'find') {
- this.addFilters()
-
- } else if (op == 'delete' || op == 'put' || op == 'update') {
- this.addConditions(op)
-
- } else if (op == 'scan') {
- this.addFilters()
- /*
- Setup scan filters for properties outside the model.
- Use the property name here as there can't be a mapping.
- */
- for (let [name, value] of Object.entries(this.properties)) {
- if (fields[name] == null && value != null) {
- this.addFilter(name, value)
- }
- }
- }
if (this.params.fields) {
for (let name of this.params.fields) {
let att = fields[name].attribute[0]
@@ -210,8 +215,7 @@ export class Expression {
let fields = this.model.block.fields
// Expand attribute references and make attribute name
where = where.toString().replace(/\${(.*?)}/g, (match, varName) => {
- let ref = this.makeTarget(fields, varName)
- return ref
+ return this.makeTarget(fields, varName)
})
// Expand value references and make attribute values
where = where.replace(/{(.*?)}/g, (match, value) => {
@@ -305,12 +309,14 @@ export class Expression {
let fields = this.model.block.fields
if (params.add) {
for (let [key, value] of Object.entries(params.add)) {
+ this.already[key] = true
let target = this.makeTarget(fields, key)
updates.add.push(`${target} :_${this.addValue(value)}`)
}
} else if (params.delete) {
for (let [key, value] of Object.entries(params.delete)) {
+ this.already[key] = true
let target = this.makeTarget(fields, key)
updates.delete.push(`${target} :_${this.addValue(value)}`)
}
@@ -320,12 +326,14 @@ export class Expression {
params.remove = [params.remove]
}
for (let key of params.remove) {
+ this.already[key] = true
let target = this.makeTarget(fields, key)
updates.remove.push(`${target}`)
}
} else if (params.set) {
for (let [key, value] of Object.entries(params.set)) {
+ this.already[key] = true
let target = this.makeTarget(fields, key)
// If value is number of simple string then don't expand
if (value.toString().match(/\${.*?}|{.*?}/)) {
| 1 |
diff --git a/token-metadata/0x24e96809B4E720Ea911bc3De8341400E26d6E994/metadata.json b/token-metadata/0x24e96809B4E720Ea911bc3De8341400E26d6E994/metadata.json "symbol": "VRTN",
"address": "0x24e96809B4E720Ea911bc3De8341400E26d6E994",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/matrix/net/HomeServerApi.ts b/src/matrix/net/HomeServerApi.ts @@ -28,7 +28,7 @@ type RequestMethod = "POST" | "GET" | "PUT";
const CS_R0_PREFIX = "/_matrix/client/r0";
const DEHYDRATION_PREFIX = "/_matrix/client/unstable/org.matrix.msc2697.v2";
-type Ctor = {
+type Options = {
homeserver: string;
accessToken: string;
request: RequestFunction;
| 10 |
diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js @@ -321,11 +321,6 @@ httpsPromise.then(function(startupHttps) {
settings.userDir = parsedArgs.userDir;
}
- if (!settings.userDir) {
- console.log("No Node-RED userDir set, exiting")
- process.exit(1)
- }
-
try {
RED.init(server,settings);
} catch(err) {
| 2 |
diff --git a/generators/common/templates/sonar-project.properties.ejs b/generators/common/templates/sonar-project.properties.ejs @@ -30,18 +30,18 @@ sonar.exclusions=<%= CLIENT_MAIN_SRC_DIR %>content/**/*.*, <%= CLIENT_MAIN_SRC_D
sonar.issue.ignore.multicriteria=<%_ if (!skipServer) { _%>S3437,<% if (authenticationType === 'jwt') { %>S4502,<% } %>S4684,UndocumentedApi<%_ } _%>
<%_ if (!skipServer) { _%>
-# Rule https://sonarcloud.io/coding_rules?open=squid%3AS3437&rule_key=squid%3AS3437 is ignored, as a JPA-managed field cannot be transient
+# Rule https://rules.sonarsource.com/java/RSPEC-3437 is ignored, as a JPA-managed field cannot be transient
sonar.issue.ignore.multicriteria.S3437.resourceKey=<%= MAIN_DIR %>java/**/*
sonar.issue.ignore.multicriteria.S3437.ruleKey=squid:S3437
-# Rule https://sonarcloud.io/coding_rules?open=squid%3AUndocumentedApi&rule_key=squid%3AUndocumentedApi is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names should be self-explanatory
+# Rule https://rules.sonarsource.com/java/RSPEC-1176 is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names should be self-explanatory
sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey=<%= MAIN_DIR %>java/**/*
sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey=squid:UndocumentedApi
<%_ if (authenticationType === 'jwt') { _%>
-# Rule https://sonarcloud.io/coding_rules?open=squid%3AS4502&rule_key=squid%3AS4502 is ignored, as for JWT tokens we are not subject to CSRF attack
+# Rule https://rules.sonarsource.com/java/RSPEC-4502 is ignored, as for JWT tokens we are not subject to CSRF attack
sonar.issue.ignore.multicriteria.S4502.resourceKey=<%= MAIN_DIR %>java/**/*
sonar.issue.ignore.multicriteria.S4502.ruleKey=squid:S4502
<%_ } _%>
-# Rule https://sonarcloud.io/coding_rules?open=java%3AS4684&rule_key=java%3AS4684
+# Rule https://rules.sonarsource.com/java/RSPEC-4684
sonar.issue.ignore.multicriteria.S4684.resourceKey=<%= MAIN_DIR %>java/**/*
sonar.issue.ignore.multicriteria.S4684.ruleKey=java:S4684
<%_ } _%>
| 3 |
diff --git a/website/lexonomy.py b/website/lexonomy.py @@ -611,7 +611,9 @@ def publicentry(dictID, entryID):
elif "_css" in configs["xemplate"]:
html = xml
else:
- html = "<script type='text/javascript'>$('#viewer').html(Xemplatron.xml2html('"+re.sub(r"'","\\'", xml)+"', "+json.dumps(configs["xemplate"])+", "+json.dumps(configs["xema"])+"));</script>"
+ entrydata = re.sub(r"'", "\\'", xml)
+ entrydata = re.sub(r"\n", " ", entrydata)
+ html = "<script type='text/javascript'>$('#viewer').html(Xemplatron.xml2html('"+entrydata+"', "+json.dumps(configs["xemplate"])+", "+json.dumps(configs["xema"])+"));</script>"
#rewrite xemplatron to python, too?
css = ""
if "_css" in configs["xemplate"]:
| 1 |
diff --git a/articles/cross-origin-authentication/index.md b/articles/cross-origin-authentication/index.md @@ -31,9 +31,9 @@ Configuring your client for cross-origin authentication is a process that requir
1. In the [client settings](${manage_url}/#/applications/${account.clientId}/settings) for your application, click **Show Advanced Settings** > **OAuth** and find the **Cross Origin Authentication Mode** switch. Ensure that the switch is in the on position.
1. Also ensure that the **OIDC Conformant** switch is toggled on in the same settings panel.
- ::: zoomable
+
- :::
+
1. Ensure that your application is using [Lock](/libraries/lock) version 10.22 or higher, or [Auth0.js](/libraries/auth0js) version 8.7 or higher.
1. If you are using Lock, make sure that you are using the [oidcconformant](/libraries/lock/v10/customization#oidcconformant-boolean-) option.
1. Third-party cookies do not work in some browsers. To handle these cases, you will need to author a page which uses **auth0.js** to act as a fallback for the cross-origin transaction. More information on setting up this page is provided below.
| 2 |
diff --git a/js/views/search/Results.js b/js/views/search/Results.js @@ -67,7 +67,8 @@ export default class extends baseVw {
renderCards(models) {
const resultsFrag = document.createDocumentFragment();
const end = this.pageSize * (Number(this.serverPage) + 1) - (this.pageSize - models.length);
- const start = end - this.pageSize + 1;
+ let start = end - this.pageSize + 1;
+ start = start > 0 ? start : 1;
const total = models.total;
this.morePages = models.morePages;
| 12 |
diff --git a/src/index.html b/src/index.html </table>
<div>
<button class="wButton wButton-neg fade" type="submit">SUBMIT</button><span class="divider-2"></span>
- <button class="wButton wButton-neg fade" type="button" ng-click="ctrl.resetForm()">CANCEL</button>
+ <button class="wButton wButton-neg fade" type="button" ng-click="ctrl.resetForm()">CLEAR</button>
</div>
</form>
| 10 |
diff --git a/OurUmbraco.Site/Views/Partials/Documentation/Breadcrumb.cshtml b/OurUmbraco.Site/Views/Partials/Documentation/Breadcrumb.cshtml }
}
- @if (!absolutePath.EndsWith("/"))
+ @if (!absolutePath.Contains("-v"))
+ {
+ if (!absolutePath.EndsWith("/"))
{
<li>@absolutePath.Substring(absolutePath.LastIndexOf('/') + 1).RemoveDash().UnderscoreToDot().EnsureCorrectDocumentationText()</li>
}
+ }
+
| 2 |
diff --git a/src/android/java/io/jxcore/node/SurroundingStateObserver.java b/src/android/java/io/jxcore/node/SurroundingStateObserver.java @@ -8,9 +8,20 @@ import org.thaliproject.p2p.btconnectorlib.PeerProperties;
public interface SurroundingStateObserver {
-
+ /**
+ * Notifies node layer about peer changes detected on native Android layer
+ *
+ * @param peerProperties Peer properties of new/updated/lost peer.
+ * @param isAvailable If true, peer is available. False otherwise.
+ */
void notifyPeerAvailabilityChanged(PeerProperties peerProperties, boolean isAvailable);
+ /**
+ * Notifies about discovery and/or advertising changes
+ *
+ * @param isDiscoveryActive We are currently discovering if true. False otherwise.
+ * @param isAdvertisingActive We are currently advertising if true. False otherwise.
+ */
void notifyDiscoveryAdvertisingStateUpdateNonTcp(boolean isDiscoveryActive, boolean isAdvertisingActive);
/**
@@ -20,6 +31,10 @@ public interface SurroundingStateObserver {
* that the Wi-Fi isn't currently connected to an access point.
* If non-null then this is the BSSID of the access point that Wi-Fi
* is connected to.
+ * @param ssidName If null this value indicates that either wifiRadioOn is not 'on' or
+ * that the Wi-Fi isn't currently connected to an access point.
+ * If non-null then this is the SSID of the access point that Wi-Fi
+ * is connected to.
*/
void notifyNetworkChanged(boolean isBluetoothEnabled, boolean isWifiEnabled, String bssidName, String ssidName);
| 0 |
diff --git a/snowpack/src/types.ts b/snowpack/src/types.ts @@ -133,11 +133,18 @@ export interface PluginLoadOptions {
}
export interface PluginTransformOptions {
+ /** The absolute file path of the source file, on disk. */
id: string;
+ /** The extension of the file */
fileExt: string;
+ /** Contents of the file to transform */
contents: string | Buffer;
+ /** True if builder is in dev mode (`snowpack dev` or `snowpack build --watch`) */
isDev: boolean;
+ /** True if HMR is enabled (add any HMR code to the output here). */
isHmrEnabled: boolean;
+ /** True if builder is in SSR mode */
+ isSSR: boolean;
}
export interface PluginRunOptions {
| 0 |
diff --git a/packages/eslint-plugin-orbit-components/package.json b/packages/eslint-plugin-orbit-components/package.json ],
"scripts": {
"build": "rm -fr ./dist && babel ./src --extensions '.ts' --out-dir ./dist",
- "prepublishOnly": "build"
+ "prepublishOnly": "yarn build"
},
"devDependencies": {
"@babel/preset-env": "^7.12.11",
| 1 |
diff --git a/packages/component-library/src/Sandbox/Sandbox.js b/packages/component-library/src/Sandbox/Sandbox.js import React from 'react';
import { css } from 'emotion';
-import Dropdown from '../Dropdown/Dropdown';
import BaseMap from '../BaseMap/BaseMap';
import CivicSandboxMap from '../CivicSandboxMap/CivicSandboxMap';
import CivicSandboxTooltip from '../CivicSandboxMap/CivicSandboxTooltip';
import SandboxDrawer from './SandboxDrawer';
-const drops = css(`
- flex-grow: 1;
- width: 40%;
+const baseMapWrapper = css(`
+ height: 80vh;
+ min-height: 650px;
`);
const Sandbox = ({
data,
- defaultSlides,
- drawerVisible,
- fetchSlideDataByDate,
layerData,
- mapboxStyle,
- mapboxToken,
- selectedFoundation,
- foundationData,
+ defaultFoundation,
+ defaultSlides,
selectedPackage,
+ selectedFoundation,
selectedSlide,
+ foundationData,
slideData,
- styles,
- toggleDrawer,
- updateFoundation,
updatePackage,
- updateSlide,
- defaultFoundation,
+ updateFoundation,
+ updateSlideCheckbox,
+ fetchSlideDataByDate,
+ drawerVisible,
+ toggleDrawer,
+ mapboxStyle,
+ styles,
onFoundationClick,
onSlideHover,
tooltipInfo,
+ allSlides
}) => {
return (
<div className={styles}>
@@ -49,52 +48,10 @@ const Sandbox = ({
}
`)}
>
- <div className={drops}>
- <span
- className={css(`
- color: #555;
- text-transform: uppercase;
- margin: 0 10px;
- `)}
- >
- Data Collection
- </span>
- <Dropdown
- value={selectedPackage}
- options={Object.keys(data.packages).map(p => ({
- value: p,
- label: p,
- }))}
- onChange={updatePackage}
- simpleValue
- />
- </div>
- <div className={drops}>
- <span
- className={css(`
- color: #555;
- text-transform: uppercase;
- margin: 0 10px;
- `)}
- >
- Base Map
- </span>
- <Dropdown
- value={selectedFoundation}
- options={data.packages[selectedPackage].foundations.map(
- foundation => ({
- value: foundation,
- label: data.foundations[foundation].name,
- })
- )}
- onChange={updateFoundation}
- simpleValue
- />
- </div>
<SandboxDrawer
data={data}
selectedSlide={selectedSlide}
- onChange={updateSlide}
+ onChangeCheckbox={updateSlideCheckbox}
selectedPackage={selectedPackage}
toggleDrawer={toggleDrawer}
drawerVisible={drawerVisible}
@@ -104,15 +61,18 @@ const Sandbox = ({
selectedFoundation={selectedFoundation}
foundationData={foundationData}
defaultFoundation={defaultFoundation}
+ allSlides={allSlides}
+ updatePackage={updatePackage}
+ updateFoundation={updateFoundation}
/>
</div>
- <div>
+ <div className={baseMapWrapper}>
<BaseMap
- mapboxStyle={mapboxStyle}
+ mapboxStyle={"mapbox://styles/mapbox/dark-v9"}
initialZoom={10.5}
initialLatitude={45.5431}
- initialLongitude={-122.7465}
- height={575}
+ initialLongitude={-122.5765}
+ useContainerHeight
>
<CivicSandboxMap
mapLayers={layerData}
@@ -129,23 +89,26 @@ const Sandbox = ({
Sandbox.propTypes = {
data: React.PropTypes.object.isRequired,
- defaultSlides: React.PropTypes.array.isRequired,
- drawerVisible: React.PropTypes.bool,
- fetchSlideDataByDate: React.PropTypes.func,
layerData: React.PropTypes.array.isRequired,
- mapboxStyle: React.PropTypes.string,
- selectedFoundation: React.PropTypes.string,
- selectedPackage: React.PropTypes.string,
- selectedSlide: React.PropTypes.array,
+ defaultFoundation: React.PropTypes.object.isRequired,
+ defaultSlides: React.PropTypes.array.isRequired,
+ selectedPackage: React.PropTypes.string.isRequired,
+ selectedFoundation: React.PropTypes.string.isRequired,
+ selectedSlide: React.PropTypes.array.isRequired,
+ foundationData: React.PropTypes.object.isRequired,
slideData: React.PropTypes.array.isRequired,
- styles: React.PropTypes.string,
- toggleDrawer: React.PropTypes.func.isRequired,
- updateFoundation: React.PropTypes.func.isRequired,
updatePackage: React.PropTypes.func.isRequired,
- updateSlide: React.PropTypes.func.isRequired,
+ updateFoundation: React.PropTypes.func.isRequired,
+ updateSlideCheckbox: React.PropTypes.func.isRequired,
+ fetchSlideDataByDate: React.PropTypes.func.isRequired,
+ drawerVisible: React.PropTypes.bool.isRequired,
+ toggleDrawer: React.PropTypes.func.isRequired,
+ mapboxStyle: React.PropTypes.string,
+ styles: React.PropTypes.string,
onFoundationClick: React.PropTypes.func,
- defaultFoundation: React.PropTypes.object.isRequired,
- foundationData: React.PropTypes.object.isRequired,
+ onSlideHover: React.PropTypes.func,
+ tooltipInfo: React.PropTypes.array,
+ allSlides: React.PropTypes.array.isRequired,
};
export default Sandbox;
| 2 |
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml @@ -5,6 +5,17 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
+ - uses: hmarr/[email protected]
+ if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+ with:
+ github-token: "${{ secrets.GITHUB_TOKEN }}"
+ - name: Label when approved
+ uses: bdougie/label-when-approved-action@master
+ if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+ env:
+ APPROVALS: "1"
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ ADD_LABEL: "automerge"
- name: automerge
uses: bdougie/automerge-action@de631dd9e7650aebeeb115e3fdd7377526bc40d3
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
| 13 |
diff --git a/scenes/street.scn b/scenes/street.scn "quaternion": [0, 0, 0, 1],
"start_url": "https://webaverse.github.io/plants/"
},
+ {
+ "position": [0, 0, 0],
+ "quaternion": [0, 0, 0, 1],
+ "start_url": "https://webaverse.github.io/dual-contouring-terrain/"
+ },
{
"position": [
-95,
| 0 |
diff --git a/guide/popular-topics/canvas.md b/guide/popular-topics/canvas.md @@ -156,7 +156,7 @@ client.on('guildMemberAdd', async member => {
</branch>
-Now, you need to load the image you want to use into Canvas. In order to have more sufficient coverage, we'll first show you how to load a basic image from a local directory. We'll be using [this image](~@/images/canvas.jpg) as the background in the welcome image, but you can use whatever you want. Be sure to download the file, name it `wallpaper.jpg`, and save it inside the same directory as your main bot file.
+Now, you need to load the image you want to use into Canvas. In order to have more sufficient coverage, we'll first show you how to load a basic image from a local directory. We'll be using [this image](https://github.com/discordjs/guide/blob/master/guide/images/canvas.jpg) as the background in the welcome image, but you can use whatever you want. Be sure to download the file, name it `wallpaper.jpg`, and save it inside the same directory as your main bot file.
<branch version="11.x">
| 1 |
diff --git a/test/unit/sql/sync.js b/test/unit/sql/sync.js @@ -6,13 +6,8 @@ module.exports = function() {
var Sync = require(path.resolve(basePath + '/lib/sync'));
describe('Sync', function() {
-
- var stubSync = function(idAttribute) {
+ var stubModel = function(idAttribute) {
var qd = [];
- var stubQuery = function() {
- qd.push(_.toArray(arguments));
- return this;
- };
return {
idAttribute: idAttribute || 'id',
@@ -50,7 +45,7 @@ module.exports = function() {
describe('prefixFields', function() {
it('should prefix all keys of the passed in object with the tablename', function() {
- var sync = new Sync(stubSync());
+ var sync = new Sync(stubModel());
var attributes = {
'some': 'column',
'another': 'column'
@@ -67,7 +62,7 @@ module.exports = function() {
'Some': 'column',
'Another': 'column'
};
- var sync = new Sync(_.extend(stubSync(), {
+ var sync = new Sync(_.extend(stubModel(), {
format: function(attrs) {
var data = {};
for (var key in attrs) {
@@ -89,7 +84,7 @@ module.exports = function() {
it('should format attributes for updates, including id attribute', function(done) {
var snakeCase = _.snakeCase;
- var stubModelInstance = _.extend(stubSync('idAttribute'), {
+ var stubModelInstance = _.extend(stubModel('idAttribute'), {
format: function(attrs) {
var data = {};
for (var key in attrs) {
@@ -98,22 +93,14 @@ module.exports = function() {
return data;
}
});
-
var updateFields = {
someColumn: 'updated',
otherColumn: 'updated'
};
stubModelInstance._query.update = function(attrs) {
- expect(stubModelInstance.getWhereParts()).to.eql([
- { id_attribute: 'pk' }
- ]);
-
- expect(attrs).to.eql({
- 'some_column': 'updated',
- 'other_column': 'updated'
- });
-
+ expect(stubModelInstance.getWhereParts()).to.eql([{id_attribute: 'pk'}]);
+ expect(attrs).to.eql({'some_column': 'updated', 'other_column': 'updated'});
done()
}
@@ -123,8 +110,7 @@ module.exports = function() {
it('should format id attribute for deletes', function(done) {
var snakeCase = _.snakeCase;
-
- var stubModelInstance = _.extend(stubSync('idAttribute'), {
+ var stubModelInstance = _.extend(stubModel('idAttribute'), {
idAttribute: 'idAttribute',
format: function(attrs) {
var data = {};
@@ -136,23 +122,18 @@ module.exports = function() {
})
stubModelInstance._query.del = function() {
- expect(stubModelInstance.getWhereParts()).to.eql([
- { id_attribute: 'pk' }
- ]);
-
+ expect(stubModelInstance.getWhereParts()).to.eql([{id_attribute: 'pk'}]);
done()
}
var sync = new Sync(stubModelInstance);
sync.del()
-
});
-
});
describe('update', function() {
it('doesn\'t try to update the primary key if it hasn\'t changed', function() {
- var sync = new Sync(stubSync());
+ var sync = new Sync(stubModel());
_.extend(sync.query, {
update: function(attrs) {
expect(attrs).to.not.have.property('id');
@@ -166,7 +147,7 @@ module.exports = function() {
});
it('will update the primary key if it has changed', function() {
- var sync = new Sync(stubSync());
+ var sync = new Sync(stubModel());
_.extend(sync.query, {
update: function(attrs) {
expect(attrs).to.have.property('id');
| 10 |
diff --git a/docs/releasing/publishing-from-a-support-branch.md b/docs/releasing/publishing-from-a-support-branch.md @@ -22,13 +22,13 @@ However, this approach has risks. For example, it creates a messy commit history
1. At stand-up, person leading the release (usually a developer) to tell the GOV.UK Design System team we are close to releasing.
2. Developers to raise new issues in the team GitHub repositories ([govuk-frontend](https://github.com/alphagov/govuk-frontend), [govuk-frontend-docs](https://github.com/alphagov/govuk-frontend-docs), [govuk-prototype-kit](https://github.com/alphagov/govuk-prototype-kit)) to:
- - create announcement draft for the new release (example card: [#2108](https://github.com/alphagov/govuk-frontend/issues/2108))
- - create release notes for the new release (example card: [#1986](https://github.com/alphagov/govuk-frontend/issues/1986))
- - create release notes for the new release of GOV.UK Prototype Kit (example card: [#958](https://github.com/alphagov/govuk-prototype-kit/issues/958))
- - create a card for the new release of GOV.UK Frontend (example card: [#1987](https://github.com/alphagov/govuk-frontend/issues/1987))
- - update the GOV.UK Design System to use the new release of GOV.UK Frontend (example card: [#1347](https://github.com/alphagov/govuk-design-system/issues/1347))
- - create a card for the new release of GOV.UK Prototype Kit (example card: [#917](https://github.com/alphagov/govuk-prototype-kit/issues/917))
- - update the GOV.UK Prototype Kit to use the new release (example card: [#923](https://github.com/alphagov/govuk-prototype-kit/issues/923))
+ - create announcement draft for the new release (example issue: [#2108](https://github.com/alphagov/govuk-frontend/issues/2108))
+ - create release notes for the new release (example issue: [#1986](https://github.com/alphagov/govuk-frontend/issues/1986))
+ - create release notes for the new release of GOV.UK Prototype Kit (example issue: [#958](https://github.com/alphagov/govuk-prototype-kit/issues/958))
+ - create an issue for the new release of GOV.UK Frontend (example issue: [#1987](https://github.com/alphagov/govuk-frontend/issues/1987))
+ - update the GOV.UK Design System to use the new release of GOV.UK Frontend (example issue: [#1347](https://github.com/alphagov/govuk-design-system/issues/1347))
+ - create an issue for the new release of GOV.UK Prototype Kit (example issue: [#917](https://github.com/alphagov/govuk-prototype-kit/issues/917))
+ - update the GOV.UK Prototype Kit to use the new release (example issue: [#923](https://github.com/alphagov/govuk-prototype-kit/issues/923))
3. Person leading the release to add the issues to the [Design System sprint board](https://github.com/orgs/alphagov/projects/4).
@@ -129,7 +129,7 @@ Note: Before you go on annual leave, tell the delivery manager who will be looki
2. On the [Design System Kanban Board](https://github.com/orgs/alphagov/projects/4):
- - move any relevant cards from the 'Ready to Release' column to 'Done'
+ - move any relevant issues from the 'Ready to Release' column to 'Done'
- close any associated milestones
## Update the `main` branch
| 14 |
diff --git a/storage-providers/appsensor-storage-influxdb/src/main/java/org/owasp/appsensor/storage/influxdb/Utils.java b/storage-providers/appsensor-storage-influxdb/src/main/java/org/owasp/appsensor/storage/influxdb/Utils.java @@ -34,7 +34,7 @@ public class Utils {
// fields / tags
public static final String LABEL = "label";
public static final String USERNAME = "username";
- public static final String TIMESTAMP = "timestamp";
+ public static final String TIMESTAMP = "time";
public static final String DETECTION_SYSTEM = "detectionSystem";
public static final String CATEGORY = "category";
public static final String THRESHOLD_COUNT = "thresholdCount";
| 1 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -428,7 +428,11 @@ def process_fastq_file(job, fastq_data_stream, session, url):
try:
line_index = 0
for encoded_line in fastq_data_stream.stdout:
+ try:
line = encoded_line.decode('utf-8')
+ except UnicodeDecodeError:
+ errors['readname_encoding'] = 'Error occured, while decoding the readname string.'
+ else:
line_index += 1
if line_index == 1:
old_illumina_current_prefix = \
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.