code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/test/provisioning/src/test/plans-acceptance-test.js b/test/provisioning/src/test/plans-acceptance-test.js @@ -270,11 +270,11 @@ describe('Create and update plans acceptance test', () => {
};
});
- it('should be created or already exists', (done) => {
+ it('should be accepted and processed', (done) => {
abacusClient.postUsage(usageToken, usageBody, (err, val) => {
expect(err).to.equal(undefined);
debug('\n POST %s', val.request.uri.href);
- expect(val.statusCode).to.be.oneOf([201, 409]);
+ expect(val.statusCode).to.equal(202);
const locationHeader = val.headers.location;
expect(locationHeader).to.not.equal(undefined);
abacusClient.waitUntilUsageIsProcessed(usageToken, locationHeader, done);
| 4 |
diff --git a/packages/client-app/static/workspace.less b/packages/client-app/static/workspace.less @@ -430,13 +430,10 @@ body.platform-linux {
.btn-toolbar {
margin-left: 0;
padding: 0 17px;
- line-height: 36px;
img.content-mask {
vertical-align: middle;
background-color: @text-color-heading;
- padding-bottom: 10px;
}
}
}
-
}
| 7 |
diff --git a/elements/simple-fields/demo/upload.html b/elements/simple-fields/demo/upload.html <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
<title>simple-fields-field Demo</title>
+ <script>window.WCGlobalBasePath = "/node_modules/";</script>
<script src="../../../node_modules/@lrnwebcomponents/deduping-fix/deduping-fix.js"></script>
<script src="../../../node_modules/web-animations-js/web-animations-next-lite.min.js"></script>
<script type="module">
| 12 |
diff --git a/src/index.js b/src/index.js @@ -49,7 +49,7 @@ module.exports = class Client {
consumer(
{
groupId,
- createPartitionAssigner,
+ partitionAssigners,
sessionTimeout,
heartbeatInterval,
maxBytesPerPartition,
@@ -65,7 +65,7 @@ module.exports = class Client {
logger: this.logger,
cluster,
groupId,
- createPartitionAssigner,
+ partitionAssigners,
sessionTimeout,
heartbeatInterval,
maxBytesPerPartition,
| 11 |
diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js @@ -17,7 +17,14 @@ const existingLocaleCodes = allLocales.map(locale => locale.code.toLowerCase().r
*
*/
async function getFirstPreferredLangCode () {
- let userPreferredLocaleCodes = await getPreferredLocales()
+ let userPreferredLocaleCodes
+
+ try {
+ userPreferredLocaleCodes = await getPreferredLocales()
+ } catch (e) {
+ // Brave currently throws when calling getAcceptLanguages, so this handles that.
+ userPreferredLocaleCodes = []
+ }
// safeguard for Brave Browser until they implement chrome.i18n.getAcceptLanguages
// https://github.com/MetaMask/metamask-extension/issues/4270
@@ -32,3 +39,4 @@ async function getFirstPreferredLangCode () {
}
module.exports = getFirstPreferredLangCode
+
| 9 |
diff --git a/src/components/Settings/RequestDeleteAccount.vue b/src/components/Settings/RequestDeleteAccount.vue @@ -37,21 +37,15 @@ export default {
Dialog.create({
title: this.$t('USERDATA.DIALOGS.REQUEST_DELETE_ACCOUNT.TITLE'),
message: this.$t('USERDATA.DIALOGS.REQUEST_DELETE_ACCOUNT.MESSAGE'),
- buttons: [
- {
- label: this.$t('BUTTON.CANCEL'),
- handler: () => {
- this.dialogShown = false
- },
- },
- {
- label: this.$t('USERDATA.DIALOGS.REQUEST_DELETE_ACCOUNT.CONFIRM'),
- handler: () => {
+ cancel: this.$t('BUTTON.CANCEL'),
+ ok: this.$t('USERDATA.DIALOGS.REQUEST_DELETE_ACCOUNT.CONFIRM'),
+ })
+ .then(() => {
this.$emit('requestDeleteAccount')
this.dialogShown = false
- },
- },
- ],
+ })
+ .catch(() => {
+ this.dialogShown = false
})
},
},
| 4 |
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js @@ -53,7 +53,8 @@ var RevealNotes = (function() {
function post( event ) {
var slideElement = Reveal.getCurrentSlide(),
- notesElement = slideElement.querySelector( 'aside.notes' );
+ notesElement = slideElement.querySelector( 'aside.notes' ),
+ fragmentElement = slideElement.querySelector( '.current-fragment' );
var messageData = {
namespace: 'reveal-notes',
@@ -64,21 +65,27 @@ var RevealNotes = (function() {
state: Reveal.getState()
};
- // Look for notes defined in a fragment, if it is a fragmentshown event
- if (event && event.hasOwnProperty('fragment')) {
- var innerNotes = event.fragment.querySelector( 'aside.notes' );
-
- if ( innerNotes) {
- notesElement = innerNotes;
- }
- }
-
// Look for notes defined in a slide attribute
if( slideElement.hasAttribute( 'data-notes' ) ) {
messageData.notes = slideElement.getAttribute( 'data-notes' );
messageData.whitespace = 'pre-wrap';
}
+ // Look for notes defined in a fragment
+ if( fragmentElement ) {
+ var fragmentNotes = fragmentElement.querySelector( 'aside.notes' );
+ if( fragmentNotes ) {
+ notesElement = fragmentNotes;
+ }
+ else if( fragmentElement.hasAttribute( 'data-notes' ) ) {
+ messageData.notes = fragmentElement.getAttribute( 'data-notes' );
+ messageData.whitespace = 'pre-wrap';
+
+ // In case there are slide notes
+ notesElement = null;
+ }
+ }
+
// Look for notes defined in an aside element
if( notesElement ) {
messageData.notes = notesElement.innerHTML;
| 7 |
diff --git a/articles/protocols/oauth2/oauth-state.md b/articles/protocols/oauth2/oauth-state.md @@ -5,7 +5,7 @@ description: Explains how to use the state parameter in authentication requests
# The State Parameter
-The `state` parameter is one of the supported Auth0 [Authentication Parameters](/libraries/lock/v10/sending-authentication-parameters), used to help mitigate [CSRF attacks](https://en.wikipedia.org/wiki/Cross-site_request_forgery).
+The `state` parameter is an authentication parameter used to help mitigate [CSRF attacks](https://en.wikipedia.org/wiki/Cross-site_request_forgery).
A CSRF attack can occur when a malicious program causes a user's web browser to perform an unwanted action on a trusted site that the user is currently authenticated. This type of attack specifically target state-changing requests to initiate a type of action instead of getting user data because the attacker has no way to see the response of the forged request.
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 14.5.0
- Added: `ignoreFunctions: []` to `function-no-unknown` ([#5901](https://github.com/stylelint/stylelint/pull/5901)).
| 6 |
diff --git a/docs/02-quickstart.md b/docs/02-quickstart.md @@ -16,7 +16,8 @@ Snowpack is agnostic to how you serve your site during development. If you have
- [`serve`](https://www.npmjs.com/package/serve) (recommended: popular, easy to use)
- [`servor`](https://www.npmjs.com/package/servor) (recommended: has live-reload, built for SPAs)
-- [`live-server`](https://www.npmjs.com/package/live-server), [`lite-server`](https://www.npmjs.com/package/lite-server), [`browser-sync`](https://www.npmjs.com/package/browser-sync), [`es-dev-server`](https://www.npmjs.com/package/es-dev-server) (honorable mentions)
+- [`es-dev-server`](https://www.npmjs.com/package/es-dev-server) (recommended: built for buildless workflows, efficient browser caching)
+- [`live-server`](https://www.npmjs.com/package/live-server), [`lite-server`](https://www.npmjs.com/package/lite-server), [`browser-sync`](https://www.npmjs.com/package/browser-sync) (honorable mentions)
- [`now dev`](http://now.sh/), [`netlify dev`](https://www.netlify.com/products/dev/) (if you already deploy via Zeit/Netlify)
| 3 |
diff --git a/module/actor/actor.js b/module/actor/actor.js @@ -1020,7 +1020,7 @@ export class GurpsActor extends Actor {
importAd(i,p) {
let a = new Advantage();
- a.name = i.name || "Advantage";
+ a.name = i.name + (i.levels? " "+i.levels.toString() : "") || "Advantage";
a.points = i.calc.points;
a.note = i.notes;
a.userdesc = i.userdesc;
@@ -1060,7 +1060,7 @@ export class GurpsActor extends Actor {
importSk(i,p) {
let s = new Skill();
- s.name = i.name || "Skill";
+ s.name = i.name + (!!i.tech_level? `/TL${i.tech_level}`:"") + (!!i.specialization? ` (${i.specialization})` : "")|| "Skill";
s.type = i.type.toUpperCase();
s.import = i.calc?.level || "";
if (s.level == 0) s.level = '';
@@ -1109,7 +1109,7 @@ export class GurpsActor extends Actor {
s.duration = i.duration || "";
s.points = i.points || "";
s.casttime = i.casting_time || "";
- s.import = s.calc?.level.toString();
+ s.import = i.calc?.level || 0;
s.uuid = i.id;
s.parentuuid = p;
let old = this._findElementIn('spells', s.uuid);
@@ -1181,8 +1181,8 @@ export class GurpsActor extends Actor {
importEq(i,p,carried) {
let e = new Equipment();
e.name = i.description || "Equipment";
- e.count = i.quantity || "0";
- e.cost = i.cost || "";
+ e.count = i.type == "equipment_container"? "1" : i.quantity || "0";
+ e.cost = i.value || "";
e.carried = carried;
e.equipped = i.equipped;
e.techlevel = i.tech_level || "";
@@ -1192,8 +1192,8 @@ export class GurpsActor extends Actor {
e.maxuses = i.max_uses || 0;
e.uuid = i.id;
e.parentuuid = p;
- e.notes = i.notes;
- e.weight = i.weight || 0;
+ e.notes = i.notes || "";
+ e.weight = parseFloat(i.weight).toString() || "";
e.pageRef(i.reference || "");
let old = this._findElementIn('equipment.carried', e.uuid);
if (!old) old = this._findElementIn('equipment.other', e.uuid);
@@ -1468,10 +1468,12 @@ export class GurpsActor extends Actor {
let m_index = 0;
let r_index = 0;
let temp = [].concat(ads,skills,spells,equipment);
+ console.log(temp);
let all = [];
for (let i of temp) {all = all.concat(this.recursiveGet(i))};
for (let i of all) {
if (i.weapons?.length) for (let w of i.weapons) {
+ console.log(i.name || i.description, w);
if (w.type == "melee_weapon") {
let m = new Melee();
m.name = i.name || i.description || "";
@@ -1480,8 +1482,7 @@ export class GurpsActor extends Actor {
m.techlevel = i.tech_level || "";
m.cost = i.value || "";
m.notes = i.notes || "";
- if (m.notes != "") i.notes += "\n";
- m.notes += w.notes;
+ if (!!m.notes && w.notes) i.notes += "\n" + w.notes;
m.pageRef(i.reference || "");
m.mode = w.usage || "";
m.import = w.calc.level.toString() || "0";
@@ -1504,8 +1505,7 @@ export class GurpsActor extends Actor {
r.legalityclass = i.legality_class || "4";
r.ammo = 0;
r.notes = i.notes || "";
- if (r.notes != "") i.notes += "\n";
- r.notes += w.notes;
+ if (!!r.notes && w.notes) i.notes += "\n" + w.notes;
r.pageRef(i.reference || "");
r.mode = w.usage || "";
r.import = w.calc.level || "0";
@@ -1593,7 +1593,7 @@ export class GurpsActor extends Actor {
commit = { ...commit, ...(await this.importProtectionFromGCSv2(r.settings.hit_locations))};
commit = { ...commit, ...this.importPointTotalsFromGCSv2(r.total_points,r.attributes,r.advantages,r.skills,r.spells)};
commit = { ...commit, ...this.importReactionsFromGCSv3(r.advantages,r.skills,r.equipment)};
- commit = { ...commit, ...this.importCombatFromGCSv2(r.advantages,r.skills,r.spells)};
+ commit = { ...commit, ...this.importCombatFromGCSv2(r.advantages,r.skills,r.spells,r.equipment)};
console.log('Starting commit');
| 1 |
diff --git a/modules/Cockpit/rest-api.php b/modules/Cockpit/rest-api.php @@ -39,21 +39,21 @@ $this->on("before", function() {
$allowed = (isset($apikeys['master']) && trim($apikeys['master']) && $apikeys['master'] == $token);
}
- if (!$allowed) {
- return false;
- }
-
$parts = explode('/', $path, 2);
$resource = $parts[0];
$params = isset($parts[1]) ? explode('/', $parts[1]) : [];
$output = false;
+ $user = $this->module('cockpit')->getUser();
- if ($resourcefile = $this->path("#config:api/{$resource}.php")) {
+ if ($resourcefile = $this->path("#config:api/public/{$resource}.php")) {
+
+ $output = include($resourcefile);
+
+ } elseif ($allowed && $resourcefile = $this->path("#config:api/{$resource}.php")) {
- $user = $this->module('cockpit')->getUser();
$output = include($resourcefile);
- } elseif (isset($routes[$resource])) {
+ } elseif ($allowed && isset($routes[$resource])) {
try {
| 11 |
diff --git a/src/lib/duration/create.js b/src/lib/duration/create.js @@ -14,7 +14,7 @@ var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
// from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
// somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
// and further modified to allow for strings containing both week and day
-var isoRegex = /^(-|\+)?P(?:((?:-|\+)?[0-9,.]*)Y)?(?:((?:-|\+)?[0-9,.]*)M)?(?:((?:-|\+)?[0-9,.]*)W)?(?:((?:-|\+)?[0-9,.]*)D)?(?:T(?:((?:-|\+)?[0-9,.]*)H)?(?:((?:-|\+)?[0-9,.]*)M)?(?:((?:-|\+)?[0-9,.]*)S)?)?$/;
+var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
export function createDuration (input, key) {
var duration = input,
@@ -38,7 +38,7 @@ export function createDuration (input, key) {
duration.milliseconds = input;
}
} else if (!!(match = aspNetRegex.exec(input))) {
- sign = (match[1] === '-') ? -1 : (match[1] === '+') ? 1 : 1;
+ sign = (match[1] === '-') ? -1 : 1;
duration = {
y : 0,
d : toInt(match[DATE]) * sign,
| 4 |
diff --git a/services/src/app.js b/services/src/app.js @@ -74,9 +74,12 @@ app.configure(channels);
// Configure a middleware for 404s and the error handler
app.use(express.notFound());
-/* eslint-disable no-unused-vars */
app.use((err, req, res, next) => {
- if (!err.statusCode) err.statusCode = err.code ? err.code : 500;
+ if (res.headersSent) {
+ return next(err);
+ }
+ if (!err.statusCode)
+ err.statusCode = (err.code ? err.code : 500);
if (!err.message) err.message = 'Unexpected server error';
/* Avoid cluttering the test logs with expected errors and exceptions */
if (process.env.NODE_ENV != 'test') {
@@ -86,7 +89,6 @@ app.use((err, req, res, next) => {
res.status(err.statusCode);
res.json({ status: FAILURE, message: err.message });
});
-/* eslint-enable no-unused-vars */
app.hooks(appHooks);
| 7 |
diff --git a/libs/ktx2image.js b/libs/ktx2image.js @@ -13,8 +13,8 @@ class Ktx2Image
{
this.vkFormat = 0;
this.typeSize = 0;
- this.pixelWidth = 0;
- this.pixelHeight = 0;
+ this.width = 0;
+ this.height = 0;
this.pixelDepth = 0;
this.layerCount = 0;
this.faceCount = 0;
@@ -78,8 +78,8 @@ class Ktx2Image
this.vkFormat = getNext();
this.typeSize = getNext();
- this.pixelWidth = getNext();
- this.pixelHeight = getNext();
+ this.width = getNext();
+ this.height = getNext();
this.pixelDepth = getNext();
this.layerCount = getNext();
this.faceCount = getNext();
@@ -138,8 +138,8 @@ class Ktx2Image
for (let level of this.levels)
{
level.miplevel = miplevel++;
- level.width = this.pixelWidth / (miplevel * miplevel);
- level.height = this.pixelHeight / (miplevel * miplevel);
+ level.width = this.width / (miplevel * miplevel);
+ level.height = this.height / (miplevel * miplevel);
if (this.vkFormat == VK_FORMAT.R16G16B16A16_SFLOAT)
{
| 10 |
diff --git a/wwwroot/config.json b/wwwroot/config.json "<a target=\"_blank\" href=\"http://www.gov.au/\"><img src=\"https://nationalmap.gov.au/images/AG-Rvsd-Stacked-Press.png\" height=\"45\" alt=\"Australian Government\" /></a>"
],
"displayOneBrand": 1,
- "catalogIndexUrl": "https://terria-catalogs-public.storage.googleapis.com/nationalmap/catalog-index/prod.zip",
+ "catalogIndexUrl": "https://terria-catalogs-public.storage.googleapis.com/nationalmap/catalog-index/prod.json",
"cesiumIonAccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2NzYxZjdkNi1mZmUyLTQ3YjMtOTdiMC00N2Y0ZTg0NWM3Y2EiLCJpZCI6Mjk5MiwiaWF0IjoxNjIyNTA0ODY0fQ.yOdPU8vWbX_dVDbofVpjMMCP59ZA1MKZInIuHV59bRo",
"developerAttribution": {
"link": "https://terria.io",
| 13 |
diff --git a/app/src/scripts/dashboard/dashboard.datasets.store.js b/app/src/scripts/dashboard/dashboard.datasets.store.js @@ -98,7 +98,16 @@ let UploadStore = Reflux.createStore({
if (!isAdmin && !isPublic) {
datasets = datasets.filter(dataset => {
if (dataset.group && userStore.data && userStore.data.profile) {
- return dataset.group === userStore.data.profile._id
+ let hasPermission
+ if (dataset.permissions) {
+ hasPermission = dataset.permissions.filter(permission => {
+ return permission._id === userStore.data.profile._id
+ }).length
+ }
+ const isUploader =
+ dataset.group === userStore.data.profile._id
+
+ return isUploader || hasPermission
} else {
return false
}
| 11 |
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js @@ -888,5 +888,5 @@ define({
"OPEN_PREFERENNCES" : "Open Preferences",
//Strings for LanguageTools Preferences
- LANGUAGE_TOOLS_PREFERENCES : "Preferences for Language Tools"
+ "LANGUAGE_TOOLS_PREFERENCES" : "Preferences for Language Tools"
});
| 1 |
diff --git a/src/index.postcss7.js b/src/index.postcss7.js @@ -63,7 +63,7 @@ const getConfigFunction = (config) => () => {
return resolveConfig([...getAllConfigs(configObject)])
}
-const plugin = postcss.plugin('tailwind', (config) => {
+const plugin = postcss.plugin('tailwindcss', (config) => {
const plugins = []
const resolvedConfigPath = resolveConfigPath(config)
| 10 |
diff --git a/articles/logout/index.md b/articles/logout/index.md @@ -123,6 +123,8 @@ In order to avoid validation errors, make sure that you do include the protocol
* The `returnTo` parameter does not function for all social providers. Please check your social provider's settings to ensure that they will accept the `redirectTo` parameter.
+* The URLs provided to the `Allowed Logout URLs` list are case-sensitive, so the URL used for logouts must match the case of the logout URL configured on the dashboard.
+
::: note
If you are working with social identity providers such as Google or Facebook, you must set your `Client ID` and `Secret` for these providers in the **Auth0 Management Console** for the logout to function.
:::
| 0 |
diff --git a/listener_clients/blink1listener/blink1listener.py b/listener_clients/blink1listener/blink1listener.py @@ -164,6 +164,7 @@ except:
print('No blink(1) devices found.')
exit (0)
+while(1):
try:
sio.connect('http://' + server + ':' + port)
sio.wait()
@@ -172,7 +173,11 @@ try:
except KeyboardInterrupt:
print('Exiting Tally Arbiter Listener.')
doBlink(0, 0, 0)
+ exit(0)
+ except socketio.exceptions.ConnectionError:
+ doBlink(0, 0, 0)
+ time.sleep(15)
except:
+ print("Unexpected error:", sys.exc_info()[0])
print('An error occurred internally.')
doBlink(0, 0, 0)
\ No newline at end of file
- exit (0)
\ No newline at end of file
| 11 |
diff --git a/packages/mjml-social/src/SocialElement.js b/packages/mjml-social/src/SocialElement.js @@ -229,11 +229,13 @@ export default class MjSocialElement extends BodyComponent {
>
<tr>
<td ${this.htmlAttributes({ style: 'icon' })}>
- <a ${this.htmlAttributes({
+ ${this.getAttribute('href') != '' ?
+ `<a ${this.htmlAttributes({
href,
rel: this.getAttribute('rel'),
target: this.getAttribute('target'),
- })}>
+ })}>` : ''
+ }
<img
${this.htmlAttributes({
alt: this.getAttribute('alt'),
@@ -244,7 +246,9 @@ export default class MjSocialElement extends BodyComponent {
width: parseInt(iconSize, 10),
})}
/>
- </a>
+ ${this.getAttribute('href') != '' ?
+ `</a>` : ''
+ }
</td>
</tr>
</table>
@@ -252,15 +256,23 @@ export default class MjSocialElement extends BodyComponent {
${this.getContent()
? `
<td ${this.htmlAttributes({ style: 'tdText' })}>
- <a
+ ${this.getAttribute('href') != '' ?
+ `<a
${this.htmlAttributes({
href,
style: 'text',
rel: this.getAttribute('rel'),
target: this.getAttribute('target'),
- })}>
+ })}>`
+ : `<span
+ ${this.htmlAttributes({
+ style: 'text',
+ })}>`
+ }
${this.getContent()}
- </a>
+ ${this.getAttribute('href') != '' ?
+ `</a>` : '</span>'
+ }
</td>
`
: ''}
| 11 |
diff --git a/server/game/cards/11.2-TMoW/HagensDaughter.js b/server/game/cards/11.2-TMoW/HagensDaughter.js @@ -5,7 +5,7 @@ class HagensDaughter extends DrawCard {
this.interrupt({
canCancel: true,
when: {
- onCharacterKilled: event => event.allowSave && event.card === this && this.canBeSaved()
+ onCharacterKilled: event => (event.allowSave || event.isBurn) && event.card === this && this.canBeSaved()
},
handler: context => {
context.event.saveCard();
| 11 |
diff --git a/src/UserConfig.js b/src/UserConfig.js @@ -195,6 +195,15 @@ class UserConfig {
this.addHandlebarsHelper(name, callback);
}
+ getFilter(name) {
+ return (
+ this.javascriptFunctions[name] ||
+ this.nunjucksFilters[name] ||
+ this.liquidFilters[name] ||
+ this.handlebarsHelpers[name]
+ );
+ }
+
addNunjucksTag(name, tagFn) {
name = this.getNamespacedName(name);
@@ -255,7 +264,8 @@ class UserConfig {
addPlugin(plugin, options) {
debug("Adding plugin (unknown name: check your config file).");
if (typeof plugin === "function") {
- plugin(this);
+ let configFunction = plugin;
+ configFunction(this, options);
} else if (plugin && plugin.configFunction) {
if (options && typeof options.init === "function") {
options.init.call(this, plugin.initArguments || {});
| 0 |
diff --git a/core/src/modules/ops/profileProperty.ts b/core/src/modules/ops/profileProperty.ts @@ -32,14 +32,14 @@ export namespace ProfilePropertyOps {
case "url":
return formatURL(value.toString());
case "boolean":
- if (![true, false, 0, 1, "true", "false"].includes(value)) {
- throw new Error(`${value} is not a valid boolean value`);
- }
- if ([true, 1, "true"].includes(value)) {
+ const check = value.toString().toLowerCase();
+ if (["1", "true"].includes(check)) {
return "true";
- } else {
+ }
+ if (["0", "false"].includes(check)) {
return "false";
}
+ throw new Error(`${value} is not a valid boolean value`);
default:
throw new Error(`cannot coerce profileProperty type ${type}`);
}
| 9 |
diff --git a/src/wrapper.js b/src/wrapper.js @@ -2,16 +2,12 @@ import React, { Component, PropTypes } from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { IntlProvider } from 'react-intl';
-
import { login } from './auth/authActions';
import { getConfig, getRate } from './actions';
import { getStoredBookmarks } from './bookmarks/bookmarksActions';
import { notify } from './app/Notification/notificationActions';
import Notification from './app/Notification/Notification';
import Sidebar from './app/Sidebar';
-import Splash from './app/Splash';
-import Loading from './widgets/Loading';
-import Modal from './widgets/Modal';
import * as messages from './translations/Translations';
import * as reblogActions from './app/Reblog/reblogActions';
@@ -44,12 +40,7 @@ export default class Wrapper extends Component {
const className = (!app.sidebarIsVisible) ? 'app-wrapper full-width' : 'app-wrapper';
return (
<IntlProvider locale={app.locale} messages={messages[app.locale]}>
- { auth.isFetching ?
- <Modal>
- <Loading />
- </Modal>
- : auth.isAuthenticated
- ? <div className={className}>
+ <div className={className}>
<Sidebar />
<Notification />
{ React.cloneElement(
@@ -57,8 +48,6 @@ export default class Wrapper extends Component {
{ auth, notify }
)}
</div>
- : <Splash />
- }
</IntlProvider>
);
}
| 11 |
diff --git a/token-metadata/0x14409B0Fc5C7f87b5DAd20754fE22d29A3dE8217/metadata.json b/token-metadata/0x14409B0Fc5C7f87b5DAd20754fE22d29A3dE8217/metadata.json "symbol": "PYRO",
"address": "0x14409B0Fc5C7f87b5DAd20754fE22d29A3dE8217",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/mavoscript.js b/src/mavoscript.js @@ -369,7 +369,7 @@ var _ = Mavo.Script = {
return `get(${_.serialize(node.object)}, ${property})`;
},
"ArrayExpression": node => `[${node.elements.map(_.serialize).join(", ")}]`,
- "Literal": node => node.raw,
+ "Literal": node => node.raw.replace(/\r/g, "\\r").replace(/\n/g, "\\n"),
"Identifier": node => node.name,
"ThisExpression": node => "this",
"Compound": node => node.body.map(_.serialize).join(", ")
| 11 |
diff --git a/_includes/index.css b/_includes/index.css @@ -246,7 +246,7 @@ footer.elv-layout {
}
@media (min-width: 64em) { /* 1024px */
.elv-layout-toc {
- margin-left: 18rem;
+ margin-left: 15rem;
max-width: 60rem;
margin-right: 1rem;
position: relative;
| 3 |
diff --git a/node/lib/util/synthetic_branch_util.js b/node/lib/util/synthetic_branch_util.js @@ -54,14 +54,23 @@ function identity(v) {
return v;
}
-function SyntheticBranchConfig(whitelistPattern) {
- if (whitelistPattern.length > 0) {
- const whitelistRE = new RegExp(whitelistPattern);
- this.whitelistTest = function(url) {
- return whitelistRE.test(url);
+function SyntheticBranchConfig(urlWhitelistPattern, pathWhitelistPattern) {
+ if (urlWhitelistPattern.length > 0) {
+ const urlWhitelistRE = new RegExp(urlWhitelistPattern);
+ this.urlWhitelistTest = function(url) {
+ return urlWhitelistRE.test(url);
};
} else {
- this.whitelistTest = function() { return false; };
+ this.urlWhitelistTest = function() { return false; };
+ }
+
+ if (pathWhitelistPattern.length > 0) {
+ const pathWhitelistRE = new RegExp(pathWhitelistPattern);
+ this.pathWhitelistTest = function(path) {
+ return pathWhitelistRE.test(path);
+ };
+ } else {
+ this.pathWhitelistTest = function() { return false; };
}
}
@@ -107,6 +116,21 @@ exports.urlToLocalPath = function *(repo, url) {
}
};
+/**
+ * Check that a given path is on the path synthetic-ref-check whitelist, if
+ * such a whitelist exists.
+ * @async
+ * @param {SyntheticBranchConfig} cfg The configuration for
+ * synthetic_branch_util
+ * @param {String} url The path of the submodule
+ * in the meta tree.
+ */
+function skipCheckForPath(cfg, path) {
+ assert.instanceOf(cfg, SyntheticBranchConfig);
+ assert.isString(path);
+ return cfg.pathWhitelistTest(path);
+}
+
/**
* Check that a given URL is on the URLs synthetic-ref-check whitelist, if
* such a whitelist exists.
@@ -119,7 +143,7 @@ exports.urlToLocalPath = function *(repo, url) {
function skipCheckForURL(cfg, url) {
assert.instanceOf(cfg, SyntheticBranchConfig);
assert.isString(url);
- return cfg.whitelistTest(url);
+ return cfg.urlWhitelistTest(url);
}
/**
@@ -133,7 +157,7 @@ function skipCheckForURL(cfg, url) {
* @param {String} url the configured URL of the submodule
* in the meta tree.
*/
-function* checkSubmodule(repo, cfg, metaCommit, submoduleEntry, url) {
+function* checkSubmodule(repo, cfg, metaCommit, submoduleEntry, url, path) {
assert.instanceOf(repo, NodeGit.Repository);
assert.instanceOf(cfg, SyntheticBranchConfig);
assert.instanceOf(submoduleEntry, NodeGit.TreeEntry);
@@ -142,6 +166,10 @@ function* checkSubmodule(repo, cfg, metaCommit, submoduleEntry, url) {
return true;
}
+ if (skipCheckForPath(cfg, path)) {
+ return true;
+ }
+
const localPath = yield *exports.urlToLocalPath(repo, url);
const submoduleRepo = yield NodeGit.Repository.open(localPath);
const submoduleCommitId = submoduleEntry.id();
@@ -184,10 +212,15 @@ function* checkSubmodules(repo, commit) {
assert.instanceOf(commit, NodeGit.Commit);
const config = yield repo.config();
- const whitelistPattern = (
+ const urlWhitelistPattern = (
yield ConfigUtil.getConfigString(
config, "gitmeta.skipsyntheticrefpattern")) || "";
- const cfg = new SyntheticBranchConfig(whitelistPattern);
+ const pathWhitelistPattern = (
+ yield ConfigUtil.getConfigString(
+ config, "gitmeta.skipsyntheticrefpathpattern")) || "";
+
+ const cfg = new SyntheticBranchConfig(urlWhitelistPattern,
+ pathWhitelistPattern);
const parent = yield GitUtil.getParentCommit(repo, commit);
const names = yield computeChangedSubmodules(repo,
@@ -222,7 +255,8 @@ function* checkSubmodules(repo, commit) {
return false;
}
const url = submodule.url;
- return yield *checkSubmodule(repo, cfg, commit, entry, url);
+ return yield *checkSubmodule(repo, cfg, commit, entry, url,
+ submodulePath);
});
return (yield result).every(identity);
});
| 11 |
diff --git a/README.md b/README.md @@ -74,26 +74,39 @@ By default `react-dates` will use `PureComponent` conditionally if it is availab
```
#### Overriding styles
-Right now, the easiest way to tweak `react-dates` to your heart's content is to create another stylesheet to override the default react-dates styles. For example, you could create a file named `react_dates_overrides.css` with the following contents:
+Right now, the easiest way to tweak `react-dates` to your heart's content is to create another stylesheet to override the default react-dates styles. For example, you could create a file named `react_dates_overrides.css` with the following contents (Make sure when you import said file to your `app.js`, you import it after the `react-dates` styles):
```css
-.CalendarDay__highlighted_calendar {
- background: #82E0AA;
- color: #186A3B;
+// NOTE: the order of these styles DO matter
+
+// Will edit everything selected including everything between a range of dates
+.CalendarDay__selected_span {
+ background: #82e0aa; //background
+ color: white; //text
+ border: 1px solid $light-red; //defualt styles include a border
+}
+
+// Will edit selected date or the endpoints of a range of dates
+.CalendarDay__selected {
+ background: $dark-red;
+ color: white;
}
-.CalendarDay__highlighted_calendar:hover {
- background: #58D68D;
- color: #186A3B;
+// Will edit when hovered over. _span style also has this property
+.CalendarDay__selected:hover {
+ background: orange;
+ color: white;
}
-.CalendarDay__highlighted_calendar:active {
- background: #58D68D;
- color: #186A3B;
+// Will edit when the second date (end date) in a range of dates
+// is not yet selected. Edits the dates between your mouse and said date
+.CalendarDay__hovered_span:hover,
+.CalendarDay__hovered_span {
+ background: brown;
}
```
-This would override the background and text colors applied to highlighted calendar days. You can use this method with the default set-up to override any aspect of the calendar to have it better fit to your particular needs.
+This would override the background and text colors applied to highlighted calendar days. You can use this method with the default set-up to override any aspect of the calendar to have it better fit to your particular needs. If there are any styles that you need that aren't listed here, you can always check the source css of each element.
### Make some awesome datepickers
| 13 |
diff --git a/map.html b/map.html container.classList.remove('dragging');
_updateTiles();
};
- container.addEventListener('mousedown', e => {
+ const _mousedown = e => {
_startDrag(e);
- });
- window.addEventListener('mouseup', e => {
+ };
+ container.addEventListener('mousedown', _mousedown);
+ container.addEventListener('pointerdown', _mousedown);
+ const _mouseup = e => {
_endDrag();
- });
- container.addEventListener('mousemove', e => {
+ };
+ window.addEventListener('mouseup', _mouseup);
+ window.addEventListener('pointerup', _mouseup);
+ const _mousemove = e => {
if (dragSpec) {
const currentX = e.clientX;
const currentY = e.clientY;
(-containerMetrics.y - (containerSize/2) + e.clientY)/height*(tileScale*zoom) + perspectiveOffset.z,
);
console.log(clickPoint.toArray().join(', ')); */
- });
+ };
+ container.addEventListener('mousemove', _mousemove);
+ container.addEventListener('pointermove', _mousemove);
window.addEventListener('resize', e => {
_updateTiles();
});
| 0 |
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb @@ -158,12 +158,12 @@ class DashboardController < ::ScopeController
# DON'T OVERWRITE THE VALUE HERE IN THE DASHBOARD CONTROLLER
# Possible values:
# ----------------
- # "public_release" (plugin is properly live and works)
+ # "public_release" (plugin is properly live and works, default)
# "experimental" (for plugins that barely work or don't work at all)
- # "tech_preview" (default)
+ # "tech_preview" (early preview for a new feature that probably still has several bugs)
# "beta" (if it's almost ready for public release)
def release_state
- "tech_preview"
+ "public_release"
end
def show_beta?
| 12 |
diff --git a/apps.json b/apps.json { "id": "aclock",
"name": "Analog Clock",
"icon": "clock-analog.png",
- "version":"0.02",
+ "version":"0.10",
"description": "An Analog Clock",
"tags": "clock",
"type":"clock",
| 3 |
diff --git a/src/client/js/components/Page/PageManagement.jsx b/src/client/js/components/Page/PageManagement.jsx @@ -113,7 +113,7 @@ const PageManagement = (props) => {
);
}
- function renderCurrentUserForDotsIcon() {
+ function renderDotsIconForCurrentUser() {
return (
<>
<a
@@ -131,7 +131,7 @@ const PageManagement = (props) => {
);
}
- function renderGuestUserForDotsIcon() {
+ function renderDotsIconForGuestUser() {
return (
<>
<a
@@ -152,7 +152,7 @@ const PageManagement = (props) => {
return (
<>
- {currentUser == null ? renderGuestUserForDotsIcon() : renderCurrentUserForDotsIcon()}
+ {currentUser == null ? renderDotsIconForGuestUser() : renderDotsIconForCurrentUser()}
<div className="dropdown-menu dropdown-menu-right">
{!isTopPagePath && renderDropdownItemForNotTopPage()}
<button className="dropdown-item" type="button" onClick={openPageTemplateModalHandler}>
| 10 |
diff --git a/src/Services/Air/AirFormat.js b/src/Services/Air/AirFormat.js @@ -257,6 +257,7 @@ function formatLowFaresSearch(searchRequest, searchResult) {
totalPrice: price.TotalPrice,
basePrice: price.BasePrice,
taxes: price.Taxes,
+ platingCarrier: thisFare.PlatingCarrier,
directions,
bookingComponents: [
{
| 0 |
diff --git a/src/utils/error.js b/src/utils/error.js +/* eslint-disable prefer-destructuring */
import { notification } from 'antd';
-// Uniform handling of API errors.
export default function handleAPIError(err) {
let data = null;
let messages = null;
- if (err.response) {
- data = err.response && err.response.data;
+ if (err.response && err.response.data) {
+ data = err.response.data;
+ } else if (err.data) {
+ data = err.data;
}
if (data) {
switch (data.code) {
| 1 |
diff --git a/token-metadata/0x8c3eE4F778E282B59D42d693A97b80b1ed80f4Ee/metadata.json b/token-metadata/0x8c3eE4F778E282B59D42d693A97b80b1ed80f4Ee/metadata.json "symbol": "STOP",
"address": "0x8c3eE4F778E282B59D42d693A97b80b1ed80f4Ee",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/extension/zoom-to-location-test.html b/test/extension/zoom-to-location-test.html <link rel='stylesheet' type='text/css' media='all' href='/lib/multselector/multselector.css'/>
<!-- util.js -->
<script src='/js/util.js' type='text/javascript'></script>
+ <!-- State Helper -->
+ <script src="/lib/StatesHelper.js"></script>
<!--script src='/lib/extension/some_new_extension.js'></script-->
<style type="text/css">
body {
states.z = parseFloat(frm.z.value);
// Encode to Base64
- var encodedData = encodeURIComponent(btoa(JSON.stringify(states)));
-
+ //var encodedData = encodeURIComponent(btoa(JSON.stringify(states)));
// Set frame src to desired location
- ifrm.src = `/viewer.html?slideId=CMU1&states=${encodedData}`;
+ //ifrm.src = `/viewer.html?slideId=CMU1&states=${encodedData}`;
+ ifrm.src = `/viewer.html?slideId=CMU1&states=${StatesHelper.encodeStates(states)}`
}
</script>
| 4 |
diff --git a/src/encoded/audit/file.py b/src/encoded/audit/file.py @@ -232,23 +232,7 @@ def audit_file_replicate_match(value, system):
return
-@audit_checker('File', frame=['award'])
-def audit_file_platform(value, system):
- '''
- A raw data file should have a platform specified.
- Should be in the schema.
- '''
-
- '''if value['status'] in ['deleted', 'replaced', 'revoked']:
- return
- '''
- if value['file_format'] not in raw_data_formats:
- return
-
- if 'platform' not in value:
- detail = 'File {} metadata lacks information on the instrument/platform '.format(value['@id']) + \
- 'used to produce it.'
- raise AuditFailure('missing platform', detail, level='ERROR')
+# def audit_file_platform(value, system): removed from release v56
def check_presence(file_to_check, files_list):
| 2 |
diff --git a/packages/react-dom-interactions/src/hooks/useRole.ts b/packages/react-dom-interactions/src/hooks/useRole.ts @@ -15,7 +15,7 @@ export const useRole = (
{enabled = true, role = 'dialog'}: Partial<Props> = {}
): ElementProps => {
const rootId = useId();
- const referenceId = `${rootId}-reference`;
+ const referenceId = useId();
const floatingProps = {id: rootId, role};
if (!enabled) {
| 1 |
diff --git a/packages/laconia-aws-batch/integration-test/dynamodb-batch-process.spec.js b/packages/laconia-aws-batch/integration-test/dynamodb-batch-process.spec.js @@ -14,7 +14,7 @@ describe("dynamodb batch process", () => {
endpoint: new AWS.Endpoint(`http://localhost:${dynamoLocalPort}`)
};
let invokeMock,
- processItem,
+ itemListener,
event,
context,
callback,
@@ -47,7 +47,7 @@ describe("dynamodb batch process", () => {
invokeMock = jest.fn();
AWSMock.mock("Lambda", "invoke", invokeMock);
- processItem = jest.fn();
+ itemListener = jest.fn();
stopListener = jest.fn();
endListener = jest.fn();
event = {};
@@ -65,24 +65,24 @@ describe("dynamodb batch process", () => {
describe("when no recursion is needed", () => {
beforeEach(async () => {
await dynamoDbBatchHandler("SCAN", { TableName: "Music" }, handlerOptions)
- .on("item", processItem)
+ .on("item", itemListener)
.on("stop", stopListener)
.on("end", endListener)(event, context, callback);
});
it("should process all records in a Table with scan", async () => {
- expect(processItem).toHaveBeenCalledTimes(3);
- expect(processItem).toHaveBeenCalledWith(
+ expect(itemListener).toHaveBeenCalledTimes(3);
+ expect(itemListener).toHaveBeenCalledWith(
{ Artist: "Foo" },
event,
context
);
- expect(processItem).toHaveBeenCalledWith(
+ expect(itemListener).toHaveBeenCalledWith(
{ Artist: "Bar" },
event,
context
);
- expect(processItem).toHaveBeenCalledWith(
+ expect(itemListener).toHaveBeenCalledWith(
{ Artist: "Fiz" },
event,
context
@@ -103,13 +103,13 @@ describe("dynamodb batch process", () => {
beforeEach(async () => {
context.getRemainingTimeInMillis = () => 5000;
await dynamoDbBatchHandler("SCAN", { TableName: "Music" }, handlerOptions)
- .on("item", processItem)
+ .on("item", itemListener)
.on("stop", stopListener)
.on("end", endListener)(event, context, callback);
});
it("should stop processing when time is up", async () => {
- expect(processItem).toHaveBeenCalledTimes(1);
+ expect(itemListener).toHaveBeenCalledTimes(1);
});
it("should not notify end listener", () => {
@@ -147,10 +147,14 @@ describe("dynamodb batch process", () => {
TableName: "Music"
},
handlerOptions
- ).on("item", processItem)(event, context, callback);
+ ).on("item", itemListener)(event, context, callback);
- expect(processItem).toHaveBeenCalledTimes(1);
- expect(processItem).toHaveBeenCalledWith({ Artist: "Fiz" }, event, context);
+ expect(itemListener).toHaveBeenCalledTimes(1);
+ expect(itemListener).toHaveBeenCalledWith(
+ { Artist: "Fiz" },
+ event,
+ context
+ );
});
it("should be able to process all items when Limit is set to 1", async () => {
@@ -161,12 +165,24 @@ describe("dynamodb batch process", () => {
Limit: 1
},
handlerOptions
- ).on("item", processItem)(event, context, callback);
+ ).on("item", itemListener)(event, context, callback);
- expect(processItem).toHaveBeenCalledTimes(3);
- expect(processItem).toHaveBeenCalledWith({ Artist: "Foo" }, event, context);
- expect(processItem).toHaveBeenCalledWith({ Artist: "Bar" }, event, context);
- expect(processItem).toHaveBeenCalledWith({ Artist: "Fiz" }, event, context);
+ expect(itemListener).toHaveBeenCalledTimes(3);
+ expect(itemListener).toHaveBeenCalledWith(
+ { Artist: "Foo" },
+ event,
+ context
+ );
+ expect(itemListener).toHaveBeenCalledWith(
+ { Artist: "Bar" },
+ event,
+ context
+ );
+ expect(itemListener).toHaveBeenCalledWith(
+ { Artist: "Fiz" },
+ event,
+ context
+ );
});
it("should be able to process items when filtered", async () => {
@@ -181,10 +197,14 @@ describe("dynamodb batch process", () => {
FilterExpression: "Artist = :a"
},
handlerOptions
- ).on("item", processItem)(event, context, callback);
+ ).on("item", itemListener)(event, context, callback);
- expect(processItem).toHaveBeenCalledTimes(1);
- expect(processItem).toHaveBeenCalledWith({ Artist: "Bar" }, event, context);
+ expect(itemListener).toHaveBeenCalledTimes(1);
+ expect(itemListener).toHaveBeenCalledWith(
+ { Artist: "Bar" },
+ event,
+ context
+ );
});
describe("when completing recursion", () => {
@@ -197,7 +217,7 @@ describe("dynamodb batch process", () => {
Limit: 1
},
handlerOptions
- ).on("item", processItem);
+ ).on("item", itemListener);
handler(event, context, callback);
invokeMock.mockImplementationOnce(event =>
@@ -210,18 +230,18 @@ describe("dynamodb batch process", () => {
await handler(JSON.parse(event.Payload), context, callback);
expect(invokeMock).toHaveBeenCalledTimes(3);
- expect(processItem).toHaveBeenCalledTimes(3);
- expect(processItem).toHaveBeenCalledWith(
+ expect(itemListener).toHaveBeenCalledTimes(3);
+ expect(itemListener).toHaveBeenCalledWith(
{ Artist: "Foo" },
expect.anything(),
expect.anything()
);
- expect(processItem).toHaveBeenCalledWith(
+ expect(itemListener).toHaveBeenCalledWith(
{ Artist: "Bar" },
expect.anything(),
expect.anything()
);
- expect(processItem).toHaveBeenCalledWith(
+ expect(itemListener).toHaveBeenCalledWith(
{ Artist: "Fiz" },
expect.anything(),
expect.anything()
| 10 |
diff --git a/src/server/models/password-reset-order.js b/src/server/models/password-reset-order.js const mongoose = require('mongoose');
const uniqueValidator = require('mongoose-unique-validator');
+const crypto = require('crypto');
const ObjectId = mongoose.Schema.Types.ObjectId;
@@ -15,9 +16,8 @@ schema.plugin(uniqueValidator);
class PasswordResetOrder {
static generateOneTimeToken() {
- const now = new Date().getTime();
- const hasher1 = crypto.createHash('sha512');
- const token = hasher1.update(`gtop${now.toString()}${process.env.SALT_FOR_GTOP_TOKEN}`).digest('base64');
+ const hasher = crypto.createHash('sha384');
+ const token = hasher.update((new Date()).getTime()).digest('base64');
return token;
}
| 7 |
diff --git a/assets/js/modules/analytics/setup.js b/assets/js/modules/analytics/setup.js @@ -834,16 +834,16 @@ class AnalyticsSetup extends Component {
<p className="googlesitekit-settings-module__meta-item-type">
{ __( 'Excluded from Analytics', 'google-site-kit' ) }
</p>
+ <h5 className="googlesitekit-settings-module__meta-item-data">
{ !! trackingDisabled.length &&
- <ul className="mdc-list mdc-list--underlined mdc-list--non-interactive">
- { trackingDisabled.map( ( exclusion, i ) => <li className="mdc-list-item" key={ i }>{ trackingExclusionLabels[ exclusion ] }</li> ) }
- </ul>
+ trackingDisabled
+ .map( ( exclusion ) => trackingExclusionLabels[ exclusion ] )
+ .join( _x( ', ', 'list separator', 'google-site-kit' ) )
}
{ ! trackingDisabled.length &&
- <h5 className="googlesitekit-settings-module__meta-item-data">
- { __( 'Analytics is currently enabled for all visitors.', 'google-site-kit' ) }
- </h5>
+ __( 'Analytics is currently enabled for all visitors.', 'google-site-kit' )
}
+ </h5>
</div>
</div>
</Fragment>
| 3 |
diff --git a/src/common/quiz/decks_content.js b/src/common/quiz/decks_content.js const reload = require('require-reload')(require);
const constants = reload('./../constants.js');
-const stationsList = ["stations_tokyo","stations_osaka","stations_hokaido","stations_fukuoka","stations_kyoto","stations_yamanashi","stations_nagano","stations_nigata","stations_aoyama","stations_iwate","stations_miyagi","stations_akita","stations_fukushima","stations_yamagata","stations_toyama","stations_ishikawa","stations_fukui","stations_kanagawa","stations_chiba","stations_saitama","stations_ibaraki","stations_gunma","stations_okayama","stations_hiroshima","stations_tottori","stations_shimane","stations_yamaguchi","stations_hyougo","stations_shiga","stations_nara","stations_wakayama","stations_shizuoka","stations_gifu","stations_mie","stations_saga","stations_nagasaki","stations_kumamoto","stations_oita","stations_miyazaki","stations_kagoshima","stations_tokushima","stations_kagawa","stations_ehime","stations_kochi","stations_okinawa"];
+const stationsList = ["stations_tokyo","stations_osaka","stations_hokaido","stations_fukuoka","stations_kyoto","stations_yamanashi","stations_nagano","stations_nigata","stations_aomori","stations_iwate","stations_miyagi","stations_akita","stations_fukushima","stations_yamagata","stations_toyama","stations_ishikawa","stations_fukui","stations_kanagawa","stations_chiba","stations_saitama","stations_ibaraki","stations_gunma","stations_okayama","stations_hiroshima","stations_tottori","stations_shimane","stations_yamaguchi","stations_hyougo","stations_shiga","stations_nara","stations_wakayama","stations_shizuoka","stations_gifu","stations_mie","stations_saga","stations_nagasaki","stations_kumamoto","stations_oita","stations_miyazaki","stations_kagoshima","stations_tokushima","stations_kagawa","stations_ehime","stations_kochi","stations_okinawa"];
const categoryFields = [
{name: 'JLPT Kanji Reading Decks', value: 'N5 N4 N3 N2 N1'},
| 10 |
diff --git a/data/pilots/galactic-empire/tie-ln-fighter.json b/data/pilots/galactic-empire/tie-ln-fighter.json "cost": 26,
"xws": "nightbeast",
"ability": "After you fully execute a blue maneuver, you may perform a [Focus] action.",
- "image": "https://i.imgur.com/FbwsflC.png",
- "alt": [
- {
- "image": "https://images-cdn.fantasyflightgames.com/filer_public/12/55/12552f53-decc-49ff-8fe2-e4285d4ff31e/op066-obsidian-squadron-pilot.png",
- "source": "X-Wing Second Edition Launch Party"
- }
- ]
+ "image": "https://i.imgur.com/FbwsflC.png"
},
{
"name": "\"Scourge\" Skutu",
"cost": 24,
"xws": "obsidiansquadronpilot",
"text": "The TIE fighter's Twin Ion Engine system was designed for speed, making the TIE/ln one of the most maneuverable starships ever mass-produced.",
- "image": "https://i.imgur.com/DDeq1x3.jpg"
+ "image": "https://i.imgur.com/DDeq1x3.jpg",
+ "alt": [
+ {
+ "image": "https://images-cdn.fantasyflightgames.com/filer_public/12/55/12552f53-decc-49ff-8fe2-e4285d4ff31e/op066-obsidian-squadron-pilot.png",
+ "source": "X-Wing Second Edition Launch Party"
+ }
+ ]
},
{
"name": "Seyn Marana",
| 5 |
diff --git a/protocols/peer/contracts/PeerFactory.sol b/protocols/peer/contracts/PeerFactory.sol @@ -40,12 +40,12 @@ contract PeerFactory is IPeerFactory, ILocatorWhitelist {
require(_swapContract != address(0),
'SWAP_CONTRACT_REQUIRED');
- address newPeerContract = address(new Peer(_swapContract, _peerContractOwner));
- deployedAddresses[newPeerContract] = true;
+ peerContractAddress = address(new Peer(_swapContract, _peerContractOwner));
+ deployedAddresses[peerContractAddress] = true;
- emit CreatePeer(newPeerContract, _swapContract, _peerContractOwner);
+ emit CreatePeer(peerContractAddress, _swapContract, _peerContractOwner);
- return newPeerContract;
+ return peerContractAddress;
}
/**
| 3 |
diff --git a/services/src/services/update/update.hooks.js b/services/src/services/update/update.hooks.js @@ -4,6 +4,7 @@ const ensureMatchingUUID = require('../../hooks/ensureuuid');
const internalOnly = require('../../hooks/internalonly');
const authentication = require('@feathersjs/authentication');
const internalApi = require('../../hooks/internalapi');
+const errors = require('@feathersjs/errors');
class UpdateHooks {
constructor() {
@@ -18,6 +19,19 @@ class UpdateHooks {
return context;
}
+ checkUpdateFormat(hook) {
+ if (!hook) {
+ throw new errors.BadRequest('No hook at all?');
+ }
+ if (!(hook.data)) {
+ throw new errors.BadRequest('Missing data');
+ }
+ if (!(hook.data.commit)) {
+ throw new errors.BadRequest('Missing commit field');
+ }
+ // TODO add required field validation once we know what the required fields are
+ }
+
getHooks() {
return {
before: {
@@ -32,6 +46,7 @@ class UpdateHooks {
],
create: [
internalApi,
+ this.checkUpdateFormat,
dbtimestamp('createdAt'),
this.defaultChannel,
],
| 0 |
diff --git a/src/components/DatasetEditor/EditableTitleText.js b/src/components/DatasetEditor/EditableTitleText.js @@ -14,7 +14,7 @@ export default ({ value, onChange }) => {
const c = useStyles()
const [newValue, setNewValue] = useState(value || "")
- const handleBlue = () => {
+ const onBlur = () => {
if (!isEmpty(newValue) && newValue !== "unnamed") {
onChange(newValue)
setNewValue(newValue)
@@ -32,7 +32,7 @@ export default ({ value, onChange }) => {
InputProps={{
inputProps: { style: { color: "#000" } },
}}
- onBlur={handleBlue}
+ onBlur={onBlur}
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault()
| 10 |
diff --git a/package.json b/package.json "babel-eslint": "^10.1.0",
"babel-preset-env": "^1.7.0",
"babel-register": "^6.26.0",
- "canvas": "^2.6.1",
- "eslint-plugin-import": "^2.22.0",
+ "canvas": "^2.8.0",
"eslint": "^7.9.0",
+ "eslint-plugin-import": "^2.22.0",
"husky": "^4.3.0",
"jest": "^26.4.2",
"mocha": "^8.1.3",
"path": "^0.12.7",
"prettier": "^2.1.2",
"pretty-quick": "^3.0.2",
- "rollup-plugin-terser": "^7.0.2",
"rollup": "^2.28.1",
+ "rollup-plugin-terser": "^7.0.2",
"should": "^13.2.3",
"sinon": "^2.4.1"
},
"dependencies": {
- "xmldom": "^0.3.0"
+ "xmldom": "github:xmldom/xmldom#0.7.0"
}
}
| 3 |
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx @@ -25,6 +25,7 @@ const googleDriveActive = require('../../googleDrive.png');
const googleDriveInactive = require('../../googleDriveMono.png');
const SAVE_TIMEOUT = 3000;
+const AUTOSAVE_TIMEOUT = 10000;
const EditPage = createClass({
displayName : 'EditPage',
@@ -120,14 +121,14 @@ const EditPage = createClass({
brew : { ...prevState.brew, text: text },
isPending : true,
htmlErrors : htmlErrors
- }), ()=>this.trySave());
+ }), ()=>{if(this.state.autoSave) this.trySave();});
},
handleStyleChange : function(style){
this.setState((prevState)=>({
brew : { ...prevState.brew, style: style },
isPending : true
- }), ()=>this.trySave());
+ }), ()=>{if(this.state.autoSave) this.trySave();});
},
handleMetaChange : function(metadata){
@@ -137,7 +138,7 @@ const EditPage = createClass({
...metadata
},
isPending : true,
- }), ()=>this.trySave());
+ }), ()=>{if(this.state.autoSave) this.trySave();});
},
@@ -146,7 +147,13 @@ const EditPage = createClass({
},
trySave : function(){
- if(!this.state.autoSave){return;};
+ // if(!this.state.autoSave){
+ // if(this.autoSaveInterval){
+ // clearInterval(this.autoSaveInterval);
+ // }
+ // this.autoSaveInterval = setInterval(this.trySave, 10000);
+ // return;
+ // };
if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
if(this.hasChanges()){
this.debounceSave();
@@ -351,7 +358,7 @@ const EditPage = createClass({
this.setState((prevState)=>({
autoSave : !prevState.autoSave
}), ()=>{
- this.trySave();
+ if(this.state.autoSave) this.trySave();
localStorage.setItem('AUTOSAVE_ON', JSON.stringify(this.state.autoSave));
});
},
| 5 |
diff --git a/pages/sponsor.js b/pages/sponsor.js @@ -9,10 +9,6 @@ import Footer from '../components/Footer';
import Page from '../components/Page';
export default class SponsorPage extends React.Component {
- componentDidCatch = e => {
- console.log('ERRORRRRR');
- console.log(e);
- };
render() {
return (
<Page>
@@ -67,7 +63,7 @@ export default class SponsorPage extends React.Component {
</figcaption>
</figure>
<p>
- Each sponsorship spot will receive an average of 28,000 downloads. Each spot will receive at least 23,000
+ Each sponsorship spot will receive an average of 30,000 downloads. Each spot will receive at least 23,000
downloads, and some of the shows reach 40-50,000 downloads just months after being launched.
</p>
@@ -126,8 +122,8 @@ export default class SponsorPage extends React.Component {
<h2>What You'll Get && Pricing</h2>
<p>We have found that we get the best results for our advertisers when they sponsor at least three shows.</p>
<p>
- Currently each sponsor spot is $800 USD per episode with a minimum of three episodes, though this price will
- increase as our audience does. Single show sponsorships are $900.
+ Currently each sponsor spot is $1,000 USD per episode with a minimum of three episodes, though this price will
+ increase as our audience does. Single show sponsorships are $1,200.
</p>
<p>As part of the sponsorship package, you'll get:</p>
| 3 |
diff --git a/articles/policies/rate-limits.md b/articles/policies/rate-limits.md @@ -176,7 +176,7 @@ The following Auth0 Authenticaion API endpoints return rate limit-related header
<td>/tokeninfo</td>
</tr>
<tr>
- <td>Delegated Authentication</td>
+ <td>Delegated Authentication*</td>
<td></td>
<td>/delegation</td>
</tr>
@@ -186,3 +186,5 @@ The following Auth0 Authenticaion API endpoints return rate limit-related header
<td>/dbconnections/change_password</td>
</tr>
</table>
+
+* *The `/delegation` endpoint limits up to 10 requests per minute from the same IP address with the same user_id*
\ No newline at end of file
| 0 |
diff --git a/assets/js/googlesitekit/datastore/user/permissions.js b/assets/js/googlesitekit/datastore/user/permissions.js @@ -125,11 +125,6 @@ export const reducer = ( state, { type, payload } ) => {
};
export const resolvers = {
- /**
- * Fullfills user capabilities on initial request.
- *
- * @since n.e.x.t
- */
*getCapabilities() {
if ( ! global._googlesitekitUserData?.permissions ) {
global.console.error( 'Could not load core/user permissions.' );
| 2 |
diff --git a/src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php b/src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php @@ -139,12 +139,18 @@ trait ColumnsProtectedMethods
return $column;
}
- //if the name is dot notation we are sure it's a relationship
+ // if the name is dot notation it might be a relationship
if (strpos($column['name'], '.') !== false) {
+ $possibleMethodName = Str::before($column['name'], '.');
+
+ // if the first part of the string exists as method,
+ // it is a relationship
+ if (method_exists($this->model, $possibleMethodName)) {
$column['entity'] = $column['name'];
return $column;
}
+ }
// if there's a method on the model with this name
if (method_exists($this->model, $column['name'])) {
| 7 |
diff --git a/src/components/Forms.js b/src/components/Forms.js @@ -25,7 +25,7 @@ export class AutoSaver extends Component {
componentWillMount() {
const intervalId = setInterval(this.autoSave, 2000)
- this.setState({ intervalId: intervalId })
+ this.setState({ intervalId })
}
componentWillUnmount() {
@@ -37,7 +37,7 @@ export class AutoSaver extends Component {
const { previousValues } = this.state
const unsavedChanges = previousValues !== values
- this.setState({ unsavedChanges: unsavedChanges })
+ this.setState({ unsavedChanges })
if (unsavedChanges && !isSubmitting) {
// We have to call handleSubmit this way because formik:
@@ -105,7 +105,7 @@ export class Field extends Component {
['textarea', 'select'].indexOf(type) === -1 ? 'input' : type
)
- this.setState({ Tag: Tag })
+ this.setState({ Tag })
}
render() {
| 4 |
diff --git a/packages/nexrender-provider-s3/package.json b/packages/nexrender-provider-s3/package.json "author": "inlife",
"main": "src/index.js",
"dependencies": {
- "amazon-s3-uri": "0.0.3",
+ "amazon-s3-uri": "0.1.1",
"aws-sdk": "^2.344.0"
},
"publishConfig": {
| 3 |
diff --git a/geometry-worker.js b/geometry-worker.js @@ -557,6 +557,18 @@ const _handleMessage = async data => {
}, [meshesBuffer, textureBuffer]);
break;
}
+ case 'loadBake': {
+ const {url} = data;
+
+ const res = await fetch(url);
+ const arrayBuffer = await res.arrayBuffer();
+ const meshes = _flatDecode(arrayBuffer);
+ for (const mesh of meshes) {
+ geometryRegistry[name] = [mesh];
+ }
+
+ break;
+ }
case 'marchObjects': {
const {x, y, z, objects, heightfields, lightfields, subparcelSize} = data;
| 0 |
diff --git a/packages/insomnia-app/app/sync/git/http-client.ts b/packages/insomnia-app/app/sync/git/http-client.ts @@ -20,6 +20,10 @@ export const httpClient = {
maxRedirects: 10,
});
} catch (err) {
+ if (!err.response){
+ // NOTE: config.url is unreachable
+ throw err;
+ }
response = err.response;
}
| 9 |
diff --git a/docs/en/writing-running-appium/windows-app-testing.md b/docs/en/writing-running-appium/windows-app-testing.md @@ -26,7 +26,7 @@ To test a UWP app, you can use any Selenium supported language and simply specif
// Launch the AlarmClock app
DesiredCapabilities appCapabilities = new DesiredCapabilities();
appCapabilities.SetCapability("app", "Microsoft.WindowsAlarms_8wekyb3d8bbwe!App");
-AlarmClockSession = new IOSDriver<IOSElement>(new Uri("http://127.0.0.1:4723"), appCapabilities);
+AlarmClockSession = new WindowsDriver<WindowsElement>(new Uri("http://127.0.0.1:4723"), appCapabilities);
// Control the AlarmClock app
AlarmClockSession.FindElementByAccessibilityId("AddAlarmButton").Click();
AlarmClockSession.FindElementByAccessibilityId("AlarmNameTextBox").Clear();
@@ -38,7 +38,7 @@ To test a classic Windows app, you can also use any Selenium supported language
// Launch Notepad
DesiredCapabilities appCapabilities = new DesiredCapabilities();
appCapabilities.SetCapability("app", @"C:\Windows\System32\notepad.exe");
-NotepadSession = new IOSDriver<IOSElement>(new Uri("http://127.0.0.1:4723"), appCapabilities);
+NotepadSession = new WindowsDriver<WindowsElement>(new Uri("http://127.0.0.1:4723"), appCapabilities);
// Control the AlarmClock app
NotepadSession.FindElementByClassName("Edit").SendKeys("This is some text");
```
| 14 |
diff --git a/src/components/responsive/GlobalAlert.js b/src/components/responsive/GlobalAlert.js @@ -54,7 +54,7 @@ const Alert = styled.div`
`
const Content = styled.div`
- min-height: 74px;
+ min-height: 60px;
max-width: 500px;
min-width: 275px;
border: 2px solid #f2f2f2;
@@ -81,6 +81,7 @@ const Text = styled.div`
padding-right: 16px;
color: #24272a;
flex: 1 1 auto;
+ padding-top: 4px;
`
const Close = styled.div`
width: 12px;
@@ -116,7 +117,7 @@ const Close = styled.div`
`
const Header = styled.div`
font-weight: 600;
- padding-bottom: 8px;
+ margin-bottom: 8px;
color: ${props => props.success ? '#02ba86' : '#e41d22'};
`
| 9 |
diff --git a/token-metadata/0xb8a5dBa52FE8A0Dd737Bf15ea5043CEA30c7e30B/metadata.json b/token-metadata/0xb8a5dBa52FE8A0Dd737Bf15ea5043CEA30c7e30B/metadata.json "symbol": "AFCASH",
"address": "0xb8a5dBa52FE8A0Dd737Bf15ea5043CEA30c7e30B",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/api/controllers/documentController.test.js b/test/api/controllers/documentController.test.js @@ -72,7 +72,7 @@ describe('Test: document controller', () => {
describe('#scroll', () => {
it('should fulfill with an object', () => {
- request.input.body = {scroll: '1m'};
+ request.input.args.scroll = '1m';
request.input.args.scrollId = 'SomeScrollIdentifier';
return documentController.scroll(request)
@@ -83,7 +83,7 @@ describe('Test: document controller', () => {
});
it('should reject an error in case of error', () => {
- request.input.body = {scroll: '1m'};
+ request.input.args.scroll = '1m';
request.input.args.scrollId = 'SomeScrollIdentifier';
kuzzle.services.list.storageEngine.scroll.returns(Promise.reject(new Error('foobar')));
| 13 |
diff --git a/iris/mutations/community/sendSlackInvites.js b/iris/mutations/community/sendSlackInvites.js @@ -40,7 +40,7 @@ export default async (
currentUser.id
);
- if (!permissions.isOwner) {
+ if (!permissions.isOwner && !permissions.isModerator) {
return new UserError(
"You don't have permission to invite people to this community."
);
| 11 |
diff --git a/packages/gatsby-transformer-screenshot/src/gatsby-node.js b/packages/gatsby-transformer-screenshot/src/gatsby-node.js @@ -44,8 +44,8 @@ exports.onPreBootstrap = (
exports.onCreateNode = async ({ node, boundActionCreators, store, cache }) => {
const { createNode, createParentChildLink } = boundActionCreators
- // We only care about parsed sites.yaml files
- if (node.internal.type !== `SitesYaml`) {
+ // We only care about parsed sites.yaml files with a url field
+ if (node.internal.type !== `SitesYaml` || !node.url) {
return
}
| 8 |
diff --git a/webpack/makeConfig.js b/webpack/makeConfig.js @@ -68,7 +68,7 @@ function makePlugins(options) {
]);
} else {
plugins = plugins.concat([
- new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en|zh|es|fr|de|ru|ko|nl|se/),
+ new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
new webpack.optimize.CommonsChunkPlugin({
name: 'vendor',
minChunks(module) {
| 2 |
diff --git a/player/index.html b/player/index.html //var elem = createNS('aa')
var animData = {
container: elem,
- renderer: 'svg',
- loop: true,
- autoplay: false,
+ renderer: 'canvas',
+ loop: false,
+ autoplay: true,
rendererSettings: {
progressiveLoad:true
},
- path: 'exports/gannon/ripple.json'
+ path: 'exports/render/data.json'
};
anim = lottie.loadAnimation(animData);
anim.addEventListener('DOMLoaded', function() {
| 3 |
diff --git a/app/builtin-pages/views/library.js b/app/builtin-pages/views/library.js @@ -353,7 +353,7 @@ function renderHeader () {
<div class="dropdown-items create-new filters subtle-shadow right">
<div class="dropdown-item" onclick=${() => onCreateSite()}>
<div class="label">
- <i class="fa fa-square-o"></i>
+ <i class="fa fa-clone"></i>
Empty project
</div>
| 4 |
diff --git a/lambda/es-proxy-layer/lib/es-logging.js b/lambda/es-proxy-layer/lib/es-logging.js @@ -76,7 +76,7 @@ module.exports=function(event, context, callback){
}
}
- // constructing the object to be logged in ES (to visualize in Kibana)
+ // constructing the object to be logged in OpenSearch (to visualize in Kibana)
let jsonData = {
entireRequest: req,
entireResponse: res,
| 3 |
diff --git a/lod.js b/lod.js @@ -53,6 +53,7 @@ export class LodChunk extends THREE.Vector3 {
constructor(x, y, z, lodArray) {
super(x, y, z);
+ this.lod = lodArray[0];
this.lodArray = lodArray;
this.name = `chunk:${this.x}:${this.z}`;
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -98026,9 +98026,9 @@ var $$IMU_EXPORT$$;
value = value.replace(/^["'](.*)["']$/, "$1");
}
- if (options.variables) {
- for (var variable in options.variables) {
- value = string_replaceall(value, variable, options.variables[variable]);
+ if (options.old_variables) {
+ for (var variable in options.old_variables) {
+ value = string_replaceall(value, variable, options.old_variables[variable]);
}
}
@@ -98756,7 +98756,7 @@ var $$IMU_EXPORT$$;
apply_styles(div, settings.mouseover_styles, {
force_important: true,
- variables: styles_variables
+ old_variables: styles_variables
});
outerdiv.appendChild(div);
| 10 |
diff --git a/js/webcomponents/bisweb_cpmelement.js b/js/webcomponents/bisweb_cpmelement.js @@ -31,7 +31,6 @@ const bis_webfileutil = require('bis_webfileutil.js');
const bisweb_connectivityvis = require('bisweb_connectivityvis.js');
const bisweb_popoverhandler = require('bisweb_popoverhandler.js');
const bisweb_scatterplot = require('bisweb_scatterplot.js');
-const bisweb_histoplot = require('bisweb_histogramplot.js');
const bis_dbase = require('bisweb_dbase');
const bisweb_userprefs = require('bisweb_userpreferences.js');
@@ -83,16 +82,12 @@ class CPMElement extends HTMLElement {
let dockbar = layoutElement.elements.dockbarcontent;
cardbar.createTab('Scatter plot', $(), { 'save' : true }).then( (scatterobj) => {
- cardbar.createTab('Histogram plot', $(), { 'save' : true }).then( (histoobj) => {
- this.createCPMGUIManager(layoutElement, scatterobj.content[0], histoobj.content[0]);
+ this.createCPMGUIManager(layoutElement, scatterobj.content[0]);
//resizing function for card bar pane
cardbar.setResizingFunction( () => {
scatterobj.content.width(layoutElement.viewerwidth / 3 + 20); //add a little bit to the width to accomodate buttons on the right
scatterobj.content.height(layoutElement.viewerheight / 2);
- histoobj.content.width(layoutElement.viewerwidth / 3 + 20);
- histoobj.content.height(layoutElement.viewerheight / 2);
- });
});
});
@@ -110,19 +105,17 @@ class CPMElement extends HTMLElement {
* @param {HTMLElement} scatterElement - The DOM element to append the scatter plot to.
* @param {HTMLElement} histoElement - The DOM element to append the histogram plot to.
*/
- createCPMGUIManager(layoutElement, scatterElement, histoElement) {
+ createCPMGUIManager(layoutElement, scatterElement) {
let dims = [layoutElement.viewerwidth / 3, layoutElement.viewerheight / 2];
let pos = [0 , layoutElement.viewerheight - 10];
let scatterplot = new bisweb_scatterplot(scatterElement, dims, pos);
- let histoplot = new bisweb_histoplot(histoElement, dims);
//resizing function for charts
$(window).on('resize', () => {
dims = [layoutElement.viewerwidth / 3 , layoutElement.viewerheight / 2];
pos = [0 , layoutElement.viewerheight - 10];
scatterplot.resize(dims, pos);
- histoplot.resize(dims, pos);
});
}
@@ -135,7 +128,6 @@ class CPMElement extends HTMLElement {
createMenubarItems(menubar, dockbar) {
let topmenu = bis_webutil.createTopMenuBarMenu('CPM', menubar);
bis_webutil.createMenuItem(topmenu, 'Open Connectivity File Loader', () => { this.openCPMSidebar(dockbar); });
-
}
/**
| 2 |
diff --git a/src/server/template-renderer/index.js b/src/server/template-renderer/index.js /* @flow */
+// TODO: handle <script> tag embedding (so we can get rid of html-webpack-plugin)
+// TODO: remove need for separate server manifest (should be included in bundle)
+
import TemplateStream from './template-stream'
import { createMapper } from './create-async-file-mapper'
@@ -23,6 +26,7 @@ export type ParsedTemplate = {
export default class TemplateRenderer {
template: ParsedTemplate;
publicPath: string;
+ clientManifest: Object;
preloadFiles: ?Array<string>;
prefetchFiles: ?Array<string>;
mapFiles: ?(files: Array<string>) => Array<string>;
@@ -40,6 +44,7 @@ export default class TemplateRenderer {
)
}
+ this.clientManifest = clientManifest
this.publicPath = clientManifest.publicPath.replace(/\/$/, '')
// preload/prefetch drectives
@@ -133,7 +138,16 @@ export default class TemplateRenderer {
return context._mappedFiles
}
if (context._evaluatedFiles && this.mapFiles) {
- const mapped = this.mapFiles(Object.keys(context._evaluatedFiles))
+ let mapped = this.mapFiles(Object.keys(context._evaluatedFiles))
+ // if a file has a no-css version (produced by vue-ssr-webpack-plugin),
+ // we should use that instead.
+ if (this.clientManifest && this.clientManifest.noCssAssets) {
+ mapped = mapped.map(file => {
+ return this.clientManifest.noCssAssets[file]
+ ? file.replace(/\.js$/, '.no-css.js')
+ : file
+ })
+ }
return (context._mappedFiles = mapped)
}
}
| 9 |
diff --git a/assets/js/googlesitekit/widgets/components/WidgetAreaRenderer.test.js b/assets/js/googlesitekit/widgets/components/WidgetAreaRenderer.test.js @@ -30,7 +30,6 @@ import {
waitFor,
muteFetch,
} from '../../../../../tests/js/test-utils';
-import fetchMock from 'fetch-mock';
const { useSelect } = Data;
@@ -72,7 +71,6 @@ describe( 'WidgetAreaRenderer', () => {
let registry;
beforeEach( async () => {
- fetchMock.catch();
registry = createTestRegistryWithArea( areaName );
const connection = { connected: true };
await registry.dispatch( CORE_SITE ).receiveGetConnection( connection );
@@ -92,13 +90,13 @@ describe( 'WidgetAreaRenderer', () => {
const widgets = registry.select( STORE_NAME ).getWidgets( areaName );
const { container } = render( <WidgetAreaRenderer slug={ areaName } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( widgets ).toHaveLength( 3 );
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget' ) ).toHaveLength( 3 );
} );
} );
- it( 'should treat widgets that render no content as zero-width (ignoring them)', () => {
+ it( 'should treat widgets that render no content as zero-width (ignoring them)', async () => {
createWidgets( registry, areaName, [
{ component: WidgetComponent, slug: 'one', width: WIDGET_WIDTHS.QUARTER },
{ component: WidgetComponentEmpty, slug: 'empty', width: WIDGET_WIDTHS.HALF },
@@ -107,7 +105,7 @@ describe( 'WidgetAreaRenderer', () => {
const { container } = render( <WidgetAreaRenderer slug={ areaName } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget-area-widgets' )[ 0 ] ).toMatchSnapshot();
} );
} );
@@ -163,11 +161,11 @@ describe( 'WidgetAreaRenderer', () => {
],
],
]
- )( 'should resize widgets in a row that spans 9 columns to fill the full 12 columns (%s)', ( testName, widgets ) => {
+ )( 'should resize widgets in a row that spans 9 columns to fill the full 12 columns (%s)', async ( testName, widgets ) => {
createWidgets( registry, areaName, widgets );
const { container } = render( <WidgetAreaRenderer slug={ areaName } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget-area-widgets' )[ 0 ] ).toMatchSnapshot();
} );
} );
@@ -197,11 +195,11 @@ describe( 'WidgetAreaRenderer', () => {
],
],
]
- )( 'should not resize widgets in a row that is smaller than 9 columns (%s)', ( testName, widgets ) => {
+ )( 'should not resize widgets in a row that is smaller than 9 columns (%s)', async ( testName, widgets ) => {
createWidgets( registry, areaName, widgets );
const { container } = render( <WidgetAreaRenderer slug={ areaName } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget-area-widgets' )[ 0 ] ).toMatchSnapshot();
} );
} );
@@ -241,11 +239,11 @@ describe( 'WidgetAreaRenderer', () => {
],
],
]
- )( 'should not resize widgets that fit into a 12-column grid (%s)', ( testName, widgets ) => {
+ )( 'should not resize widgets that fit into a 12-column grid (%s)', async ( testName, widgets ) => {
createWidgets( registry, areaName, widgets );
const { container } = render( <WidgetAreaRenderer slug={ areaName } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget-area-widgets' )[ 0 ] ).toMatchSnapshot();
} );
} );
@@ -258,7 +256,7 @@ describe( 'WidgetAreaRenderer', () => {
] );
const { container } = render( <WidgetAreaRenderer slug={ areaName } style={ WIDGET_AREA_STYLES.BOXES } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget-area-widgets > .mdc-layout-grid__inner > .mdc-layout-grid__cell.mdc-layout-grid__cell--span-12 > .mdc-layout-grid > .mdc-layout-grid__inner' ) ).toHaveLength( 0 );
} );
} );
@@ -273,7 +271,7 @@ describe( 'WidgetAreaRenderer', () => {
] );
const { container } = render( <WidgetAreaRenderer slug={ areaName } />, { registry } );
- waitFor( () => {
+ await waitFor( () => {
expect( container.firstChild.querySelectorAll( '.googlesitekit-widget-area-widgets > .mdc-layout-grid__inner > .mdc-layout-grid__cell.mdc-layout-grid__cell--span-12 > .mdc-layout-grid > .mdc-layout-grid__inner' ) ).toHaveLength( 1 );
} );
} );
| 2 |
diff --git a/packages/openneuro-app/src/scripts/uploader/uploader.jsx b/packages/openneuro-app/src/scripts/uploader/uploader.jsx @@ -90,7 +90,7 @@ export class UploadClient extends React.Component {
return ({ files }) => {
this.props.client
.query({
- query: datasets.getUntrackedFiles,
+ query: datasets.getDraftFiles,
variables: { id: datasetId },
})
.then(({ data }) => {
| 1 |
diff --git a/source/Overture/views/controls/RichTextView.js b/source/Overture/views/controls/RichTextView.js @@ -56,7 +56,7 @@ var RichTextView = NS.Class({
showToolbar: !UA.isIOS,
fontFaceOptions: [
- [ loc( 'Default' ), null ],
+ [ NS.loc( 'Default' ), null ],
[ 'Arial', 'arial, sans-serif' ],
[ 'Georgia', 'georgia, serif' ],
[ 'Helvetica', 'helvetica, arial, sans-serif' ],
| 1 |
diff --git a/apps.json b/apps.json "name": "LCARS Clock",
"shortName":"LCARS",
"icon": "lcars.png",
- "version":"0.01",
+ "version":"0.02",
"supports": ["BANGLEJS2"],
"description": "Library Computer Access Retrieval System (LCARS) clock.",
"type": "clock",
| 3 |
diff --git a/modules/core/src/lib/deck.js b/modules/core/src/lib/deck.js @@ -780,37 +780,39 @@ export default class Deck {
}
_getFrameStats() {
- this.stats.get('frameRate').timeEnd();
- this.stats.get('frameRate').timeStart();
+ const {stats} = this;
+ stats.get('frameRate').timeEnd();
+ stats.get('frameRate').timeStart();
// Get individual stats from luma.gl so reset works
const animationLoopStats = this.animationLoop.stats;
- this.stats.get('GPU Time').addTime(animationLoopStats.get('GPU Time').lastTiming);
- this.stats.get('CPU Time').addTime(animationLoopStats.get('CPU Time').lastTiming);
+ stats.get('GPU Time').addTime(animationLoopStats.get('GPU Time').lastTiming);
+ stats.get('CPU Time').addTime(animationLoopStats.get('CPU Time').lastTiming);
}
_getMetrics() {
- this.metrics.fps = this.stats.get('frameRate').getHz();
- this.metrics.setPropsTime = this.stats.get('setProps Time').time;
- this.metrics.updateAttributesTime = this.stats.get('Update Attributes').time;
- this.metrics.framesRedrawn = this.stats.get('Redraw Count').count;
- this.metrics.pickTime =
- this.stats.get('pickObject Time').time +
- this.stats.get('pickMultipleObjects Time').time +
- this.stats.get('pickObjects Time').time;
- this.metrics.pickCount = this.stats.get('Pick Count').count;
+ const {metrics, stats} = this;
+ metrics.fps = stats.get('frameRate').getHz();
+ metrics.setPropsTime = stats.get('setProps Time').time;
+ metrics.updateAttributesTime = stats.get('Update Attributes').time;
+ metrics.framesRedrawn = stats.get('Redraw Count').count;
+ metrics.pickTime =
+ stats.get('pickObject Time').time +
+ stats.get('pickMultipleObjects Time').time +
+ stats.get('pickObjects Time').time;
+ metrics.pickCount = stats.get('Pick Count').count;
// Luma stats
- this.metrics.gpuTime = this.stats.get('GPU Time').time;
- this.metrics.cpuTime = this.stats.get('CPU Time').time;
- this.metrics.gpuTimePerFrame = this.stats.get('GPU Time').getAverageTime();
- this.metrics.cpuTimePerFrame = this.stats.get('CPU Time').getAverageTime();
+ metrics.gpuTime = stats.get('GPU Time').time;
+ metrics.cpuTime = stats.get('CPU Time').time;
+ metrics.gpuTimePerFrame = stats.get('GPU Time').getAverageTime();
+ metrics.cpuTimePerFrame = stats.get('CPU Time').getAverageTime();
const memoryStats = lumaStats.get('Memory Usage');
- this.metrics.bufferMemory = memoryStats.get('Buffer Memory').count;
- this.metrics.textureMemory = memoryStats.get('Texture Memory').count;
- this.metrics.renderbufferMemory = memoryStats.get('Renderbuffer Memory').count;
- this.metrics.gpuMemory = memoryStats.get('GPU Memory').count;
+ metrics.bufferMemory = memoryStats.get('Buffer Memory').count;
+ metrics.textureMemory = memoryStats.get('Texture Memory').count;
+ metrics.renderbufferMemory = memoryStats.get('Renderbuffer Memory').count;
+ metrics.gpuMemory = memoryStats.get('GPU Memory').count;
}
}
| 7 |
diff --git a/src/server/api/cla.js b/src/server/api/cla.js @@ -411,7 +411,7 @@ let ClaApi = {
// owner (mandatory)
// gist.gist_url (optional)
// gist.gist_version (optional)
- countCLA: function (req, done) {
+ countCLA: async function (req, done) {
let params = req.args;
let self = this;
@@ -458,7 +458,13 @@ let ClaApi = {
done(err, clas.length);
});
}
- getMissingParams().then(count, done);
+
+ try {
+ await getMissingParams();
+ count();
+ } catch (e) {
+ done(e);
+ }
},
validateOrgPullRequests: function (req, done) {
| 9 |
diff --git a/src/components/editgrid/EditGrid.js b/src/components/editgrid/EditGrid.js @@ -206,22 +206,21 @@ export default class EditGridComponent extends NestedComponent {
return this.renderComponents(row.components);
}
else {
- return this.renderString(_.get(this.component, 'templates.row', EditGridComponent.defaultRowTemplate),
+ const flattenedComponents = this.flattenComponents(rowIndex);
+ return this.renderString(
+ _.get(this.component, 'templates.row', EditGridComponent.defaultRowTemplate),
{
row: dataValue[rowIndex],
+ data: this.data,
rowIndex,
components: this.component.components,
- flattenedComponents: this.flattenComponents(rowIndex),
+ flattenedComponents,
getView: (component, data) => {
- console.log('getView() method is depricated, consider usage of flattenedComponents[componentKey].getView(data)');
- const builtComponent = Components.create(component, this.options, data, true);
- const result = builtComponent.getView(data);
-
- builtComponent.destroy();
-
- return result;
+ const instance = flattenedComponents[component.key];
+ return instance ? instance.getView(data) : '';
},
- });
+ },
+ );
}
}
| 7 |
diff --git a/accessibility-checker-engine/src/v2/checker/accessibility/rulesets/index.ts b/accessibility-checker-engine/src/v2/checker/accessibility/rulesets/index.ts @@ -761,11 +761,6 @@ let a11yRulesets: Ruleset[] = [
level: eRulePolicy.VIOLATION,
toolkitLevel: eToolkitLevel.LEVEL_THREE
},
- {
- id: "group_withInputs_hasName",
- level: eRulePolicy.VIOLATION,
- toolkitLevel: eToolkitLevel.LEVEL_THREE
- },
{
id: "Rpt_Aria_MultipleGroupRoles_Implicit",
level: eRulePolicy.VIOLATION,
@@ -1965,11 +1960,6 @@ let a11yRulesets: Ruleset[] = [
level: eRulePolicy.VIOLATION,
toolkitLevel: eToolkitLevel.LEVEL_THREE
},
- {
- id: "group_withInputs_hasName",
- level: eRulePolicy.VIOLATION,
- toolkitLevel: eToolkitLevel.LEVEL_THREE
- },
{
id: "Rpt_Aria_MultipleGroupRoles_Implicit",
level: eRulePolicy.VIOLATION,
@@ -3115,11 +3105,6 @@ let a11yRulesets: Ruleset[] = [
level: eRulePolicy.VIOLATION,
toolkitLevel: eToolkitLevel.LEVEL_THREE
},
- {
- id: "group_withInputs_hasName",
- level: eRulePolicy.VIOLATION,
- toolkitLevel: eToolkitLevel.LEVEL_THREE
- },
{
id: "Rpt_Aria_MultipleGroupRoles_Implicit",
level: eRulePolicy.VIOLATION,
| 2 |
diff --git a/app/components/Composer.jsx b/app/components/Composer.jsx -import React, { Component, Fragment, } from 'react';
+import React, { Component, } from 'react';
import PropTypes from 'prop-types';
import Styled from 'styled-components';
import Theme from 'styled-theming';
@@ -6,7 +6,6 @@ import Theme from 'styled-theming';
import ConnectUtilities from '../containers/ConnectUtilities';
import Header from './Header';
-import SettingsContainer from '../containers/SettingsContainer';
import InnerContent from './InnerContent';
import UserProfilePhoto from './UserProfilePhoto';
import IconButton from './IconButton';
@@ -38,7 +37,6 @@ class Composer extends Component {
weightedStatus: PropTypes.object,
userCredentials: PropTypes.object,
accessTokenPair: PropTypes.object,
- onToggleSettingsVisibility: PropTypes.func.isRequired,
onUpdateWeightedStatus: PropTypes.func.isRequired,
notificationManager: PropTypes.object.isRequired,
localeManager: PropTypes.object.isRequired,
@@ -50,15 +48,20 @@ class Composer extends Component {
accessTokenPair: null,
};
+ static contextTypes = {
+ router: PropTypes.object,
+ };
+
constructor(props) {
super(props);
this.state = {
image: null,
};
- this._addImage = this._addImage.bind(this);
- this._removeImage = this._removeImage.bind(this);
- this._postStatus = this._postStatus.bind(this);
+ this.addImage = this.addImage.bind(this);
+ this.removeImage = this.removeImage.bind(this);
+ this.postStatus = this.postStatus.bind(this);
+ this.goToSettings = this.goToSettings.bind(this);
}
componentDidMount() {
@@ -81,20 +84,15 @@ class Composer extends Component {
);
});
- renderProcess.on('addImageComplete', (event, response) => {
- this._addImage(response);
- });
-
- renderProcess.on('addGIFComplete', (event, response) => {
- this._addImage(response);
- });
-
renderProcess.on('send-tweet-shortcut', () => {
- this._postStatus();
+ this.postStatus();
});
}
- _addImage() {
+ addImage(e) {
+ if (e) {
+ e.preventDefault();
+ }
ImageDialog((newImage) => {
this.setState({
image: newImage,
@@ -102,13 +100,13 @@ class Composer extends Component {
});
}
- _removeImage() {
+ removeImage() {
this.setState({
image: null,
});
}
- _postStatus(e) {
+ postStatus(e) {
if (e) {
e.preventDefault();
}
@@ -130,13 +128,16 @@ class Composer extends Component {
this.forceUpdate();
}
+ goToSettings() {
+ this.context.router.history.replace('/settings');
+ }
+
render() {
const { image, } = this.state;
const {
userCredentials,
weightedStatus,
onUpdateWeightedStatus,
- onToggleSettingsVisibility,
localeManager,
} = this.props;
@@ -148,24 +149,24 @@ class Composer extends Component {
return (
<ComposerStyle>
<Header
- title={localeManager.composer.title}
- right={
+ title={
+ localeManager.composer.title
+ }
+ rightView={
<IconButton
iconSrc={SettingsIcon}
altText={localeManager.composer.settings_alt_text}
- onClick={() => {
- onToggleSettingsVisibility(true);
- }}
+ onClick={this.goToSettings}
/>
}
/>
<InnerContent
style={{
position: 'relative',
- top: '51px',
+ top: '48px',
left: '0px',
minHeight: '180px',
- height: 'calc(100% - 136px)',
+ height: 'calc(100% - 132px)',
}}
>
<UserProfilePhoto
@@ -179,39 +180,28 @@ class Composer extends Component {
/>
<MediaListView
dataSource={imageDataSource}
- onRemoveImage={() => {
- this._removeImage();
- }}
+ onRemoveImage={this.removeImage}
/>
</InnerContent>
<Footer
- left={
- <Fragment>
+ leftView={
<IconButton
disabled={image !== null}
iconSrc={PhotoIcon}
altText={localeManager.composer.image_alt_text}
- onClick={(e) => {
- e.preventDefault();
- this._addImage();
- }}
+ onClick={this.addImage}
/>
- </Fragment>
}
- right={
+ rightView={
<RoundedButton
disabled={weightedStatus === null && image === null}
title={localeManager.composer.tweet_button}
fullWidth={false}
type="submit"
- onClick={(e) => {
- e.preventDefault();
- this._postStatus();
- }}
+ onClick={this.postStatus}
/>
}
/>
- <SettingsContainer />
</ComposerStyle>
);
}
| 10 |
diff --git a/resources/js/custom.js b/resources/js/custom.js @@ -659,11 +659,6 @@ try {
console.log("Mica is already active");
return;
}
- if (this.lastTheme !== "winui") {
- if (confirm("This feature currently requires the Eleven theme, enable now?")) {
- this.loadTheme("winui");
- }
- }
this.micaActive = true;
var micaDOM = document.createElement("div");
micaDOM.classList.add("micaBackground");
| 2 |
diff --git a/exampleSite/content/fragments/hero/code-hero.md b/exampleSite/content/fragments/hero/code-hero.md @@ -3,7 +3,7 @@ fragment = "content"
weight = 111
+++
-<details><summary>Code</summary>
+<details><summary>Code (index.md)</summary>
```
+++
fragment = "hero"
@@ -42,3 +42,118 @@ subtitle = "Showcase your next project"
+++
```
</details>
+
+<details><summary>Particles (config.json)</summary>
+```
+{
+ "particles": {
+ "number": {
+ "value": 80,
+ "density": {
+ "enable": true,
+ "value_area": 800
+ }
+ },
+ "color": {
+ "value": "#ffffff"
+ },
+ "shape": {
+ "type": "circle",
+ "stroke": {
+ "width": 0,
+ "color": "#000000"
+ },
+ "polygon": {
+ "nb_sides": 5
+ },
+ "image": {
+ "src": "img/github.svg",
+ "width": 100,
+ "height": 100
+ }
+ },
+ "opacity": {
+ "value": 0.5,
+ "random": false,
+ "anim": {
+ "enable": false,
+ "speed": 1,
+ "opacity_min": 0.1,
+ "sync": false
+ }
+ },
+ "size": {
+ "value": 3,
+ "random": true,
+ "anim": {
+ "enable": false,
+ "speed": 40,
+ "size_min": 0.1,
+ "sync": false
+ }
+ },
+ "line_linked": {
+ "enable": true,
+ "distance": 150,
+ "color": "#ffffff",
+ "opacity": 0.4,
+ "width": 1
+ },
+ "move": {
+ "enable": true,
+ "speed": 6,
+ "direction": "none",
+ "random": false,
+ "straight": false,
+ "out_mode": "out",
+ "bounce": false,
+ "attract": {
+ "enable": false,
+ "rotateX": 600,
+ "rotateY": 1200
+ }
+ }
+ },
+ "interactivity": {
+ "detect_on": "canvas",
+ "events": {
+ "onhover": {
+ "enable": true,
+ "mode": "repulse"
+ },
+ "onclick": {
+ "enable": true,
+ "mode": "push"
+ },
+ "resize": true
+ },
+ "modes": {
+ "grab": {
+ "distance": 400,
+ "line_linked": {
+ "opacity": 1
+ }
+ },
+ "bubble": {
+ "distance": 400,
+ "size": 40,
+ "duration": 2,
+ "opacity": 8,
+ "speed": 3
+ },
+ "repulse": {
+ "distance": 200,
+ "duration": 0.4
+ },
+ "push": {
+ "particles_nb": 4
+ },
+ "remove": {
+ "particles_nb": 2
+ }
+ }
+ },
+ "retina_detect": true
+}
+```
+</details>
| 0 |
diff --git a/accessibility-checker-engine/src/v4/rules/IBMA_Color_Contrast_WCAG2AA.ts b/accessibility-checker-engine/src/v4/rules/IBMA_Color_Contrast_WCAG2AA.ts @@ -42,7 +42,7 @@ export let IBMA_Color_Contrast_WCAG2AA: Rule = {
level: eRulePolicy.VIOLATION,
toolkitLevel: eToolkitLevel.LEVEL_ONE
}],
- act: ["afw4f7"],
+ act: ['afw4f7'],
run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
const ruleContext = context["dom"].node as HTMLElement;
let nodeName = ruleContext.nodeName.toLowerCase();
| 14 |
diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs @@ -90,8 +90,12 @@ Object.keys(differentRelationships).forEach(key => {
_%>
import { I<%= uniqueRel.otherEntityAngularName %> } from 'app/shared/model/user.model';
import { getUsers } from 'app/modules/administration/user-management/user-management.reducer';
-<%_ } else { _%>
+<%_
+ } else {
+ if (uniqueRel.otherEntityAngularName !== entityReactName) {
+_%>
import { I<%= uniqueRel.otherEntityAngularName %> } from 'app/shared/model/<%= uniqueRel.otherEntityModelName %>.model';
+ <%_ } _%>
import { getEntities as get<%= upperFirstCamelCase(uniqueRel.otherEntityNamePlural) %> } from 'app/entities/<%= uniqueRel.otherEntityPath %>/<%= uniqueRel.otherEntityFileName %>.reducer';
<%_ }
}
| 1 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -408,7 +408,6 @@ const baseResolvers = {
// If we have inactive dependencies, there's no need to check if we can
// activate the module until the dependencies have been activated.
if ( inactiveModules.length ) {
-
/* translators: Error message text. 1: A flattened list of module names. 2: A module name. */
const messageTemplate = __( 'You need to set up %1$s to gain access to %2$s.', 'google-site-kit' );
const errorMessage = sprintf( messageTemplate, listFlatten( inactiveModules ), module.name );
| 2 |
diff --git a/scenes/treehouse.scn b/scenes/treehouse.scn "start_url": "https://webaverse.github.io/damage-mesh/",
"dynamic": true
},
+ {
+ "position": [
+ 2,
+ 1,
+ 0
+ ],
+ "quaternion": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "physics": false,
+ "start_url": "https://webaverse.github.io/particle-mesh/",
+ "dynamic": true
+ },
{
"position": [
4,
| 0 |
diff --git a/app/shared/components/Tools/Form/Permissions/Auth.js b/app/shared/components/Tools/Form/Permissions/Auth.js @@ -110,12 +110,7 @@ class ToolsFormPermissionsAuth extends Component<Props> {
<Form
onSubmit={this.onSubmit}
>
- <Message
- content={t('tools_permissions_warning_content')}
- header={t('tools_permissions_warning_header')}
- icon="info circle"
- info
- />
+ <p>{t('tools_form_permissions_auth_instructions')}</p>
{(settings.advancedPermissions || newAuth)
? (
<Form.Input
@@ -183,6 +178,12 @@ class ToolsFormPermissionsAuth extends Component<Props> {
)
: false
}
+ <Message
+ content={t('tools_permissions_warning_content')}
+ header={t('tools_permissions_warning_header')}
+ icon="warning sign"
+ color="orange"
+ />
<Container textAlign="right">
<Button
content={t('tools_form_permissions_auth_submit')}
| 7 |
diff --git a/src/scripts/content/airtable.js b/src/scripts/content/airtable.js togglbutton.render('.detailViewWithActivityFeedBase .dialog > .header > .flex-auto:not(.toggl)', {observe: true}, function (elem) {
var link, descFunc,
- container = $('.justify-center > .relative', elem),
- description = $('.truncate.flex-auto.line-height-3', elem);
+ container = $('.justify-center.relative > .items-center', elem),
+ description = $('.truncate.line-height-3', elem);
descFunc = function () {
return !!description ? description.innerText : "";
| 1 |
diff --git a/packages/imba/package-lock.json b/packages/imba/package-lock.json }
},
"node_modules/vite-plugin-imba": {
- "version": "0.10.0",
- "resolved": "https://registry.npmjs.org/vite-plugin-imba/-/vite-plugin-imba-0.10.0.tgz",
- "integrity": "sha512-8zzSd7GiE7EgrkrXcabZJt53f1NXMyFZwT5Z9hoj8klBFdwpPHAaga2L2l4MdxHUm9+xDGaunefyO/+2WYUjuw==",
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/vite-plugin-imba/-/vite-plugin-imba-0.10.1.tgz",
+ "integrity": "sha512-L4YKjsg5h5PPJRmLFw/68beerBRzCGiSjCqe0Xxh1aavvcAL57ZgT+7Y2kvwG7rcFO1YBdWtJ/tyJEsMK7rEAg==",
"peer": true,
"dependencies": {
"@rollup/pluginutils": "^4.2.1",
}
},
"vite-plugin-imba": {
- "version": "0.10.0",
- "resolved": "https://registry.npmjs.org/vite-plugin-imba/-/vite-plugin-imba-0.10.0.tgz",
- "integrity": "sha512-8zzSd7GiE7EgrkrXcabZJt53f1NXMyFZwT5Z9hoj8klBFdwpPHAaga2L2l4MdxHUm9+xDGaunefyO/+2WYUjuw==",
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/vite-plugin-imba/-/vite-plugin-imba-0.10.1.tgz",
+ "integrity": "sha512-L4YKjsg5h5PPJRmLFw/68beerBRzCGiSjCqe0Xxh1aavvcAL57ZgT+7Y2kvwG7rcFO1YBdWtJ/tyJEsMK7rEAg==",
"peer": true,
"requires": {
"@rollup/pluginutils": "^4.2.1",
| 3 |
diff --git a/Gruntfile.js b/Gruntfile.js @@ -222,7 +222,7 @@ module.exports = function (grunt) {
entry: "./src/web/index.js",
output: {
filename: "scripts.js",
- path: "build/dev"
+ path: __dirname + "/build/dev"
},
plugins: [
new HtmlWebpackPlugin({
@@ -239,7 +239,7 @@ module.exports = function (grunt) {
entry: "./src/web/index.js",
output: {
filename: "scripts.js",
- path: "build/prod"
+ path: __dirname + "/build/prod"
},
plugins: [
new webpack.optimize.UglifyJsPlugin({
@@ -278,45 +278,12 @@ module.exports = function (grunt) {
}),
]
},
- // webInline: {
- // target: "web",
- // entry: "./src/web/index.js",
- // output: {
- // filename: "scripts.js",
- // path: "build/prod"
- // },
- // plugins: [
- // new webpack.optimize.UglifyJsPlugin({
- // compress: {
- // "screw_ie8": true,
- // "dead_code": true,
- // "unused": true,
- // "warnings": false
- // },
- // comments: false,
- // }),
- // new HtmlWebpackPlugin({
- // filename: "cyberchef.htm",
- // template: "./src/web/html/index.html",
- // compileTime: compileTime,
- // codebaseStats: codebaseStats,
- // inline: true,
- // minify: {
- // removeComments: true,
- // collapseWhitespace: true,
- // minifyJS: true,
- // minifyCSS: true
- // }
- // }),
- // new StyleExtHtmlWebpackPlugin()
- // ]
- // },
tests: {
target: "node",
entry: "./test/index.js",
output: {
filename: "index.js",
- path: "build/test"
+ path: __dirname + "/build/test"
}
},
node: {
@@ -324,7 +291,7 @@ module.exports = function (grunt) {
entry: "./src/node/index.js",
output: {
filename: "CyberChef.js",
- path: "build/node",
+ path: __dirname + "/build/node",
library: "CyberChef",
libraryTarget: "commonjs2"
}
@@ -344,18 +311,6 @@ module.exports = function (grunt) {
dest: "build/prod/index.html"
}
},
- // inline: {
- // options: {
- // tag: "",
- // inlineTagAttributes: {
- // js: "type='application/javascript'",
- // css: "type='text/css'"
- // }
- // },
- // compiled: {
- // src: "build/prod/cyberchef.htm"
- // }
- // },
chmod: {
build: {
options: {
| 3 |
diff --git a/shows/100 - Episode 100.md b/shows/100 - Episode 100.md @@ -29,16 +29,16 @@ Get a 30 day free trial of Freshbooks at [freshbooks.com/syntax](https://freshbo
09:37 - Most popular episodes
-* 10 - [Syntax074 - 11 Habits of Highly Effective Developers](https://syntax.fm/show/060/11-habits-of-highly-effective-developers)
+* 10 - [Syntax074 - 11 Habits of Highly Effective Developers](https://syntax.fm/show/074/11-habits-of-highly-effective-developers)
* 09 - [Syntax039 - Is jQuery Dead?](https://syntax.fm/show/039/is-jquery-dead)
-* 08 - [Syntax046 - What's New in Javascript](https://syntax.fm/show/038/what-s-new-in-javascript)
+* 08 - [Syntax046 - What's New in Javascript](https://syntax.fm/show/046/what-s-new-in-javascript)
* 07 - [Syntax048 - VS Code Round Two](https://syntax.fm/show/048/vs-code-round-two)
-* 06 - [Syntax050 - Progressive Web Apps](https://syntax.fm/show/040/progressive-web-apps)
+* 06 - [Syntax050 - Progressive Web Apps](https://syntax.fm/show/050/progressive-web-apps)
* 05 - [Syntax018 - All About CSS Grid](https://syntax.fm/show/018/all-about-css-grid)
-* 04 - [Syntax051 - Our Workflows: Design, Development, Git, Deployment](https://syntax.fm/show/041/our-workflows-design-development-git-and-deployment)
-* 03 - [Syntax066 - The React Episode](https://syntax.fm/show/054/the-react-episode)
-* 02 - [Syntax043 - 20 JavaScript Array and Object Methods to make you a better developer](https://syntax.fm/show/035/20-javascript-array-and-object-methods-to-make-you-a-better-developer)
-* 01 - [Syntax044 - How to Learn New Things Quickly](https://syntax.fm/show/036/how-to-learn-new-things-quickly)
+* 04 - [Syntax051 - Our Workflows: Design, Development, Git, Deployment](https://syntax.fm/show/051/our-workflows-design-development-git-and-deployment)
+* 03 - [Syntax066 - The React Episode](https://syntax.fm/show/066/the-react-episode)
+* 02 - [Syntax043 - 20 JavaScript Array and Object Methods to make you a better developer](https://syntax.fm/show/043/20-javascript-array-and-object-methods-to-make-you-a-better-developer)
+* 01 - [Syntax044 - How to Learn New Things Quickly](https://syntax.fm/show/044/how-to-learn-new-things-quickly)
21:35 - Top countries
@@ -74,8 +74,8 @@ Get a 30 day free trial of Freshbooks at [freshbooks.com/syntax](https://freshbo
35:10 - Favorite episodes
-* Wes - [Syntax043 - 20 JavaScript Array and Object Methods to make you a better developer](https://syntax.fm/show/035/20-javascript-array-and-object-methods-to-make-you-a-better-developer)
-* Scott - [Syntax044 - How to Learn New Things Quickly](https://syntax.fm/show/036/how-to-learn-new-things-quickly)
+* Wes - [Syntax043 - 20 JavaScript Array and Object Methods to make you a better developer](https://syntax.fm/show/043/20-javascript-array-and-object-methods-to-make-you-a-better-developer)
+* Scott - [Syntax044 - How to Learn New Things Quickly](https://syntax.fm/show/044/how-to-learn-new-things-quickly)
38:49 - Q&A
| 3 |
diff --git a/snippets/textview-markupenabled.jsx b/snippets/textview-markupenabled.jsx -import {TextView, contentView, CheckBox, Stack} from 'tabris';
+import {CheckBox, contentView, Stack, TextView} from 'tabris';
contentView.append(
- <Stack>
- <TextView markupEnabled font='16px' padding={12}>
- Normal Text<br/>
- <b>bold</b><br/>
- <i>italic</i><br/>
+ <Stack stretch padding={16} spacing={16} alignment='stretchX'>
+ <TextView markupEnabled font='16px'>
+ Normal Text <b>bold</b> <i>italic</i><br/>
<big>big</big><br/>
<small>small</small><br/>
<strong>strong</strong><br/>
<ins>inserted</ins><br/>
- <del>deleted</del><br/>
+ <del>deleted</del>
</TextView>
- <CheckBox checked onSelect={updateMarkupEnabled}>markupEnabled</CheckBox>
+ <CheckBox text='Enable markup' checked onSelect={e => $(TextView).only().markupEnabled = e.checked}/>
</Stack>
);
-
-function updateMarkupEnabled({checked: markupEnabled}) {
- contentView.find(TextView).set({markupEnabled});
-}
| 7 |
diff --git a/src/components/core/check-overflow/index.js b/src/components/core/check-overflow/index.js @@ -19,7 +19,7 @@ function checkOverflow() {
if (wasLocked && wasLocked !== swiper.isLocked) {
swiper.isEnd = false;
- swiper.navigation.update();
+ if(swiper.navigation) swiper.navigation.update();
}
}
| 0 |
diff --git a/plugins/auth/auth_bridge.js b/plugins/auth/auth_bridge.js @@ -15,7 +15,7 @@ exports.load_flat_ini = function () {
exports.check_plain_passwd = function (connection, user, passwd, cb) {
let host = this.cfg.main.host;
if (this.cfg.main.port) {
- host = host + ':' + this.cfg.main.port;
+ host = `${host}:${this.cfg.main.port}`;
}
this.try_auth_proxy(connection, host, user, passwd, cb);
};
| 14 |
diff --git a/React/Modules/RCTAsyncLocalStorage.m b/React/Modules/RCTAsyncLocalStorage.m #import "RCTLog.h"
#import "RCTUtils.h"
-static NSString *const RCTStorageDirectory = @"RCTAsyncLocalStorage_V1";
static NSString *const RCTManifestFileName = @"manifest.json";
static const NSUInteger RCTInlineValueThreshold = 1024;
@@ -68,7 +67,7 @@ static NSString *RCTGetStorageDirectory()
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
storageDirectory = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES).firstObject;
- storageDirectory = [storageDirectory stringByAppendingPathComponent:RCTStorageDirectory];
+ storageDirectory = [storageDirectory stringByAppendingPathComponent:[[[NSBundle mainBundle] infoDictionary] objectForKey:(id)kCFBundleNameKey]];
});
return storageDirectory;
}
| 10 |
diff --git a/edit.js b/edit.js @@ -5959,8 +5959,8 @@ function animate(timestamp, frame) {
rightGamepadPosition = localVector2.copy(localVector).add(localVector3.copy(rightHandOffset).multiplyScalar(handOffsetScale).applyQuaternion(localQuaternion)).toArray();
// .toArray(xrState.gamepads[0].position);
rightGamepadQuaternion = localQuaternion.toArray();
- rightGamepadPointer = (1 + Math.sin(Date.now()/1000*Math.PI*2))/2;
- rightGamepadGrip = 1 - (1 + Math.sin(Date.now()/1000*Math.PI*2))/2;
+ rightGamepadPointer = 0;
+ rightGamepadGrip = 0;
}
/* HANDS.forEach((handedness, i) => {
| 2 |
diff --git a/includes/Modules/Search_Console.php b/includes/Modules/Search_Console.php @@ -153,18 +153,8 @@ final class Search_Console extends Module implements Module_With_Screen, Module_
case 'matched-sites':
return $this->get_webmasters_service()->sites->listSites();
case 'searchanalytics':
- $data = array_merge(
- array(
- 'compareDateRanges' => false,
- 'dateRange' => 'last-28-days',
- 'dimensions' => '',
- 'url' => '',
- ),
- $data
- );
-
list ( $start_date, $end_date ) = $this->parse_date_range(
- $data['dateRange'],
+ $data['dateRange'] ?: 'last-28-days',
$data['compareDateRanges'] ? 2 : 1,
3
);
@@ -173,7 +163,7 @@ final class Search_Console extends Module implements Module_With_Screen, Module_
'page' => $data['url'],
'start_date' => $start_date,
'end_date' => $end_date,
- 'dimensions' => explode( ',', $data['dimensions'] ),
+ 'dimensions' => array_filter( explode( ',', $data['dimensions'] ) ),
);
if ( isset( $data['limit'] ) ) {
| 2 |
diff --git a/lib/api/api-router.js b/lib/api/api-router.js @@ -24,7 +24,7 @@ const TablesExtentBackend = require('../backends/tables-extent');
const ClusterBackend = require('../backends/cluster');
const LayergroupAffectedTablesCache = require('../cache/layergroup-affected-tables');
-const SurrogateKeysCache = require('../cache/surrogate_keys_cache');
+const SurrogateKeysCache = require('../cache/surrogate-keys-cache');
const VarnishHttpCacheBackend = require('../cache/backend/varnish-http');
const FastlyCacheBackend = require('../cache/backend/fastly');
const NamedMapProviderCache = require('../cache/named-map-provider-cache');
| 10 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.