code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/actor.js b/src/actor.js @@ -297,6 +297,7 @@ export const setValue = (key, value, options, callback = null) => {
};
/**
+ * @ignore
* @memberof module:Apify
* @function
* @description <p>Stores a record (object) in a sequential store using the Apify API.
| 8 |
diff --git a/articles/api-auth/tutorials/adoption/refresh-tokens.md b/articles/api-auth/tutorials/adoption/refresh-tokens.md @@ -30,7 +30,18 @@ There are some changes to how Refresh Tokens are used in the OIDC-conformant aut
</ul>
</div>
<div class="tab-content">
- <div id="refresh-oidc" class="tab-pane">
+ <div id="refresh-legacy" class="tab-pane">
+ <pre class="text hljs"><code>POST /delegation
+Content-Type: 'application/json'
+{
+ "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
+ "client_id": "...",
+ "refresh_token": "...",
+ "scope": "openid profile"
+}
+</code></pre>
+ </div>
+ <div id="refresh-oidc" class="tab-pane active">
<pre class="text hljs"><code>POST /oauth/token
Content-Type: application/json
{
@@ -43,17 +54,6 @@ Content-Type: application/json
}
</code></pre>
<ul><li>The <code>audience</code> and <code>client_secret</code> parameters are optional. The <code>client_secret</code> is not needed when requesting a <code>refresh_token</code> for a mobile app.</li></ul>
- </div>
- <div id="refresh-legacy" class="tab-pane active">
- <pre class="text hljs"><code>POST /delegation
-Content-Type: 'application/json'
-{
- "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
- "client_id": "...",
- "refresh_token": "...",
- "scope": "openid profile"
-}
-</code></pre>
</div>
</div>
</div>
| 12 |
diff --git a/layouts/partials/fragments/footer.html b/layouts/partials/fragments/footer.html </a>
{{- else }}
<div>
+ <a href="{{ .url }}">
{{- .text -}}
+ </a>
</div>
{{- end -}}
{{- end -}}
| 0 |
diff --git a/articles/libraries/auth0js/v9/index.md b/articles/libraries/auth0js/v9/index.md @@ -298,24 +298,13 @@ As shown above, the `client.userInfo` method can be called passing the returned
```json
{
- "email_verified": "false",
- "email": "[email protected]",
- "clientID": "AAAABBBBCCCCDDDDEEEEFFFFGGGGHHHH",
- "updated_at": "2017-02-07T20:50:33.563Z",
- "name": "[email protected]",
+ "sub": "auth0|123456789012345678901234",
+ "nickname": "johnfoo",
+ "name": "[email protected]",
"picture": "https://gravatar.com/avatar/example.png",
- "user_id": "auth0|123456789012345678901234",
- "nickname": "tester9",
- "identities": [
- {
- "user_id": "123456789012345678901234",
- "provider": "auth0",
- "connection": "Username-Password-Authentication",
- "isSocial": "false"
- }
- ],
- "created_at": "2017-01-20T20:06:05.008Z",
- "sub": "auth0|123456789012345678901234"
+ "updated_at": "2018-05-07T14:16:52.013Z",
+ "email": "[email protected]",
+ "email_verified": "false"
}
```
| 3 |
diff --git a/src/domain/session/room/timeline/deserialize.js b/src/domain/session/room/timeline/deserialize.js @@ -174,7 +174,8 @@ export function parseHTMLBody(platform, mediaRepository, html) {
import parse from '../../../../../lib/node-html-parser/index.js';
-export class HTMLParseResult {
+export function tests() {
+ class HTMLParseResult {
constructor(bodyNode) {
this._bodyNode = bodyNode;
}
@@ -216,9 +217,8 @@ const platform = {
parseHTML: (html) => new HTMLParseResult(parse(html))
};
-export function tests() {
function test(assert, input, output) {
- assert.deepEqual(parseHTMLBody({ mediaRepository: null, platform }, input), new MessageBody(input, output));
+ assert.deepEqual(parseHTMLBody(platform, null, input), new MessageBody(input, output));
}
return {
| 5 |
diff --git a/userscript.user.js b/userscript.user.js @@ -9743,7 +9743,17 @@ var $$IMU_EXPORT$$;
}
if (domain_nosub === "hubstatic.com") {
- return src.replace(/_[^_/.]*\.([^/.]*)$/, ".$1");
+ // https://usercontent1.hubstatic.com/9165264_f520.jpg
+ // https://usercontent1.hubstatic.com/9165264.jpg
+ // https://hubstatic.com/14406441_f1024.jpg
+ // https://hubstatic.com/14406441.jpg
+ // https://usercontent1.hubstatic.com/10262262_f120.jpg
+ // https://usercontent1.hubstatic.com/10262262.png
+ // https://hubstatic.com/14483890_f1024.jpg
+ // https://usercontent1.hubstatic.com/14483890.png
+ newsrc = src.replace(/(\/[0-9]+)_f[0-9]+(\.[^/.]*)$/, "$1$2");
+ if (newsrc !== src)
+ return add_extensions(newsrc);
}
if ((domain === "pbs.twimg.com" &&
@@ -43959,7 +43969,10 @@ var $$IMU_EXPORT$$;
return src.replace(/!lengmenjun-[0-9]+(?:[?#].*)?$/, "!lengmenjun");
}
- if (amazon_container === "gallerist") {
+ if (amazon_container === "gallerist" ||
+ // https://fireflowergames.com/spree/products/1621/small/Whispering_Willows_DE_Boxart.jpg?1554613058
+ // https://fireflowergames.com/spree/products/1621/original/Whispering_Willows_DE_Boxart.jpg?1554613058
+ domain_nowww === "fireflowergames.com") {
// https://s3.amazonaws.com/gallerist/products/21820/large/beautiful-birds-2.jpg?1550739385
// https://s3.amazonaws.com/gallerist/products/21820/original/beautiful-birds-2.jpg?1550739385
return src.replace(/(\/products\/+[0-9]+\/+)[a-z]+\/+([^/]*)(?:[?#].*)?$/, "$1original/$2");
| 7 |
diff --git a/lib/query.js b/lib/query.js @@ -160,6 +160,8 @@ function $query(ctx, query, values, qrm, config) {
if (npm.utils.isConnectivityError(err)) {
ctx.db.client.$connectionError = err;
}
+ err.query = err.query ?? query;
+ err.params = err.params ?? params;
error = err;
} else {
multiResult = Array.isArray(result);
| 14 |
diff --git a/src/helpers/sortHelpers.js b/src/helpers/sortHelpers.js @@ -34,10 +34,6 @@ export const sortComments = (comments, sortType = 'BEST') => {
}
};
-export const sortVotes = (a, b) => {
- const aShares = parseInt(a.rshares, 10);
- const bShares = parseInt(b.rshares, 10);
- return bShares - aShares;
-};
+export const sortVotes = (a, b) => b.rshares - a.rshares;
export default null;
| 2 |
diff --git a/templates/base.html b/templates/base.html <li><a href="/workflow/stakeholder_list/0/0"><span class="glyphicon glyphicon-th-list"></span> Stakeholders</a></li>
</ul>
</li>
-
+ {% if user.is_authenticated %}
<li><a href="/indicators/home/0/0/0">Indicators</a></li>
-
+ {% endif %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Form Library<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/reports/report/"><span class="glyphicon glyphicon-list-alt"></span> Program Report</a></li>
<li><a href="/customdashboard/program_list/0/"><span class="glyphicon glyphicon-list-alt"></span> Program Dashboards</a></li>
<li><a href="/workflow/report/0/none"><span class="glyphicon glyphicon-list-alt"></span> Project Report</a></li>
+ {% if user.is_authenticated %}
<li><a href="/indicators/collecteddata/0/0/0/"><span class="glyphicon glyphicon-list-alt"></span> Indicator Data Report</a></li>
<li><a href="/indicators/data/0/0/0/"><span class="glyphicon glyphicon-list-alt"></span> Indicator Visual Report</a></li>
<li><a href="/indicators/report/0/0/0/"><span class="glyphicon glyphicon-list-alt"></span> Indicator Library</a></li>
+ {% endif %}
<li><a href="/indicators/tvareport/"><span class="glyphicon glyphicon-list-alt"></span> Target vs Actual Report</a></li>
<li><a href="/indicators/disrep/0"><span class="glyphicon glyphicon-list-alt"></span> Indicator Disaggregation Report</a></li>
</ul>
{% endif %}-->
</div><!-- .container collapse -->
- <div id = "ajaxloading" class="modal ajax_loading"></div>
+ <!--<div id = "ajaxloading" class="modal ajax_loading"></div> -->
<div id="footer">
<!-- Sticky Footer -->
<div class="container">
{% include "links.html" %}
{% else %}
<div class="column col-xs-16 text-right">
- <a href="http://www.hikaya.io" class="text-muted">Hikaya</a> | <a href="https://github.com/hikaya-io/Activity-CE/blob/master/LICENSE" class="text-muted">License</a>
+ <a href="http://www.hikaya.io" class="text-muted"><b>Hikaya</b></a> |
+ <a href="http://help.hikaya.io" class="text-muted"><b>Documentation</b></a> |
+ <a href="https://github.com/hikaya-io/Activity-CE/blob/master/LICENSE"
+ class="text-muted"><b>License</b></a>
</div>
{% endif %}
| 3 |
diff --git a/lib/assets/core/test/spec/cartodb3/data/legends/legend-torque-definition-model.spec.js b/lib/assets/core/test/spec/cartodb3/data/legends/legend-torque-definition-model.spec.js @@ -44,7 +44,7 @@ describe('data/legends/legend-torque-defintion-model', function () {
expect(attrs.definition.categories.length).toBe(3);
expect(attrs.definition.categories[0].title).toBe('Carto');
expect(attrs.definition.categories[1].title).toContain('Foo');
- expect(attrs.definition.categories[2].title).toBe(null);
+ expect(attrs.definition.categories[2].title).toBe('');
});
describe('inheritStyleCategories', function () {
| 1 |
diff --git a/src/pages/Group/Helm.js b/src/pages/Group/Helm.js @@ -527,13 +527,17 @@ export default class Index extends PureComponent {
};
encodeBase64Content = commonContent => {
- const base64Content = Buffer.from(commonContent).toString('base64');
+ const base64Content =
+ (commonContent && Buffer.from(commonContent).toString('base64')) || '';
return base64Content;
};
decodeBase64Content = base64Content => {
- let commonContent = base64Content.replace(/\s/g, '+');
+ let commonContent =
+ (base64Content && base64Content.replace(/\s/g, '+')) || '';
+ if (commonContent) {
commonContent = Buffer.from(commonContent, 'base64').toString();
+ }
return commonContent;
};
handleSubmit = type => {
@@ -828,7 +832,10 @@ export default class Index extends PureComponent {
const { CodeMirrorRef } = this;
if (versionInfo.values) {
- const val = this.decodeBase64Content(versionInfo.values[value]);
+ const val =
+ (versionInfo.values[value] &&
+ this.decodeBase64Content(versionInfo.values[value])) ||
+ '';
setFieldsValue({
yamls: val
});
| 1 |
diff --git a/lib/api/core/httpRouter/routePart.js b/lib/api/core/httpRouter/routePart.js @@ -90,9 +90,10 @@ class RoutePart {
getHandler(request) {
const
parsed = URL.parse(request.url, true),
- routeHandler = new RouteHandler(parsed.pathname, parsed.query, request.requestId, request.headers);
+ pathname = parsed.pathname || '', // pathname is set to null if empty
+ routeHandler = new RouteHandler(pathname, parsed.query, request.requestId, request.headers);
- return getHandlerPart(this, parsed.pathname.split('/'), routeHandler);
+ return getHandlerPart(this, pathname.split('/'), routeHandler);
}
}
| 9 |
diff --git a/generators/docker-compose/index.js b/generators/docker-compose/index.js @@ -282,17 +282,14 @@ module.exports = class extends BaseGenerator {
this.authenticationType = appConfig.authenticationType;
// Dump the file
- let yamlString = jsyaml.dump(parentConfiguration, { indent: 4 });
+ let yamlString = jsyaml.dump(parentConfiguration, { indent: 4, lineWidth: -1 });
- // Fix the output file which is totally broken!!!
+ // Add extra indentation for each lines
const yamlArray = yamlString.split('\n');
for (let j = 0; j < yamlArray.length; j++) {
yamlArray[j] = ` ${yamlArray[j]}`;
- yamlArray[j] = yamlArray[j].replace(/'/g, '');
}
yamlString = yamlArray.join('\n');
- yamlString = yamlString.replace(/>-\n/g, '');
- yamlString = yamlString.replace(/-\s\s+/g, '- ');
this.appsYaml.push(yamlString);
});
},
| 12 |
diff --git a/config/g2_config.js b/config/g2_config.js @@ -57,13 +57,14 @@ G2Config.prototype.getFromDriver = function(callback) {
G2Config.prototype.reverseUpdate = function(keys, callback) {
this.driver.get(keys, function(err, data) {
if (err) {
- console.log(err);
+ callback(err)
} else {
- console.log(data)
- callback(null, data);
+ keys.forEach(function(key,i) {
+ this._cache[key] = data[i];
+ }.bind(this))
+ this.save(callback);
}
-
- });
+ }.bind(this));
}
// Update the configuration with the data provided (data is just an object with configuration keys/values)
| 1 |
diff --git a/test/jasmine/tests/plot_api_test.js b/test/jasmine/tests/plot_api_test.js @@ -363,6 +363,72 @@ describe('Test plot api', function() {
expect(PlotlyInternal.plot.calls.count()).toEqual(2);
});
+ it('should clear calcdata when restyling \'zmin\' and \'zmax\' on contour traces', function() {
+ var contour = {
+ data: [{
+ type: 'contour',
+ z: [[1, 2, 3], [1, 2, 1]]
+ }]
+ };
+
+ var histogram2dcontour = {
+ data: [{
+ type: 'histogram2dcontour',
+ x: [1, 1, 2, 2, 2, 3],
+ y: [0, 0, 0, 0, 1, 3]
+ }]
+ };
+
+ var mocks = [contour, histogram2dcontour];
+
+ mocks.forEach(function(gd) {
+ mockDefaultsAndCalc(gd);
+ PlotlyInternal.plot.calls.reset();
+ Plotly.restyle(gd, 'zmin', 0);
+ expect(gd.calcdata).toBeUndefined();
+ expect(PlotlyInternal.plot).toHaveBeenCalled();
+
+ mockDefaultsAndCalc(gd);
+ PlotlyInternal.plot.calls.reset();
+ Plotly.restyle(gd, 'zmax', 10);
+ expect(gd.calcdata).toBeUndefined();
+ expect(PlotlyInternal.plot).toHaveBeenCalled();
+ });
+ });
+
+ it('should not clear calcdata when restyling \'zmin\' and \'zmax\' on heatmap traces', function() {
+ var heatmap = {
+ data: [{
+ type: 'heatmap',
+ z: [[1, 2, 3], [1, 2, 1]]
+ }]
+ };
+
+ var histogram2d = {
+ data: [{
+ type: 'histogram2d',
+ x: [1, 1, 2, 2, 2, 3],
+ y: [0, 0, 0, 0, 1, 3]
+ }]
+ };
+
+ var mocks = [heatmap, histogram2d];
+
+ mocks.forEach(function(gd) {
+ mockDefaultsAndCalc(gd);
+ PlotlyInternal.plot.calls.reset();
+ Plotly.restyle(gd, 'zmin', 0);
+ expect(gd.calcdata).toBeDefined();
+ expect(PlotlyInternal.plot).toHaveBeenCalled();
+
+ mockDefaultsAndCalc(gd);
+ PlotlyInternal.plot.calls.reset();
+ Plotly.restyle(gd, 'zmax', 10);
+ expect(gd.calcdata).toBeDefined();
+ expect(PlotlyInternal.plot).toHaveBeenCalled();
+ });
+ });
+
it('ignores undefined values', function() {
var gd = {
data: [{x: [1, 2, 3], y: [1, 2, 3], type: 'scatter'}],
| 0 |
diff --git a/accessibility-checker-engine/src/v4/util/CSSUtil.ts b/accessibility-checker-engine/src/v4/util/CSSUtil.ts @@ -159,26 +159,44 @@ export function getDefinedStyles(elem: HTMLElement, pseudoClass?: PseudoClass) {
* @param {HTMLElement} elem
*/
export function isMaterialIconFont(elem: HTMLElement) {
- // material icon font can be defined either by font-family: 'Material Icons' or by class="material-icons"
- let styles = getDefinedStyles(elem);
- let fontFamily = styles['font-family'];
-
// TODO: check the existence material icons using fetch in node 18+
// for now (node 16) just dertermine if the stylesheet for the 'Material Icons' exists statically. note that the loading of the font stylesheet occurs at run time.
//list of known material icons and stylesheet link
- const well_known_icons = {
+ const known_icons = {
'Material Icons' : "https://fonts.googleapis.com/icon?family=Material+Icons"
};
+ const known_css_classes = {
+ 'material-icons' : "https://fonts.googleapis.com/icon?family=Material+Icons"
+ };
+
+ // material icon font can be defined either by font-family: 'Material Icons' or by class="material-icons"
+ let styles = getDefinedStyles(elem);
+ let fontFamily = styles['font-family'];
+
+ let found = false;
+ // font-family specifies a prioritized list of one or more font family names
+ if (fontFamily && fontFamily.split(",")[0].replace(/['"]+/g, '').trim() in known_icons)
+ found = true;
+
+ if (!found) {
+ let list = elem.classList;
+ for (let css_class in known_css_classes) {
+ if (list.contains(css_class)) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) return false;
+
let passed = false;
- // font-family specifies a prioritized list of one or more font family names, check if
- if (fontFamily && fontFamily.split(",")[0].replace(/['"]+/g, '').trim() in well_known_icons) {
+ // check if the stylesheet for the 'Material Icons' exists statically
let sheets = elem.ownerDocument.styleSheets;
for (let s = 0; s < sheets.length; s++) {
- if (sheets && sheets.length > 0 && Object.values(well_known_icons).indexOf(sheets[s].href) > -1) {
+ if (sheets && sheets.length > 0 && Object.values(known_icons).indexOf(sheets[s].href) > -1) {
passed = true;
break;
}
}
- }
return passed;
}
\ No newline at end of file
| 3 |
diff --git a/api/src/api/v2.js b/api/src/api/v2.js @@ -7,7 +7,7 @@ const package = require('../package')
const logger = require('logplease').create('api/v1');
router.use(function(req, res, next){
- if(req.method == "POST" && req.headers['content-type'] !== "application/json")
+ if(req.method == "POST" && !req.headers['content-type'].startsWith("application/json"))
return res
.status(415)
.send({
| 11 |
diff --git a/lime/project/HXProject.hx b/lime/project/HXProject.hx @@ -1153,7 +1153,11 @@ class HXProject {
if (arg != "") {
- if (!StringTools.startsWith (arg, "-")) {
+ if (StringTools.startsWith (arg, "Error: ")) {
+
+ LogHelper.error (arg.substr (7));
+
+ } else if (!StringTools.startsWith (arg, "-")) {
var path = PathHelper.standardize (arg);
| 7 |
diff --git a/package.json b/package.json "scripts": {
"build": "npm run clean && run-s build:*",
"build:deptree": "depcruise --exclude '^node_modules' --output-type dot src | dot -T svg > site/dependencygraph.svg",
- "build:docs": "DOCS_GEN=TRUE oclif-dev readme --multi && md-magic --path '**/*.md' --ignore 'node_modules'",
"build:site": "sitedown . -b site/ -l layout.html && cpx \"coverage/lcov-report/**/*\" 'site/coverage'",
"newdocs": "x0 docs",
"newdocsbuild": "x0 build docs",
| 2 |
diff --git a/src/traces/waterfall/calc.js b/src/traces/waterfall/calc.js @@ -16,6 +16,8 @@ var calcSelection = require('../scatter/calc_selection');
function extractInstructions(list) {
var result = [];
+ if(!list || !list.length) return result;
+
for(var i = 0; i < list.length; i++) {
result.push(
(list[i].length) ? list[i][0] : ''
| 9 |
diff --git a/token-metadata/0xF03f8D65BaFA598611C3495124093c56e8F638f0/metadata.json b/token-metadata/0xF03f8D65BaFA598611C3495124093c56e8F638f0/metadata.json "symbol": "VIEW",
"address": "0xF03f8D65BaFA598611C3495124093c56e8F638f0",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/documentation/jetson/FLASH_JETSON.md b/documentation/jetson/FLASH_JETSON.md @@ -18,7 +18,7 @@ jetson_release
# Output should be something like:
# - NVIDIA Jetson TX2
-# * Jetpack 4.2 [L4T 32.1.0]
+# * Jetpack 4.3 [L4T 32.3.1]
# * CUDA GPU architecture 6.2
# * NV Power Mode: MAXN - Type: 0
```
| 3 |
diff --git a/test/functional/specs/Privacy/IAB/C224675.js b/test/functional/specs/Privacy/IAB/C224675.js @@ -58,7 +58,7 @@ test("Test C224675: Passing invalid consent options should throw a validation er
.contains("Unexpected server response with status code 400")
.expect(errorMessageForInvalidStandard)
.contains(
- "The value supplied for field 'consent.[0]' does not match your input schema"
+ "The value supplied for field 'consent[0]' does not match your input schema"
);
await t.expect(errorMessageForInvalidStandard).contains("EXEG-0102-400");
@@ -79,11 +79,13 @@ test("Test C224675: Passing invalid consent options should throw a validation er
await t
.expect(errorMessageForInvalidVersion)
- .contains("Unexpected server response with status code 422")
+ .contains("Unexpected server response with status code 400")
.expect(errorMessageForInvalidVersion)
- .contains("Allowed IAB version is 2.0 for standard 'IAB TCF' at index 0");
+ .contains(
+ "The value supplied for field 'consent[0]' does not match your input schema"
+ );
- await t.expect(errorMessageForInvalidVersion).contains("EXEG-0104-422");
+ await t.expect(errorMessageForInvalidVersion).contains("EXEG-0102-400");
const errorMessageForInvalidValue = await getErrorMessageFromSetConsent({
consent: [
| 3 |
diff --git a/source/swap/test/Swap.js b/source/swap/test/Swap.js @@ -139,12 +139,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 200,
+ amount: 200,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 50,
+ amount: 50,
},
})
@@ -165,12 +165,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 200,
+ amount: 200,
},
sender: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 50,
+ amount: 50,
},
})
await reverted(
@@ -202,7 +202,7 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 200,
+ amount: 200,
},
})
await reverted(swap(order, { from: bobAddress }))
@@ -248,7 +248,7 @@ contract('Swap', async accounts => {
signer: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 1000,
+ amount: 1000,
},
sender: {
wallet: aliceAddress,
@@ -292,12 +292,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenOMG.address,
- param: 200,
+ amount: 200,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 50,
+ amount: 50,
},
})
@@ -336,7 +336,7 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenOMG.address,
- param: 200,
+ amount: 200,
},
})
await reverted(swap(order, { from: bobAddress }))
@@ -382,7 +382,7 @@ contract('Swap', async accounts => {
signer: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 1000,
+ amount: 1000,
},
sender: {
wallet: aliceAddress,
@@ -427,12 +427,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 50,
+ amount: 50,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 10,
+ amount: 10,
},
})
@@ -556,12 +556,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 50,
+ amount: 50,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 10,
+ amount: 10,
},
})
@@ -680,12 +680,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 25,
+ amount: 25,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 5,
+ amount: 5,
},
})
@@ -739,12 +739,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 25,
+ amount: 25,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 5,
+ amount: 5,
},
})
@@ -884,17 +884,17 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 100,
+ amount: 100,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 50,
+ amount: 50,
},
affiliate: {
wallet: carolAddress,
token: tokenAST.address,
- param: 50,
+ amount: 50,
},
})
@@ -930,11 +930,11 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 5,
+ amount: 5,
},
sender: {
token: tokenDAI.address,
- param: '0',
+ amount: '0',
},
})
@@ -990,13 +990,13 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenTicket.address,
- param: 12345,
+ amount: 12345,
kind: ERC721_INTERFACE_ID,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 100,
+ amount: 100,
},
})
@@ -1022,12 +1022,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 50,
+ amount: 50,
},
sender: {
wallet: bobAddress,
token: tokenKitty.address,
- param: 54321,
+ amount: 54321,
kind: ERC721_INTERFACE_ID,
},
})
@@ -1053,17 +1053,17 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: 50,
+ amount: 50,
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: 50,
+ amount: 50,
},
affiliate: {
wallet: carolAddress,
token: tokenKitty.address,
- param: 54321,
+ amount: 54321,
kind: ERC721_INTERFACE_ID,
},
})
@@ -1123,12 +1123,12 @@ contract('Swap', async accounts => {
signer: {
wallet: aliceAddress,
token: tokenAST.address,
- param: '0',
+ amount: '0',
},
sender: {
wallet: bobAddress,
token: tokenDAI.address,
- param: '0',
+ amount: '0',
},
})
const orderTwo = await orders.getOrder({
@@ -1177,12 +1177,12 @@ contract('Swap', async accounts => {
signer: {
wallet: eveAddress,
token: tokenAST.address,
- param: '0',
+ amount: '0',
},
sender: {
wallet: aliceAddress,
token: tokenDAI.address,
- param: '0',
+ amount: '0',
},
},
true
@@ -1202,12 +1202,12 @@ contract('Swap', async accounts => {
signer: {
wallet: eveAddress,
token: tokenAST.address,
- param: '0',
+ amount: '0',
},
sender: {
wallet: aliceAddress,
token: tokenDAI.address,
- param: '0',
+ amount: '0',
},
})
| 3 |
diff --git a/src/gml/type/GmlTypeCanCastTo.hx b/src/gml/type/GmlTypeCanCastTo.hx @@ -88,6 +88,7 @@ class GmlTypeCanCastTo {
if (p.length == 0) return true;
if (!canCastTo(p[0], GmlTypeDef.string, tpl, imp)) return false;
var vt = p[1];
+ if (vt == null || vt.getKind() == KAny) return true;
if (!canCastTo(mapMeta.defaultType, vt, tpl, imp)) return false;
for (mapField in mapMeta.fieldList) {
if (!canCastTo(mapField.type, vt)) return false;
| 11 |
diff --git a/wikibase/queryService/ui/queryHelper/QueryHelper.js b/wikibase/queryService/ui/queryHelper/QueryHelper.js @@ -413,7 +413,9 @@ wikibase.queryService.ui.queryHelper.QueryHelper = ( function( $, wikibase, _ )
if ( self._isSimpleMode ) {
return;
}
- entity = entity.replace( '?', '' );
+ entity = entity.replace( '?', '' ).replace( /_/g, '_<wbr>' );
+ $triple.append( $( '<td>' ).append( entity ) );
+ return;
}
if ( entity.type && entity.type === 'path' ) {
| 11 |
diff --git a/demo/views/pages/sandbox/index.js b/demo/views/pages/sandbox/index.js import React from 'react';
-import { Option, SelectAsync } from '__experimental__/components/select-async';
import { transform } from 'babel-standalone';
-import Button from '__experimental__/components/button';
import './sandbox.scss';
class Preview extends React.Component {
@@ -44,7 +42,6 @@ class Preview extends React.Component {
class Sandbox extends React.Component {
state = {
- val: [],
code: ''
}
@@ -72,8 +69,19 @@ class Sandbox extends React.Component {
render() {
return (
<div className={ `sandbox sandbox-orientation-${this.state.orientation ? 'horizontal' : 'vertical'}` }>
-
- <Button />
+ <Preview code={ this.state.code } />
+ <textarea
+ autoFocus
+ className='sandbox-input'
+ onChange={ this.updateCode }
+ onKeyDown={ this.catchTab }
+ value={ this.state.code }
+ />
+ <input
+ className='sandbox-orientation'
+ type='checkbox'
+ onChange={ () => { this.setState({ orientation: !this.state.orientation }); } }
+ />
</div>
);
}
| 13 |
diff --git a/src/system.json b/src/system.json "id": "sfrpg",
"title": "Starfinder",
"description": "A game system for running Starfinder in the Foundry VTT environment.",
- "version": "0.21.0",
+ "version": "0.22.0",
"manifestPlusVersion": "1.2.0",
"author": "The Starfinder System Developers",
"authors": [
"secondaryTokenAttribute": "attributes.sp",
"compatibility": {
"minimum": 10,
- "verified": "10.288",
+ "verified": "10.290",
"maximum": 10
},
"url": "https://github.com/foundryvtt-starfinder/foundryvtt-starfinder",
"manifest": "https://raw.githubusercontent.com/foundryvtt-starfinder/foundryvtt-starfinder/master/src/system.json",
- "download": "https://github.com/foundryvtt-starfinder/foundryvtt-starfinder/releases/download/v0.21.0/sfrpg-v0.21.0.zip"
+ "download": "https://github.com/foundryvtt-starfinder/foundryvtt-starfinder/releases/download/v0.22.0/sfrpg-v0.22.0.zip"
}
| 6 |
diff --git a/src/components/dashboard/Claim.js b/src/components/dashboard/Claim.js @@ -362,7 +362,7 @@ const Claim = props => {
} catch (exception) {
const { message } = exception
- if (!txHash || message.includes('Transaction with the same hash was already imported')) {
+ if (!txHash || !message.includes('Transaction with the same hash was already imported')) {
throw exception
}
| 0 |
diff --git a/articles/cross-origin-authentication/index.md b/articles/cross-origin-authentication/index.md @@ -31,6 +31,7 @@ Configuring your client for cross-origin authentication is a process that requir
1. Ensure that the **Allowed Web Origins** field is set to the domain making the request. You can find this field in the [Client Settings](${manage_url}/#/clients/${account.clientId}/settings).
1. Ensure that your application is using [Lock](/libraries/lock) 10 or higher, or [Auth0.js](/libraries/auth0js) version 8 or higher.
+1. If you are using Lock 10, make sure that you are using the [oidcconformant](/libraries/lock/v10/customization#oidcconformant-boolean-) option.
1. You will need to author a page which uses auth0.js to act as a fallback for the cross-origin transaction. More information on setting up this page is provided below.
## Create a Cross-Origin Fallback Page
| 0 |
diff --git a/packages/blocksAntd/src/blocks/Icon/Icon.js b/packages/blocksAntd/src/blocks/Icon/Icon.js import React, { lazy, Suspense, memo } from 'react';
import { Loading3QuartersOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import { ErrorBoundary, blockDefaultProps } from '@lowdefy/block-tools';
-import { omit, serializer, type } from '@lowdefy/helpers';
+import { omit, type } from '@lowdefy/helpers';
const lowdefyProps = [
'content',
@@ -37,28 +37,25 @@ const lowdefyProps = [
'validation',
];
const IconBlock = ({ actions, blockId, methods, properties, ...props }) => {
- let propertiesCopy = serializer.copy(properties);
- if (type.isString(propertiesCopy)) {
- propertiesCopy = { name: propertiesCopy };
- }
- if (!type.isString(propertiesCopy.name)) {
- propertiesCopy.name = 'CloseCircleOutlined';
+ const propertiesObj = type.isString(properties) ? { name: properties } : properties;
+ if (!type.isString(propertiesObj.name)) {
+ propertiesObj.name = 'CloseCircleOutlined';
}
const iconProps = {
id: blockId,
className: methods.makeCssClass([
- { color: propertiesCopy.color, fontSize: propertiesCopy.size },
- properties.style,
+ { color: propertiesObj.color, fontSize: propertiesObj.size },
+ propertiesObj.style,
]),
- rotate: propertiesCopy.rotate,
- spin: propertiesCopy.spin,
- twoToneColor: propertiesCopy.color,
+ rotate: propertiesObj.rotate,
+ spin: propertiesObj.spin,
+ twoToneColor: propertiesObj.color,
...omit(props, lowdefyProps),
};
- const IconComp = memo(lazy(() => import(`./icons/${propertiesCopy.name}`)));
+ const IconComp = memo(lazy(() => import(`./icons/${propertiesObj.name}`)));
return (
<>
- {actions.onClick && actions.onClick.loading && !propertiesCopy.disableLoadingIcon ? (
+ {actions.onClick && actions.onClick.loading && !propertiesObj.disableLoadingIcon ? (
<Loading3QuartersOutlined {...{ ...iconProps, spin: true }} />
) : (
<ErrorBoundary fallback={<ExclamationCircleOutlined {...iconProps} />}>
| 1 |
diff --git a/apiserver/apiserver/web/match.py b/apiserver/apiserver/web/match.py @@ -97,13 +97,13 @@ def list_matches_helper(offset, limit, participant_clause,
model.game_participants,
(model.games.c.id == model.game_participants.c.game_id) &
participant_clause,
- ).join(
+ ).outerjoin(
model.game_stats,
(model.games.c.id == model.game_stats.c.game_id)
- ).join(
+ ).outerjoin(
model.game_bot_stats,
(model.games.c.id == model.game_bot_stats.c.game_id)
- ).join(
+ ).outerjoin(
model.game_view_stats,
(model.games.c.id == model.game_view_stats.c.game_id)
)).where(
| 1 |
diff --git a/src/plots/cartesian/index.js b/src/plots/cartesian/index.js @@ -303,8 +303,8 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
};
exports.drawFramework = function(gd) {
- var fullLayout = gd._fullLayout,
- subplotData = makeSubplotData(gd);
+ var fullLayout = gd._fullLayout;
+ var subplotData = makeSubplotData(gd);
var subplotLayers = fullLayout._cartesianlayer.selectAll('.subplot')
.data(subplotData, Lib.identity);
@@ -327,6 +327,7 @@ exports.drawFramework = function(gd) {
plotinfo.overlays = [];
makeSubplotLayer(plotinfo);
+
// fill in list of overlay subplots
if(plotinfo.mainplot) {
var mainplot = fullLayout._plots[plotinfo.mainplot];
@@ -506,12 +507,11 @@ function removeSubplotExtras(subplotId, fullLayout) {
}
function joinLayer(parent, nodeType, className, dataVal) {
- var layer = parent.selectAll('.' + className)
- .data([dataVal || 0]);
-
- layer.enter().append(nodeType)
- .classed(className, true);
-
+ var sel = parent.select('.' + className);
+ var layer = sel.size() ?
+ sel :
+ parent.append(nodeType).classed(className, true);
+ if(dataVal) layer.datum(dataVal);
return layer;
}
| 14 |
diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js @@ -4,7 +4,7 @@ var path = require('path');
var minimist = require('minimist');
var constants = require('../../tasks/util/constants');
-var isCI = !!process.env.CIRCLECI;
+var isCI = !!process.env.CI;
var argv = minimist(process.argv.slice(4), {
string: ['bundleTest', 'width', 'height'],
'boolean': ['info', 'nowatch', 'failFast', 'verbose', 'Chrome', 'Firefox', 'IE11'],
| 9 |
diff --git a/src/authMatchPolicyResource.js b/src/authMatchPolicyResource.js @@ -2,6 +2,9 @@ module.exports = (policyResource, resource) => {
if (policyResource === resource) {
return true;
}
+ else if (policyResource === '*') {
+ return true;
+ }
else if (policyResource.includes('*')) {
//Policy contains a wildcard resource
const splitPolicyResource = policyResource.split(':');
| 1 |
diff --git a/package-lock.json b/package-lock.json }
},
"deep-equal": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz",
- "integrity": "sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.2.tgz",
+ "integrity": "sha512-kX0bjV7tdMuhrhzKPEnVwqfQCuf+IEfN+4Xqv4eKd75xGRyn8yzdQ9ujPY6a221rgJKyQC4KBu1PibDTpa6m9w==",
"dev": true,
"requires": {
"es-abstract": "^1.17.5",
"is-date-object": "^1.0.2",
"is-regex": "^1.0.5",
"isarray": "^2.0.5",
- "object-is": "^1.1.2",
+ "object-is": "^1.0.2",
"object-keys": "^1.1.1",
- "object.assign": "^4.1.0",
"regexp.prototype.flags": "^1.3.0",
"side-channel": "^1.0.2",
"which-boxed-primitive": "^1.0.1",
"which-collection": "^1.0.1",
- "which-typed-array": "^1.1.2"
+ "which-typed-array": "^1.1.1"
},
"dependencies": {
"isarray": {
}
},
"ecstatic": {
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-4.1.4.tgz",
- "integrity": "sha512-8E4ZLK4uRuB9pwywGpy/B9vcz4gCp6IY7u4cMbeCINr/fjb1v+0wf0Ae2XlfSnG8xZYnE4uaJBjFkYI0bqcIdw==",
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-4.1.2.tgz",
+ "integrity": "sha512-lnrAOpU2f7Ra8dm1pW0D1ucyUxQIEk8RjFrvROg1YqCV0ueVu9hzgiSEbSyROqXDDiHREdqC4w3AwOTb23P4UQ==",
"dev": true,
"requires": {
"charset": "^1.0.1",
}
},
"karma-jasmine": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.1.1.tgz",
- "integrity": "sha512-pxBmv5K7IkBRLsFSTOpgiK/HzicQT3mfFF+oHAC7nxMfYKhaYFgxOa5qjnHW4sL5rUnmdkSajoudOnnOdPyW4Q==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.0.3.tgz",
+ "integrity": "sha512-80iBR8/hLFY2Uw3S2GG6EndWtMCGMJjrCYNwYROWsJFVTjWrRSsLqcA2ye+U3ygW5sjOQo8f+78L8cGUxjC/+A==",
"dev": true,
"requires": {
"jasmine-core": "^3.5.0"
"dev": true
},
"ndarray": {
- "version": "1.0.19",
- "resolved": "https://registry.npmjs.org/ndarray/-/ndarray-1.0.19.tgz",
- "integrity": "sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==",
+ "version": "1.0.18",
+ "resolved": "https://registry.npmjs.org/ndarray/-/ndarray-1.0.18.tgz",
+ "integrity": "sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=",
"requires": {
"iota-array": "^1.0.0",
"is-buffer": "^1.0.2"
}
},
"node-sass": {
- "version": "4.14.0",
- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz",
- "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==",
+ "version": "4.13.1",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
+ "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
"dev": true,
"requires": {
"async-foreach": "^0.1.3",
| 3 |
diff --git a/reports/templates/report.html b/reports/templates/report.html });
</script>
+
<div class="container">
+ <!-- Sub navigation -->
+ <div class="sub-navigation">
+ <div class="sub-navigation-header">
+ <h4 class="page-title">
+ {{ request.user.activity_user.organization.level_1_label }} Reports
+ </h4>
+ </div>
+ <div class="sub-navigation-actions">
+ <!-- sample action buttons -->
+ <div class="btn-group" role="group" aria-label=""></div>
+ </div>
+ </div>
+
<div class="row">
<div class="col-sm-3">
<div class="panel panel-primary">
| 0 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view.js b/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/legend/legend-base-type-view.js @@ -58,6 +58,13 @@ module.exports = CoreView.extend({
visible: this._isLayerHidden() || this._legendDefinitionModel.hasCustomHtml()
});
+ this._togglerModel = new Backbone.Model({
+ labels: [_t('editor.legend.data-toggle.values'), _t('editor.legend.data-toggle.html')],
+ active: this._editorModel.isEditing(),
+ disabled: this._editorModel.isDisabled(),
+ isDisableable: true
+ });
+
this._configPanes();
this._initBinds();
},
@@ -141,16 +148,11 @@ module.exports = CoreView.extend({
_initBinds: function () {
this.listenTo(this._editorModel, 'change:edition', this._onChangeEdition);
- this.add_related_model(this._editorModel);
-
+ this.listenTo(this._editorModel, 'change:disabled', this._onChangeDisabled);
+ this.listenTo(this._togglerModel, 'change:active', this._onTogglerChanged);
this.listenTo(this._modelView, 'change:state', this._infoboxState);
- this.add_related_model(this._modelView);
-
this.listenTo(this._layerDefinitionModel, 'change:visible', this._infoboxState);
- this.add_related_model(this._layerDefinitionModel);
-
this.listenTo(this._mapDefinitionModel, 'change:legends', this._infoboxState);
- this.add_related_model(this._mapDefinitionModel);
},
_onChangeState: function () {
@@ -168,6 +170,16 @@ module.exports = CoreView.extend({
this._collectionPane.at(index).set({ selected: true });
},
+ _onChangeDisabled: function () {
+ var disabled = this._editorModel.get('disabled');
+ this._togglerModel.set({ disabled: disabled });
+ },
+
+ _onTogglerChanged: function () {
+ var checked = this._togglerModel.get('active');
+ this._editorModel.set({ edition: checked });
+ },
+
_initViews: function () {
var self = this;
@@ -228,9 +240,7 @@ module.exports = CoreView.extend({
},
createControlView: function () {
return new Toggler({
- editorModel: self._editorModel,
- labels: [_t('editor.legend.data-toggle.values'), _t('editor.legend.data-toggle.html')],
- isDisableable: true
+ model: self._togglerModel
});
},
createActionView: function () {
| 4 |
diff --git a/contracts/package.json b/contracts/package.json "test:ganache": "yarn run buidler test --network ganache",
"test:fork": "FORK=true yarn run buidler test --network ganache",
"fund": "yarn run buidler --network ganache run scripts/fund.js",
- "fund:fork": "yarn run fund",
+ "fund:fork": "FORK=true yarn run fund",
"clean": "rm -rf artifacts && rm -rf deployments && rm -rf cache"
},
"author": "Origin Protocol Inc <[email protected]>",
| 12 |
diff --git a/token-metadata/0x633eE3fbE5ffc05bD44Ecd8240732fF9ef9Dee1d/metadata.json b/token-metadata/0x633eE3fbE5ffc05bD44Ecd8240732fF9ef9Dee1d/metadata.json "symbol": "PEAK",
"address": "0x633eE3fbE5ffc05bD44Ecd8240732fF9ef9Dee1d",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/assets/core/javascripts/deep-insights/widgets/category/title/search-title-view.js b/lib/assets/core/javascripts/deep-insights/widgets/category/title/search-title-view.js @@ -104,8 +104,7 @@ module.exports = CoreView.extend({
var actionsTooltip = new TipsyTooltipView({
el: this.$el.find('.js-actions'),
- gravity: 'auto',
- title: function () { return _t('more-options'); }
+ gravity: 'auto'
});
this.addView(actionsTooltip);
},
| 2 |
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss @@ -134,7 +134,7 @@ select,
textarea {
line-height: 1.4;
font-weight: 400;
- font-family: "GTAmericaExp-Regular", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+ font-family: "ExpensifyNeue-Regular", "Helvetica Neue", "Helvetica", Arial, sans-serif;
font-size: 16px;
color: $color-white;
}
@@ -142,7 +142,7 @@ textarea {
button {
border-radius: 12px;
padding: 12px;
- font-family: "GTAmericaExp-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+ font-family: "ExpensifyNeue-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif;
font-size: 15px;
font-weight: bold;
| 4 |
diff --git a/contracts/Proxy.sol b/contracts/Proxy.sol FILE INFORMATION
-----------------------------------------------------------------
file: Proxy.sol
-version: 0.3
+version: 0.4
author: Anton Jurisevic
date: 2018-2-28
@@ -19,10 +19,6 @@ A proxy contract that, if it does not recognise the function
being called on it, passes all value and call data to an
underlying target contract.
-The proxy can also optionally activate metropolis operations,
-which will allow more-versatile return values once that fork
-has hit.
-
Additionally this file contains the Proxyable interface.
Any contract the proxy wraps must implement this, in order
for the proxy to be able to pass msg.sender into the underlying
@@ -32,15 +28,12 @@ contract as the state parameter, messageSender.
*/
-/* With inspiration from Martin Swende and Zeppelin.*/
-
pragma solidity ^0.4.20;
import "contracts/Owned.sol";
contract Proxy is Owned {
Proxyable target;
- bool public metropolis;
function Proxy(Proxyable _target, address _owner)
Owned(_owner)
@@ -59,14 +52,6 @@ contract Proxy is Owned {
TargetChanged(_target);
}
- // Allow the use of the more-flexible metropolis RETURNDATACOPY/SIZE operations.
- function _setMetropolis(bool _metropolis)
- external
- onlyOwner
- {
- metropolis = _metropolis;
- }
-
function ()
public
payable
@@ -77,10 +62,6 @@ contract Proxy is Owned {
let free_ptr := mload(0x40)
calldatacopy(free_ptr, 0, calldatasize)
- // Use metropolis if possible.
- let met_cond := sload(metropolis_slot)
- if met_cond
- {
// Forward all gas, ether, and data to the target contract.
let result := call(gas, sload(target_slot), callvalue, free_ptr, calldatasize, 0, 0)
returndatacopy(free_ptr, 0, returndatasize)
@@ -89,12 +70,6 @@ contract Proxy is Owned {
if iszero(result) { revert(free_ptr, calldatasize) }
return(free_ptr, returndatasize)
}
- // If metropolis is unavailable, use static 32-byte return values.
- let ret_size := 32
- let result := call(gas, sload(target_slot), callvalue, free_ptr, calldatasize, free_ptr, ret_size)
- if iszero(result) { revert(free_ptr, calldatasize) }
- return(free_ptr, ret_size)
- }
}
event TargetChanged(address targetAddress);
| 2 |
diff --git a/make.js b/make.js @@ -227,6 +227,8 @@ b.task('build:test-assets', ['build:demo:vfs', 'build:desktop:dars'], () => {
moduleName: 'TEST_VFS',
rootDir: path.join(__dirname, 'test', 'fixture')
})
+ // copy a non-minified substance file into test folder
+ b.copy('./node_modules/substance/dist/substance.js*', DIST + 'test/')
})
b.task('build:test-browser', ['build:assets', 'build:test-assets'], () => {
| 4 |
diff --git a/module/gurps.js b/module/gurps.js @@ -924,7 +924,7 @@ Hooks.once("init", async function () {
type: String,
choices: {
'Standard': 'Size and Speed/Range Table',
- 'Simplified': 'Range bands from GURPS Monster Hunters 2: The Mission'
+ 'Simplified': 'Monster Hunters tange bands'
},
default: 'Standard',
onChange: value => console.log(value)
| 3 |
diff --git a/src/traces/parcoords/calc.js b/src/traces/parcoords/calc.js @@ -46,10 +46,6 @@ function constHalf(len) {
return out;
}
-function isTypedArray(a) {
- return !Array.isArray(a) && Lib.isArrayOrTypedArray(a);
-}
-
function convertTypedArray(a) {
- return (isTypedArray(a)) ? Array.prototype.slice.call(a) : a;
+ return (Lib.isTypedArray(a)) ? Array.prototype.slice.call(a) : a;
}
| 2 |
diff --git a/_blogposts/2020-12-07-release-8-4.mdx b/_blogposts/2020-12-07-release-8-4.mdx @@ -3,8 +3,10 @@ author: hongbo
date: "2020-12-07"
previewImg:
category: compiler
+badge: release
title: ReScript 8.4
description: |
+ bsb improvements
---
## Introduction
@@ -29,7 +31,7 @@ so that once it's built for the first time, we don't need to rebuild it any more
when the assumption does not hold.
In this release, we fix the integrity of `bsb -make-world` which allows user to change the dependencies.
-The fix is well implementend that people who don't do such modifications will not pay for it.
+The fix is well implemented that people who don't do such modifications will not pay for it.
This is one of the highest desired feature request based on the
[user feedback](https://github.com/rescript-lang/rescript-compiler/issues/4361#issuecomment-739538789), so we will expand a bit here why it is tricky
@@ -47,13 +49,13 @@ In this release, we track the installation in the build graph as well, and we ca
dependent's command line flags for building binary artifacts. Such strategy benefits in such aspects:
- The calculation of the hash of installation is almost free since it is just one stat, we don't need track all dependencies' artifacts.
-- The introducion of such hashing does not appear in parsing, so that the changes of dependencies will never trigger re-parsing.
-- Once the package installation is a nop, the transitive rebuild graph will be cut off so that we can save some unneeded rebuild.
-- When people make changes to the depdendencies, if such changes don't change the package interface, it will not trigger the build of its dependents.
+- The introduction of such hashing does not appear in parsing, so that the changes of dependencies will never trigger re-parsing.
+- Once the package installation is a no-op, the transitive rebuild graph will be cut off so that we can save some unneeded rebuild.
+- When people make changes to the dependencies, if such changes don't change the package interface, it will not trigger the build of its dependents.
### Introducing `pinned-dependencies`
-To make `bsb -make-world` more pratical, we also introduce a new concept called: `pinned-dependencies`.
+To make `bsb -make-world` more practical, we also introduce a new concept called: `pinned-dependencies`.
In general, packages are classified as three categories:
- toplevel
@@ -61,7 +63,7 @@ In general, packages are classified as three categories:
- warn-error respected
- build dev dependency
- run custom rules
- - package-specs like es6/commonjs overrides all its dependencies
+ - package-specs like ES6/CommonJS overrides all its dependencies
- pinned dependencies
- warnings reported
- warn-error respected
@@ -78,11 +80,10 @@ such package will be built mostly like `toplevel` packages.
The usage is quite simple, add `pinned-dependencies` in the toplevel package's `bsconfig.json`.
Note such field only make sense in toplevel's configuration.
-
### More robust handling of removal of staled output
-When people delete or rename rescript files, it will introduce dangling staled output, for example, renaming `src/A.res`
-into `src/B.res` will bring `src/A.cmi` (and more intemediate outputs) stale. This is worse than it sounds like, suppose you have a
+When people delete or rename ReScript files, it will introduce dangling staled output, for example, renaming `src/A.res`
+into `src/B.res` will bring `src/A.cmi` (and more intermediate outputs) stale. This is worse than it sounds like, suppose you have a
local `src/List.res` which shadows the stdlib's List. Now we remove it, it will introduce stale `List.cmi` file, without the proper removal
of such stale outptu, such stale `List.cmi` file will break the integrity of the build.
| 1 |
diff --git a/test/cf/smoke/src/test/test.js b/test/cf/smoke/src/test/test.js @@ -359,10 +359,12 @@ describe('abacus-smoke-test', function() {
request.post(collector + '/v1/metering/collected/usage',
extend({ body: u.usage }, authHeader(objectStorageToken)),
(err, val) => {
- expect(err).to.equal(undefined);
+ expect(err).to.equal(undefined, util.format('Error: %o', err));
// Expect a 201 with the location of the accumulated usage
- expect(val.statusCode).to.equal(201);
+ expect(val.statusCode).to.equal(201,
+ util.format('Response code: %d body: %j',
+ val.statusCode, val.body));
expect(val.headers.location).to.not.equal(undefined);
cb();
});
@@ -465,8 +467,9 @@ describe('abacus-smoke-test', function() {
'us-south:a3d7fe4d-3cb1-4cc3-a831-ffe98e20cf27',
'aggregated/usage'
].join('/'), extend({}, authHeader(systemToken)), (err, val) => {
- expect(err).to.equal(undefined);
- expect(val.statusCode).to.equal(200);
+ expect(err).to.equal(undefined, util.format('Error: %o', err));
+ expect(val.statusCode).to.equal(200,
+ util.format('Response code: %d body: %j', val.statusCode, val.body));
const actual = clone(omit(val.body,
'id', 'processed', 'processed_id', 'start', 'end'), prune);
| 7 |
diff --git a/src/mixins/helpers.js b/src/mixins/helpers.js @@ -240,6 +240,9 @@ var helpers = {
if (i >= slideCount && this.state.lazyLoadedList.indexOf(i - slideCount) < 0) {
slidesToLoad.push(i - slideCount)
}
+ if (i < 0 && this.state.lazyLoadedList.indexOf(i + slideCount) < 0) {
+ slidesToLoad.push(i + slideCount)
+ }
}
if (slidesToLoad.length > 0) {
this.setState({
| 1 |
diff --git a/src/style/apply.js b/src/style/apply.js @@ -24,6 +24,11 @@ styfn.apply = function( eles ){
var ele = eles[ ie ];
var cxtMeta = self.getContextMeta( ele );
+
+ if( cxtMeta.empty ){
+ continue;
+ }
+
var cxtStyle = self.getContextStyle( cxtMeta );
var app = self.applyContextStyle( cxtMeta, cxtStyle, ele );
@@ -126,7 +131,8 @@ styfn.getContextMeta = function( ele ){
return {
key: cxtKey,
- diffPropNames: diffProps
+ diffPropNames: diffProps,
+ empty: diffProps.length === 0
};
};
| 7 |
diff --git a/lib/shared/addon/components/form-versions/component.js b/lib/shared/addon/components/form-versions/component.js @@ -180,7 +180,7 @@ export default Component.extend({
}
if (editing) {
- if (applyClusterTemplate && valueIsPatchVersion) {
+ if (applyClusterTemplate) {
if (initialVersionDoesSatisfy) {
value = initialVersion;
} else {
| 2 |
diff --git a/src/post/Write/SideControls.js b/src/post/Write/SideControls.js @@ -7,6 +7,7 @@ import React, { Component } from 'react';
import './PostEditor.scss';
import Icon from '../../widgets/Icon';
import { uploadFile } from '../../user/userActions';
+import { notify } from '../../app/Notification/notificationActions';
const debug = newDebug('busy:PostEditor:SideControls');
@@ -123,8 +124,12 @@ class SideControls extends Component {
const username = this.props.user.name;
let entityKey;
let imageElement;
+ const maxFileSize = 8 * 1024 * 1024 * 1024; // 8 mb in bytes
+ if (file.size > maxFileSize) {
+ return this.props.notify('Max Image size is 8mb', 'error');
+ }
const contentState = this.props.editorState.getCurrentContent();
- preloadFile({ file })
+ return preloadFile({ file })
.then((dataUrl) => {
this.hide();
const contentStateWithEntity = contentState.createEntity('IMAGE', 'IMMUTABLE', { src: dataUrl });
@@ -173,6 +178,6 @@ class SideControls extends Component {
SideControls = connect(state => ({
files: state.user.files,
-}), { uploadFile })(SideControls);
+}), { uploadFile, notify })(SideControls);
export default SideControls;
| 12 |
diff --git a/token-metadata/0x55Eb5288c9b65037a4cd2289637f38A4F9DB3a6B/metadata.json b/token-metadata/0x55Eb5288c9b65037a4cd2289637f38A4F9DB3a6B/metadata.json "symbol": "KGW",
"address": "0x55Eb5288c9b65037a4cd2289637f38A4F9DB3a6B",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/api-explorer/src/Doc.jsx b/packages/api-explorer/src/Doc.jsx @@ -181,9 +181,7 @@ class Doc extends React.Component {
}
resetTryItRequest(e) {
- this.setState({
- tryItRequestFired: e,
- });
+ this.state.tryItRequestFired = e;
}
renderCodeSample() {
| 12 |
diff --git a/ui/less/containers.less b/ui/less/containers.less .fullscreen-container() {
width: 100%;
height: 100%;
+ background-color: black;
}
.shaka-video-container:fullscreen { .fullscreen-container(); }
.shaka-video-container:-webkit-full-screen { .fullscreen-container(); }
| 12 |
diff --git a/src/public/drug/sections/MechanismsOfAction/Section.js b/src/public/drug/sections/MechanismsOfAction/Section.js import React, { Fragment } from 'react';
+import { Link } from 'ot-ui';
-import { Link, OtTableRF } from 'ot-ui';
+import Table from '../../../common/Table/Table';
+import { PaginationActionsComplete } from '../../../common/Table/TablePaginationActions';
const columns = [
{
@@ -14,10 +16,12 @@ const columns = [
{
id: 'targets',
label: 'Human targets',
- renderCell: d =>
- !d.targets || d.targets.length === 0
+ filterValue: row =>
+ row.targets.map(target => target.approvedSymbol).join(' '),
+ renderCell: row =>
+ !row.targets || row.targets.length === 0
? 'non-human'
- : d.targets.map((target, i) => (
+ : row.targets.map((target, i) => (
<Fragment key={i}>
{i > 0 ? ' ' : null}
<Link to={`/target/${target.id}`}>{target.approvedSymbol}</Link>
@@ -27,6 +31,7 @@ const columns = [
{
id: 'references',
label: 'References',
+ filterValue: false,
renderCell: d =>
!d.references
? 'n/a'
@@ -47,8 +52,15 @@ const columns = [
},
];
-const Section = ({ data }) => (
- <OtTableRF loading={false} error={false} columns={columns} data={data.rows} />
+const Section = ({ chemblId, data }) => (
+ <Table
+ showGlobalFilter
+ columns={columns}
+ rows={data.rows}
+ pagination={PaginationActionsComplete}
+ dataDownloader
+ dataDownloaderFileStem={`${chemblId}-mechanisms-of-action`}
+ />
);
export default Section;
| 4 |
diff --git a/js/node/bis_wswebsocketfileserver.js b/js/node/bis_wswebsocketfileserver.js @@ -395,7 +395,7 @@ class BisWSWebSocketFileServer extends BaseFileServer {
self.sendCommand(socket,'uploadcomplete', 'file saved in '+writeLocation+' (isbinary='+dataInProgress.isbinary+')').then( () => {
dataInProgress.data=null;
console.log(',_._._._._._ \t message sent -- file saved in ',writeLocation,' binary=',dataInProgress.isbinary);
- })
+ });
});
let errorfn= ( (e) => {
| 1 |
diff --git a/contracts/FeePool.sol b/contracts/FeePool.sol @@ -410,6 +410,12 @@ contract FeePool is Proxyable, SelfDestructible, LimitedSetup {
public
optionalProxy_onlyOwner
{
+ // Get the ExchageRates address with the XDR rate (its not in the new one)
+ address _exchangeRates = 0xE95Ef4e7a04d2fB05cb625c62CA58da10112c605;
+ if (exchangeRatesAddress != 0) {
+ _exchangeRates = exchangeRatesAddress;
+ }
+
Synth xdrSynth = synthetix.synths("XDR");
Synth sUSDSynth = synthetix.synths(sUSD);
@@ -417,7 +423,7 @@ contract FeePool is Proxyable, SelfDestructible, LimitedSetup {
uint xdrAmount = xdrSynth.balanceOf(FEE_ADDRESS);
// How much sUSD should be minted from the XDR's
- uint sUSDAmount = synthetix.effectiveValue("XDR", xdrAmount, sUSD);
+ uint sUSDAmount = IExchangeRates(_exchangeRates).effectiveValue("XDR", xdrAmount, sUSD);
// Burn the XDRs
xdrSynth.burn(FEE_ADDRESS, xdrAmount);
@@ -425,12 +431,6 @@ contract FeePool is Proxyable, SelfDestructible, LimitedSetup {
// Mint their new synths
sUSDSynth.issue(FEE_ADDRESS, sUSDAmount);
- // Get the ExchageRates address with the XDR rate (its not in the new one)
- address _exchangeRates = 0xE95Ef4e7a04d2fB05cb625c62CA58da10112c605;
- if (exchangeRatesAddress != 0) {
- _exchangeRates = exchangeRatesAddress;
- }
-
// Convert FeePeriods To sUSD
for (uint i = 0; i < FEE_PERIOD_LENGTH; i++) {
uint feesToDistribute = IExchangeRates(_exchangeRates).effectiveValue("XDR", _recentFeePeriodsStorage(i).feesToDistribute, sUSD);
| 3 |
diff --git a/defaultConfig.js b/defaultConfig.js @@ -321,7 +321,7 @@ module.exports = {
|
| Add...
|
- | Class name: .border-{width}
+ | Class name: .border{-side?}{-width?}
|
*/
@@ -532,7 +532,7 @@ module.exports = {
|
| Add...
|
- | Class name: .p-{size}
+ | Class name: .p{-side?}-{size}
|
*/
@@ -555,7 +555,7 @@ module.exports = {
|
| Add...
|
- | Class name: .m-{size}
+ | Class name: .m{-side?}-{size}
|
*/
@@ -578,7 +578,7 @@ module.exports = {
|
| Add...
|
- | Class name: .-m-{size}
+ | Class name: .-m{-side?}-{size}
|
*/
| 7 |
diff --git a/packages/spark-core/components/toggle.js b/packages/spark-core/components/toggle.js @@ -35,7 +35,8 @@ const toggleAriaExpanded = (toggleTrigger) => {
const handleToggleClick = (toggleContent, toggleIcon, toggleIconUse, element) => {
const trigger = element;
- const isAccordion = trigger.getAttribute('data-sprk-toggle-type') === 'accordion';
+ const isAccordion = trigger.getAttribute('data-sprk-toggle-type').includes('accordion');
+ const isMastheadAccordion = trigger.getAttribute('data-sprk-toggle-type') === 'masthead-accordion';
// Rotate the Icon
if (toggleIcon) toggleIcon.classList.toggle('sprk-c-Icon--open');
@@ -50,7 +51,8 @@ const handleToggleClick = (toggleContent, toggleIcon, toggleIconUse, element) =>
);
}
- if (isAccordion) toggleContent.parentElement.classList.toggle('sprk-c-Accordion__item--open');
+ if (isAccordion && !isMastheadAccordion) toggleContent.parentElement.classList.toggle('sprk-c-Accordion__item--open');
+ if (isMastheadAccordion) toggleContent.parentElement.classList.toggle('sprk-c-MastheadAccordion__item--open');
toggleContent.slideToggle(300).then(() => {
// Enable clicks after animation runs
| 3 |
diff --git a/lib/core/api/client_manager.rb b/lib/core/api/client_manager.rb @@ -13,7 +13,7 @@ module Core
{
region_id: Rails.configuration.default_region,
ssl_verify_mode: Rails.configuration.ssl_verify_peer,
- interface: ENV['DEFAULT_SERVICE_INTERFACE'] || 'public',
+ interface: ENV['DEFAULT_SERVICE_INTERFACE'] || 'internal',
log_level: Logger::INFO,
keep_alive_timeout: 5,
#headers: { "Accept-Encoding" => "" },
| 4 |
diff --git a/src/lib/validate.js b/src/lib/validate.js @@ -20,7 +20,7 @@ module.exports.validateUsernameRemotely = username => (
uri: `/accounts/checkusername/${username}/`
}, (err, body, res) => {
if (err || res.statusCode !== 200) {
- resolve({valid: false, errMsgId: 'general.apiError'});
+ resolve({valid: false, errMsgId: 'general.error'});
}
switch (body.msg) {
case 'valid username':
| 4 |
diff --git a/docs/typescript.md b/docs/typescript.md @@ -129,4 +129,4 @@ However, before you do, please [open an issue on Mongoose's GitHub page](https:/
### Next Up
-Now that you've seen the basics of how to use Mongoose in TypeScript, let's take a look at [statics in TypeScript](/docs/typescript/statics.html).
+Now that you've seen the basics of how to use Mongoose in TypeScript, let's take a look at [statics in TypeScript](/docs/typescript/statics-and-methods.html).
| 1 |
diff --git a/src/defaultConfig.js b/src/defaultConfig.js @@ -14,8 +14,8 @@ module.exports = function (config) {
let pathPrefix = pathPrefixOverride || templateConfig.getPathPrefix();
return urlFilter.call(this, url, pathPrefix);
});
- config.addFilter("log", (input, ...data) => {
- console.log(input, ...data);
+ config.addFilter("log", (input, ...messages) => {
+ console.log(input, ...messages);
return input;
});
| 10 |
diff --git a/assets/js/components/legacy-notifications/util.js b/assets/js/components/legacy-notifications/util.js @@ -24,8 +24,9 @@ import { applyFilters } from '@wordpress/hooks';
/**
* Internal dependencies
*/
-import data, { TYPE_MODULES } from '../data';
-import { getCache } from '../data/cache';
+import { getItem } from '../../googlesitekit/api/cache';
+import API from 'googlesitekit-api';
+
export const wincallbacks = applyFilters( 'googlesitekit.winCallbacks', {} );
export const modulesNotificationsToRequest = () => {
@@ -78,7 +79,7 @@ export async function getTotalNotifications() {
* @param {Array} notifications List of notifications.
* @return {Array} Filtered list of notifications.
*/
-const removeDismissed = ( notifications ) => {
+const removeDismissed = async ( notifications ) => {
if ( ! notifications ) {
return [];
}
@@ -87,10 +88,15 @@ const removeDismissed = ( notifications ) => {
return notifications;
}
- return notifications.filter( ( notification ) => {
- const dismissed = getCache( `notification::dismissed::${ notification.id }` );
+ const promises = await notifications.map( ( notification ) => getItem( `notification::dismissed::${ notification.id }` ) );
+ const allNotifications = await Promise.all( promises );
+
+ const notDismissed = notifications.filter( ( _, index ) => {
+ const dismissed = allNotifications[ index ];
return ! dismissed;
} );
+
+ return notDismissed;
};
/**
@@ -111,8 +117,8 @@ export async function getModulesNotifications() {
const promise = new Promise( async ( resolve ) => {
const { identifier } = module;
- const notifications = removeDismissed(
- await data.get( TYPE_MODULES, identifier, 'notifications', {}, false )
+ const notifications = await removeDismissed(
+ await API.get( 'modules', identifier, 'notifications', {}, false )
);
resolve( { identifier, notifications } );
| 14 |
diff --git a/Apps/Sandcastle/gallery/LensFlare.html b/Apps/Sandcastle/gallery/LensFlare.html @@ -69,7 +69,7 @@ for (var name in viewModel) {
}
}
-var lensFlare = viewer.scene.postProcessStages.add(Cesium.PostProcessStageLibrary.createLensFlarStage());
+var lensFlare = viewer.scene.postProcessStages.add(Cesium.PostProcessStageLibrary.createLensFlareStage());
function updatePostProcess() {
lensFlare.enabled = Boolean(viewModel.show);
| 3 |
diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js @@ -539,23 +539,18 @@ export default class HttpServer {
const stageVariables = this.#serverless.service.custom
? this.#serverless.service.custom.stageVariables
: null
- let lambdaProxyIntegrationEvent
- if (endpoint.isHttpApi && endpoint.payload === '2.0') {
- lambdaProxyIntegrationEvent = new LambdaProxyIntegrationEventV2(
- request,
- this.#serverless.service.provider.stage,
- requestPath,
- stageVariables,
- )
- } else {
- lambdaProxyIntegrationEvent = new LambdaProxyIntegrationEvent(
+ const LambdaProxyEvent =
+ endpoint.isHttpApi && endpoint.payload === '2.0'
+ ? LambdaProxyIntegrationEventV2
+ : LambdaProxyIntegrationEvent
+
+ const lambdaProxyIntegrationEvent = new LambdaProxyEvent(
request,
this.#serverless.service.provider.stage,
requestPath,
stageVariables,
)
- }
event = lambdaProxyIntegrationEvent.create()
}
| 0 |
diff --git a/priv/public/ui/app/mn_admin/mn_xdcr/create_dialog/mn_xdcr_create_dialog_controller.js b/priv/public/ui/app/mn_admin/mn_xdcr/create_dialog/mn_xdcr_create_dialog_controller.js var promise = mnXDCRService.postRelication(replication);
mnPromiseHelper(vm, promise, $uibModalInstance)
.showGlobalSpinner()
- .catchErrors()
+ .catchErrors(function (error) {
+ vm.errors = angular.isString(error) ? {_: error} : error;
+ })
.closeOnSuccess()
.broadcast("reloadTasksPoller")
.showGlobalSuccess("Replication created successfully!");
| 9 |
diff --git a/src/Worker.js b/src/Worker.js @@ -24,6 +24,7 @@ const baseUrl = (src => {
return 'file://' + process.cwd();
}
})(src);
+setBaseUrl(baseUrl);
const _normalizeUrl = src => {
if (!/^(?:data|blob):/.test(src)) {
const match = baseUrl.match(/^(file:\/\/)(.*)$/);
| 12 |
diff --git a/plugins/lookup/app/controllers/lookup/services_controller.rb b/plugins/lookup/app/controllers/lookup/services_controller.rb @@ -45,7 +45,7 @@ module Lookup
'lb_listener' => %w[loadbalancing find_listener],
'lb_pool' => %w[loadbalancing find_pool],
'lb_healthmonitor' => %w[loadbalancing find_healthmonitor],
- 'storage_container' => %w[object_storage find_container],
+ 'storage_container' => %w[object_storage container_metadata],
'share' => %w[shared_filesystem_storage find_share],
'share_network' => %w[shared_filesystem_storage find_share_network],
'share_snapshot' => %w[shared_filesystem_storage snapshots_detail],
| 1 |
diff --git a/components/Article/ArticleGallery.js b/components/Article/ArticleGallery.js @@ -57,16 +57,20 @@ class ArticleGallery extends Component {
const nextShow = !this.state.show
const { galleryItems } = this.state
if (nextShow && galleryItems.some(i => i.src === nextSrc.split('&')[0])) {
- this.setState({
+ this.setState(
+ {
show: true,
startItemSrc: nextSrc
- }, () => postMessage({ type: 'gallery-opened' })
+ },
+ () => postMessage({ type: 'fullscreen-enter' })
)
} else {
- this.setState({
+ this.setState(
+ {
show: false,
startItemSrc: null
- }, () => postMessage({ type: 'gallery-closed' })
+ },
+ () => postMessage({ type: 'fullscreen-exit' })
)
}
}
| 4 |
diff --git a/src/components/Label/Label.styl b/src/components/Label/Label.styl font-size 14px
line-height @height
background-color var(--background)
+ color #333
border-left-style solid
border-left-width 4px
border-left-color var(--color)
background-color var(--color)
&_selected
- box-shadow: 0px 0px 0px 3px var(--color);
+ background-color var(--color)
+ color white
+ &_selected &__hotkey
+ color white
&__text
position relative
- color var(--color)
white-space nowrap
&__hotkey
position relative
| 7 |
diff --git a/src/dot.js b/src/dot.js @@ -153,19 +153,34 @@ export default function(src, callback) {
var startNode = nodeDictionary[startNodeId];
var prevStartNode = prevNodeDictionary[startNodeId];
if (prevStartNode) {
- var startShape = startNode.children[3];
- if (startShape.tag == 'g' && startShape.children[0].tag == 'a') {
- startShape = startShape.children[0].children[1];
+ if (! startNode) {
+ return;
}
- var prevStartShape = prevStartNode.children[3];
- if (prevStartShape.tag == 'g' && prevStartShape.children[0].tag == 'a') {
- prevStartShape = prevStartShape.children[0].children[1];
+ if (startNode.children[3].tag == 'g' && startNode.children[3].children[0].tag == 'a') {
+ startNode = startNode.children[3].children[0];
}
- if (startShape.tag != 'polygon' && startShape.tag != 'ellipse') {
- throw Error('Unexpected tag: ' + startShape.tag + '. Please file an issue at https://github.com/magjac/d3-graphviz/issues');
+ if (prevStartNode.children[3].tag == 'g' && prevStartNode.children[3].children[0].tag == 'a') {
+ prevStartNode = prevStartNode.children[3].children[0];
}
- if (prevStartShape.tag != 'polygon' && prevStartShape.tag != 'ellipse') {
- throw Error('Unexpected tag: ' + prevStartShape.tag + '. Please file an issue at https://github.com/magjac/d3-graphviz/issues');
+ var startShapes = startNode.children;
+ for (var i = 0; i < startShapes.length; i++) {
+ if (startShapes[i].tag == 'polygon' || startShapes[i].tag == 'ellipse') {
+ var startShape = startShapes[i];
+ break;
+ }
+ }
+ if (typeof startShape == 'undefined') {
+ throw Error('Unsupported start shape of node ' + startNodeId + '.\nPlease file an issue at https://github.com/magjac/d3-graphviz/issues');
+ }
+ var prevStartShapes = prevStartNode.children;
+ for (var i = 0; i < prevStartShapes.length; i++) {
+ if (prevStartShapes[i].tag == 'polygon' || prevStartShapes[i].tag == 'ellipse') {
+ var prevStartShape = prevStartShapes[i];
+ break;
+ }
+ }
+ if (typeof prevStartShape == 'undefined') {
+ throw Error('Unsupported previuous start shape of node ' + startNodeId + '.\nPlease file an issue at https://github.com/magjac/d3-graphviz/issues');
}
datum.offset = {
x: prevStartShape.center.x - startShape.center.x,
| 9 |
diff --git a/assets/js/components/activation/activation-main.js b/assets/js/components/activation/activation-main.js @@ -59,7 +59,7 @@ export function ActivationMain( { buttonURL, onButtonClick, buttonLabel } ) {
<div className="googlesitekit-start-setup-wrap">
<Button
id="start-setup-link"
- className="googlesitekit-start-setup googlesitekit-activation__button"
+ className="googlesitekit-start-setup"
/* href must only be passed if not disabled to work and display correctly. */
href={ complete ? buttonURL : undefined }
onClick={ onButtonClick }
| 2 |
diff --git a/layouts/base-adresse-nationale.js b/layouts/base-adresse-nationale.js @@ -22,7 +22,6 @@ const propTypes = {
}
export function Mobile({address, bbox, viewHeight, handleSelect}) {
- const [showOverlay, setShowOverlay] = useState(false)
const [selectedLayout, setSelectedLayout] = useState('map')
return (
@@ -35,9 +34,6 @@ export function Mobile({address, bbox, viewHeight, handleSelect}) {
<BanMap address={address} {...mapboxProps} onSelect={handleSelect} />
)}
</Mapbox>
- {showOverlay && (
- <div className='overlay' />
- )}
</div>
<div className={`mobile-container ${selectedLayout === 'explorer' ? 'show' : 'hidden'}`}>
@@ -93,10 +89,6 @@ export function Mobile({address, bbox, viewHeight, handleSelect}) {
display: none;
}
- .overlay {
- height: 60%;
- }
-
.explorer {
display: flex;
flex-direction: column;
| 2 |
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js @@ -332,8 +332,6 @@ proto.render = function() {
return Axes.hoverLabelText(ax, val, hoverformat);
}
- var oldEventData;
-
if(lastPicked !== null) {
var pdata = project(scene.glplot.cameraParams, selection.dataCoordinate);
trace = lastPicked.data;
@@ -456,10 +454,11 @@ proto.render = function() {
gd.emit('plotly_hover', eventData);
}
- oldEventData = eventData;
+ this.oldEventData = eventData;
} else {
Fx.loneUnhover(svgContainer);
- gd.emit('plotly_unhover', oldEventData);
+ gd.emit('plotly_unhover', this.oldEventData);
+ this.oldEventData = undefined;
}
scene.drawAnnotations(scene);
| 1 |
diff --git a/articles/multifactor-authentication/factors/email.md b/articles/multifactor-authentication/factors/email.md @@ -9,11 +9,15 @@ contentType:
---
# MFA with Email
-Enabling MFA with Email is useful when you want to give users a fallback MFA factor for when they do not have access to their normal MFA method (e.g. they don't have their mobile device, or their device does not have connectivity). As it is designed to be used as a fallback method, **Email cannot be the only enabled factor**.
+Using MFA with email is useful when you want to provide users a way to perform MFA when they don't have a mobile device.
-When enabled, users with verified emails will get the option to get a one-time password code in their email to complete the MFA flow.
+Once Email is enabled as an MFA factor:
-Note that Email is not true 'Multi-factor Authentication' as it does not represent a different factor. It does not represent 'something I have' or 'something I am', but rather just another 'something I know' (the email password). It is also weaker than other factors, in that it's only as secure as the email itself (e.g. is it encrypted end-to-end?).
+- Users with verified emails will get the option of getting a code in their email to complete the MFA challenge.
+- Users from Database Connections without verified emails will get prompted to verify their emails.
+- Users from social / enterprise connections that don't provide verified emails, will not be able to use MFA with email. If Email MFA is the ONLY enabled factor, they will get an error when logging-in, and they will not be able to complete the login flow. You should not enable Email MFA as the only factor if you have social/enterprise connections that don't provide verified emails.
+
+Note that Email is not true 'Multi-factor Authentication' as it does not represent a different factor than the password. It does not represent 'something I have' or 'something I am', but rather just another 'something I know' (the email password). It is also weaker than other factors, in that it's only as secure as the email itself (e.g. is it encrypted end-to-end?).
## End-user experience
@@ -21,9 +25,11 @@ After the login step, users will be presented with the most secure enabled facto
+After Email MFA is enabled, all new or existing users from Database Connections that do not have verified emails will get prompted to verify their emails after their log in. They will get a code in ther email they'll need to enter in the login page to continue.
+
## Administrative setup
-In order to set up Email, you will need to have another factor enabled, and enable the Email factor in the Dashboard.
+In order to set up Email, you need to able the Email factor in the Dashboard.
| 3 |
diff --git a/UserReviewBanHelper.user.js b/UserReviewBanHelper.user.js // @description Display users' prior review bans in review, Insert review ban button in user review ban history page, Load ban form for user if user ID passed via hash
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 7.3
+// @version 7.3.1
//
// @include */review/close*
// @include */review/reopen*
};
- const reloadPage = () => location.reload(true);
const getQueryParam = key => new URLSearchParams(window.location.search).get(key);
const pluralize = s => s.length != 1 ? 's' : '';
const dateToSeDateFormat = d => d.toISOString().replace('T', ' ').replace(/\.\d+Z$/, 'Z');
| 2 |
diff --git a/assets/js/components/data-table.js b/assets/js/components/data-table.js @@ -95,7 +95,7 @@ export const getDataTableFromData = ( data, headers, options ) => {
<table
className={ `
googlesitekit-table__wrapper
- googlesitekit-table__wrapper--${ data[ 0 ].length }-col
+ googlesitekit-table__wrapper--${ data && data[ 0 ] ? data[ 0 ].length : 1 }-col
` }
>
<thead className="googlesitekit-table__head">
| 1 |
diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js @@ -124,7 +124,7 @@ function func(config) {
//
// See https://github.com/karma-runner/karma/commit/89a7a1c#commitcomment-21009216
func.defaultConfig.browserConsoleLogOptions = {
- level: 'log'
+ level: 'debug'
};
config.set(func.defaultConfig);
| 12 |
diff --git a/assets/js/modules/idea-hub/datastore/draft-post-ideas.js b/assets/js/modules/idea-hub/datastore/draft-post-ideas.js @@ -28,15 +28,9 @@ const { createRegistrySelector, commonActions, combineStores } = Data;
const fetchGetDraftPostIdeasStore = createFetchStore( {
baseName: 'getDraftPostIdeas',
controlCallback: ( { timestamp } ) => {
- return API.get(
- 'modules',
- 'idea-hub',
- 'draft-post-ideas',
- { timestamp },
- {
- useCache: false,
- }
- );
+ return API.get( 'modules', 'idea-hub', 'draft-post-ideas', {
+ timestamp,
+ } );
},
argsToParams( { timestamp } ) {
return { timestamp };
| 2 |
diff --git a/lib/node_modules/@stdlib/streams/node/from-iterator/test/test.main.js b/lib/node_modules/@stdlib/streams/node/from-iterator/test/test.main.js @@ -24,6 +24,7 @@ var tape = require( 'tape' );
var Readable = require( 'readable-stream' ).Readable;
var isBuffer = require( '@stdlib/assert/is-buffer' );
var array2iterator = require( '@stdlib/array/to-iterator' );
+var randu = require( '@stdlib/random/iterators/randu' );
var inspectStream = require( '@stdlib/streams/node/inspect-sink' );
var parseJSON = require( '@stdlib/utils/parse-json' );
var iteratorStream = require( './../lib/main.js' );
@@ -178,7 +179,7 @@ tape( 'the returned stream provides a method to destroy a stream (object)', func
var count = 0;
var s;
- s = iteratorStream( array2iterator( [ 1, 2, 3, 4, 5, 6, 7, 8 ] ) );
+ s = iteratorStream( randu() );
t.equal( typeof s.destroy, 'function', 'has destroy method' );
@@ -213,7 +214,7 @@ tape( 'the returned stream provides a method to destroy a stream (error object)'
var count = 0;
var s;
- s = iteratorStream( array2iterator( [ 1, 2, 3, 4, 5, 6, 7, 8 ] ) );
+ s = iteratorStream( randu() );
t.equal( typeof s.destroy, 'function', 'has destroy method' );
@@ -245,7 +246,7 @@ tape( 'the returned stream provides a method to destroy a stream (error object)'
tape( 'the returned stream does not allow itself to be destroyed more than once', function test( t ) {
var s;
- s = iteratorStream( array2iterator( [ 1, 2, 3, 4, 5, 6, 7, 8 ] ) );
+ s = iteratorStream( randu() );
s.on( 'error', onError );
s.on( 'close', onClose );
| 4 |
diff --git a/token-metadata/0xbE9375C6a420D2eEB258962efB95551A5b722803/metadata.json b/token-metadata/0xbE9375C6a420D2eEB258962efB95551A5b722803/metadata.json "symbol": "STMX",
"address": "0xbE9375C6a420D2eEB258962efB95551A5b722803",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/network.js b/network.js @@ -2203,7 +2203,12 @@ function onWebsocketMessage(message) {
console.log('RECEIVED '+message+' from '+ws.peer);
ws.last_ts = Date.now();
+ try{
var arrMessage = JSON.parse(message);
+ }
+ catch(e){
+ return console.log('failed to json.parse message '+message);
+ }
var message_type = arrMessage[0];
var content = arrMessage[1];
| 8 |
diff --git a/website/components/CodeBlock.js b/website/components/CodeBlock.js @@ -52,19 +52,26 @@ export default function CodeBlock({
}}
extend={{
cursor: 'pointer',
- borderRadius: 20,
+ borderRadius: '50%',
outline: 0,
- backgroundColor: theme.colors.blue,
+ backgroundColor: theme.colors.blueLight,
borderWidth: 2,
borderStyle: 'solid',
borderColor: theme.colors.blueDark,
color: 'white',
fontSize: 15,
+ opacity: 0.75,
transition:
'background-color 200ms ease-out, color 200ms ease-in-out, border-color 200ms ease-in-out, transform 100ms ease-out',
':hover': {
- backgroundColor: theme.colors.blueDark,
+ backgroundColor: theme.colors.blue,
+ opacity: 1,
+ },
+ ':focus': {
+ backgroundColor: theme.colors.blue,
+ opacity: 1,
+ boxShadow: `0 0 0 2px white, 0 0 0 4px ${theme.colors.pink}`,
},
':active': {
transform: 'scale(0.95, 0.95)',
| 7 |
diff --git a/src/components/nodes/callActivity/CallActivityFormSelect.vue b/src/components/nodes/callActivity/CallActivityFormSelect.vue @@ -25,15 +25,6 @@ export default {
uniqBy(process.events, 'ownerProcessId').forEach(event => {
list.push(this.toDropdownFormat(process, event));
});
-
- // const subprocessList = [];
-
- // process.events.forEach(event => {
- // if (!subprocessList.includes(event.ownerProcessId)) {
- // subprocessList.push(event.ownerProcessId);
- // list.push(this.toDropdownFormat(process, event));
- // }
- // });
});
return list;
@@ -42,13 +33,6 @@ export default {
methods: {
containsMultipleProcesses(process) {
return uniqBy(process.events, 'ownerProcessId').length > 1;
- // const subprocessList = [];
- // process.events.forEach((event) => {
- // if (!subprocessList.includes(event.ownerProcessId)) {
- // subprocessList.push(event.ownerProcessId);
- // }
- // });
- // return subprocessList.length > 1;
},
toDropdownFormat(process, event) {
return {
| 2 |
diff --git a/apps/heatmap/uicallbacks.js b/apps/heatmap/uicallbacks.js @@ -427,29 +427,36 @@ async function saveEditData(){
})
// add new one or update old one
- let rs = null;
const now = getDateInString();
const editData = $D.editedDataClusters.toJSON()
- if(data.length == 0){
+
+
+ // delete old one
+ let create_date = now;
+ if(data.length!==0){
+ create_date = data[0].create_date;
+ const del = await $CAMIC.store.deleteHeatmapEdit(user, subject, caseid, exec);
+ // error
+ if(del.hasError&&del.hasError==true){
+ $UI.message.addError(del.message);
+ Loading.close();
+ return;
+ }
+ }
// add new one
- rs = await $CAMIC.store.addHeatmapEdit({
+ const add = await $CAMIC.store.addHeatmapEdit({
user_id:user,
- create_date:now,
+ create_date:create_date,
update_date:now,
provenance:$D.heatMapData.provenance,
data:editData
});
- }else{
- rs = await $CAMIC.store.updateHeatmapEdit(user, subject, caseid, exec, JSON.stringify(editData));
- }
// error
- if(rs.hasError&&rs.hasError==true){
- $UI.message.addError(rs.message);
+ if(add.hasError&&add.hasError==true){
+ $UI.message.addError(add.message);
Loading.close();
return;
- }else{
-
}
Loading.close();
| 1 |
diff --git a/gulpfile.babel.js b/gulpfile.babel.js @@ -70,7 +70,10 @@ gulp.task('karma', ['lint'], function (done) {
configFile: __dirname + '/karma.conf.js',
singleRun: !Boolean(argv['keep-browser-open']),
client: {
- captureConsole: Boolean(argv['capture-console'])
+ captureConsole: Boolean(argv['capture-console']),
+ mocha: {
+ timeout : 5000
+ }
}
});
| 12 |
diff --git a/src/commands/utility/ImportDataCommand.js b/src/commands/utility/ImportDataCommand.js @@ -67,6 +67,7 @@ async function insertStrikes(db, data, type, guildid, botid) {
function getUsers(data, type, guildid, botid) {
const users = [];
for (const user of Object.keys(data)) {
+ if (data[user] > Number.MAX_SAFE_INTEGER) continue;
users.push([guildid, user, type, Date.now(), data[user], 'Imported from Vortex', botid])
}
return users;
| 8 |
diff --git a/src/parsers/GmlReader.hx b/src/parsers/GmlReader.hx @@ -612,7 +612,8 @@ using tools.NativeString;
// see if there's `= value`:
skipSpaces1x(till);
- if (peek() == "=".code) {
+ c = peek();
+ if (c == "=".code || c == ":".code && peek(1) == "=".code) {
skip(); skipSpaces1();
d.exprStart = pos;
skipVarExpr(v, ",".code);
| 1 |
diff --git a/src/templates/actors/npc2-sheet.hbs b/src/templates/actors/npc2-sheet.hbs <span class="sep"> / </span>
<input name="system.attributes.hp.max" type="text" value="{{system.attributes.hp.max}}" data-dtype="Number" placeholder="10" />
</div>
+ <footer class="attribute-footer">
+ <div>
+ <input name="system.attributes.hp.temp" type="text" class="temphp" value="{{system.attributes.hp.temp}}" data-dtype="Number" placeholder="{{localize "SFRPG.TempHPPlaceHolderText"}}" />
+ </div>
+ </footer>
</li>
<li class="attribute health">
| 0 |
diff --git a/client/index.html b/client/index.html robotState.innerHTML = res.human_state;
}
- if (res.in_cleaning === 1) {
+ if (res.in_cleaning === 1 || res.in_cleaning === 2) {
if (res.state === 3 || res.state === 10 || res.state === 2) {
pauseButton.setAttribute("disabled", "disabled");
startButton.removeAttribute("disabled");
| 11 |
diff --git a/background_scripts/actions.js b/background_scripts/actions.js @@ -476,6 +476,8 @@ Actions = (function() {
};
_.openLast = function(o) {
+ if (o.sender.tab.incognito)
+ return;
var stepBackFN = Sessions.nativeSessions ?
chrome.sessions.restore.bind(chrome.sessions) :
Sessions.stepBack.bind(Sessions, o.sender);
| 8 |
diff --git a/src/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java b/src/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java @@ -248,9 +248,9 @@ public class RNFetchBlobFS {
CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
while ((cursor = fs.read(buffer)) != -1) {
encoder.encode(ByteBuffer.wrap(buffer).asCharBuffer());
- // if the data contains invalid characters the following lines will be
- // skipped.
String chunk = new String(buffer);
+ if(cursor != bufferSize)
+ chunk = chunk.substring(0, cursor);
emitStreamEvent(streamId, "data", chunk);
if(tick > 0)
SystemClock.sleep(tick);
| 1 |
diff --git a/test/grbl.js b/test/grbl.js @@ -331,13 +331,13 @@ test('GrblLineParserResultSettings', (t) => {
];
const grbl = new Grbl();
let i = 0;
- grbl.on('settings', ({ raw, setting, value, description }) => {
+ grbl.on('settings', ({ raw, setting, value, message }) => {
if (i < lines.length) {
const r = raw.match(/^(\$[^=]+)=([^ ]*)\s*(.*)/);
t.equal(raw, lines[i]);
t.equal(setting, r[1]);
t.equal(value, r[2]);
- t.equal(description, trim(r[3], '()'));
+ t.equal(message, trim(r[3], '()'));
}
++i;
| 10 |
diff --git a/articles/support/index.md b/articles/support/index.md @@ -137,7 +137,7 @@ Auth0's Business Hours are as follows:
Monday, 6:00 am CST/UTC+8 hours - Friday, 6:00 pm PDT/UTC-7 hours | 24/5 coverage during this period
**Critical Support Hours**
-Standard Support: 24/5 | Enterprise and Preferred Support: 24/7/265
+Standard Support: 24/5 | Enterprise and Preferred Support: 24/7/365
Every effort will be made to respond sooner than the times listed above. However, some types of problems such as development issues that require us to install software to duplicate a problem, may take time due to the research and work required. Response times may also be delayed during periods of heavy ticket volume.
| 1 |
diff --git a/src/components/validationStatus.vue b/src/components/validationStatus.vue <template>
<div>
- <div class="validation-container" v-if="toggleValidationPanel">
- <span class="validation-container__defaultMessage" v-if="!numberOfValidationErrors">no problems to report</span>
- <div class="validation-container__list" v-for="error in errorList" :key="error.id">
+ <div class="validation-container position-absolute text-left" v-if="toggleValidationPanel">
+ <span class="validation-container__defaultMessage d-flex justify-content-center align-items-center h-100" v-if="!numberOfValidationErrors">no problems to report</span>
+ <div class="validation-container__list d-flex justify-content-between" v-for="error in errorList" :key="error.id">
<span class="validation-container__list--id">{{ error.id }}</span>
<span class="validation-container__list--message">
<span class="validation-container__list--key">{{ error.errorKey }}</span>
<div>{{ error.message }}</div>
</span>
- <span class="validation-container__list--errorCategory">
+ <span class="validation-container__list--errorCategory d-flex justify-content-center align-items-center">
<font-awesome-icon class="status-bar-container__status-icon" :style="{ color: iconColor }" :icon="valditionIcon" />
</span>
</div>
</div>
- <div class="status-bar-container" @click="toggleValidationPanel = !toggleValidationPanel">
+ <div class="status-bar-container d-flex align-items-center justify-content-around" @click="toggleValidationPanel = !toggleValidationPanel">
<span class="statusBar-container__status-text">Problems {{ numberOfValidationErrors }}</span>
<font-awesome-icon class="status-bar-container__status-icon" :style="{ color: statusColor }" :icon="statusIcon" />
<font-awesome-icon class="status-bar-container__status-ellipsis" :icon="ellipsisIcon" />
@@ -104,19 +104,15 @@ $border-color: #aaaaaa;
$text-size-sm: 0.85rem;
$id-container-width: 6rem;
$message-container-width: 18rem;
+$error-category-width: 1rem;
$validation-container-height: 20rem;
$validation-container-width: 28rem;
$status-bar-container-height: 2.5rem;
$status-bar-container-width: 8rem;
-$message-label-pill-width: 1.5rem;
-$message-label-pill-height: 4rem;
$error-color: #D9534F;
$warning-color: #F0AD4E;
.status-bar-container {
- display: flex;
- justify-content: space-around;
- align-items: center;
font-size: $text-size-sm;
color: $seconadry-grey;
height: $status-bar-container-height;
@@ -124,6 +120,7 @@ $warning-color: #F0AD4E;
cursor: pointer;
&__status-ellipsis {
+
&:hover {
color: $secondary-blue;
}
@@ -131,7 +128,6 @@ $warning-color: #F0AD4E;
}
.validation-container {
- position:absolute;
bottom: 0;
right: 0;
height: $validation-container-height;
@@ -140,42 +136,37 @@ $warning-color: #F0AD4E;
overflow: scroll;
margin-bottom: 2.5rem;
border: 1px solid $border-color;
- text-align: left;
&__defaultMessage {
- display: flex;
- justify-content: center;
- align-items: center;
- height: 100%;
text-transform: capitalize;
}
&__list {
- display: grid;
- grid-template-columns: $id-container-width $message-container-width 1fr;
padding: 1rem;
word-wrap: break-word;
&--id {
+ width: $id-container-width;
color: $seconadry-grey;
text-transform: none;
margin-right: 1rem;
}
&--message {
+ width: $message-container-width;
+ margin-right: 1rem;
text-transform: capitalize;
}
&--errorCategory {
- justify-self: center;
- align-self: center;
+ width: $error-category-width;
}
&--key {
font-weight: 700;
}
-
}
+
.label-background-warning {
background-color: $warning-color;
}
| 14 |
diff --git a/lib/matcher.js b/lib/matcher.js @@ -17,6 +17,10 @@ module.exports = function() {
var obj = brands[kvnd];
var parts = toParts(kvnd);
+ if (obj.countryCodes) {
+ parts.countryCodes = obj.countryCodes.slice(); // copy
+ }
+
var matchTags = (obj.matchTags || [])
.map(function(s) { return s.toLowerCase(); });
var matchNames = (obj.matchNames || [])
@@ -39,11 +43,11 @@ module.exports = function() {
}
if (parts.d) {
- // fixme: duplicates will overwrite the single entry (ok for now)
+ // fixme: name collisions will overwrite the single entry (ok for now)
if (!_ambiguous[kv]) _ambiguous[kv] = {};
_ambiguous[kv][nsimple] = parts;
} else {
- // duplicates are a problem in matchIndex, warn if we detect it
+ // name collisions are a problem in matchIndex, warn if we detect it
if (!_matchIndex[kv]) _matchIndex[kv] = {};
var m = _matchIndex[kv][nsimple];
if (m) { // there already is a match for this
@@ -58,23 +62,25 @@ module.exports = function() {
};
- // pass a `key`, `value`, `name` and return the best match
- matcher.matchKVN = function(key, value, name) {
- return matcher.matchParts(toParts(key + '/' + value + '|' + name));
+ // pass a `key`, `value`, `name` and return the best match,
+ // `countryCode` optional (if supplied, must match that too)
+ matcher.matchKVN = function(key, value, name, countryCode) {
+ return matcher.matchParts(toParts(key + '/' + value + '|' + name), countryCode);
};
- // pass a parts object and return the best match
- matcher.matchParts = function(parts) {
+ // pass a parts object and return the best match,
+ // `countryCode` optional (if supplied, must match that too)
+ matcher.matchParts = function(parts, countryCode) {
var match = null;
var inGroup = false;
// fixme: we currently return a single match for ambiguous
match = _ambiguous[parts.kv] && _ambiguous[parts.kv][parts.nsimple];
- if (match) return match;
+ if (match && matchesCountryCode(match)) return match;
// try to return an exact match
match = _matchIndex[parts.kv] && _matchIndex[parts.kv][parts.nsimple];
- if (match) return match;
+ if (match && matchesCountryCode(match)) return match;
// look in match groups
for (var mg in matchGroups) {
@@ -95,6 +101,10 @@ module.exports = function() {
match = _matchIndex[otherkv] && _matchIndex[otherkv][parts.nsimple];
}
+ if (!matchesCountryCode(match)) {
+ match = null;
+ }
+
if (inGroup && match) {
return match;
}
@@ -102,6 +112,13 @@ module.exports = function() {
}
return null;
+
+
+ function matchesCountryCode(match) {
+ if (!countryCode) return true;
+ if (!match.countryCodes) return true;
+ return (match.countryCodes.indexOf(countryCode) !== -1);
+ }
};
| 11 |
diff --git a/tasks/stats.js b/tasks/stats.js @@ -181,7 +181,7 @@ function makeBundleInfo(pathObj) {
'',
'#### npm package (starting in `v1.39.0`)',
'',
- 'Install with',
+ 'Install [`' + pkgName + '`](https://www.npmjs.com/package/' + pkgName + ') with',
'```',
'npm install ' + pkgName,
'```',
| 0 |
diff --git a/runtime.js b/runtime.js @@ -475,8 +475,10 @@ const _loadScript = async (file, {files = null, parentUrl = null, instanceId = n
if (monetization && ethereumAddress && ethereumAddress == ownerAddress) {
monetization.dispatchEvent(new Event('monetizationstart'));
+ monetization.state = "started";
} else if (monetization && document.monetization) {
monetization.dispatchEvent(new Event('monetizationstart'));
+ monetization.state = "started";
}
}
}, err => {
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.