code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/shows/003 - CSS Preprocessors and Structuring CSS.md b/shows/003 - CSS Preprocessors and Structuring CSS.md @@ -21,7 +21,7 @@ url: https://traffic.libsyn.com/syntax/Syntax003.mp3
* [Sass](http://sass-lang.com)
* [PostCSS](http://postcss.org)
* [PostCSS Autoprefixer](https://github.com/postcss/autoprefixer)
-* [RuckSack](https://simplaio.github.io/rucksack/)
+* [RuckSack](https://www.rucksackcss.org/)
* [cssnext](http://cssnext.io)
* [LostGrid](http://lostgrid.org)
* [Bootstrap](http://getbootstrap.com)
| 1 |
diff --git a/test/converter/ConvertFig.test.js b/test/converter/ConvertFig.test.js @@ -11,9 +11,13 @@ test("Extract caption title from figure", function(t) {
let dom = DefaultDOMElement.parseXML(fixture)
let converter = new ConvertFig()
converter.import(dom)
- let fn = dom.find('#fig1')
// title should now be child of fig, and caption a container of paragraphs
- t.equal(fn.outerHTML, '<fig id="fig1"><object-id pub-id-type="doi"/><title>fig_title</title><caption><p>fig_caption</p></caption><graphic xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="fig1.jpg"/></fig>')
+ let title = dom.find('#fig1 > title')
+ let caption = dom.find('#fig1 > caption')
+ t.notNil(title, '<title> should be child of <fig>')
+ t.equal(title.textContent, 'fig_title', '.. and title content should be correct')
+ t.notNil(caption, '<caption> should be child of <fig>')
+ t.equal(caption.serialize(), '<caption><p>fig_caption</p></caption>', '.. and should have correct content')
t.end()
})
@@ -21,9 +25,11 @@ test("Should expand title and caption if not there", function(t) {
let dom = DefaultDOMElement.parseXML(fixture)
let converter = new ConvertFig()
converter.import(dom)
- let fn = dom.find('#fig2')
+ let title = dom.find('#fig2 > title')
+ let caption = dom.find('#fig2 > caption')
// should create title and caption if does not exist
- t.equal(fn.outerHTML, '<fig id="fig2"><object-id pub-id-type="doi"/><title/><caption><p/></caption><graphic xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="fig2.jpg"/></fig>')
+ t.notNil(title, '<title> should be child of <fig>')
+ t.notNil(caption, '<caption> should be child of <fig>')
t.end()
})
@@ -32,8 +38,7 @@ test("Should expand title if not there", function(t) {
let dom = DefaultDOMElement.parseXML(fixture)
let converter = new ConvertFig()
converter.import(dom)
- let fn = dom.find('#fig3')
- // should create title and caption if does not exist
- t.equal(fn.outerHTML, '<fig id="fig3"><object-id pub-id-type="doi"/><title/><caption><p>fig_caption</p></caption><graphic xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="fig3.jpg"/></fig>')
+ let title = dom.find('#fig3 > title')
+ t.notNil(title, '<title> should be child of <fig>')
t.end()
})
| 7 |
diff --git a/app.json b/app.json "env": {
"HOST": {
"required": true
- },
- "PAPERTRAIL_API_TOKEN": {
- "required": true
}
},
"formation": {
"web": {
- "quantity": 1
+ "quantity": 1,
+ "size": "free"
}
},
- "addons": [
- "papertrail"
- ],
"buildpacks": [
{
"url": "heroku/nodejs"
| 4 |
diff --git a/src/components/dashboard/Rewards.web.js b/src/components/dashboard/Rewards.web.js import React, { useEffect, useMemo, useState } from 'react'
-import { isIOS } from 'mobile-device-detect'
+
+// import { isIOS } from 'mobile-device-detect'
import { get, toPairs } from 'lodash'
import userStorage from '../../lib/gundb/UserStorage'
import Config from '../../config/config'
@@ -9,6 +10,7 @@ import { useDialog } from '../../lib/undux/utils/dialog'
const log = logger.child({ from: 'RewardsTab' })
+const openInNewTab = false //isIOS
const RewardsTab = props => {
const [token, setToken] = useState()
const store = SimpleStore.useStore()
@@ -16,7 +18,7 @@ const RewardsTab = props => {
const getRewardsPath = () => {
const params = get(props, 'navigation.state.params', {})
- if (isIOS === false) {
+ if (openInNewTab === false) {
params.purpose = 'iframe'
}
params.token = token
@@ -44,7 +46,7 @@ const RewardsTab = props => {
}, [])
useEffect(() => {
- if (isIOS && token) {
+ if (openInNewTab && token) {
store.set('loadingIndicator')({ loading: false })
showDialog({
title: 'Press ok to go to Rewards dashboard',
@@ -68,7 +70,7 @@ const RewardsTab = props => {
return <iframe title="Rewards" onLoad={isLoaded} src={src} seamless frameBorder="0" style={{ flex: 1 }} />
}, [src])
- if (isIOS || token === undefined) {
+ if (openInNewTab || token === undefined) {
return null
}
| 1 |
diff --git a/articles/client-platforms/angularjs/07-authorization.md b/articles/client-platforms/angularjs/07-authorization.md @@ -65,4 +65,4 @@ Every time the `$stateChangeStart` event fires, a check is done to determine whe
> **Note:** Users have no control over their own `app_metadata`, so there is no risk of a user modifying their own access level in Auth0. Keep in mind, however, that the payload of a JSON Web Token can be modified in debuggers such as [jwt.io](https://jwt.io). If a user does this, their JWT will be invalidated and become unusable for accessing server resources; however, the user would be able to access client-side routes with a modified payload. Be sure to keep sensitive information out of the client side completely and rely on XHR requests for that information as this will ensure that resources are properly protected.
-Now if an user logs in with an email that contains `@example`, they will be allowed access to the `/admin` route.
+Now if a user logs in with an email that contains `@example`, they will be allowed access to the `/admin` route.
| 1 |
diff --git a/app/models/concerns/cartodb_central_synchronizable.rb b/app/models/concerns/cartodb_central_synchronizable.rb module Concerns
module CartodbCentralSynchronizable
+
+ def is_a_user?
+ return self.is_a?(::User) || self.is_a?(Carto::User)
+ end
+
+ def is_an_organization?
+ return self.is_a?(::Organization) || self.is_a?(Carto::Organization)
+ end
+
# This validation can't be added to the model because if a user creation begins at Central we can't know if user is the same or existing
def validate_credentials_not_taken_in_central
- return true unless self.is_a?(::User)
+ return true unless self.is_a_user?
return true unless Cartodb::Central.sync_data_with_cartodb_central?
central_client = Cartodb::Central.new
@@ -14,13 +23,13 @@ module Concerns
def create_in_central
return true unless sync_data_with_cartodb_central?
- if self.is_a?(::User)
+ if self.is_a_user?
if organization.present?
cartodb_central_client.create_organization_user(organization.name, allowed_attributes_to_central(:create))
else
CartoDB.notify_debug("User creations at box without organization are not notified to Central", user: self)
end
- elsif self.is_a?(::Organization)
+ elsif self.is_an_organization?
raise "Can't create organizations in editor"
end
return true
@@ -28,13 +37,13 @@ module Concerns
def update_in_central
return true unless sync_data_with_cartodb_central?
- if self.is_a?(::User)
+ if self.is_a_user?
if organization.present?
cartodb_central_client.update_organization_user(organization.name, username, allowed_attributes_to_central(:update))
else
cartodb_central_client.update_user(username, allowed_attributes_to_central(:update))
end
- elsif self.is_a?(::Organization)
+ elsif self.is_an_organization?
cartodb_central_client.update_organization(name, allowed_attributes_to_central(:update))
end
return true
@@ -42,7 +51,7 @@ module Concerns
def delete_in_central
return true unless sync_data_with_cartodb_central?
- if self.is_a?(::User)
+ if self.is_a_user?
if organization.nil?
cartodb_central_client.delete_user(self.username)
else
@@ -52,7 +61,7 @@ module Concerns
raise "Can't destroy the organization owner"
end
end
- elsif is_a?(::Organization)
+ elsif is_an_organization?
# See Organization#destroy_cascade
raise "Delete organizations is not allowed" if Carto::Configuration.saas?
cartodb_central_client.delete_organization(name)
@@ -61,7 +70,7 @@ module Concerns
end
def allowed_attributes_from_central(action)
- if is_a?(::Organization)
+ if is_an_organization?
case action
when :create
%i(name seats viewer_seats quota_in_bytes display_name description website
@@ -90,7 +99,7 @@ module Concerns
mapzen_routing_quota mapzen_routing_block_price no_map_logo auth_github_enabled
password_expiration_in_d inherit_owner_ffs)
end
- elsif is_a?(::User)
+ elsif is_a_user?
%i(account_type admin org_admin crypted_password database_host
database_timeout description disqus_shortname available_for_hire email
geocoding_block_price geocoding_quota map_view_block_price map_view_quota max_layers
@@ -116,7 +125,7 @@ module Concerns
end
def allowed_attributes_to_central(action)
- if is_a?(::Organization)
+ if is_an_organization?
case action
when :create
raise "Can't create organizations from editor"
@@ -126,7 +135,7 @@ module Concerns
inherit_owner_ffs)
values.slice(*allowed_attributes)
end
- elsif is_a?(::User)
+ elsif is_a_user?
allowed_attributes = %i(
account_type admin org_admin crypted_password database_host database_timeout description disqus_shortname
available_for_hire email geocoding_block_price geocoding_quota map_view_block_price map_view_quota max_layers
@@ -160,7 +169,7 @@ module Concerns
return self unless params.present? && action.present?
self.set(params.slice(*allowed_attributes_from_central(action)))
- if self.is_a?(::User) && params.has_key?(:password)
+ if self.is_a_user? && params.has_key?(:password)
self.password = self.password_confirmation = params[:password]
end
self
| 11 |
diff --git a/packages/generator-wcfactory/generators/init/templates/package.json b/packages/generator-wcfactory/generators/init/templates/package.json "@storybook/addon-viewport": "^3.4.8",
"@storybook/cli": "^3.4.11",
"@storybook/polymer": "^3.4.8",
+ "@wcfactory/generator-wcfactory": "^0.0.6",
"@webcomponents/webcomponentsjs": "^2.0.3",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-transform-es2015-modules-umd": "^6.24.1",
"decomment": "^0.9.1",
"del": "^3.0.0",
"dialog-polyfill": "^0.4.10",
- "generator-rhelement": "^0.6.3",
"global": "^4.3.2",
"gulp": "github:gulpjs/gulp#4.0",
"gulp-babel": "^7.0.0",
| 14 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.7.0
- Deprecated: `*-blacklist`, `*-requirelist` and `*-whitelist` rules in favour of the new `*-disallowed-list`, `*-required-list` and `*-disallowed-list` ones ([#4845](https://github.com/stylelint/stylelint/pull/4845)):
- `at-rule-blacklist`. Use `at-rule-disallowed-list` instead.
| 6 |
diff --git a/CHANGES.md b/CHANGES.md - Fixed `translucencyByDistance` for label outline color [#9003](https://github.com/CesiumGS/cesium/pull/9003)
- Fixed return value for `SampledPositionProperty.removeSample` [#9017](https://github.com/CesiumGS/cesium/pull/9017)
- Fixed issue where wall doesn't have correct texture coordinates when there are duplicate positions input [#9042](https://github.com/CesiumGS/cesium/issues/9042)
+- Fixed an issue where clipping planes would not clip at the correct distances on some Android devices, most commonly reproducible on devices with `Mali` GPUs that do not support float textures via WebGL [#9023](https://github.com/CesiumGS/cesium/issues/9023)
### 1.71 - 2020-07-01
| 3 |
diff --git a/src/traces/choropleth/event_data.js b/src/traces/choropleth/event_data.js * LICENSE file in the root directory of this source tree.
*/
-
'use strict';
-module.exports = function eventData(out, pt) {
+module.exports = function eventData(out, pt, trace, cd, pointNumber) {
out.location = pt.location;
out.z = pt.z;
+ var cdi = cd[pointNumber];
+ if(cdi.fIn) {
+ out.properties = cdi.fIn.properties;
+ }
+
return out;
};
| 0 |
diff --git a/android/rctmgl/src/main/java/com/mapbox/rctmgl/RCTMGLPackage.java b/android/rctmgl/src/main/java/com/mapbox/rctmgl/RCTMGLPackage.java @@ -61,7 +61,7 @@ public class RCTMGLPackage implements ReactPackage {
// sources
managers.add(new RCTMGLVectorSourceManager(reactApplicationContext));
managers.add(new RCTMGLShapeSourceManager(reactApplicationContext));
- managers.add(new RCTMGLRasterSourceManager(reactApplicationContext));
+ managers.add(new RCTMGLRasterSourceManager());
// layers
managers.add(new RCTMGLFillLayerManager());
| 2 |
diff --git a/source/swap/test/Swap.js b/source/swap/test/Swap.js @@ -450,7 +450,9 @@ contract('Swap', async accounts => {
let _order
let _unsignedOrder
- before('Alice creates an order for Bob (200 AST for 50 DAI)', async () => {
+ before(
+ 'David makes an order for Alice and Bob (200 AST for 50 DAI)',
+ async () => {
_unsignedOrder = createOrder({
signer: {
wallet: aliceAddress,
@@ -464,14 +466,19 @@ contract('Swap', async accounts => {
},
expiry: await getTimestampPlusDays(1),
})
- _order = await signOrder(_unsignedOrder, davidSigner, swapContractAddress)
- })
+ _order = await signOrder(
+ _unsignedOrder,
+ davidSigner,
+ swapContractAddress
+ )
+ }
+ )
- it('Checks that David cannot make an order on behalf of Alice', async () => {
+ it('Checks that David cannot sign an order on behalf of Alice', async () => {
await reverted(swap(_order, { from: bobAddress }), 'SIGNER_UNAUTHORIZED')
})
- it('Checks that David cannot make an order on behalf of Alice without signature', async () => {
+ it('Checks that David cannot sign an order on behalf of Alice without signature', async () => {
await reverted(
swap(
{ ..._unsignedOrder, signature: emptySignature },
@@ -481,7 +488,7 @@ contract('Swap', async accounts => {
)
})
- it('Alice attempts to incorrectly authorize herself to make orders', async () => {
+ it('Alice attempts and fails to authorize herself to sign orders on her own behalf', async () => {
await reverted(
swapContract.authorizeSigner(aliceAddress, {
from: aliceAddress,
@@ -490,7 +497,7 @@ contract('Swap', async accounts => {
)
})
- it('Alice authorizes David to make orders on her behalf', async () => {
+ it('Alice authorizes David to sign orders on her behalf', async () => {
emitted(
await swapContract.authorizeSigner(davidAddress, {
from: aliceAddress,
@@ -499,7 +506,7 @@ contract('Swap', async accounts => {
)
})
- it('Alice authorizes David a second time does not emit an event', async () => {
+ it('Alice tries and fails to authorize David twice', async () => {
notEmitted(
await swapContract.authorizeSigner(davidAddress, {
from: aliceAddress,
@@ -517,7 +524,7 @@ contract('Swap', async accounts => {
)
})
- it('Checks that David can make an order on behalf of Alice', async () => {
+ it('David signs an order on behalf of Alice successfully taken by Bob', async () => {
emitted(await swap(_order, { from: bobAddress }), 'Swap')
})
@@ -528,14 +535,14 @@ contract('Swap', async accounts => {
)
})
- it('Alice fails to try to revokes authorization from David again', async () => {
+ it('Alice tries and fails to revoke authorization from David twice', async () => {
notEmitted(
await swapContract.revokeSigner(davidAddress, { from: aliceAddress }),
'RevokeSigner'
)
})
- it('Checks that David can no longer make orders on behalf of Alice', async () => {
+ it('Checks that David can no longer sign orders on behalf of Alice', async () => {
const order = await signOrder(
createOrder({
signer: {
| 3 |
diff --git a/README.md b/README.md @@ -2,11 +2,7 @@ JSON Editor
===========
[](https://travis-ci.org/json-editor/json-editor)
-Fork of the [json-editor/json-editor](https://github.com/json-editor/json-editor)
-
-Documentation from the original repo:
-____________________________________________________________________________________
-
+Fork of the inactive [jdorn/json-editor](https://github.com/jdorn/json-editor) using the updated fork [json-editor/json-editor](https://github.com/json-editor/json-editor).
Some pull requests added from the original repo.
| 13 |
diff --git a/packages/mjml-image/src/index.js b/packages/mjml-image/src/index.js @@ -61,7 +61,7 @@ export default class MjImage extends BodyComponent {
'text-decoration': 'none',
height: this.getAttribute('height'),
'min-width': fullWidth ? '100%' : null,
- width: `${width}px`,
+ width: '100%',
'max-width': fullWidth ? '100%' : null,
},
td: {
| 13 |
diff --git a/components/evenement/add-to-calendar.js b/components/evenement/add-to-calendar.js @@ -3,21 +3,23 @@ import PropTypes from 'prop-types'
// eslint-disable-next-line camelcase
import {atcb_init} from 'add-to-calendar-button'
-const sanitizedDate = date => {
- const dateToArray = date.split('-')
- return `${dateToArray[1]}-${dateToArray[2]}-${dateToArray[0]}`
+const calendarDate = date => {
+ const [year, month, day] = date.split('-')
+ return `${month}-${day}-${year}`
}
function AddToCalendar({eventData}) {
const {titre, adresse, description, date, heureDebut, heureFin} = eventData
const {nom, numero, voie, codePostal, commune} = adresse
+ const eventDate = calendarDate(date)
+
const calendarOptions = {
event: {
name: titre,
description,
- dateStart: sanitizedDate(date),
- dateEnd: sanitizedDate(date),
+ dateStart: eventDate,
+ dateEnd: eventDate,
timeStart: heureDebut,
timeEnd: heureFin,
location: `${nom} ${numero} ${voie} ${codePostal} ${commune}`
| 7 |
diff --git a/src/scss/includes/font.scss b/src/scss/includes/font.scss -$font_system: 'Helvetica', 'Arial', 'Noto Sans', 'Ubuntu', sans-serif;
+$font_system: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Helvetica Neue', Arial, sans-serif;
@font-face {
font-family: 'icomoon';
| 4 |
diff --git a/assets/src/components/mybooks/MyBooks.test.jsx b/assets/src/components/mybooks/MyBooks.test.jsx @@ -7,8 +7,10 @@ import { someBookWithACopyFromMe } from '../../../test/booksHelper';
jest.mock('../../services/BookService');
+
describe('My books', () => {
const createComponent = (props = {}) => shallow(<MyBooks {...props} />);
+ getMyBooks.mockReturnValue({ results: [] });
it('renders without crashing', () => {
const myBooks = createComponent();
| 0 |
diff --git a/test/unit/specs/components/common/TmSessionWelcome.spec.js b/test/unit/specs/components/common/TmSessionWelcome.spec.js @@ -32,18 +32,55 @@ describe(`TmSessionWelcome`, () => {
describe(`header buttons`, () => {
it(`should open the help modal on click`, () => {
- wrapper.vm.help()
- expect(store.commit).toHaveBeenCalledWith(`setModalHelp`, true)
+ const $store = { commit: jest.fn() }
+ const self = { $store }
+ TmSessionWelcome.methods.help.call(self)
+ expect($store.commit).toHaveBeenCalledWith(`setModalHelp`, true)
+ })
+
+ describe(`closes the session modal`, () => {
+ it(`without going to prev page`, () => {
+ const $store = { commit: jest.fn() }
+ const self = {
+ back: jest.fn(),
+ $store,
+ $router: {
+ currentRoute: {
+ path: `/`
+ }
+ }
+ }
+ TmSessionWelcome.methods.closeSession.call(self)
+ expect($store.commit).toHaveBeenCalledWith(`setModalSession`, false)
+ expect($store.commit).toHaveBeenCalledWith(
+ `setModalSessionState`,
+ false
+ )
+ expect(self.back).not.toHaveBeenCalled()
})
- it(`should close the session modal on click`, () => {
+ it(`going back to prev page`, () => {
const $store = { commit: jest.fn() }
- const self = { back: jest.fn(), $store }
+ const self = {
+ back: jest.fn(),
+ $store,
+ $router: {
+ currentRoute: {
+ path: `/wallet`
+ }
+ }
+ }
TmSessionWelcome.methods.closeSession.call(self)
expect($store.commit).toHaveBeenCalledWith(`setModalSession`, false)
- expect($store.commit).toHaveBeenCalledWith(`setModalSessionState`, false)
+ expect($store.commit).toHaveBeenCalledWith(
+ `setModalSessionState`,
+ false
+ )
+ expect(self.back).toHaveBeenCalled()
+ })
})
+ describe(`back`, () => {
it(`goes back to last page`, () => {
const $store = { commit: jest.fn() }
const self = {
@@ -71,6 +108,7 @@ describe(`TmSessionWelcome`, () => {
expect($store.commit).not.toHaveBeenCalledWith(`pauseHistory`, true)
})
})
+ })
describe(`without accounts`, () => {
it(`should not show sign-in link since we have no accounts`, () => {
| 3 |
diff --git a/core/server/api/v2/settings.js b/core/server/api/v2/settings.js @@ -2,11 +2,16 @@ const Promise = require('bluebird');
const _ = require('lodash');
const models = require('../../models');
const routeSettings = require('../../services/route-settings');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const {NoPermissionError, NotFoundError} = require('@tryghost/errors');
const settingsService = require('../../services/settings');
const settingsCache = require('../../../shared/settings-cache');
+const messages = {
+ problemFindingSetting: 'Problem finding setting: {key}',
+ accessCoreSettingFromExtReq: 'Attempted to access core setting from external request'
+};
+
module.exports = {
docName: 'settings',
@@ -71,16 +76,14 @@ module.exports = {
if (!setting) {
return Promise.reject(new NotFoundError({
- message: i18n.t('errors.api.settings.problemFindingSetting', {
- key: frame.options.key
- })
+ message: tpl(messages.problemFindingSetting, {key: frame.options.key})
}));
}
// @TODO: handle in settings model permissible fn
if (setting.group === 'core' && !(frame.options.context && frame.options.context.internal)) {
return Promise.reject(new NoPermissionError({
- message: i18n.t('errors.api.settings.accessCoreSettingFromExtReq')
+ message: tpl(messages.accessCoreSettingFromExtReq)
}));
}
@@ -106,7 +109,7 @@ module.exports = {
frame.data.settings.map((setting) => {
if (setting.group === 'core' && !(frame.options.context && frame.options.context.internal)) {
errors.push(new NoPermissionError({
- message: i18n.t('errors.api.settings.accessCoreSettingFromExtReq')
+ message: tpl(messages.accessCoreSettingFromExtReq)
}));
}
});
@@ -139,14 +142,12 @@ module.exports = {
if (!settingFromCache) {
errors.push(new NotFoundError({
- message: i18n.t('errors.api.settings.problemFindingSetting', {
- key: setting.key
- })
+ message: tpl(messages.problemFindingSetting, {key: setting.key})
}));
} else if (settingFromCache.core === 'core' && !(frame.options.context && frame.options.context.internal)) {
// @TODO: handle in settings model permissible fn
errors.push(new NoPermissionError({
- message: i18n.t('errors.api.settings.accessCoreSettingFromExtReq')
+ message: tpl(messages.accessCoreSettingFromExtReq)
}));
}
});
| 14 |
diff --git a/app/pages/project/project-page.jsx b/app/pages/project/project-page.jsx @@ -45,7 +45,7 @@ export default class ProjectPage extends React.Component {
render() {
const projectPath = `/projects/${this.props.project.slug}`;
- const onHomePage = this.props.routes[2].path === undefined;
+ const onHomePage = this.props.routes[2] && this.props.routes[2].path === undefined;
const pages = this.props.pages.reduce((map, page) => {
map[page.url_key] = page;
return map;
@@ -121,7 +121,7 @@ ProjectPage.defaultProps = {
},
loading: false,
organization: null,
- pages: null,
+ pages: [],
project: {
id: '',
display_name: '',
@@ -148,9 +148,7 @@ ProjectPage.propTypes = {
src: React.PropTypes.string
}),
loading: React.PropTypes.bool,
- pages: React.PropTypes.shape({
- content: React.PropTypes.string
- }),
+ pages: React.PropTypes.arrayOf(React.PropTypes.object),
project: React.PropTypes.shape({
id: React.PropTypes.string,
display_name: React.PropTypes.string,
| 1 |
diff --git a/config/config.json b/config/config.json }
},
"minimumAckResponses": {
- "publish": 4,
+ "publish": 2,
"get": 1
},
"commandExecutorVerboseLoggingEnabled": false,
| 3 |
diff --git a/config/redirects.js b/config/redirects.js @@ -4643,10 +4643,6 @@ module.exports = [
from: ['/universal-login/multifactor-authentication','/hosted-pages/guardian','/universal-login/guardian'],
to: '/universal-login/classic-experience/mfa-classic-experience'
},
- {
- from: ['/universal-login/new-experience-limitations'],
- to: '/universal-login/new-experience/new-experience-limitations'
- },
{
from: ['/universal-login/new'],
to: '/universal-login/new-experience'
| 2 |
diff --git a/articles/user-profile/user-picture.md b/articles/user-profile/user-picture.md @@ -61,13 +61,12 @@ Example:
function (user, context, callback) {
if (user.picture.indexOf('cdn.auth0.com') > -1) {
- var url = require('url');
- var u = url.parse(user.picture, true);
- u.query.d = '<URL TO YOUR DEFAULT PICTURE HERE>';
+ const url = require('url');
+ const u = url.parse(user.picture, true);
+ u.query.d = 'URL_TO_YOUR_DEFAULT_PICTURE_HERE';
delete u.search;
user.picture = url.format(u);
}
-
callback(null, user, context);
}
| 3 |
diff --git a/app/src/controllers/testItem/sagas.js b/app/src/controllers/testItem/sagas.js @@ -20,6 +20,7 @@ import {
import { PAGE_KEY } from 'controllers/pagination';
import { URLS } from 'common/urls';
import { createNamespacedQuery, mergeNamespacedQuery } from 'common/utils/routingUtils';
+import { LEVEL_SUITE } from 'common/constants/launchLevels';
import { activeProjectSelector } from 'controllers/user';
import { LEVEL_NOT_FOUND } from 'common/constants/launchLevels';
import { setLevelAction, setPageLoadingAction } from './actionCreators';
| 12 |
diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx @@ -179,7 +179,7 @@ class Stage extends React.Component {
this.updateRect();
const {x, y} = getEventXY(e);
const mousePosition = [x - this.rect.left, y - this.rect.top];
- if (e.which === 1) {
+ if (true) {
this.setState({
mouseDown: true,
mouseDownPosition: mousePosition,
| 13 |
diff --git a/sirepo/package_data/static/js/sirepo-plotting.js b/sirepo/package_data/static/js/sirepo-plotting.js @@ -1026,6 +1026,9 @@ SIREPO.app.service('focusPointService', function(plotting) {
mouseX = focusPoint.config.xAxis.scale(x);
mouseY = focusPoint.config.yAxis.scale(y);
}
+ if (isNaN(mouseX) || isNaN(mouseY)) {
+ return null;
+ }
return {
x: mouseX,
y: mouseY
@@ -1823,8 +1826,13 @@ SIREPO.app.directive('focusCircle', function(focusPointService, plotting) {
var mouseCoords = focusPointService.dataCoordsToMouseCoords(
$scope.$parent.$parent.modelKey || $scope.$parent.$parent.modelName,
$scope.focusPoint);
+ if (mouseCoords) {
$scope.select().attr('transform', 'translate(' + mouseCoords.x + ',' + mouseCoords.y + ')');
}
+ else {
+ hideFocusCircle();
+ }
+ }
$scope.$on('sr-plotEvent', function(event, args) {
if (args.name == 'showFocusPointInfo') {
@@ -1970,8 +1978,8 @@ SIREPO.app.directive('popupReport', function(focusPointService, plotting) {
// just use the first focus point
var mouseCoords = focusPointService.dataCoordsToMouseCoords(
$scope.$parent.modelName, $scope.focusPoints[0]);
+ if (mouseCoords) {
var xf = currentXform();
- if (! isNaN(xf.tx) && ! isNaN(xf.ty)) {
showPopup({mouseX: mouseCoords.x, mouseY: xf.ty}, true);
}
}
@@ -2004,7 +2012,7 @@ SIREPO.app.directive('popupReport', function(focusPointService, plotting) {
var tNode = group.select('#x-text')
.text(xText)
.style('fill', '#000000')
- .attr('y', popupTitleSize().height)
+ .attr('y', popupTitleSize().height + textMargin)
.attr('dy', '1em');
var tSize = tNode.node().getBBox();
var txtY = tSize.y + tSize.height;
@@ -2031,7 +2039,9 @@ SIREPO.app.directive('popupReport', function(focusPointService, plotting) {
.style('fill', color)
.attr('y', txtY)
.attr('dy', '1em');
- txtY += (tNode.node().getBBox().height + textMargin);
+ if (fmtText.yText) {
+ txtY += (tNode.node().getBBox().height);
+ }
});
hNode.text('');
refreshWindow();
@@ -3632,12 +3642,14 @@ SIREPO.app.service('vtkToPNG', function(plotToPNG, utilities) {
this.pngCanvas = function(reportId, vtkRenderer, panel) {
var canvas = document.createElement('canvas');
var res = {
- copyCanvas: function() {
+ copyCanvas: function(event, skipTransverse) {
var canvas3d = $(panel).find('canvas')[0];
canvas.width = parseInt(canvas3d.getAttribute('width'));
canvas.height = parseInt(canvas3d.getAttribute('height'));
+ if (! skipTransverse) {
// this call makes sure the buffer is fresh (it appears)
vtkRenderer.getOpenGLRenderWindow().traverseAllPasses();
+ }
canvas.getContext('2d').drawImage(canvas3d, 0, 0, canvas.width, canvas.height);
},
destroy: function() {
| 7 |
diff --git a/src/source/get_line_atomic.cpp b/src/source/get_line_atomic.cpp @@ -55,9 +55,12 @@ static PyObject* get_line_atomic(PyObject* self, PyObject* args) {
tmp[len] = '\0';
tprintf::tprintf("read @ from @\n", tmp, *lastpos);
#endif
-
- memcpy(result_iter, current_iter, len+1);
- *lastpos += len+1;
+ auto null_loc
+ = reinterpret_cast<char*>(memchr(current_iter, '\n', result_bytearray.len));
+ for (int i = 0; i <= null_loc - start; i++) {
+ *(result_iter++) = *(current_iter++);
+ (*lastpos)++;
+ }
Py_RETURN_TRUE;
}
| 14 |
diff --git a/src/features/messageCreate/CommandManager.js b/src/features/messageCreate/CommandManager.js @@ -145,12 +145,12 @@ class CommandManager {
* @return {Promise<CommandInfo|null>}
*/
static async getCommandName(message) {
- if (!message.guild || message.author.bot) return {isCommand: false};
+ if (!message.guild || message.author.bot || !message.content) return {isCommand: false};
/** @type {GuildConfig} */
const guild = await GuildConfig.get(/** @type {String} */ message.guild.id);
const prefix = util.startsWithMultiple(message.content.toLowerCase(), guild.prefix.toLowerCase(), defaultPrefix.toLowerCase());
const args = util.split(message.content.substring(prefix.length),' ');
- if (!prefix) return {isCommand: false};
+ if (!prefix || !args.length) return {isCommand: false};
return {
isCommand: true,
| 8 |
diff --git a/lib/cartodb/models/dataview/factory.js b/lib/cartodb/models/dataview/factory.js -var dataviews = require('./');
+const dataviews = require('./');
module.exports = class DataviewFactory {
static get dataviews() {
@@ -9,7 +9,7 @@ module.exports = class DataviewFactory {
}
static getDataview (query, dataviewDefinition) {
- var type = dataviewDefinition.type;
+ const type = dataviewDefinition.type;
if (!this.dataviews[type]) {
throw new Error('Invalid dataview type: "' + type + '"');
}
| 4 |
diff --git a/website/site/data/updates.yml b/website/site/data/updates.yml updates:
+ - date: 2018-02-27
+ version: '1.3.0'
+ description: Multi-part extensions, e.g. "en.md", a11y improvements in the editor, and bugfixes.
+ url: 'https://github.com/netlify/netlify-cms/releases/tag/1.3.0'
- date: 2018-02-21
version: '1.2.2'
description: Fixes ES5 transpiling.
| 3 |
diff --git a/sirepo/pkcli/job_agent.py b/sirepo/pkcli/job_agent.py @@ -87,10 +87,11 @@ class _Process(PKDict):
self.compute_status_file = None
self.jid = self.msg.jid
self._in_file = None
- self._subprocess = None
+ self._main_sp = None
self._terminating = False
async def cancel(self, run_dir):
+ # TODO(e-carlin): cancel background_sp
if not self._terminating:
# Will resolve itself, b/c harmless to call proc.kill
tornado.ioloop.IOLoop.current().call_later(
@@ -99,14 +100,15 @@ class _Process(PKDict):
)
self._terminating = True
self._done(job.Status.CANCELED.value)
- self._subprocess.proc.terminate()
+ self._main_sp.proc.terminate()
def kill(self):
+ # TODO(e-carlin): kill background_sp
self._terminating = True
- if self._subprocess:
+ if self._main_sp:
self._done(job.Status.CANCELED.value)
- self._subprocess.proc.kill()
- self._subprocess = None
+ self._main_sp.proc.kill()
+ self._main_sp = None
def start(self):
# SECURITY: msg must not contain agent_id
@@ -200,7 +202,7 @@ class _Process(PKDict):
self._in_file = self.msg.run_dir.join(_IN_FILE.format(job.unique_key()))
self.msg.run_dir = str(self.msg.run_dir) # TODO(e-carlin): Find a better solution for serial and deserialization
pkjson.dump_pretty(self.msg, filename=self._in_file, pretty=False)
- self._subprocess = tornado.process.Subprocess(
+ self._main_sp = tornado.process.Subprocess(
('pyenv', 'exec', 'sirepo', 'job_process', str(self._in_file)),
# SECURITY: need to change cwd, because agent_dir has agent_id
cwd=self.msg.run_dir,
@@ -215,9 +217,9 @@ class _Process(PKDict):
i = tornado.ioloop.IOLoop.current()
self.stdout = bytearray()
self.stderr = bytearray()
- i.spawn_callback(collect, self._subprocess.stdout, self.stdout)
- i.spawn_callback(collect, self._subprocess.stderr, self.stderr)
- self._subprocess.set_exit_callback(self._exit)
+ i.spawn_callback(collect, self._main_sp.stdout, self.stdout)
+ i.spawn_callback(collect, self._main_sp.stderr, self.stderr)
+ self._main_sp.set_exit_callback(self._exit)
def _write_comput_status_file(self, status):
self.compute_status_file = self.msg.run_dir.join(_STATUS_FILE)
| 10 |
diff --git a/test/image/mocks/uniformtext_icicle.json b/test/image/mocks/uniformtext_icicle.json "data": [
{
"tiling": {
+ "pad": 3,
"orientation": "v"
},
"marker": {
},
{
"tiling": {
+ "pad": 3,
"orientation": "v"
},
"marker": {
}
},
{
+ "tiling": {
+ "pad": 3
+ },
"marker": {
"coloraxis": "coloraxis"
},
}
},
{
+ "tiling": {
+ "pad": 3
+ },
"marker": {
"coloraxis": "coloraxis"
},
| 0 |
diff --git a/src/components/entities/listItems/style.js b/src/components/entities/listItems/style.js @@ -68,6 +68,7 @@ export const Description = styled.p`
color: ${theme.text.default};
margin-top: 6px;
padding-right: 24px;
+ word-break: break-word;
`;
export const MessageIcon = styled.div`
| 1 |
diff --git a/README.md b/README.md @@ -22,15 +22,11 @@ In the main page you can see the libraries shared between users. The libraries c
Here is a quick step-by-step minimal setup, to get the app up and running in your local workstation:
### MacOS specific
-To install node.js and its package manager ```npm``` you can either download it from the [node.js homepage](https://nodejs.org/en/download/) or use a package manager like:
-- [homebrew](https://brew.sh)
+To install Node.js and npm you can either download it from the [node.js homepage](https://nodejs.org/en/download/) or install it using [homebrew](https://brew.sh):
+
```shell
brew install node
```
-- [macports](https://www.macports.org/install.php)
-```shell
-port install nodejs
-```
### Platform independent
Create Python virtual enviroment:
| 2 |
diff --git a/src/struct/commands/Command.js b/src/struct/commands/Command.js @@ -41,9 +41,13 @@ const {ArgumentMatches, ArgumentTypes, ArgumentSplits, ArgumentSplitMethods} = r
* <br/><code>'role'</code> Tries to resolve to a role.
* <br/>If any of the above are not valid, the default value will be resolved (so use an ID).
* <br/>
- * <br/>An array of strings can be used to restrict input to only those strings, case insensitive. The evaluated argument will be all lowercase.
- * <br/>A function <code>(arg => {})</code> can also be used to filter arguments.
- * <br/>If the input is not in the array or does not pass the function, the default value is used.
+ * <br/>An array of strings can be used to restrict input to only those strings, case insensitive.
+ * <br/>The evaluated argument will be all lowercase.
+ * <br/>If the input is not in the array, the default value is used.
+ * <br/>
+ * <br/>A function <code>((word, message) => {})</code> can also be used to filter or modify arguments.
+ * <br/>A return value of true will let the word pass, a falsey return value will use the default value for the argument.
+ * <br/>Another other truthy return value will be used as the argument.
* @typedef {string|string[]} ArgumentType
*/
@@ -294,7 +298,11 @@ class Command {
}
if (typeof arg.type === 'function'){
- if (!arg.type(word)) return arg.defaultValue;
+ let res = arg.type(word, message);
+ if (res === true) return word;
+ if (!res) return arg.defaultValue;
+
+ return res;
}
return word;
| 11 |
diff --git a/src/backends/backend.js b/src/backends/backend.js @@ -51,9 +51,9 @@ const slugFormatter = (template = "{{slug}}", entryData) => {
case "day":
return (`0${ date.getDate() }`).slice(-2);
case "slug":
- return sanitize(getIdentifier(entryData).trim().toLowerCase(), {replacement: "-"}).replace('.', '-');
+ return sanitize(getIdentifier(entryData).trim().toLowerCase(), {replacement: "-"}).replace(/[\.\s]/g, '-');
default:
- return sanitize(entryData.get(field, "").trim().toLowerCase(), {replacement: "-"}).replace('.', '-');
+ return sanitize(entryData.get(field, "").trim().toLowerCase(), {replacement: "-"}).replace(/[\.\s]/g, '-');
}
});
};
| 14 |
diff --git a/tests/e2e/specs/user-input-questions.test.js b/tests/e2e/specs/user-input-questions.test.js @@ -36,17 +36,7 @@ import {
setSearchConsoleProperty,
} from '../utils';
-const wpConditionalDescribe = () => {
- // Only run for non WP 4.x versions
- if ( process.env.WP_VERSION?.[ 0 ] !== '4' ) {
- return describe;
- }
- return () => {
- it( 'is skipped for WP 4.x', () => {} );
- }; // no-op
-};
-
-wpConditionalDescribe()( 'User Input Settings', () => {
+describe( 'User Input Settings', () => {
async function fillInInputSettings() {
await step( 'select purpose', async () => {
await page.waitForSelector( '.googlesitekit-user-input__question' );
| 2 |
diff --git a/README.md b/README.md @@ -102,7 +102,7 @@ Third Party Libraries licenses for its [dependencies](docs/dependencies.md):
1. **QPDF**: Apache [http://qpdf.sourceforge.net](http://qpdf.sourceforge.net/)
2. **GraphicsMagick**: MIT [http://www.graphicsmagick.org/index.html](http://www.graphicsmagick.org/index.html)
3. **ImageMagick**: Apache 2.0 [https://imagemagick.org/script/license.php](https://imagemagick.org/script/license.php)
-4. **Pdfminer.six**: MIT [https://github.com/pdfminer/pdfminer.six/blob/master/LICENSE](https://github.com/pdfminer/pfminer.six/blob/master/LICENSE)
+4. **Pdfminer.six**: MIT [https://github.com/pdfminer/pdfminer.six/blob/master/LICENSE](https://github.com/pdfminer/pdfminer.six/blob/master/LICENSE)
5. **PDF.js**: Apache 2.0 [https://github.com/mozilla/pdf.js](https://github.com/mozilla/pdf.js)
6. **Tesseract**: Apache 2.0 [https://github.com/tesseract-ocr/tesseract](https://github.com/tesseract-ocr/tesseract)
7. **Camelot**: MIT [https://github.com/camelot-dev/camelot](https://github.com/camelot-dev/camelot)
| 1 |
diff --git a/javascripts/game.js b/javascripts/game.js @@ -586,6 +586,7 @@ function onLoad() {
if (player.options.cloud === undefined) player.options.cloud = true
if (player.options.hotkeys === undefined) player.options.hotkeys = true
if (player.options.eternityconfirm === undefined) player.options.eternityconfirm = true
+ if (player.options.themes === undefined) player.options.themes = "Normal"
if (player.achievements === undefined) player.achievements = [];
if (player.sacrificed === undefined) player.sacrificed = new Decimal(0);
if (player.infinityUpgrades === undefined) player.infinityUpgrades = [];
@@ -6356,6 +6357,7 @@ var IPminpeak = new Decimal(0)
var replicantiTicks = 0
function startInterval() {
+ if (sha512_256(player.options.themes) === "0b4d2986d955f7f0a5be3e560b0c2008a6a046269ffe6704bfacf55e8f292339") {
setInterval(function () {
var thisUpdate = new Date().getTime();
if (thisUpdate - player.lastUpdate >= 21600000) giveAchievement("Don't you dare to sleep")
@@ -6905,6 +6907,7 @@ function startInterval() {
player.lastUpdate = thisUpdate;
}, 50);
}
+}
function updateChart() {
addData(normalDimChart, "0", getDimensionProductionPerSecond(1));
| 7 |
diff --git a/doc/command-optimize.md b/doc/command-optimize.md @@ -34,7 +34,7 @@ Or, you can access `steal-tools` in _node_modules/.bin_, like:
--config app/config.js \
--main app/app
-To provide build targets passed any of the supported options separated by space, like:
+To provide build targets pass any of the supported options separated by a space, like:
> steal-tools build --config app/config.js --main app/app --target web node
| 7 |
diff --git a/cmd/cmd_controller.js b/cmd/cmd_controller.js @@ -233,12 +233,7 @@ class EmbarkController {
callback(err, true);
});
}
- ], function (err, canExit) {
- if (err) {
- engine.logger.error(err.message);
- engine.logger.debug(err.stack);
- }
-
+ ], function (_err, canExit) {
// TODO: this should be moved out and determined somewhere else
if (canExit || !engine.config.contractsConfig.afterDeploy || !engine.config.contractsConfig.afterDeploy.length) {
process.exit();
| 2 |
diff --git a/lib/api-depot.js b/lib/api-depot.js @@ -29,8 +29,8 @@ async function _fetch(url, method, body) {
throw new Error('Une erreur est survenue')
}
-export function getCurrentBalUrl(codeCommune) {
- return `${API_DEPOT_URL}/communes/${codeCommune}/current-revision/files/bal/download`
+export function getBalUrl(id) {
+ return `${API_DEPOT_URL}/revisions/${id}/files/bal/download`
}
export async function getCurrentRevision(codeCommune) {
| 0 |
diff --git a/src/middy.js b/src/middy.js -/** @module Middy **/
-
/**
* @typedef middy
- * @memberof module:Middy
* @type function
* @param {Object} event - the AWS Lambda event from the original handler
* @param {Object} context - the AWS Lambda context from the original handler
* @param {function} callback - the AWS Lambca callback from the original handler
* @property {useFunction} use - attach a new middleware
- * @property {module:Middy.middlewareAttachFunction} before - attach a new *before-only* middleware
- * @property {module:Middy.middlewareAttachFunction} after - attach a new *after-only* middleware
- * @property {module:Middy.middlewareAttachFunction} onError - attach a new *error-handler-only* middleware
+ * @property {middlewareAttachFunction} before - attach a new *before-only* middleware
+ * @property {middlewareAttachFunction} after - attach a new *after-only* middleware
+ * @property {middlewareAttachFunction} onError - attach a new *error-handler-only* middleware
* @property {Object} __middlewares - contains the list of all the attached
* middlewares organised by type (`before`, `after`, `onError`). To be used only
* for testing and debugging purposes
/**
* @typedef useFunction
- * @memberof module:Middy
* @type {function}
- * @param {module:Middy.middlewareObject} - the middleware object to attach
- * @return {module:Middy.middy}
+ * @param {middlewareObject} - the middleware object to attach
+ * @return {middy}
*/
/**
* @typedef middlewareAttachFunction
- * @memberof module:Middy
* @type {function}
- * @param {module:Middy.middlewareFunction} - the middleware function to attach
- * @return {module:Middy.middy}
+ * @param {middlewareFunction} - the middleware function to attach
+ * @return {middy}
*/
/**
* @typedef middlewareFunction
- * @memberof module:Middy
* @type {function}
* @param {function} handler - the original handler function.
* It will expose properties `event`, `context`, `response` and `error` that can
* be used to interact with the middleware lifecycle
- * @param {function} next
+ * @param {function} next - the callback to invoke to pass the control to the next middleware
*/
/**
* @typedef middlewareObject
- * @memberof module:Middy
* @type Object
- * @property {module:Middy.middlewareFunction} before - the middleware function to attach as *before* middleware
- * @property {module:Middy.middlewareFunction} after - the middleware function to attach as *after* middleware
- * @property {module:Middy.middlewareFunction} onError - the middleware function to attach as *error* middleware
+ * @property {middlewareFunction} before - the middleware function to attach as *before* middleware
+ * @property {middlewareFunction} after - the middleware function to attach as *after* middleware
+ * @property {middlewareFunction} onError - the middleware function to attach as *error* middleware
*/
const runMiddlewares = (middlewares, instance, done) => {
@@ -99,9 +92,8 @@ const runErrorMiddlewares = (middlewares, instance, done) => {
/**
* Middy factory function. Use it to wrap your existing handler to enable middlewares on it.
- * @memberof module:Middy
* @param {function} handler - your original AWS Lambda function
- * @return {module:Middy.middy} - a `middy` instance
+ * @return {middy} - a `middy` instance
*/
const middy = (handler) => {
const beforeMiddlewares = []
| 7 |
diff --git a/embark-ui/src/components/Layout.js b/embark-ui/src/components/Layout.js @@ -15,7 +15,6 @@ import {
AppSidebarHeader,
AppSidebarMinimizer,
AppSidebarNav,
- AppSidebarToggler,
AppNavbarBrand,
AppHeaderDropdown
} from '@coreui/react';
@@ -71,12 +70,10 @@ const Layout = ({children, logout, location, toggleTheme, currentTheme}) => {
return (
<div className="app animated fadeIn">
<AppHeader fixed>
- <AppSidebarToggler className="d-lg-none" display="md" mobile />
- <AppNavbarBrand
+ <AppNavbarBrand className="mx-3"
full={{ src: logo, width: 50, height: 50, alt: 'Embark Logo' }}
minimized={{ src: logo, width: 30, height: 30, alt: 'Embark Logo' }}
/>
- {sidebar && <AppSidebarToggler className="d-md-down-none" display="lg" />}
<Nav className="d-md-down-none" navbar>
{HEADER_NAV_ITEMS.map((item) => {
return (
| 2 |
diff --git a/constants.js b/constants.js @@ -86,6 +86,8 @@ export const defaultVoicePack = {
indexUrl: `https://webaverse.github.io/shishi-voicepack/syllables/syllable-files.json`,
};
export const voiceEndpoint = `https://voice.webaverse.com/tts`;
+export const defaultVoice = `1jLX0Py6j8uY93Fjf2l0HOZQYXiShfWUO`; // Sweetie Belle
+
export const loreAiEndpoint = `https://ai.webaverse.com/lore`;
export const defaultDioramaSize = 512;
| 0 |
diff --git a/docs/source/docs/border-radius.blade.md b/docs/source/docs/border-radius.blade.md @@ -94,7 +94,7 @@ title: "Border Radius"
## Rounded corners
-Use the `.rounded`, `.shadow-sm`, or `.rounded-lg` utilities to apply different border radius sizes to an element.
+Use the `.rounded`, `.rounded-sm`, or `.rounded-lg` utilities to apply different border radius sizes to an element.
@component('_partials.code-sample', ['class' => 'flex justify-around text-sm'])
<div class="bg-grey-light mr-3 p-4 rounded-sm">.rounded-sm</div>
@@ -152,7 +152,7 @@ Use the `.rounded-t`, `.rounded-r`, `.rounded-b`, or `.rounded-l` utilities to o
## Responsive
-To control the shadow of an element at a specific breakpoint, add a `{breakpoint}:` prefix to any existing shadow utility. For example, use `md:shadow-lg` to apply the `shadow-lg` utility at only medium screen sizes and above.
+To control the border radius of an element at a specific breakpoint, add a `{breakpoint}:` prefix to any existing border radius utility. For example, use `md:rounded-lg` to apply the `rounded-lg` utility at only medium screen sizes and above.
For more information about Tailwind's responsive design features, check out the [Responsive Design](/workflow/responsive-design) documentation.
| 14 |
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -195,8 +195,12 @@ class AuthScreens extends React.Component {
}
const path = new URL(url).pathname;
- const exitTo = new URLSearchParams(url).get('exitTo');
- return Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN))
+ const params = new URLSearchParams(url);
+ const exitTo = params.get('exitTo');
+ const email = params.get('email');
+ const isLoggingInAsNewUser = !_.isNull(this.props.session.email) && (email !== this.props.session.email);
+ return !isLoggingInAsNewUser
+ && Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN))
&& exitTo === ROUTES.WORKSPACE_NEW;
}
@@ -366,5 +370,8 @@ export default compose(
network: {
key: ONYXKEYS.NETWORK,
},
+ session: {
+ key: ONYXKEYS.SESSION,
+ },
}),
)(AuthScreens);
| 9 |
diff --git a/src/lime/_internal/backend/native/NativeApplication.hx b/src/lime/_internal/backend/native/NativeApplication.hx @@ -64,6 +64,7 @@ class NativeApplication {
public var handle:Dynamic;
+ private var pauseTimer:Int;
private var parent:Application;
private var toggleFullscreen:Bool;
@@ -80,6 +81,7 @@ class NativeApplication {
public function new (parent:Application):Void {
this.parent = parent;
+ pauseTimer = -1;
toggleFullscreen = true;
AudioManager.init ();
@@ -95,6 +97,21 @@ class NativeApplication {
}
+ private function advanceTimer ():Void {
+
+ if (pauseTimer > -1) {
+
+ var offset = System.getTimer () - pauseTimer;
+ for (i in 0...Timer.sRunningTimers.length) {
+ if (Timer.sRunningTimers[i] != null) Timer.sRunningTimers[i].mFireAt += offset;
+ }
+ pauseTimer = -1;
+
+ }
+
+ }
+
+
public function exec ():Int {
#if !macro
@@ -597,8 +614,8 @@ class NativeApplication {
case WINDOW_ACTIVATE:
+ advanceTimer ();
window.onActivate.dispatch ();
-
AudioManager.resume ();
case WINDOW_CLOSE:
@@ -608,8 +625,8 @@ class NativeApplication {
case WINDOW_DEACTIVATE:
window.onDeactivate.dispatch ();
-
AudioManager.suspend ();
+ pauseTimer = System.getTimer ();
case WINDOW_ENTER:
@@ -685,7 +702,7 @@ class NativeApplication {
if (timer != null) {
- if (currentTime >= timer.mFireAt) {
+ while (currentTime >= timer.mFireAt) {
timer.mFireAt += timer.mTime;
timer.run ();
| 9 |
diff --git a/src/Input/Input.spec.js b/src/Input/Input.spec.js import React from 'react';
import { assert } from 'chai';
import { spy } from 'sinon';
-import { createShallow } from 'src/test-utils';
+import { createShallow, createMount } from 'src/test-utils';
import Input, { styleSheet } from './Input';
describe('<Input />', () => {
@@ -218,4 +218,55 @@ describe('<Input />', () => {
});
});
});
+
+ describe('componentDidMount', () => {
+ let mount;
+ let wrapper;
+ let instance;
+
+ before(() => {
+ mount = createMount();
+ wrapper = mount(<Input />);
+ instance = wrapper.instance();
+ });
+
+ after(() => {
+ mount.cleanUp();
+ });
+
+ beforeEach(() => {
+ instance.checkDirty = spy();
+ });
+
+ it('should not call checkDirty if controlled', () => {
+ instance.isControlled = () => true;
+ instance.componentDidMount();
+ assert.strictEqual(instance.checkDirty.callCount, 0);
+ });
+
+ it('should call checkDirty if controlled', () => {
+ instance.isControlled = () => false;
+ instance.componentDidMount();
+ assert.strictEqual(instance.checkDirty.callCount, 1);
+ });
+
+ it('should call checkDirty with input value', () => {
+ instance.isControlled = () => false;
+ instance.input = 'woof';
+ instance.componentDidMount();
+ assert.strictEqual(instance.checkDirty.calledWith(instance.input), true);
+ });
+
+ it('should call or not call checkDirty consistently', () => {
+ instance.isControlled = () => true;
+ instance.componentDidMount();
+ assert.strictEqual(instance.checkDirty.callCount, 0);
+ instance.isControlled = () => false;
+ instance.componentDidMount();
+ assert.strictEqual(instance.checkDirty.callCount, 1);
+ instance.isControlled = () => true;
+ instance.componentDidMount();
+ assert.strictEqual(instance.checkDirty.callCount, 1);
+ });
+ });
});
| 0 |
diff --git a/userscript.user.js b/userscript.user.js @@ -48739,7 +48739,8 @@ var $$IMU_EXPORT$$;
if (domain_nowww === "vk.com") {
// https://vk.com/images/icons/video_play_small.png?1
- if (/^[a-z]+:\/\/[^/]+\/+images\/+icons\/+/.test(src))
+ // https://vk.com/images/album_top_shadow.png
+ if (/^[a-z]+:\/\/[^/]+\/+images\/+(?:icons\/+)?[a-z_]+\.png(?:[?#].*)?$/.test(src))
return {
url: src,
bad: "mask"
| 8 |
diff --git a/docs/source/platform/federation.mdx b/docs/source/platform/federation.mdx ---
-title: Federation in Production
-description: How to run with Federation in production, leveraging the Apollo Platform and focusing on reliability and observability
+title: Federation on the Apollo Platform
+description: Leverage the Apollo Platform to reliably run Federation in production
---
[//]: # (Description: Introductory content, discussing the overall model of the federation platform, why you would want to register partial schemas, and framing the concept of thinking about running federation as a coordination and collaboration problem to motivate the tools we've built)
[//]: # (Assignee: Chang)
| 10 |
diff --git a/source/timezones/TimeZone.js b/source/timezones/TimeZone.js @@ -143,9 +143,6 @@ class TimeZone {
if (/GMT[+-]/.test(name)) {
name = switchSign(name);
}
- if (name === 'Europe/Kiev') {
- name = 'Europe/Kyiv';
- }
this.id = id;
this.name = name;
| 2 |
diff --git a/docs/getting-started.md b/docs/getting-started.md @@ -145,7 +145,7 @@ Once you've set these up, you can launch your app on an Android Virtual Device b
Because you don't build any native code when using Create React Native App to create a project, it's not possible to include custom native modules beyond the React Native APIs and components that are available in the Expo client app.
-If you know that you'll eventually need to include your own native code, Create React Native App is still a good way to get started. In that case you'll just need to "[eject](https://github.com/react-community/create-react-native-app/blob/master/react-native-scripts/template/README.md#ejecting-from-create-react-native-app)" eventually to create your own native builds. If you do eject, the "Building Projects with Native Code" instructions will be required to continue working on your project.
+If you know that you'll eventually need to include your own native code, Create React Native App is still a good way to get started. In that case you'll just need to "[eject](https://github.com/react-community/create-react-native-app/blob/master/EJECTING.md)" eventually to create your own native builds. If you do eject, the "Building Projects with Native Code" instructions will be required to continue working on your project.
Create React Native App configures your project to use the most recent React Native version that is supported by the Expo client app. The Expo client app usually gains support for a given React Native version about a week after the React Native version is released as stable. You can check [this document](https://github.com/react-community/create-react-native-app/blob/master/VERSIONS.md) to find out what versions are supported.
| 1 |
diff --git a/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json b/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json "dependencies": {
"bluebird": "^3.5.1",
"cfn-response": "^1.0.1",
- "handlebars": "^4.0.11",
+ "handlebars": "^4.3.0",
"lodash": "^4.17.4"
}
}
| 3 |
diff --git a/vampire-v5/VTM_Dice_Mechanics.js b/vampire-v5/VTM_Dice_Mechanics.js -// Vampire the Masquerade 5e Dice Mechanics by Momtahan K (Version 1.1).
+// Vampire the Masquerade 5e Dice Mechanics by Momtahan K (Version 1.2).
//
// The following code is an adaptation of that produced by Roll20 user Konrad J. for "Hero Quest Dice Mechanics".
// Many thanks for providing this code free to use.
// Portions of the materials are the copyrights and trademarks of White Wolf Publishing AB, and are used with permission. All rights reserved. For more in formation please visit whitewolf.com
//
// With the exception of materials under the copyright of White Wolf all extra code should be considered under
-// GNU General Public License v3 or later (GPL-3.0-or-later) Copyright 2018
+// GNU General Public License v3 or later (GPL-3.0-or-later) Copyright 2018 held my Momtahan.K
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// Effectively feel free to use, edit and modify the code to your hearts content. As I understand it this will only cause an issue if you
// try to use it for commerical gain. This has been added to ensure the community benefits from it.
+// Versions
+// Version 1.2
+// Updated images to a different location
+// Version 1.1
+// Bug fixes and updated images to a different location
+
// Guide to use the code
// The first two lines I am no longer sure if they work and require testing.
@@ -321,7 +327,7 @@ function processVampireDiceScript(run, dc) {
}
}
- let thebeast = '<img src="https://imgur.com/ARnnOE6.png" title="The Beast" height="20" width="228"/>';
+ let thebeast = '<img src="https://raw.githubusercontent.com/Kirintale/roll20-character-sheets/master/vampire-v5/Banners/TheBeast.png" title="The Beast" height="20" width="228"/>';
if (run.rouseStatRoll) {
if (diceTotals.successScore > 0) {
@@ -373,11 +379,11 @@ function addRollDeclarations(diceTotals, outputMessage, endTemplateSection, theb
if (diceTotals.successScore == 0 && vtmGlobal.luckydice) {
let lastResort = '<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/vampire-v5/Banners/lastresort.png" title="Miss" height="20" width="228"/>';
outputMessage += "{{Fate=" + lastResort + endTemplateSection;
- let miss = '<img src="https://imgur.com/l8jqvvp.png" title="Miss" height="20" width="228"/>';
+ let miss = '<img src="https://raw.githubusercontent.com/Kirintale/roll20-character-sheets/master/vampire-v5/Banners/MissFail.png" title="Miss" height="20" width="228"/>';
outputMessage += "{{Miss=" + miss + endTemplateSection;
} else if (diceTotals.successScore == 0) {
//outputMessage += "{{Fate=" + "Total failure" + endTemplateSection;
- let miss = '<img src="https://imgur.com/l8jqvvp.png" title="Miss" height="20" width="228"/>';
+ let miss = '<img src="https://raw.githubusercontent.com/Kirintale/roll20-character-sheets/master/vampire-v5/Banners/MissFail.png" title="Miss" height="20" width="228"/>';
outputMessage += "{{Miss=" + miss + endTemplateSection;
} else if (vtmGlobal.luckydice) {
let lastResort = '<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/vampire-v5/Banners/lastresort.png" title="Miss" height="20" width="228"/>';
@@ -385,10 +391,10 @@ function addRollDeclarations(diceTotals, outputMessage, endTemplateSection, theb
}
if ((diceTotals.muddyCritScore >= 2) || (diceTotals.muddyCritScore === 1 && (diceTotals.critScore >= 1))) {
- let messy = '<img src="https://imgur.com/RB68YQO.png" title="Messy" height="20" width="228"/>';
+ let messy = '<img src="https://raw.githubusercontent.com/Kirintale/roll20-character-sheets/master/vampire-v5/Banners/MessyCritical.png" title="Messy" height="20" width="228"/>';
outputMessage += "{{Messy=" + messy + endTemplateSection;
} else if (diceTotals.critScore >= 2) {
- let crit = '<img src="https://imgur.com/ja9Dvq5.png" title="Crit" height="20" width="228"/>';
+ let crit = '<img src="https://raw.githubusercontent.com/Kirintale/roll20-character-sheets/master/vampire-v5/Banners/CriticalHit.png" title="Crit" height="20" width="228"/>';
outputMessage += "{{Crit=" + crit + endTemplateSection;
}
| 3 |
diff --git a/packages/core/parcel-bundler/src/Bundler.js b/packages/core/parcel-bundler/src/Bundler.js @@ -407,12 +407,11 @@ class Bundler extends EventEmitter {
}
async unwatch(path, asset) {
+ path = await fs.realpath(path);
if (!this.watchedAssets.has(path)) {
return;
}
- path = await fs.realpath(path);
-
let watched = this.watchedAssets.get(path);
watched.delete(asset);
| 14 |
diff --git a/Solve.js b/Solve.js @@ -1387,3 +1387,4 @@ if ((typeof module) !== 'undefined') {
]);
nerdamer.api();
})();
+
| 3 |
diff --git a/.travis.yml b/.travis.yml +matrix:
+ include:
+ - os: linux
+ dist: trusty
+ sudo: required
+ - os: osx
+ osx_image: xcode8.3
+
language: node_js
before_script:
@@ -13,13 +21,6 @@ script:
node_js:
- '7'
-matrix:
- include:
- - os: linux
- sudo: required
- - os: osx
- osx_image: xcode8.3
-
before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then apt install libx11-dev libxext-dev libxss-dev
libxkbfile-dev; fi
| 12 |
diff --git a/src/constants/constants.js b/src/constants/constants.js @@ -137,12 +137,12 @@ export const NETWORK_MESSAGE_TYPES = {
export const NETWORK_MESSAGE_TIMEOUT_MILLS = {
PUBLISH: {
- INIT: 180 * 1000,
- REQUEST: 180 * 1000,
+ INIT: 60 * 1000,
+ REQUEST: 60 * 1000,
},
GET: {
- INIT: 180 * 1000,
- REQUEST: 180 * 1000,
+ INIT: 60 * 1000,
+ REQUEST: 60 * 1000,
},
};
| 12 |
diff --git a/tests/filter/filter.test.jsx b/tests/filter/filter.test.jsx @@ -91,11 +91,8 @@ describe('SLDSFilter', function () {
const demoPopover = (<DemoComponent
className="custom-filter-popover"
isOpen
- portalMount={(reactElement, domContainerNode) => {
- portalWrapper = mount(reactElement, { attachTo: domContainerNode });
- }}
onOpen={() => {
- expect(portalWrapper.find('.custom-filter-popover')).to.exist;
+ expect(wrapper.find('.custom-filter-popover')).to.exist;
done();
}}
/>);
@@ -119,9 +116,6 @@ describe('SLDSFilter', function () {
it('Filter could take onClick prop and trigger this callback during filter click', (done) => {
const demoPopover = (<DemoComponent
className="custom-filter-popover"
- portalMount={(reactElement, domContainerNode) => {
- portalWrapper = mount(reactElement, { attachTo: domContainerNode });
- }}
/>);
let onFilterClicked = false;
| 3 |
diff --git a/packages/composer-cli/lib/cmds/archive/createCommand.js b/packages/composer-cli/lib/cmds/archive/createCommand.js @@ -21,9 +21,10 @@ module.exports.describe = 'Create the details of a Business Network Archive';
module.exports.builder = function (yargs){
return yargs.option('archiveFile',{alias: 'a', required: false, describe: 'Business network archive file name. Default is based on the Identifier of the BusinessNetwork', type: 'string' })
- .option('sourceType',{alias: 't', required: true, choices: ['module','dir'], describe: 'npm module name or a directory as the source of the Business Network'})
- .option('sourceName',{alias: 'n', required: true, describe: 'Name of the npm module or directory'})
- .usage('');
+ .option('inputDir',{alias: 'd', required: false, describe: 'Location to create the archive from e.g. NPM module directory'})
+ .option('moduleName',{alias: 'm', required: false, describe: 'Name of the npm module to use '})
+ .conflicts('inputDir','moduleName')
+ .epilog('Only one of either inputDir or moduleName must be specified.');
};
| 13 |
diff --git a/packages/sync-actions/src/products.js b/packages/sync-actions/src/products.js @@ -122,10 +122,11 @@ function createProductMapActions(
}
function moveMasterVariantsIntoVariants(
- objectBefore: Object,
- objectNow: Object
+ before: Object,
+ now: Object
): Array<Object> {
- const [before, now] = copyEmptyArrayProps(objectBefore, objectNow)
+ /* eslint-disable no-param-reassign */
+ ;[before, now] = copyEmptyArrayProps(before, now)
const move = (obj: Object): Object => ({
...obj,
masterVariant: undefined,
| 13 |
diff --git a/assets/js/components/notifications/BannerNotification/utils.js b/assets/js/components/notifications/BannerNotification/utils.js export const ERROR_OR_WARNING_SIZE = 1;
export const SMALL_IMAGE_SVG_SIZE = 1;
-const MAX_SM_SIZE = 4;
-const MAX_MD_SIZE = 8;
-const MAX_LG_SIZE = 12;
/**
* Returns the cell size for the content area within BannerNotification.
@@ -59,12 +56,7 @@ export const getContentCellSizeProperties = ( {
size = size - SMALL_IMAGE_SVG_SIZE;
}
- if (
- hasWinImageSVG &&
- ( ( key === 'smSize' && imageCellSizes?.[ key ] < MAX_SM_SIZE ) ||
- ( key === 'mdSize' && imageCellSizes?.[ key ] < MAX_MD_SIZE ) ||
- ( key === 'lgSize' && imageCellSizes?.[ key ] < MAX_LG_SIZE ) )
- ) {
+ if ( hasWinImageSVG && 0 < size - imageCellSizes[ key ] ) {
size = size - imageCellSizes[ key ];
}
| 2 |
diff --git a/generators/internal/needle-api/needle-server.js b/generators/internal/needle-api/needle-server.js -const NeedleBase = require('./needle-base');
-const NeedleClientAngular = require('./needle-client-angular');
-const NeedleClientReact = require('./needle-client-react');
-const NeedleClientWebpack = require('./needle-client-webpack');
-const NeedleClientI18n = require('./needle-client-i18n');
-const NeedleServerMaven = require('./needle-server-maven');
-const NeedleServerCache = require('./needle-server-cache');
-const NeedleServerLiquibase = require('./needle-server-liquibase');
+const needleBase = require('./needle-base');
-module.exports = class {
- constructor(generator) {
- this.needleBase = new NeedleBase(generator);
- this.needleServerMaven = new NeedleServerMaven(generator);
- this.needleServerCache = new NeedleServerCache(generator);
- this.needleServerLiquibase = new NeedleServerLiquibase(generator);
- this.needleClientAngular = new NeedleClientAngular(generator);
- this.needleClientReact = new NeedleClientReact(generator);
- this.needleClientWebpack = new NeedleClientWebpack(generator);
- this.needleClientI18n = new NeedleClientI18n(generator);
- }
-};
+module.exports = class extends needleBase {};
| 13 |
diff --git a/app/classifier/drawing-tools/polygon.cjsx b/app/classifier/drawing-tools/polygon.cjsx @@ -66,8 +66,9 @@ module.exports = React.createClass
points = points.join '\n'
deleteButtonPosition = @getDeletePosition(firstPoint, secondPoint)
+ pointerEvents = if @props.disabled then 'none' else 'painted'
- <DrawingToolRoot tool={this} pointerEvents='painted'>
+ <DrawingToolRoot tool={this} pointerEvents={pointerEvents}>
<Draggable onDrag={@handleMainDrag} onEnd={deleteIfOutOfBounds.bind null, this} disabled={@props.disabled}>
<polyline points={points} fill={'none' unless @props.mark.closed} />
</Draggable>
| 8 |
diff --git a/weapons-manager.js b/weapons-manager.js @@ -341,6 +341,14 @@ world.addEventListener('trackedobjectadd', async e => {
</div>
</div>
`;
+ div.addEventListener('click', e => {
+ _use();
+ });
+ div.addEventListener('mouseenter', e => {
+ const i = Array.from(items4El.childNodes).indexOf(div);
+ selectedItemIndex = i;
+ _updateMenu();
+ });
items4El.appendChild(div);
});
world.addEventListener('trackedobjectremove', async e => {
| 0 |
diff --git a/docs/08-guides.md b/docs/08-guides.md @@ -147,7 +147,7 @@ import { html } from "/web_modules/lit-html.js";
#### Using Directives
-If you want to use lit-html [directives](https://lit-html.polymer-project.org/guide/template-reference#built-in-directives), you'll have to add them to the `webDependencies` property in your `package.json` like so:
+If you want to use lit-html [directives](https://lit-html.polymer-project.org/guide/template-reference#built-in-directives), you'll have to separately add them to the `webDependencies` property in your `package.json` like so:
```js
// File: package.json
| 7 |
diff --git a/packages/openapi-2-kong/src/kubernetes/generate.ts b/packages/openapi-2-kong/src/kubernetes/generate.ts @@ -139,9 +139,9 @@ export const generateMetadataAnnotations = (
const originalAnnotations = metadata?.annotations || {};
return {
+ ...coreAnnotations,
...originalAnnotations,
...customAnnotations,
- ...coreAnnotations,
};
}
| 11 |
diff --git a/src/scripts/renderer/preload/notification.js b/src/scripts/renderer/preload/notification.js @@ -25,7 +25,7 @@ window.Notification = (function (Html5Notification) {
log('showing native notification');
const nativeOptions = Object.assign({}, options, {
- canReply: true,
+ canReply: options.canReply !== false,
title
});
@@ -37,7 +37,7 @@ window.Notification = (function (Html5Notification) {
if (result.__data) {
nativeNotifier.removeNotification(result.__data.identifier);
} else {
- logError(new Error('tried to close notification with falsy __data'));
+ logFatal(new Error('tried to close notification with falsy __data'));
}
};
| 11 |
diff --git a/src/js/controllers/preferencesAltCurrency.js b/src/js/controllers/preferencesAltCurrency.js @@ -21,6 +21,17 @@ angular.module('canoeApp.controllers').controller('preferencesAltCurrencyControl
return idx[c.isoCode] || idx2[c.isoCode]
})
+ // #98 Last is first... Sorted by population per country (+ corea and japan) from : https://www.internetworldstats.com/stats8.htm
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'JPY')) // Japan
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'KRW')) // Korea
+
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'BRL')) // Brazil
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'IDR')) // Indonesia
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'USD')) // US
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'EUR')) // YUROP
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'INR')) // India
+ completeAlternativeList = moveElementInArrayToTop(completeAlternativeList, findElement(completeAlternativeList, 'isoCode', 'CNY')) // China
+
$scope.altCurrencyList = completeAlternativeList.slice(0, 10)
$timeout(function () {
@@ -29,6 +40,26 @@ angular.module('canoeApp.controllers').controller('preferencesAltCurrencyControl
})
}
+ function moveElementInArrayToTop (array, value) {
+ var oldIndex = array.indexOf(value);
+ console.log('oldIndex =' + oldIndex)
+ if (oldIndex > -1){
+ var newIndex = 0
+
+ var arrayClone = array.slice();
+ arrayClone.splice(oldIndex,1);
+ arrayClone.splice(newIndex,0,value);
+ return arrayClone
+ }
+ return array
+ }
+
+ function findElement(arr, propName, propValue) {
+ for (var i=0; i < arr.length; i++)
+ if (arr[i][propName] == propValue)
+ return arr[i];
+ }
+
$scope.loadMore = function () {
$timeout(function () {
$scope.altCurrencyList = completeAlternativeList.slice(0, next)
| 5 |
diff --git a/README.md b/README.md @@ -771,7 +771,7 @@ If you're going to concatenate files, you don't have to read the data to JS cont
## Caveats
* This library does not urlencode unicode characters in URL automatically, see [#146](https://github.com/wkh237/react-native-fetch-blob/issues/146).
-* When a `Blob` , from existing file, the file **WILL BE REMOVE** if you `close` the blob.
+* When you create a `Blob` , from an existing file, the file **WILL BE REMOVED** if you `close` the blob.
* If you replaced `window.XMLHttpRequest` for some reason (e.g. make Firebase SDK work), it will also affect how official `fetch` works (basically it should work just fine).
* When file stream and upload/download progress event slow down your app, consider an upgrade to `0.9.6+`, use [additional arguments](https://github.com/wkh237/react-native-fetch-blob/wiki/Fetch-API#fetchprogressconfig-eventlistenerpromisernfetchblobresponse) to limit its frequency.
* When passing a file path to the library, remove `file://` prefix.
| 1 |
diff --git a/src/components/ButtonDropdown.tsx b/src/components/ButtonDropdown.tsx @@ -3,12 +3,12 @@ import React, { useState, createRef } from "react"
import styled from "@emotion/styled"
import { useIntl } from "react-intl"
import { motion } from "framer-motion"
+import { MdMenu } from "react-icons/md"
// Components
-import Icon from "./Icon"
import Link from "./Link"
+import Button from "./Button"
import Translation from "./Translation"
-import { ButtonSecondary } from "./SharedStyledComponents"
// Utils
import { useOnClickOutside } from "../hooks/useOnClickOutside"
@@ -65,24 +65,6 @@ const listVariants = {
},
}
-const Button = styled(ButtonSecondary)`
- display: flex;
- align-items: center;
- justify-content: space-around;
- min-width: 240px;
- @media (max-width: ${(props) => props.theme.breakpoints.l}) {
- width: 100%;
- justify-content: center;
- }
-`
-
-const StyledIcon = styled(Icon)`
- fill: ${(props) => props.theme.colors.text};
- @media (max-width: ${(props) => props.theme.breakpoints.l}) {
- margin-right: 1rem;
- }
-`
-
const DropdownItem = styled.li`
margin: 0;
color: ${(props) => props.theme.colors.text};
@@ -157,11 +139,13 @@ const ButtonDropdown: React.FC<IProps> = ({ list, className }) => {
aria-label={`Select ${translateMessageId(list.text, intl)}`}
>
<Button
+ variant="outline"
+ minW={{ base: "100%", lg: "240" }}
+ leftIcon={<MdMenu />}
onClick={() => setIsOpen(!isOpen)}
onKeyDown={onKeyDownHandler}
tabIndex={0}
>
- <StyledIcon name="menu" />
<Translation id={list.text} />
</Button>
<DropdownList
| 4 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -121,17 +121,6 @@ class App extends THREE.Object3D {
use: true,
});
}
- /* hit(damage) {
- console.log('hit', new Error().stack);
- this.dispatchEvent({
- type: 'hit',
- hp: 100,
- totalHp: 100,
- });
- } */
- /* willDieFrom(damage) {
- return false;
- } */
destroy() {
this.dispatchEvent({
type: 'destroy',
| 2 |
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js @@ -399,19 +399,13 @@ class TransactionStateManager extends EventEmitter {
_setTxStatus (txId, status) {
const txMeta = this.getTx(txId)
txMeta.status = status
- setTimeout(() => {
- try {
- this.updateTx(txMeta, `txStateManager: setting status to ${status}`)
this.emit(`${txMeta.id}:${status}`, txId)
this.emit(`tx:status-update`, txId, status)
if (['submitted', 'rejected', 'failed'].includes(status)) {
this.emit(`${txMeta.id}:finished`, txMeta)
}
+ this.updateTx(txMeta, `txStateManager: setting status to ${status}`)
this.emit('update:badge')
- } catch (error) {
- log.error(error)
- }
- })
}
/**
| 13 |
diff --git a/packages/driver/test/support/views/spec.html b/packages/driver/test/support/views/spec.html <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
+ <style>p{position:absolute;top:10px;left:15px;}</style>
</head>
<body>
+ <p><a href="/">< Spec List</a></p>
<div id="mocha"></div>
<script src="/dist-test/spec_helper.js"></script>
{{#each specs}}
| 0 |
diff --git a/js/uicallbacks.js b/js/uicallbacks.js @@ -185,7 +185,7 @@ function closeSecondaryViewer(){
secondary.classList.add('none');
secondary.classList.remove('right');
$UI.multSelector.elt.classList.add('none');
- $UI.toolbar._sub_tools[4].querySelector('input[type="checkbox"]').checked = false;
+ $UI.toolbar._sub_tools[5].querySelector('input[type="checkbox"]').checked = false;
Loading.close();
//destory
| 1 |
diff --git a/framer/TextLayer.coffee b/framer/TextLayer.coffee @@ -68,18 +68,19 @@ class exports.TextLayer extends Layer
@on "change:width", @updateExplicitWidth
@on "change:height", @updateExplicitHeight
- defaultFont: =>
- # Store current device
- @_currentDevice = Framer.Device.deviceType
-
- # Android Device: Roboto
- if @_currentDevice.indexOf("google") > -1
- return "Roboto, Helvetica Neue"
- # Edge Device: Segoe UI
- if @_currentDevice.indexOf("microsoft") > -1
- return "Segoe UI, Helvetica Neue"
- # General default: macOS, SF UI
- return "-apple-system, SF UI Text, Helvetica Neue"
+ defaultFont: ->
+ appleFont = "-apple-system, SF UI Text, Helvetica Neue"
+ googleFont = "Roboto, Helvetica Neue"
+ microsoftFont = "Segoe UI, Helvetica Neue"
+ switch Framer.Device.platform()
+ when "Android" then return googleFont
+ when "iOS", "watchOS", "macOS" then return appleFont
+ when "Windows" then return microsoftFont
+ if Utils.isAndroid()
+ return googleFont
+ if Utils.isEdge()
+ return microsoftFont
+ return appleFont
autoSize: =>
constraints =
| 7 |
diff --git a/tests/e2e/plugins/site-verification-api-mock.php b/tests/e2e/plugins/site-verification-api-mock.php @@ -70,41 +70,10 @@ add_action( 'rest_api_init', function () {
array(
'callback' => function () {
return array(
- 'exact_match' => home_url( '/' ),
- );
- }
- ),
- true
- );
-
- register_rest_route(
- REST_Routes::REST_ROOT,
- 'modules/search-console/data/is-site-exist',
- array(
- 'callback' => function ( WP_REST_Request $request ) {
- $data = $request->get_param( 'data' );
-
- return array(
- 'siteURL' => 'https://example.org/',
- 'verified' => (bool) get_transient( 'gsk_e2e_sc_site_exists' ),
- );
- }
+ 'exactMatch' => array(
+ 'siteUrl' => home_url( '/' ),
+ 'permissionLevel' => 'siteOwner',
),
- true
- );
-
- register_rest_route(
- REST_Routes::REST_ROOT,
- 'modules/search-console/data/insert',
- array(
- 'methods' => 'POST',
- 'callback' => function ( WP_REST_Request $request ) {
- $data = $request->get_param( 'data' );
-
- update_option( 'googlesitekit_search_console_property', $data['siteURL'] );
-
- return array(
- 'sites' => array( $data['siteURL'] ),
);
}
),
| 3 |
diff --git a/test/_util/helpers.js b/test/_util/helpers.js @@ -116,7 +116,8 @@ function serializeDomTree(node) {
export function sortCss(cssText) {
return cssText.split(';')
.filter(Boolean)
- .sort((a, b) => a[0]==='-' ? -1 : b[0]==='-' ? 1 : a - b)
+ .map(s => s.replace(/^\s+|\s+$/g, '').replace(/(\s*:\s*)/g, ': '))
+ .sort((a, b) => a[0]==='-' ? -1 : b[0]==='-' ? 1 : a.localeCompare(b))
.join('; ') + ';';
}
| 7 |
diff --git a/icons.js b/icons.js const _svg2Url = s => `data:image/svg+xml;base64,${btoa(s.replace(/currentColor/g, '#000'))}`;
export const code = _svg2Url(`<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="code" class="svg-inline--fa fa-code fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M234.8 511.7L196 500.4c-4.2-1.2-6.7-5.7-5.5-9.9L331.3 5.8c1.2-4.2 5.7-6.7 9.9-5.5L380 11.6c4.2 1.2 6.7 5.7 5.5 9.9L244.7 506.2c-1.2 4.3-5.6 6.7-9.9 5.5zm-83.2-121.1l27.2-29c3.1-3.3 2.8-8.5-.5-11.5L72.2 256l106.1-94.1c3.4-3 3.6-8.2.5-11.5l-27.2-29c-3-3.2-8.1-3.4-11.3-.4L2.5 250.2c-3.4 3.2-3.4 8.5 0 11.7L140.3 391c3.2 3 8.2 2.8 11.3-.4zm284.1.4l137.7-129.1c3.4-3.2 3.4-8.5 0-11.7L435.7 121c-3.2-3-8.3-2.9-11.3.4l-27.2 29c-3.1 3.3-2.8 8.5.5 11.5L503.8 256l-106.1 94.1c-3.4 3-3.6 8.2-.5 11.5l27.2 29c3.1 3.2 8.1 3.4 11.3.4z"></path></svg>`);
+export const boxOpen = _svg2Url(`<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="box-open" class="svg-inline--fa fa-box-open fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M425.7 256c-16.9 0-32.8-9-41.4-23.4L320 126l-64.2 106.6c-8.7 14.5-24.6 23.5-41.5 23.5-4.5 0-9-.6-13.3-1.9L64 215v178c0 14.7 10 27.5 24.2 31l216.2 54.1c10.2 2.5 20.9 2.5 31 0L551.8 424c14.2-3.6 24.2-16.4 24.2-31V215l-137 39.1c-4.3 1.3-8.8 1.9-13.3 1.9zm212.6-112.2L586.8 41c-3.1-6.2-9.8-9.8-16.7-8.9L320 64l91.7 152.1c3.8 6.3 11.4 9.3 18.5 7.3l197.9-56.5c9.9-2.9 14.7-13.9 10.2-23.1zM53.2 41L1.7 143.8c-4.6 9.2.3 20.2 10.1 23l197.9 56.5c7.1 2 14.7-1 18.5-7.3L320 64 69.8 32.1c-6.9-.8-13.5 2.7-16.6 8.9z"></path></svg>`);
export const waveform = _svg2Url(`<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="waveform" class="svg-inline--fa fa-waveform fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M328 0h-16a16 16 0 0 0-16 16v480a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16V16a16 16 0 0 0-16-16zm-96 96h-16a16 16 0 0 0-16 16v288a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16V112a16 16 0 0 0-16-16zm192 32h-16a16 16 0 0 0-16 16v224a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16V144a16 16 0 0 0-16-16zm96-64h-16a16 16 0 0 0-16 16v352a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zM136 192h-16a16 16 0 0 0-16 16v96a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16v-96a16 16 0 0 0-16-16zm-96 32H24a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm576 0h-16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>`);
\ No newline at end of file
| 0 |
diff --git a/scenes/street.scn b/scenes/street.scn ],
"start_url": "https://webaverse.github.io/street/"
},
- {
- "position": [
- -20,
- 30,
- -30
- ],
- "start_url": "https://webaverse.github.io/floating-island/"
- },
{
"position": [
0,
| 2 |
diff --git a/Makefile b/Makefile @@ -5,7 +5,7 @@ release: npm setup-build-dir grunt tosdr moveout fonts
dev: setup-build-dir grunt-process-lists moveout fonts grunt-dev
npm:
- npm install --tldjs-update-rules
+ npm install
grunt:
grunt build --browser=$(browser) --type=$(type)
| 2 |
diff --git a/js/huobipro.js b/js/huobipro.js @@ -459,7 +459,7 @@ module.exports = class huobipro extends Exchange {
'symbol': market['id'],
};
let response = await this.privateGetOrderMatchresults (this.extend (request, params));
- let trades = this.parseTrades (response['data'], symbol, since, limit);
+ let trades = this.parseTrades (response['data'], market, since, limit);
return trades;
}
| 14 |
diff --git a/src/webhook/handlers/askingArticleSubmissionConsent.js b/src/webhook/handlers/askingArticleSubmissionConsent.js @@ -55,7 +55,10 @@ export default async function askingArticleSubmissionConsent(params) {
}
`({ text: data.searchedText }, { userId });
- await UserArticleLink.create({ userId, articleId: CreateArticle.id });
+ await UserArticleLink.createOrUpdateByUserIdAndArticleId(
+ userId,
+ CreateArticle.id
+ );
const articleUrl = getArticleURL(CreateArticle.id);
const articleCreatedMsg = t`Your submission is now recorded at ${articleUrl}`;
| 14 |
diff --git a/src/templates/main-body-template.js b/src/templates/main-body-template.js @@ -30,14 +30,12 @@ export default function mainBodyTemplate(isMini = false, showExpandCollapse = tr
};
/* eslint-disable indent */
if (this.resolvedSpec.specLoadError) {
- /*
if (isMini) {
return html`
${this.theme === 'dark' ? SetTheme.call(this, 'dark', newTheme) : SetTheme.call(this, 'light', newTheme)}
- <div style="border:1px solid var(--border-color); height:42px; padding:5px; font-size:var(--font-size-small); color:var(--red); font-family:var(--font-mono)"> ${this.resolvedSpec.info.description} </div>
+ <div style="display:flex; align-items:center; border:1px dashed var(--border-color); height:42px; padding:5px; font-size:var(--font-size-small); color:var(--red); font-family:var(--font-mono)"> ${this.resolvedSpec.info.description} </div>
`;
}
- */
return html`
${this.theme === 'dark' ? SetTheme.call(this, 'dark', newTheme) : SetTheme.call(this, 'light', newTheme)}
<!-- Header -->
| 7 |
diff --git a/token-metadata/0x04Fa0d235C4abf4BcF4787aF4CF447DE572eF828/metadata.json b/token-metadata/0x04Fa0d235C4abf4BcF4787aF4CF447DE572eF828/metadata.json "symbol": "UMA",
"address": "0x04Fa0d235C4abf4BcF4787aF4CF447DE572eF828",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl </p>
<p>
- <a aria-label="join our slack" title="slack" href="https://myetherwallet.herokuapp.com/" target="_blank" rel="noopener noreferrer" role="link" tabindex="0">
- <svg width="24" height="24" class="footer__icon" aria-labelledby="slack icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" d="M9.879 10.995l1.035 3.085 3.205-1.074-1.035-3.074-3.205 1.08v-.017z"/><path d="M18.824 14.055l-1.555.521.54 1.61c.218.65-.135 1.355-.786 1.574-.15.045-.285.067-.435.063-.511-.015-.976-.338-1.155-.849l-.54-1.607-3.21 1.073.539 1.608c.211.652-.135 1.358-.794 1.575-.15.048-.285.067-.435.064-.51-.015-.976-.34-1.156-.85l-.539-1.619-1.561.524c-.15.045-.285.061-.435.061-.511-.016-.976-.345-1.155-.855-.225-.66.135-1.364.78-1.575l1.56-.525L7.5 11.76l-1.551.525c-.141.048-.285.066-.428.064-.495-.016-.975-.338-1.141-.848-.209-.65.135-1.354.796-1.574l1.56-.52-.54-1.605c-.21-.654.136-1.359.796-1.575.659-.22 1.363.136 1.574.783l.539 1.608L12.3 7.544l-.54-1.605c-.209-.645.135-1.35.789-1.574.652-.211 1.359.135 1.575.791l.54 1.621 1.555-.51c.651-.219 1.356.135 1.575.779.218.654-.135 1.359-.784 1.575l-1.557.524 1.035 3.086 1.551-.516c.652-.211 1.358.135 1.575.795.22.66-.135 1.365-.779 1.574l-.011-.029zm4.171-5.356C20.52.456 16.946-1.471 8.699 1.005.456 3.479-1.471 7.051 1.005 15.301c2.475 8.245 6.046 10.17 14.296 7.694 8.245-2.475 10.17-6.046 7.694-14.296z" fill="#ffffff" /></svg>
+ <a href="https://instagram.com/myetherwallet" aria-label="instagram" target="_blank" rel="noopener noreferrer" role="link" tabindex="0">
+ <svg width="24" height="24" class="footer__icon" aria-labelledby="instagram icon" role="img" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+ <path fill="#ffffff" d="M1152 896q0-106-75-181t-181-75-181 75-75 181 75 181 181 75 181-75 75-181zm138 0q0 164-115 279t-279 115-279-115-115-279 115-279 279-115 279 115 115 279zm108-410q0 38-27 65t-65 27-65-27-27-65 27-65 65-27 65 27 27 65zm-502-220q-7 0-76.5-.5t-105.5 0-96.5 3-103 10-71.5 18.5q-50 20-88 58t-58 88q-11 29-18.5 71.5t-10 103-3 96.5 0 105.5.5 76.5-.5 76.5 0 105.5 3 96.5 10 103 18.5 71.5q20 50 58 88t88 58q29 11 71.5 18.5t103 10 96.5 3 105.5 0 76.5-.5 76.5.5 105.5 0 96.5-3 103-10 71.5-18.5q50-20 88-58t58-88q11-29 18.5-71.5t10-103 3-96.5 0-105.5-.5-76.5.5-76.5 0-105.5-3-96.5-10-103-18.5-71.5q-20-50-58-88t-88-58q-29-11-71.5-18.5t-103-10-96.5-3-105.5 0-76.5.5zm768 630q0 229-5 317-10 208-124 322t-322 124q-88 5-317 5t-317-5q-208-10-322-124t-124-322q-5-88-5-317t5-317q10-208 124-322t322-124q88-5 317-5t317 5q208 10 322 124t124 322q5 88 5 317z"/>
+ </svg>
</a>
<a aria-label="reddit" href="https://www.reddit.com/r/MyEtherWallet/" target="_blank" rel="noopener noreferrer" role="link" tabindex="0">
<svg width="24" height="24" class="footer__icon" aria-labelledby="reddit icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M2.204 14.049c-.06.276-.091.56-.091.847 0 3.443 4.402 6.249 9.814 6.249 5.41 0 9.812-2.804 9.812-6.249 0-.274-.029-.546-.082-.809l-.015-.032c-.021-.055-.029-.11-.029-.165-.302-1.175-1.117-2.241-2.296-3.103-.045-.016-.088-.039-.126-.07-.026-.02-.045-.042-.067-.064-1.792-1.234-4.356-2.008-7.196-2.008-2.815 0-5.354.759-7.146 1.971-.014.018-.029.033-.049.049-.039.033-.084.06-.13.075-1.206.862-2.042 1.937-2.354 3.123 0 .058-.014.114-.037.171l-.008.015zm9.773 5.441c-1.794 0-3.057-.389-3.863-1.197-.173-.174-.173-.457 0-.632.176-.165.46-.165.635 0 .63.629 1.685.943 3.228.943 1.542 0 2.591-.3 3.219-.929.165-.164.45-.164.629 0 .165.18.165.465 0 .645-.809.808-2.065 1.198-3.862 1.198l.014-.028zm-3.606-7.573c-.914 0-1.677.765-1.677 1.677 0 .91.763 1.65 1.677 1.65s1.651-.74 1.651-1.65c0-.912-.739-1.677-1.651-1.677zm7.233 0c-.914 0-1.678.765-1.678 1.677 0 .91.764 1.65 1.678 1.65s1.651-.74 1.651-1.65c0-.912-.739-1.677-1.651-1.677zm4.548-1.595c1.037.833 1.8 1.821 2.189 2.904.45-.336.719-.864.719-1.449 0-1.002-.815-1.816-1.818-1.816-.399 0-.778.129-1.09.363v-.002zM2.711 9.963c-1.003 0-1.817.816-1.817 1.818 0 .543.239 1.048.644 1.389.401-1.079 1.172-2.053 2.213-2.876-.302-.21-.663-.329-1.039-.329v-.002zm9.217 12.079c-5.906 0-10.709-3.205-10.709-7.142 0-.275.023-.544.068-.809C.494 13.598 0 12.729 0 11.777c0-1.496 1.227-2.713 2.725-2.713.674 0 1.303.246 1.797.682 1.856-1.191 4.357-1.941 7.112-1.992l1.812-5.524.404.095s.016 0 .016.002l4.223.993c.344-.798 1.138-1.36 2.065-1.36 1.229 0 2.231 1.004 2.231 2.234 0 1.232-1.003 2.234-2.231 2.234s-2.23-1.004-2.23-2.23l-3.851-.912-1.467 4.477c2.65.105 5.047.854 6.844 2.021.494-.464 1.144-.719 1.833-.719 1.498 0 2.718 1.213 2.718 2.711 0 .987-.54 1.886-1.378 2.365.029.255.059.494.059.749-.015 3.938-4.806 7.143-10.72 7.143l-.034.009zm8.179-19.187c-.74 0-1.34.599-1.34 1.338 0 .738.6 1.34 1.34 1.34.732 0 1.33-.6 1.33-1.334 0-.733-.598-1.332-1.347-1.332l.017-.012z" fill="#ffffff" /></svg>
| 14 |
diff --git a/packages/cx/src/widgets/grid/Grid.js b/packages/cx/src/widgets/grid/Grid.js @@ -581,9 +581,11 @@ export class Grid extends Widget {
resizeOverlayEl.style.width = `${width}px`;
},
onMouseUp: (e) => {
+ if (!resizeOverlayEl) return; //dblclick
let width = resizeOverlayEl.offsetWidth;
hdinst.assignedWidth = width;
gridEl.removeChild(resizeOverlayEl);
+ resizeOverlayEl = null;
if (widget.onColumnResize)
instance.invoke("onColumnResize", { width, column: hdwidget }, hdinst);
header.set("width", width);
| 1 |
diff --git a/src/encoded/batch_download.py b/src/encoded/batch_download.py @@ -267,7 +267,7 @@ def metadata_tsv(context, request):
if prop == 'files.replicate.rbns_protein_concentration':
if 'replicate' in f and 'rbns_protein_concentration_units' in f['replicate']:
temp[0] = temp[0] + ' ' + f['replicate']['rbns_protein_concentration_units']
- if prop == 'files.paired_with':
+ if prop in ['files.paired_with', 'files.derived_from']:
# chopping of path to just accession
if len(temp):
new_values = [t[7:-1] for t in temp]
| 1 |
diff --git a/storybook-utilities/markdownDocumentationLinkBuilder.js b/storybook-utilities/markdownDocumentationLinkBuilder.js -const markdownDocumentationLinkBuilder = (component, type) => {
- const directory = !type ? 'components' : type;
- return `
- ##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/${directory}/${component})
+const markdownDocumentationLinkBuilder = (component, type = 'components') => `
+##### For design and usage information check out the [documentation.](https://spark-docs.netlify.com/using-spark/${type}/${component})
`;
-};
export { markdownDocumentationLinkBuilder };
| 3 |
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js @@ -17,7 +17,6 @@ import IdentityForm from './IdentityForm';
import * as ValidationUtils from '../../libs/ValidationUtils';
import compose from '../../libs/compose';
import ONYXKEYS from '../../ONYXKEYS';
-import * as ReimbursementAccountUtils from '../../libs/ReimbursementAccountUtils';
import reimbursementAccountPropTypes from './reimbursementAccountPropTypes';
import * as Link from '../../libs/actions/Link';
import RequestorOnfidoStep from './RequestorOnfidoStep';
@@ -125,7 +124,7 @@ class RequestorStep extends React.Component {
submit(values) {
const payload = {
- bankAccountID: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankAccountID', 0),
+ bankAccountID: this.getDefaultStateForField(this.props, 'bankAccountID', 0),
...values,
dob: moment(values.dob).format(CONST.DATE.MOMENT_FORMAT_STRING),
};
| 4 |
diff --git a/.travis.yml b/.travis.yml @@ -13,21 +13,14 @@ node_js: 10.13.0
jdk: openjdk8
addons:
- postgresql: "11.5"
+ postgresql: 10
before_install:
- sudo apt-get -qq update
- - sudo apt-get --yes remove postgresql\*
- - sudo apt-get install -y postgresql-11 postgresql-client-11
- - sudo cp /etc/postgresql/{9.6,11}/main/pg_hba.conf
- - sudo service postgresql restart 11
- - sudo apt-cache policy postgresql-11-postgis-2.5
- - sudo apt-cache policy postgresql-11-postgis-2.5-scripts
- - sudo apt-cache policy libgeos-c1v5
- - sudo apt-get install -y postgresql-11-postgis-2.5
+ - sudo apt-get install -y postgresql-10-postgis-2.4 gdal-bin proj-bin libgeos-dev libgeos++-dev libproj-dev
- psql -U postgres -c "create extension postgis"
- psql -U postgres -c 'create extension "uuid-ossp"'
- - sudo -u postgres createdb template_postgis
+ - createdb -O postgres template_postgis
- psql -U postgres template_postgis -c "UPDATE pg_database SET datistemplate = TRUE WHERE datname = 'template_postgis'"
- export JAVA_HOME='/usr'
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.3.1-linux-x86_64.tar.gz | tar xz -C /tmp
| 13 |
diff --git a/src/core/operations/ExtractFiles.mjs b/src/core/operations/ExtractFiles.mjs @@ -38,7 +38,7 @@ class ExtractFiles extends Operation {
<li>
${supportedExts.join("</li><li>")}
</li>
- </ul>`;
+ </ul>Minimum File Size can be used to prune small false positives.`;
this.infoURL = "https://forensicswiki.xyz/wiki/index.php?title=File_Carving";
this.inputType = "ArrayBuffer";
this.outputType = "List<File>";
@@ -54,6 +54,11 @@ class ExtractFiles extends Operation {
name: "Ignore failed extractions",
type: "boolean",
value: true
+ },
+ {
+ name: "Minimum File Size",
+ type: "number",
+ value: 0
}
]);
}
@@ -66,6 +71,7 @@ class ExtractFiles extends Operation {
run(input, args) {
const bytes = new Uint8Array(input),
categories = [],
+ minSize = args.pop(1),
ignoreFailedExtractions = args.pop(1);
args.forEach((cat, i) => {
@@ -80,7 +86,9 @@ class ExtractFiles extends Operation {
const errors = [];
detectedFiles.forEach(detectedFile => {
try {
- files.push(extractFile(bytes, detectedFile.fileDetails, detectedFile.offset));
+ let file;
+ if ((file = extractFile(bytes, detectedFile.fileDetails, detectedFile.offset)).size >= minSize)
+ files.push(file);
} catch (err) {
if (!ignoreFailedExtractions && err.message.indexOf("No extraction algorithm available") < 0) {
errors.push(
| 0 |
diff --git a/web/treeviewer.html b/web/treeviewer.html <!-- begin webpack/gulp modifications -->
<!-- external css files -->
<!-- build:css -->
- <link rel="stylesheet" type="text/css" href="/lib/css/bootstrap_dark.css">
- <link rel="stylesheet" type="text/css" href="/lib/css/bootstrap-colorselector.css">
- <link rel="stylesheet" type="text/css" href="/web/biscommon.css">
+ <link rel="stylesheet" type="text/css" href="../lib/css/bootstrap_dark.css">
+ <link rel="stylesheet" type="text/css" href="../lib/css/bootstrap-colorselector.css">
+ <link rel="stylesheet" type="text/css" href="biscommon.css">
<!-- endbuild -->
<!-- all javascript files -->
<!-- build:js -->
- <script src="/build/web/webcomponents-lite.js"></script>
- <script src="/build/web/jquery.min.js"></script>
- <script src="/build/web/bootstrap.min.js"></script>
- <script src="/build/web/libbiswasm_wasm.js"></script>
- <script src="/build/web/bislib.js"></script>
+ <script src="../build/web/webcomponents-lite.js"></script>
+ <script src="../build/web/jquery.min.js"></script>
+ <script src="../build/web/bootstrap.min.js"></script>
+ <script src="../build/web/libbiswasm_wasm.js"></script>
+ <script src="../build/web/bislib.js"></script>
<!-- endbuild -->
<!-- end webpack/gulp modifications -->
| 1 |
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/quiz.html b/modules/xerte/parent_templates/Nottingham/models_html5/quiz.html XTEnterInteraction(x_currentPage, this.questions[this.currentQ], 'multiplechoice', name, correctOptions, correctAnswer, correctFeedback, x_currentPageXML.getAttribute("grouping"));
quiz.checked = false;
+ $('#qNo').attr('tabIndex', 0).focus();
}
}
}
| 7 |
diff --git a/src/utils/gh-auth.js b/src/utils/gh-auth.js @@ -60,9 +60,9 @@ async function getGitHubToken(opts) {
const parameters = querystring.parse(req.url.slice(req.url.indexOf('?') + 1))
if (parameters.token) {
deferredResolve(parameters)
- res.end("<html><head><style>html{font-family:sans-serif}</style></head>" +
- "<body><h3>You're now logged into Netlify CLI with your " +
- parameters.provider + ' credentials. Please close this window.')
+ res.end("<html><head><style>html{font-family:sans-serif;background:#0e1e25}body{overflow:hidden;position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;height:100vh;width:100vw;}h3{margin:0}.card{position:relative;display:flex;flex-direction:column;width:75%;max-width:364px;padding:24px;background:white;color:rgb(14,30,37);border-radius:8px;box-shadow:0 2px 4px 0 rgba(14,30,37,.16);}</style></head>" +
+ "<body><div class=card><h3>Signed In</h3><p>You're now logged into Netlify CLI with your " +
+ parameters.provider + " credentials. Please close this window.</p></div>")
server.close()
return
}
| 7 |
diff --git a/server/preprocessing/other-scripts/vis_layout.R b/server/preprocessing/other-scripts/vis_layout.R @@ -181,6 +181,27 @@ SplitTokenizer <- function(x) {
trim <- function (x) gsub("^\\s+|\\s+$", "", x)
+filter_out <- function(ngrams, stops){
+ tokens = mapply(strsplit, ngrams, split=" ")
+ tokens = mapply(strsplit, tokens, split="_")
+ tokens = lapply(tokens, function(y){
+ Filter(function(x){
+ !any(grepl(x[1], c(stops)))
+ }, y)})
+ tokens = lapply(tokens, function(y){
+ Filter(function(x){
+ !any(grepl(tail(x,1), c(stops)))
+ }, y)})
+ tokens = lapply(tokens, function(y){
+ Filter(function(x){
+ !(x[1]==tail(x,1))
+ }, y)})
+ tokens = lapply(tokens, function(y){Filter(function(x){length(x)>1},y)})
+ tokens = lapply(tokens, function(x){mapply(paste, x, collapse="_")})
+ tokens = lapply(tokens, paste, collapse=";")
+ return (tokens)
+}
+
create_cluster_labels <- function(clusters, metadata_full_subjects, weightingspec, top_n, stops, taxonomy_separator="/") {
subjectlist = list()
for (k in seq(1, clusters$num_clusters)) {
@@ -194,10 +215,12 @@ create_cluster_labels <- function(clusters, metadata_full_subjects, weightingspe
#titles = lapply(titles, function(x)paste(unlist(strsplit(x, split=" ")), collapse=" "))
titles = lapply(titles, gsub, pattern=" ", replacement=" ")
titles = lapply(titles, tolower)
- titles = lapply(titles, function(x) {removeWords(x, stops)})
# for ngrams: we have to collapse with "_" or else tokenizers will split ngrams again at that point and we'll be left with unigrams
titles_bigrams = lapply(lapply(titles, function(x)unlist(lapply(ngrams(unlist(strsplit(x, split=" ")), 2), paste, collapse="_"))), paste, collapse=" ")
+ titles_bigrams = filter_out(titles_bigrams, stops)
titles_trigrams = lapply(lapply(titles, function(x)unlist(lapply(ngrams(unlist(strsplit(x, split=" ")), 3), paste, collapse="_"))), paste, collapse=" ")
+ titles_trigrams = filter_out(titles_trigrams, stops)
+ titles = lapply(titles, function(x) {removeWords(x, stops)})
subjects = mapply(gsub, subjects, pattern=" ", replacement="_")
| 7 |
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl @@ -94,6 +94,7 @@ avatar-radius = 50%
animation: flexGrowIn 0.1s
box-shadow: 0 0 7px 0 darken(white, 30%)
transition: flex-basis 0.1s
+ box-sizing: border-box
.mCustomScrollBox
padding-left: 0
| 7 |
diff --git a/CHANGES.md b/CHANGES.md - adjust dataset page layout to accomodate new mobile design
- Disable /auth route in production & change gateway health checking endpoint to /v0/healthz
- Stopped indexer skipping datasets that have no distributions. These datasets can now be discovered via search.
+- Improved mobile navigation
## 0.0.43
| 7 |
diff --git a/src/components/basicHeader/view/basicHeaderView.js b/src/components/basicHeader/view/basicHeaderView.js import React, { useState, Fragment, useRef } from 'react';
import { View, Text, ActivityIndicator, SafeAreaView } from 'react-native';
import { injectIntl } from 'react-intl';
-import ActionSheet from 'react-native-actionsheet';
import { useSelector } from 'react-redux';
import moment from 'moment';
@@ -15,6 +14,7 @@ import { DateTimePicker } from '../../dateTimePicker';
// Constants
// Styles
import styles from './basicHeaderStyles';
+import { OptionsModal } from '../../atoms';
const BasicHeaderView = ({
disabled,
@@ -324,7 +324,7 @@ const BasicHeaderView = ({
/>
</SafeAreaView>
</Modal>
- <ActionSheet
+ <OptionsModal
ref={settingMenuRef}
options={[
intl.formatMessage({ id: 'editor.setting_schedule' }),
@@ -337,7 +337,7 @@ const BasicHeaderView = ({
title={intl.formatMessage({ id: 'editor.options' })}
onPress={_handleSettingMenuSelect}
/>
- <ActionSheet
+ <OptionsModal
ref={rewardMenuRef}
options={[
intl.formatMessage({ id: 'editor.reward_default' }),
| 14 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.