code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/site/_data/contributors.js b/site/_data/contributors.js const got = require('got');
module.exports = async function() {
+ try {
const response = await got(
'https://api.github.com/repos/stefanjudis/tiny-helpers/contributors'
);
@@ -8,4 +9,7 @@ module.exports = async function() {
return JSON.parse(response.body)
.map(contributor => contributor.login)
.filter(contributor => contributor !== 'stefanjudis');
+ } catch (e) {
+ return [];
+ }
};
| 9 |
diff --git a/package.json b/package.json "browserify-shim": "3.8.12",
"camshaft-reference": "0.32.0",
"carto": "cartodb/carto#master",
- "cartodb-deep-insights.js": "cartodb/deep-insights.js#12177-timeseries-context-menu",
+ "cartodb-deep-insights.js": "cartodb/deep-insights.js#master",
"cartodb-pecan": "0.2.x",
"cartodb.js": "CartoDB/cartodb.js#v4",
"cartocolor": "4.0.0",
| 3 |
diff --git a/assets/js/modules/analytics/dashboard/dashboard-widget-top-level.js b/assets/js/modules/analytics/dashboard/dashboard-widget-top-level.js @@ -273,7 +273,7 @@ export default withData(
data: {
url: googlesitekit.permaLink,
},
- priority: 10,
+ priority: 1,
maxAge: getTimeInSeconds( 'hour' ),
context: 'Dashboard',
toState( state, { data } ) {
| 13 |
diff --git a/scripts/cl_ui.lua b/scripts/cl_ui.lua +local isRDR = not TerraingridActivate and true or false
+local dismissKey
+local dismissKeyGroup
+if isRDR then
+ dismissKey = 0xD9D0E1C0
+ dismissKeyGroup = 1
+else
+ dismissKey = 22
+ dismissKeyGroup = 0
+end
+
function openWarning(author, reason, tTitle, tWarnedBy, tInstructions)
SendNUIMessage({
type = 'open_warning',
@@ -7,12 +18,13 @@ function openWarning(author, reason, tTitle, tWarnedBy, tInstructions)
tWarnedBy = tWarnedBy,
tInstructions = tInstructions
})
+
Citizen.CreateThread(function()
local countLimit = 100 --10 seconds
local count = 0
while true do
Citizen.Wait(100)
- if IsControlPressed(0, 22) then
+ if IsControlPressed(dismissKeyGroup, dismissKey) then
count = count +1
if count >= countLimit then
SendNUIMessage({type = 'close_warning'})
| 0 |
diff --git a/content/articles/build-react-calendar-library/index.md b/content/articles/build-react-calendar-library/index.md @@ -79,7 +79,7 @@ This may take a few minutes; wait for the installation of the development enviro
Your development environment will set up an application structure that looks like the one below.
-
+
Next, start your application by running the command below.
```bash
@@ -135,7 +135,7 @@ When a user selects a date, the value of the date will be set to the user's sele
Your application should look like the one below.
-
+
### Add style to your calendar
You can improve the calendar appearance by importing the react-calendar default stylesheet.
@@ -160,7 +160,7 @@ In this tutorial, we have changed the default styling by implementing the custom
The final customized calendar now looks as shown below:
-
+
### Select date range
React-calendar has the date range feature. This gives users the ability to select a custom date range.
@@ -347,7 +347,7 @@ When the value of `info` changes to true, the app displays the time slot and dat
Our final application will look like the image below.
-
+
### Conclusion
We went over how to integrate the `react-calendar` package into our react app, customize it, set a date range, and add a booking feature.
| 1 |
diff --git a/data.js b/data.js @@ -549,6 +549,13 @@ module.exports = [
url: "https://github.com/VizuaaLOG/microlib-tabs",
source: "https://raw.githubusercontent.com/VizuaaLOG/microlib-tabs/master/dist/tabs.microlib-latest.js"
},
+ {
+ name: "Chaintastic",
+ tags: ["data", "functional", "chain"],
+ description: "Create chainable sync/async APIs easily",
+ url: "https://github.com/ezakto/chaintastic",
+ source: "https://raw.githubusercontent.com/ezakto/chaintastic/master/lib/chaintastic.js"
+ },
{
name: "Feed",
github: "evandrolg/Feed",
| 0 |
diff --git a/avatars/vrarmik/ShoulderTransforms.js b/avatars/vrarmik/ShoulderTransforms.js @@ -11,12 +11,16 @@ class ShoulderTransforms {
this.neck = new THREE.Object3D();
this.head = new THREE.Object3D();
this.eyes = new THREE.Object3D();
+ this.eyel = new THREE.Object3D();
+ this.eyer = new THREE.Object3D();
this.hips.add(this.spine);
this.spine.add(this.transform);
this.transform.add(this.neck);
this.neck.add(this.head);
this.head.add(this.eyes);
+ this.eyes.add(this.eyel);
+ this.eyes.add(this.eyer);
// this.leftShoulder = new THREE.Object3D();
// this.transform.add(this.leftShoulder);
| 0 |
diff --git a/images/svg/disqus.svg b/images/svg/disqus.svg @@ -3,4 +3,4 @@ aria-label="Disqus" role="img"
viewBox="0 0 512 512"><rect
width="512" height="512"
rx="15%"
-fill="#fff"/><path fill="#2e9fff" d="M254 416c-39 0-75-14-103-38l-68 9 26-65A161 161 0 0 1 254 96c88 0 159 71 159 160s-71 160-159 160zm-3-80c57 0 90-34 90-81 0-48-33-80-89-80h-61v161zm2-39h-18v-82h18c26 0 43 15 43 40 0 27-17 42-43 42z"/></svg>
\ No newline at end of file
+fill="#fff"/><path fill="#2e9fff" d="M83 387l26-65a159 159 0 1 1 42 56zm168-52c57 0 90-34 90-81 0-48-33-80-89-80h-61v161zm2-39h-18v-82h18c26 0 43 15 43 40 0 27-17 42-43 42"/></svg>
\ No newline at end of file
| 4 |
diff --git a/packages/app/src/client/services/ContextExtractor.tsx b/packages/app/src/client/services/ContextExtractor.tsx @@ -14,7 +14,6 @@ import {
const { isTrashPage: _isTrashPage } = pagePathUtils;
const jsonNull = 'null';
-const dateNull = 'null';
const ContextExtractorOnce: FC = () => {
@@ -32,7 +31,16 @@ const ContextExtractorOnce: FC = () => {
const path = decodeURI(mainContent?.getAttribute('data-path') || '');
const pageId = mainContent?.getAttribute('data-page-id') || null;
const revisionCreatedAt = +(mainContent?.getAttribute('data-page-revision-created') || '');
- const createdAt = new Date(mainContent?.getAttribute('data-page-created-at') || dateNull);
+
+ let createdAt: Date | null;
+ const createdAtAttribute = mainContent?.getAttribute('data-page-created-at');
+ if (createdAtAttribute != null) {
+ createdAt = new Date(createdAtAttribute);
+ }
+ else {
+ createdAt = null;
+ }
+
const updatedAt = mainContent?.getAttribute('data-page-updated-at');
const deletedAt = mainContent?.getAttribute('data-page-deleted-at') || null;
const isUserPage = JSON.parse(mainContent?.getAttribute('data-page-user') || jsonNull);
| 12 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -205,8 +205,14 @@ module.exports = function (grunt) {
},
// https://stackoverflow.com/a/47304117/865175
run: {
- buildTranslations: {
- exec: 'npm run buildTranslations --silent'
+ buildMain: {
+ exec: 'npm run buildMain --silent'
+ },
+ buildBrowser: {
+ exec: 'npm run buildBrowser --silent'
+ },
+ buildPreload: {
+ exec: 'npm run buildPreload --silent'
}
}
})
@@ -218,10 +224,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-watch')
grunt.loadNpmTasks('grunt-run')
- grunt.registerTask('browser', ['concat:browser', 'uglify:browser'])
- grunt.registerTask('webview', ['concat:webview', 'uglify:webview'])
-
- grunt.registerTask('default', ['run:buildTranslations', 'browser', 'webview', 'concat:main'])
+ grunt.registerTask('default', ['run:buildBrowser', 'run:buildPreload', 'run:buildMain'])
grunt.registerTask('macBuild', ['default', 'electron:osxBuild'])
grunt.registerTask('linuxBuild', ['default', 'electron:linuxBuild', 'electron-installer-debian:linux32', 'electron-installer-debian:linux64'])
| 4 |
diff --git a/src/WebMidi.js b/src/WebMidi.js @@ -332,7 +332,7 @@ class WebMidi extends EventEmitter {
*/
getInputById(id) {
- if (WebMidi.validation) {
+ if (this.validation) {
if (!this.enabled) throw new Error("WebMidi is not enabled.");
if (!id) return false;
}
@@ -362,7 +362,7 @@ class WebMidi extends EventEmitter {
*/
getInputByName(name) {
- if (WebMidi.validation) {
+ if (this.validation) {
if (!this.enabled) throw new Error("WebMidi is not enabled.");
if (!name) return false;
name = name.toString();
@@ -393,7 +393,7 @@ class WebMidi extends EventEmitter {
*/
getOutputByName(name) {
- if (WebMidi.validation) {
+ if (this.validation) {
if (!this.enabled) throw new Error("WebMidi is not enabled.");
if (!name) return false;
name = name.toString();
@@ -427,7 +427,7 @@ class WebMidi extends EventEmitter {
*/
getOutputById(id) {
- if (WebMidi.validation) {
+ if (this.validation) {
if (!this.enabled) throw new Error("WebMidi is not enabled.");
if (!id) return false;
}
@@ -464,7 +464,7 @@ class WebMidi extends EventEmitter {
*/
getNoteNumberByName(name) {
- if (WebMidi.validation) {
+ if (this.validation) {
if (typeof name !== "string") name = "";
}
@@ -516,7 +516,7 @@ class WebMidi extends EventEmitter {
*/
getOctave(number) {
- if (WebMidi.validation) {
+ if (this.validation) {
number = parseInt(number);
}
@@ -545,7 +545,7 @@ class WebMidi extends EventEmitter {
let channels;
- if (WebMidi.validation) {
+ if (this.validation) {
if (channel === "all") { // backwards-compatibility
channels = ["all"];
@@ -582,7 +582,7 @@ class WebMidi extends EventEmitter {
*/
toMIDIChannels(channel) {
- if (WebMidi.validation) {
+ if (this.validation) {
console.warn(
"The toMIDIChannels() method has been deprecated. Use sanitizeChannels() instead."
);
| 4 |
diff --git a/core/algorithm-builder/environments/nodejs/wrapper/package.json b/core/algorithm-builder/environments/nodejs/wrapper/package.json "author": "",
"license": "ISC",
"dependencies": {
- "@hkube/nodejs-wrapper": "^2.0.38"
+ "@hkube/nodejs-wrapper": "^2.0.39"
},
"devDependencies": {}
}
\ No newline at end of file
| 3 |
diff --git a/test/jasmine/tests/hover_label_test.js b/test/jasmine/tests/hover_label_test.js @@ -4728,7 +4728,7 @@ describe('hovermode: (x|y)unified', function() {
.then(done, done.fail);
});
- it('shares filtering logic with compare mode x', function(done) {
+ it('filtering logic for compare mode x', function(done) {
var mock = require('@mocks/27.json');
var mockCopy = Lib.extendDeep({}, mock);
@@ -4736,14 +4736,131 @@ describe('hovermode: (x|y)unified', function() {
.then(function(gd) {
_hover(gd, { xval: '2002' });
assertElementCount('g.hovertext', 2);
+ })
+ .then(done, done.fail);
+ });
- return Plotly.relayout(gd, 'hovermode', 'x unified');
+ it('x unified should include close points and filter multiple points from the same trace', function(done) {
+ Plotly.newPlot(gd, {
+ data: [
+ {
+ type: 'bar',
+ name: 'bar',
+ x: [
+ '2017-04',
+ '2017-07',
+ '2017-10',
+ '2018-01'
+ ],
+ xperiod: 'M3',
+ y: [10, 5, 10, 5]
+ },
+ {
+ type: 'scatter',
+ name: 'scatter',
+ x: [
+ '2017-01-01',
+ '2017-02-01',
+ '2017-03-01',
+ '2017-04-01',
+ '2017-05-01',
+ '2017-06-01',
+ '2017-07-01',
+ '2017-08-01',
+ '2017-09-01',
+ '2017-10-01',
+ '2017-11-01',
+ '2017-12-01'
+ ],
+ y: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+ }
+ ],
+ layout: {
+ hovermode: 'x unified',
+ showlegend: false,
+ width: 500,
+ height: 500,
+ margin: {
+ t: 50,
+ b: 50,
+ l: 50,
+ r: 50
+ }
+ }
})
- .then(function() {
- _hover(gd, { xval: '2002' });
- assertLabel({title: '2002.042', items: [
- 'Market income : 0.5537845',
- 'Market incom... : 0.4420997'
+ .then(function(gd) {
+ _hover(gd, { xpx: 25, ypx: 250 });
+ assertLabel({title: 'Jan 1, 2017', items: [
+ 'scatter : 1'
+ ]});
+
+ _hover(gd, { xpx: 50, ypx: 250 });
+ assertLabel({title: 'Feb 1, 2017', items: [
+ 'scatter : 2'
+ ]});
+
+ _hover(gd, { xpx: 75, ypx: 250 });
+ assertLabel({title: 'Mar 1, 2017', items: [
+ 'scatter : 3'
+ ]});
+
+ _hover(gd, { xpx: 100, ypx: 250 });
+ assertLabel({title: 'Apr 1, 2017', items: [
+ 'bar : 10',
+ 'scatter : 4'
+ ]});
+
+ _hover(gd, { xpx: 125, ypx: 250 });
+ assertLabel({title: 'May 1, 2017', items: [
+ 'bar : (Apr 1, 2017, 10)',
+ 'scatter : 5'
+ ]});
+
+ _hover(gd, { xpx: 150, ypx: 250 });
+ assertLabel({title: 'Jun 1, 2017', items: [
+ 'bar : (Apr 1, 2017, 10)',
+ 'scatter : 6'
+ ]});
+
+ _hover(gd, { xpx: 175, ypx: 250 });
+ assertLabel({title: 'Jul 1, 2017', items: [
+ 'bar : 5',
+ 'scatter : 7'
+ ]});
+
+ _hover(gd, { xpx: 200, ypx: 250 });
+ assertLabel({title: 'Aug 1, 2017', items: [
+ 'bar : (Jul 1, 2017, 5)',
+ 'scatter : 8'
+ ]});
+
+ _hover(gd, { xpx: 225, ypx: 250 });
+ assertLabel({title: 'Sep 1, 2017', items: [
+ 'bar : (Jul 1, 2017, 5)',
+ 'scatter : 9'
+ ]});
+
+ _hover(gd, { xpx: 250, ypx: 250 });
+ assertLabel({title: 'Oct 1, 2017', items: [
+ 'bar : 10',
+ 'scatter : 10'
+ ]});
+
+ _hover(gd, { xpx: 275, ypx: 250 });
+ assertLabel({title: 'Nov 1, 2017', items: [
+ 'bar : (Oct 1, 2017, 10)',
+ 'scatter : 11'
+ ]});
+
+ _hover(gd, { xpx: 300, ypx: 250 });
+ assertLabel({title: 'Dec 1, 2017', items: [
+ 'bar : (Oct 1, 2017, 10)',
+ 'scatter : 12'
+ ]});
+
+ _hover(gd, { xpx: 350, ypx: 250 });
+ assertLabel({title: 'Jan 1, 2018', items: [
+ 'bar : 5'
]});
})
.then(done, done.fail);
| 0 |
diff --git a/src/styles/brackets.less b/src/styles/brackets.less @@ -1695,7 +1695,11 @@ a, img {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-left: none;
- border-right: 1px solid #b2b5b5;
+ border-right: 1px solid @bc-btn-border;
+
+ .dark & {
+ border-right-color: @dark-bc-btn-border;
+ }
}
// Make find field snug with options buttons
| 4 |
diff --git a/source/types/contracts/Types.sol b/source/types/contracts/Types.sol @@ -70,7 +70,8 @@ library Types {
"bytes4 kind,",
"address wallet,",
"address token,",
- "uint256 param",
+ "uint256 amount",
+ "uint256 id",
")"
));
@@ -79,7 +80,8 @@ library Types {
"bytes4 kind,",
"address wallet,",
"address token,",
- "uint256 param",
+ "uint256 amount",
+ "uint256 id",
")"
));
| 3 |
diff --git a/src/components/topic/create/TopicForm.js b/src/components/topic/create/TopicForm.js @@ -129,7 +129,8 @@ const asyncValidate = (values, dispatch) => (
dispatch(fetchTopicSearchResults(values.name))
.then((results) => {
if (results.topics && (results.topics.length !== 0) &&
- (values.topicId && (results.topics[0].topics_id !== values.topicId))) {
+ (results.topics[0].name === values.name) &&
+ (!values.topicId || (values.topicId && (results.topics[0].topics_id !== values.topicId)))) {
const error = { name: localMessages.nameInUseError };
throw error;
}
| 9 |
diff --git a/package.json b/package.json "github": {
"release": true,
"tokenRef": "RELEASE_IT_GITHUB_TOKEN",
- "releaseNotes": "npm run auto-changelog --stdout --commit-limit false -u --template ./changelog.hbs",
+ "releaseNotes": "npx auto-changelog --stdout --commit-limit false -u --template ./changelog.hbs",
"____comment": "\"assets\": [\"dist/logagent-*\"]"
},
"hooks": {
- "after:bump": "npm run auto-changelog -p"
+ "after:bump": "npx auto-changelog -p"
}
},
"standard": {
| 14 |
diff --git a/src/renderer/layer/tilelayer/TileLayerGLRenderer.js b/src/renderer/layer/tilelayer/TileLayerGLRenderer.js @@ -90,7 +90,11 @@ class TileLayerGLRenderer extends ImageGLRenderable(TileLayerCanvasRenderer) {
}
getCanvasImage() {
- if (this._gl() && this.isCanvasUpdated()) {
+ if (!this._gl()) {
+ return super.getCanvasImage();
+ }
+ if (this.layer.getMask()) {
+ if (this.isCanvasUpdated()) {
const ctx = this.context;
if (Browser.retina) {
ctx.save();
@@ -103,6 +107,11 @@ class TileLayerGLRenderer extends ImageGLRenderable(TileLayerCanvasRenderer) {
}
}
return super.getCanvasImage();
+ } else {
+ const img = super.getCanvasImage();
+ img.image = this.glCanvas;
+ return img;
+ }
}
// decide whether the layer is renderer with gl.
| 3 |
diff --git a/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/BaseNDCompass.js b/src/workingtitle-vcockpits-instruments-airliners/html_ui/Pages/VCockpit/Instruments/Airliners/Shared/WT/BaseNDCompass.js @@ -332,8 +332,8 @@ class Jet_NDCompass extends HTMLElement {
let CompassAngle = this.degreeToArc(compass);
let selectedAngle = this.degreeToArc(simSelectedHeading);
let delta = Math.abs(CompassAngle - selectedAngle);
- this.selectedHeadingLine.classList.toggle('hide', (delta > 65) ? false : true);
- this.selectedHeadingBug.classList.toggle('hide', (delta > 90) ? true : false);
+ this.selectedHeadingLine.classList.toggle('hide', (delta > 65 && this._displayMode !== Jet_NDCompass_Display.ROSE) ? false : true);
+ this.selectedHeadingBug.classList.toggle('hide', (delta > 90 && this._displayMode === Jet_NDCompass_Display.ARC) ? true : false);
if (showSelectedHeading) {
this.selectedHeadingLine.classList.toggle('hide', false);
| 1 |
diff --git a/token-metadata/0xBC86727E770de68B1060C91f6BB6945c73e10388/metadata.json b/token-metadata/0xBC86727E770de68B1060C91f6BB6945c73e10388/metadata.json "symbol": "XNK",
"address": "0xBC86727E770de68B1060C91f6BB6945c73e10388",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/tests/part_tests.js b/tests/part_tests.js @@ -546,12 +546,10 @@ Numbas.queueScript('go',['json','jme','localisation','parts/numberentry','parts/
q.signals.on('ready', function() {
q.allParts().forEach(function(p) {
p.json.unitTests.forEach(function(test) {
- console.log(test);
QUnit.test(test.name, function(assert) {
p.storeAnswer(test.answer.value);
p.setStudentAnswer();
var res = p.mark_answer(p.rawStudentAnswerAsJME(),p.getScope());
- console.log(res);
assert.ok(res.state_valid.mark);
test.notes.forEach(function(note) {
assert.ok(res.states[note.name]!==undefined,'Note "'+note.name+'" exists');
@@ -570,12 +568,12 @@ Numbas.queueScript('go',['json','jme','localisation','parts/numberentry','parts/
assert.notOk(differentValue,'Note "'+note.name+'" has value "'+note.expected.value+'"');
});
+ p.credit = 0;
+
var final_res = p.markAgainstScope(p.getScope(),{markingFeedback:[],warnings:[]});
- console.log('final_res',final_res);
var messages = final_res.markingFeedback.map(function(action){ return action.message; }).join('\n');
var mark_note = test.notes.find(function(n) { return n.name=='mark' });
var expectedMessages = mark_note.expected.messages.join('\n');
- console.log(messages);
assert.equal(messages,expectedMessages,'Feedback messages');
var warnings = final_res.warnings.join('\n');
var expectedWarnings = mark_note.expected.warnings.join('\n');
| 12 |
diff --git a/src/components/colorscale/scales.js b/src/components/colorscale/scales.js @@ -126,4 +126,16 @@ module.exports = {
[0.8784313725490196, '#addc30'], [0.9411764705882353, '#d8e219'],
[1, '#fde725']
]
+
+ 'Cividis': [
+ [0.000000, 'rgb(0,32,76)'], [0.058824, 'rgb(0,42,102)'],
+ [0.117647, 'rgb(0,52,110)'], [0.176471, 'rgb(39,63,108)'],
+ [0.235294, 'rgb(60,74,107)'], [0.294118, 'rgb(76,85,107)'],
+ [0.352941, 'rgb(91,95,109)'], [0.411765, 'rgb(104,106,112)'],
+ [0.470588, 'rgb(117,117,117)'], [0.529412, 'rgb(131,129,120)'],
+ [0.588235, 'rgb(146,140,120)'], [0.647059, 'rgb(161,152,118)'],
+ [0.705882, 'rgb(176,165,114)'], [0.764706, 'rgb(192,177,109)'],
+ [0.823529, 'rgb(209,191,102)'], [0.882353, 'rgb(225,204,92)'],
+ [0.941176, 'rgb(243,219,79)'], [1.000000, 'rgb(255,233,69)']
+ ]
};
| 0 |
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json },
"sidebar": {
"info": {
- "name": "Node information",
+ "name": "Information",
"tabName": "Name",
"label": "info",
"node": "Node",
| 10 |
diff --git a/metaverse_modules/land/index.js b/metaverse_modules/land/index.js -// import * as THREE from 'three';
+import * as THREE from 'three';
import metaversefile from 'metaversefile';
-const {useApp, useCleanup} = metaversefile;
+const {useApp, useLocalPlayer, useCamera, useProcGenManager, useFrame, useCleanup} = metaversefile;
+
+const localVector = new THREE.Vector3();
+const localVector2 = new THREE.Vector3();
+const localQuaternion = new THREE.Quaternion();
+const localMatrix = new THREE.Matrix4();
+const localMatrix2 = new THREE.Matrix4();
export default e => {
const app = useApp();
+ const localPlayer = useLocalPlayer();
+ const camera = useCamera();
+ const procGenManager = useProcGenManager();
app.name = 'land';
@@ -39,7 +48,7 @@ export default e => {
];
const passComponents = [];
const seed = app.getComponent('seed');
- const clipRange = app.getComponent('clipRange');
+ let clipRange = app.getComponent('clipRange');
const physicsInstance = app.getComponent('physicsInstance');
const wait = app.getComponent('wait');
const debug = app.getComponent('debug');
@@ -96,6 +105,15 @@ export default e => {
});
}
+ if (clipRange) {
+ clipRange = new THREE.Box3(
+ new THREE.Vector3().fromArray(clipRange[0]),
+ new THREE.Vector3().fromArray(clipRange[1]),
+ );
+ }
+
+ const procGenInstance = procGenManager.getInstance(seed, clipRange);
+
app.addEventListener('componentsupdate', e => {
const {keys} = e;
const components = {};
@@ -154,6 +172,23 @@ export default e => {
return null;
}
+ if (!renderPosition) {
+ useFrame(() => {
+ localMatrix
+ .copy(localPlayer.matrixWorld)
+ .premultiply(localMatrix2.copy(app.matrixWorld).invert())
+ .decompose(localVector, localQuaternion, localVector2);
+
+ const playerPosition = localVector;
+ procGenInstance.dcWorkerManager.setCamera(
+ playerPosition,
+ camera.position,
+ camera.quaternion,
+ camera.projectionMatrix
+ );
+ });
+ }
+
useCleanup(() => {
for (const subApp of subApps) {
subApp.destroy();
| 0 |
diff --git a/src/ArcgisAccount/ArcgisAccount.js b/src/ArcgisAccount/ArcgisAccount.js @@ -45,15 +45,20 @@ class ArcgisAccount extends Component {
});
};
- _getThumbnail = (user, token) => {
+ _getThumbnail = (user, token, portal) => {
const { username, thumbnail } = user;
const _token = token || '';
- return `https://www.arcgis.com/sharing/rest/community/users/${username}/info/${thumbnail}?token=${_token}`;
+ const _url = portal.allSSL ? 'https' : 'http';
+ return `${_url}://${
+ portal.portalHostname
+ }/sharing/rest/community/users/${username}/info/${thumbnail}?token=${_token}`;
};
- _getAvatar = (userInfo, token, size) => {
+ _getAvatar = (userInfo, token, portal, size) => {
if (userInfo.thumbnail) {
- return <Avatar src={this._getThumbnail(userInfo, token)} size={size} />;
+ return (
+ <Avatar src={this._getThumbnail(userInfo, token, portal)} size={size} />
+ );
} else if (userInfo.firstName && userInfo.lastName) {
let initials = userInfo.firstName[0] + userInfo.lastName[0];
initials = initials.toUpperCase();
@@ -88,7 +93,12 @@ class ArcgisAccount extends Component {
targetEl={
<ArcgisAccountControl
onClick={this.toggleAccountControl}
- avatar={this._getAvatar(this.props.user, this.props.token, 32)}
+ avatar={this._getAvatar(
+ this.props.user,
+ this.props.token,
+ this.props.portal,
+ 32
+ )}
fullName={user.fullName}
username={user.username}
open={this.state.open}
@@ -103,7 +113,7 @@ class ArcgisAccount extends Component {
<ArcgisAccountMenu
user={user}
portal={portal}
- avatar={this._getAvatar(user, token, 120)}
+ avatar={this._getAvatar(user, token, portal, 120)}
style={{ width: '410px' }}
hideSwitchAccount={hideSwitchAccount}
onRequestSwitchAccount={onRequestSwitchAccount}
| 11 |
diff --git a/src/tests/controllers/tribe.test.ts b/src/tests/controllers/tribe.test.ts import test, { ExecutionContext } from 'ava'
import nodes from '../nodes'
import { leaveTribe, deleteTribe } from '../utils/del'
-import { createTribe, joinTribe } from '../utils/save'
+import { createTribe, joinTribe, updateProfile } from '../utils/save'
import { randomText, iterate } from '../utils/helpers'
import { NodeConfig } from '../types'
import { sendTribeMessageAndCheckDecryption } from '../utils/msg'
+import { getCheckNewMsgs, getSelf } from "../utils/get";
/*
npx ava src/tests/controllers/tribe.test.ts --verbose --serial --timeout=2m
@@ -63,3 +64,80 @@ async function tribeTest(
let delTribe = await deleteTribe(t, node1, tribe)
t.true(delTribe, 'node1 should delete tribe')
}
+
+test.serial('Tribe test for seeing that if 2 nodes have the same alias, the sender alias is changed',async (t: ExecutionContext<Context>) => {
+ t.true(Array.isArray(nodes))
+ await tribeUniqueAliasTest(t,nodes[0],nodes[1], nodes[2])
+})
+
+// Tests that if 2 nodes with the same alias join a tribe, their alias assigned in the tribes is different
+async function tribeUniqueAliasTest(
+ t: ExecutionContext<Context>,
+ node1: NodeConfig,
+ node2: NodeConfig,
+ node3: NodeConfig
+) {
+ //NODE1 creates a tribe
+ let tribe = await createTribe(t, node1);
+ t.truthy(tribe, 'tribe should have been created by node1')
+
+ //Set the alias of NODE2 to be the same as NODE1
+ let old_alias = node2.alias;
+ let newAlias = {alias: node1.alias};
+ const change = await updateProfile(t, node2, newAlias);
+ t.true(change,'node2 should have updated its profile')
+ const newNode2 = await getSelf(t, node2);
+ t.true(newNode2.alias !== old_alias, 'node2 alias should not be equal to old alias')
+ t.true(newNode2.alias === node1.alias, 'node2 alias should be equal node1 alias')
+
+
+ //NODE2 JOINS TRIBE CREATED BY NODE1
+ if (node1.routeHint) tribe.owner_route_hint = node1.routeHint
+ let join = await joinTribe(t, node2, tribe)
+ t.true(join, 'node2 should join tribe')
+
+ //NODE3 JOINS TRIBE
+ if (node1.routeHint) tribe.owner_route_hint = node1.routeHint
+ let join2 = await joinTribe(t, node3, tribe)
+ t.true(join2,'node3 should join tribe')
+
+ //First node1 sends a message in tribe
+ let text = randomText()
+ let tribeMessage = await sendTribeMessageAndCheckDecryption(
+ t,
+ node1,
+ node3,
+ text,
+ tribe
+ )
+ t.true(!!tribeMessage, 'node1 should send message to tribe')
+
+ //Then node2 sends a message in tribe
+ let text2 = randomText()
+ let tribeMessage2 = await sendTribeMessageAndCheckDecryption(
+ t,
+ node2,
+ node3,
+ text2,
+ tribe
+ )
+ t.true(!!tribeMessage2, 'node2 should send message to tribe')
+ let message1 = await getCheckNewMsgs(t,node3,tribeMessage.uuid)
+ let message2 = await getCheckNewMsgs(t,node3, tribeMessage2.uuid)
+ t.true(message1.sender_alias!== message2.sender_alias, "The sender alias in both messages should be different")
+ //Check that our logic for assigning an alternate alias is working
+ t.true(message2.sender_alias === `${node1.alias}_2`, "The sender alias should be modified according to our unique alias logic")
+
+ //NODE3 LEAVES THE TRIBE
+ let left1 = await leaveTribe(t, node3, tribe)
+ t.true(left1, 'node3 should leave tribe')
+
+ //NODE2 LEAVES THE TRIBE
+ let left2 = await leaveTribe(t, node2, tribe)
+ t.true(left2, 'node2 should leave tribe')
+
+ //NODE1 LEAVES THE TRIBE
+ let delTribe = await deleteTribe(t, node1, tribe)
+ t.true(delTribe, 'node1 should delete tribe')
+
+}
| 0 |
diff --git a/index.d.ts b/index.d.ts @@ -521,7 +521,7 @@ declare namespace Moleculer {
disconnected(): void;
}
- class Context<P = any, M extends object = Record<any, any>> {
+ class Context<P = unknown, M extends object = {}> {
constructor(broker: ServiceBroker, endpoint: Endpoint);
id: string;
broker: ServiceBroker;
| 13 |
diff --git a/assets/js/modules/adsense/common/account-select.test.js b/assets/js/modules/adsense/common/account-select.test.js @@ -69,8 +69,7 @@ describe( 'AccountSelect', () => {
} );
it( 'should update accountID in the store when a new item is clicked', async () => {
- const tt = render( <AccountSelect />, { setupRegistry } );
- const { getByText, container, registry } = tt;
+ const { getByText, container, registry } = render( <AccountSelect />, { setupRegistry } );
const originalAccountID = registry.select( STORE_NAME ).getAccountID();
const selectedAccount = fixtures.accountsMultiple[ 0 ];
| 2 |
diff --git a/src/manage/settings.js b/src/manage/settings.js @@ -42,11 +42,7 @@ class Settings extends React.Component {
type="password"
readOnly
defaultValue={this.state.secret}
- actions={[
- { icon: 'copy', method: dummyFn },
- { icon: 'copy', method: dummyFn },
- { icon: 'copy', method: dummyFn }
- ]}
+ actions={[{ icon: 'copy', method: dummyFn }, { icon: 'delete', method: dummyFn }]}
description="The Client Secret is not base64 encoded."
/>
| 4 |
diff --git a/src/apps.json b/src/apps.json },
"Octopress": {
"cats": [
+ 1,
11
],
- "html": "Powered by <a href=\"http://octopress.org\">Octopress",
+ "html": "Powered by <a href=\"http://octopress.org\">",
+ "implies": "Jekyll",
+ "meta": {
+ "generator": "Octopress"
+ },
"icon": "octopress.png",
"website": "octopress.org"
},
| 7 |
diff --git a/Documentation/Contributors/CodingGuide/README.md b/Documentation/Contributors/CodingGuide/README.md @@ -327,6 +327,7 @@ byteOffset += sizeOfUint32; // Skip length field
- `TODO` comments need to be removed or addressed before the code is merged into main. Used sparingly, `PERFORMANCE_IDEA`, can be handy later when profiling.
- Remove commented out code before merging into main.
+- Modern language features may provide handy shortcuts and cleaner syntax, but they should be used with consideration for their performance implications, especially in code that is invoked per-frame.
## Functions
| 3 |
diff --git a/src/android/java/io/jxcore/node/JXcoreExtension.java b/src/android/java/io/jxcore/node/JXcoreExtension.java @@ -758,6 +758,9 @@ public class JXcoreExtension implements SurroundingStateObserver {
final ArrayList<Object> args = new ArrayList<Object>();
String errorString = null;
+ if (!isRadioOn()) {
+ errorString = "Radio Turned Off";
+ } else {
if (mConnectionHelper.getConnectivityMonitor().isBleMultipleAdvertisementSupported() !=
BluetoothManager.FeatureSupportedStatus.NOT_SUPPORTED) {
boolean succeededToStartOrWasAlreadyRunning =
@@ -785,6 +788,7 @@ public class JXcoreExtension implements SurroundingStateObserver {
} else {
errorString = "No Native Non-TCP Support";
}
+ }
if (errorString != null) {
// Failed straight away
@@ -793,6 +797,10 @@ public class JXcoreExtension implements SurroundingStateObserver {
}
}
+ private static boolean isRadioOn() {
+ return mConnectionHelper.getConnectivityMonitor().isBluetoothEnabled();
+ }
+
/**
* Returns a string value matching the given RadioState enum value.
*
| 0 |
diff --git a/LICENSE b/LICENSE The MIT License (MIT)
-Copyright (c) 2015-2017 Oli Folkerd
+Copyright (c) 2015-2018 Oli Folkerd
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
| 3 |
diff --git a/views/index.pug b/views/index.pug @@ -79,7 +79,4 @@ block content
include _partials/jscode.pug
- p
- a(href='https://www.maxcdn.com/blog/bootstrapcdn-subresource-integrity/', target='_blank', rel='noopener') Why BootstrapCDN believes in Subresource Integrity (SRI)
-
//- vim: ft=pug sw=4 sts=4 et:
| 2 |
diff --git a/examples/py/cli.py b/examples/py/cli.py @@ -110,23 +110,17 @@ if argv.exchange_id not in ccxt.exchanges:
if argv.exchange_id in keys:
config.update(keys[argv.exchange_id])
-# check auth keys in env var if not in keys file
-apiKeyID = 'apiKey'
-if apiKeyID not in config:
- apiKeyVar = (argv.exchange_id + '_' + apiKeyID).upper() # example: KRAKEN_APIKEY
- if apiKeyVar in os.environ:
- apiKey = os.environ[apiKeyVar]
- config[apiKeyID] = apiKey
-
-secretID = 'secret'
-if secretID not in config:
- secretVar = (argv.exchange_id + '_' + secretID).upper() # example: KRAKEN_SECRET
- if secretVar in os.environ:
- secret = os.environ[secretVar]
- config[secretID] = secret
-
exchange = getattr(ccxt, argv.exchange_id)(config)
+# check auth keys in env var
+requiredCredentials = exchange.requiredCredentials
+for credential, isRequired in requiredCredentials.items():
+ if isRequired and credential and not getattr(exchange, credential, None):
+ credentialEnvName = (argv.exchange_id + '_' + credential).upper() # example: KRAKEN_APIKEY
+ if credentialEnvName in os.environ:
+ credentialValue = os.environ[credentialEnvName]
+ setattr(exchange, credential, credentialValue)
+
if argv.cors:
exchange.proxy = 'https://cors-anywhere.herokuapp.com/';
exchange.origin = exchange.uuid ()
| 7 |
diff --git a/generators/generator-constants.js b/generators/generator-constants.js @@ -63,7 +63,7 @@ const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2017-latest-ubuntu';
const DOCKER_NEO4J = 'neo4j:4.0.4';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.12.9'; // waiting for https://github.com/jhipster/generator-jhipster/issues/11244
const DOCKER_MEMCACHED = 'memcached:1.6.6-alpine';
-const DOCKER_REDIS = 'redis:5.0.9'; // waiting for https://github.com/jhipster/generator-jhipster/issues/11678
+const DOCKER_REDIS = 'redis:6.0.4';
const DOCKER_KEYCLOAK = 'jboss/keycloak:10.0.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:6.8.8'; // The version should be coherent with the one from spring-data-elasticsearch project
const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
| 3 |
diff --git a/src/i18next.js b/src/i18next.js @@ -278,7 +278,7 @@ class I18n extends EventEmitter {
return new I18n(options, callback);
}
- cloneInstance(options = {}, callback) {
+ cloneInstance(options = {}, callback = noop) {
let clone = new I18n({...options, ...this.options, ...{isClone: true}}, callback);
const membersToCopy = ['store', 'services', 'language'];
membersToCopy.forEach(m => {
| 4 |
diff --git a/services/integration-content-repository/k8s/deployment.yaml b/services/integration-content-repository/k8s/deployment.yaml @@ -30,7 +30,7 @@ spec:
- name: "INTROSPECT_TYPE"
value: "basic"
- name: "INTROSPECT_ENDPOINT_BASIC"
- value: "https://iam.openintegrationhub.com/api/v1/tokens/introspect"
+ value: "http://iam.openintegrationhub.com/api/v1/tokens/introspect"
resources:
limits:
cpu: '0.1'
| 1 |
diff --git a/patrons.md b/patrons.md Meet some of the outstanding guys that support `mojs` on [Patreon](https://patreon.com/user?u=3219311&utm_medium=social&utm_source=twitter&utm_campaign=creatorshare):
- [Zak Frisch](https://github.com/zfrisch)
+- [Erhan Karadeniz](https://twitter.com/erhankaradeniz)
+- [Jorge Antunes]()
+- [Daniel C. Henning](https://github.com/danielsdesk)
- [Chris Dolphin](https://github.com/likethemammal/)
- [Volodymyr Kushnir](https://twitter.com/VovaKushnir)
-- Wojtek Jodel
+- [Wojtek Jodel]()
+- [Roman Kuba](https://github.com/codebryo)
| 3 |
diff --git a/lib/bal/api.js b/lib/bal/api.js @@ -5,7 +5,7 @@ import HttpError from '../http-error'
const {publicRuntimeConfig} = getConfig()
-export const BACKEND_URL = publicRuntimeConfig.BACKEND_URL || 'https://adresse.data.gouv.fr/backend'
+export const BACKEND_URL = publicRuntimeConfig.BACKEND_URL || 'http://localhost:3000/backend'
async function _fetch(url, method, body) {
const options = {
| 14 |
diff --git a/assets/js/modules/analytics/wp-dashboard/wp-dashboard-widget-top-pages-table.js b/assets/js/modules/analytics/wp-dashboard/wp-dashboard-widget-top-pages-table.js @@ -42,11 +42,6 @@ class WPAnalyticsDashboardWidgetTopPagesTable extends Component {
return null;
}
- const headers = [
- __( 'URL', 'google-site-kit' ),
- __( 'Pageviews', 'google-site-kit' ),
- ];
-
const links = [];
const dataMapped = map( data[ 0 ].data.rows, ( row, i ) => {
const [ title, url ] = row.dimensions;
@@ -66,7 +61,7 @@ class WPAnalyticsDashboardWidgetTopPagesTable extends Component {
showUrls: true,
};
- const dataTable = getDataTableFromData( dataMapped, headers, options );
+ const dataTable = getDataTableFromData( dataMapped, [], options );
return (
<div className="googlesitekit-search-console-widget">
| 2 |
diff --git a/react/src/components/card/SprkCard.stories.js b/react/src/components/card/SprkCard.stories.js @@ -523,8 +523,9 @@ export const fourUpCards = () => (
<SprkStackItem>
<SprkText variant="bodyTwo">
- Lorem ipsum dolor sit amet, doctus invenirevix te. Facilisi
- perpetua.
+ This Lorem ipsum dolor sit amet, doctus invenire vix te. Facilisi
+ perpetua an pri, errem commune mea at, mei prima tantas
+ signiferumque at. Numquam.
</SprkText>
</SprkStackItem>
| 3 |
diff --git a/core/field_bound_variable.js b/core/field_bound_variable.js @@ -386,7 +386,9 @@ Blockly.FieldBoundVariable.prototype.highlightVariables_ = function(on, e) {
if (!this.variable_) {
return;
}
- // TODO(harukam): Ignore events if the block is being dragged.
+ if (this.sourceBlock_.workspace.isDragging()) {
+ return;
+ }
var variables = this.variable_.getAllBoundVariables();
for (var i = 0, variable; variable = variables[i]; i++) {
var field = variable.getContainerField();
| 8 |
diff --git a/src/middleware/packages/activitypub/services/activity-mapping.js b/src/middleware/packages/activitypub/services/activity-mapping.js @@ -30,6 +30,9 @@ const ActivityMappingService = {
// If we have a match...
if (dereferencedActivity) {
+ // If mapping is false, we want the activity to be ignored
+ if( mapper.mapping === false ) return;
+
const emitter = await ctx.call('activitypub.actor.get', { actorUri: activity.actor });
const emitterProfile = emitter.url
? await ctx.call('activitypub.actor.getProfile', { actorUri: activity.actor, webId: 'system' })
@@ -57,7 +60,7 @@ const ActivityMappingService = {
async addMapper(ctx) {
const { match, mapping, priority = 1 } = ctx.params;
- if (!match || !mapping) throw new Error('No object defined for match or mapping');
+ if (!match || mapping === undefined) throw new Error('No object defined for match or mapping property');
this.mappers.push({
match,
@@ -80,7 +83,7 @@ const ActivityMappingService = {
this.mappers.sort((a, b) => b.priority - a.priority);
},
compileObject(object) {
- return Object.fromEntries(
+ return object && Object.fromEntries(
Object.entries(object).map(([key, value]) => {
if (typeof value === 'string') {
return [key, Handlebars.compile(value)];
| 7 |
diff --git a/src/views/navbar/style.js b/src/views/navbar/style.js @@ -4,7 +4,6 @@ import { Transition, FlexRow } from '../../components/globals';
import { Avatar } from '../../components/avatar';
export const UserProfileAvatar = styled(Avatar)`
- margin-top: 8px;
border: 1px solid ${({ theme }) => theme.text.default};
box-shadow: 0 0 0 2px ${props => (props.isPro ? props.theme.pro.default : 'rgba(255,255,255,0.9)')};
| 1 |
diff --git a/source/popup/components/MainPage.js b/source/popup/components/MainPage.js @@ -20,6 +20,11 @@ const ArchiveShape = PropTypes.shape({
state: PropTypes.oneOf(["locked", "unlocked", "pending"]).isRequired
});
+const Container = styled.div`
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+`;
const ArchiveList = styled.ul`
list-style-type: none;
margin: 0;
@@ -53,7 +58,7 @@ const ListContainer = styled.div`
width: 100%;
height: 300px;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
`;
const ListItem = styled.li`
background-color: rgba(20, 20, 20, 0.4);
@@ -203,7 +208,7 @@ class MainPage extends Component {
render() {
return (
- <div>
+ <Container>
<HeaderBar menuState={this.props.menuState} onMenuClick={() => this.props.onMenuClick()} />
<ListContainer>
<Choose>
@@ -235,7 +240,7 @@ class MainPage extends Component {
</Otherwise>
</Choose>
</ListContainer>
- </div>
+ </Container>
);
}
| 12 |
diff --git a/src/components/networked.js b/src/components/networked.js @@ -42,7 +42,7 @@ AFRAME.registerComponent('networked', {
this.conversionEuler = new THREE.Euler();
this.conversionEuler.order = "YXZ";
- this.interpolationBuffers = [];
+ this.bufferInfos = [];
this.bufferPosition = new THREE.Vector3();
this.bufferQuaternion = new THREE.Quaternion();
this.bufferScale = new THREE.Vector3();
@@ -178,19 +178,20 @@ AFRAME.registerComponent('networked', {
this.syncDirty();
}
} else if (NAF.options.useLerp) {
- for (var i = 0; i < this.interpolationBuffers.length; i++) {
- var interpolationBuffer = this.interpolationBuffers[i].buffer;
- var el = this.interpolationBuffers[i].el;
- interpolationBuffer.update(dt);
- var componentName = interpolationBuffer.componentName;
- if (componentName === "position"){
- el.object3D.position.copy(interpolationBuffer.getPosition());
+ for (var i = 0; i < this.bufferInfos.length; i++) {
+ var bufferInfo = this.bufferInfos[i];
+ var buffer = bufferInfo.buffer;
+ var object3D = bufferInfo.object3D;
+ var componentNames = bufferInfo.componentNames;
+ buffer.update(dt);
+ if (componentNames.includes("position")){
+ object3D.position.copy(buffer.getPosition());
}
- else if (componentName === "rotation"){
- el.object3D.quaternion.copy(interpolationBuffer.getQuaternion());
+ if (componentNames.includes("rotation")){
+ object3D.quaternion.copy(buffer.getQuaternion());
}
- else if (componentName === "scale"){
- el.object3D.scale.copy(interpolationBuffer.getScale());
+ if (componentNames.includes("scale")){
+ object3D.scale.copy(buffer.getScale());
}
}
}
@@ -386,34 +387,36 @@ AFRAME.registerComponent('networked', {
return;
}
- var buffer = null;
- var interpolationBuffer = this.interpolationBuffers.find((item) => item.el === el && item.componentName===componentName);
- if (!interpolationBuffer) {
- buffer = new InterpolationBuffer(InterpolationBuffer.MODE_LERP, 0.1);
- this.interpolationBuffers.push({ buffer: buffer, componentName: componentName, el: el });
- } else {
- buffer = interpolationBuffer.buffer;
+ var bufferInfo = this.bufferInfos.find((info) => info.object3D === el.object3D);
+ if (!bufferInfo) {
+ bufferInfo = { buffer: new InterpolationBuffer(InterpolationBuffer.MODE_LERP, 0.1),
+ object3D: el.object3D,
+ componentNames: [componentName] };
+ this.bufferInfos.push(bufferInfo);
+ }
+ var buffer = bufferInfo.buffer;
+ var componentNames = bufferInfo.componentNames;
+ if (!componentNames.includes(componentName)){
+ componentNames.push(componentName);
}
switch(componentName) {
case "position":
buffer.setPosition(this.bufferPosition.set(data.x, data.y, data.z));
- break;
+ return;
case "rotation":
this.conversionEuler.set(DEG2RAD * data.x, DEG2RAD * data.y, DEG2RAD * data.z);
buffer.setQuaternion(this.bufferQuaternion.setFromEuler(this.conversionEuler));
- break;
+ return;
case "scale":
buffer.setScale(this.bufferScale.set(data.x, data.y, data.z));
- break;
- default:
- el.setAttribute(componentName, data);
- break;
+ return;
}
+ console.error("Could not set value in interpolation buffer.", el, componentName, data, bufferInfo);
},
removeLerp: function() {
- this.interpolationBuffers = [];
+ this.bufferInfos = [];
},
remove: function () {
| 4 |
diff --git a/contracts/MixinResolver.sol b/contracts/MixinResolver.sol pragma solidity ^0.5.16;
-// Inheritance
-import "./Owned.sol";
-
// Internal references
import "./AddressResolver.sol";
-import "./ReadProxy.sol";
// https://docs.synthetix.io/contracts/source/contracts/mixinresolver
contract MixinResolver {
| 2 |
diff --git a/package.json b/package.json "build-src": "node scripts/build.js src",
"prepublish": "npm run build",
"test": "npm run jshint -s && npm run mocha -s && npm run test-components -s && npm run test-components-deprecated -s",
- "test-ci": "npm run test-generate-coverage && npm run build && NODE_ENV=development npm run test",
+ "test-ci": "npm run test-generate-coverage",
"mocha": "node test/server-tests-runner/cli.js",
"test-coverage": "npm run test-generate-coverage && nyc report --reporter=html && open ./coverage/index.html",
"test-generate-coverage": "nyc -asc npm test",
| 4 |
diff --git a/tests/mocha/workspace_svg_test.js b/tests/mocha/workspace_svg_test.js @@ -112,11 +112,6 @@ suite('WorkspaceSvg', function() {
this.workspace.updateToolbox({'contents': []});
}.bind(this), 'Existing toolbox has categories. Can\'t change mode.');
});
- test('Passing in string as toolboxdef', function() {
- var parseToolboxFake = sinon.spy(Blockly.utils.toolbox, 'parseToolboxTree');
- this.workspace.updateToolbox('<xml><category name="something"></category></xml>');
- sinon.assert.calledOnce(parseToolboxFake);
- });
});
suite('addTopBlock', function() {
| 2 |
diff --git a/views/login.blade.php b/views/login.blade.php class="form-text text-danger d-none"></div>
</div>
- <div class="checkbox">
- <label for="stay_logged_in">
+ <div class="form-group mt-n2">
+ <div class="custom-control custom-checkbox">
<input type="checkbox"
- id="stay_logged_in"
- name="stay_logged_in"> {{ $__t('Stay logged in permanently') }}
- <p class="form-text text-muted small my-0">{{ $__t('When not set, you will get logged out at latest after 30 days') }}</p>
+ class="form-check-input custom-control-input"
+ id="stay_logged_in">
+ <label class="form-check-label custom-control-label"
+ for="stay_logged_in">
+ {{ $__t('Stay logged in permanently') }}
+ <i class="fas fa-question-circle"
+ data-toggle="tooltip"
+ title="{{ $__t('When not set, you will get logged out at latest after 30 days') }}"></i>
</label>
</div>
+ </div>
<button id="login-button"
class="btn btn-success">{{ $__t('OK') }}</button>
| 4 |
diff --git a/src/modules/TimeScale.js b/src/modules/TimeScale.js @@ -532,6 +532,18 @@ class TimeScale {
unit = 'month'
date = firstVal.minDate
numberOfDays++
+ } else if (
+ firstVal.minDate !== 1 &&
+ firstVal.minHour === 0 &&
+ firstVal.minMinute === 0
+ ) {
+ // fixes apexcharts/apexcharts.js/issues/1730
+ firstTickPosition = 0
+ firstTickValue = firstVal.minDate
+ date = firstTickValue
+ val = firstTickValue
+ // in case it's the last date of month, we need to check it
+ month = changeMonth(date, currentMonth, currentYear)
}
// push the first tick in the array
| 1 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -32,6 +32,7 @@ import * as postProcessing from './post-processing.js';
import {makeId, getRandomString, getPlayerPrefix} from './util.js';
import JSON6 from 'json-6';
import {rarityColors, initialPosY} from './constants.js';
+import * as materials from './materials.js';
import soundManager from './sound-manager.js';
import {CapsuleGeometry} from './CapsuleGeometry.js';
@@ -948,6 +949,9 @@ export default () => {
useTextInternal() {
return Text;
},
+ useMaterials() {
+ return materials;
+ },
useJSON6Internal() {
return JSON6;
},
| 0 |
diff --git a/src/components/core/update/updateAutoHeight.js b/src/components/core/update/updateAutoHeight.js -export default function () {
+export default function (speed) {
const swiper = this;
const activeSlides = [];
let newHeight = 0;
let i;
-
+ if (typeof speed === 'number') {
+ swiper.setTransition(speed);
+ } else if (speed === true) {
+ swiper.setTransition(swiper.params.speed);
+ }
// Find slides currently in view
if (swiper.params.slidesPerView !== 'auto' && swiper.params.slidesPerView > 1) {
for (i = 0; i < Math.ceil(swiper.params.slidesPerView); i += 1) {
| 0 |
diff --git a/packages/spark/spark.js b/packages/spark/spark.js // Import all Spark components
-import { hugeTextInput } from './base/hugeTextInput';
+import { hugeInput } from './base/hugeInput';
import { ssnInput } from './base/ssnInput';
import passwordInput from './base/passwordInput';
import { monetaryInput } from './base/monetaryInput';
@@ -40,7 +40,7 @@ const Spark = ({ datePickerConfig = {} } = {}) => {
dropdowns();
stepper();
highlightBoard();
- hugeTextInput();
+ hugeInput();
};
export { Spark as default };
| 3 |
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js @@ -87,23 +87,9 @@ class AttachmentModal extends PureComponent {
this.submitAndClose = this.submitAndClose.bind(this);
this.closeConfirmModal = this.closeConfirmModal.bind(this);
this.validateAndDisplayFileToUpload = this.validateAndDisplayFileToUpload.bind(this);
- this.onDownloadButtonPress = this.onDownloadButtonPress.bind(this);
this.updateConfirmButtonVisibility = this.updateConfirmButtonVisibility.bind(this);
}
- /**
- * Download the attachment
- * /**
- * @param {String} sourceURL
- */
- onDownloadButtonPress(sourceURL) {
- fileDownload(sourceURL, this.props.originalFileName);
-
- // If the keyboard was open before clicking on attachment, after downloading
- // the attachment keyboard will show up, this line fixes that.
- Keyboard.dismiss();
- }
-
/**
* If our attachment is a PDF, return the unswipeable Modal type.
* @param {String} sourceUrl
@@ -125,6 +111,17 @@ class AttachmentModal extends PureComponent {
: CONST.MODAL.MODAL_TYPE.CENTERED;
}
+ /**
+ * @param {String} sourceURL
+ */
+ downloadAttachment(sourceURL) {
+ fileDownload(sourceURL, this.props.originalFileName);
+
+ // At ios if the keyboard was open while opening the attachment, then after downloading
+ // the attachment the keyboard will show up, so we need to dismiss it.
+ Keyboard.dismiss();
+ }
+
/**
* Execute the onConfirm callback and close the modal.
*/
@@ -264,7 +261,7 @@ class AttachmentModal extends PureComponent {
title={this.props.headerTitle || this.props.translate('common.attachment')}
shouldShowBorderBottom
shouldShowDownloadButton={this.props.allowDownload}
- onDownloadButtonPress={() => this.onDownloadButtonPress(sourceURL)}
+ onDownloadButtonPress={() => this.downloadAttachment(sourceURL)}
onCloseButtonPress={() => this.setState({isModalOpen: false})}
subtitle={fileName ? (
<TextWithEllipsis
| 10 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js b/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analyses-view.js @@ -32,6 +32,7 @@ module.exports = CoreView.extend({
checkAndBuildOpts(opts, REQUIRED_OPTS, this);
this._selectedNodeId = opts.selectedNodeId;
+ this._infoboxState = this._infoboxState.bind(this);
this._infoboxModel = new InfoboxModel({
state: ''
@@ -131,13 +132,8 @@ module.exports = CoreView.extend({
},
_getQueryAndCheckState: function () {
- var setStateAndRender = function () {
- this._infoboxState();
- this.render();
- }.bind(this);
-
if (!this._analysisFormsCollection.isEmpty()) {
- setStateAndRender();
+ this._infoboxState();
return;
}
@@ -149,7 +145,7 @@ module.exports = CoreView.extend({
queryGeometryModel: analysisDefinitionNodeModel.queryGeometryModel,
querySchemaModel: analysisDefinitionNodeModel.querySchemaModel
},
- setStateAndRender
+ this._infoboxState
);
},
| 2 |
diff --git a/src/js/operations/IP.js b/src/js/operations/IP.js @@ -209,6 +209,22 @@ var IP = {
output += "\nThis is a reserved multicast address.";
output += "\nMulticast addresses range: ff00::/8";
}
+
+
+ // Detect possible EUI-64 addresses
+ if ((ipv6[5] & 0xff === 0xff) && (ipv6[6] >>> 8 === 0xfe)) {
+ output += "\n\nThis IPv6 address contains a modified EUI-64 address, identified by the presence of FF:FE in the 12th and 13th octets.";
+
+ var intIdent = Utils.hex(ipv6[4] >>> 8) + ":" + Utils.hex(ipv6[4] & 0xff) + ":" +
+ Utils.hex(ipv6[5] >>> 8) + ":" + Utils.hex(ipv6[5] & 0xff) + ":" +
+ Utils.hex(ipv6[6] >>> 8) + ":" + Utils.hex(ipv6[6] & 0xff) + ":" +
+ Utils.hex(ipv6[7] >>> 8) + ":" + Utils.hex(ipv6[7] & 0xff),
+ mac = Utils.hex((ipv6[4] >>> 8) ^ 2) + ":" + Utils.hex(ipv6[4] & 0xff) + ":" +
+ Utils.hex(ipv6[5] >>> 8) + ":" + Utils.hex(ipv6[6] & 0xff) + ":" +
+ Utils.hex(ipv6[7] >>> 8) + ":" + Utils.hex(ipv6[7] & 0xff);
+ output += "\nInterface identifier: " + intIdent +
+ "\nMAC address: " + mac;
+ }
} else {
return "Invalid IPv6 address";
}
| 0 |
diff --git a/spec/services/carto/user_metadata_export_service_spec.rb b/spec/services/carto/user_metadata_export_service_spec.rb @@ -154,7 +154,7 @@ describe Carto::UserMetadataExportService do
after :each do
if @search_tweets
@search_tweets.each do |st|
- st.data_import.destroy
+ st.data_import.try(:destroy)
st.destroy
end
end
@@ -354,7 +354,11 @@ describe Carto::UserMetadataExportService do
end
def expect_export_matches_search_tweet(exported_search_tweet, search_tweet)
+ if exported_search_tweet[:data_import]
expect(exported_search_tweet[:data_import][:id]).to eq search_tweet.data_import.id
+ else
+ expect(search_tweet.data_import).to be_nil
+ end
expect(exported_search_tweet[:service_item_id]).to eq search_tweet.service_item_id
expect(exported_search_tweet[:retrieved_items]).to eq search_tweet.retrieved_items
expect(exported_search_tweet[:state]).to eq search_tweet.state
| 1 |
diff --git a/.vscode/launch.json b/.vscode/launch.json {
"version": "0.2.0",
"configurations": [
- {
- "type": "node",
- "request": "launch",
- "name": "Launch LUISAmir",
- "program": "${workspaceFolder}\\packages\\LUIS\\bin\\luis.js",
- "args": [
- "add",
- "appazureaccount",
- "--in",
- "C:\\Users\\amgeo\\Desktop\\accountToAdd.json",
- "--appId",
- "dec980c7-d340-4fd6-b6c5-0de2ff3f8b8a",
- "--authoringKey",
- "67600430bb5b4653b4aad630ca800c92",
- "--region",
- "westus",
- "--armToken",
- "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ii1zeE1KTUxDSURXTVRQdlp5SjZ0eC1DRHh3MCIsImtpZCI6Ii1zeE1KTUxDSURXTVRQdlp5SjZ0eC1DRHh3MCJ9.eyJhdWQiOiJodHRwczovL21hbmFnZW1lbnQuY29yZS53aW5kb3dzLm5ldC8iLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC83MmY5ODhiZi04NmYxLTQxYWYtOTFhYi0yZDdjZDAxMWRiNDcvIiwiaWF0IjoxNTUxNjIxNzIzLCJuYmYiOjE1NTE2MjE3MjMsImV4cCI6MTU1MTYyNTYyMywiX2NsYWltX25hbWVzIjp7Imdyb3VwcyI6InNyYzEifSwiX2NsYWltX3NvdXJjZXMiOnsic3JjMSI6eyJlbmRwb2ludCI6Imh0dHBzOi8vZ3JhcGgud2luZG93cy5uZXQvNzJmOTg4YmYtODZmMS00MWFmLTkxYWItMmQ3Y2QwMTFkYjQ3L3VzZXJzLzA3YTQxYWZiLWE4MzktNDkwOS1hY2QzLTNlMTg1ZTVjNGZjYS9nZXRNZW1iZXJPYmplY3RzIn19LCJhY3IiOiIxIiwiYWlvIjoiQVZRQXEvOEtBQUFBVlN4WE9peFBnWHROVjF2cjJvdzhJR0o0ODcyVkpVU21wcjZCMDlIMXJuNE9MeFZxSzU3QytZVFdTUzQrOXAwNXBrVC9aeEN1eUZoQ1hIT0xYZVU1Z1R4S0Z5ajJlU2hZNDAzL2FxYlZ2REk9IiwiYW1yIjpbInJzYSIsIm1mYSJdLCJhcHBpZCI6IjVlMWJhNTRkLTQ1MDQtNDc5OS05NjAwLTZkMDVlNThmMDY4MiIsImFwcGlkYWNyIjoiMiIsImZhbWlseV9uYW1lIjoiR2VvcmdlIiwiZ2l2ZW5fbmFtZSI6IkFtaXIiLCJpcGFkZHIiOiIxNjcuMjIwLjE5Ny4xOCIsIm5hbWUiOiJBbWlyIEdlb3JnZSIsIm9pZCI6IjA3YTQxYWZiLWE4MzktNDkwOS1hY2QzLTNlMTg1ZTVjNGZjYSIsIm9ucHJlbV9zaWQiOiJTLTEtNS0yMS03MjA1MTYwNy0xNzQ1NzYwMDM2LTEwOTE4Nzk1Ni0yNTA5MTQiLCJwdWlkIjoiMTAwMzAwMDA5QjM1RTYzQSIsInNjcCI6InVzZXJfaW1wZXJzb25hdGlvbiIsInN1YiI6Illja0NxYmQzZVlRckpiV1JaTFFtWHg2b1c3VEM2ZnFhZE1ZUjFuLWRwRjAiLCJ0aWQiOiI3MmY5ODhiZi04NmYxLTQxYWYtOTFhYi0yZDdjZDAxMWRiNDciLCJ1bmlxdWVfbmFtZSI6ImFtZ2VvQG1pY3Jvc29mdC5jb20iLCJ1cG4iOiJhbWdlb0BtaWNyb3NvZnQuY29tIiwidXRpIjoiQ2xfT0FUMDhwa1NITDF2enVNRWFBQSIsInZlciI6IjEuMCJ9.cio0zqZcLm1kAXTx9NIlIHU7butgmrvxMCJ03jMhzvgVZRbohkyd4OSSYw2BxbqaqW_JmHBVPZtHoLO6l16Ppl6XeeoDqO0cU_vzNzKWXgUGYxWEmf1DzorTAILtnu7tjnUgFKSIi8x5ZLg1269m407PrTIuR_wz3a3mRxVqxsj8dTcAWB_q6pKwC91st5jaRdM84ZzpTj3YK12DnCcpgqdv1IidW6qtCRbr3B2jS5GYDm0fIAKbzyBeCR8g-SyF_DL8HzD3zGeBLT5gl-1akJa8_2CQgCUeYKAk60C6UqdpkQstZSTnNYjY_quNhsh3ors7Q5OZWTiH-ScwbYzY8g"
- ]
- },
{
"type": "node",
"request": "launch",
| 13 |
diff --git a/generators/server/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs b/generators/server/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs @@ -69,7 +69,7 @@ if [ "$#" -gt 0 ]; then
fi
CREATE_KEYSPACE_SCRIPT_FOLDER="$(dirname $CQL_FILES_PATH)"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- EXECUTE_CQL_SCRIPT=$SCRIPT_DIR'/execute-cql.sh'
+ EXECUTE_CQL_SCRIPT=$SCRIPT_DIR'/execute-cql'
else
CQL_FILES_PATH="/cql/changelog/"
EXECUTE_CQL_SCRIPT="./usr/local/bin/execute-cql"
| 1 |
diff --git a/scripts/build.sh b/scripts/build.sh @@ -8,6 +8,15 @@ test -n "$v" || {
echo 'E: could not determine version'
exit 1
}
+if [[ $v = +([0-9]).+([0-9]).+([0-9])-* ]]; then
+ rv=${v%%-*}
+ IFS=.
+ set -A rv -- $rv
+ IFS=$' \t\n'
+ rv=$1.$2.$(($3-1))
+else
+ rv=$v
+fi
rm -f LICENCE.js
{
@@ -15,7 +24,7 @@ rm -f LICENCE.js
sed -e 's/^/ * /' -e 's/ *$//' <LICENSE.txt
echo ' */'
} >LICENCE.js
-header="/*! @license https://github.com/mirabilos/dygraphs/blob/v$v/LICENSE.txt (MIT) */"
+header="/*! @license https://github.com/mirabilos/dygraphs/blob/v$rv/LICENSE.txt (MIT) */"
# Build browser-compatible and ES5 versions in a subdirectory
rm -rf dist disttmp src-es5
| 9 |
diff --git a/lib/node_modules/@stdlib/math/base/special/ceil/test/test.js b/lib/node_modules/@stdlib/math/base/special/ceil/test/test.js @@ -6,6 +6,8 @@ var tape = require( 'tape' );
var PINF = require( '@stdlib/math/constants/float64-pinf' );
var NINF = require( '@stdlib/math/constants/float64-ninf' );
var isnan = require( '@stdlib/math/base/utils/is-nan' );
+var isNegativeZero = require( '@stdlib/math/base/utils/is-negative-zero' );
+var isPositiveZero = require( '@stdlib/math/base/utils/is-positive-zero' );
var ceil = require( './../lib' );
@@ -13,31 +15,43 @@ var ceil = require( './../lib' );
tape( 'main export is a function', function test( t ) {
t.ok( true, __filename );
- t.equal( typeof ceil, 'function', 'main export is a function' );
+ t.strictEqual( typeof ceil, 'function', 'main export is a function' );
t.end();
});
tape( 'the function returns the largest integer greater than or equal to a given number', function test( t ) {
- t.equal( ceil( -4.2 ), -4.0, 'equals -4' );
- t.equal( ceil( 9.99999 ), 10.0, 'equals 10' );
- t.equal( ceil( 0.0 ), 0.0, 'equals 0' );
+ t.strictEqual( ceil( -4.2 ), -4.0, 'equals -4' );
+ t.strictEqual( ceil( 9.99999 ), 10.0, 'equals 10' );
+ t.strictEqual( ceil( 0.0 ), 0.0, 'equals 0' );
t.end();
});
tape( 'the function returns `NaN` if provided a `NaN`', function test( t ) {
var val = ceil( NaN );
- t.equal( isnan( val ), true, 'returns NaN' );
+ t.strictEqual( isnan( val ), true, 'returns NaN' );
+ t.end();
+});
+
+tape( 'the function returns `-0` if provided `-0`', function test( t ) {
+ var val = ceil( -0.0 );
+ t.strictEqual( isNegativeZero( val ), true, 'returns -0' );
+ t.end();
+});
+
+tape( 'the function returns `+0` if provided `+0`', function test( t ) {
+ var val = ceil( +0.0 );
+ t.strictEqual( isPositiveZero( val ), true, 'returns +0' );
t.end();
});
tape( 'the function returns `+infinity` if provided a `+infinity`', function test( t ) {
var val = ceil( PINF );
- t.equal( val, PINF, 'returns +infinity' );
+ t.strictEqual( val, PINF, 'returns +infinity' );
t.end();
});
tape( 'the function returns `-infinity` if provided a `-infinity`', function test( t ) {
var val = ceil( NINF );
- t.equal( val, NINF, 'returns -infinity' );
+ t.strictEqual( val, NINF, 'returns -infinity' );
t.end();
});
| 4 |
diff --git a/data.js b/data.js // See examples below.
module.exports = [
+ {
+ name: "VP PubSub",
+ github: "schubergphilis/vp-pubsub",
+ tags: ["pubsub", "publish", "subscribe", "message", "pub", "sub", "emitter", "event"],
+ description: "VP PubSub is a publish/subscribe library that supports message filtering",
+ url: "https://github.com/schubergphilis/vp-pubsub",
+ source: "https://raw.githubusercontent.com/schubergphilis/vp-pubsub/master/vp-pubsub.js"
+ },
{
name: "tinyModal",
github: "juanbrujo/tinyModal",
| 0 |
diff --git a/server/index.js b/server/index.js @@ -11,9 +11,13 @@ const enableHelmet = process.env.ENABLE_HELMET === '1'
const app = next({dev})
const handle = app.getRequestHandler()
+const {prepareContoursCommunes} = require('../lib/util/contours-communes')
+
app.prepare().then(() => {
const server = express()
+ prepareContoursCommunes()
+
if (!dev) {
server.use(compression())
}
| 6 |
diff --git a/_projects/KombuchaGenomics/KombuchaGenomics.md b/_projects/KombuchaGenomics/KombuchaGenomics.md @@ -25,7 +25,9 @@ This is collaborative project for community labs globally, hosted by Counter Cul
## Participating Community Labs
+ [Counter Culture Labs](http://sphere.diybio.org/labs/CounterCultureLabs/CounterCultureLabs)
+ [BioCurious](http://sphere.diybio.org/labs/Biocurious/Biocurious)
++ [BioMakers Lab Peru](http://sphere.diybio.org/labs/BioMakersLabPeru/BioMakersLabPeru)
+ [BosLab](http://sphere.diybio.org/labs/BosLab/BosLab)
++ Sound Bio
## How to get involved
1. Join the Kombucha Genomics [Mailing List](http://tinyurl.com/kombuchamailinglist)
| 0 |
diff --git a/src/entities/entityRenderers.js b/src/entities/entityRenderers.js @@ -40,13 +40,8 @@ function journalArticleRenderer($$, entityId, entityDb) {
if (entity.doi) {
fragments.push(
- $$('a').attr({
- href: `http://dx.doi.org/${entity.doi}`,
- target: '_blank'
- }).append(
- ' doi ',
- entity.doi
- )
+ ' ',
+ _renderDOI($$, entity.doi)
)
}
return fragments
@@ -96,13 +91,8 @@ function bookRenderer($$, entityId, entityDb) {
if (entity.doi) {
fragments.push(
- $$('a').attr({
- target: '_blank',
- href: `http://dx.doi.org/${entity.doi}`
- }).append(
- ' doi ',
- entity.doi
- )
+ ' ',
+ _renderDOI($$, entity.doi)
)
}
@@ -144,13 +134,8 @@ function clinicalTrialRenderer($$, entityId, entityDb) {
if (entity.doi) {
fragments.push(
- $$('a').attr({
- href: `http://dx.doi.org/${entity.doi}`,
- target: '_blank'
- }).append(
- ' doi ',
- entity.doi
- )
+ ' ',
+ _renderDOI($$, entity.doi)
)
}
return fragments
@@ -185,13 +170,8 @@ function preprintRenderer($$, entityId, entityDb) {
if (entity.doi) {
fragments.push(
- $$('a').attr({
- href: `http://dx.doi.org/${entity.doi}`,
- target: '_blank'
- }).append(
- ' doi ',
- entity.doi
- )
+ ' ',
+ _renderDOI($$, entity.doi)
)
}
return fragments
@@ -266,12 +246,8 @@ function conferenceProceedingRenderer($$, entityId, entityDb) {
if (entity.doi) {
fragments.push(
- $$('a').attr({
- href: `http://dx.doi.org/${entity.doi}`
- }).append(
- ' doi ',
- entity.doi
- )
+ ' ',
+ _renderDOI($$, entity.doi)
)
}
return fragments
@@ -298,12 +274,14 @@ function personRenderer($$, entityId, entityDb, options = {}) {
return result
}
-function organisationRenderer($$, entityId, entityDb) {
+function organisationRenderer($$, entityId, entityDb, options = {}) {
let { name, country } = entityDb.get(entityId)
let result = [ name ]
+ if (!options.short) {
if (country) {
result.push(', ', country)
}
+ }
return result
}
@@ -342,6 +320,16 @@ function _renderAuthors($$, entityIds, entityDb) {
return fragments
}
+function _renderDOI($$, doi) {
+ return $$('a').attr({
+ href: `http://dx.doi.org/${doi}`,
+ target: '_blank'
+ }).append(
+ 'doi ',
+ doi
+ )
+}
+
function _getInitials(givenNames) {
return givenNames.split(' ').map(part => part[0].toUpperCase()).join('')
}
@@ -356,10 +344,10 @@ function _renderHTML($$, htmlString) {
}
function _delegate(fn) {
- return function(entityId, db) {
+ return function(entityId, db, options) {
let el = _createElement()
let $$ = el.createElement.bind(el)
- let fragments = fn($$, entityId, db)
+ let fragments = fn($$, entityId, db, options)
el.append(fragments)
return el.innerHTML
}
| 7 |
diff --git a/js/atb.js b/js/atb.js @@ -148,14 +148,6 @@ var ATB = (() => {
ATB.inject();
}
-
- /* not being used right now
- startUpPage: () => {
- if (!chrome.extension.inIncognitoContext) {
- chrome.tabs.create({url: "/html/intro.html"});
- }
- }
- */
}
})();
| 2 |
diff --git a/packages/app/src/components/Admin/AdminHome/AdminHome.jsx b/packages/app/src/components/Admin/AdminHome/AdminHome.jsx @@ -36,8 +36,6 @@ const AdminHome = (props) => {
const { isV5Compatible } = adminHomeContainer.state;
- let alertStyle = 'alert-info';
- if (isV5Compatible == null) alertStyle = 'alert-warning';
return (
<>
@@ -45,7 +43,7 @@ const AdminHome = (props) => {
// Alert message will be displayed in case that V5 migration has not been compleated
(isV5Compatible != null && !isV5Compatible)
&& (
- <div className={`alert ${alertStyle}`}>
+ <div className={`alert ${isV5Compatible == null ? 'alert-warning' : 'alert-info'}`}>
{t('admin:v5_page_migration.migration_desc')}
<a className="btn-link" href="/admin/app" rel="noopener noreferrer">
<i className="fa fa-link ml-1" aria-hidden="true"></i>
| 7 |
diff --git a/gulpfile.js b/gulpfile.js @@ -162,6 +162,10 @@ exports.loadProxyTests = parallel(loadProxyTestInspector, loadProxyTestData,
exports.generateProxyTests = parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests);
exports.generateProxyDocTests = proxyDocTests;
exports.runProxyTests = runProxyTests;
+exports.setupProxyTests = series(
+ parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases),
+ parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests),
+ proxyDocTests);
exports.proxyTests = series(
parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases),
parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests),
| 0 |
diff --git a/components/mapbox/ban-map/index.js b/components/mapbox/ban-map/index.js @@ -59,13 +59,13 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
cb(feature.properties)
}
- const centerAddress = () => {
+ const centerAddress = useCallback(() => {
if (address && !isCenterControlDisabled) {
map.fitBounds(address.displayBBox, {
padding: 30
})
}
- }
+ }, [address, isCenterControlDisabled, map])
const hasVisibleRenderedFeatures = useCallback(() => {
const featuresQuery = map.queryRenderedFeatures({layers: [
| 0 |
diff --git a/dist/js/tabulator.js b/dist/js/tabulator.js @@ -15701,11 +15701,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.headerFilters = {};
- var oldHeaderFilterColumns = this.headerFilterColumns;
- this.headerFilterColumns = [];
- this.headerFilterElements = [];
-
- oldHeaderFilterColumns.forEach(function (column) {
+ this.headerFilterColumns.forEach(function (column) {
column.modules.filter.value = null;
column.modules.filter.prevSuccess = undefined;
self.reloadHeaderFilter(column);
@@ -21718,8 +21714,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (self.table.options.selectable && self.table.options.selectable != "highlight") {
if (self.table.options.selectableRangeMode === "click") {
element.addEventListener("click", function (e) {
- if (e.shiftKey) {
+
self.table._clearSelection();
+
+ if (e.shiftKey) {
self.lastClickedRow = self.lastClickedRow || row;
var lastClickedRowIdx = self.table.rowManager.getDisplayRowIndex(self.lastClickedRow);
@@ -21756,7 +21754,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
self.selectRows(toggledRows);
}
- self.table._clearSelection();
} else if (e.ctrlKey || e.metaKey) {
self.toggleRow(row);
self.lastClickedRow = row;
@@ -21765,6 +21762,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
self.selectRows(row);
self.lastClickedRow = row;
}
+
+ self.table._clearSelection();
});
} else {
element.addEventListener("click", function (e) {
| 13 |
diff --git a/js/hoverzoom.js b/js/hoverzoom.js @@ -1462,7 +1462,7 @@ var hoverZoom = {
headers: new Headers({
'Origin': location.origin
}),
- mode: 'cors'
+ mode: 'no-cors'
})
.then(response => response.blob())
.then(blob => {
| 12 |
diff --git a/events.json b/events.json "commune": ""
},
"href": "",
- "instructions": "Inscriptions closes",
+ "isSubscriptionClosed": true,
+ "instructions": "",
"startHour": "14:00",
"endHour": "15:30"
},
"commune": ""
},
"href": "",
+ "isSubscriptionClosed": true,
"instructions": "",
"startHour": "14:00",
"endHour": "15:30"
"commune": ""
},
"href": "https://www.eventbrite.fr/e/billets-adresse-lab1-269490381987",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "10:00",
"endHour": "12:00"
"commune": ""
},
"href": "",
- "instructions": "Inscriptions closes",
+ "isSubscriptionClosed": true,
+ "instructions": "",
"startHour": "14:00",
"endHour": "15:30"
},
"commune": ""
},
"href": "",
- "instructions": "Inscriptions closes",
+ "isSubscriptionClosed": true,
+ "instructions": "",
"startHour": "14:00",
"endHour": "15:30"
},
"codePostal": "",
"commune": ""
},
- "href": "",
- "instructions": "Inscriptions closes",
+ "href": "https://cryptpad.fr/form/#/2/form/view/GwBMzsZjMftfsZULBCWOAP8HkHAqI7KlIi2xWXtqJFE/embed/",
+ "isSubscriptionClosed": true,
+ "instructions": "",
"startHour": "14:00",
"endHour": "15:30"
},
"commune": ""
},
"href": "https://www.eventbrite.fr/e/inscription-adresse-lab-identifiants-session-1-311197368707",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "10:00",
"endHour": "12:00"
"commune": ""
},
"href": "https://cryptpad.fr/form/#/2/form/view/vDJTz0bY-VLzwkyaa6Ubj+NkI6bJ8WG5qK3GPlCBlI0/embed/",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "14:00",
"endHour": "15:30"
"commune": ""
},
"href": "https://cryptpad.fr/form/#/2/form/view/BGnrBMIF7o4GBJ5fjEy9--DHfn36JkElX9lXEajfKAI/embed/",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "14:00",
"endHour": "15:30"
"commune": ""
},
"href": "https://www.eventbrite.fr/e/inscription-adresse-lab-identifiants-session-1-311197368707",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "10:00",
"endHour": "12:00"
"commune": ""
},
"href": "https://cryptpad.fr/form/#/2/form/view/UgnknVMXIvIN2GQT3iyB5L5HuGkr8gZrbGivU0Phv-w/embed/",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "14:00",
"endHour": "15:30"
"commune": ""
},
"href": "https://cryptpad.fr/form/#/2/form/view/unkb1bTYS69N0ANl7kmPnwWDMrCUZ9CxKyIJOKOxIiI/embed/",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "14:00",
"endHour": "15:30"
"commune": ""
},
"href": "https://cryptpad.fr/form/#/2/form/view/PTJr1owjcnXbkohaUNNqDoNOy-b9yYwEkLHTZz99p6E/embed/",
+ "isSubscriptionClosed": false,
"instructions": "",
"startHour": "14:00",
"endHour": "15:30"
| 7 |
diff --git a/src/routes/AppRouter.js b/src/routes/AppRouter.js @@ -8,12 +8,12 @@ import Detail from '../components/CountryDetails/Detail';
export default props => {
const regions = [
- "/africa",
- "/americas",
- "/asia",
- "/europe",
- "/oceania",
- "/polar"
+ "/travel-guide/africa",
+ "/travel-guide/americas",
+ "/travel-guide/asia",
+ "/travel-guide/europe",
+ "/travel-guide/oceania",
+ "/travel-guide/polar"
];
const routes = regions.map((region, index) => {
return (
@@ -40,7 +40,7 @@ export default props => {
<Header />
<Switch>
<Route
- path="/"
+ path="/travel-guide"
exact={true}
render={() => (
<RegionList
@@ -50,7 +50,7 @@ export default props => {
)}
/>
{routes}
- <Route exact path="/detail/:id" render={() => (
+ <Route exact path="/travel-guide/detail/:id" render={() => (
<Detail
flags={props.state.flagList}
countries={props.state.countries}
| 1 |
diff --git a/core/bound_variable_value.js b/core/bound_variable_value.js @@ -157,7 +157,6 @@ Blockly.BoundVariableValue.prototype.dispose = function(opt_removeReference) {
if (this.referenceList_.length == 0) {
if (this.sourceBlock_) {
- this.sourceBlock_.typedValue[this.mainFieldName_];
Blockly.BoundVariables.removeValue(this.workspace_, this);
}
Blockly.BoundVariableValue.superClass_.dispose.call(this);
| 2 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-footer/sprk-footer.component.ts b/angular/projects/spark-angular/src/lib/components/sprk-footer/sprk-footer.component.ts @@ -28,7 +28,7 @@ import { Component, Input } from '@angular/core';
<sprk-link
linkType="plain"
href="{{ item.href }}"
- analyticsString="{{ item.analytics }}"
+ analyticsString="{{ item.analytics || item.analyticsString }}"
>
<sprk-icon
*ngIf="item.icon"
@@ -79,6 +79,7 @@ import { Component, Input } from '@angular/core';
linkType="simple"
additionalClasses="sprk-u-FontWeight--normal"
href="{{ link.href }}"
+ analyticsString="{{ link.analyticsString || link.analytics }}"
>
{{ link.text }}
</sprk-link>
@@ -116,7 +117,7 @@ import { Component, Input } from '@angular/core';
<sprk-link
linkType="plain"
href="{{ item.href }}"
- analyticsString="{{ item.analytics }}"
+ analyticsString="{{ item.analytics || item.analyticsString }}"
>
<sprk-icon
*ngIf="item.icon"
@@ -157,7 +158,7 @@ import { Component, Input } from '@angular/core';
<sprk-link
additionalClasses="sprk-o-Stack__item"
href="{{ award.href }}"
- analyticsString="{{ award.analytics }}"
+ analyticsString="{{ award.analytics || award.analyticsString }}"
>
<img
*ngIf="award.imgSrc"
@@ -175,7 +176,7 @@ import { Component, Input } from '@angular/core';
>
<sprk-toggle
title="{{ toggle.title }}"
- analyticsString="{{ toggle.analytics }}"
+ analyticsString="{{ toggle.analytics || toggle.analyticsString }}"
iconClass="sprk-c-Icon--stroke-current-color"
titleFontClass="sprk-b-TypeBodyFour"
>
@@ -211,7 +212,7 @@ import { Component, Input } from '@angular/core';
<sprk-link
linkType="plain"
href="{{ item.href }}"
- analyticsString="{{ item.analytics }}"
+ analyticsString="{{ item.analytics || item.analyticsString }}"
>
<sprk-icon
*ngIf="item.icon"
| 3 |
diff --git a/stories/index.js b/stories/index.js -import React from 'react';
+import React, { Component } from 'react';
import { storiesOf, action, linkTo } from '@kadira/storybook';
import withContext from 'recompose/withContext';
import { connect } from 'react-redux';
@@ -389,6 +389,121 @@ storiesOf('Cell', module)
</Griddle>);
});
+storiesOf('Bug fixes', module)
+ .add('Delete row', () => {
+ const enhanceWithOnClick = onClick => class ComputeThing extends Component {
+ static propTypes = {
+ rowData: React.PropTypes.object.isRequired,
+ }
+
+ localClick = () => {
+ const { id } = this.props.rowData;
+
+ onClick(id);
+ }
+
+ render() {
+ const { rowData: { id } } = this.props;
+
+ return (
+ <button type='button' onClick={this.localClick}>
+ Remove {id}
+ </button>
+ )
+ }
+ }
+
+
+ class SomeComponent extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ data: [
+ {
+ "id": 0,
+ "name": "Mayer Leonard",
+ "country": "United Kingdom",
+ "city": "Kapowsin",
+ "state": "Hawaii",
+ "company": "Ovolo",
+ "favoriteNumber": 7
+ },
+ {
+ "id": 1,
+ "name": "Koch Becker",
+ "city": "Johnsonburg",
+ "state": "New Jersey",
+ "country": "Madagascar",
+ "company": "Eventage",
+ "favoriteNumber": 2
+ },
+ {
+ "id": 2,
+ "name": "Lowery Hopkins",
+ "city": "Blanco",
+ "state": "Arizona",
+ "country": "Ukraine",
+ "company": "Comtext",
+ "favoriteNumber": 3
+ },
+ {
+ "id": 3,
+ "name": "Walters Mays",
+ "city": "Glendale",
+ "state": "Illinois",
+ "country": "New Zealand",
+ "company": "Corporana",
+ "favoriteNumber": 6
+ },
+ {
+ "id": 4,
+ "name": "Shaw Lowe",
+ "city": "Coultervillle",
+ "state": "Wyoming",
+ "country": "Ecuador",
+ "company": "Isologica",
+ "favoriteNumber": 2
+ },
+ {
+ "id": 5,
+ "name": "Ola Fernandez",
+ "city": "Deltaville",
+ "state": "Delaware",
+ "country": "Virgin Islands (US)",
+ "company": "Pawnagra",
+ "favoriteNumber": 7
+ },
+ ]
+ }
+
+ this.Component = EnhanceWithRowData(enhanceWithOnClick(this.onRemove));
+
+ }
+
+ onRemove = (rowId) => {
+ const newData = this.state.data.filter(x => x.id !== rowId);
+ this.setState({data: newData});
+ }
+
+ render() {
+ return (
+ <Griddle data={this.state.data} plugins={[LocalPlugin]}>
+ <RowDefinition>
+ <ColumnDefinition id="id" />
+ <ColumnDefinition id="name" />
+ <ColumnDefinition id="somethingTotallyMadeUp" title="Compute thing" customComponent={this.Component} />
+ </RowDefinition>
+ </Griddle>
+ );
+ }
+ }
+
+ return (
+ <SomeComponent />
+ );
+})
+
storiesOf('Row', module)
.add('base row', () => {
const cells = [
| 0 |
diff --git a/protocols/peer/test/Peer-unit.js b/protocols/peer/test/Peer-unit.js @@ -192,12 +192,11 @@ contract('Peer Unit Tests', async accounts => {
})
describe('Test setTakerWallet', async () => {
- // it('Test unsetRule permissions', async () => {
- // await reverted(
- // peer.unsetRule(TAKER_TOKEN, MAKER_TOKEN, { from: notOwner })
- // )
- // await passes(peer.unsetRule(TAKER_TOKEN, MAKER_TOKEN, { from: owner }))
- // })
+ it('Test setTakerWallet permissions', async () => {
+ await reverted(peer.setTakerWallet(notOwner, { from: notOwner }))
+
+ await passes(peer.setTakerWallet(notOwner, { from: owner }))
+ })
})
describe('Test getMakerSideQuote', async () => {
| 12 |
diff --git a/app.rb b/app.rb @@ -74,7 +74,7 @@ get '/launches/upcoming' do
content_type :json
year = "upcoming"
statement = DB.prepare("SELECT * FROM launch WHERE launch_year = ?")
- results = statement.execute(year)
+ results = statement.execute(year, :cast_booleans => true)
hash = results.each do |row|
end
if hash.empty?
| 12 |
diff --git a/tags/tags.json b/tags/tags.json "a16z": {
"name": "A16Z",
"description": "Tokens backed by Andreesen-Horrowitz"
+ },
+ "oracle": {
+ "name": "Oracles",
+ "description": "Tokens associated with decentralized oracle infrastructure"
+ },
+ "defi": {
+ "name": "DeFi",
+ "description": "Tokens associated with the decentralized finance movement."
+ },
+ "business-services": {
+ "name": "Business Services",
+ "description": "Tokens that are redeemable for a business service"
+ },
+ "exchange-based": {
+ "name": "Exchange Based",
+ "description": "Tokens that offer holders discounts on trading fees and other benefits"
}
}
| 2 |
diff --git a/example/src/components/CustomIcon.js b/example/src/components/CustomIcon.js @@ -30,6 +30,7 @@ class CustomIcon extends React.Component {
};
this.onPress = this.onPress.bind(this);
+ this.onSourceLayerPress = this.onSourceLayerPress.bind(this);
}
async onPress(e) {
@@ -41,6 +42,11 @@ class CustomIcon extends React.Component {
});
}
+ onSourceLayerPress(e) {
+ const feature = e.nativeEvent.payload;
+ console.log('You pressed a layer here is your feature', feature); // eslint-disable-line
+ }
+
render() {
return (
<Page {...this.props}>
@@ -52,6 +58,8 @@ class CustomIcon extends React.Component {
style={sheet.matchParent}>
<MapboxGL.ShapeSource
id="symbolLocationSource"
+ hitbox={{ width: 20, height: 20 }}
+ onPress={this.onSourceLayerPress}
shape={this.state.featureCollection}>
<MapboxGL.SymbolLayer
id="symbolLocationSymbols"
| 3 |
diff --git a/test/jasmine/tests/gl3dlayout_test.js b/test/jasmine/tests/gl3dlayout_test.js @@ -168,33 +168,33 @@ describe('Test Gl3d layout defaults', function() {
layoutIn = { scene: {} };
supplyLayoutDefaults(layoutIn, layoutOut, fullData);
expect(layoutOut.scene.dragmode)
- .toBe('orbit', 'to orbit by default');
+ .toBe('turntable', 'to turntable by default');
- layoutIn = { scene: { dragmode: 'turntable' } };
+ layoutIn = { scene: { dragmode: 'orbit' } };
supplyLayoutDefaults(layoutIn, layoutOut, fullData);
expect(layoutOut.scene.dragmode)
- .toBe('turntable', 'to user val if valid');
+ .toBe('orbit', 'to user val if valid');
- layoutIn = { scene: {}, dragmode: 'turntable' };
+ layoutIn = { scene: {}, dragmode: 'orbit' };
supplyLayoutDefaults(layoutIn, layoutOut, fullData);
expect(layoutOut.scene.dragmode)
- .toBe('turntable', 'to user layout val if valid and 3d only');
+ .toBe('orbit', 'to user layout val if valid and 3d only');
layoutIn = { scene: {}, dragmode: 'invalid' };
supplyLayoutDefaults(layoutIn, layoutOut, fullData);
expect(layoutOut.scene.dragmode)
- .toBe('orbit', 'to orbit if invalid and 3d only');
+ .toBe('turntable', 'to turntable if invalid and 3d only');
layoutIn = { scene: {}, dragmode: 'orbit' };
layoutOut._basePlotModules.push({ name: 'cartesian' });
supplyLayoutDefaults(layoutIn, layoutOut, fullData);
expect(layoutOut.scene.dragmode)
- .toBe('orbit', 'to default if not 3d only');
+ .toBe('turntable', 'to default if not 3d only');
layoutIn = { scene: {}, dragmode: 'not gonna work' };
supplyLayoutDefaults(layoutIn, layoutOut, fullData);
expect(layoutOut.scene.dragmode)
- .toBe('orbit', 'to default if not valid');
+ .toBe('turntable', 'to default if not valid');
});
it('should coerce hovermode', function() {
| 13 |
diff --git a/SuspiciousVotingHelper.user.js b/SuspiciousVotingHelper.user.js // @description Assists in building suspicious votes CM messages. Highlight same users across IPxref table.
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.0.8
+// @version 1.1
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
@@ -264,6 +264,112 @@ it doesn't seem that this account is a sockpuppet due to different PII and are m
$(`a[href$="/users/${currUid}"]`).first().closest('tr').triggerHandler('click');
}
+ // If on user votes page
+ if(location.pathname.includes('/show-user-votes/')) {
+
+ // Sort invalidated votes table by date of invalidation instead, but still allow sorting by other columns
+ const activeVotesTables = $('.cast-votes:first table');
+ const invalidatedVotesTables = $('.cast-votes:last table');
+
+ activeVotesTables.on('click', 'th', function() {
+ let sortFunction;
+ switch($(this).index()) {
+
+ case 0: // user
+ sortFunction = function(a, b) {
+ let aTxt = $(a).find('.user-details a').text(),
+ bTxt = $(b).find('.user-details a').text();
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt > bTxt) ? 1 : -1;
+ };
+ break;
+
+ case 1: // type
+ sortFunction = function(a, b) {
+ let aTxt = $(a).find('.vote-type span').text(),
+ bTxt = $(b).find('.vote-type span').text();
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt > bTxt) ? 1 : -1;
+ };
+ break;
+
+ case 2: // rep
+ sortFunction = function(a, b) {
+ let aTxt = Number($(a).find('.vote-type').next().text().split(' / ')[0]),
+ bTxt = Number($(b).find('.vote-type').next().text().split(' / ')[0]);
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt < bTxt) ? 1 : -1;
+ };
+ break;
+
+ case 3: // perc
+ sortFunction = function(a, b) {
+ let aTxt = Number($(a).find('.number span').text().replace('%', '')),
+ bTxt = Number($(b).find('.number span').text().replace('%', ''));
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt < bTxt) ? 1 : -1;
+ };
+ break;
+
+ default:
+ return; // do nothing
+ }
+ // Sort posts in-memory then reattach to container
+ const tbody = $(this).closest('table').find('tbody');
+ tbody.children().sort(sortFunction).detach().appendTo(tbody);
+
+ return false;
+ });
+
+ invalidatedVotesTables.on('click', 'th', function() {
+ let sortFunction;
+ switch($(this).index()) {
+
+ case 0: // user
+ sortFunction = function(a, b) {
+ let aTxt = $(a).find('.user-details a').text(),
+ bTxt = $(b).find('.user-details a').text();
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt > bTxt) ? 1 : -1;
+ };
+ break;
+
+ case 1: // num
+ sortFunction = function(a, b) {
+ let aTxt = Number($(a).find('.number').text()),
+ bTxt = Number($(b).find('.number').text());
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt < bTxt) ? 1 : -1;
+ };
+ break;
+
+ case 2: // date
+ sortFunction = function(a, b) {
+ let aTxt = $(a).find('.relativetime').attr('title'),
+ bTxt = $(b).find('.relativetime').attr('title');
+
+ if(aTxt == bTxt) return 0;
+ return (aTxt < bTxt) ? 1 : -1;
+ };
+ break;
+
+ default:
+ return; // do nothing
+ }
+ // Sort posts in-memory then reattach to container
+ const tbody = $(this).closest('table').find('tbody');
+ tbody.children().sort(sortFunction).detach().appendTo(tbody);
+
+ return false;
+ });
+ }
+
// CM message page
if(location.pathname.includes('/admin/cm-message/')) {
@@ -303,6 +409,9 @@ tr[data-uid].active {
tr[data-uid].focus {
background: #cfc;
}
+.sorter th {
+ cursor: pointer;
+}
</style>
`;
$('body').append(styles);
| 11 |
diff --git a/components/combobox/__examples__/dialog.jsx b/components/combobox/__examples__/dialog.jsx @@ -3,6 +3,7 @@ import React from 'react';
import Checkbox from '~/components/checkbox';
import Combobox from '~/components/combobox';
import IconSettings from '~/components/icon-settings';
+import Popover from '~/components/popover';
class Example extends React.Component {
constructor(props) {
@@ -14,14 +15,6 @@ class Example extends React.Component {
};
}
- componentDidUpdate() {
- console.log(
- 'componentDidUpdate',
- this.state.selection,
- this.state.inputValue
- );
- }
-
handleCheckboxChange(target, value) {
const selection = this.state.selection;
if (target.checked) {
@@ -46,23 +39,26 @@ class Example extends React.Component {
return (
<IconSettings iconPath="/assets/icons">
<Combobox
+ ariaLabelledby="popover-label"
+ assistiveText={{
+ popoverLabel: 'Language Options'
+ }}
id="combobox-dialog"
events={{
onSubmit: (e) => { },
}}
+ firstFocusable={this.firstFocusable}
labels={{
label: 'Languages',
placeholder: this.state.inputValue,
}}
- popover
- // is passing selection necessary? seems not.
- selection={this.state.selection}
- value={this.state.inputValue}
- variant="popover"
- >
+ popover={
+ <Popover
+ body={
+ <div>
<fieldset className="slds-form-element">
<legend className="slds-form-element__legend slds-form-element__label">
- Select languages
+ Select up to 2
</legend>
<div className="slds-form-element__control">
<Checkbox
@@ -98,7 +94,15 @@ class Example extends React.Component {
/>
</div>
</fieldset>
- </Combobox>
+ </div>
+ }
+ />
+ }
+ // is passing selection necessary? seems not.
+ selection={this.state.selection}
+ value={this.state.inputValue}
+ variant="popover"
+ />
</IconSettings>
);
}
| 3 |
diff --git a/src/compiler/nodes.imba1 b/src/compiler/nodes.imba1 @@ -3745,7 +3745,13 @@ export class MethodDeclaration < Func
if option(:inClassBody) or option(:inObject)
# what if this is async?
- let prefix = self.isGetter() ? 'get ' : (self.isSetter() ? 'set ' : '')
+ let prefix = ''
+ if self.isGetter
+ prefix = M('get',option(:keyword)) + ' '
+ elif self.isSetter
+ prefix = M('set',option(:keyword)) + ' '
+ # let prefix = self.isGetter() ? 'get ' : (self.isSetter() ? 'set ' : '')
+
prefix = "async {prefix}" if option(:async)
prefix = "{M('static',option(:static))} {prefix}" if option(:static)
out = "{prefix}{M name, null, as: 'field'}({params.c}){code}"
@@ -5018,7 +5024,13 @@ export class VarOrAccess < ValueNode
def js o
let val = @variable or @value
if @variable and @variable.declarator != self
- let typ = datatype
+ if STACK.tsc and val.@typedAlias
+ return [email protected]
+ # if @variable.c == 'val'
+ # # not when we are part of a setter though
+ # console.log 'compile varoraccess variable',@variable
+ let typ = datatype # or (STACK.tsc and @variable.vartype)
+ # FIXME not if it is in left-side of assignment
if typ
return typ.c() + '(' + @variable.c() + ')'
@@ -6895,25 +6907,24 @@ export class ForOf < For
return head + code
else
+
+ if STACK.tsc
+ # get all the variables declared in the let
+ for item in @declvars
+ if item.vartype
+ let vname = item.c
+ let decl = item.@declarator
+ let op = LIT("{item.vartype.c} let {M item.typedAlias.c,decl} = {vname}")
+ body.unshift(op)
+
+
# compile to a naive for of loop
code = scope.c(braces: yes, indent: yes)
# let inCode = osrc.@variable ? src : (OP('=',src,osrc))
# it is really important that this is a treated as a statement
let ofjs = src.c(expression: yes)
- let js = ''
- if STACK.tsc
- js = '{\n'
- # get all the variables declared in the let
- for item in @declvars
- try
- if item.vartype
- js += item.vartype.c + ' '
- js += "let {item.c(jsdoc: yes)};\n"
- js += "{M('for',keyword)} ({v.c(jsdoc: no)} of {ofjs})" + code
- js += '}'
- else
- js = "{M('for',keyword)} (let {v.c} of {ofjs})" + code
+ let js = "{M('for',keyword)} (let {v.c} of {ofjs})" + code
if vars:counter
js = "{vars:counter} = 0; {js}"
@@ -11107,6 +11118,9 @@ export class Variable < Node
@assignments = []
self
+ def typedAlias
+ @typedAlias ||= Variable.new(@scope,@name + '$TYPED$',@declarator,@options)
+
def isGlobal name
@type == 'global' and (!name or @name == name)
@@ -11117,7 +11131,7 @@ export class Variable < Node
@assignments
def vartype
- @vartype or (@declarator and @declarator.datatype)
+ @vartype or (@declarator and @declarator:datatype and @declarator.datatype)
# Here we can collect lots of type-info about variables
# and show warnings / give advice if variables are ambiguous etc
@@ -11219,6 +11233,9 @@ export class Variable < Node
return "[" + c({}) + "]"
return @c if @c
+
+ if @typedAlias
+ @typedAlias.c(params)
# options - proxy??
if @proxy
if @proxy isa Node
| 7 |
diff --git a/scripts/test-isolated.js b/scripts/test-isolated.js @@ -47,13 +47,14 @@ const initialSetupDeferred = !inputOptions.skipFsCleanupCheck
? initialGitStatusDeferred
: Promise.resolve();
+const cwdPathLength = process.cwd().length + 1;
const paths = mochaCollectFiles({
ignore: [],
extension: ['js'],
file: [],
recursive: process.argv.includes('--recursive'),
spec: filePatterns,
-});
+}).map(filename => filename.slice(cwdPathLength));
if (!paths.length) {
process.stderr.write(chalk.red.bold('No test files matched\n\n'));
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ## vNext
+## 0.8.1
+
### Features
-- Make it possible to provide simple skins via `ThemeProvider`
+- Provide simple skins by default via `ThemeProvider` but allow customization
[PR 96](https://github.com/input-output-hk/react-polymorph/pull/96)
## 0.8.0
| 6 |
diff --git a/bin/definition-validators/path.js b/bin/definition-validators/path.js @@ -25,6 +25,8 @@ function PathObject(data) {
const { major } = data;
Object.assign(this, {
+ type: 'object',
+ properties: {
summary: {
type: 'string'
},
@@ -52,5 +54,6 @@ function PathObject(data) {
type: 'array',
items: Parameter
}
+ }
});
}
\ No newline at end of file
| 1 |
diff --git a/lib/components/helpers/choices.js b/lib/components/helpers/choices.js @@ -283,7 +283,7 @@ module.exports = React.createClass({
} else if (_.isNull(choice.sectionKey)) {
isInSection = false;
}
- if (choice.value && choice.value.match(magicChoiceRe)) {
+ if (choice.value && String(choice.value).match(magicChoiceRe)) {
visibleChoices.push(choice);
} else if (alwaysExanded || choice.sectionKey || isInOpenSection || !isInSection) {
visibleChoices.push(choice);
| 1 |
diff --git a/test/unit/helpers/vuex-setup.js b/test/unit/helpers/vuex-setup.js @@ -8,16 +8,15 @@ const Modules = require('renderer/vuex/modules').default
const Getters = require('renderer/vuex/getters')
export default function vuexSetup () {
- const node = require('../helpers/node_mock')
- const modules = Modules({
- node
- })
-
const localVue = createLocalVue()
localVue.use(Vuex)
localVue.use(VueRouter)
function init (componentConstructor, testType = shallow, {stubs, getters = {}, propsData}) {
+ const node = require('../helpers/node_mock')
+ const modules = Modules({
+ node
+ })
let store = new Vuex.Store({
getters: Object.assign({}, Getters, getters),
modules
| 1 |
diff --git a/ReduceClutter.user.js b/ReduceClutter.user.js // @description Revert recent changes that makes the page more cluttered
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.18.2
+// @version 1.18.3
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
@@ -151,6 +151,12 @@ ul.comments-list .comment-up-on {
max-height: 80vh;
}
+
+/* Remove new edit button from question closed notice */
+.js-post-notice .mt24:last-child {
+ display: none;
+}
+
`);
| 2 |
diff --git a/cmd.js b/cmd.js #!/usr/bin/env node
const argv = require("minimist")(process.argv.slice(2));
const EleventyNodeVersionCheck = require("./src/VersionCheck");
+const debug = require("debug")("Eleventy-CLI");
EleventyNodeVersionCheck().then(function() {
const Eleventy = require("./src/Eleventy");
+ debug(
+ "command: eleventy" +
+ (argv.input ? " --input=" + argv.input : "") +
+ (argv.output ? " --output=" + argv.output : "") +
+ (argv.formats ? " --formats=" + arg.formats : "") +
+ (argv.config ? " --config=" + arg.config : "") +
+ (argv.quiet ? " --quiet" : "") +
+ (argv.version ? " --version" : "") +
+ (argv.watch ? " --watch" : "")
+ );
let elev = new Eleventy(argv.input, argv.output);
elev.setConfigPath(argv.config);
| 0 |
diff --git a/packages/react-router/docs/api/hooks.md b/packages/react-router/docs/api/hooks.md @@ -140,3 +140,13 @@ function BlogPost() {
return <div />;
}
```
+
+The `useRouteMatch` hook takes a single argument, which is identical to [props argument of matchPath](./matchPath.md#props). It can be either a pathname as a string (like the example above) or an object with the matching props that `Route` accepts, like this:
+
+```jsx
+const match = useRouteMatch({
+ path: "/BLOG/:slug/",
+ strict: true,
+ sensitive: true
+});
+```
| 0 |
diff --git a/build/release-notes/avalanchego.md b/build/release-notes/avalanchego.md {% page-ref page="../tutorials/nodes-and-staking/upgrade-your-avalanchego-node.md" %}
-## [v1.6.5](https://github.com/ava-labs/avalanchego/releases/tag/v1.6.5)
+## v1.6.5 ([View on GitHub](https://github.com/ava-labs/avalanchego/releases/tag/v1.6.5))
This version is backwards compatible to [v1.6.0](https://github.com/ava-labs/avalanchego/releases/tag/v1.6.0). It is optional, but encouraged.
-## Bootstrapping
+**Bootstrapping**
- Drop inbound messages to a chain if that chain is in the execution phase of bootstrapping.
- Print beacon nodeIDs upon failure to connect to them.
-## Metrics
+**Metrics**
- Added `avalanche_{ChainID}_bootstrap_finished`, which is 1 if the chain is done bootstrapping, 0 otherwise.
-## APIs
+**APIs**
- Added `info.uptime` API call that attempts to report the network's view of the local node.
- Added `observedUptime` to each peer's result in `info.peers`.
-## Network
+**Network**
- Added reported uptime to pong messages to be able to better track a local node's uptime as viewed by the network.
- Refactored request timeout registry to avoid a potential race condition.
+
## v1.6.4 \([View on GitHub](https://github.com/ava-labs/avalanchego/releases/tag/v1.6.4)\)
This version is backwards compatible to [v1.6.0](https://github.com/ava-labs/avalanchego/releases/tag/v1.6.0). It is optional, but encouraged.
-### Config
+**Config**
- Added flag `throttler-inbound-bandwidth-refill-rate`, which specifies the max average inbound bandwidth usage of a peer.
- Added flag `throttler-inbound-bandwidth-max-burst-size`, which specifies the max inbound bandwidth usage of a peer.
-### Networking
+**Networking**
- Updated peerlist gossiping to use the same mechanism as other gossip calls.
- Added inbound message throttling based on recent bandwidth usage.
-### Metrics
+**Metrics**
- Updated `avalanche_{ChainID}_handler_gossip_{count,sum}` to `avalanche_{ChainID}_handler_gossip_request_{count,sum}`.
- Updated `avalanche_{ChainID}_lat_get_accepted_{count,sum}` to `avalanche_{ChainID}_lat_accepted_{count,sum}`.
@@ -52,22 +53,21 @@ This version is backwards compatible to [v1.6.0](https://github.com/ava-labs/ava
- Added `avalanche_P_vm_votes_won`
- Added `avalanche_P_vm_votes_lost`
-### Indexer
+**Indexer**
- Added method `GetContainerByID` to client implementation.
- Client methods now return `[]byte` rather than `string` representations of a container.
-### C-Chain
+**C-Chain**
- Updated Geth dependency to 1.10.11.
- Added a new admin API for updating the log level and measuring performance.
- Added a new `--allow-unprotected-txs` flag to allow issuance of transactions without EIP-155 replay protection.
-### Subnet & Custom VMs
+**Subnet & Custom VMs**
- Ensured that all possible chains are run in `--staking-enabled=false` networks.
----
## v1.6.3 \([View on GitHub](https://github.com/ava-labs/avalanchego/releases/tag/v1.6.3)\)
| 4 |
diff --git a/src/os/ui/menu/layermenu.js b/src/os/ui/menu/layermenu.js @@ -198,7 +198,7 @@ os.ui.menu.layer.setup = function() {
children: [{
label: 'Export...',
eventType: os.action.EventType.EXPORT,
- tooltip: 'Repositions the map to show the layer',
+ tooltip: 'Exports data from this layer',
icons: ['<i class="fa fa-fw fa-download"></i>'],
beforeRender: os.ui.menu.layer.visibleIfSupported,
handler: os.ui.menu.layer.onExport_,
| 1 |
diff --git a/src/compiler/nodes.imba1 b/src/compiler/nodes.imba1 @@ -4662,6 +4662,7 @@ export class Access < Op
var rgtexpr = null
if lft isa VarOrAccess and lft.@variable isa ImportProxy
+ unless lft.@variable isa ImbaRuntime and STACK.tsc
return [email protected](rgt).c
if rgt isa Token
@@ -5849,12 +5850,14 @@ export class Argvar < ValueNode
# NEXT -- global.parseInt or Number.parseInt (better)
var v = parseInt(String(value))
# FIXME Not needed anymore? I think the lexer handles this
- return "arguments" if v == 0
-
+ var out = "arguments"
+ if v > 0
var s = scope__
# params need to go up to the closeste method-scope
var par = s.params.at(v - 1,yes)
- "{AST.c(par.name)}" # c
+ out = "{AST.c(par.name)}" # c
+
+ M(out, @token or @value)
# CALL
@@ -7263,8 +7266,13 @@ export class TagAttr < TagPart
let path = value isa Str and value.raw
if path and !path.match(/^(\/|https?\:\/\/)/)
+ if STACK.tsc
+ val = CALL(LIT('require'),[value]).c
+ # return "{@tag.tvar}.setAttribute('{key}',String({val}))"
+ else
@asset = STACK.root.registerAsset(path,kind)
val = @asset:ref.c
+
else
val = MP(val,"path.{kind}")
@@ -11317,6 +11325,10 @@ export class ImbaRuntime < ImportProxy
self.path = options:runtime
self
+ def head
+ return '' if STACK.tsc
+ return super
+
def c
if !@importAll
@importAll = yes
@@ -11437,7 +11449,7 @@ export class Super < Node
def self.callOp name
let op = OP('.',LIT('super'),name)
- CALL(op,[LIT('arguments[0]')])
+ CALL(op,[LIT('...arguments')])
def c
let m = @method
@@ -11455,7 +11467,7 @@ export class Super < Node
if m and m.isConstructor and !member
let target = option(:target) or LIT('super')
let fallbackArgs = option(:args) or [LIT('...arguments')]
- return CALL(target,args or fallbackArgs).c
+ return M(CALL(target,args or fallbackArgs).c,@keyword)
op = LIT('super(...arguments)')
elif m and virtual
# FIXME - we no longer support super in class extensions
@@ -11478,7 +11490,7 @@ export class Super < Node
if args
op = CALL(op,args)
- return op ? (M op.c(mark: false), self) : '/**/'
+ return op ? (M op.c(mark: false), @keyword) : '/**/'
if up isa Call and m and !m.isConstructor
return OP('.',sup,m.name).c
| 7 |
diff --git a/packages/eslint-plugin/rules/jsdoc-requires-since.test.js b/packages/eslint-plugin/rules/jsdoc-requires-since.test.js @@ -41,14 +41,7 @@ ruleTester.run( 'jsdoc-requires-since', rule, {
* A function that returns a string, to test out ESLint.
*
* @since 1.7.1
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
},
{
@@ -59,14 +52,7 @@ export function exampleTestFunction( props ) {
* @since 1.7.1
* @since 1.8.0 Added a feature.
* @since n.e.x.t Added another feature.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function coolFunction( props ) {
- return 'test';
-}
`,
},
{
@@ -77,14 +63,7 @@ export function coolFunction( props ) {
* @since 1.7.1
* @since 1.8.0 Added a feature.
* @since 1.9.1 Added another feature.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function coolFunction( props ) {
- return 'test';
-}
`,
},
{
@@ -95,14 +74,7 @@ export function coolFunction( props ) {
* @since 1.7.1 Originally introduced.
* @since 1.8.0 Added a feature.
* @since 1.9.1 Added another feature.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function coolFunction( props ) {
- return 'test';
-}
`,
},
{
@@ -113,14 +85,7 @@ export function coolFunction( props ) {
* @since 1.7.1 Originally introduced.
* @since 1.8.0 Added a feature.
* @since n.e.x.t Added another feature.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function coolFunction( props ) {
- return 'test';
-}
`,
},
],
@@ -132,14 +97,7 @@ export function coolFunction( props ) {
*
* @since 1.7.0
* @since 1.7.1
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -155,14 +113,7 @@ export function exampleTestFunction( props ) {
*
* @since 1.7.0
* @since 1.7.1
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -179,14 +130,7 @@ export function exampleTestFunction( props ) {
* @since 1.6.0
* @since 1.7.0
* @since 1.7.1 Add a feature.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -201,14 +145,7 @@ export function exampleTestFunction( props ) {
* A function that returns a string, to test out ESLint.
*
* @since 1.7.1 Missing a full-stop
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -224,14 +161,7 @@ export function exampleTestFunction( props ) {
*
* @since 1.7.1
* @since 1.7.2 Missing a full-stop
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -247,14 +177,7 @@ export function exampleTestFunction( props ) {
*
* @since 1.7.1
* @since 1.7.2 lowercase description.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -270,14 +193,7 @@ export function exampleTestFunction( props ) {
*
* @since 1.7.1 lowercase description.
* @since 1.7.2 Normal description.
- * @private
- *
- * @param {?Object} props Component props.
- * @return {string} A test string.
*/
-export function exampleTestFunction( props ) {
- return 'test';
-}
`,
errors: [
{
@@ -293,13 +209,7 @@ export function exampleTestFunction( props ) {
*
* @since 1.7.2 Another description.
* @since 1.7.1 Normal description.
- * @private
- *
- * @return {string} A test string.
*/
-export function exampleTestFunction() {
- return 'test';
-}
`,
errors: [
{
@@ -315,13 +225,7 @@ export function exampleTestFunction() {
*
* @since 1.7.1 Normal description.
* @since 1.7.1 Another description.
- * @private
- *
- * @return {string} A test string.
*/
-export function exampleTestFunction() {
- return 'test';
-}
`,
errors: [
{
@@ -336,14 +240,8 @@ export function exampleTestFunction() {
* An object.
*
* @since 1.0.0 Bar.
- *
* @since 1.2.0 \`F\`
- *
- * @type {Object} A cool object.
*/
-export const myCoolObject = {
- foo: 'bar',
-};
`,
errors: [
{
| 2 |
diff --git a/generators/server/templates/src/main/docker/jib/entrypoint.sh.ejs b/generators/server/templates/src/main/docker/jib/entrypoint.sh.ejs -#!/bin/sh
+#!/bin/bash
echo "The application will start in ${JHIPSTER_SLEEP}s..." && sleep ${JHIPSTER_SLEEP}
+
+# usage: file_env VAR [DEFAULT]
+# ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
+file_env() {
+ local var="$1"
+ local fileVar="${var}_FILE"
+ local def="${2:-}"
+ if [[ ${!var:-} && ${!fileVar:-} ]]; then
+ echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+ exit 1
+ fi
+ local val="$def"
+ if [[ ${!var:-} ]]; then
+ val="${!var}"
+ elif [[ ${!fileVar:-} ]]; then
+ val="$(< "${!fileVar}")"
+ fi
+
+ if [[ -n $val ]]; then
+ export "$var"="$val"
+ fi
+
+ unset "$fileVar"
+}
+
+file_env 'SPRING_DATASOURCE_URL'
+file_env 'SPRING_DATASOURCE_USERNAME'
+file_env 'SPRING_DATASOURCE_PASSWORD'
+file_env 'SPRING_LIQUIBASE_URL'
+file_env 'SPRING_LIQUIBASE_USER'
+file_env 'SPRING_LIQUIBASE_PASSWORD'
+file_env 'JHIPSTER_REGISTRY_PASSWORD'
+
exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "<%= packageName %>.<%= mainClass %>" "$@"
| 11 |
diff --git a/lib/plugins/login/login.js b/lib/plugins/login/login.js @@ -55,7 +55,7 @@ class Login {
const version = this.serverless.version;
const state = `id%3D${frameworkId}%26version%3D${version}%26platform%3D${process.platform}`;
// refresh token docs https://auth0.com/docs/tokens/preview/refresh-token#get-a-refresh-token
- const scope = 'openid%20nickname%20email%20name%20login_count%20created_at%20original_user_id%20offline_access'; // eslint-disable-line
+ const scope = 'openid%20nickname%20email%20name%20login_count%20created_at%20tracking_id%20offline_access'; // eslint-disable-line
const authorizeUrl =
`${config.AUTH0_URL}/authorize?response_type=code&scope=${scope}` +
`&client_id=${config.AUTH0_CLIENT_ID}&redirect_uri=${config.AUTH0_CALLBACK_URL}` +
@@ -94,7 +94,7 @@ class Login {
const decoded = jwtDecode(platformResponse.id_token);
this.serverless.cli.log('You are now logged in');
// because platform only support github
- const id = decoded.original_user_id || decoded.sub;
+ const id = decoded.tracking_id || decoded.sub;
/* For future use
segment.identify({
| 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.