code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/animations-baker.js b/animations-baker.js @@ -329,7 +329,8 @@ const {CharsetEncoder} = require('three/examples/js/libs/mmdparser.js');
const rootBone = object; // not really a bone
const leftFootBone = bones.find(b => b.name === 'mixamorigLeftFoot');
const rightFootBone = bones.find(b => b.name === 'mixamorigRightFoot');
- const allOnes = arr => arr.every(v => v === 1);
+ const epsilon = 0.001;
+ const allOnesEpsilon = arr => arr.every(v => Math.abs(1 - v) < epsilon);
const bonePositionInterpolants = {};
const boneQuaternionInterpolants = {};
@@ -346,7 +347,7 @@ const {CharsetEncoder} = require('three/examples/js/libs/mmdparser.js');
const boneInterpolant = new THREE.QuaternionLinearInterpolant(track.times, track.values, track.getValueSize());
boneQuaternionInterpolants[boneName] = boneInterpolant;
} else if (/\.scale$/.test(track.name)) {
- if (allOnes(track.values)) {
+ if (allOnesEpsilon(track.values)) {
const index = tracks.indexOf(track);
tracksToRemove.push(index);
} else {
| 11 |
diff --git a/package.json b/package.json "scripts": {
"test": "jest",
"lint": "./node_modules/.bin/eslint src/* test/* build/*",
- "build": "BABEL_ENV=build node build",
+ "build": "BABEL_ENV=build node build && npm run size",
"sauce": "npx karma start karma.sauce.conf.js",
"test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2 && npm run sauce -- 3",
- "gzip-size": "gzip-size dayjs.min.js",
+ "size": "size-limit",
"postpublish": "npm run test:sauce"
},
"pre-commit": [
"lint"
],
+ "size-limit": [{
+ "limit": "2.5 KB",
+ "path": "dayjs.min.js"
+ }],
"jest": {
"roots": [
"test"
"eslint-config-airbnb-base": "^12.1.0",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-jest": "^21.15.0",
- "gzip-size-cli": "^2.1.0",
"jasmine-core": "^2.99.1",
"jest": "^22.4.3",
"karma": "^2.0.2",
"rollup": "^0.57.1",
"rollup-plugin-babel": "^4.0.0-beta.4",
"rollup-plugin-uglify": "^3.0.0",
+ "size-limit": "^0.18.0",
"typescript": "^2.8.3"
}
}
| 14 |
diff --git a/lib/voice/VoiceConnectionManager.js b/lib/voice/VoiceConnectionManager.js @@ -79,29 +79,39 @@ class VoiceConnectionManager extends Collection {
this.pendingGuilds[data.guild_id].waiting = true;
const disconnectHandler = () => {
connection = this.get(data.guild_id);
- if(!this.pendingGuilds[data.guild_id]) {
if(connection) {
connection.removeListener("ready", readyHandler);
- }
- return;
- }
- connection.removeListener("ready", readyHandler);
+ connection.removeListener("error", errorHandler);
+ };
+ if(this.pendingGuilds[data.guild_id]) {
this.pendingGuilds[data.guild_id].rej(new Error("Disconnected"));
delete this.pendingGuilds[data.guild_id];
+ }
};
const readyHandler = () => {
connection = this.get(data.guild_id);
- if(!this.pendingGuilds[data.guild_id]) {
if(connection) {
connection.removeListener("disconnect", disconnectHandler);
+ connection.removeListener("error", errorHandler);
+ };
+ if(this.pendingGuilds[data.guild_id]) {
+ this.pendingGuilds[data.guild_id].res(connection);
+ delete this.pendingGuilds[data.guild_id];
}
- return;
- }
+ };
+ const errorHandler = (err) => {
+ connection = this.get(data.guild_id);
+ if(connection) {
connection.removeListener("disconnect", disconnectHandler);
- this.pendingGuilds[data.guild_id].res(connection);
+ connection.removeListener("ready", readyHandler);
+ connection.disconnect();
+ };
+ if(this.pendingGuilds[data.guild_id]) {
+ this.pendingGuilds[data.guild_id].rej(err);
delete this.pendingGuilds[data.guild_id];
+ }
};
- connection.once("ready", readyHandler).once("disconnect", disconnectHandler);
+ connection.once("ready", readyHandler).once("disconnect", disconnectHandler).once("error", errorHandler);
}
leave(guildID) {
| 9 |
diff --git a/struts2-jquery-integration-tests/src/test/java/com/jgeppert/jquery/progressbar/ProgressbarTagIT.java b/struts2-jquery-integration-tests/src/test/java/com/jgeppert/jquery/progressbar/ProgressbarTagIT.java @@ -56,7 +56,7 @@ public class ProgressbarTagIT {
WebElement progressbar = driver.findElement(By.id("myProgressbar"));
WebElement progressbarValueDiv = progressbar.findElement(By.className("ui-progressbar-value"));
- Assert.assertEquals("width: 42%;", progressbarValueDiv.getAttribute("style"));
+ Assert.assertEquals("width: 42%;", progressbarValueDiv.getAttribute("style").trim());
}
@Test
@@ -70,7 +70,7 @@ public class ProgressbarTagIT {
WebElement progressbarValueDiv = progressbar.findElement(By.className("ui-progressbar-value"));
WebElement button = driver.findElement(By.id("myButton"));
- Assert.assertEquals("width: 42%;", progressbarValueDiv.getAttribute("style"));
+ Assert.assertEquals("width: 42%;", progressbarValueDiv.getAttribute("style").trim());
button.click();
| 1 |
diff --git a/tests/unit_tests/exclusion_test.js b/tests/unit_tests/exclusion_test.js @@ -6,7 +6,7 @@ extend(global, require("./test_chrome_stubs.js"));
// extend(global, require "../../background_scripts/marks.js")
// But it looks like marks.coffee has never been included in a test before!
// Temporary fix...
-root.Marks = {
+global.Marks = {
create() { return true; },
goto: {
bind() { return true; }
| 1 |
diff --git a/src/components/routes/account/OrderInfo.vue b/src/components/routes/account/OrderInfo.vue @@ -75,12 +75,20 @@ export default {
},
toClipboard (text) {
- this.$copyText(text).then((e) => {
- alert('Copied')
- console.log(e)
- }, (e) => {
- alert('Can not copy')
- console.log(e)
+ this.$copyText(text).then(() => {
+ this.$message({
+ message: this.$t('order.codeCopied'),
+ type: 'success',
+ duration: 1500
+ })
+ }, err => {
+ // cannot handle copy
+ console.error(err)
+ this.$message({
+ showClose: true,
+ message: this.$t('order.copyError'),
+ type: 'warning'
+ })
})
}
},
| 9 |
diff --git a/package.json b/package.json },
"dependencies": {
"@11ty/dependency-tree": "^2.0.1",
- "@11ty/eleventy-dev-server": "^1.0.0-canary.7",
+ "@11ty/eleventy-dev-server": "^1.0.0-canary.8",
"@11ty/eleventy-utils": "^1.0.1",
"@iarna/toml": "^2.2.5",
"@sindresorhus/slugify": "^1.1.2",
| 4 |
diff --git a/articles/api/management/v2/query-string-syntax.md b/articles/api/management/v2/query-string-syntax.md @@ -40,6 +40,10 @@ Some examples of query string syntax are:
`_exists_: description`
+* Your query can search across more than one field by using the `AND` & `OR` condition. Where the username field is exactly `"john"` AND the field `description` has any non-null value:
+
+ `username: "john" AND _exists_: description`
+
### Wildcards
Wildcard searches can be run on individual terms, using `?` to replace a single character, and `*` to replace zero or more characters:
@@ -92,7 +96,7 @@ Some examples of range queries are:
* Last login date of 2015:
- `last_login:[2015-01-01 TO 2015-12-31]
+ `last_login:[2015-01-01 TO 2015-12-31]`
* Users who have logged in between 1-5 times:
| 0 |
diff --git a/packages/idyll-document/src/runtime.js b/packages/idyll-document/src/runtime.js @@ -225,7 +225,7 @@ class IdyllRuntime extends React.PureComponent {
(acc, k) => {
if (state[k] !== nextState[k]) {
acc.push(k);
- changedMap[k] = nextState[k];
+ changedMap[k] = nextState[k] || state[k];
}
return acc;
},
| 1 |
diff --git a/aws/apigateway/response.go b/aws/apigateway/response.go @@ -41,3 +41,51 @@ func NewErrorResponse(statusCode int, messages ...string) *Error {
}
return err
}
+
+// Response is the type returned by an API Gateway function
+type Response struct {
+ Code int `json:"code,omitempty"`
+ Body interface{} `json:"body,omitempty"`
+ Headers map[string]string `json:"headers,omitempty"`
+}
+
+// canonicalResponse is the type for the canonicalized response with the
+// headers ensured to be lowercase
+type canonicalResponse struct {
+ Code int `json:"code,omitempty"`
+ Body interface{} `json:"body,omitempty"`
+ Headers map[string]string `json:"headers,omitempty"`
+}
+
+// MarshalJSON is a custom marshaller to ensure that the marshalled
+// headers are always lowercase
+func (resp *Response) MarshalJSON() ([]byte, error) {
+ canonicalResponse := canonicalResponse{
+ Code: resp.Code,
+ Body: resp.Body,
+ }
+ if len(resp.Headers) != 0 {
+ canonicalResponse.Headers = make(map[string]string)
+ for eachKey, eachValue := range resp.Headers {
+ canonicalResponse.Headers[strings.ToLower(eachKey)] = eachValue
+ }
+ }
+ return json.Marshal(&canonicalResponse)
+}
+
+// NewResponse returns an API Gateway response object
+func NewResponse(code int, body interface{}, headers ...map[string]string) *Response {
+ response := &Response{
+ Code: code,
+ Body: body,
+ }
+ if len(headers) != 0 {
+ response.Headers = make(map[string]string)
+ for _, eachHeaderMap := range headers {
+ for eachKey, eachValue := range eachHeaderMap {
+ response.Headers[eachKey] = eachValue
+ }
+ }
+ }
+ return response
+}
| 0 |
diff --git a/app/src/renderer/vuex/modules/wallet.js b/app/src/renderer/vuex/modules/wallet.js @@ -122,7 +122,7 @@ export default ({ commit, node }) => {
let genesis = await fs.readJson(genesisPath)
let denoms = {}
- for (let account of genesis.app_options.accounts) {
+ for (let account of genesis.app_state.accounts) {
for (let { denom } of account.coins) {
denoms[denom] = true
}
| 1 |
diff --git a/Gulpfile.js b/Gulpfile.js @@ -111,19 +111,6 @@ var CLIENT_TESTS_DESKTOP_BROWSERS = [
}
];
-var CLIENT_TESTS_OLD_BROWSERS = [
- {
- platform: 'Windows 8',
- browserName: 'internet explorer',
- version: '10.0'
- },
- {
- platform: 'Windows 7',
- browserName: 'internet explorer',
- version: '9.0'
- }
-];
-
var CLIENT_TESTS_MOBILE_BROWSERS = [
{
platform: 'Linux',
@@ -372,16 +359,6 @@ gulp.step('test-client-travis-run', function () {
gulp.task('test-client-travis', gulp.series('build', 'test-client-travis-run'));
-gulp.step('test-client-old-browsers-travis-run', function () {
- var saucelabsSettings = CLIENT_TESTS_SAUCELABS_SETTINGS;
-
- saucelabsSettings.browsers = CLIENT_TESTS_OLD_BROWSERS;
-
- return testClient('test/client/fixtures/**/*-test.js', CLIENT_TESTS_SETTINGS, saucelabsSettings);
-});
-
-gulp.task('test-client-old-browsers-travis', gulp.series('build', 'test-client-old-browsers-travis-run'));
-
gulp.step('test-client-travis-mobile-run', function () {
var saucelabsSettings = CLIENT_TESTS_SAUCELABS_SETTINGS;
| 2 |
diff --git a/src/shaders/primitive.vert b/src/shaders/primitive.vert @@ -101,8 +101,8 @@ void main()
#ifdef HAS_NORMALS
#ifdef HAS_TANGENTS
vec3 tangent = getTangent();
- vec3 normalW = normalize(vec3(u_NormalMatrix * vec4(getNormal().xyz, 0.0)));
- vec3 tangentW = normalize(vec3(u_ModelMatrix * vec4(tangent.xyz, 0.0)));
+ vec3 normalW = normalize(vec3(u_NormalMatrix * vec4(getNormal(), 0.0)));
+ vec3 tangentW = normalize(vec3(u_ModelMatrix * vec4(tangent, 0.0)));
vec3 bitangentW = cross(normalW, tangentW) * a_Tangent.w;
v_TBN = mat3(tangentW, bitangentW, normalW);
#else // !HAS_TANGENTS
| 2 |
diff --git a/lib/transports/__es__/_helpers.js b/lib/transports/__es__/_helpers.js @@ -52,7 +52,14 @@ const scrollResultSet = (self, callback, loadedHits, response) => {
const { awsChain, awsAccessKeyId, awsIniFileProfile } = self.parent.options
- if (awsChain || awsAccessKeyId || awsIniFileProfile) {
+ if (self.ESversion === '1') {
+ // body based parameters were added in 2.0.0
+ // scroll_id needs to be sent raw (base64 encoded)
+ Object.assign(scrollRequest, {
+ uri: `${scrollRequest.uri}?scroll=${self.parent.options.scrollTime}`,
+ body: self.lastScrollId
+ })
+ } else if (awsChain || awsAccessKeyId || awsIniFileProfile) {
Object.assign(scrollRequest, {
uri: `${scrollRequest.uri}?scroll=${self.parent.options.scrollTime}`,
body: jsonParser.stringify({
@@ -60,13 +67,6 @@ const scrollResultSet = (self, callback, loadedHits, response) => {
}),
method: 'GET'
})
- } else if (self.ESversion === '1') {
- // body based parameters were added in 2.0.0
- // scroll_id needs to be sent raw (base64 encoded)
- Object.assign(scrollRequest, {
- uri: `${scrollRequest.uri}?scroll=${self.parent.options.scrollTime}`,
- body: self.lastScrollId
- })
} else {
Object.assign(scrollRequest, {
body: jsonParser.stringify({
| 9 |
diff --git a/test/spec/windshaft/client.spec.js b/test/spec/windshaft/client.spec.js @@ -7,18 +7,16 @@ var Request = require('../../../src/windshaft/request');
var LZMA = require('lzma');
describe('windshaft/client', function () {
- describe('instantiateMap', function () {
+ fdescribe('instantiateMap', function () {
beforeEach(function () {
spyOn($, 'ajax').and.callFake(function (params) {
this.ajaxParams = params;
}.bind(this));
- spyOn(util, 'uniqueCallbackName').and.callFake(function () {
- return 'callbackName';
- });
+ spyOn(util, 'uniqueCallbackName').and.callFake(function () { return 'callbackName'; });
this.client = new WindshaftClient({
- urlTemplate: 'https://{user}.example.com:443',
+ urlTemplate: 'https://{user}.carto.com:443',
userName: 'rambo'
});
});
@@ -29,7 +27,7 @@ describe('windshaft/client', function () {
var url = this.ajaxParams.url.split('?')[0];
- expect(url).toEqual('https://rambo.example.com:443/api/v1/map');
+ expect(url).toEqual('https://rambo.carto.com:443/api/v1/map');
expect(this.ajaxParams.method).toEqual('GET');
expect(this.ajaxParams.dataType).toEqual('jsonp');
expect(this.ajaxParams.jsonpCallback).toMatch('_cdbc_callbackName');
@@ -39,7 +37,7 @@ describe('windshaft/client', function () {
it('should use the endpoint for named maps', function () {
var request = new Request({ some: 'json that must be encoded' }, {}, {});
this.client = new WindshaftClient({
- urlTemplate: 'https://{user}.example.com:443',
+ urlTemplate: 'https://{user}.carto.com:443',
userName: 'rambo',
templateName: 'tpl123456789'
});
@@ -47,7 +45,7 @@ describe('windshaft/client', function () {
var url = this.ajaxParams.url.split('?')[0];
- expect(url).toEqual('https://rambo.example.com:443/api/v1/map/named/tpl123456789/jsonp');
+ expect(url).toEqual('https://rambo.carto.com:443/api/v1/map/named/tpl123456789/jsonp');
});
it('should include the given params and handle JSON objects correctly', function () {
@@ -60,7 +58,7 @@ describe('windshaft/client', function () {
var url = this.ajaxParams.url.split('?')[0];
var params = this.ajaxParams.url.split('?')[1].split('&');
- expect(url).toEqual('https://rambo.example.com:443/api/v1/map');
+ expect(url).toEqual('https://rambo.carto.com:443/api/v1/map');
expect(params[0]).toEqual('config=%7B%22some%22%3A%22json%20that%20must%20be%20encoded%22%7D');
expect(params[1]).toEqual('stat_tag=stat_tag');
expect(params[2]).toEqual('filters=%7B%22some%22%3A%22filters%20that%20will%20be%20applied%22%7D');
@@ -142,13 +140,6 @@ describe('windshaft/client', function () {
});
describe('HTTP method:', function () {
- beforeEach(function () {
- this.client = new WindshaftClient({
- urlTemplate: 'https://{user}.carto.com:443',
- userName: 'rambo'
- });
- });
-
it('should use GET to URL with encoded config when the payload is small enough', function (done) {
var smallPayload = new Array(1933).join('x');
var request = new Request(smallPayload, { a: 'a sentence' }, {});
| 14 |
diff --git a/src/style_manager/model/PropertyFactory.ts b/src/style_manager/model/PropertyFactory.ts import { isFunction, isString } from 'underscore';
+import { PropertyCompositeProps } from './PropertyComposite';
type Option = {
id: string;
@@ -7,6 +8,8 @@ type Option = {
type Property = Record<string, any>;
+type PartialProps = Partial<Property | PropertyCompositeProps>;
+
const getOptions = (items: string[]): Option[] => items.map(item => ({ id: item }));
export default class PropertyFactory {
@@ -187,7 +190,7 @@ export default class PropertyFactory {
// Build default built-in properties (the order, in the array here below, matters)
// [propertyName, propertyDefinition, extendFromProperty]
- [
+ const propsToCreate: ([string, PartialProps, string] | [string, PartialProps])[] = [
// Number types
['text-shadow-h', { type: typeNumber, default: '0', units: this.unitsSizeNoPerc }],
['top', { default: 'auto', units: this.unitsSize, fixedValues }, 'text-shadow-h'],
@@ -367,6 +370,7 @@ export default class PropertyFactory {
'box-shadow',
{
preview: true,
+ // @ts-ignore
layerLabel: (l, { values }) => {
const x = values['box-shadow-h'];
const y = values['box-shadow-v'];
@@ -389,6 +393,7 @@ export default class PropertyFactory {
'text-shadow',
{
default: 'none',
+ // @ts-ignore
layerLabel: (l, { values }) => {
const x = values['text-shadow-h'];
const y = values['text-shadow-v'];
@@ -403,6 +408,7 @@ export default class PropertyFactory {
'background',
{
detached: true,
+ // @ts-ignore
layerLabel: (l, { values }) => {
const repeat = values['background-repeat-sub'] || '';
const pos = values['background-position-sub'] || '';
@@ -430,6 +436,7 @@ export default class PropertyFactory {
layerSeparator: ' ',
fromStyle(style, { property, name }) {
const filter = style[name] || '';
+ // @ts-ignore
const sep = property.getLayerSeparator();
return filter
? filter.split(sep).map(input => {
@@ -478,6 +485,7 @@ export default class PropertyFactory {
],
onChange({ property, to }) {
if (to.value) {
+ // @ts-ignore
const option = property.getOption();
const props = { ...(option.propValue || {}) };
const propToUp = property.getParent().getProperty('transform-value');
@@ -498,8 +506,9 @@ export default class PropertyFactory {
],
},
],
- ].forEach(arr => {
- const [prop, def, from] = arr as [string, Property, string];
+ ];
+
+ propsToCreate.forEach(([prop, def, from]) => {
this.add(prop, def || {}, { from });
});
| 5 |
diff --git a/docs-www/package.json b/docs-www/package.json },
"dependencies": {
"@brainhubeu/gatsby-docs-kit": "3.0.8",
- "@brainhubeu/react-carousel": "^1.13.21",
+ "@brainhubeu/react-carousel": "^1.13.20",
"gatsby": "2.20.8",
"gatsby-link": "2.3.1",
"lodash": "^4.17.15",
| 13 |
diff --git a/aleph/analyze/polyglot_entity.py b/aleph/analyze/polyglot_entity.py @@ -35,6 +35,7 @@ class PolyglotEntityAnalyzer(EntityAnalyzer):
cls._languages = [p.language for p in packages]
except Exception:
log.info("Cannot load polyglot language list.")
+ cls._languages = []
return cls._languages
def tag_text(self, text, languages):
| 9 |
diff --git a/src/components/NavigationDesktop/NavigationItemDesktop.js b/src/components/NavigationDesktop/NavigationItemDesktop.js @@ -91,20 +91,6 @@ class NavigationItemDesktop extends Component {
this.setState({ isSubNavOpen: false });
};
- renderMainNav() {
- const { classes: { primaryNavItem }, navItem } = this.props;
-
- if (!this.hasSubNavItems) {
- return (
- <Link route={`${this.linkPath()}`}>
- <ListItemText disableTypography={true} primary={navItem.name} className={primaryNavItem} />
- </Link>
- );
- }
-
- return navItem.name;
- }
-
renderSubNav(navItemGroup) {
return (
<Fragment>
@@ -163,7 +149,7 @@ class NavigationItemDesktop extends Component {
return (
<Fragment>
<Button className={primaryNavItem} color="inherit" onClick={this.onClick}>
- {this.renderMainNav()}
+ {navItem.name}
{this.hasSubNavItems && <Fragment>{this.state.isSubNavOpen ? <ChevronUpIcon /> : <ChevronDownIcon />}</Fragment>}
</Button>
{this.hasSubNavItems && this.renderPopover()}
| 13 |
diff --git a/README.md b/README.md @@ -71,6 +71,13 @@ Works with devices from this list https://github.com/ioBroker/ioBroker.zigbee/wi
## Changelog
+### 0.10.3 (2019-03-27)
+* fixes
+* (kirovilya) Aqara Wireless Relay Controller, Smart LED Driver
+* (asgothian) eCozy Thermostat, Nue / 3A, Gledopto GL-C-006 GL-C-009, Philips SML002, OSRAM Outdoor Lantern W RGBW
+* (arteck) sensor_86sw2 new states
+* (allofmex) Improved device configuration and network map
+
### 0.10.2 (2019-03-15)
* some fixes
* (allofmex) Visualize mesh newtwork map, "available" state, configuration requests
| 6 |
diff --git a/core/background/migrate.js b/core/background/migrate.js @@ -10,6 +10,10 @@ define(['storage/chromeStorage'], (ChromeStorage) => {
* @return {Promise} Promise that will be resolved when the task has complete
*/
function migrateFromLocalStorage() {
+ if (!localStorage.length) {
+ return Promise.resolve();
+ }
+
let options = ChromeStorage.getStorage(ChromeStorage.OPTIONS);
let defaultOptions = [
'disableGa', 'forceRecognize', 'useNotifications',
@@ -17,10 +21,6 @@ define(['storage/chromeStorage'], (ChromeStorage) => {
];
return options.get().then((data) => {
- if (!localStorage.length) {
- return;
- }
-
for (let option of defaultOptions) {
if (localStorage[option] !== undefined) {
data[option] = localStorage[option] === '1';
| 7 |
diff --git a/src/server/optimizing-compiler/codegen.js b/src/server/optimizing-compiler/codegen.js @@ -53,10 +53,10 @@ function genSSRElement (el: ASTElement, state: CodegenState): string {
return genFor(el, state, genSSRElement)
} else if (el.if && !el.ifProcessed) {
return genIf(el, state, genSSRElement)
+ } else if (el.tag === 'template' && !el.slotTarget) {
+ return genSSRChildren(el, state) || 'void 0'
}
- // TODO handle <template> tag
- // TODO optimize style/class rendering
// TODO optimize merge sibling nodes
switch (el.ssrOptimizability) {
@@ -137,6 +137,8 @@ function elementToSegments (el, state): Array<StringSegment> {
type: EXPRESSION,
value: genIf(el, state, elementToString, '""')
}]
+ } else if (el.tag === 'template') {
+ return childrenToSegments(el, state)
}
const openSegments = elementToOpenTagSegments(el, state)
| 9 |
diff --git a/vis/js/list.js b/vis/js/list.js @@ -116,10 +116,14 @@ export const list = StateMachine.create({
});
list.sortBy = function(field) {
+ let sort_field = field;
+
//if field (potentially) includes highlight spans, sort by original text
- let sort_field = (Array.isArray(config.highlight_query_fields) && config.highlight_query_fields.includes(field))
- ? (field + config.sort_field_exentsion)
- : (field);
+ if(config.highlight_query_terms
+ && config.highlight_query_fields.includes(field)) {
+ sort_field = field + config.sort_field_exentsion;
+ }
+
sortBy(sort_field);
}
| 1 |
diff --git a/html/components/alert.stories.js b/html/components/alert.stories.js @@ -68,7 +68,7 @@ export const success = () => {
data-analytics="object.action.event"
>
<div class="sprk-c-Alert__content">
- <svg class="sprk-c-Alert__icon sprk-c-Icon sprk-c-Icon--filled sprk-c-Icon--filled-current-color" viewBox="0 0 512 512" aria-hidden="true" >
+ <svg class="sprk-c-Alert__icon sprk-c-Icon sprk-c-Icon--filled sprk-c-Icon--filled-current-color" viewBox="0 0 64 64" aria-hidden="true" >
<use xlink:href="#check-mark-filled"></use>
</svg>
<p class="sprk-c-Alert__text">
@@ -109,7 +109,7 @@ export const fail = () => {
data-analytics="object.action.event"
>
<div class="sprk-c-Alert__content">
- <svg class="sprk-c-Alert__icon sprk-c-Icon sprk-c-Icon--filled sprk-c-Icon--filled-current-color" viewBox="0 0 576 512" aria-hidden="true" >
+ <svg class="sprk-c-Alert__icon sprk-c-Icon sprk-c-Icon--filled sprk-c-Icon--filled-current-color" viewBox="0 0 64 64" aria-hidden="true" >
<use xlink:href="#exclamation-filled"></use>
</svg>
<p class="sprk-c-Alert__text"> This is a failure message to alert that something was not successful.</p>
@@ -150,7 +150,7 @@ export const noDismissButton = () => {
<div class="sprk-c-Alert__content">
<svg
class="sprk-c-Alert__icon sprk-c-Icon sprk-c-Icon--filled sprk-c-Icon--filled-current-color"
- viewBox="0 0 512 512"
+ viewBox="0 0 64 64"
aria-hidden="true"
>
<use xlink:href="#check-mark-filled"></use>
| 3 |
diff --git a/lib/Backend/NativeCodeGenerator.cpp b/lib/Backend/NativeCodeGenerator.cpp @@ -3745,6 +3745,7 @@ JITManager::HandleServerCallResult(HRESULT hr, RemoteCallType callType)
return true;
case E_ABORT:
throw Js::OperationAbortedException();
+ case HRESULT_FROM_WIN32(ERROR_COMMITMENT_LIMIT):
case E_OUTOFMEMORY:
if (callType == RemoteCallType::MemFree)
{
| 9 |
diff --git a/src/components/SessionApprove.vue b/src/components/SessionApprove.vue <template>
<div class="session-approve">
<h2>Approve Transaction</h2>
- <div>
- <p>Verify the transaction details below.</p>
- </div>
<br />
+ <div class="from">
+ From
+ <Bech32 :address="senderAddress" />
+ </div>
<TmFormGroup v-if="signRequest">
<TransactionItem
v-if="transaction"
:show-meta-data="false"
/>
<!-- Going to take some more logic based on how transactions are passed in -->
- <div>
- From
- <Bech32 :address="senderAddress" />
- </div>
<TableInvoice
+ class="approval-table"
:amount="amount"
:estimated-fee="fees"
:bond-denom="bondDenom"
id="reject-btn"
value="Reject"
class="left-button"
- color="secondary"
+ type="secondary"
@click.native="reject"
/>
<TmBtn
id="approve-btn"
value="Approve"
class="right-button"
- color="primary"
+ type="primary"
@click.native="approve"
/>
</div>
@@ -221,11 +219,26 @@ export default {
.session-approve-footer {
display: flex;
- justify-content: space-around;
- padding: 1.5rem 0 1rem;
+ justify-content: flex-end;
+ padding: 2rem 0 0;
/* keeps button in bottom right no matter the size of the action modal */
flex-grow: 1;
- align-self: flex-end;
+}
+
+.from {
+ font-size: 14px;
+}
+
+.left-button {
+ margin-right: 0.5rem;
+}
+</style>
+
+<style>
+.approval-table .table-invoice {
+ padding: 0.5rem 0;
+ margin: 1rem 0;
+ font-size: 14px;
}
</style>
| 7 |
diff --git a/app/stylesheets/builtin-pages/network.less b/app/stylesheets/builtin-pages/network.less align-items: center;
justify-content: space-between;
background: #fff;
+ width: 700px;
padding: 10px 15px;
font-size: .75rem;
border-bottom: 1px solid #ddd;
| 12 |
diff --git a/assets/js/components/user-input/UserInputQuestionnaire.js b/assets/js/components/user-input/UserInputQuestionnaire.js @@ -71,10 +71,8 @@ export default function UserInputQuestionnaire() {
const dashboardURL = useSelect( ( select ) =>
select( CORE_SITE ).getAdminURL( 'googlesitekit-dashboard' )
);
- const { isSavingSettings, error, answeredUntilIndex } = useSelect(
- ( select ) => {
- const userInputSettings =
- select( CORE_USER ).getUserInputSettings();
+ const { isSavingSettings, error } = useSelect( ( select ) => {
+ const userInputSettings = select( CORE_USER ).getUserInputSettings();
return {
isSavingSettings:
@@ -85,22 +83,8 @@ export default function UserInputQuestionnaire() {
'saveUserInputSettings',
[]
),
- answeredUntilIndex: USER_INPUT_QUESTIONS_LIST.findIndex(
- ( question ) =>
- userInputSettings?.[ question ]?.values?.length === 0
- ),
};
- }
- );
-
- useEffect( () => {
- if ( answeredUntilIndex === -1 ) {
- return;
- }
- if ( activeSlugIndex > answeredUntilIndex ) {
- setActiveSlug( steps[ answeredUntilIndex ] );
- }
- }, [ answeredUntilIndex, activeSlugIndex, setActiveSlug ] );
+ } );
useEffect( () => {
if ( activeSlug === 'preview' ) {
| 2 |
diff --git a/Makefile b/Makefile @@ -14,7 +14,7 @@ dist:
# ============
lint:
- $(BIN)eslint bin/sassdoc index.js src test
+ $(BIN)standard bin/sassdoc index.js src/**/*.js test/**/*.js
test: test/data/expected.stream.json dist
$(BIN)mocha test/**/*.test.js
| 14 |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml @@ -62,11 +62,14 @@ jobs:
- name: Build image
run: |
- BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+ BRANCH_NAME=${GITHUB_REF#refs/heads/}
+ BRANCH_NAME=${BRANCH_NAME//\//-}
+ echo "Building sql-api image from branch: $BRANCH_NAME, commit: ${GITHUB_SHA::7}..."
docker build -f private/Dockerfile --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${BRANCH_NAME} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${BRANCH_NAME}--${GITHUB_SHA::7} .
- - name: Upload image
- run: |
+ echo 'Pushing images to the registry...'
docker push gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${BRANCH_NAME}
docker push gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7}
docker push gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${BRANCH_NAME}--${GITHUB_SHA::7}
+
+
| 14 |
diff --git a/token-metadata/0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b/metadata.json b/token-metadata/0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b/metadata.json "symbol": "DPI",
"address": "0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/assets/js/modules/search-console/components/dashboard/SearchFunnelWidget/Overview.js b/assets/js/modules/search-console/components/dashboard/SearchFunnelWidget/Overview.js @@ -36,10 +36,7 @@ import {
VIEW_CONTEXT_DASHBOARD,
VIEW_CONTEXT_PAGE_DASHBOARD,
} from '../../../../../googlesitekit/constants';
-import {
- extractSearchConsoleDashboardData,
- isZeroReport as isSearchConsoleZeroReport,
-} from '../../../util';
+import { extractSearchConsoleDashboardData } from '../../../util';
import { calculateChange } from '../../../../../util';
import { CORE_MODULES } from '../../../../../googlesitekit/modules/datastore/constants';
import { CORE_SITE } from '../../../../../googlesitekit/datastore/site/constants';
@@ -51,7 +48,6 @@ import CTA from '../../../../../components/notifications/CTA';
import ViewContextContext from '../../../../../components/Root/ViewContextContext';
import DataBlock from '../../../../../components/DataBlock';
import ProgressBar from '../../../../../components/ProgressBar';
-import { MODULES_SEARCH_CONSOLE } from '../../../datastore/constants';
const { useSelect, useInViewSelect } = Data;
function getDatapointAndChange( [ report ], selectedStat, divider = 1 ) {
@@ -93,9 +89,6 @@ const Overview = ( {
const isNavigatingToReauthURL = useSelect( ( select ) =>
select( CORE_LOCATION ).isNavigatingTo( adminReauthURL )
);
- const isSearchConsoleGatheringData = useInViewSelect( ( select ) =>
- select( MODULES_SEARCH_CONSOLE ).isGatheringData()
- );
const isAnalyticsGatheringData = useInViewSelect( ( select ) =>
analyticsModuleActiveAndConnected
? select( MODULES_ANALYTICS ).isGatheringData()
@@ -155,10 +148,6 @@ const Overview = ( {
lgSize: 6,
};
- const hasSearchConsoleData =
- isSearchConsoleGatheringData === false &&
- ! isSearchConsoleZeroReport( searchConsoleData );
-
const supportURL = useSelect( ( select ) =>
select( CORE_SITE ).getGoogleSupportURL( {
path: '/analytics/answer/1032415',
@@ -169,22 +158,11 @@ const Overview = ( {
return (
<Grid>
<Row>
- { isSearchConsoleGatheringData && (
- <Cell { ...halfCellProps }>
- <WidgetReportZero moduleSlug="search-console" />
- </Cell>
- ) }
-
- { hasSearchConsoleData && (
- <Fragment>
<Cell { ...quarterCellProps }>
<DataBlock
stat={ 0 }
className="googlesitekit-data-block--impressions googlesitekit-data-block--button-1"
- title={ __(
- 'Total Impressions',
- 'google-site-kit'
- ) }
+ title={ __( 'Total Impressions', 'google-site-kit' ) }
datapoint={ totalImpressions }
change={ totalImpressionsChange }
changeDataUnit="%"
@@ -198,10 +176,7 @@ const Overview = ( {
<DataBlock
stat={ 1 }
className="googlesitekit-data-block--clicks googlesitekit-data-block--button-2"
- title={ __(
- 'Total Clicks',
- 'google-site-kit'
- ) }
+ title={ __( 'Total Clicks', 'google-site-kit' ) }
datapoint={ totalClicks }
change={ totalClicksChange }
changeDataUnit="%"
@@ -210,8 +185,6 @@ const Overview = ( {
handleStatSelection={ handleStatsSelection }
/>
</Cell>
- </Fragment>
- ) }
{ isNavigatingToReauthURL && (
<Cell
| 2 |
diff --git a/tools/docs/api/build-docs/static/js/script.js b/tools/docs/api/build-docs/static/js/script.js // Reset the scroll position:
document.querySelector( 'body' ).scrollTop = 0;
+ // Update the document title:
+ document.title = container.querySelector( 'title' ).innerHTML;
+
// Update browser history (note: browser history API available IE10+):
if ( bool && history && history.pushState ) {
state = {
| 12 |
diff --git a/lib/packExternalModules.js b/lib/packExternalModules.js @@ -116,17 +116,44 @@ module.exports = {
this.options.verbose && this.serverless.cli.log(`Fetch dependency graph from ${packageJsonPath}`);
// Get first level dependency graph
const command = 'npm ls -prod -json -depth=1'; // Only prod dependencies
- let dependencyGraph = {};
- try {
- const depJson = childProcess.execSync(command, {
+
+ const ignoredNpmErrors = [
+ { npmError: 'extraneous', log: false },
+ { npmError: 'missing', log: false },
+ { npmError: 'peer dep missing', log: true },
+ ];
+
+ return BbPromise.fromCallback(cb => {
+ childProcess.exec(command, {
cwd: path.dirname(packageJsonPath),
maxBuffer: this.serverless.service.custom.packExternalModulesMaxBuffer || 200 * 1024,
encoding: 'utf8'
+ }, (err, stdout, stderr) => {
+ if (err) {
+ // Only exit with an error if we have critical npm errors for 2nd level inside
+ const errors = _.split(stderr, '\n');
+ const failed = _.reduce(errors, (failed, error) => {
+ if (failed) {
+ return true;
+ }
+ return !_.isEmpty(error) && !_.some(ignoredNpmErrors, ignoredError => _.startsWith(error, `npm ERR! ${ignoredError.npmError}`));
+ }, false);
+
+ if (failed) {
+ return cb(err);
+ }
+ }
+ return cb(null, stdout);
+ });
+ })
+ .then(depJson => BbPromise.try(() => JSON.parse(depJson)))
+ .then(dependencyGraph => {
+ const problems = _.get(dependencyGraph, 'problems', []);
+ if (this.options.verbose && !_.isEmpty(problems)) {
+ this.serverless.cli.log(`Ignoring ${_.size(problems)} NPM errors:`);
+ _.forEach(problems, problem => {
+ this.serverless.cli.log(`=> ${problem}`);
});
- dependencyGraph = JSON.parse(depJson);
- } catch (e) {
- // We rethrow here. It's not recoverable.
- throw e;
}
// (1) Generate dependency composition
@@ -135,6 +162,12 @@ module.exports = {
return getProdModules.call(this, externalModules, packagePath, dependencyGraph);
}));
+ if (_.isEmpty(compositeModules)) {
+ // The compiled code does not reference any external modules at all
+ this.serverless.cli.log('No external modules needed');
+ return BbPromise.resolve(stats);
+ }
+
// (1.a) Install all needed modules
const compositeModulePath = path.join(this.webpackOutputPath, 'dependencies');
const compositePackageJson = path.join(compositeModulePath, 'package.json');
@@ -192,5 +225,6 @@ module.exports = {
});
})
.return(stats);
+ });
}
};
| 8 |
diff --git a/lib/node_modules/@stdlib/strided/dispatch/lib/main.js b/lib/node_modules/@stdlib/strided/dispatch/lib/main.js @@ -112,11 +112,11 @@ function dispatch( fcns, types, data, nargs, nin, nout ) {
* Strided array function interface which performs multiple dispatch.
*
* @private
- * @param {NonNegativeInteger} N - number of indexed elements
+ * @param {integer} N - number of indexed elements
* @param {...(ArrayLikeObject|integer|NonNegativeInteger)} args - array arguments (arrays, strides, and offsets)
* @throws {Error} insufficient arguments
* @throws {Error} too many arguments
- * @throws {TypeError} first argument must be a nonnegative integer
+ * @throws {TypeError} first argument must be an integer
* @throws {TypeError} input array strides must be integers
* @throws {TypeError} output array strides must be integers
* @throws {TypeError} input array offsets must be nonnegative integers
@@ -150,8 +150,8 @@ function dispatch( fcns, types, data, nargs, nin, nout ) {
throw new Error( 'invalid invocation. Too many arguments.' );
}
N = arguments[ 0 ];
- if ( !isNonNegativeInteger( N ) ) {
- throw new TypeError( 'invalid argument. First argument must be a nonnegative integer.' );
+ if ( !isInteger( N ) ) {
+ throw new TypeError( 'invalid argument. First argument must be an integer.' );
}
shape = [ N ];
| 11 |
diff --git a/public/index.html b/public/index.html const scene = new THREE.Scene();
scene.background = new THREE.Color(0xFFFFFF);
+ const camera = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight, 0.1, 10000);
+ camera.position.set(0, 1, 1);
+ camera.rotation.order = 'YXZ';
+
const portalMeshes = [];
const innerMeshes = [];
const backMeshes = [];
};
scene.add(finishMesh);
- const camera = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight, 0.1, 10000);
- camera.position.set(0, 1, 1);
- camera.rotation.order = 'YXZ';
-
const position = new THREE.Vector3();
const velocity = new THREE.Vector3();
let lastTime = Date.now();
| 5 |
diff --git a/src/lib/gundb/UserStorageClass.js b/src/lib/gundb/UserStorageClass.js @@ -31,6 +31,7 @@ import pino from '../logger/pino-logger'
import { ExceptionCategory } from '../logger/exceptions'
import isMobilePhone from '../validators/isMobilePhone'
import { resizeImage } from '../utils/image'
+import { isE2ERunning } from '../utils/platform'
import { GD_GUN_CREDENTIALS } from '../constants/localStorage'
import delUndefValNested from '../utils/delUndefValNested'
import defaultGun from './gundb'
@@ -2517,44 +2518,29 @@ export class UserStorage {
async deleteAccount(): Promise<boolean> {
let deleteResults = false
let deleteAccountResult
+ const { wallet, userProperties, gunuser, _trackStatus } = this
try {
const faceIdentifier = this.getFaceIdentifier()
- const signature = await this.wallet.sign(faceIdentifier, 'faceVerification')
+ const signature = await wallet.sign(faceIdentifier, 'faceVerification')
await FaceVerificationAPI.disposeFaceSnapshot(faceIdentifier, signature)
deleteAccountResult = await retry(() => API.deleteAccount(), 1)
if (get(deleteAccountResult, 'data.ok', false)) {
- deleteResults = await Promise.all([
- retry(() => this.wallet.deleteAccount(), 1)
- .then(r => ({ wallet: 'ok' }))
- .catch(e => ({ wallet: 'failed' })),
-
- retry(() => this.deleteProfile(), 1)
- .then(r => ({
- profile: 'ok',
- }))
- .catch(r => ({
- profile: 'failed',
- })),
+ const deleteWalletPromise = _trackStatus(retry(() => wallet.deleteAccount(), 1), 'wallet')
- retry(() => this.userProperties.reset(), 1)
- .then(r => ({
- userprops: 'ok',
- }))
- .catch(r => ({
- userprops: 'failed',
- })),
+ const cleanupPromises = [
+ _trackStatus(retry(() => this.deleteProfile(), 1), 'profile'),
+ _trackStatus(retry(() => userProperties.reset(), 1), 'userprops'),
+ _trackStatus(retry(() => gunuser.get('registered').putAck(false), 1), 'registered'),
+ ]
- retry(() => this.gunuser.get('registered').putAck(false), 1)
- .then(r => ({
- registered: 'ok',
- }))
- .catch(r => ({
- registered: 'failed',
- })),
- ])
+ if (!isE2ERunning) {
+ cleanupPromises.unshift(deleteWalletPromise)
+ }
+
+ deleteResults = await Promise.all(cleanupPromises)
}
} catch (e) {
logger.error('deleteAccount unexpected error', e.message, e)
@@ -2564,4 +2550,21 @@ export class UserStorage {
logger.debug('deleteAccount', deleteResults)
return true
}
+
+ _trackStatus(promise, label) {
+ return promise
+ .then(() => {
+ const status = { [label]: 'ok' }
+
+ logger.debug('Cleanup:', status)
+ return status
+ })
+ .catch(exception => {
+ const status = { [label]: 'failed' }
+ const { message } = exception
+
+ logger.debug('Cleanup:', message, exception, status)
+ return status
+ })
+ }
}
| 0 |
diff --git a/src/compiler/nodes.imba1 b/src/compiler/nodes.imba1 @@ -1241,6 +1241,36 @@ export class ValueNode < Node
def region
[@value.@loc,@value.@loc + @value.@len]
+export class ValueReferenceNode < Node
+ prop value
+ prop orig
+
+ def initialize value, orig
+ setup
+ @value = value
+ @orig = orig or value
+
+ def startLoc
+ @orig?.startLoc
+
+ def endLoc
+ @orig?.endLoc
+
+ def load value
+ value
+
+ def js o
+ let res = M(@value.c(mark: false),self)
+ return res
+
+
+ def visit
+ @value.traverse if @value isa Node # && @value:traverse
+ self
+
+ def region
+ [@orig.@loc,@orig.@loc + @orig.@len]
+
export class ExpressionNode < ValueNode
export class AssertionNode < ValueNode
@@ -1562,6 +1592,8 @@ export class ListNode < Node
@indentation ||= a and b ? Indentation.new(a,b) : INDENT
self
+
+
def endLoc
if @endLoc
return @endLoc
@@ -1573,6 +1605,11 @@ export class ListNode < Node
export class ArgList < ListNode
+ def startLoc
+ if typeof @startLoc == 'number'
+ return @startLoc
+ first?.startLoc
+
def consume node
if node isa TagLike
@nodes = @nodes.map do |child|
@@ -1583,6 +1620,14 @@ export class ArgList < ListNode
return self
super
+ def setEnds start,end
+ if end and end:endLoc and end.endLoc != -1
+ @endLoc = end.endLoc
+ if start and start:startLoc and start.startLoc != -1
+ @startLoc = start.startLoc
+ self
+
+
export class AssignList < ArgList
def concat other
@@ -4253,6 +4298,7 @@ export class ObjAttr < Node
if decl
value = scope__.register(key.symbol,key, type: decl)
stack.registerSemanticToken(key,value)
+ value = value.via(key)
if @defaults
value = OP('=',value,@defaults)
@@ -5968,6 +6014,14 @@ export class Call < Node
@block && @block.traverse
+ if self isa BangCall and (@args.count == 0) and option(:keyword)
+ let bang = option(:keyword)
+ @args.setEnds(bang,bang)
+ # @args.@startLoc = option(:keyword).startLoc
+ # @args.@endLoc = option(:keyword).endLoc
+ self
+
+
def addBlock block
var pos = @args.filter(|n,i| n isa DoPlaceholder )[0]
pos ? args.replace(pos,block) : args.push(block)
@@ -6061,7 +6115,8 @@ export class Call < Node
out = "{callee.c(expression: yes)}.call({args.c(expression: yes,mark: false)})"
else
- out = "{callee.c(expression: yes)}{safeop}({args.c(expression: yes,mark: false)})"
+ let outargs = "({args.c(expression: yes,mark: false)})"
+ out = "{callee.c(expression: yes)}{safeop}{M(outargs,@args)}"
if wrap
# we set the cachevar inside
@@ -7481,6 +7536,9 @@ export class TagModifier < TagPart
return "(" + @name.c + ")(e,\{\})"
# let key =
let key = quoted.slice(1,-1).split('-')
+
+ if key[0] == 'options'
+ key[0] = '___setup'
# let op = OP('.',LIT('e.MODIFIERS'),@name)
# return "{op.c}({params ? params.c : ''})"
let call = "{M(key[0],@name)}({params ? params.c : ''})"
@@ -7620,7 +7678,10 @@ class TagHandlerCallback < ValueNode
if val isa Access or val isa VarOrAccess
# let e = Token.new('IDENTIFIER','e')
+ let target = val
val = CALL(val,[LIT('e')])
+ val.@args.@startLoc = target.endLoc
+ val.@args.@endLoc = target.endLoc
# console.log 'is stack tsc?'
# TODO don't generate this until visiting the taghandler
@@ -11132,6 +11193,8 @@ export class Variable < Node
refs: AST.dump(@references, typ)
}
+ def via node
+ ValueReferenceNode.new(self,node)
export class SystemVariable < Variable
| 7 |
diff --git a/server/tests/dump_test.js b/server/tests/dump_test.js @@ -65,7 +65,8 @@ exports.testDumperPrototypePrimitiveToExpr = function(t) {
const intrp = getInterpreter();
const spec = [{filename: 'all', rest: true}];
const dumper = new Dumper(intrp, spec);
- const cases = [
+
+ let cases = [
[undefined, 'undefined'],
[null, 'null'],
[false, 'false'],
@@ -82,6 +83,28 @@ exports.testDumperPrototypePrimitiveToExpr = function(t) {
t.expect(util.format('quote(%o)', tc[0]), r, tc[1]);
t.expect(util.format('eval(quote(%o))', tc[0]), eval(r), tc[0]);
}
+
+ // Shadow some names and check results are still correct.
+ const inner = new Interpreter.Scope(Interpreter.Scope.Type.FUNCTION,
+ intrp.ROOT, intrp.global);
+ inner.createMutableBinding('Infinity', '42');
+ inner.createMutableBinding('NaN', '42');
+ inner.createMutableBinding('undefined', '42');
+ dumper.scope = inner;
+
+ cases = [
+ [undefined, '(void 0)'],
+ [Infinity, '(1/0)'],
+ [-Infinity, '(-1/0)'],
+ [NaN, '(0/0)'],
+ ];
+ for (const tc of cases) {
+ var r = dumper.primitiveToExpr(tc[0]);
+ t.expect(util.format('quote(%o)', tc[0]), r, tc[1]);
+ t.expect(util.format('eval(quote(%o))', tc[0]), eval(r), tc[0]);
+ }
+
+
};
/**
| 9 |
diff --git a/src/parser/templateStrings.js b/src/parser/templateStrings.js @@ -80,6 +80,9 @@ let parseMatch = (ddb, character, match, feature) => {
const classOption = [ddb.character.options.race, ddb.character.options.class, ddb.character.options.feat]
.flat()
.find((option) => option.definition.id === feature.componentId);
+ if (!classOption) {
+ logger.error("Unable to parse option class info, please log a bug report");
+ } else {
const optionCls = utils.findClassByFeatureId(ddb, classOption.componentId);
if (optionCls) {
result = result.replace("classlevel", optionCls.level);
@@ -88,6 +91,7 @@ let parseMatch = (ddb, character, match, feature) => {
}
}
}
+ }
if (result.includes("characterlevel")) {
result = result.replace("characterlevel", character.flags.ddbimporter.dndbeyond.totalLevels);
@@ -126,6 +130,7 @@ let parseMatch = (ddb, character, match, feature) => {
* @param {*} constraint
*/
const applyConstraint = (value, constraint) => {
+ // {{(classlevel/2)@rounddown#unsigned}}
// @ features
// @roundup
// @roundown
| 7 |
diff --git a/articles/protocols/saml/saml-configuration/troubleshoot.md b/articles/protocols/saml/saml-configuration/troubleshoot.md +---
+ description: How to troubleshoot SAML-related configuration issues
+---
+
+# Troubleshooting
+
+This guide serves to help you troubleshoot any issues that may arise during the SAML configuration process. It is not intended to be an exhaustive guide, but one that covers the most commonly encountered issues during setup.
+
+## Step 1: Understand the Situation
+
+When troubleshooting, it's important that all parties involved are using the same terminology to facilitate understanding. This section describes key vocabulary and siutations that will be referred to later in this guide.
+
+* **Is Auth0 serving as the SAML Service Provider (SP), the SAML Identity Provider (IdP), or both?**
+
+ Generally speaking, the SP redirects users elsewhere for authentication. The IdP authenticates the user by prompting them to login and validating the information provided. If your application redirects the user to Auth0 for authentication via SAML, then Auth0 is the IdP. If Auth0 redirects users via a Connection to a remote IdP via SAML, then Auth0 is the SP to the remote IdP.
+
+ Auth0 can act as the SP, IdP, or both.
+
+* **Does your authentication flow use an SP-initiated model, an IdP-initiated model, or both?**
+
+ SP-initiated authentication flows begin with the user navigating to the SP application and getting redirected to the IdP for login. An IdP-initiated flow means the user navigates to the IdP, logs in, and then gets redirected to the SP application.
+
+ Within enterprise settings, the IdP-initiated flow is most common.
+
+* **Which user profile attribute identifies the user at the IdP (during login) and within each application?**
+
+ If the naming attribute differs between the IdP and the application(s), you'll need to configure the appropriate mappings within Auth0 so that it sends the correct user profile attributes to the application(s).
+
+ * From our experience, using the email address as the unique identifier is the easiest option, though there are privacy concerns with this option.
+ * Enterprise organizations often use an internal ID of some type with the IdP, which needs to be mapped to another attribute meaninful to outsourced SaaS applications.
+
+* **Are your authentication requests signed?**
+
+
+* **Are your authentication assertions encrypted?**
| 0 |
diff --git a/src/lib/notifications/hooks/useNotifications.native.js b/src/lib/notifications/hooks/useNotifications.native.js @@ -3,7 +3,7 @@ import { Notifications } from 'react-native-notifications'
// eslint-disable-next-line import/default
import PushNotification from 'react-native-push-notification'
-import { noop } from 'lodash'
+import { invokeMap, noop } from 'lodash'
import Config from '../../../config/config'
import { NotificationsAPI } from '../api/NotificationsApi'
import { CHANNEL_ID, NotificationsCategories } from '../constants'
@@ -118,7 +118,7 @@ export const useNotifications = (onOpened = noop, onReceived = noop) => {
]
return () => {
- subscriptions.forEach(subscription => subscription.remove())
+ invokeMap(subscriptions, 'remove')
}
}, [enabled, receivedHandler, openedHandler])
}
| 0 |
diff --git a/assets/js/googlesitekit/data/utils.js b/assets/js/googlesitekit/data/utils.js @@ -29,6 +29,7 @@ import memize from 'memize';
import { createRegistryControl, createRegistrySelector } from '@wordpress/data';
const GET_REGISTRY = 'GET_REGISTRY';
+const AWAIT = 'AWAIT';
/**
* Collects and combines multiple objects of similar shape.
@@ -224,6 +225,23 @@ export const commonActions = {
type: GET_REGISTRY,
};
},
+
+ /**
+ * Dispatches an action and calls a control to return the promise resolution.
+ *
+ * Useful for controls and resolvers that wish to call an asynchronous function or other promise.
+ *
+ * @since n.e.x.t
+ *
+ * @param {Promise} value A promise to resolve.
+ * @return {Object} Object with resolved promise.
+ */
+ *await( value ) {
+ return {
+ payload: { value },
+ type: AWAIT,
+ };
+ },
};
/**
@@ -245,6 +263,17 @@ export const commonControls = {
* @return {Object} FSA-compatible action.
*/
[ GET_REGISTRY ]: createRegistryControl( ( registry ) => () => registry ),
+
+ /**
+ * Returns a resolved promise.
+ *
+ * @since n.e.x.t
+ *
+ * @param {Object} payload Object containing a promise.
+ * @param {Object} payload.payload Object containing a promise.
+ * @return {*} Resolved promise.
+ */
+ [ AWAIT ]: ( { payload } ) => payload.value,
};
/**
| 9 |
diff --git a/src/main/resources/public/js/src/newWidgets/PreviewWidgetView.js b/src/main/resources/public/js/src/newWidgets/PreviewWidgetView.js @@ -41,7 +41,7 @@ define(function (require) {
this.model = new GadgetModel({ gadget: options.sharedWidgetModel.get('gadget') });
}
gadget = this.model.get('gadget');
- if (!WidgetService.getWidgetConfig(gadget).hasPreview || (!options.validateForPreview() && !options.sharedWidgetModel)) {
+ if (!WidgetService.getWidgetConfig(gadget).hasPreview || (!(options.validateForPreview && options.validateForPreview()) && !options.sharedWidgetModel)) {
this.$el.css('background-image', 'url(' + this.model.get('gadgetPreviewImg') + ')');
return true;
}
| 1 |
diff --git a/Jakefile b/Jakefile @@ -46,6 +46,7 @@ task('test', ['package'], async function (name) {
let pkg = JSON.parse(fs.readFileSync('./package.json').toString());
let version = pkg.version;
+ proc.execSync('rm -rf ./test/node_modules');
// Install from the actual package, run tests from the packaged binary
proc.execSync('mkdir -p ./test/node_modules/.bin && mv ./pkg/jake-v' +
version + ' ./test/node_modules/jake && ln -s ' + process.cwd() +
| 11 |
diff --git a/app/src/renderer/components/staking/PageBond.vue b/app/src/renderer/components/staking/PageBond.vue @@ -301,7 +301,6 @@ export default {
d.deltaAtomsPercent =
this.percent(this.delta(rawAtoms, d.oldAtoms), this.totalAtoms)
}
- return d.atoms
},
setBondBarOuterWidth () {
let outerBar = this.$el.querySelector('.bond-bar__outer')
| 1 |
diff --git a/snippets/drawer-pages.js b/snippets/drawer-pages.js @@ -10,15 +10,15 @@ var navigationView = new tabris.NavigationView({
new tabris.ImageView({
left: 0, right: 0, top: 0, height: 200,
- image: 'images/cover.jpg',
+ image: 'images/landscape.jpg',
scaleMode: 'fill'
}).appendTo(drawer);
var pageSelector = new tabris.CollectionView({
left: 0, top: 'prev()', right: 0, bottom: 0,
- items: [{title: 'Page 1', icon: 'images/page.png'}, {title: 'Page 2', icon: 'images/page.png'}],
+ items: [{title: 'Basket', icon: 'images/page.png'}, {title: 'Checkout', icon: 'images/page.png'}],
initializeCell: initializeCell,
- itemHeight: tabris.device.platform === 'iOS' ? 40 : 48
+ itemHeight: 48
}).appendTo(drawer);
pageSelector.on('select', function(target, pageDescriptor) {
@@ -31,19 +31,19 @@ createPage({title: 'Initial Page', icon: 'images/page.png'}).appendTo(navigation
function initializeCell(cell) {
new tabris.Composite({
- left: 0, right: 0, bottom: 0, height: 1,
- background: '#bbb'
+ left: tabris.device.platform === 'iOS' ? 60 : 72, right: 0, bottom: 0, height: 1,
+ background: '#e7e7e7'
}).appendTo(cell);
var imageView = new tabris.ImageView({
- left: 10, top: 10, bottom: 10
+ left: 14, top: 10, bottom: 10
}).appendTo(cell);
var textView = new tabris.TextView({
- left: 72, centerY: 0,
+ left: tabris.device.platform === 'iOS' ? 60 : 72, centerY: 0,
font: tabris.device.platform === 'iOS' ? '17px .HelveticaNeueInterface-Regular' : '14px Roboto Medium',
- textColor: tabris.device.platform === 'iOS' ? 'rgb(22, 126, 251)' : '#212121'
+ textColor: '#212121'
}).appendTo(cell);
cell.on('change:item', function(widget, page) {
- imageView.image = page.icon;
+ imageView.image = {src: page.icon, scale: 3};
textView.text = page.title;
});
}
| 7 |
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md +# Contributor Covenant Code of Conduct
+
## Our Pledge
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
## Our Standards
@@ -66,7 +68,6 @@ members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
\ No newline at end of file
+[homepage]: https://www.contributor-covenant.org
| 3 |
diff --git a/apps/widbaroalarm/widget.js b/apps/widbaroalarm/widget.js } else {
saveSetting("lastLowWarningTs", 0);
}
- } else {
- saveSetting("lastLowWarningTs", 0);
}
if (setting("highalarm")) {
} else {
saveSetting("lastHighWarningTs", 0);
}
- } else {
- saveSetting("lastHighWarningTs", 0);
}
if (history3.length > 0 && !alreadyWarned) {
const raise3halarm = setting("raise3halarm");
if (drop3halarm > 0 || raise3halarm > 0) {
// we need at least 30min of data for reliable detection
- if (history3[0]["ts"] > ts - (30 * 60)) {
+ const diffDateAge = Math.abs(history3[0]["ts"] - ts);
+ if (diffDateAge < 10 * 60) { // todo change to 1800
return;
}
// Get oldest entry:
const oldestPressure = history3[0]["p"];
if (oldestPressure != undefined && oldestPressure > 0) {
- const diff = oldestPressure - pressure;
+ const diffPressure = Math.abs(oldestPressure - pressure);
// drop alarm
if (drop3halarm > 0 && oldestPressure > pressure) {
- if (Math.abs(diff) > drop3halarm) {
+ if (diffPressure > drop3halarm) {
if (doWeNeedToWarn("lastDropWarningTs")) {
- showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " +
- Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure drop", "lastDropWarningTs");
+ showAlarm((Math.round(diffPressure * 10) / 10) + " hPa/3h from " +
+ Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "lastDropWarningTs");
}
} else {
saveSetting("lastDropWarningTs", 0);
// raise alarm
if (raise3halarm > 0 && oldestPressure < pressure) {
- if (Math.abs(diff) > raise3halarm) {
+ if (diffPressure > raise3halarm) {
if (doWeNeedToWarn("lastRaiseWarningTs")) {
- showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " +
- Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure raise", "lastRaiseWarningTs");
+ showAlarm((Math.round(diffPressure * 10) / 10) + " hPa/3h from " +
+ Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "lastRaiseWarningTs");
}
} else {
saveSetting("lastRaiseWarningTs", 0);
| 7 |
diff --git a/docs/guides/writing.md b/docs/guides/writing.md @@ -90,7 +90,6 @@ The _infobox_ is the box on the left hand side of the entry. It can show several
## Social Icons
Links to any kind of website, social media, or contact information can be presented here.
-{% include social-icons.html %}
## Tags
You are probably familiar with _tags_, they are used as keywords to easily categorize entries. A good rule of thumb is to have maximum 10 tags. In addition, it is good practice to search the current tags used by other entries and reuse them if applicable.
| 2 |
diff --git a/app/controllers/superadmin/users_controller.rb b/app/controllers/superadmin/users_controller.rb @@ -11,9 +11,9 @@ class Superadmin::UsersController < Superadmin::SuperadminController
respond_to :json
- ssl_required :show, :create, :update, :destroy, :index
- before_filter :get_user, only: [:update, :destroy, :show, :dump, :data_imports, :data_import]
- before_filter :get_carto_user, only: [:synchronizations, :synchronization, :geocodings, :geocoding]
+ ssl_required :show, :index
+ before_action :get_user, only: [:show, :dump, :data_imports, :data_import]
+ before_action :get_carto_user, only: [:synchronizations, :synchronization, :geocodings, :geocoding]
rescue_from Carto::ParamInvalidError, with: :rescue_from_carto_error
| 2 |
diff --git a/core/workbench.js b/core/workbench.js @@ -299,9 +299,12 @@ Blockly.Workbench.prototype.setVisible = function(visible) {
// bubble contains whole the mutator.
this.bubble_.setVisible(visible);
// Update the visibility of the workspace for its components.
+ if (this.workspace_) {
this.workspace_.setVisible(visible);
+ }
if (visible) {
+ goog.asserts.assert(this.workspace_, 'The workspace has been removed.');
var tree = this.getFlyoutLanguageTree_();
this.workspace_.flyout_.show(tree.childNodes);
| 11 |
diff --git a/README.md b/README.md @@ -8,11 +8,11 @@ A light JavaScript library to create integrated 2D/3D maps.
* **Open and pluggable**: Easy to extend with techs you may love as [plugins](https://maptalks.org/plugins.html).
* **Performant**: Can smoothly render tens of thousands of geometries.
* **Simple**: Extremely easy to learn and use.
-* **Feature Packed**: Essential features for the most mapping needs.
+* **Feature Packed**: Essential features for most mapping needs.
## The Story
-maptalks.js was born in 2013, for a map-centric project to help [YUM! China](http://www.yumchina.com/en/) to choose locations of KFC and PizzaHut restaurants. After verified in many projects of government depts and enterprises, we did a complete rewrite with ES2015 and open source it, hoping it can make your life easier in mapping projects.
+maptalks.js was born in 2013, for a map-centric project to help [YUM! China](http://www.yumchina.com/en/) to choose locations of KFC and PizzaHut restaurants. After verified in many projects of government depts and enterprises, we did a complete rewrite with ES2015 and open sourced it, hoping it can make your life easier in mapping projects.
## Resources
@@ -33,7 +33,7 @@ maptalks.js is well tested against IE10, IE11, Firefox and Chrome by around 1.5K
## Plugin Development
-It's easy and joyful to write plugins for maptalks, please check out [the tutorials](https://github.com/maptalks/maptalks.js/wiki) and begin to develop you own. And welcome to [share your works](https://github.com/maptalks/maptalks.github.io/issues/new) with us.
+It's easy and joyful to write plugins for maptalks, please check out [the tutorials](https://github.com/maptalks/maptalks.js/wiki) and begin to develop your own. And you are welcome to [share your work](https://github.com/maptalks/maptalks.github.io/issues/new) with us.
## Contributing
| 1 |
diff --git a/js/core/bis_bidsutils.js b/js/core/bis_bidsutils.js @@ -366,7 +366,7 @@ let syncSupportingFiles = (changedFiles, baseDirectory) => {
//open dicom settings file
getSettingsFile(settingsFilename).then((settings) => {
- let compiledSupportingFileList = [];
+ let compiledSupportingFileList = [], movePromiseArray = [];
for (let file of changedFiles) {
@@ -402,7 +402,7 @@ let syncSupportingFiles = (changedFiles, baseDirectory) => {
console.log('old location', oldFilepath, 'new location', newFilepath);
- bis_genericio.moveDirectory(oldFilepath + '&&' + newFilepath);
+ movePromiseArray.push(bis_genericio.moveDirectory(oldFilepath + '&&' + newFilepath));
newSupportingFileList.push(newFilepath);
}
@@ -429,9 +429,14 @@ let syncSupportingFiles = (changedFiles, baseDirectory) => {
console.log('new supporting file list', compiledSupportingFileList);
console.log('new settings', settings);
- writeSettingsFile(settingsFilename, settings);
+ let writeSettingsFileFn = writeSettingsFile(settingsFilename, settings);
+ movePromiseArray.push(writeSettingsFileFn)
+
+ Promise.all(movePromiseArray).then( () => {
resolve(compiledSupportingFileList);
+ });
+
}).catch( (e) => { reject(e);});
});
@@ -441,19 +446,22 @@ let syncSupportingFiles = (changedFiles, baseDirectory) => {
/**
- * Schedules a disk write for a time after this function is called. Note that this function may not save the file passed to the function by 'settings' initially.
- * It will save the latest copy passed to the function before the write is triggered.
+ * Writes dicom settings file to disk.
*
* @param {String} filename - Name of the settings file to save.
* @param {Object} settings - New settings file to write over transientDicomJobInfo.
*/
let writeSettingsFile = (filename, settings) => {
+ return new Promise( (resolve, reject) => {
if (typeof settings !== 'string') {
settings = JSON.stringify(settings, null, 2);
}
console.log('settings', settings);
- bis_genericio.write(filename, settings, false);
+ bis_genericio.write(filename, settings, false)
+ .then( () => { resolve(); })
+ .catch( () => { reject(); });
+ });
};
/**
| 1 |
diff --git a/src/app/learnocaml_index_main.ml b/src/app/learnocaml_index_main.ml @@ -849,15 +849,10 @@ let () =
Lwt.return ()
in
let download_all () =
- let token = get_stored_token ()
- and name = "archive.zip" in
- Server_caller.request (Learnocaml_api.Archive_zip token) >|= function
- | Ok zip ->
- let contents = Js.string zip in
- Learnocaml_common.fake_download ~name ~contents
- | Error e ->
- alert ~title:[%i"Failed to download archive. Please try again later!"]
- (Server_caller.string_of_error e)
+ let token = get_stored_token () |> Token.to_string in
+ Dom_html.window##.location##assign
+ (Js.string @@ "/archive.zip?token=" ^ token);
+ Lwt.return_unit
in
let logout_dialog () =
Server_caller.request
| 4 |
diff --git a/app/assets/stylesheets/deep-insights/themes/scss/map/_embed.scss b/app/assets/stylesheets/deep-insights/themes/scss/map/_embed.scss @@ -115,6 +115,7 @@ $cEmbedTabs-Shadow: rgba(0, 0, 0, 0.24);
.CDB-Embed-legends {
.CDB-Legends-canvas {
display: block !important;
+ border-radius: 0;
position: relative;
top: 0;
left: 0;
@@ -125,6 +126,7 @@ $cEmbedTabs-Shadow: rgba(0, 0, 0, 0.24);
}
.CDB-Legends-canvasInner {
+ border-radius: 0;
height: 100%;
max-height: none;
}
| 2 |
diff --git a/character-controller.js b/character-controller.js @@ -412,6 +412,17 @@ class StatePlayer extends PlayerBase {
}
return null;
}
+ getActionByActionId(actionId) {
+ if (this.isBound()) {
+ const actions = this.getActionsState();
+ for (const action of actions) {
+ if (action.actionId === actionId) {
+ return action;
+ }
+ }
+ }
+ return null;
+ }
getActionIndex(type) {
if (this.isBound()) {
const actions = this.getActionsState();
| 0 |
diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js }
if (arcQ.length > 2) {
let el = arcQ.length;
- let e1 = arcQ[el-3]; // third last in arcQ
- let e2 = arcQ[el-2]; // second last in arcQ
+ let e1 = arcQ[0]; // first in arcQ
+ let e2 = arcQ[Math.floor(el/2)]; // mid in arcQ
let e3 = arcQ[el-1]; // last in arcQ
let cc = BASE.util.center2d(e1, e2, e3, 1); // find center
let dc = 0;
| 7 |
diff --git a/token-metadata/0xBa21Ef4c9f433Ede00badEFcC2754B8E74bd538A/metadata.json b/token-metadata/0xBa21Ef4c9f433Ede00badEFcC2754B8E74bd538A/metadata.json "symbol": "SWFL",
"address": "0xBa21Ef4c9f433Ede00badEFcC2754B8E74bd538A",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/map.html b/map.html const q = parseQuery(location.search);
const extents = parseExtents(q.e);
if (extents) {
+ const rarity = q.r;
+
const center = extents.getCenter(new THREE.Vector3());
const size = extents.getSize(new THREE.Vector3());
const geometry = new THREE.PlaneBufferGeometry(size.x, size.z)
.applyMatrix4(new THREE.Matrix4().makeRotationFromQuaternion(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), -Math.PI/2)))
.applyMatrix4(new THREE.Matrix4().makeTranslation(size.x/2, 0, size.z/2));
const s = 4;
+ const rarityColor = rarityColors[rarity] || rarityColors.legendary;
const material = new THREE.ShaderMaterial({
uniforms: {
/* uColor: {
varying vec3 vBarycentric;
varying vec3 vPosition;
- const vec3 lineColor1 = vec3(${new THREE.Color(rarityColors.legendary[0]).toArray().join(', ')});
- const vec3 lineColor2 = vec3(${new THREE.Color(rarityColors.legendary[1]).toArray().join(', ')});
+ const vec3 lineColor1 = vec3(${new THREE.Color(rarityColor[0]).toArray().join(', ')});
+ const vec3 lineColor2 = vec3(${new THREE.Color(rarityColor[1]).toArray().join(', ')});
float edgeFactor(vec3 bary, float width) {
// vec3 bary = vec3(vBC.x, vBC.y, 1.0 - vBC.x - vBC.y);
| 0 |
diff --git a/token-metadata/0xcD62b1C403fa761BAadFC74C525ce2B51780b184/metadata.json b/token-metadata/0xcD62b1C403fa761BAadFC74C525ce2B51780b184/metadata.json "symbol": "ANJ",
"address": "0xcD62b1C403fa761BAadFC74C525ce2B51780b184",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0x419D0d8BdD9aF5e606Ae2232ed285Aff190E711b/metadata.json b/token-metadata/0x419D0d8BdD9aF5e606Ae2232ed285Aff190E711b/metadata.json "symbol": "FUN",
"address": "0x419D0d8BdD9aF5e606Ae2232ed285Aff190E711b",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/renderer/components/nettests/performance/NDT.js b/renderer/components/nettests/performance/NDT.js @@ -18,12 +18,8 @@ const NDT = ({measurement, render}) => {
upload,
ping,
server = 'Not in test_keys',
- packet_loss,
- out_of_order,
avg_rtt,
- max_rtt,
- mss,
- timeouts
+ mss
} = testKeys
const downloadSpeed = formatSpeed(download)
const uploadSpeed = formatSpeed(upload)
@@ -65,42 +61,18 @@ const NDT = ({measurement, render}) => {
const NDTetails = () => (
<Box width={1}>
<Flex flexWrap='wrap' alignItems='center' my={4}>
- <Box width={1/3} my={4}>
- <StatusBox
- label={<FormattedMessage id='TestResults.Details.Performance.NDT.PacketLoss' />}
- value={<Text>{packet_loss} <small> % </small></Text>}
- />
- </Box>
- <Box width={1/3}>
- <StatusBox
- label={<FormattedMessage id='TestResults.Details.Performance.NDT.OutOfOrder' />}
- value={out_of_order}
- />
- </Box>
- <Box width={1/3}>
+ <Box width={1/2} my={4}>
<StatusBox
label={<FormattedMessage id='TestResults.Details.Performance.NDT.AveragePing' />}
value={avg_rtt}
/>
</Box>
- <Box width={1/3}>
- <StatusBox
- label={<FormattedMessage id='TestResults.Details.Performance.NDT.MaxPing' />}
- value={max_rtt}
- />
- </Box>
- <Box width={1/3}>
+ <Box width={1/2}>
<StatusBox
label={<FormattedMessage id='TestResults.Details.Performance.NDT.MSS' />}
value={mss}
/>
</Box>
- <Box width={1/3}>
- <StatusBox
- label={<FormattedMessage id='TestResults.Details.Performance.NDT.Timeouts' />}
- value={timeouts}
- />
- </Box>
</Flex>
</Box>
)
| 2 |
diff --git a/test/HiGlassComponentTest.jsx b/test/HiGlassComponentTest.jsx @@ -265,7 +265,6 @@ describe('Simple HiGlassComponent', () => {
waitForTilesLoaded(hgc, done);
});
});
- return;
describe('2D Rectangle Annotations', () => {
it('Cleans up previously created instances and mounts a new component', (done) => {
| 2 |
diff --git a/src/ApiGateway.js b/src/ApiGateway.js @@ -320,7 +320,9 @@ module.exports = class ApiGateway {
}
if (!isLambdaInvokeRoute) {
- serverlessLog(`${method} ${fullPath}`)
+ const { host, httpsProtocol, port } = this._options
+ const server = `${httpsProtocol ? 'https' : 'http'}://${host}:${port}`
+ serverlessLog(`${method} ${server}${fullPath}`)
}
// If the endpoint has an authorization function, create an authStrategy for the route
| 0 |
diff --git a/aleph/migrate/versions/9dcef7592cea_added_fields_to_entitysetitem_to_support_profiles.py b/aleph/migrate/versions/9dcef7592cea_added_fields_to_entitysetitem_to_support_profiles.py @@ -5,19 +5,13 @@ Revises: 3174fef04825
Create Date: 2020-07-21 13:42:06.509804
"""
-
-# revision identifiers, used by Alembic.
-revision = "9dcef7592cea"
-down_revision = "4c9e198c5b31"
-
from itertools import groupby, takewhile
-from collections import namedtuple
-
-from aleph.model import Judgement
-
from alembic import op
import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
+
+
+revision = "9dcef7592cea"
+down_revision = "4c9e198c5b31"
def upgrade():
@@ -44,6 +38,11 @@ def upgrade():
linkage_table = meta.tables["linkage"]
entityset_table = meta.tables["entityset"]
item_table = meta.tables["entityset_item"]
+
+ q = sa.update(item_table)
+ q = q.values({"judgement": "POSITIVE"})
+ bind.execute(q)
+
q = sa.select([linkage_table]).order_by("profile_id")
rp = bind.execute(q)
@@ -52,11 +51,10 @@ def upgrade():
)
judgement_lookup = {
- True: Judgement.POSITIVE,
- False: Judgement.NEGATIVE,
- None: Judgement.UNSURE,
+ True: "POSITIVE",
+ False: "NEGATIVE",
+ None: "UNSURE",
}
-
for profile_id, links in profiles:
links = list(links)
role_id = links[0].context_id
@@ -78,6 +76,7 @@ def upgrade():
bind.execute(q)
for link in links:
+ judgment = judgement_lookup[link.decision]
q = sa.insert(item_table)
q = q.values(
{
@@ -87,20 +86,14 @@ def upgrade():
"updated_at": link.updated_at,
"created_at": link.created_at,
"added_by_id": link.decider_id,
- "judgement": judgement_lookup[link.decision].name,
+ "judgement": judgment,
"deleted_at": None,
}
)
bind.execute(q)
+
op.drop_table("linkage")
def downgrade():
- op.drop_column("entityset_item", "compared_to_entity_id")
- op.drop_column("entityset_item", "judgement")
-
- judgement_enum = sa.Enum(
- "POSITIVE", "NEGATIVE", "UNSURE", "NO_JUDGEMENT", name="judgement"
- )
- judgement_enum.drop(op.get_bind())
- op.drop_column("entityset_item", "added_by_id")
+ pass
| 12 |
diff --git a/src/pages/using-spark/guides/alt-text.mdx b/src/pages/using-spark/guides/alt-text.mdx @@ -22,7 +22,7 @@ UX Writers, designers and developers can use this **Alternative Text Guide** as
#### Accessibility Benefits
-- Screen readers read alt-text in place of images. This allows the image to be accessible to users with visual impairment.
+- Screen readers read alt-text in place of images, which allows low or no-vision users to understand the meaning of the image.
- When an image fails to load or if content is blocked, the alt-text will appear in it's place.
- It gives images a text to display so screen readers can read it without altering the meaning of the screen.
| 3 |
diff --git a/src/middleware/packages/notifications/services/expo-push/service.js b/src/middleware/packages/notifications/services/expo-push/service.js @@ -22,16 +22,17 @@ const ExpoPushService = {
async started() {
await this.broker.call('api.addRoute', {
route: {
+ path: '/push',
+ name: 'push',
bodyParsers: { json: true },
authorization: false,
authentication: true,
- name: 'push',
aliases: {
- [`POST push/devices`]: 'push.device.subscribe',
- [`GET push/devices`]: 'push.device.find',
- [`GET push/devices/:id`]: 'push.device.get',
- [`GET push/notifications`]: 'push.notification.find',
- [`GET push/notifications/:id`]: 'push.notification.get'
+ [`POST /devices`]: 'push.device.subscribe',
+ [`GET /devices`]: 'push.device.find',
+ [`GET /devices/:id`]: 'push.device.get',
+ [`GET /notifications`]: 'push.notification.find',
+ [`GET /notifications/:id`]: 'push.notification.get'
}
}
});
| 7 |
diff --git a/tarteaucitron.js b/tarteaucitron.js @@ -17,7 +17,7 @@ var scripts = document.getElementsByTagName('script'),
var tarteaucitron = {
- "version": 20201013,
+ "version": 20201017,
"cdn": cdn,
"user": {},
"lang": {},
@@ -726,7 +726,7 @@ var tarteaucitron = {
}
if ((!isResponded && (isAutostart || (isNavigating && isWaiting)) && !tarteaucitron.highPrivacy) || isAllowed) {
- if (!isAllowed) {
+ if (!isAllowed || (!service.needConsent && cookie.indexOf(service.key + '=false') < 0)) {
tarteaucitron.cookie.create(service.key, true);
}
if (tarteaucitron.launch[service.key] !== true) {
| 12 |
diff --git a/Dockerfile b/Dockerfile @@ -42,11 +42,14 @@ RUN gem.ruby3.1 install bundler -v "$(grep -A 1 "BUNDLED WITH" /hackweek/Gemfile
RUN ln -sf /usr/bin/ruby.ruby3.1 /home/frontend/bin/ruby; \
ln -sf /usr/bin/gem.ruby3.1 /home/frontend/bin/gem; \
ln -sf /usr/bin/bundle.ruby3.1 /home/frontend/bin/bundle; \
- ln -sf /usr/bin/rake.ruby3.1 /home/frontend/bin/rake
+ ln -sf /usr/bin/rake.ruby3.1 /home/frontend/bin/rake; \
+ sudo update-alternatives --set rake /usr/bin/rake.ruby.ruby3.1
WORKDIR /hackweek
USER frontend
+ENV PATH /home/frontend/bin:$PATH
+
# Refresh our bundle
RUN export NOKOGIRI_USE_SYSTEM_LIBRARIES=1; bundle install --jobs=3 --retry=3
| 12 |
diff --git a/packages/slackbot-proxy/src/services/RegisterService.ts b/packages/slackbot-proxy/src/services/RegisterService.ts @@ -70,7 +70,7 @@ export class RegisterService implements GrowiCommandProcessor {
user: payload.user.id,
text: 'Hello world',
blocks: [
- generateMarkdownSectionBlock('Please enter the following Proxy URL to your GROWI slack bot setting form'),
+ generateMarkdownSectionBlock('Please enter and update the following Proxy URL to your GROWI slack bot setting form'),
generateMarkdownSectionBlock(`Proxy URL: ${proxyURL}`),
],
});
| 7 |
diff --git a/bump-versions.config.js b/bump-versions.config.js +/*
+ * Reference: https://community.algolia.com/shipjs/
+ */
module.exports = {
monorepo: {
- mainVersionFile: 'package.json',
+ mainVersionFile: 'lerna.json',
packagesToBump: [
'packages/*',
],
| 12 |
diff --git a/userscript.user.js b/userscript.user.js @@ -13424,7 +13424,8 @@ var $$IMU_EXPORT$$;
if (domain === "steamstore-a.akamaihd.net") {
// https://steamstore-a.akamaihd.net/public/images/v6/app/game_page_background_shadow.png?v=2
// https://steamstore-a.akamaihd.net/public/images/v5/ico_game_highlight_video.png
- if (/\/public\/+images\/+v[0-9]*\/+(?:app\/+game_page|ico_game_).*/.test(src))
+ // https://steamstore-a.akamaihd.net/public/images/v5/game_highlight_activethumb.png
+ if (/\/public\/+images\/+v[0-9]*\/+(?:app\/+game_page|(?:ico_)?game_).*/.test(src))
return {
url: src,
bad: "mask"
| 8 |
diff --git a/src/utils/ErrorBoundary.ts b/src/utils/ErrorBoundary.ts @@ -25,22 +25,22 @@ export class ErrorBoundary {
* Executes callback() and then runs errorCallback() on error.
* This will never throw but instead return `errorValue` if an error occured.
*/
- try<T>(callback: () => T): T | typeof ErrorValue;
- try<T>(callback: () => Promise<T>): Promise<T | typeof ErrorValue> | typeof ErrorValue {
+ try<T, E>(callback: () => T, errorValue?: E): T | typeof errorValue;
+ try<T, E>(callback: () => Promise<T>, errorValue?: E): Promise<T | typeof errorValue> | typeof errorValue {
try {
- let result: T | Promise<T | typeof ErrorValue> = callback();
+ let result: T | Promise<T | typeof errorValue> = callback();
if (result instanceof Promise) {
result = result.catch(err => {
this._error = err;
this.errorCallback(err);
- return ErrorValue;
+ return errorValue;
});
}
return result;
} catch (err) {
this._error = err;
this.errorCallback(err);
- return ErrorValue;
+ return errorValue;
}
}
@@ -56,9 +56,9 @@ export function tests() {
const boundary = new ErrorBoundary(() => emitted = true);
const result = boundary.try(() => {
throw new Error("fail!");
- });
+ }, 0);
assert(emitted);
- assert.strictEqual(result, ErrorValue);
+ assert.strictEqual(result, 0);
},
"return value of callback is forwarded": assert => {
let emitted = false;
@@ -74,9 +74,9 @@ export function tests() {
const boundary = new ErrorBoundary(() => emitted = true);
const result = await boundary.try(async () => {
throw new Error("fail!");
- });
+ }, 0);
assert(emitted);
- assert.strictEqual(result, ErrorValue);
+ assert.strictEqual(result, 0);
}
}
}
\ No newline at end of file
| 11 |
diff --git a/lib/fs_utils/source_file.js b/lib/fs_utils/source_file.js @@ -128,6 +128,14 @@ class SourceFile {
[this.type]: {data, node},
};
+ const cssExports = file.cssExports;
+ if (cssExports && this.type !== 'stylesheet') {
+ this.targets.stylesheet = {
+ data: cssExports,
+ node: identityNode(cssExports, this.path),
+ };
+ }
+
const exports = file.exports;
if (!exports || this.type === 'javascript') return;
| 11 |
diff --git a/test/contracts/Exchanger.js b/test/contracts/Exchanger.js @@ -192,7 +192,7 @@ contract('Exchanger (via Synthetix)', async accounts => {
});
it('then the maxSecsLeftInWaitingPeriod is close to 90', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sEUR);
- timeIsClose({ actual: maxSecs, expected: 90 });
+ timeIsClose({ actual: maxSecs, expected: 90, variance: 2 });
});
describe('and 88 seconds elapses', () => {
// Note: timestamp accurancy can't be guaranteed, so provide a few seconds of buffer either way
@@ -205,7 +205,7 @@ contract('Exchanger (via Synthetix)', async accounts => {
});
it('and the maxSecsLeftInWaitingPeriod is close to 1', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sEUR);
- timeIsClose({ actual: maxSecs, expected: 1 });
+ timeIsClose({ actual: maxSecs, expected: 1, variance: 2 });
});
});
describe('when a further 4 seconds elapse', () => {
@@ -242,7 +242,7 @@ contract('Exchanger (via Synthetix)', async accounts => {
});
it('then fetching maxSecs for that user into sEUR returns 60', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sEUR);
- timeIsClose({ actual: maxSecs, expected: 60 });
+ timeIsClose({ actual: maxSecs, expected: 60, variance: 2 });
});
it('and fetching maxSecs for that user into the source synth returns 0', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sUSD);
@@ -281,7 +281,7 @@ contract('Exchanger (via Synthetix)', async accounts => {
});
it('then it returns 5', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sEUR);
- timeIsClose({ actual: maxSecs, expected: 5 });
+ timeIsClose({ actual: maxSecs, expected: 5, variance: 2 });
});
describe('when another user does the same exchange', () => {
beforeEach(async () => {
@@ -289,11 +289,11 @@ contract('Exchanger (via Synthetix)', async accounts => {
});
it('then it still returns 5 for the original user', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sEUR);
- timeIsClose({ actual: maxSecs, expected: 5 });
+ timeIsClose({ actual: maxSecs, expected: 5, variance: 2 });
});
it('and yet the new user has 60 secs', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account2, sEUR);
- timeIsClose({ actual: maxSecs, expected: 60 });
+ timeIsClose({ actual: maxSecs, expected: 60, variance: 2 });
});
});
describe('when another 5 seconds elapses', () => {
@@ -320,7 +320,7 @@ contract('Exchanger (via Synthetix)', async accounts => {
});
it('then the secs remaining returns 60 again', async () => {
const maxSecs = await exchanger.maxSecsLeftInWaitingPeriod(account1, sEUR);
- timeIsClose({ actual: maxSecs, expected: 60 });
+ timeIsClose({ actual: maxSecs, expected: 60, variance: 2 });
});
});
});
| 10 |
diff --git a/resource/js/components/PageEditorByHackmd.jsx b/resource/js/components/PageEditorByHackmd.jsx @@ -35,7 +35,7 @@ export default class PageEditorByHackmd extends React.PureComponent {
*/
getMarkdown() {
if (!this.state.isInitialized) {
- throw new Error('HackmdEditor component has not initialized');
+ return Promise.reject(new Error('HackmdEditor component has not initialized'));
}
return this.refs.hackmdEditor.getValue()
| 9 |
diff --git a/app/components/Features/NetworkForm/networks.js b/app/components/Features/NetworkForm/networks.js @@ -23,24 +23,24 @@ function NetworksTable({ ...props }) {
<TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnName)}
</TableCell>
- <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
+ {/* <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnNetwork)}
- </TableCell>
- <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
+ </TableCell> */}
+ {/* <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnType)}
- </TableCell>
+ </TableCell> */}
<TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnAPI)}
</TableCell>
<TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnHost)}
</TableCell>
- <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
+ {/* <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnFailures)}
- </TableCell>
- <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
+ </TableCell> */}
+ {/* <TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnPing)}
- </TableCell>
+ </TableCell> */}
<TableCell className={`${classes.tableHeadCell} ${classes.tableHeadFontSize}`}>
{intl.formatMessage(messages.networkTableColumnSelect)}
</TableCell>
@@ -53,20 +53,20 @@ function NetworksTable({ ...props }) {
return (
<TableRow className={classes.tableRowHover} key={endpoint.name}>
<TableCell className={classes.tableCell}>{network.name}</TableCell>
- <TableCell className={classes.tableCell}>{network.network.toUpperCase()}</TableCell>
- <TableCell className={classes.tableCell}>{network.type.toUpperCase()}</TableCell>
+ {/* <TableCell className={classes.tableCell}>{network.network.toUpperCase()}</TableCell> */}
+ {/* <TableCell className={classes.tableCell}>{network.type.toUpperCase()}</TableCell> */}
<TableCell className={classes.tableCell}>{endpoint.name}</TableCell>
<TableCell className={classes.tableCell}>
{endpoint.protocol}
{'://'}
{endpoint.url}:{endpoint.port}
</TableCell>
- <TableCell className={classes.tableCell}>{endpoint.failures}</TableCell>
- <TableCell className={classes.tableCell}>
+ {/* <TableCell className={classes.tableCell}>{endpoint.failures}</TableCell> */}
+ {/* <TableCell className={classes.tableCell}>
{endpoint.ping === -1
? intl.formatMessage(messages.networkTableUnknownNetworkText)
: `${endpoint.ping} ms`}
- </TableCell>
+ </TableCell> */}
<TableCell className={classes.tableCell}>
{active && active.network === network && active.endpoint.name === endpoint.name ? (
intl.formatMessage(messages.networkTableCurrentNetworkText)
| 2 |
diff --git a/src/undo_manager/index.js b/src/undo_manager/index.js @@ -181,7 +181,7 @@ module.exports = () => {
* um.undo();
*/
undo() {
- if (!em.get('Canvas').isInputFocused()) um.undo(1);
+ !em.isEditing() && um.undo(1);
return this;
},
@@ -203,7 +203,7 @@ module.exports = () => {
* um.redo();
*/
redo() {
- if (!em.get('Canvas').isInputFocused()) um.redo(1);
+ !em.isEditing() && um.redo(1);
return this;
},
| 14 |
diff --git a/src/encoded/batch_download.py b/src/encoded/batch_download.py @@ -38,6 +38,8 @@ _tsv_mapping = OrderedDict([
('Biosample type', ['biosample_type']),
('Biosample life stage', ['replicates.library.biosample.life_stage']),
('Biosample sex', ['replicates.library.biosample.sex']),
+ ('Biosample Age', ['replicates.library.biosample.age',
+ 'replicates.library.biosample.age_units']),
('Biosample organism', ['replicates.library.biosample.organism.scientific_name']),
('Biosample treatments', ['replicates.library.biosample.treatments.treatment_term_name']),
('Biosample subcellular fraction term name', ['replicates.library.biosample.subcellular_fraction_term_name']),
@@ -58,7 +60,6 @@ _tsv_mapping = OrderedDict([
('RBNS protein concentration', ['files.replicate.rbns_protein_concentration', 'files.replicate.rbns_protein_concentration_units']),
('Library fragmentation method', ['files.replicate.library.fragmentation_method']),
('Library size range', ['files.replicate.library.size_range']),
- ('Biosample Age', ['files.replicate.library.biosample.age_display']),
('Biological replicate(s)', ['files.biological_replicates']),
('Technical replicate', ['files.replicate.technical_replicate_number']),
('Read length', ['files.read_length']),
@@ -66,7 +67,7 @@ _tsv_mapping = OrderedDict([
('Run type', ['files.run_type']),
('Paired end', ['files.paired_end']),
('Paired with', ['files.paired_with']),
- ('Derived from', ['files.derived_from.accession']),
+ ('Derived from', ['files.derived_from']),
('Size', ['files.file_size']),
('Lab', ['files.lab.title']),
('md5sum', ['files.md5sum']),
| 1 |
diff --git a/sample-apps/appsensor-ws-rest-server-with-websocket-mysql-boot/create.sql b/sample-apps/appsensor-ws-rest-server-with-websocket-mysql-boot/create.sql create table attack (id integer not null auto_increment, timestamp varchar(255), detection_point_id integer, detection_system_id integer, resource_id integer, user_id integer, primary key (id))
create table attack_metadata (attack_id integer not null, metadata_id integer not null)
create table detection_point (id integer not null auto_increment, category varchar(255), label varchar(255), threshold_id integer, primary key (id))
-create table detection_system (id integer not null auto_increment, detection_system_id varchar(255), ip_address tinyblob, primary key (id))
+create table detection_system (id integer not null auto_increment, detection_system_id varchar(255), ip_address blob, primary key (id))
create table event (id integer not null auto_increment, timestamp varchar(255), detection_point_id integer, detection_system_id integer, resource_id integer, user_id integer, primary key (id))
create table event_metadata (event_id integer not null, metadata_id integer not null)
create table geo_location (id integer not null auto_increment, latitude double precision not null, longitude double precision not null, primary key (id))
create table `interval` (id integer not null auto_increment, duration integer, unit varchar(255), primary key (id))
-create table ipaddress (id integer not null auto_increment, address varchar(255), geo_location tinyblob, primary key (id))
+create table ipaddress (id integer not null auto_increment, address varchar(255), geo_location blob, primary key (id))
create table key_value_pair (id integer not null auto_increment, `key` varchar(255), value varchar(255), primary key (id))
create table resource (id integer not null auto_increment, location varchar(255), primary key (id))
create table response (id integer not null auto_increment, action varchar(255), active bit not null, timestamp varchar(255), detection_system_id integer, interval_id integer, user_id integer, primary key (id))
create table response_metadata (response_id integer not null, metadata_id integer not null)
create table threshold (id integer not null auto_increment, t_count integer, interval_id integer, primary key (id))
-create table user (id integer not null auto_increment, ip_address tinyblob, username varchar(255), primary key (id))
+create table user (id integer not null auto_increment, ip_address blob, username varchar(255), primary key (id))
alter table attack_metadata add constraint UK_bbudvpd8rk7ejftsybir8hxkl unique (metadata_id)
alter table event_metadata add constraint UK_kpngs6dpgqyc5yrnos21tgsj2 unique (metadata_id)
alter table response_metadata add constraint UK_78xls2e7mtshgxtik5dey4y71 unique (metadata_id)
| 1 |
diff --git a/token-metadata/0x608f006B6813f97097372d0d31Fb0F11d1CA3E4e/metadata.json b/token-metadata/0x608f006B6813f97097372d0d31Fb0F11d1CA3E4e/metadata.json "symbol": "CRAD",
"address": "0x608f006B6813f97097372d0d31Fb0F11d1CA3E4e",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/edit.js b/edit.js @@ -5082,6 +5082,8 @@ function animate(timestamp, frame) {
currentTeleport = (axes[1] < -0.9 || axes[3] < -0.9);
currentSelector = (axes[1] > 0.9 || axes[3] > 0.9);
+ currentWeaponDown = buttons[0] > 0.5;
+
if (
buttons[2] >= 0.5 && lastButtons[index][2] < 0.5 &&
!(Math.abs(axes[0]) > 0.5 || Math.abs(axes[1]) > 0.5 || Math.abs(axes[2]) > 0.5 || Math.abs(axes[3]) > 0.5) &&
| 0 |
diff --git a/spec/extensions_parser.spec.js b/spec/extensions_parser.spec.js @@ -100,5 +100,21 @@ describe('ExtensionsParser', function() {
it('validate creativeExtension has length 4', () => {
expect(parsedCreativeExts.length).toEqual(4);
});
+
+ it('validate Count extension', () => {
+ const ext = parsedCreativeExts[0];
+ expect(ext.attributes['type']).toEqual('Count');
+ expect(ext.children.length).toEqual(0);
+ expect(ext.name).toEqual('CreativeExtension');
+ expect(ext.value).toEqual('4');
+ });
+
+ it('validate simple JSON in cdata extension', () => {
+ const ext = parsedCreativeExts[1];
+ expect(ext.attributes).toEqual({});
+ expect(ext.children.length).toEqual(0);
+ expect(ext.name).toEqual('CreativeExtension');
+ expect(ext.value).toEqual('{ foo: bar }');
+ });
});
});
| 0 |
diff --git a/README.md b/README.md @@ -88,6 +88,11 @@ When the file `embedded.txt` exists, it must contain a valid and writable path w
In embedded mode, settings can be overridden by text files in `data/settingoverrides`, the file name must be `<SettingName>.txt` (e. g. `BASE_URL.txt`) and the content must be the setting value (normally one single line).
+## Contributing
+Any help is more than appreciated. Feel free to pick any open unassigned issue, but please leave a short comment or assign the issue yourself, to avoid working on the same thing.
+
+New ideas are also very welcome, feel free to open an issue to discuss them.
+
## Screenshots
#### Dashboard
| 0 |
diff --git a/unlock-app/src/components/content/CheckoutContent.tsx b/unlock-app/src/components/content/CheckoutContent.tsx @@ -125,7 +125,10 @@ export const CheckoutContentInner = ({
/>
{current.matches(CheckoutState.loading) && <Loading />}
{current.matches(CheckoutState.notLoggedIn) && (
- <NotLoggedIn config={config!} lockAddresses={lockAddresses} />
+ <NotLoggedIn
+ config={paywallConfig!}
+ lockAddresses={lockAddresses}
+ />
)}
{current.matches(CheckoutState.locks) && (
<Locks
@@ -148,7 +151,7 @@ export const CheckoutContentInner = ({
)}
{current.matches(CheckoutState.metadataForm) && (
<MetadataForm
- fields={config!.metadataInputs!}
+ fields={paywallConfig!.metadataInputs!}
onSubmit={onMetadataSubmit}
/>
)}
| 14 |
diff --git a/includes/Core/Modules/Modules.php b/includes/Core/Modules/Modules.php @@ -582,7 +582,7 @@ final class Modules {
$slug = $request['slug'];
try {
$module = $this->get_module( $slug );
- } catch ( \Exception $e ) {
+ } catch ( Exception $e ) {
return new WP_Error( 'invalid_module_slug', __( 'Invalid module slug.', 'google-site-kit' ), array( 'status' => 404 ) );
}
@@ -599,7 +599,7 @@ final class Modules {
$slug = $request['slug'];
try {
$module = $this->get_module( $slug );
- } catch ( \Exception $e ) {
+ } catch ( Exception $e ) {
return new WP_Error( 'invalid_module_slug', __( 'Invalid module slug.', 'google-site-kit' ), array( 'status' => 404 ) );
}
@@ -641,7 +641,7 @@ final class Modules {
$slug = $request['slug'];
try {
$module = $this->get_module( $slug );
- } catch ( \Exception $e ) {
+ } catch ( Exception $e ) {
return new WP_Error( 'invalid_module_slug', __( 'Invalid module slug.', 'google-site-kit' ), array( 'status' => 404 ) );
}
$data = $module->get_data( $request['datapoint'], $request->get_params() );
@@ -658,7 +658,7 @@ final class Modules {
$slug = $request['slug'];
try {
$module = $this->get_module( $slug );
- } catch ( \Exception $e ) {
+ } catch ( Exception $e ) {
return new WP_Error( 'invalid_module_slug', __( 'Invalid module slug.', 'google-site-kit' ), array( 'status' => 404 ) );
}
$data = isset( $request['data'] ) ? (array) $request['data'] : array();
| 2 |
diff --git a/packages/bitcore-wallet-client/src/lib/api.ts b/packages/bitcore-wallet-client/src/lib/api.ts @@ -1748,7 +1748,10 @@ export class API extends EventEmitter {
log.debug('Merchant memo:', memo);
}
this._doBroadcast(txp, (err2, txp) => {
- return cb(err2, txp, memo, err);
+ if (err2) {
+ log.error('Error broadcasting payment', err2);
+ }
+ return cb(null, txp, memo);
});
}
);
| 8 |
diff --git a/src/apps.json b/src/apps.json ],
"icon": "jComponent.png",
"js": {
- "M.version": ".*\\;version:\\1"
+ "MAIN.version": ".*\\;version:\\1"
},
"implies": "jQuery",
"website": "https://componentator.com"
| 7 |
diff --git a/src/index.js b/src/index.js @@ -1078,7 +1078,7 @@ const _bindWindow = (window, newWindowCb) => {
if (display.isPresenting) {
const [{leftBounds, rightBounds}] = display.getLayers();
- const offsetMatrix = localMatrix2.compose(localVector.fromArray(layer.xrOffset.position), localQuaternion.fromArray(layer.xrOffset.rotation), localVector2.fromArray(layer.xrOffset.scale));
+ const offsetMatrix = localMatrix2.compose(localVector.fromArray(layer.xrOffset.position), localQuaternion.fromArray(layer.xrOffset.orientation), localVector2.fromArray(layer.xrOffset.scale));
o.viewports[0][0] = leftBounds[0]*layer.width * factor;
o.viewports[0][1] = leftBounds[1]*layer.height;
| 10 |
diff --git a/SSAOPass.js b/SSAOPass.js @@ -425,7 +425,7 @@ class SSAOPass extends Pass {
cache.set( object, object.visible );
- if ( object.isPoints || object.isLine ) object.visible = false;
+ if ( object.isPoints || object.isLine || object.isLowPriority ) object.visible = false;
} );
| 0 |
diff --git a/public/javascripts/SVValidate/css/validation-bar.css b/public/javascripts/SVValidate/css/validation-bar.css /* Put buttons here */
.validation-button {
height: 70px;
- background: white;
+ background-color: white;
margin-right: 2px;
border-radius: 5px;
border-width: 2px;
margin-right: 2px;
}
-.validation-button:focus {
- outline:0;
-}
-
.validation-button:active {
outline: none;
border: none;
background-color: lightgrey;
}
+
+.validation-button:focus {
+ outline: none;
+ border-radius: 5px;
+ border-width: 2px;
+ border-color: lightgrey;
+ background-color: white;
+}
+
+.validation-button:hover {
+ background-color: lightgrey;
+}
\ No newline at end of file
| 1 |
diff --git a/src/utils/innerSliderUtils.js b/src/utils/innerSliderUtils.js -// Following function expects props and states from InnerSlider component
-// and returns a list of slides that need to be loaded in order to complete the list frame
+// return list of slides that need to be loaded and are not in lazyLoadedList
export const getOnDemandLazySlides = spec => {
- /*
- @TODO: call onLazyLoad event here
- */
let onDemandSlides = []
- // you might wanna use trackUtils functions for it
let startIndex = lazyStartIndex(spec)
let endIndex = lazyEndIndex(spec)
-
for (let slideIndex = startIndex; slideIndex < endIndex; slideIndex++) {
if (spec.lazyLoadedList.indexOf(slideIndex) < 0) {
onDemandSlides.push(slideIndex)
@@ -18,6 +12,7 @@ export const getOnDemandLazySlides = spec => {
return onDemandSlides
}
+// return list of slides that need to be present
export const getRequiredLazySlides = spec => {
let requiredSlides = []
let startIndex = lazyStartIndex(spec)
@@ -29,27 +24,32 @@ export const getRequiredLazySlides = spec => {
}
+// startIndex that needs to be present
export const lazyStartIndex = spec => spec.currentSlide - slidesOnLeft(spec)
-export const lazyEndIndex = spec => spec.currentSlide + slidesOnRight(spec) // endIndex is exclusive
+// endIndex that needs to be present but is exclusive
+export const lazyEndIndex = spec => spec.currentSlide + slidesOnRight(spec)
-// may be compared with trackutils equivalents for betterment
+// no of slides on left of current in active frame
export const slidesOnLeft = spec => (
spec.centerMode
? Math.floor(spec.slidesToShow / 2) + (parseInt(spec.centerPadding) > 0 ? 1 : 0)
: 0
)
-// may be compared with trackutils equivalents for betterment
+// no of slides on right of current in active frame
export const slidesOnRight = spec => (
spec.centerMode
? Math.floor((spec.slidesToShow - 1) / 2) + 1 + (parseInt(spec.centerPadding) > 0 ? 1 : 0)
: spec.slidesToShow
)
+// get width of an element
export const getWidth = elem => elem && elem.offsetWidth || 0
+// get height of an element
export const getHeight = elem => elem && elem.offsetHeight || 0
+// in case of swipe event, get direction of the swipe event
export const getSwipeDirection = (touchObject, verticalSwiping=false) => {
var xDist, yDist, r, swipeAngle;
xDist = touchObject.startX - touchObject.curX;
@@ -77,6 +77,7 @@ export const getSwipeDirection = (touchObject, verticalSwiping=false) => {
}
+// whether or not we can go next
export const canGoNext = spec => {
let canGo = true
if (!spec.infinite) {
@@ -90,8 +91,10 @@ export const canGoNext = spec => {
return canGo
}
+// given an object and a list of keys, return new object with given keys
export const extractObject = (spec, keys) => {
let newObject = {}
keys.forEach( key => newObject[key] = spec[key])
return newObject
}
+
| 0 |
diff --git a/packages/inertia/index.d.ts b/packages/inertia/index.d.ts +import { CancelTokenSource } from "axios"
+
declare global {
// These open interfaces may be extended in an application-specific manner via
// declaration merging / interface augmentation.
@@ -20,10 +22,17 @@ export interface Page<CustomPageProps extends PageProps = PageProps> {
type VisitOptions = {
method?: string
+ replace?: boolean
preserveScroll?: boolean | ((props: Inertia.PageProps) => boolean)
preserveState?: boolean | ((props: Inertia.PageProps) => boolean)
- replace?: boolean
only?: string[]
+ headers?: object
+ onCancelToken?: (cancelToken: CancelTokenSource) => void
+ onStart?: (visit: VisitOptions & {url: string}) => void | boolean
+ onProgress?: (progress: any) => void // Cast to any, Axios doesn't have a type definition for this
+ onFinish?: () => void
+ onCancel?: () => void
+ onSuccess?: (page: Page) => void | Promise
}
interface Inertia {
| 3 |
diff --git a/src/lib/libraries/sounds.json b/src/lib/libraries/sounds.json "sampleCount": 13911,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "Afro String",
"sampleCount": 14704,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "Baa",
"sampleCount": 13118,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "C2 Bass",
"sampleCount": 15849,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "Car Horn",
"electronic"
]
},
+ {
+ "name": "Connect",
+ "md5": "9aad12085708ccd279297d4bea9c5ae0.wav",
+ "sampleCount": 22623,
+ "rate": 22050,
+ "format": "adpcm",
+ "tags": [
+ "effects",
+ "electronic",
+ "games"
+ ]
+ },
{
"name": "Cough1",
"md5": "98ec3e1eeb7893fca519aa52cc1ef3c1.wav",
"sampleCount": 12702,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "Dance Around",
"loops"
]
},
+ {
+ "name": "Disconnect",
+ "md5": "56df0714ed1ed455a2befd787a077214.wav",
+ "sampleCount": 27563,
+ "rate": 22050,
+ "format": "adpcm",
+ "tags": [
+ "effects",
+ "electronic",
+ "games"
+ ]
+ },
{
"name": "Dog1",
"md5": "b15adefc3c12f758b6dc6a045362532f.wav",
"sampleCount": 8680,
"rate": 22050,
"format": "adpcm",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "Eggs",
"sampleCount": 12766,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "Fairydust",
"human"
]
},
- {
- "name": "Finish",
- "md5": "56df0714ed1ed455a2befd787a077214.wav",
- "sampleCount": 27563,
- "rate": 22050,
- "format": "adpcm",
- "tags": [
- "effects",
- "electronic",
- "games"
- ]
- },
{
"name": "Flam Snare",
"md5": "3b6cce9f8c56c0537ca61eee3945cd1d.wav",
"sampleCount": 14640,
"rate": 22050,
"format": "",
- "tags": []
+ "tags": [
+ "music",
+ "instruments",
+ "notes"
+ ]
},
{
"name": "G Ukulele",
"cartoon"
]
},
- {
- "name": "Start",
- "md5": "9aad12085708ccd279297d4bea9c5ae0.wav",
- "sampleCount": 22623,
- "rate": 22050,
- "format": "adpcm",
- "tags": [
- "effects",
- "electronic",
- "games"
- ]
- },
{
"name": "String Accent",
"md5": "c1b5c86a10f43f87746b1c305d4fd8df.wav",
| 10 |
diff --git a/core/algorithm-operator/lib/templates/algorithm-queue.js b/core/algorithm-operator/lib/templates/algorithm-queue.js @@ -61,6 +61,15 @@ const algorithmQueueTemplate = {
fieldPath: 'status.hostIP'
}
}
+ },
+ {
+ name: 'INTERVAL',
+ valueFrom: {
+ configMapKeyRef: {
+ name: 'algorithm-operator-configmap',
+ key: 'ALGORITHM_QUEUE_INTERVAL'
+ }
+ }
}
]
}
| 0 |
diff --git a/src/ui.bar.js b/src/ui.bar.js @@ -250,8 +250,10 @@ var _ = Mavo.UI.Bar = $.Class({
cleanup: function() {
if (this.editing) {
this.done();
+ if (this.bar) {
this.bar.edit.textContent = this._("edit");
}
+ }
},
condition: function() {
return this.needsEdit;
| 1 |
diff --git a/www/tablet/js/widget_controlbutton.js b/www/tablet/js/widget_controlbutton.js @@ -94,7 +94,6 @@ var Modul_controlbutton = function () {
// Events
elem.on(ftui.config.clickEventType, function (e) {
- e.preventDefault();
e.stopImmediatePropagation();
elem.touch_pos_y = $(window).scrollTop();
@@ -107,6 +106,8 @@ var Modul_controlbutton = function () {
e.preventDefault();
e.stopImmediatePropagation();
+ console.log(Math.abs(elem.touch_pos_y - $(window).scrollTop()) );
+
if ( Math.abs(elem.touch_pos_y - $(window).scrollTop()) > 3 ||
Math.abs(elem.touch_pos_x - $(window).scrollLeft()) > 3 ||
!elem.clicked ) return;
| 1 |
diff --git a/components/csv/step.js b/components/csv/step.js @@ -5,12 +5,12 @@ import theme from '../../styles/theme'
const Step = ({title, children}) => {
return (
- <div>
+ <div style={{margin: '1em 0'}}>
<h2 className={`${children ? '' : 'disabled'}`}>{title}</h2>
{children}
<style jsx>{`
.disabled {
- color: ${theme.colors.lightGrey}
+ color: ${theme.colors.lightGrey};
}
`}</style>
</div>
| 0 |
diff --git a/Source/Core/CylinderOutlineGeometry.js b/Source/Core/CylinderOutlineGeometry.js @@ -4,11 +4,11 @@ define([
'./BoundingSphere',
'./Cartesian2',
'./Cartesian3',
+ './Check',
'./ComponentDatatype',
'./CylinderGeometryLibrary',
'./defaultValue',
'./defined',
- './DeveloperError',
'./Geometry',
'./GeometryAttribute',
'./GeometryAttributes',
@@ -18,11 +18,11 @@ define([
BoundingSphere,
Cartesian2,
Cartesian3,
+ Check,
ComponentDatatype,
CylinderGeometryLibrary,
defaultValue,
defined,
- DeveloperError,
Geometry,
GeometryAttribute,
GeometryAttributes,
@@ -72,18 +72,10 @@ define([
var numberOfVerticalLines = Math.max(defaultValue(options.numberOfVerticalLines, 16), 0);
//>>includeStart('debug', pragmas.debug);
- if (!defined(length)) {
- throw new DeveloperError('options.length must be defined.');
- }
- if (!defined(topRadius)) {
- throw new DeveloperError('options.topRadius must be defined.');
- }
- if (!defined(bottomRadius)) {
- throw new DeveloperError('options.bottomRadius must be defined.');
- }
- if (slices < 3) {
- throw new DeveloperError('options.slices must be greater than or equal to 3.');
- }
+ Check.typeOf.number('options.positions', length);
+ Check.typeOf.number('options.topRadius', topRadius);
+ Check.typeOf.number('options.bottomRadius', bottomRadius);
+ Check.typeOf.number.greaterThanOrEquals('options.sclices', slices, 3);
//>>includeEnd('debug');
this._length = length;
@@ -111,12 +103,8 @@ define([
*/
CylinderOutlineGeometry.pack = function(value, array, startingIndex) {
//>>includeStart('debug', pragmas.debug);
- if (!defined(value)) {
- throw new DeveloperError('value is required');
- }
- if (!defined(array)) {
- throw new DeveloperError('array is required');
- }
+ Check.typeOf.object('value', value);
+ Check.defined('array', array);
//>>includeEnd('debug');
startingIndex = defaultValue(startingIndex, 0);
@@ -148,9 +136,7 @@ define([
*/
CylinderOutlineGeometry.unpack = function(array, startingIndex, result) {
//>>includeStart('debug', pragmas.debug);
- if (!defined(array)) {
- throw new DeveloperError('array is required');
- }
+ Check.defined('array', array);
//>>includeEnd('debug');
startingIndex = defaultValue(startingIndex, 0);
| 14 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.