code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/components/base-adresse-nationale/commune/index.js b/components/base-adresse-nationale/commune/index.js @@ -9,9 +9,11 @@ import AddressesList from '../addresses-list'
import Details from '@/components/base-adresse-nationale/commune/details'
import Tabs from '@/components/base-adresse-nationale/commune/tabs'
import Voie from './voie'
+import {formatPercent} from '@/lib/format-numbers'
function Commune({nomCommune, codeCommune, region, departement, nbNumerosCertifies, voies, nbVoies, nbLieuxDits, nbNumeros, population, codesPostaux}) {
const [activeTab, setActiveTab] = useState('VOIES')
+ const certificationPercentage = (nbNumerosCertifies * 100) / nbNumeros
return (
<>
@@ -29,6 +31,7 @@ function Commune({nomCommune, codeCommune, region, departement, nbNumerosCertifi
</div>
</div>
<Details
+ certificationPercentage={formatPercent(certificationPercentage)}
nbVoies={nbVoies}
nbLieuxDits={nbLieuxDits}
nbNumeros={nbNumeros}
| 0 |
diff --git a/common/lib/types/presencemessage.ts b/common/lib/types/presencemessage.ts @@ -30,13 +30,13 @@ class PresenceMessage {
* disconnection). This is useful because synthesized messages cannot be
* compared for newness by id lexicographically - RTP2b1
*/
- isSynthesized() {
+ isSynthesized(): boolean {
if (!this.id || !this.connectionId) { return true }
return this.id.substring(this.connectionId.length, 0) !== this.connectionId;
- };
+ }
/* RTP2b2 */
- parseId() {
+ parseId(): { connectionId: string, msgSerial: number, index: number } {
if (!this.id) throw new Error('parseId(): Presence message does not contain an id');
const parts = this.id.split(':');
return {
@@ -44,13 +44,18 @@ class PresenceMessage {
msgSerial: parseInt(parts[1], 10),
index: parseInt(parts[2], 10)
};
- };
+ }
/**
* Overload toJSON() to intercept JSON.stringify()
* @return {*}
*/
- toJSON() {
+ toJSON(): {
+ clientId?: string,
+ action: number,
+ data: string | Buffer,
+ encoding?: string,
+ } {
/* encode data to base64 if present and we're returning real JSON;
* although msgpack calls toJSON(), we know it is a stringify()
* call if it has a non-empty arguments list */
@@ -73,11 +78,11 @@ class PresenceMessage {
/* Convert presence action back to an int for sending to Ably */
action: toActionValue(this.action as string),
data: data,
- encoding: encoding,
+ encoding: encoding
+ }
}
- };
- toString() {
+ toString(): string {
let result = '[PresenceMessage';
result += '; action=' + this.action;
if(this.id)
@@ -100,42 +105,43 @@ class PresenceMessage {
}
result += ']';
return result;
- };
+ }
static encode = Message.encode;
static decode = Message.decode;
- static fromResponseBody(body: unknown[], options: CipherOptions, format: Format) {
+ static fromResponseBody(body: Record<string, unknown>[], options: CipherOptions, format?: Format): PresenceMessage[] {
+ const messages: PresenceMessage[] = [];
if(format) {
body = decodeBody(body, format);
}
for(let i = 0; i < body.length; i++) {
- let msg = body[i] = PresenceMessage.fromValues(body[i], true);
+ const msg = messages[i] = PresenceMessage.fromValues(body[i], true);
try {
PresenceMessage.decode(msg, options);
} catch (e) {
Logger.logAction(Logger.LOG_ERROR, 'PresenceMessage.fromResponseBody()', (e as Error).toString());
}
}
- return body;
- };
+ return messages;
+ }
- static fromValues(values: any, stringifyAction?: boolean): PresenceMessage {
+ static fromValues(values: PresenceMessage | Record<string, unknown>, stringifyAction?: boolean): PresenceMessage {
if(stringifyAction) {
- values.action = PresenceMessage.Actions[values.action]
+ values.action = PresenceMessage.Actions[values.action as number]
}
return Object.assign(new PresenceMessage(), values);
- };
+ }
- static fromValuesArray(values: unknown[]) {
+ static fromValuesArray(values: unknown[]): PresenceMessage[] {
const count = values.length, result = new Array(count);
- for(let i = 0; i < count; i++) result[i] = PresenceMessage.fromValues(values[i]);
+ for(let i = 0; i < count; i++) result[i] = PresenceMessage.fromValues(values[i] as Record<string, unknown>);
return result;
- };
+ }
- static fromEncoded(encoded: unknown, options: CipherOptions) {
- let msg = PresenceMessage.fromValues(encoded, true);
+ static fromEncoded(encoded: Record<string, unknown>, options: CipherOptions): PresenceMessage {
+ const msg = PresenceMessage.fromValues(encoded, true);
/* if decoding fails at any point, catch and return the message decoded to
* the fullest extent possible */
try {
@@ -144,13 +150,13 @@ class PresenceMessage {
Logger.logAction(Logger.LOG_ERROR, 'PresenceMessage.fromEncoded()', (e as Error).toString());
}
return msg;
- };
+ }
- static fromEncodedArray(encodedArray: unknown[], options: CipherOptions) {
+ static fromEncodedArray(encodedArray: Record<string, unknown>[], options: CipherOptions): PresenceMessage[] {
return encodedArray.map(function(encoded) {
return PresenceMessage.fromEncoded(encoded, options);
});
- };
+ }
static getMessagesSize = Message.getMessagesSize;
}
| 7 |
diff --git a/assets/js/modules/analytics/dashboard/dashboard-widget-top-earning-pages-small.js b/assets/js/modules/analytics/dashboard/dashboard-widget-top-earning-pages-small.js @@ -37,7 +37,7 @@ import { getDataTableFromData, TableOverflowContainer } from '../../../component
import PreviewTable from '../../../components/preview-table';
import Layout from '../../../components/layout/layout';
import CTA from '../../../components/notifications/cta';
-import { analyticsAdsenseReportDataDefaults } from '../util';
+import { analyticsAdsenseReportDataDefaults, isDataZeroForReporting } from '../util';
class AdSenseDashboardWidgetTopPagesTableSmall extends Component {
static renderLayout( component ) {
@@ -107,23 +107,17 @@ class AdSenseDashboardWidgetTopPagesTableSmall extends Component {
}
}
-const isDataZero = () => {
- return false;
-};
-
/**
* Check error data response.
*
- * @param {Object} data Response data.
+ * @param {Object} data Response error data.
*
* @return {(HTMLElement|null)} Returns HTML element markup with error message if it exists.
*/
const getDataError = ( data ) => {
- if ( data && data.error_data ) {
- const errors = Object.values( data.error_data );
-
+ if ( data.code && data.message && data.data && data.data.status ) {
// Specifically looking for string "badRequest"
- if ( errors[ 0 ] && 'badRequest' === errors[ 0 ].reason ) {
+ if ( data.data.reason && 'badRequest' === data.data.reason ) {
return (
<div className="
mdc-layout-grid__cell
@@ -142,8 +136,11 @@ const getDataError = ( data ) => {
</div>
);
}
+
+ return data.message;
}
+ // Legacy errors? Maybe this is never hit but better be safe than sorry.
if ( data && data.errors ) {
const errors = Object.values( data.errors );
if ( errors[ 0 ] && errors[ 0 ][ 0 ] ) {
@@ -175,6 +172,6 @@ export default withData(
inGrid: true,
createGrid: true,
},
- isDataZero,
+ isDataZeroForReporting,
getDataError,
);
| 9 |
diff --git a/src/components/SettingsWindow.jsx b/src/components/SettingsWindow.jsx @@ -491,11 +491,10 @@ export default class SettingsWindow extends PureComponent {
console.log(arr[i])
if(i < 2 && isNaN(arr[i])) return false;
}
- this.state.adjustmentTimes[index] = {
- hour: arr[0],
- minute: arr[1],
- am: arr[2]
- }
+ this.state.adjustmentTimes[index].hour = arr[0]
+ this.state.adjustmentTimes[index].minute = arr[1]
+ this.state.adjustmentTimes[index].am = arr[2]
+
//this.forceUpdate()
this.adjustmentTimesUpdated()
}
| 1 |
diff --git a/src/components/CategoriesFilterList.js b/src/components/CategoriesFilterList.js @@ -15,15 +15,13 @@ const CategoriesFilterList = ({ locale, stagedCategories, onPress }: Props) => (
<ScrollView style={styles.container}>
{Object.keys(categories[locale]).map(key => {
const category = categories[locale][key];
-
return (
<TouchableOpacity
key={category.label}
style={styles.itemContainer}
accessibilityTraits={["button"]}
accessibilityComponentType="button"
- delayPressIn={50}
- onPress={() => onPress(category.label)}
+ onPressIn={() => onPress(category.label)}
>
<View
style={[
| 2 |
diff --git a/articles/tutorials/calling-an-external-idp-api.md b/articles/tutorials/calling-an-external-idp-api.md ----
+g---
title: Call an Identity Provider API
description: How to call an Identity Provider API.
---
@@ -57,6 +57,38 @@ Within the user's `identities` array, there will be an `access_token` that you c
In most cases, the user will only have one identity, but if you have used the [account linking feature](/link-accounts), there may be more.
+In this sample response we can see that our user had only one identity (`google-oauth2`):
+
+```json
+{
+ "email": "[email protected]",
+ "email_verified": true,
+ "name": "John Doe",
+ "given_name": "John",
+ "family_name": "Doe",
+ "picture": "https://myavatar/photo.jpg",
+ "gender": "male",
+ "locale": "en",
+ "updated_at": "2017-03-15T07:14:32.451Z",
+ "user_id": "google-oauth2|111199914890750704174",
+ "nickname": "john.doe",
+ "identities": [
+ {
+ "provider": "google-oauth2",
+ "access_token": "ya29.GlsPBCS6ahokDlgCYnVLnDKNE71HBXPEzNhAPoKJLAGKDSe1De3_xclahNcdZXoU-26hCpa8h6240TV86dtaEQ4ZWoeeZduHDq_yeu9QyQqUr--S9B2CR9YJrLTD",
+ "expires_in": 3599,
+ "user_id": "111199914890750704174",
+ "connection": "google-oauth2",
+ "isSocial": true
+ }
+ ],
+ "created_at": "2017-03-15T07:13:41.134Z",
+ "last_ip": "127.0.0.1",
+ "last_login": "2017-03-15T07:14:32.451Z",
+ "logins_count": 99
+}
+```
+
<div class="alert alert-warning">
<strong>Security Warning!</strong> Make sure that you don't expose the IdP access token to your client-side application.
</div>
\ No newline at end of file
| 0 |
diff --git a/module/actor-sheet.js b/module/actor-sheet.js @@ -223,7 +223,7 @@ export class GurpsActorSheet extends ActorSheet {
console.log(effectiveDR)
- this.applyDamageToSpecificLocation(location, damage, effectiveDR)
+ this.applyDamageToSpecificLocationWithDR(location, damage, effectiveDR)
}
else {
// get DR for that location
@@ -234,12 +234,23 @@ export class GurpsActorSheet extends ActorSheet {
}
let dr = parseInt(hitlocation.dr)
- this.applyDamageToSpecificLocation(location, damage, dr)
+ this.applyDamageToSpecificLocationWithDR(location, damage, dr)
}
}
+ applyDamageToSpecificLocation(location, damage) {
+ // get DR for that location
+ let hitlocation = null
+ for (const [key, value] of Object.entries(this.actor.data.data.hitlocations)) {
+ if (value.where === location)
+ hitlocation = value
+ }
+ let dr = parseInt(hitlocation.dr)
+ this.applyDamageToSpecificLocationWithDR(location, damage, dr)
+ }
+
// Location is set to a specific hit location
- applyDamageToSpecificLocation(location, damage, dr) {
+ applyDamageToSpecificLocationWithDR(location, damage, dr) {
let current = this.actor.data.data.HP.value
let attacker = game.actors.get(damage.attacker)
| 1 |
diff --git a/articles/api/management/v2/user-search.md b/articles/api/management/v2/user-search.md @@ -123,6 +123,32 @@ Search for all users that have never logged in | `(_missing_:logins_count OR log
Search for all users who logged in before 2015 | `last_login:[* TO 2014-12-31]`
Fuzziness: Search for terms that are similar to, but not exactly like, `jhn` | `name:jhn~`
+### Example Request
+
+Below is an example request for searching all users whose email is exactly "[email protected]".
+
+```har
+{
+ "method": "GET",
+ "url": "https://${account.namespace}/api/v2/users",
+ "headers": [
+ { "name": "Authorization", "value": "Bearer ACCESS_TOKEN" }
+ ],
+ "queryString": [
+ {
+ "name": "q",
+ "value": "email.raw:\"[email protected]\"",
+ "comment": "Query in Lucene query string syntax"
+ },
+ {
+ "name": "search_engine",
+ "value": "v2",
+ "comment": "Use 'v2' if you want to try our new search engine"
+ }
+ ]
+}
+```
+
### Search using ranges
Inclusive ranges are specified with square brackets: `[min TO max]` and exclusive ranges with curly brackets: `{min TO max}`. Curly and square brackets can be combined in the same range expression: `logins_count:[100 TO 200}`.
| 0 |
diff --git a/src/lib/sentry.js b/src/lib/sentry.js @@ -5,6 +5,7 @@ const initSentry = () => {
Sentry.init({
dsn: `${process.env.SENTRY_DSN}`,
+ environment: 'www',
// Do not collect global onerror, only collect specifically from React error boundaries.
// TryCatch plugin also includes errors from setTimeouts (i.e. the VM)
integrations: integrations => integrations.filter(i =>
| 12 |
diff --git a/src/userscript.ts b/src/userscript.ts @@ -101542,7 +101542,7 @@ var $$IMU_EXPORT$$;
// thanks to karpuzikov on github: https://github.com/qsniyg/maxurl/issues/1075
// https://www.westerndigital.com/content/dam/store/en-us/assets/products/usb-flash-drives/ultra-luxe-usb-3-1/gallery/ultra-luxe-usb-3-1-angle-down-left.png.wdthumb.319.319.webp
// https://www.westerndigital.com/content/dam/store/en-us/assets/products/usb-flash-drives/ultra-luxe-usb-3-1/gallery/ultra-luxe-usb-3-1-angle-down-left.png
- return src.replace(/\.wdthumb\.\d+\.\d+\.webp/, "");
+ return src.replace(/\.wdthumb\.\d+\.\d+\.\w+/, "");
}
if (domain === "content.rozetka.com.ua") {
| 7 |
diff --git a/src/parser.coffee b/src/parser.coffee @@ -83,6 +83,9 @@ class VASTParser
if node.nodeName is 'Ad'
ad = @parseAdElement node
if ad?
+ if options.determinedSequence?
+ ad.sequence = options.determinedSequence
+
response.ads.push ad
else
# VAST version of response not supported.
@@ -123,6 +126,8 @@ class VASTParser
# Get full URL if url is defined
ad.nextWrapperURL = @resolveVastAdTagURI(ad.nextWrapperURL, url)
+ # sequence doesn't carry over in wrapper element
+ options.determinedSequence = ad.sequence
@_parse ad.nextWrapperURL, parentURLs, options, (err, wrappedResponse) =>
errorAlreadyRaised = false
if err?
| 0 |
diff --git a/packages/components/src/UnitInput/UnitInput.js b/packages/components/src/UnitInput/UnitInput.js @@ -168,7 +168,7 @@ function PresetPlaceholder({ cssProp, inputRef, onChange, value }) {
background: ui.color.admin,
color: ui.color.white,
},
- ui.opacity(isTypeAhead ? 0.5 : 1),
+ ui.opacity(!isFocused && isTypeAhead ? 0.5 : 1),
ui.borderRadius.round,
]}
>
@@ -197,6 +197,16 @@ function PresetPlaceholder({ cssProp, inputRef, onChange, value }) {
e.preventDefault();
handleOnRemoveUnit(e);
}
+ // Select all
+ if ((e.keyCode === 65 && e.metaKey) || e.ctrlKey) {
+ e.preventDefault();
+ inputRef.current.focus();
+ }
+ // Left/Right arrow
+ if (e.keyCode === 37 || e.keyCode === 39) {
+ e.preventDefault();
+ inputRef.current.focus();
+ }
}}
onMouseDown={(e) => e.stopPropagation()}
ref={selectRef}
| 7 |
diff --git a/plugins/data.rfc5322_header_checks.js b/plugins/data.rfc5322_header_checks.js @@ -17,16 +17,14 @@ exports.hook_data_post = function (next, connection) {
// Headers that MUST be present
for (let i=0,l=required_headers.length; i < l; i++) {
if (header.get_all(required_headers[i]).length === 0) {
- return next(DENY, "Required header '" + required_headers[i] +
- "' missing");
+ return next(DENY, `Required header '${required_headers[i]}' missing`);
}
}
// Headers that MUST be unique if present
for (let i=0,l=singular_headers.length; i < l; i++) {
if (header.get_all(singular_headers[i]).length > 1) {
- return next(DENY, "Message contains non-unique '" +
- singular_headers[i] + "' header");
+ return next(DENY, `Message contains non-unique '${singular_headers[i]}' header`);
}
}
| 14 |
diff --git a/src/lib/wallet/GoodWallet.js b/src/lib/wallet/GoodWallet.js @@ -68,12 +68,12 @@ export class GoodWallet {
return await this.claimContract.methods.checkEntitlement().call()
}
- async balanceChanged(callback: (error: any, event: any) => any) {
- await this.ready
- let handler = this.tokenContract.events.Transfer({ fromBlock: 'latest', filter: { from: this.account } }, callback)
- let handler2 = this.tokenContract.events.Transfer({ fromBlock: 'latest', filter: { to: this.account } }, callback)
- return [handler, handler2]
- }
+ // async balanceChanged(callback: (error: any, event: any) => any) {
+ // await this.ready
+ // let handler = this.tokenContract.events.Transfer({ fromBlock: 'latest', filter: { from: this.account } }, callback)
+ // let handler2 = this.tokenContract.events.Transfer({ fromBlock: 'latest', filter: { to: this.account } }, callback)
+ // return [handler, handler2]
+ // }
async balanceOf() {
await this.ready
| 2 |
diff --git a/src/components/head/index.js b/src/components/head/index.js @@ -23,6 +23,9 @@ export default ({ title, description, showUnreadFavicon }: Props) => {
id="dynamic-favicon"
href={`${process.env.PUBLIC_URL}/img/favicon_unread.ico`}
/>}
+ <meta name="apple-mobile-web-app-title" content="Spectrum" />
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black" />
</Helmet>
);
};
| 12 |
diff --git a/test/functional/specs/Data Collector/C451771.js b/test/functional/specs/Data Collector/C451771.js @@ -44,7 +44,7 @@ const consentIn = ClientFunction(
{ dependencies: { CONSENT_IN } }
);
-test("Test C2593: Event command consents to all purposes", async () => {
+test("C451771: XDM and data objects should be cloned as soon as feasible.", async () => {
await configureAlloyInstance(
"alloy",
compose(
| 1 |
diff --git a/lib/nearley.js b/lib/nearley.js }
var that = this;
- return state.wantedBy.reduce(function(stack, prevState) {
- return stack.concat(that.buildStateStacks(
+ return state.wantedBy.reduce(function(stacks, prevState) {
+ return stacks.concat(that.buildStateStacks(
prevState,
[state].concat(visited))
.map(function(stack) {
| 10 |
diff --git a/binding.gyp b/binding.gyp 'deps/exokit-bindings/videocontext/src/win/*.cpp',
'deps/exokit-bindings/windowsystem/src/*.cc',
'deps/exokit-bindings/glfw/src/*.cc',
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/base/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/cpptoc/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/cpptoc/test/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/cpptoc/views/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/ctocpp/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/ctocpp/test/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/ctocpp/views/*.cc')\")",
- "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/wrapper/*.cc')\")",
+ "<!(node -e \"console.log(require.resolve('native-browser-deps').slice(0, -9) + '/lib/windows/libcef_dll/base/cef_logging.cc')\")",
'deps/openvr/src/*.cpp',
'deps/exokit-bindings/leapmotion/src/*.cc',
],
'openvr_api.lib',
'Leap.lib',
'libcef.lib',
+ 'libcef_dll_wrapper.lib',
],
'copies': [
{
| 4 |
diff --git a/src/parser/spells/ability.js b/src/parser/spells/ability.js @@ -11,15 +11,16 @@ export function convertSpellCastingAbilityId(spellCastingAbilityId) {
}
// search through classinfo and determine spellcasting ability
-export function getSpellCastingAbility(classInfo) {
+export function getSpellCastingAbility(classInfo, checkSubclass = true, onlySubclass = false) {
let spellCastingAbility = undefined;
- if (hasSpellCastingAbility(classInfo.definition.spellCastingAbilityId)) {
+ if (!onlySubclass && hasSpellCastingAbility(classInfo.definition.spellCastingAbilityId)) {
spellCastingAbility = convertSpellCastingAbilityId(classInfo.definition.spellCastingAbilityId);
} else if (
+ checkSubclass &&
classInfo.subclassDefinition &&
hasSpellCastingAbility(classInfo.subclassDefinition.spellCastingAbilityId)
) {
- // Arcane Trickster has spellcasting ID granted here
+ // e.g. Arcane Trickster has spellcasting ID granted here
spellCastingAbility = convertSpellCastingAbilityId(classInfo.subclassDefinition.spellCastingAbilityId);
} else {
// special cases: No spellcaster, but can cast spells like totem barbarian, default to wis
| 11 |
diff --git a/Source/Scene/WebMapTileServiceImageryProvider.js b/Source/Scene/WebMapTileServiceImageryProvider.js @@ -228,11 +228,6 @@ function WebMapTileServiceImageryProvider(options) {
var style = options.style;
var tileMatrixSetID = options.tileMatrixSetID;
var url = resource.url;
- var templateValues = {
- style: style,
- Style: style,
- TileMatrixSet: tileMatrixSetID,
- };
var bracketMatch = url.match(/{/g);
if (
@@ -242,6 +237,12 @@ function WebMapTileServiceImageryProvider(options) {
resource.setQueryParameters(defaultParameters);
this._useKvp = true;
} else {
+ var templateValues = {
+ style: style,
+ Style: style,
+ TileMatrixSet: tileMatrixSetID,
+ };
+
resource.setTemplateValues(templateValues);
this._useKvp = false;
}
@@ -358,9 +359,6 @@ function requestImage(imageryProvider, col, row, level, request, interval) {
} else {
// build KVP request
var query = {};
- templateValues = {
- s: subdomains[(col + row + level) % subdomains.length],
- };
query.tilematrix = tileMatrix;
query.layer = imageryProvider._layer;
query.style = imageryProvider._style;
@@ -377,6 +375,10 @@ function requestImage(imageryProvider, col, row, level, request, interval) {
query = combine(query, dynamicIntervalData);
}
+ templateValues = {
+ s: subdomains[(col + row + level) % subdomains.length],
+ };
+
resource = imageryProvider._resource.getDerivedResource({
queryParameters: query,
request: request,
| 5 |
diff --git a/content/articles/jaspersoft-reports/index.md b/content/articles/jaspersoft-reports/index.md @@ -52,7 +52,7 @@ spring.jpa.properties.hibernate.format_sql=true
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
```
-The `spring.jpa.hibernate.ddl-auto` property allows us to create database tables. The `spring.jpa.show-sql` property prints the queries generated by Hibernate so we know when errors occur. The `spring.jpa.properties.hibernate.format_sql` property displays the SQL statements. The `spring.jpa.properties.hibernate.dialect` property tells the application which SQL dialect to use.
+The `spring.jpa.hibernate.ddl-auto` property influences how the database tables are created and managed. The value `create-drop` tells Spring to create the tables on startup but drop them when the app terminates. The `spring.jpa.show-sql` property prints the queries generated by Hibernate so we know when errors occur. The `spring.jpa.properties.hibernate.format_sql` property formats the SQL statements for readability. The `spring.jpa.properties.hibernate.dialect` property tells the application which SQL dialect to use.
### Create a Products model
@@ -148,7 +148,7 @@ public interface ReportService {
}
```
### Design a report using Jaspersoft template
-First, open JasperSoft studio. Before we create a design of the report, we will add the MySQL connector to the classpath. This will ensure we can connect to our database and generate the desired fields from our table. In Jaspersoft studio, click on *help*, *install new software*, *manage*. Once you click *manage* a new panel named preferences opens. Use the search field provided by the panel to search for *java*. The search will return different results but in our case click on *build path*. Under *build path*, click on *classpath variables*. The *classpath variables* provides us with the capability to add, edit, and remove variables using the *new*, *edit*, and *remove* buttons. Click on *new* and add the jar file on the window that opens with the desired name as shown below:
+First, open JasperSoft studio. Before we create a design of the report, we will add the MySQL connector to the classpath. This will ensure we can connect to our database and generate the desired fields from our table. In Jaspersoft studio, click on *help*, *install new software*, *manage*. Once you click *manage* a new panel named *preferences* opens. Use the search field provided by the panel to search for *java*. The search will return different results but in our case click on *build path*. Under *build path*, click on *classpath variables*. The *classpath variables* provides us with the capability to add, edit, and remove variables using the *new*, *edit*, and *remove* buttons. Click on *new* and add the jar file on the window that opens with the desired name as shown below:
| 1 |
diff --git a/src/pages/start.js b/src/pages/start.js @@ -131,7 +131,7 @@ export default () => (
</One>
<CTAContainer>
<LargeButton.link to="/apply" inverted f={[3, 4]}>
- Apply to Hack Club
+ Begin Your Application
</LargeButton.link>
</CTAContainer>
<Two>
@@ -233,7 +233,7 @@ export default () => (
</Modules>
<Box align="center" mt={4}>
<LargeButton.link to="/apply" inverted f={[3, 4]}>
- Apply + Start Your Club
+ Begin Your Application
</LargeButton.link>
</Box>
</Four>
| 7 |
diff --git a/token-metadata/0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643/metadata.json b/token-metadata/0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643/metadata.json "symbol": "CDAI",
"address": "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md @@ -5,7 +5,7 @@ TL;DR? The `winston` project is actively working towards getting `3.0.0` out of
- [What makes up `[email protected]`?](#what-makes-up-winston-3.0.0)
- [What about `[email protected]`?!](#what-about-winston-2.x)
- [Roadmap](#roadmap)
- - [Bugs][#bugs]
+ - [Bugs](#bugs)
- [Documentation](#documentation)
- [Feature Requests](#feature-requests)
- [Be kind & actively empathetic to one another](CODE_OF_CONDUCT.md)
@@ -53,7 +53,7 @@ const logger = createLogger({
Below is the list of items that make up the roadmap through `3.1.0`. We are actively triaging the open issues, so it is likely a few more critical path items will be added to this list before `3.0.0` gets out of RC.
-- [Bugs][#bugs]
+- [Bugs](#bugs)
- [Documentation](#documentation)
- [Feature Requests](#feature-requests)
| 1 |
diff --git a/src/components/userAvatar/view/userAvatarView.tsx b/src/components/userAvatar/view/userAvatarView.tsx @@ -60,7 +60,11 @@ const UserAvatarView = ({
const uri = avatarUrl ? avatarUrl : getResizedAvatar(username, 'large');
const _avatar = username
- ? { uri : `${uri}?stamp=${avatarCacheStamp}` }
+ ? {
+ uri : `${uri}${username === curUsername && avatarCacheStamp
+ ? ('?stamp=' + avatarCacheStamp) : '' }`,
+ cache : FastImage.cacheControl.web
+ }
: DEFAULT_IMAGE;
let _size:number;
| 4 |
diff --git a/packages/frontend/src/actions/account.js b/packages/frontend/src/actions/account.js @@ -569,6 +569,13 @@ export const refreshAccount = (basicData = false) => async (dispatch, getState)
}
};
+export const switchAccount = (accountId) => async (dispatch, getState) => {
+ dispatch(makeAccountActive(accountId));
+ dispatch(handleRefreshUrl());
+ dispatch(refreshAccount());
+ dispatch(clearAccountState());
+};
+
export const clearAccountState = () => async (dispatch, getState) => {
dispatch(staking.clearState());
dispatch(tokens.clearState());
| 5 |
diff --git a/styleguide.config.js b/styleguide.config.js const path = require("path");
const fs = require("fs");
-const theme = require("./styleguide/src/styles/themes.js")
+const theme = require("./styleguide/src/styles/themes")
// const snapguidist = require("snapguidist");
const componentsDir = path.join(__dirname, "package/src/components");
@@ -72,7 +72,7 @@ function generateSection({ componentNames, name, content }) {
module.exports = {
title: "Reaction UI Components Style Guide",
- theme,
+ themes,
sections: [
{
name: "Introduction",
| 1 |
diff --git a/planet.js b/planet.js @@ -762,6 +762,7 @@ const _connectRoom = async roomName => {
const {peerId, hash} = j;
if (peerId === peerConnection.connectionId && hash !== modelHash) {
modelHash = hash;
+ _loadAvatar(hash);
}
} else {
console.warn('unknown method', method);
@@ -776,7 +777,7 @@ const _connectRoom = async roomName => {
microphoneMediaStream = new MediaStream([track]);
const audio = document.createElement('audio');
audio.srcObject = microphoneMediaStream;
- // audio.play();
+ audio.play();
if (playerRig) {
playerRig.context.rig.setMicrophoneMediaStream(microphoneMediaStream);
track.addEventListener('ended', e => {
| 12 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -213,10 +213,6 @@ workflows:
context: Development
requires:
- setup
- - delegate_factory_tests:
- context: Development
- requires:
- - setup
- order_utils_tests:
context: Development
requires:
@@ -240,7 +236,6 @@ workflows:
- indexer_tests
- index_tests
- delegate_tests
- - delegate_factory_tests
- order_utils_tests
- types_tests
- wrapper_tests
| 2 |
diff --git a/articles/quickstart/backend/rails/01-authentication.md b/articles/quickstart/backend/rails/01-authentication.md @@ -6,8 +6,7 @@ description: This tutorial demonstrates how to add authentication to Ruby on Rai
<%= include('../../../_includes/_package', {
org: 'auth0-samples',
repo: 'auth0-rubyonrails-api-samples',
- path: '01-Authenticate-RS256',
- branch: 'OIDC',
+ path: '01-Authenticate-RS256'
requirements: [
'Ruby 2.1.8',
'Rails 4.2.5.1'
| 3 |
diff --git a/docs-src/tutorials/02-usage.md b/docs-src/tutorials/02-usage.md @@ -186,7 +186,7 @@ the step will execute. For example:
- `text`: The HTML text of the button
- `classes`: Extra classes to apply to the `<a>`
- `secondary`: A boolean, that when true, adds a `shepherd-button-secondary` class to the button
- - `action`: A function executed when the button is clicked on
+ - `action`: A function executed when the button is clicked on.
It is automatically bound to the `tour` the step is associated with, so things like `this.next` will
work inside the action. You can use action to skip steps or navigate to specific steps, with something like:
```javascript
| 0 |
diff --git a/components/commit/commit.js b/components/commit/commit.js @@ -31,7 +31,11 @@ function CommitViewModel(gitNode) {
this.fileLineDiffs = ko.observable();
this.numberOfAddedLines = ko.observable();
this.numberOfRemovedLines = ko.observable();
- this.authorGravatar = ko.computed(function() { return md5(self.authorEmail().toLowerCase()); });
+ this.authorGravatar = ko.computed(function() {
+ var lowerCaseEmail = self.authorEmail();
+ lowerCaseEmail = lowerCaseEmail ? lowerCaseEmail.toLowerCase() : lowerCaseEmail;
+ return md5(lowerCaseEmail);
+ });
this.showCommitDiff = ko.computed(function() {
return self.fileLineDiffs() && self.fileLineDiffs().length > 0;
| 1 |
diff --git a/src/pages/item/index.js b/src/pages/item/index.js @@ -198,7 +198,7 @@ function Item() {
{t('Calculated over the average for the last 24 hours')}
</div>
- {t('This item is currently being sold for')} {formatPrice(currentItemData.avg24hPrice)} {t('on the Flea Market.')}
+ {t('This item was sold for')} {formatPrice(currentItemData.avg24hPrice)} {t('on average in the last 24h on the Flea Market.')}
{t(' However, due to how fees are calculated you\'re better off selling for')} {formatPrice(currentItemData.bestPrice)}
</div>
}
| 7 |
diff --git a/README.md b/README.md @@ -24,6 +24,12 @@ npm install
npm install -g
```
+## Using with TypeScript
+
+```sh
+npm install --save-dev @types/minio
+```
+
## Initialize Minio Client
You need five items in order to connect to Minio object storage server.
| 0 |
diff --git a/assets/js/googlesitekit/datastore/user/user-input-settings.js b/assets/js/googlesitekit/datastore/user/user-input-settings.js @@ -54,8 +54,6 @@ const fetchSaveUserInputSettingsStore = createFetchStore( {
// Actions
const SET_USER_INPUT_SETTINGS = 'SET_USER_INPUT_SETTINGS';
const SET_USER_INPUT_SETTING = 'SET_USER_INPUT_SETTING';
-const START_SAVING_USER_SETTINGS = 'START_SAVING_USER_SETTINGS';
-const FINISH_SAVING_USER_SETTINGS = 'FINISH_SAVING_USER_SETTINGS';
const baseInitialState = {
inputSettings: undefined,
@@ -115,22 +113,12 @@ const baseActions = {
[ key ]: settings[ key ]?.values || [],
} ), {} );
- yield {
- payload: {},
- type: START_SAVING_USER_SETTINGS,
- };
-
const { response, error } = yield fetchSaveUserInputSettingsStore.actions.fetchSaveUserInputSettings( values );
if ( error ) {
// Store error manually since saveUserInputSettings signature differs from fetchSaveUserInputSettings.
registry.dispatch( STORE_NAME ).receiveError( error, 'saveUserInputSettings', [] );
}
- yield {
- payload: {},
- type: FINISH_SAVING_USER_SETTINGS,
- };
-
return { response, error };
},
};
@@ -155,14 +143,14 @@ export const baseReducer = ( state, { type, payload } ) => {
},
};
}
- case START_SAVING_USER_SETTINGS: {
+ case 'START_FETCH_SAVE_USER_INPUT_SETTINGS': {
return {
...state,
hasStartedSavingInputSettings: true,
hasFinishedSavingInputSettings: false,
};
}
- case FINISH_SAVING_USER_SETTINGS: {
+ case 'FINISH_FETCH_SAVE_USER_INPUT_SETTINGS': {
return {
...state,
hasStartedSavingInputSettings: false,
| 2 |
diff --git a/assets/js/components/setup/CompatibilityChecks/CompatibilityErrorNotice.js b/assets/js/components/setup/CompatibilityChecks/CompatibilityErrorNotice.js @@ -24,9 +24,10 @@ import { __, sprintf } from '@wordpress/i18n';
/**
* Internal dependencies
*/
+import Data from 'googlesitekit-data';
import { sanitizeHTML } from '../../../util/sanitize';
import Link from '../../Link';
-import { useSelect } from '@wordpress/data';
+const { useSelect } = Data;
import { STORE_NAME as CORE_SITE } from '../../../googlesitekit/datastore/site/constants';
import {
ERROR_AMP_CDN_RESTRICTED,
| 4 |
diff --git a/public/app/js/main.js b/public/app/js/main.js @@ -331,16 +331,17 @@ $(document).ready(function() {
/* update audio time */
- var playerTimeNow = document.querySelector(".player_time--now");
+ let playerTimeNowElem = document.getElementsByClassName("player_time--now")[0];
+ let playerTimeTotalElem = document.getElementsByClassName("player_time--total")[0];
+ let playerSliderElem = document.getElementsByClassName("player_slider")[0];
cbus.broadcast.listen("audioTick", function(e) {
/* slider */
- var percentage = e.data.currentTime / e.data.duration;
- $(".player_slider").val(Math.round(1000 * percentage) || 0);
+ playerSliderElem.value = Math.round(1000 * e.data.currentTime / e.data.duration) || 0;
/* time indicator */
- $(".player_time--now").html(colonSeparateDuration(e.data.currentTime));
- $(".player_time--total").html(colonSeparateDuration(e.data.duration));
+ playerTimeNowElem.innerHTML = colonSeparateDuration(e.data.currentTime);
+ playerTimeTotalElem.innerHTML = colonSeparateDuration(e.data.duration);
/* record in localforage so we can resume next time */
localforage.setItem("cbus-last-audio-time", e.data.currentTime);
@@ -348,11 +349,11 @@ $(document).ready(function() {
/* open podcast detail when podcast name clicked in episode data */
- $(".player_detail_feed-title").on("click", function() {
+ document.getElementsByClassName("player_detail_feed-title")[0].onclick = function() {
cbus.broadcast.send("showPodcastDetail", {
url: cbus.data.getEpisodeData({ audioElement: cbus.audio.element }).feedURL
});
- });
+ };
});
/* shortly after startup, remove from episodesUnsubbed and feedsQNP episodes/feeds not in queue or now playing */
| 7 |
diff --git a/src/components/general/character/character.module.css b/src/components/general/character/character.module.css /* */
-.bigButton {
- display: flex;
- margin: 15px 30px;
- margin-top: auto;
- padding: 10px;
- border: 2px solid #FFF;
- font-family: 'GeoSans';
- font-size: 20px;
- justify-content: center;
- color: #FFF;
- cursor: pointer;
- opacity: 0.3;
- transition: opacity 0.3s ease-out;
-}
-@keyframes highlight {
- 0% {
- border-color: #FFF;
- }
- 50% {
- border-color: #808080;
- }
- 100% {
- border-color: #808080;
- }
-}
-@keyframes highlight2 {
- 0% {
- background-color: #FFF;
- color: #000;
- }
- 50% {
- background-color: #000;
- color: #FFF;
- }
- 100% {
- background-color: #000;
- color: #FFF;
- }
-}
-.bigButton {
- animation: highlight 1s step-end infinite;
-}
-.bigButton.highlight {
- animation: highlight2 0.15s step-end infinite;
- opacity: 1;
-}
-.bigButton:hover {
- animation: none;
- opacity: 1;
- transition: opacity 1s cubic-bezier(0, 1, 0, 1);
-}
-
-/* */
-
.characterPanel .panel-body {
display: flex;
flex-direction: column;
| 2 |
diff --git a/lib/source/polkadotV0-source.js b/lib/source/polkadotV0-source.js @@ -183,9 +183,9 @@ class polkadotAPI {
async getBalancesFromAddress(address) {
const api = await this.getAPI()
const account = await api.query.system.account(address)
- const freeBalance = account.data.free
- const totalBalance = BigNumber(account.data.free.toString()).plus(
- account.data.reserved.toString()
+ const totalBalance = account.data.free
+ const freeBalance = BigNumber(totalBalance.toString()).minus(
+ account.data.miscFrozen.toString()
)
return this.reducers.balanceReducer(
this.network,
| 1 |
diff --git a/assets/js/modules/idea-hub/components/dashboard/DashboardCTA/index.js b/assets/js/modules/idea-hub/components/dashboard/DashboardCTA/index.js @@ -72,8 +72,8 @@ function DashboardCTA() {
<p>
<BulbIcon
className="googlesitekit-idea-hub__dashboard-cta__learnmore-bulb"
- width="16px"
- height="16px"
+ width="16"
+ height="16"
/>
<Link
| 2 |
diff --git a/src/pages/slack_invite.js b/src/pages/slack_invite.js @@ -17,14 +17,6 @@ import Sheet from 'components/Sheet'
import SlackForm from 'components/SlackForm'
import { ColoredHeadline } from '../components/Content'
-/*
-const Stats = styled(Flex)`
- flex-wrap: wrap;
- align-items: center;
- justify-content: center;
-`
-*/
-
const BackgroundGradient = styled(Box)`
position: relative;
overflow: hidden;
| 7 |
diff --git a/src/menelaus_stats.erl b/src/menelaus_stats.erl @@ -1507,7 +1507,7 @@ do_couchbase_index_stats_descriptions(BucketId, IndexNodes) ->
{title, <<"data size">>},
{name, per_index_stat(Id, <<"data_size">>)},
{desc, <<"Actual data size consumed by the index">>}]},
- {struct, [{title, <<"total items remaining">>},
+ {struct, [{title, <<"total mutations remaining">>},
{name, per_index_stat(Id, <<"num_docs_pending+queued">>)},
{desc, <<"Number of documents pending to be indexed">>}]},
{struct, [{title, <<"drain rate items/sec">>},
| 10 |
diff --git a/assets/js/modules/pagespeed-insights/components/common/ReportDetailsLink.js b/assets/js/modules/pagespeed-insights/components/common/ReportDetailsLink.js @@ -46,7 +46,6 @@ export default function ReportDetailsLink() {
),
{
a: <Link
- key="link"
href={ pagespeedInsightsURL }
external
/>,
| 2 |
diff --git a/js/gdax.js b/js/gdax.js @@ -397,14 +397,14 @@ module.exports = class gdax extends Exchange {
// deposit from a payment_method, like a bank account
if ('payment_method_id' in params){
- response = await this.privatePostDepositPaymentMethod (this.extend ({
+ response = await this.privatePostDepositsPaymentMethod (this.extend ({
'currency': currency,
'amount': amount,
}, params));
// deposit into GDAX account from a Coinbase account
} else if ('coinbase_account_id' in params){
- response = await this.privatePostDepositCoinbaseAccount (this.extend ({
+ response = await this.privatePostDepositsCoinbaseAccount (this.extend ({
'currency': currency,
'amount': amount,
}, params));
| 4 |
diff --git a/services/backend-api/client/src/mocks/handlers.ts b/services/backend-api/client/src/mocks/handlers.ts @@ -172,10 +172,27 @@ const handlers = [
}),
)),
- rest.delete('/api/v1/user-feeds/:feedId', (req, res, ctx) => res(
+ rest.delete('/api/v1/user-feeds/:feedId', (req, res, ctx) => {
+ const { feedId } = req.params;
+
+ const index = mockUserFeeds.findIndex((feed) => feed.id === feedId);
+
+ if (index === -1) {
+ return res(
+ ctx.status(404),
+ ctx.json(generateMockApiErrorResponse({
+ code: 'FEED_NOT_FOUND',
+ })),
+ );
+ }
+
+ mockUserFeeds.splice(index, 1);
+
+ return res(
ctx.delay(500),
ctx.status(204),
- )),
+ );
+ }),
rest.patch('/api/v1/user-feeds/:feedId', (req, res, ctx) => res(
ctx.delay(500),
| 9 |
diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -26,7 +26,18 @@ module.exports = (resolve, rootDir, isEjecting) => {
setupFiles: [resolve('config/polyfills.js')],
setupTestFrameworkScriptFile: setupTestsFile,
testPathIgnorePatterns: [
- '<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]',
+ // Ignore the following directories:
+ // build
+ // - the build output directory
+ // .cache
+ // - the yarn module cache on Ubuntu if $HOME === rootDir
+ // docs
+ // - often used to publish to Github Pages
+ // node_modules
+ // - ignore tests in dependencies
+ // scripts
+ // - directory generated upon eject
+ '<rootDir>[/\\\\](build|\\.cache|docs|node_modules|scripts)[/\\\\]',
],
testEnvironment: 'node',
testURL: 'http://localhost',
| 8 |
diff --git a/js/cloud/bisweb_awsmodule.js b/js/cloud/bisweb_awsmodule.js @@ -840,11 +840,24 @@ class AWSModule extends BaseServerClient {
//create edit modal and update UI with the changed values
tableRow.find('.btn').on('click', () => {
- this.createAWSEditModal(selectedItemId, selectedItemInfo.bucketName, selectedItemInfo.identityPoolId)
+ //fetch new data from app cache and open edit modal
+ this.awsbucketstorage.getItem(selectedItemId).then( (val) => {
+
+ let parsedVal;
+ try {
+ parsedVal = JSON.parse(val)
+ } catch(e) {
+ console.log('could not parsed val', val);
+ }
+
+ this.createAWSEditModal(selectedItemId, parsedVal)
.then( (params) => {
console.log('params', params);
tableContainer.find('table .bucket-name')[0].innerHTML = params.bucketName;
tableContainer.find('table .identity-pool-id')[0].innerHTML = params.identityPoolId;
+ tableContainer.find('table .user-pool-id')[0].innerHTML = params.userPoolId;
+ tableContainer.find('table .client-id')[0].innerHTML = params.appClientId;
+ tableContainer.find('table .web-domain')[0].innerHTML = params.appWebDomain;
refreshDropdown().then( (dropdown) => {
console.log('refresh dropdown', dropdown, 'bucket name', params.bucketName);
@@ -859,6 +872,7 @@ class AWSModule extends BaseServerClient {
}
});
});
+ });
tableHead.find('#aws-selector-table-body').append(tableRow);
tableContainer.append(tableHead);
@@ -939,11 +953,12 @@ class AWSModule extends BaseServerClient {
let confirmButton = bis_webutil.createbutton({ 'name' : 'Confirm', 'type' : 'success' });
let cancelButton = bis_webutil.createbutton({ 'name' : 'Cancel', 'type' : 'danger' });
+ console.log('old params', oldParams);
editContainer.find('.edit-bucket-input').val(oldParams.bucketName);
editContainer.find('.edit-identity-pool-input').val(oldParams.identityPoolId);
editContainer.find('.edit-user-pool-input').val(oldParams.userPoolId);
- editContainer.find('.edit-client-input').val(oldParams.clientId);
- editContainer.find('.edit-web-domain-input').val(oldParams.webDomain);
+ editContainer.find('.edit-client-input').val(oldParams.appClientId);
+ editContainer.find('.edit-web-domain-input').val(oldParams.appWebDomain);
let buttonGroup = editContainer.find('.btn-group');
| 1 |
diff --git a/packages/core/src/models/devided-page-path.js b/packages/core/src/models/devided-page-path.js @@ -2,8 +2,9 @@ import * as pathUtils from '../utils/path-utils';
// https://regex101.com/r/BahpKX/2
const PATTERN_INCLUDE_DATE = /^(.+\/[^/]+)\/(\d{4}|\d{4}\/\d{2}|\d{4}\/\d{2}\/\d{2})$/;
-// https://regex101.com/r/HJNvMW/1
-const PATTERN_DEFAULT = /^((.*)(?<!<)\/)?(.+)$/;
+
+// (?<!filename)\.js$
+// ^(?:(?!filename\.js$).)*\.js$
export class DevidedPagePath {
@@ -34,6 +35,14 @@ export class DevidedPagePath {
}
}
+ let PATTERN_DEFAULT = /^((.*)\/)?(.+)$/;
+ try { // for non-chrome browsers
+ PATTERN_DEFAULT = /^((.*)(?<!<)\/)?(.+)$/; // https://regex101.com/r/HJNvMW/1
+ }
+ catch (err) {
+ // lookbehind regex is not supported on non-chrome browsers
+ }
+
const matchDefault = pagePath.match(PATTERN_DEFAULT);
if (matchDefault != null) {
this.isFormerRoot = matchDefault[1] === '/';
| 7 |
diff --git a/source/views/containers/PanZoomView.js b/source/views/containers/PanZoomView.js @@ -49,11 +49,9 @@ const PanZoomView = Class({
const layer = this.get('layer');
if (this.get('isInDocument')) {
layer.addEventListener('load', this, true);
- layer.addEventListener('webkitTransitionEnd', this, true);
layer.addEventListener('transitionend', this, true);
} else {
layer.removeEventListener('load', this, true);
- layer.removeEventListener('webkitTransitionEnd', this, true);
layer.removeEventListener('transitionend', this, true);
}
}.observes('isInDocument'),
@@ -89,7 +87,7 @@ const PanZoomView = Class({
}
.nextLoop()
.nextFrame()
- .on('load', 'webkitTransitionEnd', 'transitionend'),
+ .on('load', 'transitionend'),
positioning: 'relative',
| 2 |
diff --git a/server/handlers/awsJobs.js b/server/handlers/awsJobs.js @@ -264,19 +264,10 @@ let handlers = {
return
}
- //Pair the job data with the scitran user info
- scitran.getUser(job.userId, (err, response) => {
- if (err) next(err)
-
- job.userMetadata = {}
- if (response.statusCode == 200) {
- job.userMetadata = response.body
- }
//Send back job object to client
// server side polling handles all interactions with Batch now therefore we are not initiating batch polling from client
res.send(job)
})
- })
},
cancelJob(req, res, next) {
| 13 |
diff --git a/test/test.js b/test/test.js @@ -109,12 +109,14 @@ describe('ELASTICDUMP', () => {
}
}
+ const isNew = /[6-9]\.\d+\..+/.test(process.env.ES_VERSION)
+
const templateSettings = {
- index_patterns: [
+ [isNew ? 'index_patterns' : 'template']: isNew ? [
'source_index',
'another_index',
'destination_index'
- ],
+ ] : '*_index',
settings: {
number_of_shards: 1,
number_of_replicas: 0
| 9 |
diff --git a/src/plots/layout_attributes.js b/src/plots/layout_attributes.js @@ -269,7 +269,7 @@ module.exports = {
role: 'style',
dflt: colorAttrs.background,
editType: 'plot',
- description: 'Sets the color of paper where the graph is drawn.'
+ description: 'Sets the background color of the paper where the graph is drawn.'
},
plot_bgcolor: {
// defined here, but set in cartesian.supplyLayoutDefaults
@@ -279,7 +279,7 @@ module.exports = {
dflt: colorAttrs.background,
editType: 'layoutstyle',
description: [
- 'Sets the color of plotting area in-between x and y axes.'
+ 'Sets the background color of the plotting area in-between x and y axes.'
].join(' ')
},
separators: {
| 0 |
diff --git a/token-metadata/0xDea67845A51E24461D5fED8084E69B426AF3D5Db/metadata.json b/token-metadata/0xDea67845A51E24461D5fED8084E69B426AF3D5Db/metadata.json "symbol": "HTRE",
"address": "0xDea67845A51E24461D5fED8084E69B426AF3D5Db",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/dashboard/FeedActions.js b/src/components/dashboard/FeedActions.js import React from 'react'
import { StyleSheet } from 'react-native'
import { Alert, TouchableHighlight, Text, View } from 'react-native-web'
+import { utils } from 'web3'
import type { FeedEventProps } from './FeedItems/EventProps'
-const transactionEvents = ['claim', 'receive', 'withdraw']
-
/**
* Returns swipeable actions for items inside Feed list
*
@@ -14,7 +13,7 @@ const transactionEvents = ['claim', 'receive', 'withdraw']
*/
export default ({ item }: FeedEventProps) => (
<View style={styles.actionsContainer}>
- {item && transactionEvents.indexOf(item.type) === -1 && (
+ {item && !utils.isHexStrict(item.id) && (
<TouchableHighlight
style={[styles.actionButton, styles.actionButtonDestructive]}
onPress={() => {
| 3 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "5.7.2">
+<!ENTITY version-java-client "5.7.3">
<!ENTITY version-dotnet-client "5.1.0">
<!ENTITY version-server "3.7.17">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/packages/@uppy/webcam/types/index.d.ts b/packages/@uppy/webcam/types/index.d.ts @@ -18,6 +18,7 @@ export interface WebcamOptions extends PluginOptions {
locale?: WebcamLocale
title?: string
videoConstraints?: MediaTrackConstraints
+ showRecordingLength?: boolean
}
declare class Webcam extends UIPlugin<WebcamOptions> {}
| 0 |
diff --git a/world.js b/world.js @@ -884,7 +884,7 @@ world.addEventListener('trackedobjectadd', async e => {
const token = await res.json();
const file = await (async () => {
- if (typeof contentId === 'number' || /^\d+$/.test(contentId)) {
+ if (typeof contentId === 'number') {
const {hash, filename} = token.properties;
/* const contractSource = await getContractSource('getNft.cdc');
| 2 |
diff --git a/lime/system/ThreadPool.hx b/lime/system/ThreadPool.hx @@ -30,6 +30,7 @@ class ThreadPool {
public var onProgress = new Event<Dynamic->Void> ();
#if (cpp || neko)
+ private var __synchronous:Bool;
private var __workCompleted:Int;
private var __workIncoming = new Deque<ThreadPoolMessage> ();
private var __workQueued:Int;
@@ -70,6 +71,8 @@ class ThreadPool {
#if (cpp || neko)
+ if (Application.current != null && !__synchronous) {
+
__workIncoming.add (new ThreadPoolMessage (WORK, state));
__workQueued++;
@@ -86,6 +89,13 @@ class ThreadPool {
}
+ } else {
+
+ __synchronous = true;
+ doWork.dispatch (state);
+
+ }
+
#else
doWork.dispatch (state);
@@ -98,33 +108,48 @@ class ThreadPool {
public function sendComplete (state:Dynamic = null):Void {
#if (cpp || neko)
+ if (!__synchronous) {
+
__workResult.add (new ThreadPoolMessage (COMPLETE, state));
- #else
- onComplete.dispatch (state);
+ return;
+
+ }
#end
+ onComplete.dispatch (state);
+
}
public function sendError (state:Dynamic = null):Void {
#if (cpp || neko)
+ if (!__synchronous) {
+
__workResult.add (new ThreadPoolMessage (ERROR, state));
- #else
- onError.dispatch (state);
+ return;
+
+ }
#end
+ onError.dispatch (state);
+
}
public function sendProgress (state:Dynamic = null):Void {
#if (cpp || neko)
+ if (!__synchronous) {
+
__workResult.add (new ThreadPoolMessage (PROGRESS, state));
- #else
- onProgress.dispatch (state);
+ return;
+
+ }
#end
+ onProgress.dispatch (state);
+
}
| 7 |
diff --git a/lib/ui/components/common/Tabs.js b/lib/ui/components/common/Tabs.js @@ -18,6 +18,11 @@ const Tab = styled.div`
cursor: ${(props) => props.isSelected ? 'default' : 'pointer'};
border: ${(props) => props.isSelected ? '1px solid #f0f0f0' : 'none'};
border-bottom: ${(props) => props.isSelected ? '1px solid white' : 'none'};
+
+ &:first-child {
+ border-top-left-radius: 0;
+ border-left: none;
+ }
`;
const Tabs = (props) => (
| 7 |
diff --git a/token-metadata/0x5Ca381bBfb58f0092df149bD3D243b08B9a8386e/metadata.json b/token-metadata/0x5Ca381bBfb58f0092df149bD3D243b08B9a8386e/metadata.json "symbol": "MXC",
"address": "0x5Ca381bBfb58f0092df149bD3D243b08B9a8386e",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js @@ -117,7 +117,7 @@ export function getDefaultResolvers(options) {
if (!doc) {
if (allowNull) {
- return null;
+ return { result: null };
} else {
const MissingDocumentError = createError('app.missing_document', { message: 'app.missing_document' });
throw new MissingDocumentError({ data: { documentId, slug } });
| 1 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -1143,7 +1143,10 @@ const keyTab5El = document.getElementById('key-tab-5');
e.preventDefault();
e.stopPropagation();
- if (editedObject) {
+ if (appManager.grabbedObjects[0]) {
+ appManager.grabbedObjects[0] = null;
+ _updateMenu();
+ } else if (editedObject) {
editedObject = null;
_updateMenu();
} else {
@@ -1168,8 +1171,9 @@ const _updateMenu = () => {
menu2El.classList.toggle('open', menuOpen === 2);
menu3El.classList.toggle('open', menuOpen === 3);
menu4El.classList.toggle('open', menuOpen === 4);
- unmenuEl.classList.toggle('closed', menuOpen !== 0 || !!highlightedObject || !!editedObject || !!highlightedWorld);
- objectMenuEl.classList.toggle('open', !!highlightedObject && !editedObject && !highlightedWorld && menuOpen !== 4);
+ unmenuEl.classList.toggle('closed', menuOpen !== 0 || !!appManager.grabbedObjects[0] || !!highlightedObject || !!editedObject || !!highlightedWorld);
+ objectMenuEl.classList.toggle('open', !!highlightedObject && !!appManager.grabbedObjects[0] && !editedObject && !highlightedWorld && menuOpen !== 4);
+ grabMenuEl.classList.toggle('open', !!appManager.grabbedObjects[0]);
editMenuEl.classList.toggle('open', !!editedObject);
worldMenuEl.classList.toggle('open', !!highlightedWorld && !editedObject && menuOpen === 0);
locationIcon.classList.toggle('open', false);
@@ -1291,6 +1295,7 @@ const menu3El = document.getElementById('menu-3');
const menu4El = document.getElementById('menu-4');
const unmenuEl = document.getElementById('unmenu');
const objectMenuEl = document.getElementById('object-menu');
+const grabMenuEl = document.getElementById('grab-menu');
const editMenuEl = document.getElementById('edit-menu');
const worldMenuEl = document.getElementById('world-menu');
const locationLabel = document.getElementById('location-label');
| 0 |
diff --git a/docs/readme.md b/docs/readme.md - [Pagination](api/graphql/pagination.md)
- [Testing](api/graphql/testing.md)
- [Tips & Tricks](api/graphql/tips-and-tricks.md)
-- [Hyperion (server side rendering)](hyperion/intro.md)
- - [Development](hyperion/development.md)
+- [Hyperion (server side rendering)](hyperion%20(server%20side%20rendering)/intro.md)
+ - [Development](hyperion%20(server%20side%20rendering)/development.md)
- [Operations](operations/intro.md)
- [Deleting users](operations/deleting-users.md)
- [Importing RethinkDB backups](operations/importing-rethinkdb-backups.md)
| 1 |
diff --git a/lib/router/bind.js b/lib/router/bind.js @@ -145,8 +145,8 @@ function bindAction(path, target, verb, options) {
return;
}
- // Add "action" property to the route options.
- _.extend(options || {}, {action: actionIdentity});
+ // Add "action" property to the route options, and set the _middlewareType property if the function doesn't already have one.
+ _.extend(options || {}, {action: actionIdentity, _middlewareType: (sails._actions[actionIdentity] && sails._actions[actionIdentity]._middlewareType || 'ACTION: ' + actionIdentity)});
// Loop through all of the registered action middleware, and find
// any that should apply to the action with the given identity.
| 12 |
diff --git a/source/tab/Popup.js b/source/tab/Popup.js @@ -260,6 +260,7 @@ class Popup extends EventEmitter {
fontFamily: "Buttercup-OpenSans",
height: `${LIST_ITEM_HEIGHT}px`,
lineHeight: `${LIST_ITEM_HEIGHT}px`,
+ margin: "0",
paddingLeft: "30px",
backgroundImage: `url(${ICON_KEY})`,
backgroundSize: "20px",
| 2 |
diff --git a/2-js-basics/3-making-decisions/README.md b/2-js-basics/3-making-decisions/README.md @@ -28,9 +28,9 @@ Operators are used to evaluate conditions by making comparisons that will create
| Symbol | Description | Example |
| ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `<` | **Greater than**: Compares two values and returns the `true` Boolean data type if the value on the right side is larger than the left | `5 < 6 // true` |
-| `<=` | **Greater than or equal to**: Compares two values and returns the `true` Boolean data type if the value on the right side is larger than or equal to the left | `5 <= 6 // true` |
-| `>` | **Less than**: Compares two values and returns the `true` Boolean data type if the value on the left side is larger than the right | `5 > 6 // false` |
+| `<` | **Less than**: Compares two values and returns the `true` Boolean data type if the value on the left side is larger than the right | `5 < 6 // true` |
+| `<=` | **Less than or equal to**: Compares two values and returns the `true` Boolean data type if the value on the left side is larger than or equal to the right | `5 <= 6 // true` |
+| `>` | **Greater than**: Compares two values and returns the `true` Boolean data type if the value on the left side is larger than the right | `5 > 6 // false` |
| `>=` | **Less than or equal to**: Compares two values and returns the `true` Boolean data type if the value on the left side is larger than or equal to the right | `5 >= 6 // false` |
| `===` | **Strict equality**: Compares two values and returns the `true` Boolean data type if values on the right and left are equal AND are the same data type. | `5 === 6 // false` |
| `!==` | **Inequality**: Compares two values and returns the opposite Boolean value of what a strict equality operator would return | `5 !== 6 // true` |
| 3 |
diff --git a/modules/exstats.js b/modules/exstats.js @@ -110,7 +110,7 @@ Bangle.on("GPS", function(fix) {
if (stats["dist"]) stats["dist"].emit("changed",stats["dist"]);
var duration = Date.now() - state.startTime; // in ms
state.avrSpeed = state.distance * 1000 / duration; // meters/sec
- state.curSpeed = state.curSpeed*0.8 + fix.speed*0.2*3.6; // meters/sec
+ state.curSpeed = state.curSpeed*0.8 + fix.speed*0.2/3.6; // meters/sec
if (stats["pacea"]) stats["pacea"].emit("changed",stats["pacea"]);
if (stats["pacec"]) stats["pacec"].emit("changed",stats["pacec"]);
if (stats["speed"]) stats["speed"].emit("changed",stats["speed"]);
@@ -202,8 +202,8 @@ exports.getStats = function(statIDs, options) {
needGPS = true;
stats["speed"]={
title : "Speed",
- getValue : function() { return state.curSpeed/3.6; }, // in kph
- getString : function() { return require("locale").speed(state.curSpeed/3.6); },
+ getValue : function() { return state.curSpeed*3.6; }, // in kph
+ getString : function() { return require("locale").speed(state.curSpeed*3.6); },
};
}
if (statIDs.includes("caden")) {
| 1 |
diff --git a/controllers/ChoresController.php b/controllers/ChoresController.php @@ -49,7 +49,7 @@ class ChoresController extends BaseController
public function ChoreEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
{
- if ($args['choredId'] == 'new')
+ if ($args['choreId'] == 'new')
{
return $this->AppContainer->view->render($response, 'choreform', [
'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
| 1 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -2414,11 +2414,16 @@ RED.view = (function() {
// This is not a virtualLink - which means it started
// on a regular node port. Need to ensure the this isn't
// connecting to a link node virual port.
+ //
+ // PORT_TYPE_OUTPUT=0
+ // PORT_TYPE_INPUT=1
if (!(
(d.type === "link out" && portType === PORT_TYPE_OUTPUT) ||
(d.type === "link in" && portType === PORT_TYPE_INPUT) ||
- (portType === PORT_TYPE_OUTPUT && mouseup_node.outputs === 0) ||
- (portType === PORT_TYPE_INPUT && mouseup_node.inputs === 0)
+ (portType === PORT_TYPE_OUTPUT && mouseup_node.type !== "subflow" && mouseup_node.outputs === 0) ||
+ (portType === PORT_TYPE_INPUT && mouseup_node.type !== "subflow" && mouseup_node.inputs === 0) ||
+ (drag_line.portType === PORT_TYPE_INPUT && mouseup_node.type === "subflow" && (mouseup_node.direction === "status" || mouseup_node.direction === "out")) ||
+ (drag_line.portType === PORT_TYPE_OUTPUT && mouseup_node.type === "subflow" && mouseup_node.direction === "in")
)) {
var existingLink = RED.nodes.filterLinks({source:src,target:dst,sourcePort: src_port}).length !== 0;
if (!existingLink) {
| 1 |
diff --git a/src/components/stencil.config.js b/src/components/stencil.config.js @@ -2,7 +2,7 @@ const path = require('path');
const sass = require('@stencil/sass');
exports.config = {
- namespace: 'mycomponent',
+ namespace: 'airship',
outputTargets:[
{
type: 'dist'
| 10 |
diff --git a/src/core/lib/Base64.mjs b/src/core/lib/Base64.mjs @@ -95,6 +95,7 @@ export function fromBase64(data, alphabet="A-Za-z0-9+/=", returnType="string", r
const output = [];
let chr1, chr2, chr3,
+ encChr1, encChr2, encChr3, encChr4,
enc1, enc2, enc3, enc4,
i = 0;
@@ -103,15 +104,39 @@ export function fromBase64(data, alphabet="A-Za-z0-9+/=", returnType="string", r
data = data.replace(re, "");
}
- while (i < data.length) {
- enc1 = alphabet.indexOf(data.charAt(i++));
- enc2 = alphabet.indexOf(data.charAt(i++) || "=");
- enc3 = alphabet.indexOf(data.charAt(i++) || "=");
- enc4 = alphabet.indexOf(data.charAt(i++) || "=");
+ if (data.length % 4 === 1) {
+ throw new OperationError(`Invalid Base64 input length (${data.length}): it won't be 4n+1`);
+ }
- enc2 = enc2 === -1 ? 64 : enc2;
- enc3 = enc3 === -1 ? 64 : enc3;
- enc4 = enc4 === -1 ? 64 : enc4;
+ if (alphabet.length === 65) {
+ const pad = alphabet.charAt(64);
+ const padPos = data.indexOf(pad);
+ if (padPos >= 0) {
+ // padding character should appear only at the end of the input
+ // there should be only one or two padding character(s) if it exists
+ if (padPos < data.length - 2 || data.charAt(data.length - 1) !== pad) {
+ throw new OperationError("Invalid Base64 input: padding character misused");
+ }
+ if (data.length % 4 !== 0) {
+ throw new OperationError("Invalid Base64 input: padded not to multiple of 4");
+ }
+ }
+ }
+
+ while (i < data.length) {
+ encChr1 = data.charAt(i++);
+ encChr2 = data.charAt(i++);
+ encChr3 = data.charAt(i++);
+ encChr4 = data.charAt(i++);
+
+ enc1 = alphabet.indexOf(encChr1);
+ enc2 = alphabet.indexOf(encChr2);
+ enc3 = alphabet.indexOf(encChr3);
+ enc4 = alphabet.indexOf(encChr4);
+
+ if (enc1 < 0 || enc2 < 0 || enc3 < 0 || enc4 < 0) {
+ throw new OperationError("Invalid Base64 input: contains non-alphabet char(s)");
+ }
chr1 = (enc1 << 2) | (enc2 >> 4);
chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
@@ -119,10 +144,10 @@ export function fromBase64(data, alphabet="A-Za-z0-9+/=", returnType="string", r
output.push(chr1);
- if (enc3 !== 64) {
+ if (encChr3 !== "" && enc3 !== 64) {
output.push(chr2);
}
- if (enc4 !== 64) {
+ if (encChr4 !== "" && enc4 !== 64) {
output.push(chr3);
}
}
| 0 |
diff --git a/src/components/nodes/dataOutputAssociation/dataOutputAssociation.vue b/src/components/nodes/dataOutputAssociation/dataOutputAssociation.vue @@ -21,6 +21,7 @@ import linkConfig from '@/mixins/linkConfig';
import get from 'lodash/get';
import associationHead from '!!url-loader!@/assets/association-head.svg';
import CrownConfig from '@/components/crown/crownConfig/crownConfig';
+import {pull} from 'lodash';
export default {
components: {
@@ -106,5 +107,8 @@ export default {
this.shape.addTo(this.graph);
this.shape.component = this;
},
+ destroyed() {
+ pull(this.sourceNode.definition.get('dataOutputAssociations'), this.node.definition);
+ },
};
</script>
| 2 |
diff --git a/app/modules/handler/containers/Stage.js b/app/modules/handler/containers/Stage.js @@ -32,6 +32,7 @@ import PromptActionUnlock from '../components/Actions/Unlock';
import URIActions from '../actions/uri';
import WhitelistActions from '../actions/whitelist';
+import GlobalTransactionMessageError from '../../../shared/components/Global/Transaction/Message/Error';
import * as HardwareLedgerActions from '../../../shared/actions/hardware/ledger';
import { setSetting } from '../../../shared/actions/settings';
import { unlockWalletByAuth } from '../../../shared/actions/wallet';
@@ -425,51 +426,9 @@ class PromptStage extends Component<Props> {
</Dimmer>
{(error && error.type !== 'forbidden')
? (
- <Segment color="red" inverted style={{ margin: 0 }}>
- {(error.message)
- ? (
- <React.Fragment>
- <Header size="huge">
- <Icon name="warning sign" />
- <Header.Content>
- {error.message}
- <Header.Subheader
- style={{ color: 'white' }}
- >
- There was a problem with this transaction, but it still may have succeeded. Check your account history to determine if it was successful before trying again.
- </Header.Subheader>
- </Header.Content>
- </Header>
- {(error.stack)
- ? (
- <Segment>
- {error.stack}
- </Segment>
-
- )
- : false
- }
- {(error.json && isObject(error.json))
- ? (
- <Segment>
- <ReactJson
- collapsed={4}
- displayDataTypes={false}
- displayObjectSize={false}
- iconStyle="square"
- name={null}
- src={error.json}
- style={{ padding: '1em' }}
+ <GlobalTransactionMessageError
+ error={error}
/>
- </Segment>
- )
- : false
- }
- </React.Fragment>
- )
- : false
- }
- </Segment>
)
: stage
}
| 4 |
diff --git a/ui/watch.sh b/ui/watch.sh @@ -18,8 +18,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
fi
# run sass once without --watch to force update. then run with --watch to keep watching
- node_modules/.bin/node-sass --sourcemap=none $DIR/scss/all.scss $DIR/../app/dist/themes/light.css
- node_modules/.bin/node-sass --sourcemap=none --watch $DIR/scss/all.scss $DIR/../app/dist/themes/light.css &
+ node_modules/.bin/node-sass --output $DIR/../app/dist/css --sourcemap=none $DIR/scss/
+ node_modules/.bin/node-sass --output $DIR/../app/dist/css --sourcemap=none --watch $DIR/scss/ &
node_modules/.bin/webpack --config webpack.dev.config.js --progress --colors --watch
)
| 13 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -23,8 +23,9 @@ import postProcessing from './post-processing.js';
import {getRandomString, memoize} from './util.js';
import * as mathUtils from './math-utils.js';
import JSON6 from 'json-6';
-import * as materials from './materials.js';
import * as geometries from './geometries.js';
+import * as materials from './materials.js';
+import * as meshes from './meshes.js';
import meshLodManager from './mesh-lodder.js';
import * as avatarCruncher from './avatar-cruncher.js';
import * as avatarSpriter from './avatar-spriter.js';
@@ -1185,6 +1186,9 @@ export default () => {
useMaterials() {
return materials;
},
+ useMeshes() {
+ return meshes;
+ },
useJSON6Internal() {
return JSON6;
},
| 0 |
diff --git a/html/settings/_settings.scss b/html/settings/_settings.scss /// Setting for the background
/// color of any text when selected.
-$sprk-selection-bg-color: $sprk-purple-light !default;
+$sprk-selection-bg-color: $sprk-purple-lightest !default;
/// Setting for the
/// color of any text when selected.
$sprk-selection-text-color: $sprk-black !default;
| 4 |
diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css @@ -720,7 +720,11 @@ div.message-container > div:first-child {
transform: scale(1.1);
}
-//Notification Modal
+.app-bar {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+}
.notification-modal-wrapper {
display: flex;
| 5 |
diff --git a/aws/step/step.go b/aws/step/step.go @@ -1030,7 +1030,7 @@ func (sm *StateMachine) MarshalJSON() ([]byte, error) {
Comment: sm.comment,
StartAt: sm.startAt.Name(),
States: sm.uniqueStates,
- End: (len(sm.uniqueStates) == 1) && !sm.disableEndState,
+ //End: (len(sm.uniqueStates) != 1) && !sm.disableEndState,
})
}
| 2 |
diff --git a/.gitignore b/.gitignore @@ -15,11 +15,11 @@ lib
**/__tests__/_output*
# docs
-*/docs/**/*.mov
-*/docs/**/*.pxm
-*/docs/node_modules
-*/docs/dist
-*/docs/content/assets/showcases/*
+**/docs/**/*.mov
+**/docs/**/*.pxm
+**/docs/node_modules
+**/docs/dist
+**/docs/content/assets/showcases/*
# phenomic-theme-base files to work on it
themes/phenomic-theme-base/dist
| 8 |
diff --git a/magda-minion-broken-link/src/index.ts b/magda-minion-broken-link/src/index.ts @@ -5,6 +5,8 @@ import commonYargs from "@magda/minion-framework/dist/commonYargs";
const ID = "minion-broken-link";
+const coerceJson = (path?: string) => path && require(path);
+
const argv = commonYargs(ID, 6111, "http://localhost:6111", argv =>
argv
.option("externalRetries", {
@@ -17,7 +19,8 @@ const argv = commonYargs(ID, 6111, "http://localhost:6111", argv =>
describe:
"A object that defines wait time for each of domain. " +
"Echo property name of the object would be the domain name and property value is the wait time in seconds",
- type: "object",
+ type: "string",
+ coerce: coerceJson,
default: {}
})
);
| 11 |
diff --git a/test/server/cards/cancreatecards.spec.js b/test/server/cards/cancreatecards.spec.js @@ -87,7 +87,6 @@ describe('All Cards:', function() {
this.actionSpy = spyOn(this.card, 'action');
this.card.setupCardAbilities(AbilityDsl);
this.calls = _.flatten(this.actionSpy.calls.allArgs());
- console.log(this.calls)
});
it('should have a title which is a string', function() {
@@ -107,7 +106,11 @@ describe('All Cards:', function() {
});
it('should have a legal location as its location', function() {
- expect(_.all(this.calls, args => _.isUndefined(args.location) || _.every(args.location, location => ['province 1', 'province 2', 'province 3', 'province 4', 'dynasty discard pile', 'conflict discard pile', 'hand'].includes(location)))).toBe(true);
+ expect(_.all(this.calls, args => (
+ _.isUndefined(args.location) ||
+ ['province 1', 'province 2', 'province 3', 'province 4', 'dynasty discard pile', 'conflict discard pile', 'hand'].includes(args.location) ||
+ _.every(args.location, location => ['province 1', 'province 2', 'province 3', 'province 4', 'dynasty discard pile', 'conflict discard pile', 'hand'].includes(location))
+ ))).toBe(true);
});
it('should not have a when property', function() {
@@ -159,7 +162,11 @@ describe('All Cards:', function() {
});
it('should have a legal location as its location', function() {
- expect(_.all(this.calls, args => _.isUndefined(args.location) || _.every(args.location, location => ['province 1', 'province 2', 'province 3', 'province 4', 'dynasty discard pile', 'conflict discard pile', 'hand'].includes(location)))).toBe(true);
+ expect(_.all(this.calls, args => (
+ _.isUndefined(args.location) ||
+ ['province 1', 'province 2', 'province 3', 'province 4', 'dynasty discard pile', 'conflict discard pile', 'hand'].includes(args.location) ||
+ _.every(args.location, location => ['province 1', 'province 2', 'province 3', 'province 4', 'dynasty discard pile', 'conflict discard pile', 'hand'].includes(location))
+ ))).toBe(true);
});
});
});
| 11 |
diff --git a/README.md b/README.md @@ -521,28 +521,11 @@ axios.get('/user/12345', {
}
});
-// cancel the request (the message parameter is optional)
-source.cancel('Operation canceled by the user.');
-```
-
-```js
-var CancelToken = axios.CancelToken;
-var source = CancelToken.source();
-
-axios(
- method: 'POST',
- url: '/user/12345',
- data: {
+axios.post('/user/12345', {
name: 'new name'
- },
+}, {
cancelToken: source.token
-}).catch(function(thrown) {
- if (axios.isCancel(thrown)) {
- console.log('Request canceled', thrown.message);
- } else {
- // handle error
- }
-});
+})
// cancel the request (the message parameter is optional)
source.cancel('Operation canceled by the user.');
| 3 |
diff --git a/src/client/modules/post/graphql/PostsSubscription.graphql b/src/client/modules/post/graphql/PostsSubscription.graphql #import "./Post.graphql"
-subscription onPostUpdated($endCursor: Int!) {
+subscription onPostsUpdated($endCursor: Int!) {
postsUpdated(endCursor: $endCursor) {
mutation
node {
| 10 |
diff --git a/site/rabbit.ent b/site/rabbit.ent @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!ENTITY version-java-client "5.4.1">
+<!ENTITY version-java-client "5.4.2">
<!ENTITY version-dotnet-client "5.1.0">
<!ENTITY version-server "3.7.8">
<!ENTITY version-server-series "v3.7.x">
| 12 |
diff --git a/userscript.user.js b/userscript.user.js @@ -2971,6 +2971,19 @@ var $$IMU_EXPORT$$;
// doesn't work for some urls:
// https://i.ytimg.com/vi/o-gVbQHG0Ck/hqdefault.jpg
// https://i.ytimg.com/vi/o-gVbQHG0Ck/sddefault.jpg -- different image
+
+ // Transforms private signed URLs into public ones. Only works for public videos.
+ // Signed URLs can't be changed, so this step is needed.
+ newsrc = src.replace(/^([a-z]+:\/\/)i[0-9]+(\.ytimg\.com\/vi\/+[^/]+\/+[a-z]+\.)/, "$1i$2");
+ if (newsrc !== src)
+ return {
+ url: newsrc,
+ problems: {
+ // FIXME: Is it?
+ possibly_different: true
+ }
+ };
+
regex = /(\/+vi\/+[^/]*\/+)(?:[a-z]+|0)(\.[^/.?#]*)(?:[?#].*)?$/;
return fillobj_urls([
src.replace(regex, "$1maxresdefault$2"),
@@ -13205,11 +13218,14 @@ var $$IMU_EXPORT$$;
"$1$2");
}
- if (domain_nowww === "maximkorea.net" &&
- src.indexOf("/magdb/file/") >= 0) {
+ if (domain_nowww === "maximkorea.net") {
// http://www.maximkorea.net/magdb/file/138/138_3289240590_img_400.jpg
// http://www.maximkorea.net/magdb/file/138/138_3289240590_img.jpg
- return src.replace(/_img_[0-9]+(\.[^/.]*)$/, "_img$1");
+ // thanks to rEnr3n on github:
+ // http://www.maximkorea.net/missmaxim/m2girl_view.php?m2girl_uid=151
+ // http://www.maximkorea.net/missmaxim/m2girl/20145/73_2014502_133127_img_300.jpg
+ // http://www.maximkorea.net/missmaxim/m2girl/20145/73_2014502_133127_img.jpg -- upscaled?
+ return src.replace(/(\/[0-9]+_[0-9]+(?:_[0-9]+)?_img)_[0-9]+(\.[^/.]*)$/, "$1$2");
}
if (domain === "blogimgc.eximg.jp") {
| 7 |
diff --git a/AjaxControlToolkit/ToolkitResourceManager.cs b/AjaxControlToolkit/ToolkitResourceManager.cs @@ -20,6 +20,18 @@ namespace AjaxControlToolkit {
_scriptsCache = new Dictionary<Type, List<ResourceEntry>>(),
_cssCache = new Dictionary<Type, List<ResourceEntry>>();
+ static readonly Type[] _controlTypesWithBackground = new Type[] {
+ typeof(BalloonPopupExtender),
+ typeof(CalendarExtender),
+ typeof(ComboBox),
+ typeof(DropDownExtender),
+ typeof(HtmlEditor.Editor),
+ typeof(HtmlEditorExtender),
+ typeof(MultiHandleSliderExtender),
+ typeof(SliderExtender),
+ typeof(TabContainer)
+ };
+
static ToolkitResourceManager() {
}
@@ -33,6 +45,11 @@ namespace AjaxControlToolkit {
}
// Scripts
+ public static ScriptReference GetBaseScriptReference() {
+ return new ScriptReference(
+ Constants.BaseScriptName + Constants.JsPostfix,
+ typeof(ToolkitResourceManager).Assembly.FullName);
+ }
public static string[] GetScriptPaths(params string[] toolkitBundles) {
return GetEmbeddedScripts(toolkitBundles)
@@ -163,9 +180,14 @@ namespace AjaxControlToolkit {
yield return entry;
}
+ if(controlTypes.Any(IsControlWithBackground))
yield return new ResourceEntry(Constants.BackgroundStylesName, typeof(ExtenderControlBase), 0);
}
+ static bool IsControlWithBackground(Type typeToCheck) {
+ return _controlTypesWithBackground.Any(t => t.IsAssignableFrom(typeToCheck));
+ }
+
static string FormatStyleVirtualPath(string name, bool minified) {
return Constants.StylesVirtualPath + name + (minified ? Constants.MinCssPostfix : Constants.CssPostfix);
}
| 7 |
diff --git a/renderer/components/onboard/__tests__/Sections.test.js b/renderer/components/onboard/__tests__/Sections.test.js @@ -118,8 +118,11 @@ describe('Tests for Screens 3 and Screen 4 of Sections component', () => {
const lottiePlayerSecond = screen.getByTestId("quiz-steps-animation");
await waitForElementToBeRemoved(lottiePlayerSecond, { timeout: 2000 });
- const warningTitle = await screen.findByText(English['Onboarding.Crash.Title'])
- expect(warningTitle).toBeInTheDocument()
+ const popQuizTitle = screen.queryByText(English['Onboarding.PopQuiz.Title'])
+ expect(popQuizTitle).not.toBeInTheDocument()
+
+ const crashInfoTitle = await screen.findByText(English['Onboarding.Crash.Title'])
+ expect(crashInfoTitle).toBeInTheDocument()
const yesButton = screen.getByText(English['Onboarding.Crash.Button.Yes'])
fireEvent.click(yesButton)
| 7 |
diff --git a/articles/integrations/aws-api-gateway-2/part-3.md b/articles/integrations/aws-api-gateway-2/part-3.md @@ -31,3 +31,11 @@ Under **Settings**, click the **pencil** icon to the right **Authorization** and
Click the **check mark** icon to save your choice of custom authorizer. Make sure the **API Key Required** field is set to `false`.
+
+## Deploy the API
+
+To make your changes public, you'll need to [deploy your API](/integrations/aws-api-gateway-2/part-1#deploy-the-api).
+
+If successful, you'll be redirected to the **Test Stage Editor**. Copy down the **Invoke URL** provided in the blue ribbon at the top, since you'll need this to test your deployment.
+
+
| 0 |
diff --git a/src/selectors/events.js b/src/selectors/events.js @@ -7,6 +7,10 @@ export const selectEvents = (state: State) =>
getEventsState(state).data.entries.filter(
entry => entry.sys.contentType.sys.id === "event"
);
+export const selectFeaturedEvents = (state: State) =>
+ getEventsState(state).data.entries.filter(
+ entry => entry.sys.contentType.sys.id === "featuredEvents"
+ );
export const selectEventsLoading = (state: State) =>
getEventsState(state).loading;
export const selectEventsRefreshing = (state: State) =>
| 0 |
diff --git a/Deal-Init/script.json b/Deal-Init/script.json {
-"name": "DealInit",
-"script":"Deal-Init.js",
-"version": "1.4",
-"previousversions": [ "1.3","1.2" ],
-"description": "Handles Savage Worlds card-based Inititive by dealing cards to Turn Order, automatically handling Jokers and Initiative Edges and sorting Turn Order by suit. To see options, type: !deal-init --help",
-"authors": "Pat Elwer",
-"roll20userid": "8948",
-"useroptions": [],
-"dependencies": [],
-"modifies": {
- "character.": "read",
- "token.*": "read",
- "turnorder.*": "read,write"
+name: "DealInit",
+script: "Deal-Init.js",
+version: "1.5",
+previousversions: [
+"1.4",
+"1.3",
+"1.2"
+],
+description: "Handles Savage Worlds card-based Inititive by dealing cards to Turn Order, automatically handling Jokers and Initiative Edges and sorting Turn Order by suit. To see options, type: !deal-init --help",
+authors: "Pat Elwer",
+roll20userid: "8948",
+useroptions: [ ],
+dependencies: [ ],
+modifies: {
+character.: "read",
+token.*: "read",
+turnorder.*: "read,write"
},
-"conflicts":[]
+conflicts: [ ]
}
| 3 |
diff --git a/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts b/magda-web-client/src/Components/Dataset/Add/DatasetAddCommon.ts @@ -528,7 +528,9 @@ export function createBlankState(user: User): State {
defaultLicense: "world"
},
datasetPublishing: {
- state: "draft",
+ state: config.featureFlags.datasetApprovalWorkflowOn
+ ? "draft"
+ : "published",
level: "agency",
contactPointDisplay: "team"
},
| 12 |
diff --git a/dapp/src/components/layout.js b/dapp/src/components/layout.js @@ -166,7 +166,7 @@ const Layout = ({
<div className="container d-flex flex-column flex-md-row align-items-center">
{showStakingBanner ? (
<>
- <div className="d-flex flex-column mt-0 justify-content-center">
+ <div className="d-flex flex-column mt-0 justify-content-center px-4 px-md-0 text-md-left">
<div className="title-text">
{fbt(
'Changes are coming to OGN staking.',
| 7 |
diff --git a/ui/component/viewers/videoViewer/view.jsx b/ui/component/viewers/videoViewer/view.jsx @@ -22,6 +22,7 @@ const SEEK_STEP = 10; // time to seek in seconds
const VIDEO_JS_OPTIONS: { poster?: string } = {
controls: true,
+ autoplay: true,
preload: 'auto',
playbackRates: [0.25, 0.5, 0.75, 1, 1.1, 1.25, 1.5, 2],
responsive: true,
@@ -113,12 +114,6 @@ function VideoViewer(props: Props) {
player = videojs(videoNode, videoJsOptions, function() {
player.volume(volume);
player.muted(muted);
- player.ready(() => {
- // In the future this should be replaced with something that checks if the
- // video is actually playing after calling play()
- // If it's not, fall back to the play button
- player.play();
- });
});
}
@@ -133,7 +128,6 @@ function VideoViewer(props: Props) {
// requireRedraw just makes it so the video component is removed from the page _by react_
// Then it's set to false immediately after so we can re-mount a new player
setRequireRedraw(true);
- player.pause();
};
}, [videoRef, source, contentType, setRequireRedraw, requireRedraw]);
| 13 |
diff --git a/source/sourcePane.js b/source/sourcePane.js @@ -146,7 +146,7 @@ const thisPane = {
var contentType, allowed, eTag
if (response.headers && response.headers.get('content-type')) {
contentType = response.headers.get('content-type') // Should work but headers may be empty
- allow = response.headers.get('allow')
+ allowed = response.headers.get('allow')
eTag = response.headers.get('etag')
}
| 11 |
diff --git a/test/unit/seed-phrase-verifier-test.js b/test/unit/seed-phrase-verifier-test.js @@ -13,20 +13,23 @@ describe('SeedPhraseVerifier', function () {
let hdKeyTree = 'HD Key Tree'
let keyringController
- beforeEach(function () {
+ let vault
+ let primaryKeyring
+
+ beforeEach(async function () {
keyringController = new KeyringController({
initState: clone(firstTimeState),
encryptor: mockEncryptor,
})
assert(keyringController)
+
+ vault = await keyringController.createNewVaultAndKeychain(password)
+ primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
})
it('should be able to verify created account with seed words', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
let createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1)
@@ -39,11 +42,9 @@ describe('SeedPhraseVerifier', function () {
it('should be able to verify created account (upper case) with seed words', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
let createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1)
+
let upperCaseAccounts = [createdAccounts[0].toUpperCase()]
let serialized = await primaryKeyring.serialize()
@@ -55,9 +56,6 @@ describe('SeedPhraseVerifier', function () {
it('should be able to verify created account (lower case) with seed words', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
let createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1)
let lowerCaseAccounts = [createdAccounts[0].toLowerCase()]
@@ -71,9 +69,6 @@ describe('SeedPhraseVerifier', function () {
it('should return error with good but different seed words', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
let createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1)
@@ -90,9 +85,6 @@ describe('SeedPhraseVerifier', function () {
it('should return error with undefined existing accounts', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
let createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1)
@@ -109,9 +101,6 @@ describe('SeedPhraseVerifier', function () {
it('should return error with empty accounts array', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
let createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1)
@@ -128,10 +117,6 @@ describe('SeedPhraseVerifier', function () {
it('should be able to verify more than one created account with seed words', async function () {
- let vault = await keyringController.createNewVaultAndKeychain(password)
-
- let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
-
const keyState = await keyringController.addNewAccount(primaryKeyring)
const keyState2 = await keyringController.addNewAccount(primaryKeyring)
| 5 |
diff --git a/articles/integrations/aws-api-gateway/custom-authorizers/part-4.md b/articles/integrations/aws-api-gateway/custom-authorizers/part-4.md @@ -48,10 +48,6 @@ You can test your deployment by making a `GET` call to the **Invoke URL** you co
{
"method": "GET",
"url": "https://YOUR_INVOKE_URL/pets",
- "headers": [{
- "name": "Authorization",
- "value": "Bearer TOKEN"
- }]
}
```
| 2 |
diff --git a/packages/insomnia-app/app/ui/containers/app.js b/packages/insomnia-app/app/ui/containers/app.js @@ -534,11 +534,11 @@ class App extends PureComponent {
const header = getContentDispositionHeader(headers);
const nameFromHeader = header ? header.value : null;
- if (!responsePatch.bodyPath) {
- return;
- }
-
- if (responsePatch.statusCode >= 200 && responsePatch.statusCode < 300) {
+ if (
+ responsePatch.bodyPath &&
+ responsePatch.statusCode >= 200 &&
+ responsePatch.statusCode < 300
+ ) {
const extension = mime.extension(responsePatch.contentType) || 'unknown';
const name =
nameFromHeader || `${request.name.replace(/\s/g, '-').toLowerCase()}.${extension}`;
@@ -568,6 +568,9 @@ class App extends PureComponent {
console.warn('Failed to download request after sending', responsePatch.bodyPath, err);
await models.response.create(responsePatch, settings.maxHistoryResponses);
});
+ } else {
+ // Save the bad responses so failures are shown still
+ await models.response.create(responsePatch, settings.maxHistoryResponses);
}
} catch (err) {
showAlert({
| 9 |
diff --git a/Source/Renderer/ModernizeShader.js b/Source/Renderer/ModernizeShader.js @@ -55,7 +55,8 @@ define([
var variableMap = {};
var negativeMap = {};
- for (var a = 0; a < variablesThatWeCareAbout.length; ++a) {
+ var numVariablesWeCareAbout = variablesThatWeCareAbout.length;
+ for (var a = 0; a < numVariablesWeCareAbout; ++a) {
var variableThatWeCareAbout = variablesThatWeCareAbout[a];
variableMap[variableThatWeCareAbout] = [null];
}
@@ -83,7 +84,7 @@ define([
} else if (hasENDIF) {
stack.pop();
} else if (!/layout/g.test(line)) {
- for (var varIndex = 0; varIndex < variablesThatWeCareAbout.length; ++varIndex) {
+ for (var varIndex = 0; varIndex < numVariablesWeCareAbout; ++varIndex) {
var varName = variablesThatWeCareAbout[varIndex];
if (line.indexOf(varName) !== -1) {
if (variableMap[varName].length === 1 && variableMap[varName][0] === null) {
| 10 |
diff --git a/jobs/starlink.js b/jobs/starlink.js @@ -131,7 +131,7 @@ module.exports = async () => {
LAUNCH_DATE: sat.LAUNCH_DATE,
SITE: sat.SITE,
DECAY_DATE: sat.DECAY_DATE,
- DECAYED: sat.DECAYED,
+ DECAYED: !!(sat.DECAY_DATE),
FILE: sat.FILE,
GP_ID: sat.GP_ID,
TLE_LINE0: sat.TLE_LINE0,
| 12 |
diff --git a/articles/api-auth/tutorials/authorization-code-grant.md b/articles/api-auth/tutorials/authorization-code-grant.md @@ -11,8 +11,8 @@ https://${account.namespace}/authorize?
audience={API_AUDIENCE}&
scope={SCOPE}&
response_type=code&
- client_id={AUTH0_CLIENT_ID}&
- redirect_uri={CALLBACK_URL}&
+ client_id=${account.clientId}&
+ redirect_uri=${account.callback}&
state={OPAQUE_VALUE}
```
@@ -28,7 +28,7 @@ Where:
For example:
```html
-<a href="https://${account.namespace}/authorize?scope=appointments%20contacts&audience=appointments:api&response_type=code&client_id=${account.clientId}&redirect_uri=https://myclientapp.com/callback">
+<a href="https://${account.namespace}/authorize?scope=appointments%20contacts&audience=appointments:api&response_type=code&client_id=${account.clientId}&redirect_uri=${account.callback}">
Sign In
</a>
```
@@ -50,7 +50,7 @@ Now that you have an Authorization Code, you must exchange it for an Access Toke
],
"postData": {
"mimeType": "application/json",
- "text": "{\"grant_type\":\"authorization_code\",\"client_id\": \"${account.clientId}\",\"client_secret\": \"${account.clientSecret}\",\"code\": \"YOUR_AUTHORIZATION_CODE\",\"redirect_uri\": \"https://myclientapp.com/callback\"}"
+ "text": "{\"grant_type\":\"authorization_code\",\"client_id\": \"${account.clientId}\",\"client_secret\": \"${account.clientSecret}\",\"code\": \"YOUR_AUTHORIZATION_CODE\",\"redirect_uri\": \"${account.callback}"}"
}
}
```
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.