code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/app/components/Features/ProxyTable/index.js b/app/components/Features/ProxyTable/index.js @@ -31,7 +31,7 @@ const HorusPay = props => {
data: {
voter: networkIdentity ? networkIdentity.name : '',
proxy,
- producers: null,
+ producers: [],
},
},
];
| 3 |
diff --git a/Makefile b/Makefile @@ -207,7 +207,13 @@ clean:
@rm -rf prep/
@rm -rf site/
@rm -f duk duk-rom dukd dukd-rom duk.O2 duk.O3 duk.O4
- @rm -f duk-clang duk-g++ dukd-g++
+ @rm -f duk-pgo duk-pgo.O2
+ @rm -f duk-perf duk-perf.O2 duk-perf.O3 duk-perf.O4
+ @rm -f duk-perf-pgo duk-perf-pgo.O2 duk-perf-pgo.O3 duk-perf-pgo.O4
+ @rm -f duk-size
+ @rm -f duk-rom dukd-rom
+ @rm -f duk-clang duk-perf-clang
+ @rm -f duk-g++ dukd-g++ duk-perf-g++
@rm -f ajduk ajduk-rom ajdukd
@rm -f emduk emduk.js
@rm -f libduktape*.so*
| 7 |
diff --git a/articles/migrations/index.md b/articles/migrations/index.md @@ -89,8 +89,8 @@ The affected endpoints are:
- [DELETE /api/v2/users/{id}/multifactor/{provider}](/api/management/v2#!/Users/delete_multifactor_by_provider)
- [POST /api/v2/device-credentials](/api/management/v2#!/Device_Credentials/post_device_credentials)
- [DELETE /api/v2/device-credentials/{id}](/api/management/v2#!/Device_Credentials/delete_device_credentials_by_id)
-- [POST/api/v2/users/{id}/identities](/api/management/v2#!/Users/post_identities) (used for [Account Linking](/link-accounts), see warning panel below)
-- [DELETE /api/v2/users/{id}/identities/{provider}/{user_id}](/api/management/v2#!/Users/delete_provider_by_user_id)
+- [POST/api/v2/users/{id}/identities](/api/management/v2#!/Users/post_identities) (used for [Account Linking](/link-accounts))
+- [DELETE /api/v2/users/{id}/identities/{provider}/{user_id}](/api/management/v2#!/Users/delete_provider_by_user_id) (used for [Account Linking](/link-accounts))
These endpoints will now accept regular [Access Tokens](/access-token). This functionality is available now.
@@ -108,10 +108,6 @@ Note that the following scopes are also required by some endpoints:
For example, the [GET /api/v2/users/{id} endpoint](/api/management/v2#!/Users/get_users_by_id) requires the scopes: `read:users`, `read:user_idp_tokens`, and `read:current_user`. For detailed steps and code samples, see [How to get an Access Token](/tokens/access-token#how-to-get-an-access-token).
-:::panel-warning Account Linking available only for admins
-You can link two accounts by invoking the [POST/api/v2/users/{id}/identities](/api/management/v2#!/Users/post_identities) endpoint. This **will not be available for Access Tokens issued to end users**, but only to administrators of your tenant.
-:::
-
Applications must be updated by June 1, 2018, when the ability to use ID Tokens will be disabled. Migration guides will be available by the end of February 2018.
#### Am I affected by the change?
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md All notable changes to this project are documented in this file.
-## Head
+## 13.13.1
- Fixed: invalid JSON for `max-warnings` option ([#5267](https://github.com/stylelint/stylelint/pull/5267)).
- Fixed: `no-invalid-position-at-import-rule` false positives for dollar variables ([#5264](https://github.com/stylelint/stylelint/pull/5264)).
| 6 |
diff --git a/src/components/dashboard/SendLinkSummary.js b/src/components/dashboard/SendLinkSummary.js @@ -10,6 +10,7 @@ import { receiveStyles } from './styles'
import TopBar from '../common/TopBar'
import API from '../../lib/API/api'
import isEmail from 'validator/lib/isEmail'
+import isMobilePhone from '../../lib/validators/isMobilePhone'
export type AmountProps = {
screenProps: any,
@@ -44,9 +45,11 @@ const SendLinkSummary = (props: AmountProps) => {
}
// Send sms if to is phone
- if (true) {
+ if (isMobilePhone(to)) {
return API.sendLinkBySMS(to, sendLink)
}
+
+ throw new Error(`${to} is neither a valid phone or email`)
}
const generateLinkAndSend = async () => {
| 0 |
diff --git a/src/server/routes/apiv3/security-setting.js b/src/server/routes/apiv3/security-setting.js @@ -709,9 +709,17 @@ module.exports = (crowi) => {
githubClientSecret: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientSecret'),
isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-github:isSameUsernameTreatedAsIdenticalUser'),
};
+ // reset strategy
+ await crowi.passportService.resetGitHubStrategy();
+ // setup strategy
+ if (crowi.configManager.getConfig('crowi', 'security:passport-github:isEnabled')) {
+ await crowi.passportService.setupGitHubStrategy(true);
+ }
return res.apiv3({ securitySettingParams });
}
catch (err) {
+ // reset strategy
+ await crowi.passportService.resetGitHubStrategy();
const msg = 'Error occurred in updating githubOAuth';
logger.error('Error', err);
return res.apiv3Err(new ErrorV3(msg, 'update-githubOAuth-failed'));
| 12 |
diff --git a/examples/__tests__/SimpleSlider.test.js b/examples/__tests__/SimpleSlider.test.js @@ -32,4 +32,26 @@ describe('Simple Slider', function() {
const wrapper = mount(<SimpleSlider />);
expect(wrapper.find('.slick-next').length).toEqual(1);
});
+
+ it('should got to second slide when next button is clicked', function () {
+ const wrapper = mount(<SimpleSlider />);
+ wrapper.find('.slick-next').simulate('click')
+ expect(wrapper.find('.slick-slide.slick-active').first().text()).toEqual('2');
+ expect(wrapper.find('.slick-dots .slick-active').length).toEqual(1);
+ expect(wrapper.find('.slick-dots').childAt(1).hasClass('slick-active')).toEqual(true)
+ });
+ it('should goto last slide when prev button is clicked', function() {
+ const wrapper = mount(<SimpleSlider />);
+ wrapper.find('.slick-prev').simulate('click')
+ expect(wrapper.find('.slick-slide.slick-active').first().text()).toEqual('6');
+ expect(wrapper.find('.slick-dots .slick-active').length).toEqual(1);
+ expect(wrapper.find('.slick-dots').childAt(5).hasClass('slick-active')).toEqual(true)
+ })
+ it('should goto 4th slide when 4th dot is clicked', function() {
+ const wrapper = mount(<SimpleSlider />);
+ wrapper.find('.slick-dots button').at(3).simulate('click')
+ expect(wrapper.find('.slick-slide.slick-active').first().text()).toEqual('4');
+ expect(wrapper.find('.slick-dots .slick-active').length).toEqual(1);
+ expect(wrapper.find('.slick-dots').childAt(3).hasClass('slick-active')).toEqual(true)
+ })
});
| 0 |
diff --git a/geometry-worker.js b/geometry-worker.js @@ -412,6 +412,7 @@ const _flatEncode = meshes => {
let totalSize = 0;
for (const mesh of meshes) {
totalSize += MAX_NAME_LENGTH;
+ totalSize += Uint32Array.BYTES_PER_ELEMENT;
totalSize += Uint32Array.BYTES_PER_ELEMENT * 3;
totalSize += mesh.positions.byteLength;
totalSize += mesh.uvs.byteLength;
@@ -429,6 +430,9 @@ const _flatEncode = meshes => {
new Uint8Array(arrayBuffer, index, nameBuffer.length).set(nameBuffer);
index += MAX_NAME_LENGTH;
+ new Uint32Array(arrayBuffer, index, 1)[0] = +mesh.transparent;
+ index += Uint32Array.BYTES_PER_ELEMENT;
+
const pui = new Uint32Array(arrayBuffer, index, 3);
pui[0] = mesh.positions.length;
pui[1] = mesh.uvs.length;
@@ -468,6 +472,9 @@ const _flatDecode = arrayBuffer => {
const name = new TextDecoder().decode(new Uint8Array(arrayBuffer, index, nameLength));
index += nameLength;
+ const transparent = !!new Uint32Array(arrayBuffer, index, 1)[0];
+ index += Uint32Array.BYTES_PER_ELEMENT;
+
const [numPositions, numUvs, numIndices] = new Uint32Array(arrayBuffer, index, 3);
index += Uint32Array.BYTES_PER_ELEMENT * 3;
@@ -484,6 +491,7 @@ const _flatDecode = arrayBuffer => {
const m = {
name,
+ transparent,
positions,
uvs,
indices,
@@ -508,10 +516,11 @@ const _handleMessage = async data => {
}
for (const child of gltf.children) {
- const {name, geometry} = child;
+ const {name, geometry, material} = child;
+ const transparent = /fence/i.test(material.name);
geometryRegistry[name] = [{
name,
- transparent: false,
+ transparent,
positions: geometry.attributes.position.array,
uvs: geometry.attributes.uv.array,
indices: geometry.index.array,
| 0 |
diff --git a/docs/api-reference/carto/carto-layer.md b/docs/api-reference/carto/carto-layer.md @@ -117,7 +117,7 @@ Only supported when apiVersion is `API_VERSIONS.V3` and `type` is `MAP_TYPES.TAB
Name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.
-##### `columns` (Array<String>, optional)
+##### `columns` (Array, optional)
Only supported when apiVersion is `API_VERSIONS.V3` and `type` is `MAP_TYPES.TABLE`.
| 2 |
diff --git a/website/js/components/Heading.js b/website/js/components/Heading.js @@ -2,11 +2,12 @@ import { h } from 'hyperapp'
import { toKebabCase } from '../utils'
const Subheading = scope => (props, children) => {
- const id = toKebabCase(scope + children[0])
- const link = <a href={'#' + id}>{children}</a>
+ const id = toKebabCase(
+ scope + children.find(child => typeof child === 'string')
+ )
return (
<h3 id={id} class="section__subheading">
- {link}
+ <a href={'#' + id}>{children}</a>
</h3>
)
}
| 7 |
diff --git a/src/__tests__/hasError.spec.js b/src/__tests__/hasError.spec.js @@ -10,6 +10,12 @@ const describeHasError = (name, structure, expect) => {
const hasError = createHasError(structure)
describe(name, () => {
+ it('should throw an error for an invalid field type', () => {
+ const field = fromJS({ name: 'foo', type: 'NotARealFieldType' })
+ const obj = fromJS({})
+ expect(() => hasError(field, obj, obj, obj)).toThrow(/Unknown field type/)
+ })
+
it('should return false for falsy values', () => {
const field = fromJS({ name: 'foo', type: 'Field' })
expect(hasError(field, undefined)).toBe(false)
| 1 |
diff --git a/src/components/ProductDetailOptionsList/ProductDetailOptionsList.js b/src/components/ProductDetailOptionsList/ProductDetailOptionsList.js @@ -14,8 +14,8 @@ const styles = (theme) => ({
}
});
-@observer
@withStyles(styles, { withTheme: true })
+@observer
export default class OptionsList extends Component {
static propTypes = {
classes: PropTypes.object.isRequired,
@@ -38,7 +38,6 @@ export default class OptionsList extends Component {
@action
selectOption = (option) => {
this.selectedOption = option._id;
- this.forceUpdate();
Router.pushRoute("product", {
productSlug: this.props.productSlug,
| 2 |
diff --git a/src/pages/Group/AddServiceComponent.js b/src/pages/Group/AddServiceComponent.js @@ -349,7 +349,6 @@ export default class AddServiceComponent extends PureComponent {
<Market
{...MarketParameter}
isHelm={false}
- scope="enterprise"
handleServiceComponent={scopeMax => {
this.handleServiceComponent(
false,
| 1 |
diff --git a/components/core/Profile.js b/components/core/Profile.js @@ -310,7 +310,7 @@ export default class Profile extends React.Component {
}).length,
fetched: false,
tab: this.props.tab,
- isOnline: false,
+ /* isOnline: false, */
};
componentDidMount = () => {
@@ -404,11 +404,10 @@ export default class Profile extends React.Component {
});
};
- checkStatus = () => {
+ checkStatus = (userId) => {
const activeUsers = this.props.activeUsers;
- const userId = this.props.data?.id;
- this.setState({ isOnline: activeUsers && activeUsers.includes(userId) });
+ return activeUsers && activeUsers.includes(userId);
};
render() {
@@ -473,12 +472,13 @@ export default class Profile extends React.Component {
) : null}
</div>
);
+
return (
<UserEntry
key={relation.id}
user={relation.user}
button={button}
- userOnline={this.state.isOnline}
+ userOnline={this.checkStatus(relation.id)}
showStatusIndicator={this.props.isAuthenticated}
onClick={() => {
this.props.onAction({
@@ -532,7 +532,7 @@ export default class Profile extends React.Component {
key={relation.id}
user={relation.owner}
button={button}
- userOnline={this.state.isOnline}
+ userOnline={this.checkStatus(relation.id)}
showStatusIndicator={this.props.isAuthenticated}
onClick={() => {
this.props.onAction({
@@ -581,8 +581,10 @@ export default class Profile extends React.Component {
<div
css={STYLES_STATUS_INDICATOR}
style={{
- borderColor: this.state.isOnline && `${Constants.system.active}`,
- backgroundColor: this.state.isOnline && `${Constants.system.active}`,
+ borderColor:
+ this.checkStatus(this.props.data?.id) && `${Constants.system.active}`,
+ backgroundColor:
+ this.checkStatus(this.props.data?.id) && `${Constants.system.active}`,
}}
/>
)}
| 1 |
diff --git a/packages/app/src/test/service/page.test.js b/packages/app/src/test/service/page.test.js @@ -104,6 +104,24 @@ describe('PageService', () => {
creator: testUser1,
lastUpdateUser: testUser1,
},
+ {
+ path: '/level1/level2',
+ grant: Page.GRANT_PUBLIC,
+ creator: testUser1,
+ lastUpdateUser: testUser1,
+ },
+ {
+ path: '/level1/level2/child',
+ grant: Page.GRANT_PUBLIC,
+ creator: testUser1,
+ lastUpdateUser: testUser1,
+ },
+ {
+ path: '/level1/level2/level2',
+ grant: Page.GRANT_PUBLIC,
+ creator: testUser1,
+ lastUpdateUser: testUser1,
+ },
{
path: '/parentForRename1/child',
grant: Page.GRANT_PUBLIC,
@@ -194,6 +212,9 @@ describe('PageService', () => {
parentForRename3 = await Page.findOne({ path: '/parentForRename3' });
parentForRename4 = await Page.findOne({ path: '/parentForRename4' });
parentForRename6 = await Page.findOne({ path: '/parentForRename6' });
+ parentForRename7 = await Page.findOne({ path: '/level1/level2' });
+ parentForRename8 = await Page.findOne({ path: '/level1/level2/child' });
+ parentForRename9 = await Page.findOne({ path: '/level1/level2/level2' });
parentForDuplicate = await Page.findOne({ path: '/parentForDuplicate' });
@@ -258,6 +279,17 @@ describe('PageService', () => {
expect(resultPage.path).toEqual(expectPage.path);
expect(wrongPage).toBeNull();
});
+
+ test('rename page with different tree with isRecursively [shallower]', async() => {
+ await crowi.pageService.renamePage(parentForRename7, '/level1', testUser1, {}, true);
+ const expectPage1 = await Page.findOne({ path: '/level1' });
+ const expectPage2 = await Page.findOne({ path: '/level1/child' });
+ const expectPage3 = await Page.findOne({ path: '/level1/level2' });
+
+ expect(expectPage1).not.toBeNull();
+ expect(expectPage2).not.toBeNull();
+ expect(expectPage3).not.toBeNull();
+ });
});
});
| 10 |
diff --git a/src/assets/js/eventregistration.js b/src/assets/js/eventregistration.js @@ -90,7 +90,7 @@ document.getElementById('generateQR').addEventListener('click', async function (
let canvas = document.getElementById('eventqrcode');
let ctx = canvas.getContext('2d');
- const qr = await GenerateQRCode(grid, description, address, defaultcheckinlengthMinutes, locationtype, startdate, enddate, starttime, endtime, false, defaultcheckinlengthHours);
+ const qr = await GenerateQRCode(grid, description.replace(/\s+/g, ' '), address.replace(/\s+/g, ' '), defaultcheckinlengthMinutes, locationtype, startdate, enddate, starttime, endtime, false, defaultcheckinlengthHours);
ctx.width = 1654;
ctx.height = 2339;
canvas.width = 1654;
@@ -543,7 +543,7 @@ async function GenerateMultiQRCode(data) {
let grid = document.getElementById("pageTemplate").value
QR_LIST.splice(0, QR_LIST.length);
for (const qr of data) {
- GenerateQRCode(grid, qr.description, qr.address, qr.defaultcheckinlengthinminutes, qr.type, qr.startdate, qr.enddate, qr.starttime, qr.endtime, true);
+ GenerateQRCode(grid, qr.description.replace(/\s+/g, ' '), qr.address.replace(/\s+/g, ' '), qr.defaultcheckinlengthinminutes, qr.type, qr.startdate, qr.enddate, qr.starttime, qr.endtime, true);
}
if (QR_LIST.length !== data.length) {
document.getElementById('generateMultiQR').disabled = false;
| 14 |
diff --git a/docs/cypress/integration/guides_spec.coffee b/docs/cypress/integration/guides_spec.coffee @@ -11,7 +11,7 @@ describe "Guides", ->
cy.url()
.should('match', new RegExp(GUIDES_PATH))
- it "all section & body links work", ->
+ xit "all section & body links work", ->
filterMailtos = (urlsToFilter) ->
Cypress._.filter(urlsToFilter, (url) -> not url.match(/mailto:/))
| 12 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js b/public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js @@ -12,7 +12,6 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) {
* fix for the shift-getting-stuck bug.
* this is a documented issue, see here:
* https://stackoverflow.com/questions/11225694/why-are-onkeyup-events-not-firing-in-javascript-game
- *
* essentially what's going on is that JS sometimes fires a final keydown after a keyup.
* (usually happens when multiple events are fired)
* so the log would look like keydown:shift, keydown: shift, keyup: shift, keydown: shift.
@@ -287,8 +286,7 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) {
keyCode: e.keyCode
});
break;
- // shift key
- case 16:
+ case 16: //shift
// store the timestamp here so that we can check if the z-up event is in the buffer range
lastShiftKeyUpTimestamp = e.timeStamp;
break;
| 1 |
diff --git a/spec/lib/carto/tracking/events_spec.rb b/spec/lib/carto/tracking/events_spec.rb @@ -107,8 +107,6 @@ module Carto
:type,
:object_created_at,
:lifetime,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -197,8 +195,6 @@ module Carto
:object_created_at,
:lifetime,
:origin,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -287,8 +283,6 @@ module Carto
:type,
:object_created_at,
:lifetime,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -372,7 +366,6 @@ module Carto
it 'matches current prod properites' do
current_prod_properties = [:creation_time,
- :email,
:event_origin,
:lifetime,
:object_created_at,
@@ -381,7 +374,6 @@ module Carto
:type,
:user_active_for,
:user_created_at,
- :username,
:vis_id]
format = @event_class.new(@user.id,
@@ -458,8 +450,6 @@ module Carto
:imported_from,
:sync,
:file_type,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -537,8 +527,6 @@ module Carto
:imported_from,
:sync,
:file_type,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -596,13 +584,11 @@ module Carto
it 'matches current prod properites' do
current_prod_properties = [:creation_time,
- :email,
:event_origin,
:plan,
:quota_overage,
:user_active_for,
- :user_created_at,
- :username]
+ :user_created_at]
format = @event_class.new(@user.id, user_id: @user.id, quota_overage: 123)
.instance_eval { @format }
@@ -693,15 +679,13 @@ module Carto
it 'matches current prod properites' do
current_prod_properties = [:creation_time,
- :email,
:event_origin,
:map_id,
:map_name,
:mapviews,
:plan,
:user_active_for,
- :user_created_at,
- :username]
+ :user_created_at]
format = @event_class.new(@user.id,
visualization_id: @visualization.id,
@@ -790,8 +774,6 @@ module Carto
:object_created_at,
:lifetime,
:origin,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -880,8 +862,6 @@ module Carto
:type,
:object_created_at,
:lifetime,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -983,12 +963,10 @@ module Carto
it 'matches current prod properites' do
current_prod_properties = [:action,
:creation_time,
- :email,
:event_origin,
:plan,
:user_active_for,
:user_created_at,
- :username,
:vis_author,
:vis_author_email,
:vis_author_id,
@@ -1100,8 +1078,6 @@ module Carto
:type,
:object_created_at,
:lifetime,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -1215,8 +1191,6 @@ module Carto
:type,
:object_created_at,
:lifetime,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
@@ -1358,8 +1332,6 @@ module Carto
:type,
:object_created_at,
:lifetime,
- :username,
- :email,
:plan,
:user_active_for,
:user_created_at,
| 2 |
diff --git a/articles/tutorials/bulk-importing-users-into-auth0.md b/articles/tutorials/bulk-importing-users-into-auth0.md @@ -82,8 +82,9 @@ A file with the following contents is valid:
}
]
```
-
-> The file size limit for a bulk import is 500KB. You will need to start multiple imports if your data exceeds this size.
+::: note
+The file size limit for a bulk import is 500KB. You will need to start multiple imports if your data exceeds this size.
+:::
## How does it work?
@@ -101,7 +102,7 @@ Your request should contain the following parameters:
If it works, you will get a response similar to the following one:
-```
+```json
{
"status":"pending",
"type":"users_import",
| 14 |
diff --git a/src/traces/ohlc/hover.js b/src/traces/ohlc/hover.js @@ -101,10 +101,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
// put it all in .extraText
pointData.extraText = textParts.join('<br>');
- // this puts the label at the midpoint of the box, ie
+ // this puts the label *and the spike* at the midpoint of the box, ie
// halfway between open and close, not between high and low.
- // TODO: the spike also links to this point, whereas previously
- // it linked to close. Is one better?
pointData.y0 = pointData.y1 = ya.c2p(di.yc, true);
return [pointData];
| 2 |
diff --git a/test/geometry/MarkerSpec.js b/test/geometry/MarkerSpec.js @@ -319,6 +319,7 @@ describe('Geometry.Marker', function () {
});
it('change marker file by updateSymbol', function (done) {
+ this.timeout(10000);
var marker = new maptalks.Marker(map.getCenter(), {
symbol : {
'markerFile' : 'resources/tile.png'
| 3 |
diff --git a/pages/docs/manual/latest/build-overview.mdx b/pages/docs/manual/latest/build-overview.mdx @@ -37,7 +37,7 @@ Add `-w` to keep the built-in watcher running. Any new file change will be picke
- `bsb -make-world -w -ws 0.0.0.0:9999`
- `bsb -make-world -w -ws 5000`
-**To build only yourself**, use `bsb -make`.
+**To build only yourself**, use `bsb`.
`bsb -help` to see all the available options.
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -1654,7 +1654,8 @@ var $$IMU_EXPORT$$;
allow_video: {
name: "Videos",
description: "Allows videos to be returned",
- category: "rules"
+ category: "rules",
+ onupdate: update_rule_setting
},
allow_watermark: {
name: "Larger watermarked images",
@@ -48214,6 +48215,12 @@ var $$IMU_EXPORT$$;
if (!options.allow_apicalls) {
options.do_request = null;
}
+
+ if (!settings.allow_video) {
+ options.exclude_videos = true;
+ } else {
+ options.exclude_videos = false;
+ }
}
var waiting = false;
| 11 |
diff --git a/js/models/trackerlist-site.es6.js b/js/models/trackerlist-site.es6.js @@ -56,9 +56,8 @@ SiteTrackerList.prototype = $.extend({},
}
})
.sort((a, b) => {
- return a.count - b.count;
+ return b.count - a.count;
})
- .reverse();
} else {
console.debug('SiteTrackerList model: no tab');
| 2 |
diff --git a/lib/monitoring/addon/node-detail/template.hbs b/lib/monitoring/addon/node-detail/template.hbs <section class="header clearfix">
<div class="pull-left">
<h1 class="vertical-middle">
- {{t 'hostsPage.hostPage.header.title' name=model.node.displayName}}{{copy-to-clipboard clipboardText=model.node.hostname size="small"}}
+ {{t 'hostsPage.hostPage.header.title' name=model.node.hostname}}{{copy-to-clipboard clipboardText=model.node.hostname size="small"}}
</h1>
{{!-- <div class="vertical-middle">
<label class="acc-label vertical-middle p-0">{{t 'hostsPage.hostPage.hostname'}}:</label>
| 14 |
diff --git a/token-metadata/0xa47c8bf37f92aBed4A126BDA807A7b7498661acD/metadata.json b/token-metadata/0xa47c8bf37f92aBed4A126BDA807A7b7498661acD/metadata.json "symbol": "UST",
"address": "0xa47c8bf37f92aBed4A126BDA807A7b7498661acD",
"decimals": 18,
- "dharmaVerificationStatus": "UNVERIFIED"
+ "dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
| 3 |
diff --git a/backend/consul_connection.go b/backend/consul_connection.go @@ -2,6 +2,7 @@ package main
import (
"fmt"
+ "net"
"time"
"github.com/gorilla/websocket"
@@ -543,8 +544,13 @@ func (c *ConsulConnection) dereigsterConsulService(action Action) {
nodeAddress := params["nodeAddress"].(string)
serviceID := params["serviceID"].(string)
+ _, port, _ := net.SplitHostPort(c.region.Config.ConsulAddress)
+ if port == "" {
+ port = "80"
+ }
+
config := api.DefaultConfig()
- config.Address = nodeAddress + ":8500"
+ config.Address = nodeAddress + ":" + port
client, err := api.NewClient(config)
if err != nil {
@@ -579,8 +585,13 @@ func (c *ConsulConnection) dereigsterConsulServiceCheck(action Action) {
nodeAddress := params["nodeAddress"].(string)
checkID := params["checkID"].(string)
+ _, port, _ := net.SplitHostPort(c.region.Config.ConsulAddress)
+ if port == "" {
+ port = "80"
+ }
+
config := api.DefaultConfig()
- config.Address = nodeAddress + ":8500"
+ config.Address = nodeAddress + ":" + port
client, err := api.NewClient(config)
if err != nil {
| 4 |
diff --git a/package.json b/package.json "lint": "eslint .",
"list-contributors": "echo 'clone https://github.com/mgechev/github-contributors-list.git first, then run npm install' && cd ../github-contributors-list && node bin/githubcontrib --owner dherault --repo serverless-offline --sortBy contributions --showlogin true --sortOrder desc > contributors.md",
"test": "jest --verbose --silent",
- "test:cov": "jest --coverage",
+ "test:cov": "jest --coverage --silent",
"test:log": "jest --verbose"
},
"repository": {
| 0 |
diff --git a/bl-themes/alternative/php/home.php b/bl-themes/alternative/php/home.php <ul class="pagination flex-wrap justify-content-center">
<!-- Previous button -->
- <li class="page-item mr-2 <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
+ <?php if (Paginator::showPrev()): ?>
+ <li class="page-item mr-2">
<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1">◀ <?php echo $L->get('Previous'); ?></a>
</li>
+ <?php endif; ?>
<!-- Home button -->
- <?php if (Paginator::currentPage() > 1): ?>
- <li class="page-item">
- <a class="page-link" href="<?php echo Theme::siteUrl() ?>">Home</a>
+ <li class="page-item <?php if (Paginator::currentPage()==1) echo 'disabled' ?>">
+ <a class="page-link" href="<?php echo Theme::siteUrl() ?>"><?php echo $L->get('Home'); ?></a>
</li>
- <?php endif ?>
<!-- Next button -->
- <li class="page-item ml-2 <?php if (!Paginator::showNext()) echo 'disabled' ?>">
+ <?php if (Paginator::showNext()): ?>
+ <li class="page-item ml-2">
<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $L->get('Next'); ?> ►</a>
</li>
-
+ <?php endif; ?>
</ul>
</nav>
<?php endif ?>
| 2 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Integration with Canvas Learning Management System (LMS) -- an early example implementation
- Tags to questions in Content Designer and ability to create reports in Kibana.
- Integration with Genesys call center platform.
-- Client Filtering with Session Attributes (i.e., Support to allow the same set of questions to be answered differently based on a session attribute)
+- Client Filtering with Session Attributes (i.e., Support to allow the same set of questions to be answered differently based on a session attribute).
- Intelligent redaction of Personally Identifiable Information in logs with Amazon Comprehend.
- A QnABot client (e.g. a Connect contact flow) can now optionally provide a value for session attribute, `qnabotUserId`. When this session attribute is set, QnABot tracks user activity based on the provided value. If not set, QnABot continues to track user activity based on the request userId (LexV1) or sessionId (LexV2). NOTE: `qnabotUserId` value is not used when user authentication using JWTs is enabled - in this case users are securely identified and verified from the JWT.
- Support for pre and post processing AWS Lambda Hooks.
@@ -20,8 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Test tab in Content Designer to show same results as the web client when using Kendra FAQ.
- Broken link in documentation for downloading CloudFormation template.
- Integration with Slack on Amazon LexV2 bots.
-- Bug with response bots with Alexa. QnABot will set the sessionAttribute from CONNECT_NEXT_PROMPT_VARNAME to an empty string if QnABot is in a response bot in a voice channel. This will prevent QnABot from saying the next prompt in the middle of a response bot flow.
+- QnABot will set the sessionAttribute from CONNECT_NEXT_PROMPT_VARNAME to an empty string if QnABot is in a response bot in a voice channel. This will prevent QnABot from saying the next prompt in the middle of a response bot flow.
- Kendra FAQ sync where export Lambda was missing the Layer containing qnabot log.
+- Bug with response bots with Alexa where QnABot was filling in a malformed reprompt.text in the response.
### Changed
- Bot routing capability to have multiple-bot architecture (e.g., General bot routing questions to specialty bots).
| 3 |
diff --git a/packages/driver/test/cypress/integration/commands/actions/scroll_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/scroll_spec.coffee @@ -423,13 +423,13 @@ describe "src/cy/commands/actions/scroll", ->
cy.get("#scroll-to-both").scrollTo(25, { duration: 1 }).then ->
lastLog = @lastLog
- expect(lastLog.get("message")).to.eq "{duration: 1}"
+ expect(lastLog.get("message")).to.eq "25, 0, {duration: 1}"
it "logs easing options", ->
cy.get("#scroll-to-both").scrollTo(25, { easing: 'linear' }).then ->
lastLog = @lastLog
- expect(lastLog.get("message")).to.eq "{easing: linear}"
+ expect(lastLog.get("message")).to.eq "25, 0, {easing: linear}"
it "snapshots immediately", ->
cy.get("#scroll-to-both").scrollTo(25, { duration: 1 }).then ->
@@ -439,9 +439,12 @@ describe "src/cy/commands/actions/scroll", ->
expect(lastLog.get("snapshots")[0]).to.be.an("object")
it "#consoleProps", ->
- cy.get("#scroll-to-both").scrollTo(25).then ($container) ->
+ cy.get("#scroll-to-both").scrollTo(25, {duration: 1}).then ($container) ->
console = @lastLog.invoke("consoleProps")
expect(console.Command).to.eq("scrollTo")
+ expect(console.X).to.eq(25)
+ expect(console.Y).to.eq(0)
+ expect(console.Options).to.eq('{duration: 1}')
expect(console["Scrolled Element"]).to.eq $container.get(0)
context "#scrollIntoView", ->
| 0 |
diff --git a/index.d.ts b/index.d.ts @@ -38,7 +38,7 @@ declare module "hyperapp" {
tag: NonEmptyString<T>,
props: CustomPayloads<S, C> & Props<S>,
children?: MaybeVNode<S> | readonly MaybeVNode<S>[]
- ): VNode<S>
+ ): ElementVNode<S>
// `memo()` stores a view along with any given data for it.
function memo<S, D extends Indexable = Indexable>(
@@ -47,10 +47,10 @@ declare module "hyperapp" {
): VNode<S>
// `text()` creates a virtual DOM node representing plain text.
- function text<S, T = unknown>(
+ function text<T = unknown>(
// Values, aside from symbols and functions, can be handled.
value: T extends symbol | ((..._: unknown[]) => unknown) ? never : T
- ): VNode<S>
+ ): TextVNode
// ---------------------------------------------------------------------------
@@ -63,7 +63,7 @@ declare module "hyperapp" {
tag: NonEmptyString<T>,
props: CustomPayloads<S, C> & Props<S>,
children?: MaybeVNode<S> | readonly MaybeVNode<S>[]
- ): VNode<S>
+ ): ElementVNode<S>
}
// ---------------------------------------------------------------------------
@@ -180,7 +180,7 @@ declare module "hyperapp" {
type Unsubscribe = () => void
// A virtual DOM node (a.k.a. VNode) represents an actual DOM element.
- type VNode<S> = {
+ type ElementVNode<S> = {
readonly props: Props<S>
readonly children: readonly MaybeVNode<S>[]
node: null | undefined | Node
@@ -203,7 +203,7 @@ declare module "hyperapp" {
// VNode types are based on actual DOM node types:
// https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
- readonly type: 1 | 3
+ readonly type: 1
// `_VNode` is a phantom guard property which gives us a way to tell `VNode`
// objects apart from `Props` objects. Since we don't expect users to make
@@ -211,4 +211,18 @@ declare module "hyperapp" {
// is unique to TypeScript type definitions for JavaScript code.
_VNode: true
}
+
+ // Certain VNodes specifically represent Text nodes and don't rely on state.
+ type TextVNode = {
+ readonly props: {}
+ readonly children: []
+ node: null | undefined | Node
+ readonly key: undefined
+ readonly tag: string
+ readonly type: 3
+ _VNode: true
+ }
+
+ // VNodes may represent either Text or Element nodes.
+ type VNode<S> = ElementVNode<S> | TextVNode
}
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,17 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
where X.Y.Z is the semver of most recent plotly.js release.
+## [1.47.3] -- 2019-04-18
+
+### Fixed
+- Fix MathJax rendering in Firefox [#3783]
+- Fix `waterfall` hover under `hovermode: 'closest'` [#3778]
+- Fix `waterfall` `connector.line.width` updates [#3789]
+- Fix `waterfall` positioning on date axes [#3791]
+- Fix `waterfall` default connector line color [#3788]
+- Fix `hoverlabel.align` behavior for centered hover labels [#3781]
+
+
## [1.47.2] -- 2019-04-15
### Fixed
| 3 |
diff --git a/dapp/src/components/buySell/CoinRow.js b/dapp/src/components/buySell/CoinRow.js @@ -165,11 +165,9 @@ const CoinRow = ({
className="coin-info flex-grow d-flex d-md-none"
onClick={() => setShowMore(!showMore)}
>
- {active && (
- <>
<img src="/images/more-icon.svg" className="more-icon" />
+ {active && (
<div className="total">{formatCurrency(total)}</div>
- </>
)}
</div>
</div>
@@ -369,7 +367,7 @@ const CoinRow = ({
}
.more-icon {
- margin: 0 10px;
+ margin: 0 auto 0 10px;
}
}
`}</style>
| 11 |
diff --git a/packages/core/parcel-bundler/src/FSCache.js b/packages/core/parcel-bundler/src/FSCache.js @@ -2,7 +2,7 @@ const fs = require('./utils/fs');
const path = require('path');
const md5 = require('./utils/md5');
const objectHash = require('./utils/objectHash');
-const pjson = require('../package.json');
+const pkg = require('../package.json');
// These keys can affect the output, so if they differ, the cache should not match
const OPTION_KEYS = ['publicURL', 'minify', 'hmr'];
@@ -14,7 +14,7 @@ class FSCache {
this.invalidated = new Set();
this.optionsHash = objectHash(
OPTION_KEYS.reduce((p, k) => ((p[k] = options[k]), p), {
- version: pjosn.version,
+ version: pkg.version,
})
);
}
| 10 |
diff --git a/app-manager.js b/app-manager.js @@ -360,6 +360,17 @@ class AppManager extends EventTarget {
}
return null;
}
+ getPairByPhysicsId(physicsId) {
+ for (const app of this.apps) {
+ const physicsObjects = app.getPhysicsObjects();
+ for (const physicsObject of physicsObjects) {
+ if (physicsObject.physicsId === physicsId) {
+ return [app, physicsObject];
+ }
+ }
+ }
+ return null;
+ }
getOrCreateTrackedApp(instanceId) {
for (let i = 0; this.appsArray.length > i; i++) {
const app = this.appsArray.get(i, Z.Map);
| 0 |
diff --git a/app/src/pages/inside/logsPage/historyLine/historyLineItem/historyLineItemTooltip/historyLineItemTooltip.jsx b/app/src/pages/inside/logsPage/historyLine/historyLineItem/historyLineItemTooltip/historyLineItemTooltip.jsx @@ -44,9 +44,9 @@ const messages = defineMessages({
id: 'HistoryLineItemTooltip.launch',
defaultMessage: 'Launch',
},
- attributes: {
- id: 'HistoryLineItemTooltip.attributes',
- defaultMessage: 'Attributes:',
+ launchAttributes: {
+ id: 'HistoryLineItemTooltip.launchAttributes',
+ defaultMessage: 'Launch attributes:',
},
defectType: {
id: 'HistoryLineItemTooltip.defectType',
@@ -151,7 +151,7 @@ export class HistoryLineItemTooltip extends Component {
launchAttributes &&
launchAttributes.length && (
<div className={cx('attributes-block')}>
- <span className={cx('title')}>{formatMessage(messages.attributes)}</span>
+ <span className={cx('title')}>{formatMessage(messages.launchAttributes)}</span>
{launchAttributes.map((attribute) => {
return (
<span className={cx('attribute-item')}>
| 14 |
diff --git a/public/app/js/cbus-data.js b/public/app/js/cbus-data.js @@ -68,11 +68,7 @@ cbus.data.update = function(specificFeedData) {
});
};
-cbus.data.updateAudios = function() {
- let audiosContainerElem = document.getElementsByClassName("audios")[0];
-
- function makeAudioElem(episodeInfo) {
- if (!document.querySelector(".audios audio[data-id='" + episodeInfo.id + "']")) {
+cbus.data.makeAudioElem = function(episodeInfo) {
var audioElem = document.createElement("audio");
if (cbus.data.episodesOffline.indexOf(episodeInfo.id) === -1) {
audioElem.src = episodeInfo.url;
@@ -84,15 +80,24 @@ cbus.data.updateAudios = function() {
}
audioElem.dataset.id = episodeInfo.id;
audioElem.preload = "none";
- audiosContainerElem.appendChild(audioElem);
- }
+
+ return audioElem;
+};
+
+cbus.data.updateAudios = function() {
+ let audiosContainerElem = document.getElementsByClassName("audios")[0];
+
+ for (let i = 0, l = Math.min(50, cbus.data.episodes.length); i < l; i++) { // because ui.display limits to 50; any more is pointless
+ audiosContainerElem.appendChild(cbus.data.makeAudioElem(cbus.data.episodes[i]));
}
- for (let episodeInfo of cbus.data.episodes) {
- makeAudioElem(episodeInfo)
+ let episodeIDs = cbus.data.episodes.filter(function(episodeInfo) {
+ return episodeInfo.id;
+ });
+ for (let i = 0, l = cbus.data.episodesUnsubbed.length; i < l; i++) {
+ if (episodeIDs.indexOf(cbus.data.episodesUnsubbed[i].id) === -1) {
+ audiosContainerElem.appendChild(cbus.data.makeAudioElem(cbus.data.episodesUnsubbed[i]));
}
- for (let episodeInfo of cbus.data.episodesUnsubbed) {
- makeAudioElem(episodeInfo)
}
};
| 7 |
diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/login/_login.component.ts b/generators/client/templates/angular/src/main/webapp/app/shared/login/_login.component.ts @@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { Router } from '@angular/router';
import { <% if (enableTranslation) { %>JhiLanguageService, <% } %>EventManager } from 'ng-jhipster';
-import { LoginService } from '../login/login.service';
+import { LoginService } from './login.service';
import { StateStorageService } from '../auth/state-storage.service';
<%_ if (enableSocialSignIn) { _%>
import { SocialService } from '../social/social.service';
| 1 |
diff --git a/edit.js b/edit.js @@ -869,9 +869,16 @@ const addItem = async (position, quaternion) => {
scene.add(itemMesh);
itemMeshes.push(itemMesh);
};
+
+{ // XXX
addItem(new THREE.Vector3(0, 1, 0), new THREE.Quaternion());
-const timeFactor = 60 * 1000;
+ const file = new Blob(['https://google.com'], {type: 'text/plain'});
+ const u = URL.createObjectURL(file) + '/file.url';
+ world.addObject(u, null, new THREE.Vector3(), new THREE.Quaternion());
+}
+
+// const timeFactor = 60 * 1000;
let lastTimestamp = performance.now();
const startTime = Date.now();
function animate(timestamp, frame) {
| 0 |
diff --git a/README.md b/README.md @@ -50,21 +50,14 @@ db.createCollection(
});
```
-Other calls can create additional documents for the same collection.
-
### Resources
-Here are some online resources that walk you through working with MarkLogic
-using the Node.js Client API:
-
-* [MarkLogic Node.js Client API](http://developer.marklogic.com/features/node-client-api)
-* [Introduction to the Node.js Client API - Getting Started](http://docs.marklogic.com/guide/node-dev/intro#id_68052)
-
-The instructions describe:
-
-* installing the MarkLogic database and setting up an admin user
-* installing the Node.js Client API using npm
-* working through some initial examples to get familiar with the API
+* [Node.js Client API Documentation](https://docs.marklogic.com/jsdoc/index.html)
+* [Feature Overview of the Node.js Client API](http://developer.marklogic.com/features/node-client-api)
+* [The Node.js Client API in 5 Minutes](https://developer.marklogic.com/learn/node-in-5-minutes)
+* [Node.js Application Developer's Guide](http://docs.marklogic.com/guide/node-dev)
+* [MarkLogic Training for the Node.js Client API](http://www.marklogic.com/training-courses/developing-marklogic-applications-i-node-js/)
+* [MarkLogic On-Demand Courses for Node.js](https://mlu.marklogic.com/ondemand/index.xqy?q=Series%3A%22Node.js%22)
### Code Examples
@@ -73,11 +66,11 @@ in the online resources. To run the examples, follow the instructions here:
examples/1readme.txt
-### Generating Documentation
+### Generating Documentation Locally
-After installing the project dependencies (including the [gulp](http://gulpjs.com/) build system),
-you can build the reference documentation locally from the root directory of the
-marklogic package:
+After installing the project dependencies (including the [gulp](http://gulpjs.com/)
+build system), you can build the reference documentation locally from the root
+directory of the marklogic package:
gulp doc
| 0 |
diff --git a/src/parsers/GmlSeeker.hx b/src/parsers/GmlSeeker.hx @@ -145,11 +145,14 @@ class GmlSeeker {
+ "@is(?:s)?"
+ "\\b\\s*\\{(.+?)\\}"
);
- private static var jsDoc_is_line = new RegExp("^\\s*(?:" + [
- "globalvar\\s+(\\w+)", // globalvar name
- "global\\s*\\.\\s*(\\w+)\\s*=", // global.name=
- "(\\w+)\\s*=" // name=
+ private static var jsDoc_is_line = (function() {
+ var id = "[_a-zA-Z]\\w*";
+ return new RegExp("^\\s*(?:" + [
+ 'globalvar\\s+($id(?:\\s*,\\s*$id)*)', // globalvar name[, name2]
+ 'global\\s*\\.\\s*($id)\\s*=', // global.name=
+ '($id)\\s*=' // name=
].join("|") + ")");
+ })();
private static var jsDoc_template = new RegExp("^///\\s*"
+ "@template\\b\\s*"
+ "(?:\\{(.*?)\\}\\s*)?"
@@ -654,10 +657,12 @@ class GmlSeeker {
var name:String;
var type = GmlTypeDef.parse(typeStr);
if (lineMatch[1] != null) {
- name = lineMatch[1];
+ tools.RegExpTools.each(JsTools.rx(~/\w+/g), lineMatch[1], function(mt) {
+ name = mt[0];
out.globalVarTypes[name] = type;
var comp = out.comps[name];
if (comp != null) comp.setDocTag("type", typeStr);
+ });
} else if (lineMatch[2] != null) {
name = lineMatch[2];
out.globalTypes[name] = type;
| 11 |
diff --git a/packages/app/src/components/PageDeleteModal.tsx b/packages/app/src/components/PageDeleteModal.tsx @@ -212,10 +212,10 @@ const PageDeleteModal: FC = () => {
if (pages != null) {
return pages.map(page => (
- <div key={page.data._id}>
+ <p key={page.data._id} className="mb-1">
<code>{ page.data.path }</code>
{ !page.meta?.isDeletable && <span className="ml-3 text-danger"><strong>(CAN NOT TO DELETE)</strong></span> }
- </div>
+ </p>
));
}
return <></>;
| 7 |
diff --git a/src/data/event.js b/src/data/event.js @@ -30,7 +30,6 @@ export type Event = {
},
sys: {
id: string,
- type: string,
contentType: {
sys: {
id: "event"
@@ -47,7 +46,6 @@ export type Performance = {
},
sys: {
id: string,
- type: string,
contentType: {
sys: {
id: "performance"
@@ -70,7 +68,6 @@ export type FeaturedEvents = {
},
sys: {
id: string,
- type: string,
contentType: {
sys: {
id: "featuredEvents"
| 2 |
diff --git a/src/mesh/object.js b/src/mesh/object.js @@ -63,7 +63,7 @@ mesh.object = class MeshObject {
}
applyMatrix4(matrix) {
- return this.applyMatrix(matrix.elements);
+ return this.applyMatrix(matrix.elements).matrixChanged();
}
focus() {
| 3 |
diff --git a/main.js b/main.js @@ -224,16 +224,14 @@ function handleSquirrelEvent() {
* @param {*} dir
*/
function buildModulesInFolder(app, namespace, dir) {
- console.log("%%%%%", dir);
if (fs.existsSync(dir)) {
var rootDir = fs.readdirSync(dir);
-console.log(rootDir, "&&&&&&&")
+
if (rootDir && rootDir.length > 0) {
rootDir.forEach(function (file) {
var nameParts = file.split('/');
var name = camelCase(nameParts[(nameParts.length - 1)].split(".")[0]);
- console.log(name, "#######");
var filePath = dir + file;
if (fs.lstatSync(filePath).isDirectory()) {
| 2 |
diff --git a/src/components/CreateMenu.js b/src/components/CreateMenu.js @@ -55,13 +55,13 @@ class CreateMenu extends PureComponent {
const menuItemData = [
{
icon: ChatBubble,
- text: 'Request Money', // reset
- onPress: () => this.setOnModalHide(() => redirect(ROUTES.IOU_REQUEST_MONEY)), // ROUTES.NEW_CHAT
+ text: 'New Chat',
+ onPress: () => this.setOnModalHide(() => redirect(ROUTES.NEW_CHAT)),
},
{
- text: 'Split Bill', // reset
icon: Users,
- onPress: () => this.setOnModalHide(() => redirect(ROUTES.IOU_GROUP_SPLIT)), // ROUTES.NEW_GROUP
+ text: 'New Group',
+ onPress: () => this.setOnModalHide(() => redirect(ROUTES.NEW_GROUP)),
},
].map(item => ({
...item,
| 13 |
diff --git a/Apps/Sandcastle/gallery/development/Many Clipping Planes.html b/Apps/Sandcastle/gallery/development/Many Clipping Planes.html <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Demonstration of large numbers of clipping planes.">
- <meta name="cesium-sandcastle-labels" content="Beginner, Showcases">
+ <meta name="cesium-sandcastle-labels" content="Development">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
| 5 |
diff --git a/sling/core/commons/src/main/java/com/composum/sling/clientlibs/handle/FileHandle.java b/sling/core/commons/src/main/java/com/composum/sling/clientlibs/handle/FileHandle.java @@ -122,7 +122,7 @@ public class FileHandle {
return size;
}
- public InputStream getStream() throws RepositoryException {
+ public InputStream getStream() {
InputStream stream = null;
if (content.isValid()) {
ValueMap values = content.adaptTo(ValueMap.class);
@@ -131,7 +131,7 @@ public class FileHandle {
return stream;
}
- public void storeContent(InputStream stream) throws RepositoryException {
+ public void storeContent(InputStream stream) {
if (content.isValid()) {
ModifiableValueMap values = content.adaptTo(ModifiableValueMap.class);
values.put(ResourceUtil.PROP_DATA, stream);
| 6 |
diff --git a/changelog/60_UNRELEASED_2020-xx-xx.md b/changelog/60_UNRELEASED_2020-xx-xx.md -> !!! The major version bump is due to a breaking API change, please see below if you use the API
+> !!! The major version bump is due to breaking API changes, please see below if you use the API
### New feature: Link product of different sizes
- Imagine you buy for example eggs in different pack sizes
- Fixed a PHP warning when using the "Share/Integrate calendar (iCal)" button (thanks @tsia)
### API improvements/fixes
-- !!! BREAKING CHANGE: All prices are now related to the products **stock** quantity unit (instead the purchase QU)
+- Breaking changes:
+ - All prices are now related to the products **stock** quantity unit (instead the purchase QU)
+ - The product object no longer has a field `barcodes` with a comma separated barcode list, instead barcodes are now stored in a separate table/entity `product_barcodes` (use the existing "Generic entity interactions" endpoints to access them)
- Fixed (again) that CORS was broken
### General & other improvements
| 0 |
diff --git a/README.md b/README.md ### Jake -- the JavaScript build tool for Node.js
-[](https://travis-ci.org/elonmitchell/jake)
+[](https://travis-ci.org/jakejs/jake)
Documentation site at [http://jakejs.com](http://jakejs.com/)
| 13 |
diff --git a/includes/Modules/Site_Verification.php b/includes/Modules/Site_Verification.php @@ -145,7 +145,7 @@ final class Site_Verification extends Module implements Module_With_Scopes {
case 'verification':
return $this->get_siteverification_service()->webResource->listWebResource();
case 'verification-token':
- $existing_token = $this->authentication->verification_tag()->get();
+ $existing_token = $this->authentication->verification_meta()->get();
if ( ! empty( $existing_token ) ) {
return function() use ( $existing_token ) {
@@ -200,7 +200,7 @@ final class Site_Verification extends Module implements Module_With_Scopes {
return $token;
}
- $this->authentication->verification_tag()->set( $token['token'] );
+ $this->authentication->verification_meta()->set( $token['token'] );
$client = $this->get_client();
$orig_defer = $client->shouldDefer();
@@ -412,7 +412,7 @@ final class Site_Verification extends Module implements Module_With_Scopes {
$authentication->verification_file()->set( $_GET['googlesitekit_verification_token'] );
break;
case self::VERIFICATION_TYPE_META:
- $authentication->verification_tag()->set( $_GET['googlesitekit_verification_token'] );
+ $authentication->verification_meta()->set( $_GET['googlesitekit_verification_token'] );
}
$code = isset( $_GET['googlesitekit_code'] ) ? $_GET['googlesitekit_code'] : '';
@@ -437,7 +437,7 @@ final class Site_Verification extends Module implements Module_With_Scopes {
*/
private function print_site_verification_meta() {
// Get verification meta tags for all users.
- $verification_tags = $this->authentication->verification_tag()->get_all();
+ $verification_tags = $this->authentication->verification_meta()->get_all();
$allowed_html = array(
'meta' => array(
'name' => array(),
| 14 |
diff --git a/src/drawNode.js b/src/drawNode.js @@ -121,9 +121,20 @@ function _updateNode(node, x, y, width, height, shape, nodeId, attributes, optio
.attr("id", id);
title.text(nodeId);
+ if (svgElements.size() != 0) {
var bbox = svgElements.node().getBBox();
bbox.cx = bbox.x + bbox.width / 2;
bbox.cy = bbox.y + bbox.height / 2;
+ } else if (text.size() != 0) {
+ bbox = {
+ x: +text.attr('x'),
+ y: +text.attr('y'),
+ width: 0,
+ height: 0,
+ cx: +text.attr('x'),
+ cy: +text.attr('y'),
+ }
+ }
svgElements.each(function(data, index) {
var svgElement = d3.select(this);
if (svgElement.attr("cx")) {
| 9 |
diff --git a/services/test/services/errortelemetry.hooks.test.js b/services/test/services/errortelemetry.hooks.test.js -const assert = require('assert');
const errors = require('@feathersjs/errors');
const checkLogFormat = require('../../src/services/errorTelemetry/errorTelemetry.hooks').checkLogFormat;
describe('Error Telemetry Hooks', () => {
it('should fail with empty parameters', () => {
- try {
+ expect(() => {
checkLogFormat();
- } catch (err) {
- assert.ok( err instanceof errors.BadRequest );
- }
+ }).toThrow(/No hook at all/);
+ });
+
+ it('missing data should be rejected', async() => {
+ expect(() => {
+ checkLogFormat({});
+ }).toThrow(/Missing data/);
+ });
+
+ it('missing log field should be rejected', async() => {
+ expect(() => {
+ checkLogFormat({data: {}});
+ }).toThrow(/Missing log field/);
});
it('missing fields should be rejected', async () => {
const badQueries = [
- {},
- {'log':{'version': 1 }},
- {'log':{'timestamp': 1526387942 }}
+ {data: {'log':{}}},
+ {data: {'log':{'version': 1 }}},
+ {data: {'log':{'version': 1, 'timestamp': 1526387942 }}},
+ {data: {'log':{'version': 1, 'timestamp': 1526387942 }}},
+ {data: {'log':{'version': 1, 'timestamp': 1526387942 }, 'name': 'name'}},
+ {data: {'log':{'version': 1, 'timestamp': 1526387942 }, 'name': 'name', 'level': 'info'}},
];
for (let i = 0; i < badQueries.length; i++) {
- try {
+ expect(() => {
checkLogFormat(badQueries[i]);
- assert.fail('Should have failed above (value=${badQueries[i]})');
- } catch (err) {
- assert.ok( err instanceof errors.BadRequest );
- }
+ }).toThrow(/Missing required field/);
}
});
+
+ it('should pass with valid data', async() => {
+ let hook = { data : {'log':{'timestamp': 1526387942, 'version': 1, 'name': 'name', 'level': 'info', 'message': 'message' }} };
+ expect(() => {
+ checkLogFormat(hook);
+ }).not.toThrow(errors.BadRequest);
+ });
});
| 3 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead-accordion/sprk-masthead-accordion.module.ts b/angular/projects/spark-angular/src/lib/components/sprk-masthead/sprk-masthead-accordion/sprk-masthead-accordion.module.ts @@ -2,7 +2,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { SprkIconModule } from '../../sprk-icon/sprk-icon.module';
-import { SprkMastheadAccordionComponent } from './sprk-masthead-accordion.component';
+import {
+ SprkMastheadAccordionComponent
+} from './sprk-masthead-accordion.component';
@NgModule({
imports: [CommonModule, RouterModule, SprkIconModule],
| 3 |
diff --git a/app/views/admin/organization_users/_form.html.erb b/app/views/admin/organization_users/_form.html.erb </div>
<div class="FormAccount-rowData">
<div class="Toggler">
- <%= f.check_box :mfa, id: "mfa", value: "1", checked: mfa_enabled %>
+ <%= f.check_box :mfa, id: "mfa", checked: mfa_enabled %>
<%= label_tag(:mfa, '') %>
</div>
<div class="FormAccount-rowInfo u-lspace-23">
| 2 |
diff --git a/src/service-broker.js b/src/service-broker.js @@ -996,7 +996,7 @@ class ServiceBroker {
endpoint.failure(err);
}
- if (err instanceof E.RequestTimeoutError) {
+ if (err.retryable) {
// Retry request
if (ctx.retryCount-- > 0) {
this.logger.warn(`Action '${actionName}' timed out on '${nodeID}'!`);
| 9 |
diff --git a/packages/build/tests/plugins/run/fixtures/ci/plugin.js b/packages/build/tests/plugins/run/fixtures/ci/plugin.js @@ -2,8 +2,10 @@ module.exports = {
name: 'netlify-plugin-test',
init() {
console.log('a'.repeat(1e3))
+ console.error('b'.repeat(1e3))
},
build() {
- console.log('b'.repeat(1e3))
+ console.log('c'.repeat(1e3))
+ console.error('d'.repeat(1e3))
},
}
| 7 |
diff --git a/sirepo/package_data/static/js/landing-page.js b/sirepo/package_data/static/js/landing-page.js @@ -504,10 +504,9 @@ app.directive('modeSelector', function(utilities) {
link: function($scope) {
},
controller: function($scope, $element) {
- $scope.currentMode = $scope.modeMap.find(function(mode) {
+ $scope.currentMode = $.grep($scope.modeMap, function(mode) {
return mode.default;
- });
-
+ })[0];
$scope.setMode = function(m) {
$scope.currentMode = m;
};
| 14 |
diff --git a/.github/workflows/workflow-validation.yml b/.github/workflows/workflow-validation.yml @@ -4,10 +4,6 @@ on:
pull_request:
paths:
- '.github/**.yml'
- types:
- - opened
- - reopened
- - synchronize
concurrency:
group: workflow-validation-${{ github.ref }}
| 2 |
diff --git a/package/ParamPoly.js b/package/ParamPoly.js @@ -6,6 +6,7 @@ function ParamPoly(urlvar){
});
return vars;
}
+ let urlvar = "passed"
// when document ready
// get url variable
@@ -14,6 +15,9 @@ function ParamPoly(urlvar){
Store.prototype.findMarkTypes_raw = Store.prototype.findMarkTypes
Store.prototype.findMarkbyIds_raw = Store.prototype.findMarkbyIds
Store.prototype.findMark = function (ids, slide){
+ if (!urlvar in getUrlVars()){
+ return x
+ } else {
// expecting feature collection so far
let test_data = "%5B%7B%22type%22%3A%22Feature%22%2C%22properties%22%3A%7B%22style%22%3A%7B%22color%22%3A%22%237cfc00%22%2C%22lineCap%22%3A%22round%22%2C%22lineJoin%22%3A%22round%22%2C%22lineWidth%22%3A3%7D%7D%2C%22geometry%22%3A%7B%22type%22%3A%22Polygon%22%2C%22coordinates%22%3A%5B%5B%5B0%2C1.333075238564%5D%2C%5B0.9211833251318%2C1.333075238564%5D%2C%5B0.9211833251318%2C1.4056976389659%5D%2C%5B0.84856092473%2C1.4056976389659%5D%2C%5B0%2C1.333075238564%5D%5D%5D%7D%7D%2C%7B%22type%22%3A%22Feature%22%2C%22properties%22%3A%7B%22style%22%3A%7B%22color%22%3A%22%237cfc00%22%2C%22lineCap%22%3A%22round%22%2C%22lineJoin%22%3A%22round%22%2C%22lineWidth%22%3A3%7D%7D%2C%22geometry%22%3A%7B%22type%22%3A%22Polygon%22%2C%22coordinates%22%3A%5B%5B%5B0.0819138121014%2C1.2558071323124%5D%2C%5B0.987611451067%2C1.2558071323124%5D%2C%5B0.987611451067%2C1.9173119035902%5D%2C%5B0.0819138121014%2C1.9173119035902%5D%2C%5B0.0819138121014%2C1.2558071323124%5D%5D%5D%7D%7D%5D"
//let image_data = JSON.parse(decodeURI(getUrlVars(urlvar)))
@@ -24,17 +28,25 @@ function ParamPoly(urlvar){
return x
})
}
+ }
Store.prototype.findMarkTypes = function(slide, name){
+ if (!urlvar in getUrlVars()){
+ return x
+ } else {
return this.findMarkTypes_raw(slide, name).then(x=>{
let urltype = { "image" : { "slide" : "NO" , "slidename" : "NO"} , "analysis" : { "source" : "url" , "execution_id" : "URLPARAM"}}
x.push(urltype)
return x
})
}
+ }
Store.prototype.findMarkbyIds = function(ids, slide){
return this.findMarkbyIds_raw(ids, slide).then(x=>{
+ if (!urlvar in getUrlVars()){
+ return x
+ } else {
if ("URLPARAM" in ids){
// expecting feature collection so far
let test_data = "%5B%7B%22type%22%3A%22Feature%22%2C%22properties%22%3A%7B%22style%22%3A%7B%22color%22%3A%22%237cfc00%22%2C%22lineCap%22%3A%22round%22%2C%22lineJoin%22%3A%22round%22%2C%22lineWidth%22%3A3%7D%7D%2C%22geometry%22%3A%7B%22type%22%3A%22Polygon%22%2C%22coordinates%22%3A%5B%5B%5B0%2C1.333075238564%5D%2C%5B0.9211833251318%2C1.333075238564%5D%2C%5B0.9211833251318%2C1.4056976389659%5D%2C%5B0.84856092473%2C1.4056976389659%5D%2C%5B0%2C1.333075238564%5D%5D%5D%7D%7D%2C%7B%22type%22%3A%22Feature%22%2C%22properties%22%3A%7B%22style%22%3A%7B%22color%22%3A%22%237cfc00%22%2C%22lineCap%22%3A%22round%22%2C%22lineJoin%22%3A%22round%22%2C%22lineWidth%22%3A3%7D%7D%2C%22geometry%22%3A%7B%22type%22%3A%22Polygon%22%2C%22coordinates%22%3A%5B%5B%5B0.0819138121014%2C1.2558071323124%5D%2C%5B0.987611451067%2C1.2558071323124%5D%2C%5B0.987611451067%2C1.9173119035902%5D%2C%5B0.0819138121014%2C1.9173119035902%5D%2C%5B0.0819138121014%2C1.2558071323124%5D%5D%5D%7D%7D%5D"
@@ -44,6 +56,7 @@ function ParamPoly(urlvar){
x.push(dummy_mark)
}
return x
+ }
})
}
| 9 |
diff --git a/webdriver-ts/src/common.ts b/webdriver-ts/src/common.ts @@ -183,7 +183,7 @@ export async function loadFrameworkVersionInformation(matchPredicate: IMatchPred
let directories = fs.readdirSync(path.resolve(frameworksPath, keyedType));
for (let directory of directories) {
- let pathInFrameworksDir = path.join(keyedType, directory);
+ let pathInFrameworksDir = keyedType + "/" + directory;
if (matchPredicate(pathInFrameworksDir)) {
let fi = loadFrameworkInfo(pathInFrameworksDir);
if (fi!=null) results.push(fi);
| 4 |
diff --git a/content/api/plugins/configuration-api.md b/content/api/plugins/configuration-api.md @@ -121,13 +121,7 @@ in the **Settings** tab of the Test Runner.
### Switch between multiple configuration files
-<Alert type="warning">
-
-This section is only applicatble to the legacy `cypress.json` configuration.
-Learn more about the preferred
-[Cypress configuration](/guides/references/configuration).
-
-</Alert>
+::include{file=partials/warning-plugins-file.md}
This means you can do things like store multiple configuration files and switch
between them like:
| 14 |
diff --git a/docs/markdown/reference/validation/README.md b/docs/markdown/reference/validation/README.md @@ -162,7 +162,7 @@ Same example as above just modified for vee-validate:
// form submit logic
},
validateState(ref) {
- if (this.veeFields[ref] && this.veeFields[ref].dirty) {
+ if (this.veeFields[ref] && (this.veeFields[ref].dirty || this.veeFields[ref].validated)) {
return !this.errors.has(ref)
}
return null
| 9 |
diff --git a/assets/js/modules/subscribe-with-google/components/settings/SettingsForm.js b/assets/js/modules/subscribe-with-google/components/settings/SettingsForm.js @@ -37,7 +37,7 @@ export default function SettingsForm() {
<PublicationIDInput />
</div>
- <div className="googlesitekit-setup-module__inputs googlesitekit-setup-module__inputs googlesitekit-setup-module__inputs--multiline">
+ <div className="googlesitekit-setup-module__inputs googlesitekit-setup-module__inputs--multiline">
<ProductsInput />
</div>
</Fragment>
| 2 |
diff --git a/README.md b/README.md @@ -30,32 +30,32 @@ Latest version which is compatible to Struts 2.3.x is version [3.7.1].
<dependency>
<groupId>com.jgeppert.struts2.jquery</groupId>
<artifactId>struts2-jquery-plugin</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.jgeppert.struts2.jquery</groupId>
<artifactId>struts2-jquery-grid-plugin</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.jgeppert.struts2.jquery</groupId>
<artifactId>struts2-jquery-datatables-plugin</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.jgeppert.struts2.jquery</groupId>
<artifactId>struts2-jquery-richtext-plugin</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.jgeppert.struts2.jquery</groupId>
<artifactId>struts2-jquery-tree-plugin</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.jgeppert.struts2.jquery</groupId>
<artifactId>struts2-jquery-mobile-plugin</artifactId>
- <version>4.0.1</version>
+ <version>4.0.2</version>
</dependency>
...
</dependencies>
| 12 |
diff --git a/index.d.ts b/index.d.ts @@ -313,6 +313,8 @@ declare namespace R {
defaultTo<T, U>(a: T, b: U): T | U
defaultTo<T>(a: T): <U>(b: U) => T | U
+ debug(...input: any[]): void
+
divide(a: number, b: number): number
divide(a: number): (b: number) => number
| 0 |
diff --git a/src/utils/gaa.js b/src/utils/gaa.js @@ -970,10 +970,8 @@ export class GaaSignInWithGoogleButton {
'theme': 'outline',
'text': 'continue_with',
'logo_alignment': 'center',
- 'width': self.document.getElementById(SIGN_IN_WITH_GOOGLE_BUTTON_ID)
- .offsetWidth,
- 'height': self.document.getElementById(SIGN_IN_WITH_GOOGLE_BUTTON_ID)
- .offsetHeight,
+ 'width': buttonEl.offsetWidth,
+ 'height': buttonEl.offsetHeight,
}
);
| 10 |
diff --git a/config/environments/production.rb b/config/environments/production.rb @@ -80,13 +80,17 @@ Hackweek::Application.configure do
# Use lograge to show the logs in one line
config.lograge.enabled = true
+ config.lograge.custom_payload do |controller|
+ {
+ user: controller.current_user.try(:name)
+ }
+ end
config.lograge.custom_options = lambda do |event|
exceptions = ['controller', 'action', 'format', 'id']
{
params: event.payload[:params].except(*exceptions),
- host: event.payload[:headers].env['REMOTE_ADDR'],
time: event.time,
- user: User.current.try(:login)
+ user: event.payload[:user]
}
end
end
| 1 |
diff --git a/articles/quickstart/spa/_includes/_getting_started.md b/articles/quickstart/spa/_includes/_getting_started.md This guide walks you through setting up authentication and authorization in your ${library} apps with Auth0.
+If you are new to Auth0 please check our [Auth0 Overview](https://auth0.com/docs/overview).
+
+If you want to have a complete picture of how to integrate Authentication and Authorization for Single Page Application, you can read about it [here](https://auth0.com/docs/architecture-scenarios/application/spa-api).
+
+If you are interested in a deeper undertanding of the OAuth flows that are used by Single Page Application, read about the [Implicit Grant Flow)(https://auth0.com/docs/api-auth/tutorials/implicit-grant)
+
<%= include('../../../_includes/_new_app') %>
<%= include('../../../_includes/_callback_url') %>
| 0 |
diff --git a/apps/timecal/timecal.app.js b/apps/timecal/timecal.app.js @@ -67,10 +67,10 @@ class TimeCalClock{
/*
* Run forest run
**/
- draw(){
+ draw(force){
this.drawTime();
- if (this.TZOffset===undefined || this.TZOffset!==d.getTimezoneOffset())
+ if (force || this.TZOffset===undefined || this.TZOffset!==d.getTimezoneOffset())
this.drawDateAndCal();
}
@@ -83,8 +83,6 @@ class TimeCalClock{
d=this.date ? this.date : new Date();
const Y=Bangle.appRect.y+this.DATE_FONT_SIZE()+10;
- d=d?d :new Date();
-
g.setFontAlign(0, -1).setFont("Vector", this.TIME_FONT_SIZE()).setColor(g.theme.fg)
.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7)
.drawString(("0" + require("locale").time(d, 1)).slice(-5), this.centerX, Y, true);
@@ -265,3 +263,10 @@ class TimeCalClock{
}
timeCalClock = new TimeCalClock(); timeCalClock.draw();
+
+//hook on settime to redraw immediatly
+var _setTime = setTime;
+var setTime = function(t) {
+ _setTime(t);
+ timeCalClock.draw(true);
+};
\ No newline at end of file
| 11 |
diff --git a/src/main.js b/src/main.js @@ -41,6 +41,11 @@ const exportedUtils = Object.assign(publicUtils, {
* accessible from the left sidebar. To learn how Apify SDK works, we suggest following
* the [Getting Started](/docs/guides/getting-started) tutorial.
*
+ * **Important:**
+ * > The following functions: `addWebhook`, `call`, `callTask` and Apify Client available under `client` are features of the
+ * > [Apify platform](/docs/guides/apify-platform) and require your scripts to be authenticated.
+ * > See the [authentication guide](/docs/guides/apify-platform#logging-into-apify-platform-from-apify-sdk) for instructions.
+ *
* @module Apify
*/
export {
| 7 |
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml @@ -41,6 +41,12 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
+ if: github.event_name != 'pull_request_target'
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ ref: ${{ env.GITHUB_HEAD_REF }}
+ if: github.event_name == 'pull_request_target'
- uses: camptocamp/initialise-gopass-summon-action@v2
with:
| 4 |
diff --git a/modules/plugins/validator.js b/modules/plugins/validator.js @@ -4,6 +4,7 @@ import { RULE_TYPE, KEYFRAME_TYPE } from '../utils/styleTypes'
import isObject from '../utils/isObject'
import isNestedSelector from '../utils/isNestedSelector'
+import isMediaQuery from '../utils/isMediaQuery'
const percentageRegex = /from|to|%/
@@ -18,7 +19,7 @@ function validateStyleObject(
const value = style[property]
if (isObject(value)) {
- if (isNestedSelector(property)) {
+ if (isNestedSelector(property) || isMediaQuery(property)) {
validateStyleObject(value, logInvalid, deleteInvalid)
} else {
if (deleteInvalid) {
| 1 |
diff --git a/item-spec/item-spec.md b/item-spec/item-spec.md @@ -34,7 +34,7 @@ inherited from GeoJSON.
| id | string | **REQUIRED.** Provider identifier. As most geospatial assets are already defined by some identification scheme by the data provider it is recommended to simply use that ID. Data providers are advised to include sufficient information to make their IDs globally unique, including things like unique satellite IDs. |
| type | string | **REQUIRED.** Type of the GeoJSON Object. MUST be set to `Feature`. |
| geometry | [GeoJSON Geometry Object](https://tools.ietf.org/html/rfc7946#section-3.1) | **REQUIRED.** Defines the full footprint of the asset represented by this item, formatted according to [RFC 7946, section 3.1](https://tools.ietf.org/html/rfc7946#section-3.1). The footprint should be the default GeoJSON geometry, though additional geometries can be included. Coordinates are specified in Longitude/Latitude or Longitude/Latitude/Elevation based on [WGS 84](http://www.opengis.net/def/crs/OGC/1.3/CRS84). |
-| bbox | \[number] | **REQUIRED.** Bounding Box of the asset represented by this item, formatted according to [RFC 7946, section 5](https://tools.ietf.org/html/rfc7946#section-5). |
+| bbox | \[number] | **REQUIRED\*.** Bounding Box of the asset represented by this item, formatted according to [RFC 7946, section 5](https://tools.ietf.org/html/rfc7946#section-5). \* Note that GeoJSON allows null geometries - if a null geometry is used then the bbox is not required. |
| properties | [Properties Object](#properties-object) | **REQUIRED.** A dictionary of additional metadata for the item. |
| links | \[[Link Object](#link-object)] | **REQUIRED.** List of link objects to resources and related URLs. A link with the `rel` set to `self` is strongly recommended. |
| assets | Map<string, [Asset Object](#asset-object)> | **REQUIRED.** Dictionary of asset objects that can be downloaded, each with a unique key. |
| 3 |
diff --git a/app/components/build/EmailPrompt.js b/app/components/build/EmailPrompt.js @@ -88,15 +88,17 @@ class EmailPrompt extends React.Component {
};
render() {
- const { email = "[email protected]" } = this.props.build.createdBy;
+ const { email } = this.props.build.createdBy;
const notice = this.props.viewer.notice;
- // if the build has no email (this shouldn't happen???)
+ // There won't be an email address if this build was created by a
+ // registered user or if this build just has no owner (perhaps it was
+ // created by Buildkite)
if (!email) {
return null;
}
- // if the user has seen the notice and has been dismissed
+ // If the user has seen the notice and has been dismissed
if (notice && notice.dismissedAt) {
return null;
}
| 4 |
diff --git a/includes/Modules/Search_Console.php b/includes/Modules/Search_Console.php @@ -478,18 +478,7 @@ final class Search_Console extends Module implements Module_With_Screen, Module_
case 'page-analytics':
case 'search-keywords':
case 'index-status':
- $response_data = $response->getRows();
- usort(
- $response_data,
- function ( \Google_Service_Webmasters_ApiDataRow $a, \Google_Service_Webmasters_ApiDataRow $b ) {
- if ( $a->getImpressions() === $b->getImpressions() ) {
- return 0;
- }
-
- return ( $a->getImpressions() < $b->getImpressions() ) ? 1 : -1;
- }
- );
- return array_slice( $response_data, 0, 10 );
+ return $response->getRows();
}
}
| 2 |
diff --git a/src/components/MTableHeader/index.js b/src/components/MTableHeader/index.js @@ -142,7 +142,7 @@ export function MTableHeader(props) {
onClick={() => {
const orderDirection =
columnDef.tableData.id !== props.orderBy
- ? 'asc'
+ ? props.orderDirection || 'asc' // use the current sort order when switching columns if defined
: props.orderDirection === 'asc'
? 'desc'
: props.orderDirection === 'desc' && props.thirdSortClick
| 4 |
diff --git a/Apps/Sandcastle/gallery/Custom Shaders 3D Tiles.html b/Apps/Sandcastle/gallery/Custom Shaders 3D Tiles.html }),
});
viewer.scene.primitives.add(tileset);
- viewer.zoomTo(tileset);
+ const initialPosition = Cesium.Cartesian3.fromDegrees(
+ -74.01881302800248,
+ 40.69114333714821,
+ 753
+ );
+ const initialOrientation = new Cesium.HeadingPitchRoll.fromDegrees(
+ 21.27879878293835,
+ -21.34390550872461,
+ 0.0716951918898415
+ );
+ viewer.scene.camera.setView({
+ destination: initialPosition,
+ orientation: initialOrientation,
+ endTransform: Cesium.Matrix4.IDENTITY,
+ });
//Sandcastle_End
Sandcastle.finishedLoading();
| 7 |
diff --git a/docs/json/animation.json b/docs/json/animation.json "ddd": {
"title": "3-D",
"description": "Composition has 3-D layers",
- "enum": [0, 1],
- "type": "number"
+ "type": "number",
+ "oneOf": [
+ {
+ "$ref": "#/helpers/boolean"
+ }
+ ],
+ "default": 0
},
"h": {
"title": "Height",
| 12 |
diff --git a/components/Select.jsx b/components/Select.jsx import styles from 'styles/Select.module.css'
import { useTranslate } from 'hooks/useTranslate'
+import { useLocale } from 'hooks/useLocale'
-export default function Select ({ data, onChange }) {
- const translate = useTranslate()
- const normalizedDate = (date) => {
- let dateFormat = ''
- for (let i = 0; i < date.length; i++) {
- dateFormat = dateFormat + date[i]
- if (i === 3) {
- dateFormat = dateFormat + '/'
- } if (i === 5) {
- dateFormat = dateFormat + '/'
- }
+const REPORT_DATE_REGEXP = /(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})/
+
+const toDate = (value) => {
+ const { year, month, day } = value.match(REPORT_DATE_REGEXP).groups
+ return new Date(parseInt(year), parseInt(month) - 1, parseInt(day))
}
- return dateFormat
+
+const formatDate = ({ locale, value }) => {
+ const date = toDate(value)
+ return new Intl.DateTimeFormat(locale, {
+ year: 'numeric', month: '2-digit', day: '2-digit'
+ }).format(date)
}
+export default function Select ({ data, onChange }) {
+ const { locale } = useLocale()
+ const translate = useTranslate()
+
return (
<>
<section className={styles.sectionSelect}>
@@ -30,7 +34,7 @@ export default function Select ({ data, onChange }) {
{data &&
data.map((date) => (
<option key={date} value={date}>
- {normalizedDate(date)}
+ {formatDate({ locale, value: date })}
</option>
))}
</select>
| 7 |
diff --git a/assets/js/components/settings/SettingsActiveModule/Header.test.js b/assets/js/components/settings/SettingsActiveModule/Header.test.js @@ -37,8 +37,6 @@ import {
provideModules,
fireEvent,
} from '../../../../../tests/js/test-utils';
-import { MODULES_ANALYTICS } from '../../../modules/analytics/datastore/constants';
-import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
describe( 'Header', () => {
const history = createHashHistory();
@@ -87,7 +85,6 @@ describe( 'Header', () => {
connected: false,
},
] );
- registry.dispatch( MODULES_ANALYTICS ).receiveGetSettings( {} );
} );
it( 'should render "Connected" for a connected module', () => {
@@ -118,25 +115,6 @@ describe( 'Header', () => {
expect( button ).toHaveTextContent( 'Connect Google Analytics 4' );
} );
- it( 'should not render the button to connect GA4 if Analytics is connected without access to it but GA4 is not', () => {
- registry
- .dispatch( MODULES_ANALYTICS )
- .receiveGetSettings( { ownerID: 100 } );
- registry
- .dispatch( CORE_MODULES )
- .receiveCheckModuleAccess(
- { access: false },
- { slug: 'analytics' }
- );
- const { queryByRole } = render( <Header slug="analytics" />, {
- registry,
- } );
-
- expect(
- queryByRole( 'button', { name: /connect google analytics 4/i } )
- ).not.toBeInTheDocument();
- } );
-
it( 'should open the tab when ENTER key is pressed', () => {
history.push( '/connected-services' );
| 2 |
diff --git a/src/screens/editor/children/styles.ts b/src/screens/editor/children/styles.ts @@ -40,7 +40,7 @@ export default EStyleSheet.create({
inputWrapper: { flexDirection: 'row', alignItems: 'center' },
contentLabel: { color: '$iconColor', marginTop:4, textAlign:'left' },
weightInput: {width:80},
- weightFormInput: { textAlign: 'center', color: '$primaryBlack' },
+ weightFormInput: { flex:1, color: '$primaryBlack' },
weightFormInputWrapper: { marginTop: 8 },
usernameInput: { flex:1, color: '$primaryBlack', marginLeft: 16 },
usernameFormInputWrapper: { marginTop: 8 },
| 7 |
diff --git a/app/views/turkerIdExists.scala.html b/app/views/turkerIdExists.scala.html <p>
The reason is that you have already created an account on our website using your
worker id. If you'd like to work on this HIT, please contact us at
- <a href="mailto:sidewalk@@umiacs.umd.edu">sidewalk@@umiacs.umd.edu</a>. Alternatively, you could continue
+ <a href="mailto:sidewalk@@cs.uw.edu">sidewalk@@cs.uw.edu</a>. Alternatively, you could continue
using your account on our website: <a href='@routes.AuditController.audit()'>projectsidewalk.io</a> and
keep mapping! :)
</p>
| 3 |
diff --git a/src/components/date/date.component.js b/src/components/date/date.component.js @@ -67,12 +67,7 @@ const Date = Input(InputIcon(InputLabel(InputValidation(class Date extends React
/**
* The current date
*/
- value: PropTypes.string,
-
- /*
- * The today date
- */
- todayButton: PropTypes.string
+ value: PropTypes.string
};
static defaultProps = {
@@ -459,7 +454,6 @@ const Date = Input(InputIcon(InputLabel(InputValidation(class Date extends React
* @return {Object}
*/
get datePickerProps() {
- const { todayButton } = this.props;
let date = this.state.datePickerValue;
if (!date) {
@@ -488,8 +482,7 @@ const Date = Input(InputIcon(InputLabel(InputValidation(class Date extends React
navbarElement: <Navbar />,
onDayClick: this.handleDateSelect,
ref: (input) => { this.datepicker = input; },
- selectedDays: [this.state.datePickerValue],
- todayButton
+ selectedDays: [this.state.datePickerValue]
};
}
| 13 |
diff --git a/tests/phpunit/integration/Core/Util/Migration_n_e_x_tTest.php b/tests/phpunit/integration/Core/Util/Migration_n_e_x_tTest.php @@ -17,6 +17,8 @@ use Google\Site_Kit\Core\Util\Migration_n_e_x_t;
use Google\Site_Kit\Core\Util\Tracking;
use Google\Site_Kit\Tests\TestCase;
+// phpcs:disable PEAR.NamingConventions.ValidClassName.Invalid
+
class Migration_n_e_x_tTest extends TestCase {
/**
* @var Context
| 8 |
diff --git a/src/components/TextInputWithFocusStyles.js b/src/components/TextInputWithFocusStyles.js @@ -36,7 +36,7 @@ class TextInputWithFocusStyles extends React.Component {
super(props);
this.state = {
- style: this.props.styleFocusOut,
+ isFocused: false,
};
}
@@ -48,15 +48,19 @@ class TextInputWithFocusStyles extends React.Component {
...finalStyles,
...s
}), {});
- const stateStyles = !_.isArray(this.state.style)
- ? this.state.style
- : _.reduce(this.state.style, (finalStyles, s) => ({
+ let focusedStyle = this.state.isFocused
+ ? this.props.styleFocusIn
+ : this.props.styleFocusOut;
+
+ focusedStyle = !_.isArray(focusedStyle)
+ ? focusedStyle
+ : _.reduce(focusedStyle, (finalStyles, s) => ({
...finalStyles,
...s
}), {});
// Merge the two styles together
- const mergedStyles = _.extend(propStyles, stateStyles);
+ const mergedStyles = _.extend(propStyles, focusedStyle);
// Omit the props that are used in this intermediary component and only pass down the props that
// are necessary
@@ -72,11 +76,11 @@ class TextInputWithFocusStyles extends React.Component {
ref={this.props.forwardedRef}
style={mergedStyles}
onFocus={() => {
- this.setState({style: this.props.styleFocusIn});
+ this.setState({isFocused: true});
this.props.onFocus();
}}
onBlur={() => {
- this.setState({style: this.props.styleFocusOut});
+ this.setState({isFocused: false});
this.props.onBlur();
}}
/* eslint-disable-next-line react/jsx-props-no-spreading */
| 4 |
diff --git a/buildout.cfg b/buildout.cfg @@ -119,7 +119,7 @@ recipe = collective.recipe.cmd
on_install = true
on_update = true
cmds =
- curl -o ontology.json https://s3-us-west-1.amazonaws.com/encoded-build/ontology/ontology-2017-02-04.json
+ curl -o ontology.json https://s3-us-west-1.amazonaws.com/encoded-build/ontology/ontology-2017-02-07.json
[aws-ip-ranges]
recipe = collective.recipe.cmd
| 3 |
diff --git a/src/structs/ArticleMessage.js b/src/structs/ArticleMessage.js @@ -31,6 +31,11 @@ class ArticleMessage {
}
}
+ getChannel () {
+ const channel = this.bot.channels.cache.get(this.feed.channel)
+ return channel
+ }
+
determineFormat () {
const { feed, parsedArticle, filteredFormats } = this
let text = feed.text || this.config.feeds.defaultText
@@ -165,8 +170,8 @@ class ArticleMessage {
}
async getWebhook () {
- const { feed, bot } = this
- const channel = bot.channels.cache.get(feed.channel)
+ const { feed } = this
+ const channel = this.getChannel()
if (!channel) {
return
}
@@ -264,7 +269,7 @@ class ArticleMessage {
if (webhook) {
return webhook
}
- const channel = this.bot.channels.cache.get(this.feed.channel)
+ const channel = this.getChannel()
return channel
}
| 4 |
diff --git a/metaverse_modules/barrier/index.js b/metaverse_modules/barrier/index.js @@ -110,6 +110,8 @@ export default () => {
// const {CapsuleGeometry} = useGeometries();
const {WebaverseShaderMaterial} = useMaterials();
+ app.name = 'barrier';
+
const _getSingleUse = () => app.getComponent('singleUse') ?? false;
const barrierMeshes = [];
| 0 |
diff --git a/src/admin/__tests__/describeGroups.spec.js b/src/admin/__tests__/describeGroups.spec.js @@ -13,7 +13,7 @@ const {
} = require('testHelpers')
describe('Admin', () => {
- let admin, topicName, groupIds, cluster, consumers, producer
+ let admin, topicName, groupIds, consumers, producer
beforeAll(async () => {
topicName = `test-topic-${secureRandom()}`
@@ -23,31 +23,37 @@ describe('Admin', () => {
`consumer-group-id-${secureRandom()}`,
]
- cluster = createCluster()
- admin = createAdmin({ cluster: cluster, logger: newLogger() })
+ admin = createAdmin({
+ cluster: createCluster({ metadataMaxAge: 50 }),
+ logger: newLogger(),
+ })
+
consumers = groupIds.map(groupId =>
createConsumer({
- cluster,
+ cluster: createCluster({ metadataMaxAge: 50 }),
groupId,
- maxWaitTimeInMs: 100,
+ heartbeatInterval: 100,
+ maxWaitTimeInMs: 500,
+ maxBytesPerPartition: 180,
+ rebalanceTimeout: 1000,
logger: newLogger(),
})
)
producer = createProducer({
- cluster,
+ cluster: createCluster({ metadataMaxAge: 50 }),
createPartitioner: createModPartitioner,
logger: newLogger(),
})
+ await createTopic({ topic: topicName })
+
await Promise.all([
admin.connect(),
producer.connect(),
- ...[consumers.map(consumer => consumer.connect())],
+ ...consumers.map(consumer => consumer.connect()),
])
- await createTopic({ topic: topicName })
-
const messagesConsumed = []
await Promise.all(
consumers.map(async consumer => {
| 7 |
diff --git a/src/components/Message/Message.Bubble.tsx b/src/components/Message/Message.Bubble.tsx @@ -4,7 +4,7 @@ import { noop } from '../../utilities/other'
import { isNativeSpanType } from '@helpscout/react-utils/dist/isType'
import compose from '@helpscout/react-utils/dist/compose'
import Heading from '../Heading'
-import LoadingDots from '../LoadingDots'
+import TypingDots from '../TypingDots'
import Icon from '../Icon'
import Text from '../Text'
import styled from '../styled'
@@ -36,7 +36,10 @@ const MessageBubbleTitle = styled(Heading)(TitleCSS)
const MessageBubbleTyping = styled('div')(TypingCSS)
// convertLinksToHTML will escape for output as HTML
-const enhanceBody = compose(newlineToHTML, convertLinksToHTML)
+const enhanceBody = compose(
+ newlineToHTML,
+ convertLinksToHTML
+)
export const Bubble = (props: Props, context: Context) => {
const {
@@ -128,7 +131,7 @@ export const Bubble = (props: Props, context: Context) => {
const innerContentMarkup = typing ? (
<MessageBubbleTyping className="c-MessageBubble__typing">
- <LoadingDots />
+ <TypingDots />
</MessageBubbleTyping>
) : (
bodyMarkup
| 14 |
diff --git a/src/configureStore.js b/src/configureStore.js @@ -15,11 +15,15 @@ function configureStoreProd(initialState = {}, history) {
const enhancers = [applyMiddleware(...middlewares)];
- return createStore(
+ const store = createStore(
createReducer(),
initialState,
compose(...enhancers),
);
+
+ store.asyncReducers = {};
+
+ return store;
}
function configureStoreDev(initialState = {}, history) {
| 1 |
diff --git a/test/jasmine/tests/gl2d_click_test.js b/test/jasmine/tests/gl2d_click_test.js @@ -738,4 +738,61 @@ describe('@noCI @gl Test gl2d lasso/select:', function() {
.catch(failTest)
.then(done);
});
+
+ it('should work on gl text charts', function(done) {
+ var fig = Lib.extendDeep({}, require('@mocks/gl2d_text_chart_basic.json'));
+ fig.layout.dragmode = 'select';
+ fig.layout.margin = {t: 0, b: 0, l: 0, r: 0};
+ fig.layout.height = 500;
+ fig.layout.width = 500;
+ gd = createGraphDiv();
+
+ function _assertGlTextOpts(msg, exp) {
+ var scene = gd.calcdata[0][0].t._scene;
+ scene.glText.forEach(function(opts, i) {
+ expect(Array.from(opts.color))
+ .toBeCloseToArray(exp.rgba[i], 2, 'item ' + i + ' - ' + msg);
+ });
+ }
+
+ Plotly.plot(gd, fig)
+ .then(delay(100))
+ .then(function() {
+ _assertGlTextOpts('base', {
+ rgba: [
+ [68, 68, 68, 255],
+ [68, 68, 68, 255],
+ [68, 68, 68, 255]
+ ]
+ });
+ })
+ .then(function() { return select([[100, 100], [250, 250]]); })
+ .then(function(eventData) {
+ assertEventData(eventData, {
+ points: [{x: 1, y: 2}]
+ });
+ _assertGlTextOpts('after selection', {
+ rgba: [
+ [
+ 68, 68, 68, 51,
+ 68, 68, 68, 51,
+ 68, 68, 68, 51,
+ ],
+ [
+ 68, 68, 68, 51,
+ // this is the selected pt!
+ 68, 68, 68, 255,
+ 68, 68, 68, 51
+ ],
+ [
+ 68, 68, 68, 51,
+ 68, 68, 68, 51,
+ 68, 68, 68, 51
+ ]
+ ]
+ });
+ })
+ .catch(failTest)
+ .then(done);
+ });
});
| 0 |
diff --git a/OurUmbraco.Site/web.vsts.config b/OurUmbraco.Site/web.vsts.config <match url="documentation/products/*" />
<action type="Redirect" url="/documentation/Add-ons/{R:1}" redirectType="Permanent" appendQueryString="true" />
</rule>
- <!-- Redirect v9+ configuration articles to the new platform -->
- <rule name="Configuration" patternSyntax="Wildcard">
- <match url="documentation/Reference/Configuration/*"/>
- <action type="Redirect" url="https://docs.umbraco.com/umbraco-cms/reference/configuration/" redirectType="Permanent" appendQueryString="true"/>
- </rule>
- <!-- Notifications has been removed from Our, so we need to rewrite pointing to the new platform -->
- <rule name="Notifications" patternSyntax="Wildcard">
- <match url="documentation/Reference/Notifications/*"/>
- <action type="Redirect" url="https://docs.umbraco.com/umbraco-cms/reference/notifications/" redirectType="Permanent" appendQueryString="true"/>
- </rule>
<!-- Article on migrating from 9 to 10 has been removed from Our -->
<rule name="9-to-10" patternSyntax="Wildcard">
<match url="documentation/Umbraco-Cloud/Upgrades/Upgrading-from-9-to-10"/>
<action type="Redirect" url="https://docs.umbraco.com/umbraco-cloud/upgrades/major-upgrades" redirectType="Permanent" appendQueryString="true"/>
</rule>
- <!-- We removed HealthCheck Guides article from Our -->
- <rule name="Health-Check-Guides" patternSyntax="Wildcard">
- <match url="documentation/Extending/Health-Check/Guides/*"/>
- <action type="Redirect" url="https://docs.umbraco.com/umbraco-cms/extending/health-check/guides" redirectType="Permanent" appendQueryString="true"/>
- </rule>
<!-- We removed IMemberManager article from Our -->
<rule name="IMemberManager" patternSyntax="Wildcard">
<match url="documentation/Reference/Querying/IMemberManager"/>
| 2 |
diff --git a/framer/TextLayer.coffee b/framer/TextLayer.coffee @@ -196,6 +196,7 @@ class exports.TextLayer extends Layer
@define "textOverflow",
get: -> @_styledText.textOverflow
set: (value) ->
+ @clip = _.isString(value)
@_styledText.setTextOverflow(value)
@renderText()
| 12 |
diff --git a/renderer/components/nettests/circumvention/Psiphon.js b/renderer/components/nettests/circumvention/Psiphon.js @@ -18,7 +18,7 @@ const Psiphon = ({measurement, isAnomaly, render}) => {
const PsiphonDetails = () => (
<Box width={1}>
- <Flex my={4} justifyContent='center'>
+ <Flex my={4}>
<Text>
{isAnomaly ? (
<FormattedMessage id='TestResults.Details.Circumvention.Psiphon.Blocked.Content.Paragraph' />
| 2 |
diff --git a/Specs/Scene/Cesium3DTileBatchTableSpec.js b/Specs/Scene/Cesium3DTileBatchTableSpec.js @@ -123,19 +123,6 @@ describe(
expect(batchTable.getShow(0)).toEqual(false);
});
- it("setColor throws with invalid batchId", function () {
- var batchTable = new Cesium3DTileBatchTable(mockTileset, 1);
- expect(function () {
- batchTable.setColor();
- }).toThrowDeveloperError();
- expect(function () {
- batchTable.setColor(-1);
- }).toThrowDeveloperError();
- expect(function () {
- batchTable.setColor(1);
- }).toThrowDeveloperError();
- });
-
it("setColor", function () {
var batchTable = new Cesium3DTileBatchTable(mockTileset, 1);
| 3 |
diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js @@ -417,7 +417,7 @@ const baseActions = {
* Stores recoverable modules in the datastore.
*
* Because this is frequently-accessed data, this is usually sourced
- * from a global variable (`_googlesitekitSiteData`), set by PHP
+ * from a global variable (`_googlesitekitDashboardSharingData`), set by PHP
* in the `before_print` callback for `googlesitekit-datastore-site`.
*
* @since 1.74.0
| 1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.