code
stringlengths
122
4.99k
label
int64
0
14
diff --git a/magefile/actions.go b/magefile/actions.go @@ -121,6 +121,12 @@ func Delete() error { return SpartaCommand("delete") } +// Explore opens up the terminal GUI +func Explore() error { + // Get the bucketName + return SpartaCommand("explore") +} + // Status returns a report for the given status func Status(plaintext ...bool) error { if len(plaintext) == 1 && plaintext[0] {
0
diff --git a/api/lib/services/agent/agent.converse-generate-response.service.js b/api/lib/services/agent/agent.converse-generate-response.service.js @@ -178,6 +178,9 @@ module.exports = async function ({ agent, action, context, currentFrame, rasaRes } const missingKeywords = _.filter(requiredSlots, (slot) => { + if (currentFrame.slots[slot.slotName] && Array.isArray(currentFrame.slots[slot.slotName])){ + return currentFrame.slots[slot.slotName].length === 0; + } return !currentFrame.slots[slot.slotName]; }); conversationStateObject.slots = currentFrame.slots; @@ -334,7 +337,7 @@ module.exports = async function ({ agent, action, context, currentFrame, rasaRes templateContext: conversationStateObject }); if (webhookResponse.textResponse) { - return { textResponse: webhookResponse.textResponse, actions: webhookResponse.actions ? webhookResponse.actions : [] }; + return { textResponse: webhookResponse.textResponse, actions: webhookResponse.actions ? webhookResponse.actions : [], actionWasFulfilled: true }; } conversationStateObject.webhookResponse = { ...webhookResponse }; const response = await agentService.converseCompileResponseTemplates({ responses: conversationStateObject.action.responses, templateContext: conversationStateObject });
9
diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.js b/src/pages/EnablePayments/AdditionalDetailsStep.js @@ -170,28 +170,11 @@ class AdditionalDetailsStep extends React.Component { if (this.props.walletAdditionalDetails.errorCode === CONST.WALLET.ERROR.SSN) { if (!ValidationUtils.isValidSSNFullNine(values[INPUT_IDS.SSN])) { errors[INPUT_IDS.SSN] = this.props.translate(this.errorTranslationKeys.ssnFull9); - } else { - const errorsObject = this.props.walletAdditionalDetails.errors; - if (!_.isEmpty(errorsObject)) { - const elementKey = _.keys(errorsObject)[0]; - if (this.props.walletAdditionalDetails.errors[elementKey] !== 'We\'re having trouble verifying your SSN. Please enter the full 9 digits of your SSN.') { - if (typeof this.props.walletAdditionalDetails.errors[elementKey] === 'string') { - // Get the first element of the errors object. - errors[INPUT_IDS.SSN] = this.props.walletAdditionalDetails.errors[elementKey]; - } else { - errors[INPUT_IDS.SSN] = 'There was an error'; - } - } - } } } else if (!ValidationUtils.isValidSSNLastFour(values[INPUT_IDS.SSN])) { errors[INPUT_IDS.SSN] = this.props.translate(this.errorTranslationKeys.ssn); } - // We need to make sure the draft values from the form are saved to the draft Wallet Additional Details Onyx - // object because the draft Wallet Additional Details Onyx object is populated by several forms in several steps. - FormActions.setDraftValues(ONYXKEYS.WALLET_ADDITIONAL_DETAILS, this.props.walletAdditionalDetailsDraft); - return errors; } @@ -211,10 +194,6 @@ class AdditionalDetailsStep extends React.Component { ssn: values[INPUT_IDS.SSN], }; - // Clear any errors that were sent by the server. - FormActions.setErrors(ONYXKEYS.WALLET_ADDITIONAL_DETAILS, null); - FormActions.setErrorFields(ONYXKEYS.WALLET_ADDITIONAL_DETAILS, null); - // Attempt to set the personal details Wallet.updatePersonalDetails(personalDetails); }
9
diff --git a/src/components/FullPageOfflineBlockingView.js b/src/components/FullPageOfflineBlockingView.js @@ -10,6 +10,7 @@ import * as Expensicons from './Icon/Expensicons'; import themeColors from '../styles/themes/default'; import styles from '../styles/styles'; import compose from '../libs/compose'; +import variables from '../styles/variables'; const propTypes = { /** Child elements */ @@ -31,8 +32,8 @@ const FullPageOfflineBlockingView = (props) => { <Icon src={Expensicons.OfflineCloud} fill={themeColors.offline} - width={50} - height={50} + width={variables.iconSizeMondo} + height={variables.iconSizeMondo} /> <Text style={[styles.h1]}>{props.translate('common.youAppearToBeOffline')}</Text> <Text style={[styles.w70, styles.textAlignCenter]}>{props.translate('common.thisFeatureRequiresInternet')}</Text>
4
diff --git a/examples/layerFadingOpacity/layerFadingOpacity.html b/examples/layerFadingOpacity/layerFadingOpacity.html 'text': ri.name, 'size': 16, 'outline': 0, - //'face': "Lucida Console", - 'weight': "bold", 'color': "black", 'align': "center" },
1
diff --git a/README.md b/README.md @@ -91,7 +91,7 @@ framework with the [Chai](http://www.chaijs.com/) assertion library for unit tests. To run unit tests in Spark: 1. Navigate to the root of the Spark-Core or Spark-Extras repository -2. Make sure you have run `npm install` already +2. Run `npm install` if you have not already 3. Run `mocha --compilers js:babel-core/register ./tests/*.tests.js` 4. See test output in terminal to determine number of passing or failed tests
3
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js @@ -1028,7 +1028,7 @@ drawing.setClipUrl = function(s, localId, gd) { var context = gd._context; var baseUrl = context._exportedPlot ? '' : (context._baseUrl || ''); - s.attr('clip-path', 'url(' + baseUrl + '#' + localId + ')'); + s.attr('clip-path', 'url(\'' + baseUrl + '#' + localId + '\')'); }; drawing.getTranslate = function(element) {
0
diff --git a/scenes/street.scn b/scenes/street.scn "position": [-2, 1, 2], "quaternion": [0, 0.7071067811865475, 0, 0.7071067811865476], "start_url": "https://webaverse.github.io/helm/" - }, - { - "position": [0, -60, 0], - "quaternion": [0, 0, 0, 1], - "start_url": "../metaverse_modules/land/", - "components": [ - { - "key": "minLodRange", - "value": 2 - }, - { - "key": "lods", - "value": 3 - }, - { - "key": "debug", - "value": true - } - ] } ] } \ No newline at end of file
2
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js @@ -1352,6 +1352,68 @@ describe('Test event property of interactions on a geo plot:', function() { }); }); +describe('Test geo base layers', function() { + afterEach(destroyGraphDiv); + + it('should clear obsolete features and layers on *geo.scope* relayout calls', function(done) { + var gd = createGraphDiv(); + + function _assert(geojson, layers) { + var cd0 = gd.calcdata[0]; + var subplot = gd._fullLayout.geo._subplot; + + expect(cd0[0].geojson).negateIf(geojson[0]).toBe(null); + expect(cd0[1].geojson).negateIf(geojson[1]).toBe(null); + + expect(Object.keys(subplot.layers).length).toEqual(layers.length, '# of layers'); + + d3.select(gd).selectAll('.geo > .layer').each(function(d, i) { + expect(d).toBe(layers[i], 'layer ' + d + ' at position ' + i); + }); + } + + Plotly.plot(gd, [{ + type: 'choropleth', + locations: ['CAN', 'FRA'], + z: [10, 20] + }], { + geo: {showframe: true} + }) + .then(function() { + _assert( + [true, true], + ['bg', 'coastlines', 'frame', 'backplot', 'frontplot'] + ); + return Plotly.relayout(gd, 'geo.scope', 'europe'); + }) + .then(function() { + _assert( + // 'CAN' is not drawn on 'europe' scope + [false, true], + // 'frame' is not drawn on scoped maps + // 'countries' are there by default on scoped maps + ['bg', 'countries', 'backplot', 'frontplot'] + ); + return Plotly.relayout(gd, 'geo.scope', 'africa'); + }) + .then(function() { + _assert( + [false, false], + ['bg', 'countries', 'backplot', 'frontplot'] + ); + return Plotly.relayout(gd, 'geo.scope', 'world'); + }) + .then(function() { + _assert( + [true, true], + ['bg', 'coastlines', 'frame', 'backplot', 'frontplot'] + ); + }) + .catch(fail) + .then(done); + }); +}); + describe('Test geo zoom/pan/drag interactions:', function() { var gd; var eventData;
0
diff --git a/views/products.blade.php b/views/products.blade.php <th>{{ $__t('QU stock') }}</th> <th>{{ $__t('QU factor') }}</th> <th>{{ $__t('Product group') }}</th> - <th>{{ $__t('Barcode(s)') }}</th> @include('components.userfields_thead', array( 'userfields' => $userfields <td> @if(!empty($product->product_group_id)) {{ FindObjectInArrayByPropertyValue($productGroups, 'id', $product->product_group_id)->name }} @endif </td> - <td> - {{ $product->barcode }} - </td> @include('components.userfields_tbody', array( 'userfields' => $userfields,
2
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js @@ -97,7 +97,7 @@ proto.tryCreatePlot = function() { gl: scene.gl, glOptions: { preserveDrawingBuffer: isMobile, - premultipliedAlpha: false, + premultipliedAlpha: true, antialias: true }, container: scene.container,
12
diff --git a/.travis.yml b/.travis.yml @@ -38,6 +38,7 @@ branches: # Before install, failures in this section will result in build status 'errored' before_install: + - npm i -g npm - npm install || exit 1 - docker run --rm -v "$PWD:/app" composer install - |
3
diff --git a/packages/mjml-cli/src/client.js b/packages/mjml-cli/src/client.js @@ -90,7 +90,15 @@ export default async () => { .help() .version(`mjml-core: ${coreVersion}\nmjml-cli: ${cliVersion}`).argv - const config = Object.assign(DEFAULT_OPTIONS, argv.c) + let fonts + + try { + fonts = argv.c && argv.c.fonts && JSON.parse(argv.c.fonts) + } catch (e) { + error(`Failed to decode JSON for config.fonts argument`) + } + + const config = Object.assign(DEFAULT_OPTIONS, argv.c, fonts && {fonts}) const inputArgs = pickArgs(['r', 'w', 'i', '_', 'm', 'v'])(argv) const outputArgs = pickArgs(['o', 's'])(argv)
11
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -1070,25 +1070,28 @@ articles: url: /monitor-auth0/streams children: - title: AWS EventBridge - url: 'https://marketplace.auth0.com/integrations/amazon-log-streaming' - forceFullReload: true - external: true + url: /monitor-auth0/streams/stream-logs-to-amazon-eventbridge + hidden: true - title: Azure Event Grid url: /monitor-auth0/streams/stream-logs-to-azure-event-grid + hidden: true - title: Datadog url: /monitor-auth0/streams/stream-logs-to-datadog + hidden: true children: - title: Datadog Dashboard Templates url: /monitor-auth0/streams/datadog-dashboard-templates hidden: true - title: Splunk url: /monitor-auth0/streams/stream-logs-to-splunk + hidden: true children: - title: Auth0 App for Splunk url: /monitor-auth0/streams/splunk-dashboard hidden: true - title: Sumo Logic url: /monitor-auth0/streams/stream-logs-to-sumo-logic + hidden: true children: - title: Auth0 App for Sumo Logic url: /monitor-auth0/streams/sumo-logic-dashboard
2
diff --git a/app/hotels/src/singleHotel/roomPicker/RoomPicker.js b/app/hotels/src/singleHotel/roomPicker/RoomPicker.js @@ -15,7 +15,7 @@ const styles = StyleSheet.create({ button: { backgroundColor: '#0097a9', width: 60, - paddingVertical: 10, + paddingVertical: 16, alignItems: 'center', }, minusButton: {
0
diff --git a/src/reducers/allAccounts.js b/src/reducers/allAccounts.js import { handleActions, combineActions } from 'redux-actions' import reduceReducers from 'reduce-reducers' -import { refreshAccountExternal } from '../actions/account' +import { refreshAccountExternal, updateStakingAccount, updateStakingLockup } from '../actions/account' const initialState = {} @@ -20,7 +20,23 @@ const allAccountsReducer = handleActions({ ...payload } } + }, + [updateStakingAccount]: (state, { error, meta, payload, ready }) => { + if (!ready || error) { + return state + } + + return { + ...state, + [meta.accountId]: { + ...state[meta.accountId], + balance: { + ...state[meta.accountId].balance, + account: payload + } + } } + }, }, initialState)
9
diff --git a/app/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb +# frozen_string_literal: true + module WikiPagesHelper acts_as_wiki_pages_helper def wiki_content( text ) @@ -10,13 +12,17 @@ module WikiPagesHelper def wiki_nav( text ) text.gsub( /\{\{nav.*?\}\}/ ) do | match | - page_titles = match[/nav(.*?)\}/, 1].split(',') + page_titles = match[/nav(.*?)\}/, 1].split( "," ) html = "<ul class='leftmenu'>" page_titles.each do | page_title | page_title.strip! - link_class = @page && @page.title.downcase == page_title.downcase ? 'active' : nil + link_class = @page && @page.title.downcase == page_title.downcase ? "active" : nil html += content_tag :li do - link_to page_title, wiki_link(page_title), :class => link_class + page = WikiPage.find_by_title( page_title ) + if page&.title != page_title + page = WikiPage.find_by_path( page_title.parameterize ) + end + link_to ( page&.title || page_title ), wiki_link( page&.path || page_title ), class: link_class end end html += "</ul>" @@ -28,14 +34,19 @@ module WikiPagesHelper pattern = /\{\{topnav.*?\}\}/ navtxt = @page.content[pattern, 0] return if navtxt.blank? - @page.content.gsub!(pattern, '') + + @page.content.gsub!( pattern, "" ) html = "<ul class='topmenu'>" - page_titles = navtxt[/nav(.*?)\}/, 1].split(',') + page_titles = navtxt[/nav(.*?)\}/, 1].split( "," ) page_titles.each do | page_title | page_title.strip! - link_class = @page && @page.title.downcase == page_title.downcase ? 'active' : nil + link_class = @page && @page.title.downcase == page_title.downcase ? "active" : nil html += content_tag :li do - link_to page_title, wiki_link(page_title), :class => link_class + page = WikiPage.find_by_title( page_title ) + if page&.title != page_title + page = WikiPage.find_by_path( page_title.parameterize ) + end + link_to ( page&.title || page_title ), wiki_link( page&.path || page_title ), class: link_class end end html += "</ul>" @@ -43,24 +54,36 @@ module WikiPagesHelper end def wiki_css( text ) - text.gsub(/<style.*?>(.*?)<\/style>/m) do |match| + text.gsub( %r{<style.*?>(.*?)</style>}m ) do | match | content_for( :extracss ) { match.html_safe } end end def wiki_page_attachments( page = @page ) - return unless Irwi::config.page_attachment_class_name + return unless Irwi.config.page_attachment_class_name html = "" page.attachments.each do | attachment | img = if attachment.image? - "<a target=\"_blank\" href=\"#{attachment.wiki_page_attachment.url(:original)}\">#{image_tag(attachment.wiki_page_attachment.url(:thumb))}</a>".html_safe + <<~HTML + <a + target="_blank" + href="#{attachment.wiki_page_attachment.url( :original )}" + > + #{image_tag( attachment.wiki_page_attachment.url( :thumb ) )} + </a> + HTML else - "<a target=\"_blank\" href=\"#{attachment.wiki_page_attachment.url(:original)}\">#{ t :view }</a>".html_safe - end - html += image_and_content(img, :image_size => 100, - :class => "stacked wiki_page_attachment") do - s = link_to(wt('Remove'), wiki_remove_page_attachment_path(attachment.id), :method => :delete, :class => "right") + "<a target=\"_blank\" href=\"#{attachment.wiki_page_attachment.url( :original )}\">#{t :view}</a>" + end + html += image_and_content( img.html_safe, image_size: 100, + class: "stacked wiki_page_attachment" ) do + s = link_to( + wt( "Remove" ), + wiki_remove_page_attachment_path( attachment.id ), + method: :delete, + class: "right" + ) s += content_tag( :label, "html" ) s += "<br/>".html_safe s += content_tag( :textarea, "<img src=\"#{attachment.wiki_page_attachment.url( :original )}\"/>" ) @@ -69,13 +92,13 @@ module WikiPagesHelper end html += form_for( Irwi.config.page_attachment_class.new, - :as => :wiki_page_attachment, - :url => wiki_add_page_attachment_path(page), - :html => { :multipart => true }) do |form| + as: :wiki_page_attachment, + url: wiki_add_page_attachment_path( page ), + html: { multipart: true } ) do | form | "<label>Add an attached image</label><br/>".html_safe + form.file_field( :wiki_page_attachment ) + - form.hidden_field(:page_id, :value => page.id) + - form.submit('Add attachment') + form.hidden_field( :page_id, value: page.id ) + + form.submit( "Add attachment" ) end html.html_safe end
11
diff --git a/lib/winston/logger.js b/lib/winston/logger.js @@ -359,14 +359,14 @@ Logger.prototype.query = function query(options, callback) { options = options || {}; const results = {}; - const query = common.clone(options.query) || {}; + const queryObject = common.clone(options.query) || {}; // // Helper function to query a single transport // function queryTransport(transport, next) { if (options.query) { - options.query = transport.formatQuery(query); + options.query = transport.formatQuery(queryObject); } transport.query(options, function (err, results) {
10
diff --git a/.github/workflows/windows_test_npm_install.yml b/.github/workflows/windows_test_npm_install.yml @@ -184,7 +184,7 @@ jobs: . "${{ env.NVS_HOME }}/nvs.sh" && nvs add ${{ matrix.NODE_VERSION }} echo '' echo 'Setting Node.js default executable...' - mkdir -p /usr/local/bin + mkdir -p -m 775 /usr/local/bin . "${{ env.NVS_HOME }}/nvs.sh" && nvs link ${{ matrix.NODE_VERSION }} echo '' echo "Activating Node.js version ${{matrix.NODE_VERSION }}..."
12
diff --git a/dapp/src/constants/Contract.js b/dapp/src/constants/Contract.js @@ -20,9 +20,9 @@ export const gasLimits = { // when the amount minted using multiple coins triggers the rebase function and not the allocate function MINT_MULTIPLE_REBASE_GAS_LIMIT: 957285, // when the amount minted using a single coin triggers the allocate function - MINT_ALLOCATE_GAS_LIMIT: 3051658, + MINT_ALLOCATE_GAS_LIMIT: 3451658, // when the amount minted using multiple coins triggers the allocate function - MINT_MULTIPLE_ALLOCATE_GAS_LIMIT: 3351658, + MINT_MULTIPLE_ALLOCATE_GAS_LIMIT: 3751658, // redeem/redeemAll gas limit REDEEM_GAS_LIMIT: 923514, // when the amount redeemed triggers the rebase function
9
diff --git a/lib/components/field-container.js b/lib/components/field-container.js @@ -2,9 +2,10 @@ import React from 'react'; import fieldMixin from '../mixins/field'; -// This component abstracts away our ugly old mixins into a component with a -// render callback. That way, we can eventually deprecate the mixins and do a -// much grander refactor. +// A better way to add new field types vs the old mixins approach. This +// component abstracts away our ugly old mixins into a component with a render +// callback. That way, we can eventually deprecate the mixins and do a much +// grander refactor. class FieldContainer extends React.Component { onChangeValue = fieldMixin.onChangeValue.bind(this); onBubbleValue = fieldMixin.onBubbleValue.bind(this);
7
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 @@ -22,9 +22,10 @@ When producing web content, **HTML elements** define the structure, purpose and Here are some benefits of using semantic HTML: -- It's easier for engineers to understand and to develop with. -- **Create faster, responsive, and better mobile user experiences.** It's easier to make responsive, have reduced file size, and load faster. -- Using semantic HTML Elements help search engines index pages and give more important to those that have them. +- It allows UX writers and developers to add meaning to content so search engines, screen readers and web browsers can understand it. +- It improves user experience. It's easier for engineers to understand and to develop with. +- It helps create faster, responsive, and better mobile user experiences. It's easier to make responsive, have reduced file size, and load faster. +- It helps web pages get better rankings. Search engines give more importance to those that have them. <SprkDivider element="span" additionalClasses="sprk-u-mvn" />
3
diff --git a/includes/Modules/AdSense.php b/includes/Modules/AdSense.php @@ -533,7 +533,7 @@ tag_partner: "site_kit" return function() { $account_id = $this->get_data( 'account-id' ); if ( ! is_wp_error( $account_id ) && $account_id ) { - return sprintf( 'https://www.google.com/adsense/new/u/0/%s/main/viewreports', $account_id ); + return sprintf( 'https://www.google.com/adsense/new/%s/main/viewreports', $account_id ); } return 'https://www.google.com/adsense/start'; };
2
diff --git a/manual.md b/manual.md @@ -567,20 +567,65 @@ The out of the box TypeScript compiler though relies on both extension-less modules and the Node.js module resolution logic to apply types to JavaScript modules. -In order to bridge this gap, Deno supports compiler hints that inform Deno the -location of `.d.ts` files and the JavaScript code they relate to. A compiler -hint looks like this: +In order to bridge this gap, Deno supports three ways of referencing type +definition files without having to resort to "magic" resolution. + +#### Compiler hint + +If you are importing a JavaScript module, and you know where the type definition +for that module is located, you can specify the type definition at import. This +takes the form of a compiler hint. Compiler hints inform Deno the location of +`.d.ts` files and the JavaScript code that is imported that they relate to. The +hint is `@deno-types` and when specified the value will be used in the compiler +instead of the JavaScript module. For example if you had `foo.js`, but you know +that along side of it was `foo.d.ts` which was the types for the file, the code +would look like this: ```ts // @deno-types="./foo.d.ts" import * as foo from "./foo.js"; ``` -Where the hint affects the next `import` statement (or `export ... from` -statement) where the value of the `@deno-types` will be substituted at compile -time instead of the specified module. Like in the above example, the Deno -compiler will load `./foo.d.ts` instead of `./foo.js`. Deno will still load -`./foo.js` when it runs the program. +The value follows the same resolution logic as importing a module, meaning the +file needs to have an extension and is relative to the current module. Remote +specifiers are also allowed. + +The hint affects the next `import` statement (or `export ... from` statement) +where the value of the `@deno-types` will be substituted at compile time instead +of the specified module. Like in the above example, the Deno compiler will load +`./foo.d.ts` instead of `./foo.js`. Deno will still load `./foo.js` when it runs +the program. + +#### Triple-slash reference directive in JavaScript files + +If you are hosting modules which you want to be consumed by Deno, and you want +to inform Deno the location of the type definitions, you can utilise a +triple-slash directive in the actual code. For example, if you have a JavaScript +module, where you want to provide Deno with the location of the type definitions +for that JavaScript file, which happens to be along side that file. You +JavaScript module named `foo.js` might look like this: + +```js +/// <reference types="./foo.d.ts" /> +export const foo = "foo"; +``` + +Deno will see this, and the compiler will use `foo.d.ts` when type checking the +file, though `foo.js` will be loaded at runtime. The resolution of the value of +the directive follows the same resolution logic as importing a module, meaning +the file needs to have an extension and is relative to the current file. Remote +specifiers are also allowed. + +#### X-TypeScript-Types custom header + +If you are hosting modules which you want to be consumed by Deno, and you want +to inform Deno the location of the type definitions, you can use a custom HTTP +header of `X-TypeScript-Types` to inform Deno of the location of that file. + +The header works in the same way as the triple-slash reference mentioned above, +it just means that the content of the JavaScript file itself does not need to be +modified, and the location of the type definitions can be determined by the +server itself. **Not all type definitions are supported.** @@ -592,11 +637,12 @@ include `node`, expecting to resolve to some path like `./node_modules/@types/node/index.d.ts`. Since this depends on non-relative "magical" resolution, Deno cannot resolve this. -**Why not use the triple-slash type reference?** +**Why not use the triple-slash type reference in TypeScript files?** The TypeScript compiler supports triple-slash directives, including a type reference directive. If Deno used this, it would interfere with the behavior of -the TypeScript compiler. +the TypeScript compiler. Deno only looks for the directive in JavaScript (and +JSX) files. ### Testing if current file is the main program
7
diff --git a/src/lib/gundb/UserPropertiesClass.js b/src/lib/gundb/UserPropertiesClass.js @@ -52,7 +52,7 @@ export default class UserProperties { data: {} constructor(gun: Gun) { - this.gun = gun.user().get('properties') + this.gun = gun this.ready = (async () => { let props @@ -110,10 +110,10 @@ export default class UserProperties { * Set value to multiple properties */ async updateAll(properties: { [string]: any }): Promise<boolean> { - const { gun, data } = this + const { data } = this assign(data, properties) - await gun.secret(data) + await this.props.secret(data) return true }
1
diff --git a/resources/twitter-logo.svg b/resources/twitter-logo.svg -<svg width="34" height="28" viewBox="0 0 34 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -<title>twitter-logo</title> +<svg width="34" height="34" viewBox="0 0 34 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +<title>Feather Icon</title> <desc>Created using Figma</desc> -<g id="Canvas" transform="translate(2054 357)"> -<g id="twitter-logo"> -<use xlink:href="#path0_fill" transform="translate(-2054 -357)" fill="#1DA1F2"/> +<g id="Canvas" transform="matrix(0.265625 0 0 0.265625 162.828 739.766)"> +<clipPath id="clip-0" clip-rule="evenodd"> +<path d="M -613 -2785L -485 -2785L -485 -2657L -613 -2657L -613 -2785Z" fill="#FFFFFF"/> +</clipPath> +<g id="Icon/Feather Icon" clip-path="url(#clip-0)"> +<g id="Ellipse"> +<use xlink:href="#path0_fill" transform="translate(-606 -2778)" fill="#1DA1F2"/> +</g> </g> </g> <defs> -<path id="path0_fill" d="M 10.6803 28C 23.5102 28 30.5306 17.2244 30.5306 7.89567C 30.5306 7.59252 30.5306 7.28937 30.517 6.98622C 31.8776 5.9941 33.0612 4.74016 34 3.32087C 32.7483 3.88583 31.4014 4.25787 29.9864 4.43701C 31.4286 3.5689 32.5306 2.17717 33.0612 0.523622C 31.7143 1.33661 30.2177 1.91535 28.6259 2.23228C 27.3469 0.854331 25.5374 2.10259e-07 23.5374 2.10259e-07C 19.6871 2.10259e-07 16.5578 3.16929 16.5578 7.0689C 16.5578 7.62008 16.6259 8.15748 16.7347 8.6811C 10.9388 8.39173 5.79592 5.56693 2.35374 1.29528C 1.7551 2.34252 1.41497 3.55512 1.41497 4.85039C 1.41497 7.30315 2.65306 9.46654 4.51701 10.7343C 3.37415 10.6929 2.29932 10.376 1.36054 9.85236C 1.36054 9.87992 1.36054 9.90748 1.36054 9.94882C 1.36054 13.3661 3.76871 16.2323 6.95238 16.8799C 6.36735 17.0453 5.7551 17.128 5.11565 17.128C 4.66667 17.128 4.23129 17.0866 3.80952 17.0039C 4.69388 19.815 7.27891 21.8543 10.3265 21.9094C 7.93197 23.811 4.92517 24.9409 1.65986 24.9409C 1.10204 24.9409 0.544217 24.9134 -2.07603e-07 24.8445C 3.07483 26.8287 6.7483 28 10.6803 28Z"/> +<path id="path0_fill" d="M 121 0C 57.75 0 0 57.75 0 121C 0 121 8.25 99 27.5 85.25C 46.75 71.5 85 82.75 96 58C 76.75 58 66 50 66 50C 88 50 121 32.0833 121 0Z"/> </defs> </svg>
14
diff --git a/src/js/services/pushNotificationsService.js b/src/js/services/pushNotificationsService.js @@ -102,7 +102,7 @@ angular.module('copayApp.services').factory('pushNotificationsService', function if (usePushNotifications) { FirebasePlugin.onTokenRefresh(function(token) { - if (!_token) return; + if (!token) return; $log.debug('Refresh and update token for push notifications...'); _token = token; root.enable();
1
diff --git a/index.html b/index.html else { if (options.releases && options.releases.items) { var $releaseSwitcher = $('#releaseSwitcher'); + var foundRelease = null; for (let i = 0; i < options.releases.items.length; ++i) { let release = options.releases.items[i]; if (typeof release.latestVersion !== "undefined") { $li.append($a); $releaseSwitcher.append($li); - // set default selection for release if (options.edition && release.latestVersion.branchPath === options.edition) { + foundRelease = release; + } + } + } + // set default selection for release + if (foundRelease) { if (options.publicBrowser) { - $("#editionLabel").html(release.name); - $("#versionLabel").html(release.latestVersion.version); - initVersionsDropdown(release); + $("#editionLabel").html(foundRelease.name); + $("#versionLabel").html(foundRelease.latestVersion.version); + initVersionsDropdown(foundRelease.shortName); } else { - $("#editionLabel").html(release.name + " " + release.latestVersion.version); + $("#editionLabel").html(foundRelease.name + " " + foundRelease.latestVersion.version); + } + } else { + if (options.publicBrowser && /^MAIN.*\d{4}-\d{2}-\d{2}$/.test(options.edition)) { + var isInternationalBranch = /^MAIN\/+\d{4}-\d{2}-\d{2}$/.test(options.edition); + for (let i = 0; i < options.releases.items.length; ++i) { + let release = options.releases.items[i]; + if ((isInternationalBranch && release.branchPath === 'MAIN') || (!isInternationalBranch && release.branchPath !== 'MAIN' && options.edition.startsWith(release.branchPath))) { + $("#editionLabel").html(release.name); + $("#versionLabel").html(options.edition.substring(options.edition.lastIndexOf('/') + 1)); + initVersionsDropdown(release.shortName); + break; } } } } } - function initVersionsDropdown(release) { - $.getJSON("/snowstorm/snomed-ct/codesystems/" + release.shortName + "/versions?showFutureVersions=false&showInternalReleases=false", function(result) {}).done(function(result) { + function initVersionsDropdown(shortName) { + $.getJSON("/snowstorm/snomed-ct/codesystems/" + shortName + "/versions?showFutureVersions=false&showInternalReleases=false", function(result) {}).done(function(result) { var $versionSwitcher = $('#versionSwitcher'); $versionSwitcher.html(""); if (result.items.length > 0) {
7
diff --git a/components/maplibre/ban-map/index.js b/components/maplibre/ban-map/index.js @@ -85,6 +85,23 @@ const isFeatureContained = (container, content) => { return booleanContains(polygonA, polygonB) } +const getPositionsFeatures = address => { + if (address?.positions?.length > 1) { + return address.positions.map(p => ({ + type: 'Feature', + geometry: { + type: 'Point', + coordinates: p.position.coordinates + }, + properties: { + ...address, + type: p.positionType, + nomVoie: address.voie.nomVoie + } + })) + } +} + function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onSelect, isMobile}) { const {isSafariBrowser} = useContext(DeviceContext) const [isCenterControlDisabled, setIsCenterControlDisabled] = useState(true) @@ -92,6 +109,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS const [isCadastreDisplayable, setIsCadastreDisplayble] = useState(true) const [isCadastreLayersShown, setIsCadastreLayersShown] = useState(false) const isMultiPositions = address?.positions?.length > 1 + const positionsSource = map.getSource('positions') const onLeave = useCallback(() => { if (hoveredFeature) { @@ -286,18 +304,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS type: 'geojson', data: { type: 'FeatureCollection', - features: isMultiPositions ? address.positions.map(p => ({ - type: 'Feature', - geometry: { - type: 'Point', - coordinates: p.position.coordinates - }, - properties: { - ...address, - type: p.positionType, - nomVoie: address.voie.nomVoie - } - })) : [] + features: [] } } ]) @@ -311,7 +318,7 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS positionsLabelLayer, positionsCircleLayer ]) - }, [setSources, setLayers, address, isMultiPositions]) + }, [setSources, setLayers]) useEffect(() => { if (isSourceLoaded && map.getLayer('adresse-complet-label') && map.getLayer('adresse-label')) { @@ -334,6 +341,15 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS } }, [map, isSourceLoaded, address, setLayers]) + useEffect(() => { + if (map && address?.type === 'numero' && positionsSource) { + positionsSource.setData({ + type: 'FeatureCollection', + features: getPositionsFeatures(address) + }) + } + }, [map, address, positionsSource]) + return ( <> <div className='maplibregl-ctrl-group maplibregl-ctrl'>
0
diff --git a/cloudtest/cloudtest_test.go b/cloudtest/cloudtest_test.go @@ -6,20 +6,19 @@ package cloudtest import ( "bytes" "fmt" + awsv2Config "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/service/sts" "regexp" "testing" "time" - - "github.com/aws/aws-sdk-go-v2/aws/session" - "github.com/aws/aws-sdk-go-v2/service/sts" ) var accountID = "" func init() { - awsSession, awsSessionErr := session.NewSession() + awsConfig := awsv2Config.LoadDefaultConfig(context.Background()) if awsSessionErr == nil { - stsService := sts.New(awsSession) + stsService := sts.NewFromConfig(awsConfig) callerInfo, callerInfoErr := stsService.GetCallerIdentity(&sts.GetCallerIdentityInput{}) if callerInfoErr == nil { accountID = *callerInfo.Account
2
diff --git a/package.json b/package.json "node": "stable" }, "scripts": { + "preversion": "npm t", "test": "npm run lint && mocha test/ --recursive -R dot --check-leaks --require babel-core/register", "lint": "eslint _ng/**/*", "prepublish": "npm t",
0
diff --git a/test/multi/index.js b/test/multi/index.js @@ -47,7 +47,6 @@ describe('deploy multiple instances', () => { network, yes: true, privateKey: deployer.private, - deploymentPath: path.join(__dirname, '../../', 'publish', 'deployed', 'local'), }); });
2
diff --git a/packages/openneuro-server/handlers/users.js b/packages/openneuro-server/handlers/users.js @@ -118,7 +118,7 @@ export default { */ createAPIKey(req, res, next) { generateApiKey(req.user) - .then(key => res.send({ key: key })) + .then(key => res.send(key)) .catch(err => next(err)) },
1
diff --git a/src/parsers/seeker/GmlSeekerImpl.hx b/src/parsers/seeker/GmlSeekerImpl.hx @@ -38,8 +38,7 @@ class GmlSeekerImpl { public var project:Project; public var reader:GmlReaderExt; - - public var swapReader:GmlReaderExt = null; + public var swapReader:GmlReaderExt; public function saveReader():Void { if (swapReader == null) swapReader = new GmlReaderExt(src); swapReader.setTo(reader); @@ -117,6 +116,7 @@ class GmlSeekerImpl { project = Project.current; version = project.version; reader = new GmlReaderExt(code, version); + swapReader = new GmlReaderExt(code, version); notLam = !(kind is KGmlLambdas); canLam = !notLam && project.canLambda(); @@ -203,16 +203,30 @@ class GmlSeekerImpl { }; case "globalvar": { while (q.loop) { - s = find(Ident | Semico); - if (s == null || s == ";" || GmlAPI.kwFlow.exists(s)) break; - var g = new GmlGlobalVar(s, orig); - out.globalVars[s] = g; - if (privateGlobalRegex == null || !privateGlobalRegex.test(s)) { - out.comps[s] = g.comp; + saveReader(); + q.skipSpaces1(); + if (!q.peek().isIdent0_ni()) break; + var name = q.readIdent(); + if (GmlAPI.kwFlow.exists(name)) { + restoreReader(); + break; + } + + var g = new GmlGlobalVar(name, orig); + out.globalVars[name] = g; + if (privateGlobalRegex == null || !privateGlobalRegex.test(name)) { + out.comps[name] = g.comp; } - out.kindList.push(s); - out.kindMap.set(s, "globalvar"); - setLookup(s); + out.kindList.push(name); + out.kindMap.set(name, "globalvar"); + setLookup(name); + + saveReader(); + q.skipSpaces1(); + if (q.peek() != ",".code) { + restoreReader(); + break; + } else q.skip(); } }; case "global": {
9
diff --git a/package.json b/package.json "lint:fix": "eslint --fix app.js \"lib/**/*.js\" \"test/**/*.js\"", "lint": "eslint app.js \"lib/**/*.js\" \"test/**/*.js\"", "preinstall": "make pre-install", - "pretest": "NODE_ENV=test node test setup", + "pretest:setup": "npm run lint", + "test:setup": "NODE_ENV=test node test setup", + "pretest": "npm run test:setup", "test": "NODE_ENV=test mocha -t 5000 --exit --recursive test/acceptance test/integration test/unit", - "posttest": "NODE_ENV=test node test teardown", + "posttest": "npm run test:teardown", + "test:teardown": "NODE_ENV=test node test teardown", "update-internal-deps": "rm -rf node_modules && npm install", "docker-test": "./docker-test.sh", "docker-bash": "./docker-bash.sh"
7
diff --git a/src/client/js/components/PageEditor/MarkdownTableUtil.js b/src/client/js/components/PageEditor/MarkdownTableUtil.js @@ -9,10 +9,9 @@ class MarkdownTableUtil { // https://github.com/markdown-it/markdown-it/blob/d29f421927e93e88daf75f22089a3e732e195bd2/lib/rules_block/table.js#L83 this.tableAlignmentLineRE = /^[-:|][-:|\s]*$/; this.tableAlignmentLineNegRE = /^[^-:]*$/; // it is need to check to ignore empty row which is matched above RE - // https://regex101.com/r/7BN2fR/8 - this.linePartOfTableRE = /^\|[^\r\n]*|[^\r\n]*\|$/; // own idea + // https://regex101.com/r/7BN2fR/10 + this.linePartOfTableRE = /^([^\r\n|]*)\|(([^\r\n|]*\|)+)$/; - this.getBot = this.getBot.bind(this); this.getEot = this.getEot.bind(this); this.getBol = this.getBol.bind(this); this.getStrFromBot = this.getStrFromBot.bind(this);
7
diff --git a/extensions/dbgobject/type/dbgobject-type.js b/extensions/dbgobject/type/dbgobject-type.js @@ -26,7 +26,8 @@ Loader.OnLoad(function () { // Normalize type name. this._name = name.trim(); // strip outer whitespace - this._name = this._name.replace(/^const\s+/, ""); // remove leading "const" and whitespace + this._name = this._name.replace(/&/g, "*"); // treat references like pointers + this._name = this._name.replace(/^((const|volatile)\s+)+/g, ""); // remove leading "const" and whitespace this._name = this._name.replace(/\s+const$/, ""); // remove trailing "const" and whitespace this._name = this._name.replace(/(?:\s+const)?\s+(?=\*+$)/, ""); // remove whitespace and possible "const" before any "*"s
9
diff --git a/assets/js/modules/adsense/components/setup/SetupMain.js b/assets/js/modules/adsense/components/setup/SetupMain.js @@ -100,7 +100,7 @@ export default function SetupMain( { finishSetup } ) { const urlChannels = useSelect( ( select ) => select( STORE_NAME ).getURLChannels( accountID, clientID ) ); const accountsError = useSelect( ( select ) => select( STORE_NAME ).getError( 'getAccounts', [] ) ); const alertsError = useSelect( ( select ) => select( STORE_NAME ).getError( 'getAlerts', [ accountID ] ) ); - const error = accountsError || alertsError; + const hasErrors = useSelect( ( select ) => select( STORE_NAME ).hasErrors() ); // Determine account and site status. const accountStatus = determineAccountStatus( { @@ -278,7 +278,7 @@ export default function SetupMain( { finishSetup } ) { const existingTag = useSelect( ( select ) => select( STORE_NAME ).getExistingTag() ); let viewComponent; - if ( ( undefined === accountStatus && ! error ) || undefined === existingTag || ( isDoingSubmitChanges && ! isSubmittingInBackground ) || isNavigating ) { + if ( ( undefined === accountStatus && ! hasErrors ) || undefined === existingTag || ( isDoingSubmitChanges && ! isSubmittingInBackground ) || isNavigating ) { // Show loading indicator if account status not determined yet or if // a submission is in progress that is not happening in background. viewComponent = <ProgressBar />; @@ -305,7 +305,7 @@ export default function SetupMain( { finishSetup } ) { viewComponent = <SetupAccountApproved />; break; default: - if ( error ) { + if ( hasErrors ) { viewComponent = <ErrorNotice />; } else { viewComponent = <ErrorText message={ sprintf( @@ -328,7 +328,7 @@ export default function SetupMain( { finishSetup } ) { viewComponent = <SetupSiteAdded finishSetup={ finishSetupAndNavigate } />; break; default: - if ( error ) { + if ( hasErrors ) { viewComponent = <ErrorNotice />; } else { viewComponent = <ErrorText message={ sprintf(
14
diff --git a/packages/uppy/index.js b/packages/uppy/index.js @@ -17,7 +17,7 @@ exports.DragDrop = require('@uppy/drag-drop') exports.FileInput = require('@uppy/file-input') exports.Informer = require('@uppy/informer') exports.ProgressBar = require('@uppy/progress-bar') -exports.StatusBar = require('@uppy/statusbar') +exports.StatusBar = require('@uppy/status-bar') // Acquirers exports.Dropbox = require('@uppy/dropbox') @@ -31,7 +31,7 @@ exports.AwsS3 = require('@uppy/aws-s3') exports.AwsS3Multipart = require('@uppy/aws-s3-multipart') exports.Transloadit = require('@uppy/transloadit') exports.Tus = require('@uppy/tus') -exports.XHRUpload = require('@uppy/xhrupload') +exports.XHRUpload = require('@uppy/xhr-upload') // Miscellaneous exports.Form = require('@uppy/form')
3
diff --git a/src/kiri/main.js b/src/kiri/main.js }); } - function platformUpdateSize() { + function platformUpdateSize(updateDark = true) { let dev = settings.device, isBelt = dev.bedBelt, width, depth, unitMM = ctrl.units === 'mm', gridMajor = unitMM ? 25 : 25.4, gridMinor = unitMM ? 5 : 25.4 / 10; + if (updateDark) { if (ctrl.dark) { SPACE.platform.setGrid(gridMajor, gridMinor, 0x999999, 0x333333); SPACE.platform.opacity(0.8); SPACE.setSkyColor(0xffffff); DOC.body.classList.remove('dark'); } + } SPACE.platform.setRulers(ruler, ruler, 1 / unitScale(), 'X', isBelt ? 'Z' : 'Y'); SPACE.platform.setGZOff(height/2 - 0.1); platform.update_origin();
11
diff --git a/docs/jupyter.rst b/docs/jupyter.rst @@ -235,9 +235,9 @@ Then we can define the data and tell the server how to render it. hgc.View([ hgc.Track(track_type='top-axis', position='top'), hgc.Track(track_type='left-axis', position='left'), - hgc.Track(track_type='heatmap', position='center', - tileset_uuid=ts.uuid, - server=server.api_address, + hgc.Track(track_type='heatmap', + position='center', + tileset=ts, height=250, options={ 'valueScaleMax': 0.5 }), @@ -266,11 +266,10 @@ Then we have to set up a data server to output the data in "tiles". .. code-block:: python - import hgtiles.points as hgpo - import hgtiles.utils as hgut + import clodius.tiles.points as hgpo + import clodius.tiles.utils as hgut - import hgflask.server as hfse - import hgflask.tilesets as hfti + import higlass.tilesets as hgti import numpy as np import pandas as pd @@ -285,7 +284,7 @@ Then we have to set up a data server to output the data in "tiles". # get the tileset info (bounds and such) of the dataset tsinfo = hgpo.tileset_info(df, 'x', 'y') - ts = hfti.Tileset( + ts = hgti.Tileset( tileset_info=lambda: tsinfo, tiles=lambda tile_ids: hgpo.format_data( hgut.bundled_tiles_wrapper_2d(tile_ids, @@ -299,16 +298,15 @@ And finally, we can create a HiGlass client in the browser to view the data: .. code-block:: python - import hgflask.client as hfc - import higlass_jupyter as hiju + import higlass.client as hgc - hgc = hfc.ViewConf([ - hfc.View([ - hfc.Track( + + (display, server, viewconf) = higlass.display([ + hgc.View([ + hgc.Track( track_type='labelled-points-track', position='center', - tileset_uuid=ts.uuid, - api_url=server.api_address, + tileset=ts, height=200, options={ 'labelField': 'v' @@ -316,8 +314,6 @@ And finally, we can create a HiGlass client in the browser to view the data: ]) ]) - hiju.HiGlassDisplay(viewconf=hgc.to_json()) - .. image:: img/jupyter-labelled-points.png Other constructs @@ -334,10 +330,9 @@ requests: .. code-block:: python - import hgflask.server as hgse - import hgflask.tilesets as hfti - import hgtiles.format as hgfo - import hgtiles.utils as hgut + import higlass.tilesets as hgti + import clodius.tiles.format as hgfo + import clodius.tiles.utils as hgut ts = hfti.Tileset( tileset_info=tileset_info, @@ -345,6 +340,5 @@ requests: lambda z,x,y: hgfo.format_dense_tile(tile_data(z, x, y))) ) - server = hgse.start([ts]) In this case, we expect *tile_data* to simply return a matrix of values.
3
diff --git a/app/views/developer.scala.html b/app/views/developer.scala.html <h2>Contact Us</h2> <p class="text-justify"> Questions? Bugs? Feature requests and suggestions? Or anything else? Email us - (<a href="mailto:sidewalk@@umiacs.umd.edu">sidewalk@@umiacs.umd.edu</a>), post a + (<a href="mailto:sidewalk@@cs.uw.edu">sidewalk@@cs.uw.edu</a>), post a <a href="https://github.com/ProjectSidewalk/SidewalkWebpage/issues" target="_blank">GitHub issue</a>, or follow and talk to us on <a href="https://twitter.com/projsidewalk" target="_blank">Twitter @@projsidewalk</a>!
3
diff --git a/docs-website/_includes/scripts.html b/docs-website/_includes/scripts.html ga.q = [] ga.l = +new Date() ga('create', 'UA-52736259-4', 'auto') + ga('set', 'anonymizeIp', true) ga('send', 'pageview') </script> <script src="https://www.google-analytics.com/analytics.js" async defer></script>
12
diff --git a/package.json b/package.json "name": "find-and-replace", "main": "./lib/find", "description": "Find and replace within buffers and across the project.", - "version": "0.215.10", + "version": "0.215.11", "license": "MIT", "activationCommands": { "atom-workspace": [
6
diff --git a/packages/ts2kt-automator/lib.js b/packages/ts2kt-automator/lib.js @@ -43,7 +43,7 @@ function getPackageVersion(packageName) { } function getPackageTypeFilePath(name) { - const typePackage = require(`@types/${name}/package.json`); + const typePackage = require(path.resolve(process.cwd(), `./node_modules/@types/${name}/package.json`)); // Looks like types packages always have just index.d.ts file // See https://github.com/DefinitelyTyped/DefinitelyTyped#create-a-new-package const typesFileName = typePackage.typings || 'index.d.ts'; @@ -59,7 +59,7 @@ function getPackageTypeFilePath(name) { console.log("Looks like package has embedded types. Let's check..."); - const packageItself = require(`${name}/package.json`); + const packageItself = require(path.resolve(process.cwd(), `./node_modules/${name}/package.json`)); if (!packageItself.typings) { throw new Error( `Cannot find types for package ${name}. It has no types in @types/${name} and no "typings" field in package.json`
11
diff --git a/app/assets/javascripts/jquery/plugins/inat/universal_autocomplete.js.erb b/app/assets/javascripts/jquery/plugins/inat/universal_autocomplete.js.erb @@ -13,12 +13,6 @@ $.fn.universalAutocomplete = function( options ) { $( field ).data( "selected", false ); return; } - // var results = $( "li:visible", options.appendTo ) - // if ( results.length === 0 ) { - // window.location = "/search?q=" + $( field ).val( ); - // } else { - // results.get( 0 ).click( ); - // } window.location = "/search?q=" + $( field ).val( ); } ); @@ -152,29 +146,37 @@ $.fn.universalAutocomplete = function( options ) { wrapperDiv.on( "mouseup", function( e ) { if ( // We only care about the middle mouse button - e.which == 2 && - // ...and not about link clicks - e.target.nodeName !== "A" && - $( e.target ).parents( "a" ).length == 0 + e.which == 2 ) { + var a = e.target.nodeName == "A" ? e.target : $( e.target ).parents( "a" ).get( 0 ); + if ( a ) { + window.open( a.href, "_blank" ); + } else { $( field ).data( "ui-autocomplete" )._trigger( "select", "autocompleteselect", { item: item, openBlank: true } ); + } e.preventDefault( ); return false; } } ); wrapperDiv.on( "click", function( e ) { - if ( - ( e.metaKey || e.ctrlKey || e.altKey ) && - e.target.nodeName !== "A" && - $( e.target ).parents( "a" ).length == 0 - ) { + var a = e.target.nodeName == "A" ? e.target : $( e.target ).parents( "a" ).get( 0 ); + if ( e.metaKey || e.ctrlKey || e.altKey ) { + if ( a ) { + window.open( a.href, "_blank" ); + } else { $( field ).data( "ui-autocomplete" )._trigger( "select", "autocompleteselect", { item: item, openBlank: true } ); + } + e.preventDefault( ); + return false; + } + if ( a ) { + window.location = a.href; e.preventDefault( ); return false; }
9
diff --git a/articles/user-profile/index.md b/articles/user-profile/index.md --- description: Explains the basics of a User profile, how to create a user and view users and their profile details. -url: /user-profile toc: true --- - # User Profile -The Auth0 **User Profile** is the set of attributes that contains specific information about a user. User Profile information may include the user's name, email address, contact information, and so on. Please see [Structure of the User Profile](/user-profile/user-profile-structure) for more information about the attributes available on the User Profile. +The Auth0 **User Profile** is the set of attributes that contains specific information about a user. User Profile information may include the user's name, email address, contact information, and so on. User Profile attributes can come from many places. Attributes may be returned by the authenticating service (such as Facebook), as well as via custom databases and web services. Auth0 refers to all attribute sources as **Connections** because Auth0 connects to them to authenticate the user. -For more information about User Profiles, please see [User Profile: In-Depth Details](/user-profile/user-profile-details). - ## Manage User Profiles using the Management Dashboard Use the Auth0 Management Dashboard ("Dashboard") to manage User Profiles. @@ -153,3 +149,12 @@ For total separation you can create a new account. To do this click on tenant na If you need to restrict some users to certain clients you can use rules. Inside a rule, the `context.clientName` and `context.clientID` variables are available to check which client the user is using for login. See [this rule for an example](https://github.com/auth0/rules/blob/master/rules/simple-user-whitelist-for-app.md). You can also restrict users from clients by configuring a new connection and only giving access to a specific client. To enable client access for a connection go to the the **Settings** section for a connection and click on the **Clients** tab, here you can enable/disable any client. + +## Keep reading + +::: next-steps +* [User Profile Attributes](/user-profile/user-profile-structure) +* [Auth0 Normalized User Profile](/user-profile/normalized) +* [User Metadata](/metadata) +* [User Profile: In-Depth Details](/user-profile/user-profile-details) +:::
2
diff --git a/README.md b/README.md @@ -38,7 +38,7 @@ npm run docs ## Questions -For questions and support please use the [Gitter chat room](https://gitter.im/vuejs/vue) or [the official forum](http://forum.vuejs.org). The issue list of this repo is **exclusively** for bug reports and feature requests. +For questions and support please use the [Discord chat server](https://chat.vuejs.org) or [the official forum](http://forum.vuejs.org). The issue list of this repo is **exclusively** for bug reports and feature requests. ## Issues
14
diff --git a/test/unit/cli-facade-package.js b/test/unit/cli-facade-package.js @@ -101,15 +101,22 @@ describe('cli : facade : package', () => { execute(false, () => { local.compress.restore(); - const warnMessage = logSpy.warn.args[0][0], - okMessage = logSpy.ok.args[0][0], - re = new RegExp('\\' + path.sep, 'g'), - warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), - okMessageWithSlashesOnPath = okMessage.replace(re, '/'); - + const warnMessage = logSpy.warn.args[0][0]; + const warnDependenciesMessage = logSpy.warn.args[1][0]; + const okMessage = logSpy.ok.args[0][0]; + const re = new RegExp('\\' + path.sep, 'g'); + const warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'); + const warnDependenciesMessageWithSlashesOnPath = warnDependenciesMessage.replace( + re, + '/' + ); + const okMessageWithSlashesOnPath = okMessage.replace(re, '/'); + expect(warnDependenciesMessageWithSlashesOnPath).to.include( + 'Ensuring dependencies are loaded...' + ); expect(warnMessageWithSlashesOnPath).to.include('Packaging -> '); expect(okMessageWithSlashesOnPath).to.include('Packaged -> '); - expect(logSpy.warn.args[1]).to.be.undefined; + expect(logSpy.warn.args[2]).to.be.undefined; done(); }); }); @@ -125,12 +132,23 @@ describe('cli : facade : package', () => { it('should show a message for success', done => { execute(true, () => { - const warnMessage = logSpy.warn.args[1][0], - okMessage = logSpy.ok.args[1][0], - re = new RegExp('\\' + path.sep, 'g'), - warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), - okMessageWithSlashesOnPath = okMessage.replace(re, '/'); + const warnDependenciesMessage = logSpy.warn.args[1][0]; + const warnMessage = logSpy.warn.args[2][0]; + const okMessage = logSpy.ok.args[1][0]; + const re = new RegExp('\\' + path.sep, 'g'); + const warnMessageWithSlashesOnPath = warnMessage.replace( + re, + '/' + ); + const warnDependenciesMessageWithSlashesOnPath = warnDependenciesMessage.replace( + re, + '/' + ); + const okMessageWithSlashesOnPath = okMessage.replace(re, '/'); + expect(warnDependenciesMessageWithSlashesOnPath).to.include( + 'Ensuring dependencies are loaded...' + ); expect(warnMessageWithSlashesOnPath).to.include( 'Compressing -> ' ); @@ -157,11 +175,22 @@ describe('cli : facade : package', () => { it('should show a message for failure', done => { execute(true, () => { - const warnMessage = logSpy.warn.args[1][0], - errorMessage = logSpy.err.args[0][0], - re = new RegExp('\\' + path.sep, 'g'), - warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'); + const warnDependenciesMessage = logSpy.warn.args[1][0]; + const warnMessage = logSpy.warn.args[2][0]; + const errorMessage = logSpy.err.args[0][0]; + const re = new RegExp('\\' + path.sep, 'g'); + const warnMessageWithSlashesOnPath = warnMessage.replace( + re, + '/' + ); + const warnDependenciesMessageWithSlashesOnPath = warnDependenciesMessage.replace( + re, + '/' + ); + expect(warnDependenciesMessageWithSlashesOnPath).to.include( + 'Ensuring dependencies are loaded...' + ); expect(warnMessageWithSlashesOnPath).to.include( 'Compressing -> ' );
3
diff --git a/app.rb b/app.rb @@ -81,7 +81,7 @@ end # Returns all launches get '/launches' do content_type :json - results = DB.query("SELECT * FROM launch WHERE * IS NOT NULL", :cast_booleans => true) + results = DB.query("SELECT * FROM launch", :cast_booleans => true) hash = results.each do |row| end JSON.pretty_generate(hash)
13
diff --git a/ImmediateGLBufferAttribute.js b/ImmediateGLBufferAttribute.js @@ -27,6 +27,10 @@ export class ImmediateGLBufferAttribute extends THREE.GLBufferAttribute { break; } case Uint8Array: { + glType = WebGLRenderingContext.UNSIGNED_BYTE; + break; + } + case Int8Array: { glType = WebGLRenderingContext.BYTE; break; }
0
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -707,9 +707,18 @@ metaversefile.setApi({ app.physicsObjects.push(physicsObject); return physicsObject; })(physics.addCookedConvexGeometry); + physics.enablePhysicsObject = (enablePhysicsObject => function(physicsObject) { + enablePhysicsObject.call(this, physicsObject); + })(physics.enablePhysicsObject); physics.disablePhysicsObject = (disablePhysicsObject => function(physicsObject) { disablePhysicsObject.call(this, physicsObject); })(physics.disablePhysicsObject); + physics.enableGeometryQueries = (enableGeometryQueries => function(physicsObject) { + enableGeometryQueries.call(this, physicsObject); + })(physics.enableGeometryQueries); + physics.disableGeometryQueries = (disableGeometryQueries => function(physicsObject) { + disableGeometryQueries.call(this, physicsObject); + })(physics.disableGeometryQueries); physics.setTransform = (setTransform => function(physicsObject) { setTransform.call(this, physicsObject);
0
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js @@ -10,11 +10,39 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => { const Lock = { _lock: {}, - has(id) { - return !!this._lock[id]; + _timer: {}, + echoDelay: 500, // echo should be happening much faster + normalDelay: 1e3, // normally user typed comment will be much slower + ECHO: 2, + NORMAL: 1, + NULL: 0, + has(id, value) { + const existing = this._lock[id]; + let ret = this.NULL; + if (existing) { + ret = existing === value ? this.ECHO : this.NORMAL; + } + return ret; + }, + clear(id, delay) { + const previous = this._timer[id]; + if (previous) { + Meteor.clearTimeout(previous); + } + this._timer[id] = Meteor.setTimeout(() => this.unset(id), delay); }, - set(id) { - this._lock[id] = 1; + set(id, value) { + const state = this.has(id, value); + let delay = this.normalDelay; + if (state === this.ECHO) { + delay = this.echoDelay; + } + if (!value) { + // user commented, we set a lock + value = 1; + } + this._lock[id] = value; + this.clear(id, delay); // always auto reset the locker after delay }, unset(id) { delete this._lock[id]; @@ -33,10 +61,7 @@ const webhooksAtbts = (process.env.WEBHOOKS_ATTRIBUTES && 'commentId', 'swimlaneId', ]; -const responseFunc = 'reactOnHookResponse'; -Meteor.methods({ - [responseFunc](data) { - check(data, Object); +const responseFunc = data => { const paramCommentId = data.commentId; const paramCardId = data.cardId; const paramBoardId = data.boardId; @@ -48,25 +73,32 @@ Meteor.methods({ cardId: paramCardId, boardId: paramBoardId, }); + const board = Boards.findOne(paramBoardId); + const card = Cards.findOne(paramCardId); + if (board && card) { if (comment) { - CardComments.update(comment._id, { + Lock.set(comment._id, newComment); + CardComments.direct.update(comment._id, { $set: { text: newComment, }, }); + } } else { const userId = data.userId; if (userId) { - CardComments.insert({ + const inserted = CardComments.direct.insert({ text: newComment, userId, cardId, boardId, }); + Lock.set(inserted._id, newComment); } } } - }, +}; +Meteor.methods({ outgoingWebhooks(integration, description, params) { check(integration, Object); check(description, String); @@ -119,9 +151,20 @@ Meteor.methods({ if (token) headers['X-Wekan-Token'] = token; const options = { headers, - data: is2way ? clonedParams : value, + data: is2way ? { description, ...clonedParams } : value, }; const url = integration.url; + if (is2way) { + const cid = params.commentId; + const comment = params.comment; + const lockState = cid && Lock.has(cid, comment); + if (cid && lockState !== Lock.NULL) { + // it's a comment and there is a previous lock + return; + } else if (cid) { + Lock.set(cid, comment); // set a lock here + } + } const response = postCatchError(url, options); if ( @@ -131,21 +174,12 @@ Meteor.methods({ response.statusCode < 300 ) { if (is2way) { - const cid = params.commentId; - const tooSoon = Lock.has(cid); // if an activity happens to fast, notification shouldn't fire with the same id - if (!tooSoon) { - let clearNotification = () => {}; - if (cid) { - Lock.set(cid); - const clearNotificationFlagTimeout = 1000; - clearNotification = () => Lock.unset(cid); - Meteor.setTimeout(clearNotification, clearNotificationFlagTimeout); - } const data = response.data; // only an JSON encoded response will be actioned if (data) { - Meteor.call(responseFunc, data, () => { - clearNotification(); - }); + try { + responseFunc(data); + } catch (e) { + throw new Meteor.Error('error-process-data'); } } }
1
diff --git a/assets/js/modules/search-console/components/dashboard/DashboardImpressionsWidget.js b/assets/js/modules/search-console/components/dashboard/DashboardImpressionsWidget.js @@ -34,7 +34,6 @@ import { CORE_USER } from '../../../../googlesitekit/datastore/user/constants'; import { isZeroReport } from '../../util'; import { calculateChange, untrailingslashit } from '../../../../util'; import extractForSparkline from '../../../../util/extract-for-sparkline'; -import { trackEvent } from '../../../../util/tracking'; import whenActive from '../../../../util/when-active'; import DataBlock from '../../../../components/DataBlock'; import Sparkline from '../../../../components/Sparkline'; @@ -113,7 +112,6 @@ function DashboardImpressionsWidget( { WidgetReportZero, WidgetReportError } ) { ); if ( error ) { - trackEvent( 'plugin_setup', 'search_console_error', error.message ); return ( <WidgetReportError moduleSlug="search-console" error={ error } /> );
2
diff --git a/src/integrations/analytics.test.js b/src/integrations/analytics.test.js +// @flow +import { NativeModules } from "react-native"; import analytics from "./analytics"; import { init } from "../actions"; +import { NAVIGATION } from "../actions/navigation"; +import { HOME } from "../constants/routes"; + +jest.mock("react-native", () => ({ + NativeModules: { + Analytics: { + trackEvent: jest.fn() + } + } +})); describe("analytics middleware", () => { it("behaves like a redux middleware", () => { const mockNext = jest.fn(); const action = init(); + analytics()(mockNext)(action); + expect(mockNext).toBeCalledWith(action); + }); + it("tracks events for NAVIGATION actions", () => { + const mockNext = jest.fn(); + const action = { type: NAVIGATION, route: "Test" }; analytics()(mockNext)(action); + expect(NativeModules.Analytics.trackEvent).toBeCalledWith("Screen Event", { + screen: "Test" + }); + }); - expect(mockNext).toBeCalledWith(action); + it("tracks event for INIT action as HOME screen", () => { + const mockNext = jest.fn(); + const action = init(); + analytics()(mockNext)(action); + expect(NativeModules.Analytics.trackEvent).toBeCalledWith("Screen Event", { + screen: HOME + }); }); });
0
diff --git a/templates/workflow/program_update_form.html b/templates/workflow/program_update_form.html $('#id_sector').select2({theme: 'bootstrap'}) $('#id_user_access').select2({theme: 'bootstrap'}) $('#id_fund_code').select2({theme: 'bootstrap'}) + }); + $('#reset-id-reset').click(() => { + document.location.href = '/workflow/level1' }) </script> {% endblock content %}
0
diff --git a/packages/components/types/components/FormGroup.d.ts b/packages/components/types/components/FormGroup.d.ts import { PolymorphicComponent } from './_shared'; +import { GridProps } from './Grid'; import { TextProps } from './Text'; -export declare type FormGroupProps = { +export declare type FormGroupProps = GridProps & { /** * Aligns the label within `FormGroup`. *
7
diff --git a/README.md b/README.md @@ -66,7 +66,33 @@ npm install --save-dev cypress cypress-vue-unit-test 1. Create a new project with `vue create <project-name>` and select Cypress for E2E testing 1. Install this package with `npm install --save-dev cypress-vue-unit-test` -1. Enable the import of Vue files by uncommenting the "webpack import" and the "file:processor event" lines in tests/e2e/plugins/index.js +1. Enable the import of Vue files by uncommenting the "webpack import" and the "file:processor event" lines in tests/e2e/plugins/index.js. The file should then look like this: + +```js +// tests/e2e/plugins/index.js + +// webpack import +const webpack = require('@cypress/webpack-preprocessor') + +module.exports = (on, config) => { + // file:processor event + on( + 'file:preprocessor', + webpack({ + webpackOptions: require('@vue/cli-service/webpack.config'), + watchOptions: {} + }) + ) + + return Object.assign({}, config, { + fixturesFolder: 'tests/e2e/fixtures', + integrationFolder: 'tests/e2e/specs', + screenshotsFolder: 'tests/e2e/screenshots', + videosFolder: 'tests/e2e/videos', + supportFile: 'tests/e2e/support/index.js' + }) +} +``` <a name="use"/>
0
diff --git a/home.scn b/home.scn "scale": [1, 1, 1], "start_url": "https://avaer.github.io/hookshot/index.js" }, + { + "name": "lightsaber", + "position": [0, 1, 0], + "quaternion": [0, 0, 0, 1], + "scale": [1, 1, 1], + "start_url": "https://avaer.github.io/lightsaber/index.js" + }, { "name": "cv", "position": [-2, 0, -12],
0
diff --git a/src/components/DateRangePicker.js b/src/components/DateRangePicker.js @@ -96,8 +96,8 @@ class DateRangePicker extends React.Component { super(props); this.state = { - focusedDay: props.selectedEndDate || moment().unix(), currentDate: props.selectedEndDate || moment().startOf('day').unix(), + focusedDay: props.selectedEndDate || moment().startOf('day').unix(), selectedBox: SelectedBox.FROM, selectedStartDate: this.props.selectedStartDate, selectedEndDate: this.props.selectedEndDate,
12
diff --git a/src/index.js b/src/index.js @@ -63,8 +63,6 @@ const keys = { 'o': 79, } -const DefaultProvider = props => <React.Fragment children={props.children} /> - export class SlideDeck extends React.Component { static propTypes = { slides: PropTypes.array.isRequired,
4
diff --git a/app/update-password/template.hbs b/app/update-password/template.hbs <hr/> <h3 class="mt-20 text-left">{{t 'modalEditPassword.firstLogin.setView'}}{{field-required}}</h3> <div class="image-radio-container mt-20"> - <label class="image-radio" {{action "setView" "ember" }}> + <label class="image-radio" {{action "setView" "ember" preventDefault=false}}> <button class="mb-5 {{if (eq landing 'ember') 'checked' ''}}" type="button"> <img src="{{app.baseAssets}}assets/images/cluster-multi.svg"/> </button> {{t "landingPage.emberLong" }} </label> - <label class="image-radio" {{action "setView" "vue" }}> + <label class="image-radio" {{action "setView" "vue" preventDefault=false}}> <button class="mb-5 {{if (eq landing 'vue') 'checked' ''}}" type="button"> <img src="{{app.baseAssets}}assets/images/cluster-single.svg"/> </button>
12
diff --git a/api/services/radarr.js b/api/services/radarr.js @@ -135,7 +135,7 @@ class Radarr { } async add(movieData) { - movieData.ProfileId = this.config.profileId; + movieData.qualityProfileId = parseInt(this.config.profileId); movieData.Path = `${this.config.rootPath}${sanitize( movieData.title )} (${movieData.year})`; @@ -146,11 +146,13 @@ class Radarr { try { let add = await this.post('movie', false, movieData); - console.log(add); + if (Array.isArray(add)) { + if (add[1].errorMessage) throw add[1].errorMessage; + } return add.id; } catch (err) { console.log(`SERVICE - RADARR: Unable to add movie ${err}`); - return false; + throw err; } } @@ -176,9 +178,8 @@ class Radarr { ); } } catch (err) { - console.log(err); console.log( - `SERVICE - RADARR: Unable to add movie ${job.title}` + `SERVICE - RADARR: Unable to add movie ${job.title} - ERR: ${err}` ); } }
1
diff --git a/src/lib/Notification/PushNotification/index.native.js b/src/lib/Notification/PushNotification/index.native.js @@ -33,9 +33,13 @@ function pushNotificationEventCallback(eventType, notification) { } // If a push notification is received while the app is in foreground, - // we'll assume pusher is connected so we'll ignore this push notification - if (AppState.currentState === 'active') { - console.debug('[PUSH_NOTIFICATION] App is in foreground, not executing any callback.'); + // we'll assume pusher is connected so we'll ignore is and not fetch the same data twice. + // However, we will allow NotificationResponse events through, so that tapping on a foreground notification + // will take you to the relevant report. + // Note: We hope to prevent foreground notifications from appearing in the near future, + // so when that happens we can go back to ignoring all push notification callbacks when the app is in the foreground + if (AppState.currentState === 'active' && eventType === EventType.PushReceived) { + console.debug('[PUSH_NOTIFICATION] Push received while app is in foreground, not executing any callback.'); return; }
11
diff --git a/configs/atoti.json b/configs/atoti.json "selectors": { "lvl0": "section h1", "lvl1": "section h2", - "lvl2": "section h3, section dl.py.class dt, section dl.py.data dt, section dl.py.function dt", - "lvl3": "section h4, section dl.py.method dt", + "lvl2": "section h3, section dl.py.class > dt, section dl.py.data > dt, section dl.py.function > dt", + "lvl3": "section h4, section dl.py.method > dt", "lvl4": "section h5", "lvl5": "section h6", "text": "section p, section li"
7
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,17 @@ 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.2] -- 2019-08-13 + +### Fixed +- Fix gl3d hover behavior when multiple points share identical position [#4096] +- Fix `[email protected]` dependency version listing in `package.json` [#4094] +- Fix decimal and thousands separator declaration for Italian (`it`) locale [#4122] +- Fix `indicator` `steps` attribute declaration [#4115] +- Performance fix - use `Axes.prepTicks` (not `Axes.calcTicks`) for `indicator` + number and delta formatting [#4099] + + ## [1.49.1] -- 2019-07-31 ### Fixed
3
diff --git a/apps/gbridge/ChangeLog b/apps/gbridge/ChangeLog 0.23: Allow notification dismiss to remove from phone too 0.24: tag HRM power requests to allow this to work alongside other widgets/apps (fix #799) 0.25: workaround call notification + Fix inflated step number
3
diff --git a/packages/app/src/styles/theme/wood.scss b/packages/app/src/styles/theme/wood.scss @@ -66,7 +66,7 @@ html[dark] { // $color-list: $color-global; $bgcolor-list: transparent; $color-list-hover: $gray-100; - $bgcolor-list-hover: darken($bgcolor-global, 3%); + $bgcolor-list-hover: darken($bgcolor-global, 5%); // $color-list-active: $color-reversal; // $bgcolor-list-active: $primary;
7
diff --git a/articles/libraries/lock/index.md b/articles/libraries/lock/index.md @@ -120,7 +120,7 @@ function showLoggedIn() { ## Browser Compatibility -Browser compatibility is ensured for **Chrome**, **Safari**, **Firefox** and **IE >= 9**. Auth0 currently uses [zuul](https://github.com/defunctzombie/zuul) along with [Saucelabs](https://saucelabs.com) to run integration tests on each push. +Browser compatibility is ensured for **Chrome**, **Safari**, **Firefox** and **IE >= 10**. Auth0 currently uses [zuul](https://github.com/defunctzombie/zuul) along with [Saucelabs](https://saucelabs.com) to run integration tests on each push. <!--vars-->
3
diff --git a/src/Tracker.js b/src/Tracker.js @@ -70,7 +70,7 @@ class Tracker { .then((parsedBody) => { this.logger.debug(parsedBody); }) - .catch(this.logger.error); + .catch((error) => this.logger.error(`Error updating carbonitex. Token: ${carbonToken} | Error Code: ${error.statusCode} | Guilds: ${guildsLen}`)); }) .catch(this.logger.error); } @@ -97,7 +97,7 @@ class Tracker { .then((parsedBody) => { this.logger.debug(parsedBody); }) - .catch(this.logger.error); + .catch(error => this.logger.error(`Error updating DiscordList. Token: ${discordListToken} | Error Code: ${error.statusCode}`)); } } @@ -127,7 +127,7 @@ class Tracker { .then((parsedBody) => { this.logger.debug(parsedBody); }) - .catch(this.logger.error); + .catch(error =>this.logger.error(`Error updating DiscordList. Token: ${botsDiscordPwToken} | User: ${botsDiscordPwUser} | Error Code: ${error.statusCode}`)); } }
1
diff --git a/test/functional/specs/C14409.js b/test/functional/specs/C14409.js import { t, ClientFunction } from "testcafe"; import createNetworkLogger from "../helpers/networkLogger"; -import getResponseBody from "../helpers/networkLogger/getResponseBody"; import fixtureFactory from "../helpers/fixtureFactory"; import cookies from "../helpers/cookies"; import alloyEvent from "../helpers/alloyEvent"; -import getConsentCookieName from "../helpers/getConsentCookieName"; -import createResponse from "../../../src/core/createResponse"; const networkLogger = createNetworkLogger(); @@ -28,6 +25,7 @@ test("C14409 - Consenting to no purposes should be persisted.", async () => { const imsOrgId = "53A16ACB5CC1D3760A495C99@AdobeOrg"; await cookies.clear(); + // configure alloy const configure = await alloyEvent("configure", { configId: "9999999", orgId: imsOrgId, @@ -37,45 +35,10 @@ test("C14409 - Consenting to no purposes should be persisted.", async () => { await configure.promise; - // send alloy event - const event1 = await alloyEvent({ - viewStart: true - }); - - // apply user consent + // set consent to out await setConsentToOut(); - await event1.promise; - - const cookieName = getConsentCookieName(imsOrgId); - - const consentCheck = await cookies.get(cookieName); - - await t.expect(consentCheck).eql("general=out"); - - // test konductor response - await t.expect(networkLogger.edgeEndpointLogs.requests.length).eql(1); - await t - .expect(networkLogger.edgeEndpointLogs.requests[0].response.statusCode) - .eql(200); - - const request = JSON.parse( - getResponseBody(networkLogger.edgeEndpointLogs.requests[0]) - ); - - // read state:store handles from response (i.e. 'set a cookie') - await t.expect("handle" in request).ok(); - await t.expect(request.handle.length).gt(0); - - const storePayloads = createResponse(request).getPayloadsByType( - "state:store" - ); - const cookiesToSet = storePayloads.reduce((memo, storePayload) => { - memo[storePayload.key] = storePayload; - return memo; - }, {}); - - // Reload and reconfigure alloy + // Reload page and reconfigure alloy // [TODO] Navigate to a different subdomain when it is available // https://github.com/DevExpress/testcafe/blob/a4f6a4ac3627ebeb29b344ed3a1793627dd87909/docs/articles/documentation/test-api/actions/navigate.md await t.eval(() => document.location.reload()); @@ -89,18 +52,14 @@ test("C14409 - Consenting to no purposes should be persisted.", async () => { await reconfigure.promise; + // send event const errorMessage = await t.eval(() => window .alloy("event", { data: { a: 1 } }) .then(() => undefined, e => e.message) ); - // expect that konductor cookie handle matches cookie name - await t.expect(cookieName in cookiesToSet).ok(); - + // check that the promise from the command is rejected and check the error message to make sure it was due to the user being opted out. await t.expect(errorMessage).ok("Expected the event command to be rejected"); await t.expect(errorMessage).contains("The user declined consent."); - - await t.expect("maxAge" in cookiesToSet[cookieName]).ok(); - await t.expect(cookiesToSet[cookieName].maxAge).eql(15552000); });
2
diff --git a/spark/components/stepper/vanilla/stepper.tests.js b/spark/components/stepper/vanilla/stepper.tests.js @@ -532,7 +532,7 @@ describe('slider position tests', () => { </div> </li> `); - resetSlider([step], 'test', slider); + resetSlider([step], slider, 'test'); expect(step.querySelectorAll('.sprk-u-Visibility--hidden').length).eql(0); });
3
diff --git a/metaverse-modules.js b/metaverse-modules.js @@ -27,6 +27,8 @@ const loadPromise = (async () => { const p = metaversefile.import(moduleUrl) .then(m => { modules[moduleName] = m; + }, err => { + console.warn(err); }); promises.push(p); }
0
diff --git a/NiL.JS/BaseLibrary/JSON.cs b/NiL.JS/BaseLibrary/JSON.cs @@ -96,7 +96,12 @@ namespace NiL.JS.BaseLibrary if (!Tools.ParseNumber(code, ref pos, out value)) ExceptionHelper.ThrowSyntaxError("Invalid number definition."); + var intValue = (int)value; + frame.state = ParseState.End; + if (intValue == value) + frame.value = intValue; + else frame.value = value; } else if (code[start] == '"')
7
diff --git a/cmd_build.go b/cmd_build.go @@ -1046,6 +1046,17 @@ func Build(noop bool, } buildContext.cfTemplate.Description = serviceDescription + // Add some params to the context... + buildContext.workflowHooksContext = context.WithValue(buildContext.workflowHooksContext, + ContextKeyBuildOutputDir, + outputDirectory) + buildContext.workflowHooksContext = context.WithValue(buildContext.workflowHooksContext, + ContextKeyBuildID, + buildID) + buildContext.workflowHooksContext = context.WithValue(buildContext.workflowHooksContext, + ContextKeyBuildBinaryName, + SpartaBinaryName) + logger.Info(). Str("BuildID", buildID). Bool("noop", noop).
0
diff --git a/buildtools/check-example.js b/buildtools/check-example.js @@ -17,6 +17,10 @@ page.onError = function(msg, trace) { if (trace) { msgStack.push('TRACE:'); trace.forEach(function(t) { + if (t.file.startsWith('https://maps.googleapis.com/maps/api/js')) { + // Ignore google referer error + return; + } msgStack.push(' -> ' + t.file + ': ' + t.line + (t.function ? ' (in function "' + t.function + '")' : '')); }); }
8
diff --git a/components/Audio/MediaProgress.js b/components/Audio/MediaProgress.js @@ -89,7 +89,9 @@ const MediaProgressProvider = ({ variables: { mediaId }, fetchPolicy: 'network-only' }) - .then(({ data: { mediaProgress: { secs } } = {} }) => { + .then(({ data: { mediaProgress } }) => { + // mediaProgress can be null + const { secs } = mediaProgress || {} if (secs) { if ( durationMs &&
9
diff --git a/package.json b/package.json "name": "find-and-replace", "main": "./lib/find", "description": "Find and replace within buffers and across the project.", - "version": "0.206.2", + "version": "0.206.3", "license": "MIT", "activationCommands": { "atom-workspace": [
6
diff --git a/packages/material-ui-shell/src/components/MenuHeader/MenuHeader.js b/packages/material-ui-shell/src/components/MenuHeader/MenuHeader.js @@ -70,7 +70,7 @@ const MenuHeader = () => { <List className={clsx(!isAuthenticated && classes.toolbar)}> {!isMiniMode && ( <ListItem className={classes.listItem}> - {isAuthenticated && !isMiniMode && ( + {isAuthenticated && ( authData.photoURL ? ( <ListItemAvatar onClick={() => { @@ -95,7 +95,6 @@ const MenuHeader = () => { </ListItemAvatar> ) )} - {!isMiniMode && ( <ListItemSecondaryAction> <IconButton onClick={() => { @@ -137,7 +136,6 @@ const MenuHeader = () => { </> )} </ListItemSecondaryAction> - )} </ListItem> )} @@ -174,7 +172,7 @@ const MenuHeader = () => { marginLeft: !isMenuOpen && isDesktop && authData.photoURL ? 7 - : undefined, + : undefined }} primary={authData.displayName} secondary={authData.email}
2
diff --git a/public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js b/public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js @@ -127,8 +127,14 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) { * @private */ this._documentKeyDown = function (e) { + // Prevent Google's default panning and moving using arrow keys and WASD. + // https://stackoverflow.com/a/66069717/9409728 + if (['ArrowUp', 'ArrowLeft', 'ArrowDown', 'ArrowRight', 'KeyW', 'KeyA', 'KeyS', 'KeyD'].indexOf(e.code) > -1) { + e.stopPropagation(); + } + if (!status.focusOnTextField && !status.disableKeyboard) { - //only set shift if the event was made after the keyup. + // Only set shift if the event was made after the keyup. if (e.timeStamp > lastShiftKeyUpTimestamp) { status.shiftDown = e.shiftKey; } @@ -151,28 +157,23 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) { } } else { switch (e.keyCode) { - case 16: // "Shift" - break; - case 37: // "Left" + case 37: // "ArrowLeft" self._rotatePov(-2); break; - case 39: // "Right" + case 39: // "ArrowRight" self._rotatePov(2); break; } if (!status.disableMovement) { switch (e.keyCode) { - case 38: // "up" + case 38: // "ArrowUp" self._moveForward(); break; - case 40: // "down" + case 40: // "ArrowDown" self._moveBackward(); break; } } - if ([37, 38, 39, 40].indexOf(e.keyCode) > -1) { - e.preventDefault(); - } } } }; @@ -199,8 +200,8 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) { } switch(e.keyCode) { // Zoom Hotkeys - case 16: //shift - // store the timestamp here so that we can check if the z-up event is in the buffer range + case 16: // Shift + // Store the timestamp here so that we can check if the z-up event is in the buffer range. lastShiftKeyUpTimestamp = e.timeStamp; break; case 90: @@ -226,7 +227,7 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) { } } - // Hotkeys for tag selection + // Hotkeys for tag selection. if (contextMenu.getTargetLabel() != null && contextMenu.isOpen() && !contextMenu.isTagDisabled()) { var labelType = contextMenu.getTargetLabel().getProperty('labelType'); var tags = contextMenu.labelTags.filter(tag => tag.label_type === labelType); @@ -238,10 +239,6 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) { } } - /* - This is a callback method that is triggered when a keyUp - event occurs. It is not relevant to ContextMenu's textbox focus. - */ switch (e.keyCode) { case 13: // "Enter" @@ -310,6 +307,7 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) { }; - $(document).bind('keyup', this._documentKeyUp); - $(document).bind('keydown', this._documentKeyDown); + // Add the keyboard event listeners. We need { capture: true } for keydown to disable StreetView's shortcuts. + window.addEventListener('keydown', this._documentKeyDown, { capture: true }); + window.addEventListener('keyup', this._documentKeyUp); }
1
diff --git a/token-metadata/0x64c5572E7a100AF9901c148D75d72c619A7f1e9d/metadata.json b/token-metadata/0x64c5572E7a100AF9901c148D75d72c619A7f1e9d/metadata.json "symbol": "UNICRAP", "address": "0x64c5572E7a100AF9901c148D75d72c619A7f1e9d", "decimals": 18, - "dharmaVerificationStatus": { "dharmaVerificationStatus": "VERIFIED" } \ No newline at end of file -} \ No newline at end of file
3
diff --git a/server/services/getLinkedCatAuthors.php b/server/services/getLinkedCatAuthors.php @@ -143,11 +143,11 @@ function loadOrRefresh($lc_cache) { $authors = NULL; } finally { - # if no error occurred, update cache + # if error occurred, skip cache refreshment at this stage and load instead if (empty($authors)) { $authors = loadCache($lc_cache); } - # if error occurred, skip cache refreshment at this stage and load instead + # if no error occurred, update cache else { writeCache($lc_cache, $authors); }
5
diff --git a/assets/js/modules/thank-with-google/components/setup/SetupPublicationActive.js b/assets/js/modules/thank-with-google/components/setup/SetupPublicationActive.js @@ -24,7 +24,7 @@ import PropTypes from 'prop-types'; /** * WordPress dependencies */ -import { Fragment, useCallback } from '@wordpress/element'; +import { useCallback } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; /** @@ -44,7 +44,6 @@ export default function SetupPublicationActive( { currentPublicationID } ) { }, [ currentPublicationID, setPublicationID ] ); return ( - <Fragment> <SetupPublicationScreen title={ __( 'Congratulations!', 'google-site-kit' ) } description={ __( @@ -62,7 +61,6 @@ export default function SetupPublicationActive( { currentPublicationID } ) { { __( 'Customize Thank with Google', 'google-site-kit' ) } </Button> </SetupPublicationScreen> - </Fragment> ); }
2
diff --git a/src/pages/iou/IOUTransactions.js b/src/pages/iou/IOUTransactions.js @@ -42,7 +42,6 @@ const IOUTransactions = ({ <View style={[styles.mt3]}> {_.map(reportActions, (reportAction) => { if (reportAction.actionName === 'IOU' - && reportAction.originalMessage.IOUTransactionID && reportAction.originalMessage.IOUReportID === iouReportID) { // TODO, remove rejected transactions from the array const rejectable = rejectedTransactions.includes(reportAction.originalMessage.IOUTransactionID);
13
diff --git a/deepfence_backend/tasks/vulnerability_scan_worker.py b/deepfence_backend/tasks/vulnerability_scan_worker.py @@ -50,7 +50,7 @@ def vulnerability_scan(self, **kwargs): """ Figure out arguments for deepaudit """ - mapper_image_name = os.environ.get("mapper_image_name", "deepfenceio/deepfence_vulnerability_mapper") + mapper_image_name = os.environ.get("mapper_image_name", "deepfenceio/deepfence_vulnerability_mapper_ce") mapper_image_tag = os.environ.get("image_tag", "latest") mapper_image_name_with_tag = "{0}:{1}".format(mapper_image_name, mapper_image_tag) data_volume = {}
13
diff --git a/articles/libraries/auth0-android/index.md b/articles/libraries/auth0-android/index.md @@ -35,7 +35,7 @@ Open your app's `AndroidManifest.xml` file and add the following permission. You can set up your Auth0 credentials and initiate Auth0 in one of two ways: -### 1) Client Information In-Line +### 1) Client information in-line Method one is to simply create an instance of `Auth0` with your client information. @@ -43,7 +43,7 @@ Method one is to simply create an instance of `Auth0` with your client informati Auth0 account = new Auth0("${account.clientId}", "${account.namespace}"); ``` -### 2) Client Information Read from XML +### 2) Client information read from XML Method two is to save your client information in the `strings.xml` file using the following names: @@ -93,7 +93,7 @@ authentication Note that the default scope used is `openid` ::: -### Passwordless Login +### Passwordless login Logging in with a Passwordless is slightly different. Passwordless can be done via email or via SMS, and either by sending the user a code, or sending them a link which contains a code. All of these methods of Passwordless authentication will require two steps - requesting the code, and then inputting the code for verification. @@ -141,7 +141,7 @@ authentication Note that the default scope used is `openid` ::: -### Signing up with database connection +### Sign up with database connection Signing up with a database connection is similarly easy. Call the `signUp` method passing the user's given email, chosen password, and the connection name to initiate the signup process. @@ -161,7 +161,7 @@ authentication }); ``` -### Getting user information +### Get user information To get the information associated with a given user's `access_token`, you can call the `userInfo` endpoint, passing the token. @@ -181,6 +181,30 @@ authentication }); ``` +### Password Resets + +To initiate a password reset for a user, call `resetPassword` with the user's email address and the database connection name as parameters. + +```java +String connectionName = "Username-Password-Authentication"; +authentication + .resetPassword("[email protected]", connectionName) + .start(new AuthenticationCallback<Void>() { + @Override + public void onSuccess(Void payload) { + //Password Reset requested + } + + @Override + public void onFailure(AuthenticationException error) { + //Request failed + } + }); +``` + +::: panel-info Request Failures +Note that password reset requests will fail on network related errors, but will not fail if the designated email does not exist in the database (for security reasons). +::: ## Using the Management API
0
diff --git a/src/graphql/mutations/__tests__/CreateReplyRequest.js b/src/graphql/mutations/__tests__/CreateReplyRequest.js @@ -33,12 +33,12 @@ describe('CreateReplyRequest', () => { expect(errors).toBeUndefined(); expect(data).toMatchSnapshot(); - const conn = await client.get({ + const request = await client.get({ index: 'replyrequests', type: 'doc', id, }); - expect(conn._source).toMatchSnapshot(); + expect(request._source).toMatchSnapshot(); const article = await client.get({ index: 'articles',
10
diff --git a/package.json b/package.json }, "devDependencies": { "babel-cli": "^6.22.2", - "babel-eslint": "^2.0.2", "babel-plugin-transform-builtin-extend": "^1.1.2", "babel-plugin-transform-runtime": "^6.22.0", "babel-preset-latest": "^6.22.0", "coveralls": "^2.11.2", "dateformat": "^1.0.11", - "eslint": "^0.18.0", "jsesc": "^0.5.0", "mocha": "^2.2.1", "nyc": "^10.1.2",
2
diff --git a/articles/multifactor-authentication/custom-mfa-rules.md b/articles/multifactor-authentication/custom-mfa-rules.md --- -description: You can add step-up authentication to your app with Auth0's extensible multifactor authentication support. +title: Step-Up Authentication with Custom Multifactor Authentication Rules +description: Learn how you can add step-up authentication to your app with Auth0's extensible multifactor authentication support --- -# Step-Up Authentication with Custom Multifactor Authentication Rules - -::: panel Notice -Auth0 now supports `amr` and `acr` claims with `acr_values` for step-up authentication. This approach allows for more control with MFA. - -[Click here for details.](/tutorials/step-up-authentication) -::: - -## What is Step-Up Authentication? +# Step-Up Authentication with Custom MFA Rules With Step-Up Authentication, applications that allow access to different types of resources can require users to authenticate with a stronger authentication mechanism to access sensitive resources. @@ -20,7 +13,11 @@ You can add step-up authentication to your app with Auth0's extensible multifact ![](/media/articles/step-up-authentication/flow.png) -## Custom Multifactor Authentication Rule +::: note +Auth0 now supports `amr` and `acr` claims with `acr_values` for step-up authentication. This approach allows for more control with MFA. For details see [Step-up Authentication](/tutorials/step-up-authentication). +::: + +## Custom Multifactor Authentication rule The following [rule](/rules) modifies the outgoing token by adding an `authentication_level` parameter. A regular login will be marked as `normal`. @@ -60,7 +57,7 @@ function (user, context, callback) { In addition to the [Auth0 supported mutlifactor authentication providers](/multifactor-authentication#using-auth0s-built-in-support) (Google Authenticator and Duo Security) you can plug in your own [custom provider](/multifactor-authentication#use-a-custom-mfa-service). ::: -## Application Logic +## Application logic You will need to add logic to your app to check the user's login authentication level when they request access to sensitive resources. @@ -96,7 +93,7 @@ router.get('/employees', requireMultiFactor, function(req, res) { Enable the **Use Auth0 instead of the IdP to do Single Sign On** option in the settings page of your client in Auth0, or specify a connection name when triggering step-up authentication, to make sure users are not forced to authenticate when already logged in. By enabling the SSO setting or specifying a connection name, your app will trigger an SSO login which will only prompt the user for multifactor authentication. ::: -## Sample Application +## Sample application In the [Fabrikam Intranet sample](https://github.com/auth0/step-up-authentication-sample), a user that tries to access the Customers section will be required to authenticate:
3
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js @@ -907,8 +907,37 @@ function openWorkspaceReimburseView(policyID) { Log.warn('openWorkspaceReimburseView invalid params', {policyID}); return; } + const onyxData = { + optimisticData: [ + { + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.REIMBURSEMENT_ACCOUNT, + value: { + isLoading: true, + }, + }, + ], + successData: [ + { + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.REIMBURSEMENT_ACCOUNT, + value: { + isLoading: false, + }, + }, + ], + failureData: [ + { + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.REIMBURSEMENT_ACCOUNT, + value: { + isLoading: false, + }, + }, + ], + }; - API.read('OpenWorkspaceReimburseView', {policyID}); + API.read('OpenWorkspaceReimburseView', {policyID}, onyxData); } function openWorkspaceMembersPage(policyID, clientMemberEmails) {
12
diff --git a/src/components/fab/QFab.vue b/src/components/fab/QFab.vue @@ -67,9 +67,9 @@ export default { close (fn) { this.opened = false this.__updateModel(false) + this.$emit('close') if (typeof fn === 'function') { - this.$emit('close') fn() } },
1
diff --git a/snomed-interaction-components/js/snomed-interaction-components-2.1.js b/snomed-interaction-components/js/snomed-interaction-components-2.1.js @@ -10641,8 +10641,8 @@ function conceptDetails(divElement, conceptId, options) { var subscription = channel.subscribe(panelId, function(data, envelope) { // console.log("listening in " + panel.divElement.id); panel.conceptId = data.conceptId; - if (data.showConcept) { - $('a[href="#fh-cd1_canvas-pane"]').click(); + if (data.showConcept && !$('a[href="#' + panel.divElement.id +'-pane"]').parent().hasClass("active")) { + $('a[href="#' + panel.divElement.id +'-pane"]').click(); } if ($("#home-children-" + panel.divElement.id + "-body").length > 0) {} else { panel.setupCanvas(); @@ -12785,7 +12785,8 @@ function searchPanel(divElement, options) { term: $(event.target).attr('data-term'), module: $(event.target).attr("data-module"), conceptId: $(event.target).attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); } @@ -12843,7 +12844,8 @@ function searchPanel(divElement, options) { term: $(event.target).attr('data-term'), module: $(event.target).attr("data-module"), conceptId: $(event.target).attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); } @@ -13254,7 +13256,8 @@ function searchPanel(divElement, options) { term: $(event.target).attr("data-term"), module: $(event.target).attr("data-module"), conceptId: $(event.target).attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); $("[draggable='true']").tooltip({ @@ -14195,7 +14198,8 @@ function taxonomyPanel(divElement, conceptId, options) { term: $(event.target).attr('data-term'), module: $(event.target).attr("data-module"), conceptId: selectedId, - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); } } @@ -14841,7 +14845,8 @@ function refsetPanel(divElement, options) { term: $(event.target).attr('data-term'), module: $(event.target).attr("data-module"), conceptId: $(event.target).attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); }).done(function(result) { @@ -15049,7 +15054,8 @@ function refsetPanel(divElement, options) { term: clickedBadge.attr('data-term'), module: clickedBadge.attr("data-module"), conceptId: clickedBadge.attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); }).fail(function(err) { @@ -15159,7 +15165,8 @@ function favoritePanel(divElement, options) { term: $(event.target).attr('data-term'), module: $(event.target).attr("data-module"), conceptId: $(event.target).attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); } @@ -15995,7 +16002,8 @@ function queryComputerPanel(divElement, options) { term: $(event.target).closest("tr").attr('data-term'), module: $(event.target).closest("tr").attr("data-module"), conceptId: $(event.target).closest("tr").attr('data-concept-id'), - source: panel.divElement.id + source: panel.divElement.id, + showConcept: true }); }); }).fail(function(err) {
7
diff --git a/network.js b/network.js @@ -52,6 +52,7 @@ var assocBlockedPeers = {}; var exchangeRates = {}; var knownWitnesses = {}; var bWatchingForLight = false; +var prev_bugreport_hash = ''; if (process.browser){ // browser console.log("defining .on() on ws"); @@ -2122,7 +2123,12 @@ function handleJustsaying(ws, subject, body){ case 'bugreport': if (!body) return; - if (conf.ignoreBugreportRegexp && new RegExp(conf.ignoreBugreportRegexp).test(body.message+' '+body.exception.toString())) + var text = body.message + ' ' + body.exception.toString(); + var hash = crypto.createHash("sha256").update(text, "utf8").digest("base64"); + if (hash === prev_bugreport_hash) + return console.log("ignoring known bug report"); + prev_bugreport_hash = hash; + if (conf.ignoreBugreportRegexp && new RegExp(conf.ignoreBugreportRegexp).test(text)) return console.log('ignoring bugreport'); mail.sendBugEmail(body.message, body.exception); break;
8
diff --git a/docs/README.md b/docs/README.md [[toc]] ## What is GrapesJS? -At first look you might probably think it's just another kind of page/HTML builder, but actually is something more. GrapesJS is a multi-purpose, Web Builder Framework, which means it allows you easily create your, drag & drop enabled, builder of "THINGS". For "THINGS" we consider anything web structure related, so HTML at first, but don't just think about web pages, we use HTML-like structure basically everywhere: Newsletters (eg. [MJML](https://mjml.io/)), Native Mobile Applications (eg. [React Native](https://github.com/facebook/react-native)), Native Desktop Applications (eg. [Vuido](https://vuido.mimec.org)), PDFs (eg. [React PDF](https://github.com/diegomura/react-pdf)), etc. So, for everything you can imagine as a set of elements like `<tag some="attribute">... other nested elements ...</tag>` you can create easily a GrapesJS builder around it and then use it independently in some of your applications. -GrapesJS comes along with different features and tools which enable you to craft easy to use builders, which will allow your users to create complex HTML-like templates without any knowledge of coding. +At first glance might think this is just another page/HTML builder, but it's something more. GrapesJS is a multi-purpose, Web Builder Framework, which means it allows you to easily create a drag & drop enabled builder of "things". By "things" we mean anything with HTML-like structure, which entails much more than web pages. We use HTML-like structure basically everywhere: Newsletters (eg. [MJML](https://mjml.io/)), Native Mobile Applications (eg. [React Native](https://github.com/facebook/react-native)), Native Desktop Applications (eg. [Vuido](https://vuido.mimec.org)), PDFs (eg. [React PDF](https://github.com/diegomura/react-pdf)), etc. So, for everything you can imagine as a set of elements like `<tag some="attribute">... other nested elements ...</tag>` you can create easily a GrapesJS builder around it and then use it independently your applications. +GrapesJS ships with features and tools that enable you to craft easy to use builders. Which allows your users to create complex HTML-like templates without any knowledge of coding. ## Why GrapesJS? -Mainly, GrapesJS was designed to be used inside some CMS to speed up the creation of dynamic templates and replace common WYSIWYG editors, which are good for content editing but inappropriate for creating HTML structures. Then, with the same concept, instead of creating just an application we decided to create a framework that could be extended and used by everyone for any kind purpose. +GrapesJS was designed primarily to for use inside Content Management Systems to speed up the creation of dynamic templates and replace common WYSIWYG editors. Which are good for content editing, but inappropriate for creating HTML structures. Instead of creating an application we decided to create an extensible framework that could be used by anyone for any purpose. ## Quick Start -To show up of what GrapesJS is capable of we have created some presets. +To showcase the power of GrapesJS we have created some presets. * [grapesjs-preset-webpage](https://github.com/artf/grapesjs-preset-webpage) - [Webpage Builder](http://artf.github.io/grapesjs/demo.html) * [grapesjs-preset-newsletter](https://github.com/artf/grapesjs-preset-newsletter) - [Newsletter Builder](http://artf.github.io/grapesjs/demo-newsletter-editor.html) @@ -34,7 +34,7 @@ You can actually use them as a starting point for your editors, so, just follow Latest version: [![npm](https://img.shields.io/npm/v/grapesjs.svg?colorB=e67891)](https://www.npmjs.com/package/grapesjs) -You can download GrapesJS from one of this sources +You can download GrapesJS from one of these sources * CDNs * unpkg @@ -54,3 +54,4 @@ You can download GrapesJS from one of this sources ## Changelog To track changes made in the library we rely on [Github Releases](https://github.com/artf/grapesjs/releases) +
7
diff --git a/src/state/state.js b/src/state/state.js @@ -282,15 +282,15 @@ var state = { * @memberOf me.state * @public * @function - * @param {boolean} [pauseTrack=false] pause current track on screen pause + * @param {boolean} [music=false] pause current music track on screen pause */ - pause(pauseTrack=false) { + pause(music=false) { // only pause when we are not loading stuff if ((_state !== this.LOADING) && !this.isPaused()) { // stop the main loop _pauseRunLoop(); // current music stop - if (pauseTrack === true) { + if (music === true) { pauseTrack(); } @@ -308,14 +308,14 @@ var state = { * @memberOf me.state * @public * @function - * @param {boolean} [resumeTrack=false] resume current track on screen resume + * @param {boolean} [music=false] resume current music track on screen resume */ - restart(resumeTrack=false) { + restart(music=false) { if (!this.isRunning()) { // restart the main loop _startRunLoop(); // current music stop - if (resumeTrack === true) { + if (music === true) { resumeTrack(); }
1
diff --git a/assets/js/components/adminbar/LegacyAdminBarWidgets.js b/assets/js/components/adminbar/LegacyAdminBarWidgets.js @@ -48,15 +48,15 @@ export default function LegacyAdminBarWidgets() { return <AdminBarZeroData />; } - const handleSearchConsoleDataError = ( error, data ) => { - global.console.log( 'handleSearchConsoleDataError', error, data ); + // withData uses handleDataError function props for handling both errors and zero-data. + // If called without an error, it means zero data. + const handleSearchConsoleDataError = ( error ) => { if ( ! error ) { setZeroDataSearchConsole( true ); } }; - const handleAnalyticsDataError = ( error, data ) => { - global.console.log( 'handleAnalyticsDataError', error, data ); + const handleAnalyticsDataError = ( error ) => { if ( ! error ) { setZeroDataAnalytics( true ); }
2
diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js @@ -4870,7 +4870,7 @@ tarteaucitron.services.webtvnu = { tarteaucitron.services.studizz = { "key": "studizz", "type": "other", - "name": "studizz", + "name": "Studizz Chatbot", "uri": "https://group.studizz.fr/", "needConsent": true, "cookies": [], @@ -4884,3 +4884,4 @@ tarteaucitron.services.studizz = { tarteaucitron.addScript('https://webchat.studizz.fr/webchat.js?token=' + tarteaucitron.user.studizzToken); } }; +
10
diff --git a/.github/workflows/actions/android-pre-build/action.yml b/.github/workflows/actions/android-pre-build/action.yml @@ -7,13 +7,17 @@ inputs: runs: steps: - uses: actions/checkout@v2 + shell: bash - name: Git branch name + shell: bash id: git-branch-name uses: EthanSK/git-branch-name-action@v1 - name: Detect and set target branch + shell: bash run: | echo "TARGET_BRANCH=${{ inputs.target_branch || env.GIT_BRANCH_NAME }}" >> $GITHUB_ENV - name: Pre-checks - Env is Dev + shell: bash run: | echo "ENV=development" >> $GITHUB_ENV echo "SECRET_NAME=DEV_ENV" >> $GITHUB_ENV @@ -22,6 +26,7 @@ runs: echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_DEV }}" >> $GITHUB_ENV - name: Pre-checks - Env is QA if: ${{ env.TARGET_BRANCH == 'staging' }} + shell: bash run: | echo "ENV=staging" >> $GITHUB_ENV echo "SECRET_NAME=STAGING_ENV" >> $GITHUB_ENV @@ -29,6 +34,7 @@ runs: echo "APPCENTER_TOKEN=${{ secrets.APPCENTER_ANDROID_STAGING }}" >> $GITHUB_ENV echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_STAGING }}" >> $GITHUB_ENV - name: Pre-checks - Env is PROD + shell: bash if: ${{ env.TARGET_BRANCH == 'next' }} run: | echo "ENV=prod" >> $GITHUB_ENV @@ -38,15 +44,18 @@ runs: echo "APPCENTER_CODEPUSH_TOKEN=${{ secrets.APPCENTER_CODEPUSH_PROD }}" >> $GITHUB_ENV - uses: actions/checkout@v2 - uses: actions/setup-node@v1 + shell: bash with: node-version: 14 - name: Cache & install npm dependencies + shell: bash uses: bahmutov/npm-install@v1 with: install-command: yarn --frozen-lockfile - name: add .env secrets env: SENTRYRC: ${{ secrets.sentryrc_file }} + shell: bash run: | env_name="${{ env.ENV }}" echo $env_name
0
diff --git a/src/updates.js b/src/updates.js @@ -234,7 +234,9 @@ export function applyClasses(element, classes) { function applyReferencedElementUpdates(element, updates) { for (const key in updates) { const props = updates[key]; - const referencedElement = element.$[key]; + const referencedElement = element.$ ? + element.$[key] : + element.getElementById(key); if (referencedElement) { apply(referencedElement, props); } else {
11
diff --git a/src/migrations/20190618055300-abolish-crowi-classic-auth.js b/src/migrations/20190618055300-abolish-crowi-classic-auth.js @@ -15,7 +15,7 @@ module.exports = { // enable passport and delete configs for crowi classic auth await Promise.all([ - Config.deleteOne({ ns: 'crowi', key: 'security:isEnabledPassport' }), + Config.findOneAndUpdateByNsAndKey('crowi', 'security:isEnabledPassport', true), Config.deleteOne({ ns: 'crowi', key: 'google:clientId' }), Config.deleteOne({ ns: 'crowi', key: 'google:clientSecret' }), ]);
12