code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/html/package-lock.json b/html/package-lock.json "dev": true }, "@sparkdesignsystem/spark-styles": { - "version": "1.0.0-beta.0", - "resolved": "https://registry.npmjs.org/@sparkdesignsystem/spark-styles/-/spark-styles-1.0.0-beta.0.tgz", - "integrity": "sha512-nJZ5JvKFmouxgbJcM70obZ9r1xUtlUqHKo9gDrK89A4MLnza1vwNWhsznLRzz744VINtLr0C/CsAiQxG8BLmoQ==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sparkdesignsystem/spark-styles/-/spark-styles-1.0.0.tgz", + "integrity": "sha512-KCGyCsCXZJzfC20ts73z7gGIyX6ArsoVFvkArSN+j+jmbQDObodLbSQyzkhZAxravYVywlJQU4HYwdyS7VqF9g==" }, "@storybook/addon-a11y": { "version": "5.3.19",
3
diff --git a/lib/generate.js b/lib/generate.js @@ -171,9 +171,11 @@ generate.ts = generate.typescript = function (parser, exportName) { output += "// http://github.com/Hardmath123/nearley\n"; output += "function id(d:any[]):any {return d[0];}\n"; output += parser.body.join('\n'); - output += "interface NearleyGrammar {ParserRules:NearleyRule[]; ParserStart:string};\n"; - output += "interface NearleyRule {name:string; symbols:NearleySymbol[]; postprocess?:(d:any[],loc?:number,reject?:{})=>any};\n"; - output += "type NearleySymbol = string | {literal:any} | {test:(token:any) => boolean};\n"; + output += "export interface Token {value:any; [key: string]:any};\n"; + output += "export interface Lexer {reset:(chunk:string, info:any) => void; next:() => Token; save:() => any; formatError:(token:Token) => string; has:(tokenType:string) => boolean};\n"; + output += "export interface NearleyGrammar {ParserRules:NearleyRule[]; ParserStart:string; Lexer:Lexer|undefined};\n"; + output += "export interface NearleyRule {name:string; symbols:NearleySymbol[]; postprocess?:(d:any[],loc?:number,reject?:{})=>any};\n"; + output += "export type NearleySymbol = string | {literal:any} | {test:(token:any) => boolean};\n"; output += "export var grammar : NearleyGrammar = {\n"; output += " Lexer: " + parser.config.lexer + ",\n"; output += " ParserRules: " + serializeRules(parser.rules, generate.typescript.builtinPostprocessors) + "\n"; @@ -184,7 +186,8 @@ generate.ts = generate.typescript = function (parser, exportName) { generate.typescript.builtinPostprocessors = { "joiner": "(d) => d.join('')", "arrconcat": "(d) => [d[0]].concat(d[1])", - "nuller": "(d) => null", + "arrpush": "(d) => d[0].concat([d[1]])", + "nuller": "() => null", "id": "id" };
7
diff --git a/index.d.ts b/index.d.ts @@ -260,7 +260,7 @@ export interface Bot extends TypedEmitter<BotEvents> { updateSign: (block: Block, text: string) => void equip: ( - item: Item, + item: Item | number, destination: EquipmentDestination | null, callback?: (error?: Error) => void ) => Promise<void>
3
diff --git a/app/shared/actions/stake.js b/app/shared/actions/stake.js @@ -54,7 +54,7 @@ export function setStake(account, netAmount, cpuAmount) { }; } -export function clearSystemState() { +export function resetStakeForm() { return (dispatch: () => void) => { dispatch({ type: types.RESET_SYSTEM_STATES
10
diff --git a/src/ts4.1/index.d.ts b/src/ts4.1/index.d.ts @@ -118,7 +118,7 @@ export function Trans<N extends Namespace, K extends TFuncKey<N>, E extends Elem props: TransProps<N, K, E> ): React.ReactElement; -export function useSSR(initialI18nStore: any, initialLanguage: any): void; +export function useSSR(initialI18nStore: Resource, initialLanguage: string): void; export interface UseTranslationOptions { i18n?: i18n; @@ -178,7 +178,7 @@ export interface I18nextProviderProps { } export const I18nextProvider: React.FunctionComponent<I18nextProviderProps>; -export const I18nContext: React.Context<i18n>; +export const I18nContext: React.Context<{ i18n: i18n }>; export interface TranslationProps<N extends Namespace> { children: (
1
diff --git a/policykit/templates/policyadmin/login.html b/policykit/templates/policyadmin/login.html @@ -95,7 +95,7 @@ You must be an admin of the Discord to add PolicyKit to your server.<BR> <P> -<a href="https://discordapp.com/api/oauth2/authorize?client_id={{discord_client_id}}&response_type=code&redirect_uri={{server_url}}%2Fdiscord%2Foauth&scope=identify&state=policykit_discord_user_login"> +<a href="https://discordapp.com/api/oauth2/authorize?client_id={{discord_client_id}}&response_type=code&redirect_uri={{server_url}}%2Fdiscord%2Foauth&scope=identify%20guilds&state=policykit_discord_user_login"> Sign in with Discord </a>
0
diff --git a/src/statemanager/WfsPermalink.js b/src/statemanager/WfsPermalink.js @@ -283,7 +283,7 @@ WfsPermalinkService.prototype.issueRequest_ = function( // zoom to features const size = map.getSize(); if (size !== undefined) { - const maxZoom = zoomLevel || this.pointRecenterZoom_; + const maxZoom = zoomLevel === undefined ? this.pointRecenterZoom_ : zoomLevel; const padding = [10, 10, 10, 10]; map.getView().fit(this.getExtent_(features), {size, maxZoom, padding}); }
9
diff --git a/app/src/renderer/vuex/modules/distribution.js b/app/src/renderer/vuex/modules/distribution.js @@ -73,12 +73,12 @@ export default ({ node }) => { const rewards = coinsToObject(rewardsArray) commit(`setTotalRewards`, rewards) commit(`setDistributionError`, null) + state.loaded = true } catch (error) { Sentry.captureException(error) commit(`setDistributionError`, error) } state.loading = false - state.loaded = true }, async withdrawAllRewards( { rootState: { wallet }, dispatch },
3
diff --git a/packages/table-core/src/features/RowSelection.ts b/packages/table-core/src/features/RowSelection.ts @@ -267,16 +267,16 @@ export const RowSelection: TableFeature = { // }, getIsAllRowsSelected: () => { - const preFilteredFlatRows = table.getPreFilteredRowModel().flatRows + const preGroupedFlatRows = table.getPreGroupedRowModel().flatRows const { rowSelection } = table.getState() let isAllRowsSelected = Boolean( - preFilteredFlatRows.length && Object.keys(rowSelection).length + preGroupedFlatRows.length && Object.keys(rowSelection).length ) if (isAllRowsSelected) { if ( - preFilteredFlatRows.some( + preGroupedFlatRows.some( row => row.getCanSelect() && !rowSelection[row.id] ) ) {
1
diff --git a/app/hglib.html b/app/hglib.html </script> <script> console.log('hey'); - usedServer = "localhost:8000"; + let remoteServer = "52.45.229.11"; + usedServer = remoteServer; var viewConfig = { 'editable': true, zoomFixed: false, { 'uid': 'hm1', 'server': usedServer , - 'tilesetUid': 'ma', + 'tilesetUid': 'aa', 'type': 'heatmap' } ]
3
diff --git a/src/modules/resize/resize.js b/src/modules/resize/resize.js @@ -9,6 +9,7 @@ export default { resize: { resizeHandler() { if (!swiper || !swiper.initialized) return; + swiper.emit('beforeResize'); swiper.emit('resize'); }, orientationChangeHandler() {
0
diff --git a/vis/test/snapshot/__snapshots__/list-base.test.js.snap b/vis/test/snapshot/__snapshots__/list-base.test.js.snap @@ -6,7 +6,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p id="list-col" style={ Object { - "width": "100%", + "width": undefined, } } > @@ -87,6 +87,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p className="form-control" id="filter_input" onChange={[Function]} + placeholder="Search within map..." type="text" value="" /> @@ -110,11 +111,12 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="button" type="button" > + show: <span id="curr-filter-type" > - + Any </span> <i @@ -138,7 +140,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="menuitem" tabIndex="-1" > - + Any </a> </li> <li @@ -153,7 +155,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="menuitem" tabIndex="-1" > - + Open Access </a> </li> </ul> @@ -182,11 +184,12 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="button" type="button" > + sort by: <span id="curr-sort-type" > - + Relevance </span> <i @@ -210,7 +213,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="menuitem" tabIndex="-1" > - + Relevance </a> </li> <li @@ -225,7 +228,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="menuitem" tabIndex="-1" > - + Title </a> </li> <li @@ -240,7 +243,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="menuitem" tabIndex="-1" > - + Authors </a> </li> <li @@ -255,7 +258,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p role="menuitem" tabIndex="-1" > - + Year </a> </li> </ul> @@ -498,7 +501,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) id="list-col" style={ Object { - "width": "100%", + "width": undefined, } } > @@ -579,6 +582,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) className="form-control" id="filter_input" onChange={[Function]} + placeholder="Search within map..." type="text" value="" /> @@ -602,11 +606,12 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="button" type="button" > + show: <span id="curr-filter-type" > - + Any </span> <i @@ -630,7 +635,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="menuitem" tabIndex="-1" > - + Any </a> </li> <li @@ -645,7 +650,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="menuitem" tabIndex="-1" > - + Open Access </a> </li> </ul> @@ -674,11 +679,12 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="button" type="button" > + sort by: <span id="curr-sort-type" > - + Relevance </span> <i @@ -702,7 +708,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="menuitem" tabIndex="-1" > - + Relevance </a> </li> <li @@ -717,7 +723,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="menuitem" tabIndex="-1" > - + Title </a> </li> <li @@ -732,7 +738,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="menuitem" tabIndex="-1" > - + Authors </a> </li> <li @@ -747,7 +753,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out) role="menuitem" tabIndex="-1" > - + Year </a> </li> </ul>
3
diff --git a/packages/dev-server/index.js b/packages/dev-server/index.js @@ -19,32 +19,9 @@ module.exports = function() { ) ); - const afterWebpack = (err, stats) => { - if (err) { - console.log(chalk.red(err.stack || err)); - if (err.details) { - console.log(chalk.red(err.details)); - } - return; - } - - const info = stats.toJson(); - - if (stats.hasErrors()) { - console.log(chalk.red('WEBPACK FAILED TO COMPILE!\n')); - console.log(chalk.red(info.errors)); - } - - if (stats.hasWarnings()) { - console.log(chalk.yellow(info.warnings)); - } - - console.log(stats.toString({ colors: true })); - - // Announce the server after the webpack config has compiled + const announceServer = () => { console.log(chalk.green(`\nServer up at http://localhost:${port}`)); - console.log(chalk.gray('\nCtrl+C to stop the server')); - console.log(chalk.yellow('\nLogging requests...')); + console.log(chalk.yellow('\nLogging requests...\n')); }; if (isProd) { @@ -56,19 +33,19 @@ module.exports = function() { } else { // Start a webpack dev server with hot module reloading when dev console.log(chalk.gray('Compiling webpack config')); - const compiler = webpack(config, afterWebpack); + const compiler = webpack(config); const middleware = devMiddleware(compiler, { // lazy: true, - noInfo: true, publicPath: config.output.publicPath, - silent: true, stats: 'errors-only', - clientLogLevel: 'error', + logLevel: 'warn', }); app.use(middleware); - app.use(hotMiddleware(compiler)); + app.use(hotMiddleware(compiler, { + log: () => {} + })); } // Respond with static files when they exist @@ -101,5 +78,5 @@ module.exports = function() { // Start the server const port = process.env.PORT || 3000; - app.listen(port); + app.listen(port, announceServer); };
2
diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json "url": "https://www.krakend.io/schema/v3.json" }, { - "name": "Datadog Service Catalog Definition", - "description": "Datadog service catalog definition file", + "name": "Datadog Service Definition", + "description": "Datadog Service Definition file", "fileMatch": [ "service.datadog.yaml", "service.datadog.yml",
10
diff --git a/src/lib/stores/AuthStore.js b/src/lib/stores/AuthStore.js @@ -7,6 +7,9 @@ import Cookies from "js-cookie"; */ class AuthStore { + constructor(name) { + this.tokenName = name || "token"; + } /** * The login token of the current user * @@ -18,16 +21,21 @@ class AuthStore { this.token = token || ""; } + @action unsetToken(tokenName) { + this.token = ""; + Cookies.remove(tokenName); + } + saveTokenToCookie() { if (typeof this.token === "string" && this.token.length) { - Cookies.set("token", this.token); + Cookies.set(this.tokenName, this.token); } else { - Cookies.remove("token"); + Cookies.remove(this.tokenName); } } setTokenFromCookie() { - const token = Cookies.get("token"); + const token = Cookies.get(this.tokenName); this.setToken(token); } }
11
diff --git a/utilities/warning/is-trigger-tabbable.js b/utilities/warning/is-trigger-tabbable.js @@ -10,8 +10,8 @@ import { BUTTON, BUTTON_STATEFUL, BUTTON_GROUP, - CHECKBOX, - DATEPICKER, + FORMS_CHECKBOX, + DATE_PICKER, FORMS_INPUT, LOOKUP, TIME_PICKER @@ -40,8 +40,8 @@ if (process.env.NODE_ENV !== 'production') { && trigger.type.displayName !== BUTTON && trigger.type.displayName !== BUTTON_STATEFUL && trigger.type.displayName !== BUTTON_GROUP - && trigger.type.displayName !== CHECKBOX - && trigger.type.displayName !== DATEPICKER + && trigger.type.displayName !== FORMS_CHECKBOX + && trigger.type.displayName !== DATE_PICKER && trigger.type.displayName !== FORMS_INPUT && trigger.type.displayName !== LOOKUP && trigger.type.displayName !== TIME_PICKER) {
10
diff --git a/src/sass/components/apl.scss b/src/sass/components/apl.scss } &-amount { + padding: 0 16px; &-title { color: rgba(0, 0, 0, 0.40); font-size: 13px; } &-totals { margin-top: 14px; + padding: 0 16px; &-item { margin: 4px 0; color: #787878; border-bottom: 1px solid #FF9B00; display: block; height: 1px; - width: 100%; + position: absolute; + left: 0; + right: 16px; } } &-right { border-bottom: 1px solid #FF9B00; display: block; height: 1px; - width: 100%; + position: absolute; + left: 0; + right: 16px; } } &.right-active { text-transform: uppercase; letter-spacing: -0.08px; line-height: 18px; - margin: 18px 0 -12px; + margin: 18px 0 -12px 16px; } .item { border: 0;
1
diff --git a/brands/tourism/hotel.json b/brands/tourism/hotel.json } }, "tourism/hotel|Jurys Inn": { - "countryCodes": ["gb", "ie", "cz"], + "countryCodes": ["cz", "gb", "ie"], "tags": { "brand": "Jurys Inn", "brand:wikidata": "Q12060924",
5
diff --git a/packages/frontend/src/actions/account.js b/packages/frontend/src/actions/account.js @@ -458,8 +458,7 @@ export const handleCreateAccountWithSeedPhrase = (accountId, recoveryKeyPair, fu export const finishAccountSetup = () => async (dispatch, getState) => { await dispatch(refreshAccount()); await dispatch(getBalance()); - await dispatch(staking.clearState()); - dispatch(tokens.clearState()); + await dispatch(clearAccountState()); const { balance, url, accountId } = getState().account; let promptTwoFactor = await TwoFactor.checkCanEnableTwoFactor(balance);
1
diff --git a/_data/conferences.yml b/_data/conferences.yml --- +- title: ACL + year: 2020 + id: naacl20 + link: https://acl2020.org/ + deadline: '2020-12-9 23:59:59' + timezone: UTC-12 + date: July 6-8, 2020 + place: Seattle, Washington, USA + sub: NLP + - title: AAAI year: 2020 id: aaai20
3
diff --git a/addon/components/polaris-resource-list/bulk-actions.js b/addon/components/polaris-resource-list/bulk-actions.js @@ -61,9 +61,9 @@ export default Component.extend(ContextBoundEventListenersMixin, { * * @type {Object[]} * @default null - * @property passedActions + * @property actionsCollection */ - passedActions: null, + actionsCollection: null, /** * Text to select all across pages @@ -221,15 +221,15 @@ export default Component.extend(ContextBoundEventListenersMixin, { } ), - hasActions: computed('promotedActions', 'passedActions', function() { - let { promotedActions, passedActions } = this.getProperties( + hasActions: computed('promotedActions', 'actionsCollection', function() { + let { promotedActions, actionsCollection } = this.getProperties( 'promotedActions', - 'passedActions' + 'actionsCollection' ); return Boolean( (promotedActions && promotedActions.length > 0) || - (passedActions && passedActions.length > 0) + (actionsCollection && actionsCollection.length > 0) ); }), @@ -303,19 +303,19 @@ export default Component.extend(ContextBoundEventListenersMixin, { } ), - actionSections: computed('passedActions.[]', function() { - let passedActions = this.get('passedActions'); + actionSections: computed('actionsCollection.[]', function() { + let actionsCollection = this.get('actionsCollection'); - if (!passedActions || passedActions.length === 0) { + if (!actionsCollection || actionsCollection.length === 0) { return null; } - if (this.instanceOfBulkActionListSectionArray(passedActions)) { - return passedActions; + if (this.instanceOfBulkActionListSectionArray(actionsCollection)) { + return actionsCollection; } - if (this.instanceOfBulkActionArray(passedActions)) { - return [{ items: passedActions }]; + if (this.instanceOfBulkActionArray(actionsCollection)) { + return [{ items: actionsCollection }]; } }), @@ -364,20 +364,20 @@ export default Component.extend(ContextBoundEventListenersMixin, { */ onToggleAll() {}, - instanceOfBulkActionListSectionArray(passedActions) { - let validList = passedActions.filter((action) => { + instanceOfBulkActionListSectionArray(actionsCollection) { + let validList = actionsCollection.filter((action) => { return action.items; }); - return passedActions.length === validList.length; + return actionsCollection.length === validList.length; }, - instanceOfBulkActionArray(passedActions) { - let validList = passedActions.filter((action) => { + instanceOfBulkActionArray(actionsCollection) { + let validList = actionsCollection.filter((action) => { return !action.items; }); - return passedActions.length === validList.length; + return actionsCollection.length === validList.length; }, setContainerNode() { @@ -466,14 +466,14 @@ export default Component.extend(ContextBoundEventListenersMixin, { } let { - passedActions, + actionsCollection, promotedActions, moreActionsNode, addedMoreActionsWidthForMeasuring, largeScreenButtonsNode, containerNode, } = this.getProperties( - 'passedActions', + 'actionsCollection', 'promotedActions', 'moreActionsNode', 'addedMoreActionsWidthForMeasuring', @@ -481,7 +481,7 @@ export default Component.extend(ContextBoundEventListenersMixin, { 'containerNode' ); - if (promotedActions && !passedActions && moreActionsNode) { + if (promotedActions && !actionsCollection && moreActionsNode) { addedMoreActionsWidthForMeasuring = moreActionsNode.getBoundingClientRect() .width; }
10
diff --git a/assets/js/googlesitekit/modules/datastore/sharing-settings.test.js b/assets/js/googlesitekit/modules/datastore/sharing-settings.test.js @@ -1037,7 +1037,7 @@ describe( 'core/modules sharing-settings', () => { ).toBeUndefined(); } ); - it( 'should return an empty object if there is no `defaultSharedOwnershipModuleSettings`', async () => { + it( 'should return an empty object if there is no `defaultSharedOwnershipModuleSettings`', () => { global[ dashboardSharingDataBaseVar ] = { defaultSharedOwnershipModuleSettings: {}, }; @@ -1051,7 +1051,7 @@ describe( 'core/modules sharing-settings', () => { ); } ); - it( 'should return the `defaultSharedOwnershipModuleSettings` object', async () => { + it( 'should return the `defaultSharedOwnershipModuleSettings` object', () => { global[ dashboardSharingDataBaseVar ] = { defaultSharedOwnershipModuleSettings, };
2
diff --git a/token-metadata/0x2AF5D2aD76741191D15Dfe7bF6aC92d4Bd912Ca3/metadata.json b/token-metadata/0x2AF5D2aD76741191D15Dfe7bF6aC92d4Bd912Ca3/metadata.json "symbol": "LEO", "address": "0x2AF5D2aD76741191D15Dfe7bF6aC92d4Bd912Ca3", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/td.vue/vue.config.js b/td.vue/vue.config.js @@ -32,7 +32,7 @@ module.exports = { outputDir: 'dist-desktop', builderOptions: { appId: 'org.owasp.threatdragon', - productName: 'OWASP-Threat-Dragon', + productName: 'Threat-Dragon-ng', directories: { output: 'dist-desktop' },
10
diff --git a/deepfence_ui/app/scripts/components/vulnerability-view/vulnerability-table-view/vulnerability-table-v2-view.js b/deepfence_ui/app/scripts/components/vulnerability-view/vulnerability-table-view/vulnerability-table-v2-view.js @@ -22,42 +22,49 @@ const maskOptionsMap = { host: [ { type: 'radio', - id: 'mask_all_hosts_and_images', + id: 'mask_across_nodes', name: 'masking_docs', label: 'Mask across all hosts and images', - value: 'mask_all_hosts_and_images', + value: 'mask_across_nodes', }, { type: 'radio', - id: 'mask_all_host', + id: 'mask_across_nodes', name: 'masking_docs', label: 'Mask across all hosts', - value: 'mask_all_host', + value: 'host||mask_across_nodes', // node_type of host is required by backend }, { type: 'radio', id: 'mask_this_host', name: 'masking_docs', label: 'Mask only on this host', - value: 'mask_this_host', - defaultValue: 'mask_this_host', + value: 'host||mask_this_host', // node_type of host is required by backend + defaultValue: 'host||mask_this_host', }, ], container_image: [ { type: 'radio', - id: 'mask_all_images', + id: 'mask_across_nodes', + name: 'masking_docs', + label: 'Mask across all hosts and images', + value: 'mask_across_nodes', + }, + { + type: 'radio', + id: 'mask_across_images', name: 'masking_docs', label: 'Mask across all images', - value: 'mask_all_images', + value: 'container_image||mask_across_images', // node_type of container_image is required by backend }, { type: 'radio', id: 'mask_this_image', name: 'masking_docs', label: 'Mask only on this image', - value: 'mask_this_image', - defaultValue: 'mask_this_image', + value: 'container_image||mask_this_image', + defaultValue: 'container_image||mask_this_image', // node_type of container_image is required by backend }, ] } @@ -177,10 +184,18 @@ class VulnerabilityTableV2 extends React.Component { } = this.props; // Mask and unmask will reset page to 1 this.handlePageChange(0) - return action({ + + const payload = { docs: params, - mask_across_images: maskDocs === 'true' - }); + }; + const [node, value] = maskDocs.split('||'); + if (value !== undefined) { + payload[value] = true; + payload.node_type = node; + } else { + payload[node] = true; + } + return action(payload); } handleNotify(selectedDocIndex = {}) { @@ -421,6 +436,9 @@ class VulnerabilityTableV2 extends React.Component { additionalInputs: alerts[0]?.node_type ? getMaskOptionsType(alerts[0].node_type) : [], confirmButtonText: 'Yes, mask', cancelButtonText: 'No, Keep', + contentStyles: { + height: '300px', + }, }, }, {
3
diff --git a/test/common.js b/test/common.js @@ -15,7 +15,10 @@ const config = { if (process.env.MYSQL_USE_TLS) { config.ssl = { rejectUnauthorized: false, - ca: fs.readFileSync(path.join(__dirname, '../examples/ssl/certs/ca-cert.pem'), 'utf-8') + ca: fs.readFileSync( + path.join(__dirname, '../examples/ssl/certs/ca.pem'), + 'utf-8' + ) }; } @@ -60,7 +63,10 @@ exports.createConnection = function(args) { start = [0, 0] || start; const timestamp = Date.now(); const seconds = Math.ceil(timestamp / 1000); - return [seconds - start[0], (timestamp - seconds * 1000) * 1000 - start[1]]; + return [ + seconds - start[0], + (timestamp - seconds * 1000) * 1000 - start[1] + ]; }; } @@ -162,7 +168,10 @@ exports.createConnectionWithURI = function() { exports.createTemplate = function() { const jade = require('jade'); - const template = require('fs').readFileSync(`${__dirname}/template.jade`, 'ascii'); + const template = require('fs').readFileSync( + `${__dirname}/template.jade`, + 'ascii' + ); return jade.compile(template); };
3
diff --git a/modules/core/src/utils/globals.js b/modules/core/src/utils/globals.js // micro modules like 'global' and 'is-browser'; /* global process, window, global, document */ -const isBrowser = +export const isBrowser = typeof process !== 'object' || String(process) !== '[object process]' || process.browser; -module.exports = { - window: typeof window !== 'undefined' ? window : global, - global: typeof global !== 'undefined' ? global : window, - document: typeof document !== 'undefined' ? document : {}, - isBrowser -}; +const window_ = typeof window !== 'undefined' ? window : global; +const global_ = typeof global !== 'undefined' ? global : window; +const document_ = typeof document !== 'undefined' ? document : {}; + +export {window_ as window, global_ as global, document_ as document};
2
diff --git a/tests/harness/min_js/test_reporter.js b/tests/harness/min_js/test_reporter.js @@ -61,3 +61,11 @@ TestReporter.prototype.getRunTime = function() { TestReporter.prototype.getUniqueId = function() { return 'id'; }; + +/** + * Unsupported runner: Provide result-returning function used by JsTestRunner. + * @return {string} + * */ +TestReporter.prototype.getTestResultsAsJson = function() { + return ''; +};
0
diff --git a/.drone.star b/.drone.star @@ -261,6 +261,7 @@ def setupServerAndApp(): "commands": [ "cd /var/www/owncloud/server/", "php occ config:system:set trusted_domains 1 --value=owncloud", + "php occ config:system:set skeletondirectory --value=''", ], }]
12
diff --git a/src/components/Composer/index.ios.js b/src/components/Composer/index.ios.js @@ -147,6 +147,7 @@ class Composer extends React.Component { autoComplete="off" placeholderTextColor={themeColors.placeholderText} ref={el => this.textInput = el} + maxHeight={this.props.isComposerFullSize ? '100%' : CONST.COMPOSER_MAX_HEIGHT} onChange={() => this.updateNumberOfLines()} onContentSizeChange={e => this.updateNumberOfLines(e)} rejectResponderTermination={false}
12
diff --git a/src/gameClasses/components/ui/VideoChatComponent.js b/src/gameClasses/components/ui/VideoChatComponent.js @@ -65,18 +65,14 @@ var VideoChatComponent = IgeEntity.extend({ var playerId = player.id() var unit = player.getSelectedUnit(); if (unit) { - //if player.vcGroupId has an id and self.groups[player.vcGroupId] exists I only check if the player - // is outside the group range. + // if the Player belongs to a group and is out of range from the group's centoid OR if that player's group no longer exists, then kick that player out of the group if (player.vcGroupId && self.groups[player.vcGroupId]) { var group = self.groups[player.vcGroupId]; - // if the Player belongs to a group and is out of range from the group's centoid, then kick that player out of the group - if (group) { var centoid = group.centoid; var distance = self.getDistance(centoid, unit._translate) if (distance > self.chatLeaveDistance) { self.removePlayerFromGroup(playerId) } - } } else { // if the Player doesn't belong in any group // check if the Player is within enter range of any group. If so, make Player enter the group.
1
diff --git a/src/pages/using-spark/guides/writing-meaningful-web-content-with-semantic-html.mdx b/src/pages/using-spark/guides/writing-meaningful-web-content-with-semantic-html.mdx @@ -93,10 +93,12 @@ An element consists of three main parts: <h3 class="sprk-b-TypeDisplayFour sprk-u-mbm sprk-u-Measure">Example</h3> -`<p>Download the Rocket Homes mobile application on your mobile device to start looking for your dream home.</p>` +``` +<p>Download the Rocket Homes mobile application on your mobile device to start looking for your dream home.</p> +``` - **The opening tag** `<p>`represents the start of the paragraph element. -- **The content** is the enclosed text (<i>"Download the Rocket.... " </i>) inside `<p></p>` paragraph the tags. +- **The content** is the enclosed text inside `<p></p>` paragraph the tags: <i>"Download the Rocket..."</i> - **The closing tag** `</p>` represents where the paragraph element ends. <SprkDivider element="span" additionalClasses="sprk-u-mvn" />
3
diff --git a/test/spec/engine.spec.js b/test/spec/engine.spec.js @@ -115,7 +115,7 @@ describe('Engine', function () { it('should perform a request with the state encoded in a payload (no layers, no dataviews) ', function (done) { spyOn($, 'ajax').and.callFake(function (params) { var actual = params.url; - var expected = 'http://example.com/api/v1/map?config=%7B%22buffersize%22%3A%7B%22mvt%22%3A0%7D%2C%22layers%22%3A%5B%5D%2C%22dataviews%22%3A%7B%7D%2C%22analyses%22%3A%5B%5D%7D&client=fake-stat-tag&api_key=' + engineMock.getApiKey(); + var expected = 'http://example.com/api/v1/map?config=%7B%22buffersize%22%3A%7B%22mvt%22%3A0%7D%2C%22layers%22%3A%5B%5D%2C%22dataviews%22%3A%7B%7D%2C%22analyses%22%3A%5B%5D%7D&client=fake-client&api_key=' + engineMock.getApiKey(); expect(actual).toEqual(expected); done(); }); @@ -125,7 +125,7 @@ describe('Engine', function () { it('should perform a request with the state encoded in a payload (single layer) ', function (done) { spyOn($, 'ajax').and.callFake(function (params) { var actual = params.url; - var expected = 'http://example.com/api/v1/map?config=%7B%22buffersize%22%3A%7B%22mvt%22%3A0%7D%2C%22layers%22%3A%5B%7B%22type%22%3A%22mapnik%22%2C%22options%22%3A%7B%22cartocss_version%22%3A%222.1.0%22%2C%22source%22%3A%7B%22id%22%3A%22a1%22%7D%2C%22interactivity%22%3A%5B%22cartodb_id%22%5D%7D%7D%5D%2C%22dataviews%22%3A%7B%7D%2C%22analyses%22%3A%5B%7B%22id%22%3A%22a1%22%2C%22type%22%3A%22source%22%2C%22params%22%3A%7B%22query%22%3A%22SELECT%20*%20FROM%20table%22%7D%7D%5D%7D&client=fake-stat-tag&api_key=' + engineMock.getApiKey(); + var expected = 'http://example.com/api/v1/map?config=%7B%22buffersize%22%3A%7B%22mvt%22%3A0%7D%2C%22layers%22%3A%5B%7B%22type%22%3A%22mapnik%22%2C%22options%22%3A%7B%22cartocss_version%22%3A%222.1.0%22%2C%22source%22%3A%7B%22id%22%3A%22a1%22%7D%2C%22interactivity%22%3A%5B%22cartodb_id%22%5D%7D%7D%5D%2C%22dataviews%22%3A%7B%7D%2C%22analyses%22%3A%5B%7B%22id%22%3A%22a1%22%2C%22type%22%3A%22source%22%2C%22params%22%3A%7B%22query%22%3A%22SELECT%20*%20FROM%20table%22%7D%7D%5D%7D&client=fake-client&api_key=' + engineMock.getApiKey(); expect(actual).toEqual(expected); done(); });
10
diff --git a/package.json b/package.json }, "homepage": "https://github.com/dherault/serverless-offline", "keywords": [ - "Serverless", - "Amazon Web Services", - "AWS", - "Lambda", - "API Gateway" + "serverless", + "serverless framework", + "serverless offline", + "serverless plugin", + "serverless local", + "amazon web services", + "aws", + "lambda", + "api gateway" ], "files": [ "src",
0
diff --git a/protocols/market/contracts/Market.sol b/protocols/market/contracts/Market.sol @@ -114,13 +114,12 @@ contract Market is Ownable { Intent memory newIntent = Intent(_staker, _amount, _expiry, _locator); // Insert after the next highest amount on the linked list. - if (insertIntent(newIntent, findPosition(_amount))) { + insertIntent(newIntent, findPosition(_amount)); // Increment the length of the linked list if successful. length = length + 1; emit SetIntent(_staker, _amount, _expiry, _locator, makerToken, takerToken); } - } /** * @notice Unset an Intent to Trade @@ -281,12 +280,7 @@ contract Market is Ownable { function insertIntent( Intent memory _newIntent, Intent memory _nextIntent - ) internal returns (bool) { - - // Ensure the _existing intent is in the linked list. - if (!hasIntent(_nextIntent.staker)) { - return false; - } + ) internal { // Get the intent before the _nextIntent. Intent memory previousIntent = intentsLinkedList[_nextIntent.staker][PREV]; @@ -294,8 +288,6 @@ contract Market is Ownable { // Link the _newIntent into place. link(previousIntent, _newIntent); link(_newIntent, _nextIntent); - - return true; } /**
2
diff --git a/sirepo/package_data/static/js/sirepo-plotting.js b/sirepo/package_data/static/js/sirepo-plotting.js @@ -64,6 +64,18 @@ SIREPO.app.factory('plotting', function(appState, d3Service, frameCache, panelSt }; } + function formatNumber(value) { + if (value) { + if (Math.abs(value) < 1e3 && Math.abs(value) > 1e-3) { + return cleanNumber(value.toFixed(3)); + } + else { + return cleanNumber(value.toExponential(2)); + } + } + return '' + value; + } + function initAnimation(scope) { scope.prevFrameIndex = -1; scope.isPlaying = false; @@ -258,17 +270,7 @@ SIREPO.app.factory('plotting', function(appState, d3Service, frameCache, panelSt return createAxis(scale, orient) // this causes a 'number of fractional digits' error in MSIE //.tickFormat(d3.format('e')) - .tickFormat(function (value) { - if (value) { - if (Math.abs(value) < 1e3 && Math.abs(value) > 1e-3) { - return cleanNumber(value.toFixed(3)); - } - else { - return cleanNumber(value.toExponential(2)); - } - } - return value; - }); + .tickFormat(formatNumber); }, exportCSV: function(fileName, heading, points) { @@ -317,12 +319,11 @@ SIREPO.app.factory('plotting', function(appState, d3Service, frameCache, panelSt fixFormat: function(scope, axis, precision) { var format = d3.format('.' + (precision || '3') + 's'); - var format2 = d3.format('.2f'); // amounts near zero may appear as NNNz, change them to 0 return function(n) { var units = scope[axis + 'units']; if (! units) { - return cleanNumber(format2(n)); + return cleanNumber(formatNumber(n)); } var v = format(n); //TODO(pjm): use a regexp
7
diff --git a/editor.js b/editor.js @@ -16,7 +16,7 @@ import App from './app.js'; import {camera, getRenderer} from './app-object.js'; import {CapsuleGeometry} from './CapsuleGeometry.js'; import HtmlRenderer from 'html-render'; -import {storageHost} from './constants.js'; +import {storageHost, tokensHost} from './constants.js'; // import TransformGizmo from './TransformGizmo.js'; // import transformControls from './transform-controls.js'; import easing from './easing.js'; @@ -2212,7 +2212,7 @@ Promise.all([ app.addEventListener('frame', () => { contextMenuMesh.update(); }); - renderer.domElement.addEventListener('click', e => { + renderer.domElement.addEventListener('click', async e => { // _updateRaycasterFromMouseEvent(localRaycaster, e); if (contextMenuMesh.visible) { const highlightedIndex = contextMenuMesh.getHighlightedIndex(); @@ -2224,12 +2224,14 @@ Promise.all([ } case 'Possess': { const object = weaponsManager.getContextMenuObject(); - console.log('possesss context menu object', object); + // console.log('possesss context menu object', object); const {contentId} = object; if (typeof contentId === 'number') { - throw new Error('possessing number content ids not supported yet'); - /* const ext = getExt(contentId); - app.setAvatarUrl(`https://webaverse.github.io/assets/sacks3.vrm`, 'vrm'); */ + const res = await fetch(`${tokensHost}/${contentId}`); + const j = await res.json(); + const {hash, name, ext} = j; + const u = `${storageHost}/ipfs/${hash}`; + app.setAvatarUrl(u, ext); } else if (typeof contentId === 'string') { const ext = getExt(contentId); app.setAvatarUrl(contentId, ext);
0
diff --git a/src/scripts/interactive-video.js b/src/scripts/interactive-video.js @@ -1796,6 +1796,30 @@ InteractiveVideo.prototype.attachControls = function ($wrapper) { html: `<h3 id="${self.playbackRateMenuId}">${self.l10n.playbackRate}</h3>`, }); + const closePlaybackRateMenu = () => { + if (self.isMinimal) { + self.controls.$more.click(); + } + else { + self.controls.$playbackRateButton.click(); + } + }; + + // Adding close button to playback rate-menu + self.controls.$playbackRateChooser.append($('<span>', { + 'role': 'button', + 'class': 'h5p-chooser-close-button', + 'tabindex': '0', + 'aria-label': self.l10n.close, + click: () => closePlaybackRateMenu(), + keydown: event => { + if (event.which === KEY_CODE_SPACE || event.which === KEY_CODE_ENTER) { + closePlaybackRateMenu(); + event.preventDefault(); + } + } + })); + // Button for opening video playback rate selection dialog self.controls.$playbackRateButton = self.createButton('playbackRate', 'h5p-control', $right, createPopupMenuHandler('$playbackRateButton', '$playbackRateChooser')); self.setDisabled(self.controls.$playbackRateButton);
0
diff --git a/pages/_document.js b/pages/_document.js import React from 'react' -import Document, {Head, Main, NextScript} from 'next/document' +import Document, {Head, Html, Main, NextScript} from 'next/document' const PIWIK_URL = process.env.NEXT_PUBLIC_PIWIK_URL const PIWIK_SITE_ID = process.env.NEXT_PUBLIC_PIWIK_SITE_ID @@ -12,7 +12,7 @@ class MyDocument extends Document { render() { return ( - <html lang='fr'> + <Html lang='fr'> <Head> <meta name='viewport' content='width=device-width, initial-scale=1' /> <meta httpEquiv='x-ua-compatible' content='ie=edge' /> @@ -28,7 +28,7 @@ class MyDocument extends Document { {PIWIK_URL && PIWIK_SITE_ID && <script defer async src={`${PIWIK_URL}/piwik.js`} />} <NextScript /> </body> - </html> + </Html> ) } }
0
diff --git a/test/specs/selector_manager/index.js b/test/specs/selector_manager/index.js @@ -3,7 +3,7 @@ var Models = require('./model/SelectorModels'); var ClassTagView = require('./view/ClassTagView'); var ClassTagsView = require('./view/ClassTagsView'); var e2e = require('./e2e/ClassManager'); -var Editor = require('editor/model/editor'); +var Editor = require('editor/model/Editor'); describe('SelectorManager', () => {
1
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 "4.1.1"> +<!ENTITY version-java-client "4.2.0"> <!ENTITY version-dotnet-client "3.6.10"> <!ENTITY version-server "3.6.10"> <!ENTITY version-erlang-client "3.6.10">
12
diff --git a/package.json b/package.json "build": "node script/build.js", "test": "mocha && standard --fix && standard-markdown", "prepack": "check-for-leaks", - "prepush": "check-for-leaks" + "prepush": "check-for-leaks", + "release": "node script/release.js" } } \ No newline at end of file
12
diff --git a/src/modules/Graphics.js b/src/modules/Graphics.js @@ -760,9 +760,9 @@ class Graphics { textObj.textContent = textString if (textString.length > 0) { // ellipsis is needed - if (textObj.getComputedTextLength() >= width) { + if (textObj.getComputedTextLength() >= width / 0.8) { for (let x = textString.length - 3; x > 0; x -= 3) { - if (textObj.getSubStringLength(0, x) <= width) { + if (textObj.getSubStringLength(0, x) <= width / 0.8) { textObj.textContent = textString.substring(0, x) + '...' return }
7
diff --git a/src/core/lib/FileSignatures.mjs b/src/core/lib/FileSignatures.mjs @@ -828,7 +828,7 @@ export const FILE_SIGNATURES = { 0: 0x78, 1: [0x1, 0x9c, 0xda, 0x5e] }, - extractor: null + extractor: extractZlib }, { name: "xz compression", @@ -1443,6 +1443,37 @@ export function extractGZIP(bytes, offset) { } +/** + * Zlib extractor. + * + * @param {Uint8Array} bytes + * @param {number} offset + * @returns {Uint8Array} + */ +export function extractZlib(bytes, offset) { + const stream = new Stream(bytes.slice(offset)); + + // Skip over CMF + stream.moveForwardsBy(1); + + // Read flags + const flags = stream.readInt(1); + + // Skip over preset dictionary checksum + if (flags & 0x20) { + stream.moveForwardsBy(4); + } + + // Parse DEFLATE stream + parseDEFLATE(stream); + + // Skip over final checksum + stream.moveForwardsBy(4); + + return stream.carve(); +} + + /** * Steps through a DEFLATE stream *
0
diff --git a/views/kan-game-wrapper.es b/views/kan-game-wrapper.es @@ -13,13 +13,6 @@ import { layoutResizeObserver } from 'views/services/layout' const config = remote.require('./lib/config') const poiControlHeight = 30 -const getTitlebarHeight = () => { - if (document.querySelector('title-bar') && getComputedStyle(document.querySelector('title-bar')).display === 'none') { - return 0 - } else { - return config.get('poi.useCustomTitleBar', process.platform === 'win32' || process.platform === 'linux') ? 29 : 0 - } -} @connect(state => ({ configWebviewWidth: get(state, 'config.poi.webview.width', 800), @@ -30,18 +23,10 @@ const getTitlebarHeight = () => { horizontalRatio: get(state, 'config.poi.webview.ratio.horizontal', 60), verticalRatio: get(state, 'config.poi.webview.ratio.vertical', 50), editable: get(state, 'config.poi.layouteditable', false), + windowSize: get(state, 'layout.window', { width: window.innerWidth, height: window.innerHeight }), })) export class KanGameWrapper extends Component { - state = { - windowWidth: window.innerWidth, - windowHeight: window.innerHeight, - } - - setWindowSize = () => { - this.setState({ - windowWidth: window.innerWidth, - windowHeight: window.innerHeight, - }) + alignWebview = () => { try { document.querySelector('kan-game webview').executeJavaScript('window.align()') } catch(e) { @@ -58,13 +43,13 @@ export class KanGameWrapper extends Component { } componentDidMount = () => { - this.setWindowSizeDebounced = debounce(this.setWindowSize, 200) - window.addEventListener('resize', this.setWindowSizeDebounced) + this.alignWebviewDebounced = debounce(this.alignWebview, 200) + window.addEventListener('resize', this.alignWebviewDebounced) layoutResizeObserver.observe(document.querySelector('kan-game webview')) } componentWillUnmount = () => { - window.removeEventListener('resize', this.setWindowSizeDebounced) + window.removeEventListener('resize', this.alignWebviewDebounced) layoutResizeObserver.unobserve(document.querySelector('kan-game webview')) } @@ -93,9 +78,9 @@ export class KanGameWrapper extends Component { horizontalRatio, verticalRatio, editable, + windowSize, } = this.props - const { windowHeight, windowWidth } = this.state - const titleBarHeight = getTitlebarHeight() + const { width: windowWidth, height: windowHeight } = windowSize const zoomedPoiControlHeight = Math.floor(poiControlHeight * zoomLevel) let webviewWidth = configWebviewWidth let webviewHeight = Math.floor(configWebviewWidth * 0.6) @@ -104,7 +89,7 @@ export class KanGameWrapper extends Component { webviewWidth = Math.floor(windowWidth * horizontalRatio / 100) webviewHeight = Math.floor(webviewWidth * 0.6) } else { - webviewHeight = Math.floor((windowHeight - titleBarHeight) * verticalRatio / 100) + webviewHeight = Math.floor(windowHeight * verticalRatio / 100) webviewWidth = Math.floor(webviewHeight / 0.6) } } @@ -113,21 +98,21 @@ export class KanGameWrapper extends Component { px: 800, percent: 0, } : isHorizontal ? { - px: 0, + px: (windowHeight - zoomedPoiControlHeight) * 500 / (windowWidth * 3), percent: 60, } : { - px: 0, - percent: 100, + px: windowWidth, + percent: 0, } const defaultHeight = useFixedResolution ? { px: 480 + zoomedPoiControlHeight, percent: 0, } : isHorizontal ? { - px: 0, - percent: 100, + px: windowHeight, + percent: 0, } : { px: zoomedPoiControlHeight, - percent: 50, + percent: windowWidth * 60 / windowHeight, } this.resizableAreaWidth = useFixedResolution ? { px: webviewWidth,
12
diff --git a/src/system/device.js b/src/system/device.js @@ -380,7 +380,7 @@ let device = { * @readonly * @name nodeJS */ - nodeJS : (typeof process !== "undefined") && (process.release.name === "node"), + nodeJS : (typeof globalThis.process !== "undefined") && (typeof globalThis.process.release !== "undefined") && (globalThis.process.release.name === "node"), /** * equals to true if the device is running on ChromeOS.
1
diff --git a/src/App.jsx b/src/App.jsx @@ -4,6 +4,7 @@ import classnames from 'classnames'; import logo from './logo.svg'; import styles from './App.module.css'; import MagicMenu from './MagicMenu.jsx'; +import {defaultAvatarUrl} from '../constants'; import Header from './Header.jsx'; import Footer from './Footer.jsx'; @@ -25,7 +26,6 @@ const _startApp = async (weba, canvas) => { universe.handleUrlUpdate(); await weba.startLoop(); - const defaultAvatarUrl = './avatars/citrine.vrm'; const localPlayer = metaversefileApi.useLocalPlayer(); await localPlayer.setAvatarUrl(defaultAvatarUrl); };
4
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js @@ -242,7 +242,7 @@ function fetchIOUReport(iouReportID, chatReportID) { } const iouReportData = response.reports[iouReportID]; if (!iouReportData) { - console.error(`No iouReportData found for reportID ${iouReportID}, report it most likely settled.`); + console.debug(`No iouReportData found for reportID ${iouReportID}, report is most likely settled.`); return; } return getSimplifiedIOUReport(iouReportData, chatReportID);
14
diff --git a/src/og/control/LayerSwitcher.js b/src/og/control/LayerSwitcher.js @@ -23,7 +23,10 @@ class LayerSwitcher extends Control { this.overlaysContainer = null; this.layerRecord = null; // Each layer record has it's own dropzone to the top of the div. We need a final one to the very end. - this.lastDropZone = elementFactory('div', { id: 'og-last-layer-drop-zone', class: 'og-layer-record-drop-zone' }); + this.lastDropZone = elementFactory('div', { + id: 'og-last-layer-drop-zone', + class: 'og-layer-record-drop-zone' + }); this._id = LayerSwitcher.numSwitches++; } @@ -86,7 +89,6 @@ class LayerSwitcher extends Control { this.layerRecord.appendChild(info); container.appendChild(this.layerRecord); - // Drag events for the layer-record (for CSS styling) thelayerRecord.addEventListener('dragstart', () => { thelayerRecord.classList.add('og-dragging'); @@ -112,7 +114,7 @@ class LayerSwitcher extends Control { obj._removeCallback = function () { container.removeChild(thelayerRecord); - }; + } } assignZindexesPerDialogOrder() { // See how user has placed overlays in switcher and change ZIndexes accordingly (start 10000, go down 100) @@ -124,7 +126,6 @@ class LayerSwitcher extends Control { for (var i = 0; i < dialog_layer_ids.length; i++) { let the_layer = visible_overlays.filter(x => x.getID() == dialog_layer_ids[i]); the_layer[0].setZIndex(10000 - i * 100); - } } @@ -139,7 +140,7 @@ class LayerSwitcher extends Control { dropZone.addEventListener('dragleave', (e) => { e.preventDefault(); dropZone.classList.remove('og-drag-over'); - }) + }); } dropZonedrop(dropZone) { @@ -178,7 +179,7 @@ class LayerSwitcher extends Control { terrainRecord.appendChild(info); this.terrainContainer.appendChild(terrainRecord); - if(id ==0){ + if (id === 0) { input.checked = true; } @@ -199,8 +200,14 @@ class LayerSwitcher extends Control { createDialog() { this.terrainContainer = elementFactory('div', { class: 'og-terrain-switcher-container og-layer-container' }, 'Terrain Providers') this.baseLayersContainer = elementFactory('div', { class: 'og-layer-switcher-base-layer-container og-layer-container' }, 'Base Layers'); - this.overlaysContainer = elementFactory('div', { id: 'og-overlay-container', class: 'og-layer-switcher-overlay-container og-layer-container' }, 'Overlays'); - this.dialog = elementFactory('div', { id: 'og-layer-switcher-dialog', class: 'og-layer-switcher og-dialog og-hide' }); + this.overlaysContainer = elementFactory('div', { + id: 'og-overlay-container', + class: 'og-layer-switcher-overlay-container og-layer-container' + }, 'Overlays'); + this.dialog = elementFactory('div', { + id: 'og-layer-switcher-dialog', + class: 'og-layer-switcher og-dialog og-hide' + }); this.renderer.div.appendChild(this.dialog); this.dialog.appendChild(this.terrainContainer); this.dialog.appendChild(this.baseLayersContainer); @@ -211,17 +218,10 @@ class LayerSwitcher extends Control { let baseLayers = layers.filter(x => x.isBaseLayer()); let overlays = layers.filter(x => !x.isBaseLayer()); let overlays_sorted = overlays.sort((a, b) => (a._zIndex < b._zIndex) ? 1 : -1) // Sort by zIndex, so I get the highest first - let overlays_new_zIndex = overlays_sorted.map((overlay, index) => { - overlay._zIndex = 10000 - index * 100; // First layer (highest zIndex) will be assigned 10000 and others 9900, 9800 etc - return overlay; - }) for (let i = 0; i < baseLayers.length; i++) { // Loop baselayers and add them, running the function this.onLayerAdded(baseLayers[i]); } - for (let i = 0; i < overlays_new_zIndex.length; i++) { // Loop overlays - with new zIndexes - and add them, running the function - this.onLayerAdded(overlays_new_zIndex[i]); - } // Create terrain records let terrainPool = [...this.planet._terrainPool]; @@ -231,14 +231,17 @@ class LayerSwitcher extends Control { this.createTerrainRecord(i, terrainPool[i]); } } - } + // Last dropZone events - haven't been attached before this.dropZoneBehaviour(this.lastDropZone); } createMenuBtn() { - let btn = elementFactory('div', { id: 'og-layer-switcher-menu-btn', class: 'og-layer-switcher og-has-dialog og-menu-btn og-OFF' }, + let btn = elementFactory('div', { + id: 'og-layer-switcher-menu-btn', + class: 'og-layer-switcher og-has-dialog og-menu-btn og-OFF' + }, elementFactory('div', { id: 'og-layer-switcher-menu-icon', class: 'og-icon-holder' })); this.renderer.div.appendChild(btn); }
2
diff --git a/client/app/app.js b/client/app/app.js @@ -12,7 +12,7 @@ import "angular-xeditable"; import ngLocale from "angular-dynamic-locale"; // config -import Common from "./common/common"; +import Services from "./services/services"; import PageComponents from "./components/pages"; import AppMaterial from "./app.material"; import AppLocalizeConfig from "./app.localizeConfig"; @@ -44,7 +44,7 @@ angular.module("app", [ ngCookies, translate, translateStorageCookie, - Common, + Services, PageComponents, logo ]).config(($stateProvider, $locationProvider, $urlRouterProvider, $httpProvider) => {
1
diff --git a/data/operators/amenity/fire_station.json b/data/operators/amenity/fire_station.json "displayName": "Chicago Fire Department", "id": "chicagofiredepartment-79af54", "locationSet": { - "include": [[-87.65, 41.9, 35]] + "include": [[-87.73, 41.83, 27]] }, "tags": { "amenity": "fire_station", "displayName": "Cincinnati Fire Department", "id": "cincinnatifiredepartment-2acc13", "locationSet": { - "include": [[-84.5, 39.16]] + "include": [[-84.54, 39.11, 16]] }, "tags": { "amenity": "fire_station", "displayName": "Kansas City Fire Department", "id": "kansascityfiredepartment-8e1536", "locationSet": { - "include": [[-94.5653, 39.1167, 15]], + "include": [[-94.58, 39.1, 32]], "exclude": ["us-ks.geojson"] }, "tags": { "displayName": "Los Angeles County Fire Department", "id": "losangelescountyfiredepartment-7d64c3", "locationSet": { - "include": [[-118, 33.85, 110]] + "include": [[-118.28, 33.84, 123]] }, "matchNames": ["lacfd", "lacofd"], "note": "This is the 'county' fire dept (differernt from the one listed below).", "displayName": "Los Angeles Fire Department", "id": "losangelesfiredepartment-434f0c", "locationSet": { - "include": [[-118, 33.85, 80]] + "include": [[-118.39, 34, 39]] }, "matchNames": [ "la city fire", "displayName": "Milwaukee Fire Department", "id": "milwaukeefiredepartment-fe5bf1", "locationSet": { - "include": [[-87.9, 43.05]] + "include": [[-87.98, 43.06, 17]] }, "tags": { "amenity": "fire_station", "displayName": "Minneapolis Fire Department", "id": "minneapolisfiredepartment-b6303c", "locationSet": { - "include": [[-93.36, 45, 55]] + "include": [[-93.27, 44.97, 10]] }, "tags": { "amenity": "fire_station", "displayName": "Santa Clara County Fire Department", "id": "santaclaracountyfiredepartment-76bab0", "locationSet": { - "include": [[-121.95, 37.35, 25]] + "include": [[-121.7, 37.2, 51]] }, "matchNames": ["sccfd"], "tags": {
7
diff --git a/lime/system/System.hx b/lime/system/System.hx @@ -6,6 +6,9 @@ import lime._backend.native.NativeCFFI; import lime.app.Application; import lime.app.Config; import lime.math.Rectangle; +import lime.utils.ArrayBuffer; +import lime.utils.UInt8Array; +import lime.utils.UInt16Array; #if flash import flash.net.URLRequest; @@ -593,16 +596,26 @@ class System { private static function get_endianness ():Endian { - // TODO: Make this smarter + if (endianness == null) { #if (ps3 || wiiu || flash) return BIG_ENDIAN; #else - return LITTLE_ENDIAN; + var arrayBuffer = new ArrayBuffer (2); + var uint8Array = new UInt8Array (arrayBuffer); + var uint16array = new UInt16Array (arrayBuffer); + uint8Array[0] = 0xAA; + uint8Array[1] = 0xBB; + if (uint16array[0] == 0xAABB) endianness = BIG_ENDIAN; + else endianness = LITTLE_ENDIAN; #end } + return endianness; + + } + }
7
diff --git a/lib/slack/oauth.js b/lib/slack/oauth.js @@ -11,7 +11,7 @@ module.exports = { // FIXME: make dynamic const scope = 'links:read,links:write,commands,chat:write,team:read'; const slackRootUrl = process.env.SLACK_ROOT_URL || 'https://slack.com'; - const state = crypto.randomBytes(Math.ceil(30 / 2)).toString('hex').slice(0, 30); + const state = crypto.randomBytes(15).toString('hex'); req.session.slackOAuthState = state;
4
diff --git a/src/client/js/components/PageEditor/LinkEditModal.jsx b/src/client/js/components/PageEditor/LinkEditModal.jsx @@ -74,7 +74,7 @@ class LinkEditModal extends React.PureComponent { let linkInputValue = ''; let linkerType = 'mdLink'; - // https://regex101.com/r/1UuWBJ/9 + // https://regex101.com/r/2fNmUN/1 if (MarkdownLink.match(/^\[\[.*\]\]$/) && this.isApplyPukiwikiLikeLinkerPlugin) { linkerType = 'pukiwikiLink'; const value = MarkdownLink.slice(2, -2); @@ -86,14 +86,14 @@ class LinkEditModal extends React.PureComponent { labelInputValue = value.slice(0, indexOfSplit); linkInputValue = value.slice(indexOfSplit + 1); } - // https://regex101.com/r/1UuWBJ/10 + // https://regex101.com/r/DJfkYf/1 else if (MarkdownLink.match(/^\[\/.*\]$/)) { linkerType = 'growiLink'; const value = MarkdownLink.slice(1, -1); labelInputValue = value; linkInputValue = value; } - // https://regex101.com/r/1UuWBJ/11 + // https://regex101.com/r/DZCKP3/1 else if (MarkdownLink.match(/^\[.*\]\(.*\)$/)) { const value = MarkdownLink.slice(1, -1); const indexOfSplit = value.lastIndexOf('](');
14
diff --git a/userscript.user.js b/userscript.user.js @@ -46031,18 +46031,22 @@ var $$IMU_EXPORT$$; var close_on_leave_el = get_close_on_leave_el() && popup_el && !popup_el_automatic; var outside_of_popup_el = false; + var popup_el_hidden = false; if (close_on_leave_el) { var popup_el_rect = popup_el.getBoundingClientRect(); - if (popup_el_rect.width > 0 && popup_el_rect.height > 0) { + if (popup_el_rect && popup_el_rect.width > 0 && popup_el_rect.height > 0) { if (!in_clientrect(mouseX, mouseY, popup_el_rect) && !in_img_jitter) { outside_of_popup_el = true; } + } else { + // the element must be hidden + popup_el_hidden = true; } } can_close_popup[1] = false; - if (mouse_in_image_yet && (!close_on_leave_el || outside_of_popup_el)) { + if (mouse_in_image_yet && (!close_on_leave_el || outside_of_popup_el || popup_el_hidden)) { if (imgmiddleX && imgmiddleY && (Math.abs(mouseX - imgmiddleX) > jitter_threshx || Math.abs(mouseY - imgmiddleY) > jitter_threshy)) {
11
diff --git a/packages/react-static/src/static/generateTemplates.js b/packages/react-static/src/static/generateTemplates.js @@ -9,11 +9,13 @@ export default async ({ config }) => { const route404 = routes.find(route => route.path === '404') const id404 = route404.templateIndex - const productionImports = ` -import universal, { setHasBabelPlugin } from '${ - process.env.REACT_STATIC_UNIVERSAL_PATH - }' - ` + // convert Windows-style path separators to the Unix style to ensure sure the + // string literal is valid and doesn't contain escaped characters + const reactStaticUniversalPath = process.env.REACT_STATIC_UNIVERSAL_PATH.split( + '\\' + ).join('/') + + const productionImports = `import universal, { setHasBabelPlugin } from '${reactStaticUniversalPath}'` const developmentImports = '' const productionTemplates = `
14
diff --git a/src/mavo.js b/src/mavo.js @@ -212,7 +212,7 @@ var _ = self.Mavo = $.Class({ if (location.hash) { this.element.addEventListener("mavo:load.mavo", evt => { var callback = records => { - var target = $(location.hash); + var target = document.getElementById(location.hash.slice(1)); if (target || !location.hash) { if (this.element.contains(target)) {
9
diff --git a/package.json b/package.json "body-parser": "^1.18.3", "chai": "^2.3.0", "del": "^3.0.0", + "del-cli": "^1.1.0", "endpoint-utils": "^1.0.1", "eslint": "4.17.0", "eslint-plugin-hammerhead": "0.1.10", ], "scripts": { "test": "gulp travis", - "publish-please": "publish-please", + "publish-please": "del-cli package-lock.json node_modules && npm i && publish-please", "prepublish": "publish-please guard" } }
7
diff --git a/module/gurps.js b/module/gurps.js @@ -1729,7 +1729,7 @@ Hooks.once('ready', async function () { }) let handle = (actor) => { actor.handleDamageDrop(dropData.payload) } - if (dropData.type === 'Item') handle = (actor) => { actor.createOwnedItem(game.items.get(dropData.id)) } + if (dropData.type === 'Item') handle = (actor) => { actor.handleItemDrop(dropData) } // actual targets are stored in game.user.targets if (targets.length === 0) return false
11
diff --git a/diorama.js b/diorama.js @@ -496,6 +496,7 @@ const createPlayerDiorama = ({ glyphBackground = false, dotsBackground = false, autoCamera = true, + detached = false, } = {}) => { // _ensureSideSceneCompiled(); @@ -844,9 +845,10 @@ const createPlayerDiorama = ({ renderer.setClearColor(oldClearColor, oldClearAlpha); }, destroy() { - dioramas.splice(dioramas.indexOf(diorama), 1); - - // postProcessing.removeEventListener('update', recompile); + const index = dioramas.indexOf(diorama); + if (index !== -1) { + dioramas.splice(index, 1); + } }, }; @@ -869,7 +871,9 @@ const createPlayerDiorama = ({ player.addEventListener('avatarchange', avatarchange); } */ + if (!detached) { dioramas.push(diorama); + } return diorama; };
0
diff --git a/src/tests/controllers/messageLength.test.ts b/src/tests/controllers/messageLength.test.ts import test, { ExecutionContext } from 'ava' -import { randomText, iterate } from '../utils/helpers' +import { randomText, iterate, sleep } from '../utils/helpers' import { addContact } from '../utils/save' import { deleteContact } from '../utils/del' import { sendMessage } from '../utils/msg' @@ -32,6 +32,7 @@ export async function messageLengthTest(t, node1, node2) { t.true(added, 'n1 should add n2 as contact') const date = new Date(Date.now()) + await sleep(2000) //NODE1 SENDS A TEXT MESSAGE TO NODE2 const text = randomText() await sendMessage(t, node1, node2, text)
0
diff --git a/site/_data/contributors.js b/site/_data/contributors.js @@ -5,7 +5,7 @@ module.exports = async function() { if (process.env.NODE_ENV === 'production') { try { const response = await got( - 'https://api.github.com/repos/stefanjudis/tiny-helpers/contributors' + 'https://api.github.com/repos/stefanjudis/tiny-helpers/contributors?per_page=100' ); return JSON.parse(response.body)
1
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -415,7 +415,7 @@ RED.nodes = (function() { nodeTabMap[z][node.id] = node; var nl = nodeLinks[node.id]; if (nl) { - nl.in.forEach((l) => { + nl.in.forEach(function(l) { var idx = linkTabMap[node.z].indexOf(l); if (idx != -1) { linkTabMap[node.z].splice(idx, 1); @@ -424,7 +424,7 @@ RED.nodes = (function() { linkTabMap[z].push(l); } }); - nl.out.forEach((l) => { + nl.out.forEach(function(l) { var idx = linkTabMap[node.z].indexOf(l); if (idx != -1) { linkTabMap[node.z].splice(idx, 1);
2
diff --git a/src/client/components/composer/NewRequest/WebRTCServerEntryForm.jsx b/src/client/components/composer/NewRequest/WebRTCServerEntryForm.jsx -import React, { useState, useEffect } from "react"; -import { Controlled as CodeMirror } from "react-codemirror2"; -import "codemirror/addon/edit/matchbrackets"; -import "codemirror/addon/edit/closebrackets"; -import "codemirror/theme/twilight.css"; -import "codemirror/lib/codemirror.css"; -import "codemirror/addon/hint/show-hint"; -import "codemirror/addon/hint/show-hint.css"; -import "codemirror-graphql/hint"; -import "codemirror-graphql/lint"; -import "codemirror-graphql/mode"; -import "codemirror/addon/lint/lint.css"; +import React, { useState, useEffect } from 'react'; +import { Controlled as CodeMirror } from 'react-codemirror2'; +import 'codemirror/addon/edit/matchbrackets'; +import 'codemirror/addon/edit/closebrackets'; +import 'codemirror/theme/twilight.css'; +import 'codemirror/lib/codemirror.css'; +import 'codemirror/addon/hint/show-hint'; +import 'codemirror/addon/hint/show-hint.css'; +import 'codemirror-graphql/hint'; +import 'codemirror-graphql/lint'; +import 'codemirror-graphql/mode'; +import 'codemirror/addon/lint/lint.css'; -const WebRTCBodyEntryForm = (props) => { +const WebRTServerEntryForm = (props) => { const { newRequestBody, newRequestBody: { bodyContent }, @@ -34,15 +34,15 @@ const WebRTCBodyEntryForm = (props) => { // conditionally render warning message warningMessage ? <div>{warningMessage.body}</div> : null } - <div className="composer-section-title">Body</div> + <div className="composer-section-title">TURN or STUN Servers</div> <div id="gql-body-entry" className="is-neutral-200-box p-3"> <CodeMirror value={cmValue} options={{ - mode: "graphql", - theme: "neo sidebar", - scrollbarStyle: "native", - lineNumbers: false, + mode: 'javascript', + theme: 'neo sidebar', + scrollbarStyle: 'native', + lineNumbers: true, lint: true, hintOptions: true, matchBrackets: true, @@ -51,7 +51,7 @@ const WebRTCBodyEntryForm = (props) => { tabSize: 2, }} editorDidMount={(editor) => { - editor.setSize("100%", 150); + editor.setSize('100%', 150); }} onBeforeChange={(editor, data, value) => { const optionObj = { @@ -59,8 +59,8 @@ const WebRTCBodyEntryForm = (props) => { completeSingle: false, }; setValue(value); - editor.setOption("lint", optionObj); - editor.setOption("hintOptions", optionObj); + editor.setOption('lint', optionObj); + editor.setOption('hintOptions', optionObj); }} onChange={(editor, data, value) => { editor.showHint(); @@ -76,4 +76,4 @@ const WebRTCBodyEntryForm = (props) => { ); }; -export default WebRTCBodyEntryForm; +export default WebRTServerEntryForm;
10
diff --git a/js/component/file-tile.js b/js/component/file-tile.js @@ -5,7 +5,7 @@ import {Thumbnail, TruncatedText, CreditAmount} from '../component/common.js'; let FileTile = React.createClass({ _isMounted: false, - _statusCheckInterval: 5000, + _fileInfoCheckInterval: 5000, propTypes: { metadata: React.PropTypes.object.isRequired, @@ -19,7 +19,7 @@ let FileTile = React.createClass({ costIncludesData: React.PropTypes.bool, }, updateFileInfo: function(progress=null) { - const updateStatusCallback = ((fileInfo) => { + const updateFileInfoCallback = ((fileInfo) => { if (!this._isMounted || 'fileInfo' in this.props) { /** * The component was unmounted, or a file info data structure has now been provided by the @@ -33,17 +33,17 @@ let FileTile = React.createClass({ local: !!fileInfo, }); - setTimeout(() => { this.updateFileInfo() }, this._statusCheckInterval); + setTimeout(() => { this.updateFileInfo() }, this._fileInfoCheckInterval); }); if ('sdHash' in this.props) { - lbry.getFileInfoBySdHash(this.props.sdHash, updateStatusCallback); + lbry.getFileInfoBySdHash(this.props.sdHash, updateFileInfoCallback); this.getIsMineIfNeeded(this.props.sdHash); } else if ('name' in this.props) { lbry.getFileInfoByName(this.props.name, (fileInfo) => { this.getIsMineIfNeeded(fileInfo.sd_hash); - updateStatusCallback(fileInfo); + updateFileInfoCallback(fileInfo); }); } else { throw new Error("No progress, stream name or sd hash passed to FileTile");
10
diff --git a/components/Article/PayNote.js b/components/Article/PayNote.js @@ -235,12 +235,22 @@ const generateKey = (note, index) => { return { ...note, key: `custom-${index}` } } +const isPermissibleIOSCta = cta => !cta || cta === 'trialForm' + const disableForIOS = note => { - return { ...note, target: { ...note.target, inNativeIOSApp: false } } + return { + ...note, + target: { + ...note.target, + inNativeIOSApp: + isPermissibleIOSCta(note.before.cta) && + isPermissibleIOSCta(note.after.cta) + } + } } const enableForTrialSignup = note => { - return note.before.cta === 'trialForm' + return note.before.cta === 'trialForm' || note.after.cta === 'trialForm' ? { ...note, target: { ...note.target, trialSignup: 'any' } } : note }
11
diff --git a/player-avatar-binding.js b/player-avatar-binding.js @@ -14,6 +14,11 @@ export function applyPlayerTransformsToAvatar(player, session, rig) { rig.inputs.rightGamepad.quaternion.copy(player.rightHand.quaternion); } } +/* export function applyPlayerMetaTransformsToAvatar(player, session, rig) { + if (!session) { + rig.velocity.copy(player.characterPhysics.velocity); + } +} */ export function applyPlayerModesToAvatar(player, session, rig) { const aimAction = player.getAction('aim'); const aimComponent = (() => { @@ -143,6 +148,7 @@ export function applyPlayerChatToAvatar(player, rig) { } export function applyPlayerToAvatar(player, session, rig) { applyPlayerTransformsToAvatar(player, session, rig); + // applyPlayerMetaTransformsToAvatar(player, session, rig); applyPlayerModesToAvatar(player, session, rig); applyPlayerActionsToAvatar(player, rig); applyPlayerChatToAvatar(player, rig);
0
diff --git a/data.js b/data.js @@ -5116,8 +5116,8 @@ module.exports = [ { name: "preact", github: "developit/preact", - tags: ["dom", "templating"], - description: "Tiny & fast Component-based Virtual DOM framework.", + tags: ["dom", "diff", "templating", "react", "components"], + description: "Preact is a fast, 3kB alternative to React, with the same ES2015 API", url: "https://github.com/developit/preact", source: "https://raw.githubusercontent.com/developit/preact/master/src/preact.js" },
0
diff --git a/src/module/actor/actor.js b/src/module/actor/actor.js @@ -286,7 +286,7 @@ export class ActorSFRPG extends Actor { modifiersToConcat = item.data.modifiers; break; case "feat": - if (item.data.labels && item.data.labels.featType === "Passive") { + if (item.data.activation.type === "") { modifiersToConcat = item.data.modifiers; } break;
1
diff --git a/src/Data.js b/src/Data.js @@ -296,6 +296,8 @@ CM.Data.ConfigDefault = { GCTimer: 1, Favicon: 1, WrinklerButtons: 1, + ShowMysteriousAchievements: 0, + ShowShadowMysteriousAchievements: 0, Header: {BarsColors: 1, Calculation: 1, Notification: 1, NotificationGC: 1, NotificationFC: 1, NotificationSea: 1, NotificationGard: 1, NotificationMagi: 1, NotificationWrink: 1, NotificationWrinkMax: 1, Tooltip: 1, Statistics: 1, Notation: 1, Miscellaneous: 1, Lucky: 1, Spells: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, };
0
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,16 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master where X.Y.Z is the semver of most recent plotly.js release. +## [1.49.3] -- 2019-08-20 + +### Fixed +- Fix graphs with `visible: false` `sankey` traces [#4123] +- Fix `scattergl` with `mode: 'text'` and `text` arrays longer + than the coordinates arrays [#4125, #4126] +- Fix `rangeslider` positioning when left margin is pushed + by other component [#4127] + + ## [1.49.2] -- 2019-08-13 ### Fixed
3
diff --git a/content/specs/machine-type.md b/content/specs/machine-type.md @@ -59,4 +59,4 @@ The currently available Xcode versions are as follows: * [Xcode 13.0 - 13.2 base image](../specs/versions-macos-xcode-13-0/): `13.0`, `13.1`, `13.2.1` * [Xcode 12.5 base image](../specs/versions-macos-xcode-12-5/): `12.5.1`, `12.5`, `12.4` * [Xcode 12.0 - 12.4 base image](../specs/versions-macos-xcode-12-0/): `12.4`, `12.3`, `12.2`, `12.1.1`, `12.0.1` -* [Xcode 11.x base image](../specs/versions-macos-xcode-11/): `11.7`, `11.6`, `11.5`. `11.4.1`, `11.3.1`. `11.2.1`, `11.1`. `11.0` +* [Xcode 11.x base image](../specs/versions-macos-xcode-11/): `11.7`
3
diff --git a/src/og/scene/Planet.js b/src/og/scene/Planet.js @@ -77,7 +77,13 @@ const EVENT_NAMES = [ * Triggered when some layer visibility changed. * @event og.scene.Planet#layervisibilitychange */ - "layervisibilitychange" + "layervisibilitychange", + + /** + * Triggered when all data is loaded + * @event og.scene.Planet#rendercompleted + */ + "rendercompleted" ]; /** @@ -394,6 +400,8 @@ class Planet extends RenderNode { this._initialized = false; this.always = []; + + this._renderCompleted = true; } static getBearingNorthRotationQuat(cartesian) { @@ -1044,11 +1052,31 @@ class Planet extends RenderNode { frame() { this._renderScreenNodesPASS(); - //if (HEIGHTPICKING) { this._renderHeightPickingFramebufferPASS(); - //} this.drawEntityCollections(this._frustumEntityCollections); + + this._checkRendercompleted(); + } + + _checkRendercompleted() { + if ( + this._plainSegmentWorker._pendingQueue.length === 0 && + this._tileLoader._loading === 0 && + this._tileLoader._queue.length === 0 && + (!this.terrain._loader || + (this.terrain._loader && + this.terrain._loader._loading === 0 && + this.terrain._loader._queue.length === 0)) && + this._terrainWorker._pendingQueue.length === 0 + ) { + if (!this._renderCompleted) { + this._renderCompleted = true; + this.events.dispatch(this.events.rendercompleted, true); + } + } else { + this._renderCompleted = false; + } } /**
0
diff --git a/package.json b/package.json "url-loader": "^1.1.2", "web-resource-inliner": "^4.2.1", "webpack": "^4.25.1", - "webpack-dev-server": "^3.1.10", + "webpack-dev-server": "^3.1.14", "webpack-node-externals": "^1.7.2", "worker-loader": "^2.0.0" }, "lodash": "^4.17.11", "loglevel": "^1.6.1", "loglevel-message-prefix": "^3.0.0", + "mgrs": "^1.0.0", "moment": "^2.22.2", "moment-timezone": "^0.5.23", "ngeohash": "^0.6.0",
0
diff --git a/packages/spark/base/inputs/_text-input.scss b/packages/spark/base/inputs/_text-input.scss @@ -45,7 +45,7 @@ $sprk-input-huge-box-shadow: 0 3px 10px 1px rgba(0, 0, 0, 0.08) !default; .sprk-b-InputContainer--huge .sprk-b-TextInput:focus { border-width: $sprk-text-input-huge-focus-border-width; } -.sprk-b-InputContainer--huge .sprk-b-TextInput:focus::placeholder { +.sprk-b-InputContainer--huge .sprk-b-TextInput::placeholder { font-size: $sprk-text-input-huge-font-size; } .sprk-b-InputContainer--huge .sprk-b-TextInput.sprk-b-TextInput--float-label { @@ -116,7 +116,7 @@ $sprk-input-huge-box-shadow: 0 3px 10px 1px rgba(0, 0, 0, 0.08) !default; .sprk-b-InputContainer--huge > :first-child.sprk-b-TextInput.sprk-b-TextInput--label-hidden:focus { padding: $sprk-text-input-huge-padding; } -.sprk-b-InputContainer--huge > :first-child.sprk-b-TextInput.sprk-b-TextInput--label-hidden:focus + .sprk-b-Label { +.sprk-b-InputContainer--huge > :first-child.sprk-b-TextInput.sprk-b-TextInput--label-hidden + .sprk-b-Label { left: -10000px; width: 1px; height: 1px;
1
diff --git a/packages/vulcan-lib/lib/modules/errors.js b/packages/vulcan-lib/lib/modules/errors.js /* +Get whatever word is contained between the first two double quotes + +*/ +const getFirstWord = input => { + const parts = /"([^"]*)"/.exec(input); + if (parts === null) { + return null; + } + return parts[1]; +} + +/* + +Parse a GraphQL error message + +Sample message: + +"GraphQL error: Variable "$data" got invalid value {"meetingDate":"2018-08-07T06:05:51.704Z"}. +In field "name": Expected "String!", found null. +In field "stage": Expected "String!", found null. +In field "addresses": Expected "[JSON]!", found null." + +*/ + +const parseErrorMessage = message => { + + // note: optionally add .slice(1) at the end to get rid of the first error, which is not that helpful + let fieldErrors = message.split('\n'); + + fieldErrors = fieldErrors.map(error => { + // field name is whatever is between the first to double quotes + const fieldName = getFirstWord(error); + if (error.includes('found null')) { + // missing field errors + return { + id: 'errors.required', + path: fieldName, + properties: { + name: fieldName, + }, + } + } else { + // other generic GraphQL errors + return { + message: error + } + } + }); + return fieldErrors; +} +/* + Errors can have the following properties stored on their `data` property: - id: used as an internationalization key, for example `errors.required` - path: for field-specific errors inside forms, the path of the field with the issue @@ -33,8 +85,8 @@ export const getErrors = error => { errors = [graphQLError.data]; } } else { - // 4. there is no data object, just use raw error - errors = [graphQLError]; + // 4. there is no data object, try to parse raw error message + errors = parseErrorMessage(graphQLError.message); } } return errors;
7
diff --git a/test/jasmine/tests/lib_number_format_test.js b/test/jasmine/tests/lib_number_format_test.js @@ -128,4 +128,10 @@ describe('number format', function() { expect(numberFormat(format)(String(-number))).toEqual(negExp, 'string negative'); }); }); + + it('padding and alignment without formatting numbers', function() { + expect(numberFormat('<10c')(123.456)).toEqual('123.456 ', 'left'); + expect(numberFormat('>10c')(123.456)).toEqual(' 123.456', 'right'); + expect(numberFormat('^10c')(123.456)).toEqual(' 123.456 ', 'center'); + }); });
0
diff --git a/token-metadata/0x5313E18463Cf2F4b68b392a5b11f94dE5528D01d/metadata.json b/token-metadata/0x5313E18463Cf2F4b68b392a5b11f94dE5528D01d/metadata.json "symbol": "ULLU", "address": "0x5313E18463Cf2F4b68b392a5b11f94dE5528D01d", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/app/models/carto/user_migration_export.rb b/app/models/carto/user_migration_export.rb @@ -33,7 +33,7 @@ module Carto update_attributes(state: STATE_EXPORTING) package = if backup - UserMigrationPackage.for_backup("backup_#{user.username}_#{Time.now}", log) + UserMigrationPackage.for_backup("backup_#{user.username}_#{Time.now.iso8601}", log) else UserMigrationPackage.for_export(id, log) end
4
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -266,9 +266,6 @@ articles: - title: "Picture" url: "/user-profile/user-picture" - - title: "User Search" - url: "/users/search" - - title: "User Metadata" url: "/metadata"
2
diff --git a/README.md b/README.md @@ -45,6 +45,13 @@ GET https://api.spacexdata.com/v1/launches/latest }, "core_serial": "B1031", "cap_serial": null, + "reuse": { + "core": true, + "side_core1": false, + "side_core2": false, + "fairings": false, + "capsule": false + }, "launch_site": { "site_id": "ksc_lc_39a", "site_name": "KSC LC 39A"
3
diff --git a/projects/ngx-extended-pdf-viewer/src/lib/ngx-extended-pdf-viewer.component.ts b/projects/ngx-extended-pdf-viewer/src/lib/ngx-extended-pdf-viewer.component.ts @@ -304,6 +304,7 @@ export class NgxExtendedPdfViewerComponent implements OnInit, AfterViewInit, OnC */ private autoHeight = false; + @Input() public minHeight: string | undefined = undefined; private _height = '100%';
11
diff --git a/experimental/orchestrator/CLI/ModelTuning/README.md b/experimental/orchestrator/CLI/ModelTuning/README.md @@ -5,7 +5,7 @@ The following sample illustrates how to evaluate and improve a simple language m ## Prerequisites * [Bot Framework CLI][5] -* [Bot Framework CLI Orchestrator plugin](1) +* [Bot Framework CLI Orchestrator plugin][1] * An understanding of [Orchestrator][6] feature usage. ## Walkthrough
1
diff --git a/src/traces/isosurface/attributes.js b/src/traces/isosurface/attributes.js @@ -136,7 +136,8 @@ colorscaleAttrs('', { min: 0, max: 1, dflt: 1, - description: 'Sets the opacity of the iso-surface.' + editType: 'calc', + description: 'Sets the fill ratio (opacity) of the iso-surface.' }, volumefill: { @@ -145,7 +146,8 @@ colorscaleAttrs('', { min: 0, max: 1, dflt: 0.15, - description: 'Sets the opacity of the iso-volume.' + editType: 'calc', + description: 'Sets the fill ratio (opacity) of the iso-volume.' }, slicefill: { @@ -154,7 +156,8 @@ colorscaleAttrs('', { min: 0, max: 1, dflt: 1, - description: 'Sets the opacity of the slices and caps.' + editType: 'calc', + description: 'Sets the fill ratio (opacity) of the slices and caps.' }, // Flat shaded mode
0
diff --git a/ReviewQueueHelper.user.js b/ReviewQueueHelper.user.js // @description Keyboard shortcuts, skips accepted questions and audits (to save review quota) // @homepage https://github.com/samliew/SO-mod-userscripts // @author @samliew -// @version 3.7.6 +// @version 3.7.7 // // @include https://*stackoverflow.com/review* // @include https://*serverfault.com/review* @@ -52,7 +52,7 @@ async function waitForSOMU() { const isSO = site === 'stackoverflow.com'; const superusers = [ 584192 ]; - const isSuperuser = superusers.includes(StackExchange.options.user.userId); + const isSuperuser = false && superusers.includes(StackExchange.options.user.userId); const queueType = /^\/review/.test(location.pathname) ? location.pathname.replace(/\/\d+$/, '').split('/').pop() : null; const filteredTypesElem = document.querySelector('.review-filter-summary'); @@ -993,20 +993,25 @@ async function waitForSOMU() { // return; //} - // Ignore these close reasons on SO + // Ignore these close reasons on SO-only if($('#closeReasonId-Duplicate').is(':checked')) { // dupes toastMessage('AUTO SKIP - ignore dupes'); skipReview(); return; } - else if($('#siteSpecificCloseReasonId-11-').is(':checked') && selOptCount < 2) { // typos + else if($('#siteSpecificCloseReasonId-11-').is(':checked')) { // typos toastMessage('AUTO SKIP - ignore typo'); skipReview(); return; } + else if($('#siteSpecificCloseReasonId-16-').is(':checked')) { // software recs + toastMessage('AUTO SKIP - ignore softrec'); + skipReview(); + return; + } // Ignore migrations - if($('siteSpecificCloseReasonId-2-').is(':checked') || $('input[name="belongsOnBaseHostAddress"]:checked').length > 0) { // migrate + if($('#siteSpecificCloseReasonId-2-').is(':checked') || $('input[name="belongsOnBaseHostAddress"]:checked').length > 0) { // migrate //$('#closeReasonId-NeedsDetailsOrClarity').prop('checked', true).trigger('click'); // default to unclear? toastMessage('AUTO SKIP - ignore migrations'); skipReview();
8
diff --git a/server/services/searchLinkedCatAuthorview.php b/server/services/searchLinkedCatAuthorview.php @@ -14,9 +14,9 @@ $post_params = $_POST; $result = search("linkedcat_authorview", $dirty_query, $post_params, - array("author_id", "doc_count", "living_dates", "image_link"), + array("author_name", "doc_count", "living_dates", "image_link"), ";", - null, + null ); echo $result
3
diff --git a/outbound/queue.js b/outbound/queue.js @@ -50,7 +50,7 @@ const temp_fail_queue = exports.temp_fail_queue = new TimerQueue(); let queue_count = 0; -exports.get_stats = () => in_progress + '/' + exports.delivery_queue.length() + '/' + exports.temp_fail_queue.length() +exports.get_stats = () => `${in_progress}/${exports.delivery_queue.length()}/${exports.temp_fail_queue.length()}`; exports.list_queue = cb => { exports._load_cur_queue(null, exports._list_file, cb); @@ -157,7 +157,7 @@ exports.load_queue_files = (pid, input_files, iteratee, callback) => { callback = callback || function () {}; if (searchPid) { - logger.loginfo("[outbound] Grabbing queue files for pid: " + pid); + logger.loginfo(`[outbound] Grabbing queue files for pid: ${pid}`); } else { logger.loginfo("[outbound] Loading the queue..."); @@ -208,7 +208,7 @@ exports.stats = () => { exports._list_file = (file, cb) => { const tl_reader = fs.createReadStream(path.join(queue_dir, file), {start: 0, end: 3}); tl_reader.on('error', err => { - console.error("Error reading queue file: " + file + ":", err); + console.error(`Error reading queue file: ${file}:`, err); }); tl_reader.once('data', buf => { // I'm making the assumption here we won't ever read less than 4 bytes @@ -243,7 +243,7 @@ exports._list_file = (file, cb) => { exports.flush_queue = (domain, pid) => { if (domain) { exports.list_queue((err, qlist) => { - if (err) return logger.logerror("[outbound] Failed to load queue: " + err); + if (err) return logger.logerror(`[outbound] Failed to load queue: ${err}`); qlist.forEach(todo => { if (todo.domain.toLowerCase() != domain.toLowerCase()) return; if (pid && todo.pid != pid) return; @@ -258,7 +258,7 @@ exports.flush_queue = (domain, pid) => { } exports.load_pid_queue = pid => { - logger.loginfo("[outbound] Loading queue for pid: " + pid); + logger.loginfo(`[outbound] Loading queue for pid: ${pid}`); exports.load_queue(pid); } @@ -267,13 +267,13 @@ exports.ensure_queue_dir = () => { // this code is only run at start-up. if (fs.existsSync(queue_dir)) return; - logger.logdebug("[outbound] Creating queue directory " + queue_dir); + logger.logdebug(`[outbound] Creating queue directory ${queue_dir}`); try { fs.mkdirSync(queue_dir, 493); // 493 == 0755 } catch (err) { if (err.code !== 'EEXIST') { - logger.logerror("[outbound] Error creating queue directory: " + err); + logger.logerror(`[outbound] Error creating queue directory: ${err}`); throw err; } } @@ -311,7 +311,7 @@ exports.scan_queue_pids = cb => { fs.readdir(queue_dir, (err, files) => { if (err) { - logger.logerror("[outbound] Failed to load queue directory (" + queue_dir + "): " + err); + logger.logerror(`[outbound] Failed to load queue directory (${queue_dir}): ${err}`); return cb(err); }
14
diff --git a/app/components/ember-survey.js b/app/components/ember-survey.js @@ -5,6 +5,7 @@ import {computed } from '@ember/object'; import { pluralize } from 'ember-inflector'; export default Component.extend({ + tagName: '', router: service(), init() { this._super(...arguments);
13
diff --git a/src/views/community/index.js b/src/views/community/index.js @@ -13,6 +13,7 @@ import Icon from '../../components/icons'; import generateMetaInfo from 'shared/generate-meta-info'; import AppViewWrapper from '../../components/appViewWrapper'; import Column from '../../components/column'; +import { Button } from '../../components/buttons'; import ThreadFeed from '../../components/threadFeed'; import ListCard from './components/listCard'; import Search from './components/search'; @@ -196,28 +197,26 @@ class CommunityViewPure extends Component { <Head title={title} description={description} /> <CoverColumn> - <CoverPhoto src={community.coverPhoto}> - {// if the user is logged in and doesn't own the community, - // add a button on top of the cover photo that will allow - // the person to leave the community - isLoggedIn && - (!community.communityPermissions.isOwner && - community.communityPermissions.isMember) && - <CoverButton - glyph="minus-fill" - color="bg.default" - hoverColor="bg.default" - opacity="0.5" - tipText="Leave community" - tipLocation="left" - onClick={() => this.toggleMembership(community.id)} - />} - </CoverPhoto> - + <CoverPhoto src={community.coverPhoto} /> <CoverRow className={'flexy'}> <Column type="secondary" className={'inset'}> <CommunityProfile data={{ community }} profileSize="full" /> - + {isLoggedIn && + (!community.communityPermissions.isOwner && + community.communityPermissions.isMember) && + <Button + onClick={() => this.toggleMembership(community.id)} + gradientTheme={'text'} + color={'text.alt'} + hoverColor={'warn.default'} + style={{ + width: '100%', + margin: '16px 0', + backgroundImage: 'none', + }} + > + Leave {community.name} + </Button>} {!isMobile && <ChannelListCard slug={communitySlug.toLowerCase()}
14
diff --git a/articles/support/pre-deployment/tests/best-practice.md b/articles/support/pre-deployment/tests/best-practice.md @@ -8,10 +8,10 @@ The following checks cannot be automated, so we recommend manually checking thes | Check | Description | | ---- | ----------- | -| Anomaly Detection | Review your account's [Anomaly Detection](/anomaly-detection) capability and configuration | -| Externalize Configuration Parameters | [Externalize, instead of hard code, all configuration parameters](/connections/database/mysql#4-add-configuration-parameters), such as credentials, connection strings, API keys, etc, when developing Rules, Hooks, or custom database connections | +| [Anomaly Detection](/anomaly-detection) | Review your account's [Anomaly Detection](${manage_url}/#/anomaly) capability and configuration | +| Externalize [Configuration Parameters](/connections/database/mysql#4-add-configuration-parameters) | [Externalize, instead of hard code, all configuration parameters](${manage_url}/#/connections/database), such as credentials, connection strings, API keys, etc, when developing Rules, Hooks, or custom database connections | | Restrict Delegation | If not using Delegation, set the Allowed Apps and APIs field of your Client Settings to the current Client ID | -| SSO Timeout Values | Review the default SSO cookie timeout value and ensure it aligns with your requirements | +| SSO Timeout Values | Review the default [SSO cookie timeout values](${manage_url}/#/account/advanced) and ensure it aligns with your requirements | | Tenants and Administrators | Review all tenants and tenant administrators to ensure they are correct. Decommission tenants that are no longer in use. Ensure that tenant administrators are limited to the necessary users. | | Verify Client Ids in App Code | Ensure that the Client IDs in your application code match those with their Auth0 Client configurations | | Whitelist Auth0 Public IPs | Whitelist Auth0 IPs if you're connecting to internal services or services behind a firewall when using Rules, Hooks, or custom databases | \ No newline at end of file
0
diff --git a/source/views/panels/PopOverView.js b/source/views/panels/PopOverView.js @@ -269,7 +269,6 @@ const PopOverView = Class({ - atNode -> the node within the view to align to - positionToThe -> 'bottom'/'top'/'left'/'right' - alignEdge -> 'left'/'centre'/'right'/'top'/'middle'/'bottom' - - inParent -> The view to insert the pop over in (optional) - showCallout -> true/false - offsetLeft - offsetTop
2
diff --git a/admin/admin.js b/admin/admin.js @@ -2763,7 +2763,7 @@ function getDashCard(dev, groupImage) { } else if (stateDef.role == 'level.dimmer' && stateDef.write) { val = `<span class="range-field dash"><input type="range" min="0" max="100" ${(val != undefined) ? `value="${val}"` : ""} /></span>`; } else if (stateDef.role == 'level.color.temperature' && stateDef.write) { - val = `<span class="range-field dash"><input type="range" min="200" max="9000" ${(val != undefined) ? `value="${val}"` : ""} /></span>`; + val = `<span class="range-field dash"><input type="range" min="150" max="500" ${(val != undefined) ? `value="${val}"` : ""} /></span>`; } else if (stateDef.type == 'boolean') { const disabled = (stateDef.write) ? '' : 'disabled="disabled"'; val = `<label class="dash"><input type="checkbox" ${(val == true) ? "checked='checked'" : ""} ${disabled}/><span></span></label>`;
12
diff --git a/src/core/config/Categories.json b/src/core/config/Categories.json "Entropy", "Frequency distribution", "Chi Square", - "Haversine distance", "Detect File Type", "Scan for Embedded Files", "Disassemble x86", "Generate UUID", "Generate TOTP", "Generate HOTP", + "Haversine distance", "Render Image", "Remove EXIF", "Extract EXIF",
5
diff --git a/src/inner-slider.js b/src/inner-slider.js @@ -309,7 +309,7 @@ export class InnerSlider extends React.Component { ...this.props, ...this.state, trackRef: this.track, - useCSS: !dontAnimate, + useCSS: this.props.useCSS && !dontAnimate, }) if (!state) return beforeChange && beforeChange(currentSlide, state.currentSlide)
1
diff --git a/lib/node_modules/@stdlib/_tools/github/dispatch-workflow/examples/index.js b/lib/node_modules/@stdlib/_tools/github/dispatch-workflow/examples/index.js var dispatch = require( './../lib' ); var opts = { - 'token': 'c1a3e8dc2d76eec68f3435a820812560f2ee058b', + 'token': '<your_token_goes_here>', 'useragent': 'my-unique-agent' };
14
diff --git a/thali/install/ios/nativeInstaller.js b/thali/install/ios/nativeInstaller.js @@ -204,7 +204,7 @@ function addFramework( var buildDir = path.join(checkoutDir, 'thali-ios', 'Carthage', 'Build'); console.log('Building CocoaAsyncSocket.framework'); - return biuldCocoaAsyncSocket(checkoutDir, buildDir, buildWithTests) + return buildCocoaAsyncSocket(checkoutDir, buildDir, buildWithTests) }) .then (function () { console.log('Building CocoaAsyncSocket.framework has been finished'); @@ -212,7 +212,7 @@ function addFramework( var checkoutDir = path.join(frameworkOutputDir, 'Carthage', 'Checkouts'); var buildDir = path.join(checkoutDir, 'thali-ios', 'Carthage', 'Build'); - return biuldSwiftXCTest(checkoutDir, buildDir, buildWithTests) + return buildSwiftXCTest(checkoutDir, buildDir, buildWithTests) }) .then (function () { // We need to build ThaliCore.framework before embedding it into the project @@ -267,7 +267,7 @@ function checkoutThaliCoreViaCarthage(cartfileDir, outputDir, buildWithTests) { }) } -function biuldCocoaAsyncSocket(checkoutDir, buildDir, buildWithTests) { +function buildCocoaAsyncSocket(checkoutDir, buildDir, buildWithTests) { var projectDir = 'CocoaAsyncSocket'; var projectName = 'CocoaAsyncSocket'; var projectScheme = 'iOS Framework'; @@ -318,7 +318,7 @@ function biuldCocoaAsyncSocket(checkoutDir, buildDir, buildWithTests) { }); } -function biuldSwiftXCTest(checkoutDir, buildDir, buildWithTests) { +function buildSwiftXCTest(checkoutDir, buildDir, buildWithTests) { var projectDir = 'swift-corelibs-xctest'; var projectName = 'XCTest' var projectScheme = 'SwiftXCTest-iOS';
1
diff --git a/lib/node_modules/@stdlib/math/base/complex/divide/test/test.js b/lib/node_modules/@stdlib/math/base/complex/divide/test/test.js @@ -233,7 +233,7 @@ tape( 'the function computes a complex quotient', function test( t ) { q = cdiv( re1[ i ], im1[ i ], re2[ i ], im2[ i ] ); if ( quotients.qreNaN[ i ] ) { - t.ok( isnan( q[ 0 ] ), 'real part is NaN' ); + t.strictEqual( isnan( q[ 0 ] ), true, 'real part is NaN' ); } else if ( quotients.qreFinite[ i ] ) { if ( q[ 0 ] === quotients.qre[ i ] ) { t.strictEqual( q[ 0 ], quotients.qre[ i ], 'returns expected real component' ); @@ -243,10 +243,10 @@ tape( 'the function computes a complex quotient', function test( t ) { t.ok( delta <= tol, 'within tolerance. x: '+re1[i]+'+ '+im1[i]+'i. y: '+re2[i]+'+ '+im2[i]+'i. real: '+q[0]+'. expected: '+quotients.qre[i]+'. delta: '+delta+'. tol: '+tol+'.' ); } } else { - t.ok( isinfinite( q[ 0 ] ), 'real part is infinite' ); + t.strictEqual( isinfinite( q[ 0 ] ), true, 'real part is infinite' ); } if ( quotients.qimNaN[ i ] ) { - t.ok( isnan( q[ 1 ] ), 'imaginary part is NaN' ); + t.strictEqual( isnan( q[ 1 ] ), true, 'imaginary part is NaN' ); } else if ( quotients.qimFinite[ i ]) { if ( q[ 1 ] === quotients.qim[ i ] ) { t.strictEqual( q[ 1 ], quotients.qim[ i ], 'returns expected imaginary component' ); @@ -256,7 +256,7 @@ tape( 'the function computes a complex quotient', function test( t ) { t.ok( delta <= tol, 'within tolerance. x: '+re1[i]+'+ '+im1[i]+'i. y: '+re2[i]+'+ '+im2[i]+'i. imag: '+q[1]+'. expected: '+quotients.qre[i]+'. delta: '+delta+'. tol: '+tol+'.' ); } } else { - t.ok( isinfinite( q[ 1 ] ), 'imaginary part is infinite' ); + t.strictEqual( isinfinite( q[ 1 ] ), true, 'imaginary part is infinite' ); } if ( isnan( q[ 0 ] ) || isnan( q[ 1 ] ) ) { t.strictEqual( isnan( q[ 0 ] ), isnan( q[ 1 ] ), 'both components are NaN' );
4
diff --git a/src/context/actions/hooksTestCaseActions.ts b/src/context/actions/hooksTestCaseActions.ts @@ -10,7 +10,7 @@ export const actionTypes = { DELETE_HOOKRENDER: 'DELETE_HOOKRENDER', UPDATE_HOOKRENDER: 'UPDATE_HOOKRENDER', ADD_HOOK_UPDATES: 'ADD_HOOK_UPDATES', - DELETE_HOOK_UPDATES: 'DELETE_HOOK_UPDATE', + DELETE_HOOK_UPDATES: 'DELETE_HOOK_UPDATES', UPDATE_HOOK_UPDATES: 'UPDATE_HOOK_UPDATES', UPDATE_HOOKS_FILEPATH: 'UPDATE_HOOKS_FILEPATH', UPDATE_CONTEXT_FILEPATH: 'UPDATE_CONTEXT_FILEPATH',
1
diff --git a/airesources/PHP/src/Ship.php b/airesources/PHP/src/Ship.php @@ -36,6 +36,12 @@ class Ship extends Entity */ private $planet; + /** + * @var Coordinate + */ + private $coordinateNextTurn; + + public function __construct( Player $owner, int $id, @@ -121,7 +127,8 @@ class Ship extends Entity $angleRad = $this->getCoordinate()->getAngleTo($target); $obstacles = $map->getEntitiesBetween($this, $target); - if ($avoidObstacles && $obstacles->current()) { + $obstacles = iterator_to_array($obstacles); + if ($avoidObstacles && $obstacles) { $newTargetDx = cos($angleRad + $angularStepRad) * $distance; $newTargetDy = sin($angleRad + $angularStepRad) * $distance; $newTarget = new Coordinate($this->getCoordinate()->getX() + $newTargetDx, $this->getCoordinate()->getY() + $newTargetDy); @@ -138,14 +145,16 @@ class Ship extends Entity $angleDeg = self::angleRadToDegClipped($angleRad); $logger->log('Distance: '.$distance.' / AngleRad: '.$angleRad.' / AngleDeg: '.$angleDeg.' / Thrust '.$computedThrust); - + $this->coordinateNextTurn = $target->forecastMove($computedThrust, $angleDeg); return $this->thrust($computedThrust, $angleDeg); } - /** - * @return null|Planet - */ - public function getPlanet() + public function getCoordinateNextTurn(): ?Coordinate + { + return $this->coordinateNextTurn; + } + + public function getPlanet(): ?\Planet { return $this->planet; } @@ -175,4 +184,6 @@ class Ship extends Entity ] ); } + + }
12
diff --git a/data.js b/data.js @@ -5134,7 +5134,7 @@ module.exports = [ github: "gibbok/animatelo", tags: ["animation", "animate", "web animation"], description: "Animatelo is a bunch of cool, fun, and cross-browser animations for you to use in your projects. This is a porting to Web Animation API of the fabulous animate.css project.", - url: "https://github.com/gibbok/animatelo", + url: "https://gibbok.github.io/animatelo/", source: "https://raw.githubusercontent.com/gibbok/animatelo/master/dist/animatelo.min.js" } ];
0