code,label "diff --git a/token-metadata/0xc3761EB917CD790B30dAD99f6Cc5b4Ff93C4F9eA/metadata.json b/token-metadata/0xc3761EB917CD790B30dAD99f6Cc5b4Ff93C4F9eA/metadata.json ""symbol"": ""ERC20"", ""address"": ""0xc3761EB917CD790B30dAD99f6Cc5b4Ff93C4F9eA"", ""decimals"": 18, - ""dharmaVerificationStatus"": { ""dharmaVerificationStatus"": ""VERIFIED"" } \ No newline at end of file -} \ No newline at end of file ",3 "diff --git a/packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx b/packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx @@ -167,7 +167,7 @@ const GrowiContextualSubNavigation = (props) => { const { data: isAbleToShowPageAuthors } = useIsAbleToShowPageAuthors(); const { mutate: mutateSWRTagsInfo, data: tagsInfoData } = useSWRxTagsInfo(pageId); - const { data: tagsOnEditMode, sync: syncPageTagsForEditors } = usePageTagsForEditors(); + const { data: tagsForEditors, sync: syncPageTagsForEditors } = usePageTagsForEditors(); const { open: openDuplicateModal } = usePageDuplicateModal(); const { open: openRenameModal } = usePageRenameModal(); @@ -330,7 +330,7 @@ const GrowiContextualSubNavigation = (props) => { isGuestUser={isGuestUser} isDrawerMode={isDrawerMode} isCompactMode={isCompactMode} - tags={isViewMode ? tagsInfoData?.tags : tagsOnEditMode} + tags={isViewMode ? tagsInfoData?.tags : tagsForEditors} tagsUpdatedHandler={isViewMode ? tagsUpdatedHandlerForViewMode : tagsUpdatedHandlerForEditMode} controls={ControlComponents} additionalClasses={['container-fluid']} ",10 "diff --git a/src/client/js/util/reveal/plugins/growi-renderer.js b/src/client/js/util/reveal/plugins/growi-renderer.js let sections = document.querySelectorAll( '[data-markdown]'), section; for (let i = 0, len = sections.length; i < len; i++ ) { section = sections[i]; - section.innerHTML = '

hoge

'; + // remove all existing children. + while (section.firstChild) section.removeChild(section.firstChild); + // add h1 DOM 'Hoge'. + let h1 = document.createElement('h1'); + h1.appendChild(document.createTextNode('Hoge')); + section.appendChild(h1); } const GrowiRenderer = require('../../GrowiRenderer'); let growiRenderer = new GrowiRenderer(root.crowi, root.crowiRenderer, {mode: 'editor'}); ",14 "diff --git a/src/module/dice.js b/src/module/dice.js @@ -310,14 +310,6 @@ export class DiceSFRPG { } } - // Flag critical thresholds - for (let d of roll.dice) { - if (d.faces === 20) { - d.options.critical = critical; - d.options.fumble = fumble; - } - } - if (game.settings.get(""sfrpg"", ""useCustomChatCards"")) { //Push the roll to the ChatBox const customData = { ",2 "diff --git a/helm/zenko/charts/s3-data/templates/deployment.yaml b/helm/zenko/charts/s3-data/templates/deployment.yaml @@ -15,6 +15,14 @@ spec: app: {{ template ""s3-data.name"" . }} release: {{ .Release.Name }} spec: + initContainers: + - name: {{ .Chart.Name }}-init + image: busybox + command: ['sh', '-x', '-c', 'if ! test -d /data/3511; then for i in `seq 1 3511`; do mkdir -p /data/$i; done; fi'] + volumeMounts: + - name: persistent-storage + mountPath: /data + containers: - name: {{ .Chart.Name }} image: ""{{ .Values.image.repository }}:{{ .Values.image.tag }}"" ",4 "diff --git a/src/components/virtual/virtual.js b/src/components/virtual/virtual.js @@ -111,7 +111,7 @@ const Virtual = { const $slideEl = params.renderSlide ? $(params.renderSlide.call(swiper, slide, index)) : $(`
${slide}
`); - + if (!$slideEl.attr('data-swiper-slide-index')) $slideEl.attr('data-swiper-slide-index', index); if (params.cache) swiper.virtual.cache[index] = $slideEl; return $slideEl; }, ",0 "diff --git a/CHANGELOG b/CHANGELOG @@ -16,6 +16,8 @@ entered - Updated third-party libs to get rid of deprecation warnings for React v16 - Fixed small bug in placing rules - Display error when failing to retrieve tilesetInfo +* Added support for cross-section tracks + ======= v0.10.20 (2018-02- ",3 "diff --git a/source/swap/contracts/Swap.sol b/source/swap/contracts/Swap.sol @@ -100,9 +100,6 @@ contract Swap is ISwap, Ownable, EIP712 { * @param order Order to settle */ function swap(address recipient, Order calldata order) external { - // Ensure the order is not expired. - if (order.expiry <= block.timestamp) revert OrderExpired(); - // Validate the sender side of the trade. address finalSenderWallet; @@ -417,6 +414,9 @@ contract Swap is ISwap, Ownable, EIP712 { function _checkValidOrder(Order calldata order, bytes32 domainSeparator) internal { + // Ensure the order is not expired. + if (order.expiry <= block.timestamp) revert OrderExpired(); + bytes32 hashed = _hashOrder(order, domainSeparator); // Recover the signatory from the hash and signature ",5 "diff --git a/src/views/Splash.vue b/src/views/Splash.vue
-

Import with seed phrase

+

Import with seed phrase

",3 "diff --git a/.env.production b/.env.production #defaults for build based on dev env #for dev env tell webpack.config.dev.js to install service worker +NODE_ENV=production REACT_APP_SERVICE_WORKER=true -REACT_APP_ENV=development -REACT_APP_LOG_LEVEL=debug -REACT_APP_SERVER_URL=https://good-server.herokuapp.com -REACT_APP_GUN_PUBLIC_URL=https://goodgun-dev.herokuapp.com/gun -REACT_APP_NETWORK=fuse -REACT_APP_SKIP_EMAIL_VERIFICATION=true -REACT_APP_WEB3_SITE_URL=https://w3.gooddollar.org -REACT_APP_WEB3_SITE_URL_ECONOMY_ENDPOINT=/learn/economy -REACT_APP_MNEMONIC_TO_SEED=true -REACT_APP_ENABLE_INVITES=true -REACT_APP_INVITES_URL= -REACT_APP_SHOW_INVITE=true -REACT_APP_ENABLE_SELF_CUSTODY=true -REACT_APP_CLAIM_QUEUE_ENABLED=true -GENERATE_SOURCEMAP=true -REACT_APP_AUTH0_DOMAIN=https://gooddollar.eu.auth0.com -REACT_APP_DASHBOARD_URL=https://gooddashboard-qa.herokuapp.com +REACT_APP_ENV=production +REACT_APP_LOG_LEVEL=off +REACT_APP_SERVER_URL=https://goodserver.gooddollar.org/ +REACT_APP_GUN_PUBLIC_URL=https://goodgun-nvme.gooddollar.org/gun +REACT_APP_NETWORK=production +REACT_APP_SKIP_EMAIL_VERIFICATION=false +REACT_APP_SKIP_MOBILE_VERIFICATION=true +REACT_APP_MARKET_URL=https://gooddollarmarketplace.sharetribe.com/en +REACT_APP_ETORO=false +REACT_APP_AUTH0_DOMAIN=https://auth0.gooddollar.org +REACT_APP_DASHBOARD_URL=https://dashboard.gooddollar.org/ REACT_APP_ENV_PHASE_ZERO=false REACT_APP_ENV_PHASE_ONE=true REACT_APP_FACE_VERIFICATION_PRIVACY_URL=https://medium.com/gooddollar/gooddollar-identity-pillar-balancing-identity-and-privacy-part-i-face-matching-d6864bcebf54 +REACT_APP_WEB3_SITE_URL=https://w3next.gooddollar.org REACT_APP_USE_TORUS=true +REACT_APP_TORUS_NETWORK=mainnet +REACT_APP_TORUS_PROXY_CONTRACT=0x638646503746d5456209e33a2ff5e3226d698bea +REACT_APP_TORUS_GOOGLE=gooddollar-google +REACT_APP_TORUS_FACEBOOK=gooddollar-facebook +REACT_APP_TORUS_GOOGLEAUTH0=gooddollar-google-auth0 +REACT_APP_ZOOM_PRODUCTION_MODE=true +REACT_APP_ENABLE_SELF_CUSTODY=false REACT_APP_AB_TEST_PERCENTAGE=0.5 +REACT_APP_REALM_APP_ID=wallet_prod-obclo REACT_APP_PUBLIC_URL=https://wallet.gooddollar.org -REACT_APP_IPFS_GATEWAYS=""https://gateway.pinata.cloud/ipfs/{cid},https://{cid}.cf-ipfs.com,https://ipfs.io/ipfs/{cid},https://{cid}.ipfs.dweb.link"" -REACT_APP_IPFS_LAZY_UPLOAD=true -REACT_APP_SMS_RATE_LIMIT=60000 -REACT_APP_REALM_APP_ID = ""wallet_dev-dhiht"" #needs to end with newline ",0 "diff --git a/articles/architecture-scenarios/_includes/_authorization/_api-integration.md b/articles/architecture-scenarios/_includes/_authorization/_api-integration.md -In this scenario your Auth0 tenant can provide an OAuth2 [Access Token](/tokens/overview-access-tokens), typically expressed as a [JWT](/jwt), which [can be used by your API to provide fine-grained access security](/api-auth). In addition, Auth0 provides support for what is notionally described as both first-party and third-party applications. +In this scenario your Auth0 tenant can provide an OAuth2 [Access Token](/tokens/overview-access-tokens), typically expressed as a [JWT](/jwt), which [can be used by your API to restrict access to certain parties](/api-auth). In addition, Auth0 provides support for what is notionally described as both first-party and third-party applications. Acting as the authorization server, and with the consent of the user (the resource owner), your Auth0 tenant can be used to provide an Access Token - typically expressed as a [JWT](/jwt) - to an application (client) so that it can access a protected resources hosted by a resource server on behalf of the resource owner. The issued Access Token is typically passed as the Bearer token in the HTTP Authorization header sent to an [API](/api-auth/why-use-access-tokens-to-secure-apis). ",2 "diff --git a/source/views/controls/AbstractInputView.js b/source/views/controls/AbstractInputView.js @@ -196,69 +196,6 @@ const AbstractInputView = Class({ this._domControl.value = this.get('value'); }, - // --- Focus --- - - /** - Method: O.AbstractInputView#focus - - Focusses the control. - - Returns: - {O.AbstractInputView} Returns self. - */ - focus() { - if (this.get('isInDocument')) { - this._domControl.focus({ - preventScroll: true, - }); - // Fire event synchronously. - if (!this.get('isFocused')) { - this.fire('focus', { - target: this._domControl, - targetView: this, - }); - } - } - return this; - }, - - /** - Method: O.AbstractInputView#blur - - Removes focus from the control. - - Returns: - {O.AbstractInputView} Returns self. - */ - blur() { - if (this.get('isInDocument')) { - this._domControl.blur(); - // Fire event synchronously. - if (this.get('isFocused')) { - this.fire('blur', { - target: this._domControl, - targetView: this, - }); - } - } - return this; - }, - - /** - Method (private): O.AbstractInputView#_updateIsFocused - - Updates the <#isFocused> property. - - Parameters: - event - {Event} The focus event. - */ - _updateIsFocused: function (event) { - this.set( - 'isFocused', - event.type === 'focus' && event.target === this._domControl, - ); - }.on('focus', 'blur'), - // --- Input --- userDidInput(value) { ",2 "diff --git a/website/contributing/how-to-contribute-code.md b/website/contributing/how-to-contribute-code.md @@ -76,7 +76,7 @@ Code-level contributions to React Native generally come in the form of [a pull r If all goes well, your pull request will be merged. If it is not merged, maintainers will do their best to explain their reasoning. -If this is your first time sending a pull request, we have created a [step-by-step guide to help you get started](contributing/how-to-open-a-pull-request). For more detailed information on how pull requests are handled, see the [Managing Pull Requests page](Managing-Pull-Requests). +If this is your first time sending a pull request, we have created a [step-by-step guide to help you get started](/contributing/how-to-open-a-pull-request). For more detailed information on how pull requests are handled, see the [Managing Pull Requests page](Managing-Pull-Requests). ### Contributor License Agreement ",1 "diff --git a/src/lib/gundb/UserStorageClass.js b/src/lib/gundb/UserStorageClass.js @@ -1066,6 +1066,7 @@ export class UserStorage { logger.debug('init feed byid', { items, ids: items && Object.entries(items) }) if (!items) { + await this.feed.putAck({ byid: {} }) return } if (items && items._) { @@ -2428,23 +2429,26 @@ export class UserStorage { .catch(r => ({ profile: 'failed', })), - this.gunuser - .get('feed') - .putAck(null) - .then(r => ({ - feed: 'ok', - })) - .catch(r => ({ - feed: 'failed', - })), - this.properties - .putAck(null) - .then(r => ({ - properties: 'ok', - })) - .catch(r => ({ - properties: 'failed', - })), + + //dont delete anything, everything is encrypted. nullified nodes in gun + //can break stuff if user recreates account with same credentials + // this.gunuser + // .get('feed') + // .putAck(null) + // .then(r => ({ + // feed: 'ok', + // })) + // .catch(r => ({ + // feed: 'failed', + // })), + // this.properties + // .putAck(null) + // .then(r => ({ + // properties: 'ok', + // })) + // .catch(r => ({ + // properties: 'failed', + // })), this.gunuser .get('registered') .putAck(false) ",0 "diff --git a/src/tests/controllers/messageLength.test.ts b/src/tests/controllers/messageLength.test.ts @@ -37,7 +37,7 @@ export async function messageLengthTest(t, node1, node2) { t.true(messageSent.success, 'node1 should send text message to node2') const newMessages = await getCheckMsgs(t, node2) - console.log(newMessages) + console.log(newMessages + '') t.true( newMessages.new_messages_length == 1, 'node2 should only have 1 new message' ",0 "diff --git a/backend/utils/events.js b/backend/utils/events.js @@ -51,7 +51,12 @@ async function upsertEvent({ web3, event, shopId, networkId }) { // Fetch the block to get its timestamp. const block = await web3.eth.getBlock(eventObj.blockNumber) + if (block) { eventObj.timestamp = block.timestamp + } else { + // Best effort. This is likely only to happen with newer blocks + eventObj.timestamp = Math.floor(+new Date() / 1000) + } // Save the event in the DB. const record = await Event.create(eventObj) ",4 "diff --git a/tests/codeceptjs/editors/object_test.js b/tests/codeceptjs/editors/object_test.js @@ -68,14 +68,14 @@ Scenario('opt in optional properties', async (I) => { I.seeDisabledAttribute('[data-schemapath=""root.object.boolean""] .json-editor-opt-in'); // tests merged from master 17.9.2019 - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.string""] .json-editor-opt-in', 'checked'), false); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.string""] .json-editor-opt-in', 'disabled'), false); - assert.equal(await I.grabAttributeFrom('[name=""root[string]""]', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.number""] .json-editor-opt-in', 'checked'), false); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.number""] .json-editor-opt-in', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[name=""root[object][number]""]', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.boolean""] .json-editor-opt-in', 'checked'), false); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.boolean""] .json-editor-opt-in', 'disabled'), 'true'); + I.dontSeeCheckedAttribute('[data-schemapath=""root.string""] .json-editor-opt-in') + I.dontSeeDisabledAttribute('[data-schemapath=""root.string""] .json-editor-opt-in') + I.seeDisabledAttribute('[name=""root[string]""]') + I.dontSeeCheckedAttribute('[data-schemapath=""root.object.number""] .json-editor-opt-in') + I.seeDisabledAttribute('[data-schemapath=""root.object.number""] .json-editor-opt-in') + I.seeDisabledAttribute('[name=""root[object][number]""]') + I.dontSeeCheckedAttribute('[data-schemapath=""root.object.boolean""] .json-editor-opt-in') + I.seeDisabledAttribute('[data-schemapath=""root.object.boolean""] .json-editor-opt-in') I.click('.get-value'); assert.equal(await I.grabValueFrom('.value'), '{""number"":0,""boolean"":false}'); @@ -84,15 +84,17 @@ Scenario('opt in optional properties', async (I) => { I.click('[data-schemapath=""root""] .json-editor-btn-edit'); I.click('[data-schemapath=""root""] .json-editor-btn-edit'); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.string""] .json-editor-opt-in', 'checked'), false); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.string""] .json-editor-opt-in', 'disabled'), false); - assert.equal(await I.grabAttributeFrom('[name=""root[string]""]', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.number""] .json-editor-opt-in', 'checked'), false); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.number""] .json-editor-opt-in', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[name=""root[object][number]""]', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.boolean""] .json-editor-opt-in', 'checked'), false); - assert.equal(await I.grabAttributeFrom('[data-schemapath=""root.object.boolean""] .json-editor-opt-in', 'disabled'), 'true'); - assert.equal(await I.grabAttributeFrom('[name=""root[object][boolean]""]', 'disabled'), 'true'); + + I.dontSeeCheckedAttribute('[data-schemapath=""root.string""] .json-editor-opt-in') + I.dontSeeDisabledAttribute('[data-schemapath=""root.string""] .json-editor-opt-in') + I.seeDisabledAttribute('[name=""root[string]""]') + I.dontSeeCheckedAttribute('[data-schemapath=""root.object.number""] .json-editor-opt-in') + I.seeDisabledAttribute('[data-schemapath=""root.object.number""] .json-editor-opt-in') + I.seeDisabledAttribute('[name=""root[object][number]""]') + I.dontSeeCheckedAttribute('[data-schemapath=""root.object.boolean""] .json-editor-opt-in') + I.seeDisabledAttribute('[data-schemapath=""root.object.boolean""] .json-editor-opt-in') + I.seeDisabledAttribute('[name=""root[object][boolean]""]') + I.click('.get-value'); assert.equal(await I.grabValueFrom('.value'), '{""number"":0,""boolean"":false}'); ",1 "diff --git a/packages/webpack-plugin/lib/json-compiler/index.js b/packages/webpack-plugin/lib/json-compiler/index.js @@ -136,7 +136,7 @@ module.exports = function (raw) { if (this.resourcePath.endsWith('.json.js')) { json = JSON.parse(mpxJSON.compileMPXJSONText({ source: raw, mode, defs, filePath: this.resourcePath })) } else { - json = JSON.parse(raw) + json = JSON.parse(raw || '{}') } } catch (err) { return callback(err) ",9 "diff --git a/tests/e2e/specs/modules/pagespeed-insights/activation.test.js b/tests/e2e/specs/modules/pagespeed-insights/activation.test.js @@ -50,14 +50,5 @@ describe( 'PageSpeed Insights Activation', () => { await expect( page ).toClick( 'button.mdc-button', { text: 'Proceed' } ); await page.waitForSelector( 'h3.googlesitekit-heading-3' ); - - // Check that the correct key is saved on the settings page. - await visitAdminPage( 'admin.php', 'page=googlesitekit-settings' ); - - await expect( page ).toClick( 'button.mdc-tab', { text: 'Admin Settings' } ); - - // Check the API Key text, verifying the submitted value has been stored. - await expect( page ).toMatchElement( '.googlesitekit-settings-module__meta-item-type', { text: 'API Key' } ); - await expect( page ).toMatchElement( 'h5.googlesitekit-settings-module__meta-item-data', { text: 'PSIKEYTOSUBMITANDTEST' } ); } ); } ); ",2 "diff --git a/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/SetupBanner.js b/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/SetupBanner.js @@ -315,7 +315,7 @@ export default function SetupBanner( { onSubmitSuccess } ) { { ctaLabel } } - footer={

{ footer }

} + footer={ footer } dismiss={ __( 'Cancel', 'google-site-kit' ) } dismissExpires={ getBannerDismissalExpiryTime( referenceDateString ",2 "diff --git a/components/post.js b/components/post.js @@ -2,6 +2,7 @@ import PropTypes from 'prop-types' import Link from 'next/link' import Image from 'next/image' import {ArrowLeftCircle} from 'react-feather' +import colors from '@/styles/colors' import Section from '@/components/section' @@ -142,6 +143,19 @@ function Post({title, published_at, feature_image, html, backLink}) { left: 0; border-radius: 0 2px 2px 0; } + + .kg-button-card a { + color: white; + background-color: ${colors.blue}; + border-radius: 5px; + font-weight: 1em; + padding: .5em 1.2em; + height: 2.4em; + line-height: 1em; + margin: auto; + text-decoration: none; + transition: all .2s ease; + } `} ) ",0 "diff --git a/packages/mjml-core/src/helpers/traverseMJML.js b/packages/mjml-core/src/helpers/traverseMJML.js @@ -3,13 +3,9 @@ import head from 'lodash/head' import map from 'lodash/map' import noop from 'lodash/noop' -export default function traverseMJML(mjml, predicate = noop, ignoreTagContent = null) { +export default function traverseMJML(mjml, predicate = noop) { const traverse = mjml => map(mjml.children, child => { - if (ignoreTagContent && child.tagName === ignoreTagContent) { - return [] - } - if (predicate(child)) { return child } ",13 "diff --git a/src/plots/plots.js b/src/plots/plots.js @@ -257,7 +257,7 @@ plots.previousPromises = function(gd) { * Add source links to your graph inside the 'showSources' config argument. */ plots.addLinks = function(gd) { - if(gd._context.showLink === false) return; + if(!gd._context.showLink || !gd._context.showSources) return; var fullLayout = gd._fullLayout; ",9 "diff --git a/react/src/components/card/SprkCard.js b/react/src/components/card/SprkCard.js @@ -67,10 +67,10 @@ SprkCard.propTypes = { * Card Content. */ additionalContentClasses: PropTypes.string, - /** Takes content for a base card */ + /** Content to render inside of SprkCard. */ children: PropTypes.node, /** - * The value supplied will be assigned + * Value assigned * to the `data-id` attribute on the * component. This is intended to be * used as a selector for automated @@ -79,63 +79,125 @@ SprkCard.propTypes = { */ idString: PropTypes.string, /** - * If `true`, the Standout Card styles - * will be applied. + * Determines if card style has a deeper shadow. */ isStandout: PropTypes.bool, - /** The type of Card variant to render. */ + // TODO: Turn this prop into a oneOf type and include the possible possibilities. It could also need a default/base variant style. Issue #2496 + /** + * Determines the type of card. + * If none provided, it defaults to + * the base card style. + * + * Expects either `highlightedHeader` + * or `teaser`. + */ variant: PropTypes.string, - /** Configures highlighted header */ + /** + * Configurations that + * populate the content of SprkCard + * with a highlighted Header. + */ highlightedHeaderConfig: PropTypes.shape({ - /** Text inside of highlighted card */ + /** + * The Highlighted Header Card's main body text. + */ bodyText: PropTypes.string, - /** Sub-headline of card */ + /** + * The Highlighted Header Card's description. + */ description: PropTypes.string, - /** Headline of card */ + /** + * The Card's title. + */ title: PropTypes.string, }), - /** Configures teaser */ + /** + * Configuration that populate the content of SprkCard teaser. + */ teaserConfig: PropTypes.shape({ - /** Text in the main body */ + /** + * Teaser Card's body text. + */ bodyText: PropTypes.string, + /** + * Configures the call-to-action of a teaser card. + */ cta: PropTypes.shape({ - /** Extra classes on the Call to Action of Teaser */ + /** Extra classes on the call-to-action of Teaser Card. */ additionalCtaIconClasses: PropTypes.string, - /** CTA Analytics */ + /** + * Value assigned to the + * `data-analytics` attribute on the Call to Action. + * Intended for an outside + * library to capture data. + */ ctaAnalytics: PropTypes.string, - /** Icon next to CTA */ + /** + * Determines what icon `SprkIcon` renders next to the Call to Action. + */ ctaIcon: PropTypes.string, - /** Anchor tag, or router link at user discretion */ - mediaLinkElement: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), - /** Link or Button */ + /** + * Determinds if the CTA is a link or a button. + * Will default to `link` if none provided. + */ ctaVariant: PropTypes.oneOf(['link', 'button']), - /** Where the cta navigates to */ + /** + * Determines the href of the media. + */ href: PropTypes.string, - /** Text of the CTA */ + /** Text of the CTA. */ text: PropTypes.string, }), - /** Configs for the main media of the teaser card */ + /** + * Configures the main media of the Teaser Card. + */ media: PropTypes.shape({ - /** Additional classes if it's an icon */ + /** + * Expects a space separated string + * of classes to be added to the + * media icon. + */ additionalMediaIconClasses: PropTypes.string, - /** Where media navigates to */ + /** + * Determines the href of the media. + */ href: PropTypes.string, - /** Anchor tag, or router link at user discretion */ + /** + * Determines if link renders as an Anchor tag, or router link. + * If an href is provided and an element is not, + * an anchor tag will be rendered. + */ mediaLinkElement: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), - /** Reference name of SprkIcon */ + /** + * Determines what icon `SprkIcon` renders + * as the main media of the Teaser Card. + */ iconName: PropTypes.string, - /** Alternative text for image */ + /** Alternative text for the media. */ imgAlt: PropTypes.string, - /** src for image */ + /** The source link for the media. */ imgSrc: PropTypes.string, - /** Analytics id tag for image */ + /** + * The value supplied will be assigned to the + * `data-analytics` attribute on the media of the card. + * Intended for an outside + * library to capture data. + */ mediaAnalyticsString: PropTypes.string, - /** Chooses if main media is img or SprkIcon */ + /** + * Determines which type of media renders. Defaults to `img` if none provided. + */ mediaVariant: PropTypes.oneOf(['img', 'icon']), }), - /** title of teaser card */ + /** + * Text that will show as as + * the main headline of the Teaser Card. + */ title: PropTypes.string, - /** Decides if title goes first */ + /** + * Determines if the Teaser Card's + * title is at the top or below the main media. + */ titleFirst: PropTypes.bool, }), }; ",7 "diff --git a/lib/modules/swarm/process.js b/lib/modules/swarm/process.js @@ -24,7 +24,7 @@ class SwarmProcess extends ProcessWrapper { `--password=${fs.dappPath(this.storageConfig.account.password)}`, `--corsdomain=${self.cors.join(',')}` ]; - console.error('Starting swarm process with arguments: ' + args.join(' ')); + console.trace('Starting swarm process with arguments: ' + args.join(' ')); this.child = child_process.spawn(this.command, args); this.child.on('error', (err) => { ",13 "diff --git a/core/rendered_connection.js b/core/rendered_connection.js @@ -475,19 +475,12 @@ Blockly.RenderedConnection.prototype.renderTypeVarHighlights = function() { delete this.typeVarPaths_[i]; } } - var typeExpr = this.typeExpr; - if (opt_isOutput === true) { - var block = this.sourceBlock_; - if (goog.isFunction(block.outputTypeExprToRender)) { - typeExpr = block.outputTypeExprToRender(); - } - } this.typeVarPaths_ = []; var xy = this.sourceBlock_.getRelativeToSurfaceXY(); var pos = new goog.math.Coordinate(this.x_ - xy.x, this.y_ - xy.y); this.typeVarPaths_ = Blockly.RenderedTypeExpr.createHighlightedSvg( - typeExpr, pos, 1, this.sourceBlock_.getSvgRoot()); + this.typeExpr, pos, 1, this.sourceBlock_.getSvgRoot()); }; /** ",2 "diff --git a/README.md b/README.md @@ -26,12 +26,9 @@ Community chat. [Join us!][discord-url] ##### New releases -> `whs` is currently at v2 major version. We don't have clear plans for v3 yet. So v2 will probably remain the main stable version until at least 2018. - -> We try to publish **patch releases every 20 days** or even more often. - -> We try to publish **minor update releases every 60 days** or even more often depending on the amount of features that sometimes get added in a very small period of time. We want the community to profit from new modules, components and feature enhancements as soon as they are implemented. +> `whs` is currently at v2 major version. We had plans for v3 yet but development isn't active. So v2 will probably remain the main stable version until further notice. +> We try to publish **minor update releases** for bug fixes, we will review PRs. #### NPM ",3 "diff --git a/javascript/components/UserLocation.js b/javascript/components/UserLocation.js @@ -130,6 +130,7 @@ class UserLocation extends React.Component { async componentDidMount() { this._isMounted = true; + locationManager.addListener(this._onLocationUpdate); await this.setLocationManager({ running: this.needsLocationManagerRunning(), @@ -212,7 +213,13 @@ class UserLocation extends React.Component { render() { const {heading, coordinates} = this.state; - const {children, visible, showsUserHeadingIndicator} = this.props; + const { + children, + visible, + showsUserHeadingIndicator, + onPress, + animated, + } = this.props; if (!visible || !coordinates) { return null; @@ -220,10 +227,10 @@ class UserLocation extends React.Component { return (