code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/widgets/histogram/chart.js b/src/widgets/histogram/chart.js @@ -1266,6 +1266,8 @@ module.exports = cdb.core.View.extend({
var data = this.model.get('data');
this._calcBarWidth();
+ // Remove spacing if not enough room for the smallest case
+ var spacing = ((data.length * 2) - 1) > this.chartWidth() ? 0 : 1;
var bars = this.chart.append('g')
.attr('transform', 'translate(0, 0)')
@@ -1283,7 +1285,7 @@ module.exports = cdb.core.View.extend({
})
.attr('y', self.chartHeight())
.attr('height', 0)
- .attr('width', Math.max(0.5, this.barWidth - 1));
+ .attr('width', Math.max(1, this.barWidth - spacing));
bars
.transition()
| 2 |
diff --git a/src/screens/editor/children/postOptionsModal.tsx b/src/screens/editor/children/postOptionsModal.tsx @@ -90,6 +90,9 @@ const PostOptionsModal = forwardRef(({
if (scheduledForDate) {
setScheduleLater(true);
setScheduledFor(scheduledForDate);
+ } else {
+ setScheduleLater(false);
+ setScheduledFor('');
}
},[scheduledForDate])
@@ -156,7 +159,10 @@ const PostOptionsModal = forwardRef(({
]}
selectedOptionIndex={scheduleLater ? 1 : 0}
handleOnChange={(index)=> {
- setScheduleLater(index === 1)
+ setScheduleLater(index === 1);
+ if (index !== 1) {
+ handleScheduleChange(null);
+ }
}}
/>
| 12 |
diff --git a/README.md b/README.md @@ -74,8 +74,8 @@ npm install jquery.tabulator --save
### CDNJS
To access Tabulator directly from the CDNJS CDN servers, include the following two lines at the start of your project, instead of the localy hosted versions:
```html
-<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/2.11.0/tabulator.min.css" rel="stylesheet">
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/2.11.0/tabulator.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.2.0/tabulator.min.css" rel="stylesheet">
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.2.0/tabulator.min.js"></script>
```
Coming Soon
| 3 |
diff --git a/js/test/base/functions/test.number.js b/js/test/base/functions/test.number.js @@ -45,9 +45,9 @@ it ('decimalToPrecision: truncation (to N significant digits)', () => {
equal (decimalToPrecision ('0.0001234567', TRUNCATE, 7, SIGNIFICANT_DIGITS), '0.0001234567')
equal (decimalToPrecision ('0.000123456', TRUNCATE, 6, SIGNIFICANT_DIGITS), '0.000123456')
- equal (decimalToPrecision ('0.00012345', TRUNCATE, 5, SIGNIFICANT_DIGITS), '0.00012345')
- equal (decimalToPrecision ('0.00012', TRUNCATE, 2, SIGNIFICANT_DIGITS), '0.00012')
- equal (decimalToPrecision ('0.0001', TRUNCATE, 1, SIGNIFICANT_DIGITS), '0.0001')
+ equal (decimalToPrecision ('0.000123456', TRUNCATE, 5, SIGNIFICANT_DIGITS), '0.00012345')
+ equal (decimalToPrecision ('0.000123456', TRUNCATE, 2, SIGNIFICANT_DIGITS), '0.00012')
+ equal (decimalToPrecision ('0.000123456', TRUNCATE, 1, SIGNIFICANT_DIGITS), '0.0001')
equal (decimalToPrecision ('123.0000987654', TRUNCATE, 10, SIGNIFICANT_DIGITS), '123.0000987')
equal (decimalToPrecision ('123.0000987654', TRUNCATE, 8, SIGNIFICANT_DIGITS), '123.00009')
| 1 |
diff --git a/character-physics.js b/character-physics.js @@ -199,16 +199,16 @@ class CharacterPhysics {
.decompose(this.player.position, this.player.quaternion, this.player.scale);
this.player.matrixWorld.copy(this.player.matrix);
- this.player.updateMatrixWorld();
+ // this.player.updateMatrixWorld();
- if (this.avatar) {
+ /* if (this.avatar) {
if (this.player.hasAction('jump')) {
this.avatar.setFloorHeight(-0xFFFFFF);
} else {
this.avatar.setFloorHeight(localVector.y - this.player.avatar.height);
}
this.avatar.updateMatrixWorld();
- }
+ } */
}
}
/* dampen the velocity to make physical sense for the current avatar state */
| 2 |
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js @@ -7,8 +7,8 @@ module.exports = {
theme: 'millidocs',
head: [
['link', { rel: 'icon', href: '/favicon.png' }],
- ['script', { type: 'text/javascript', src: `${base}/embed.js` }],
- ['script', { type: 'text/javascript', src: `${base}/extensions/external-events.js` }]
+ ['script', { type: 'text/javascript', src: `embed.js` }],
+ ['script', { type: 'text/javascript', src: `extensions/external-events.js` }]
],
markdown: {
anchor: {
| 1 |
diff --git a/commands/yagcommmand.go b/commands/yagcommmand.go @@ -240,14 +240,10 @@ func (cs *CustomCommand) Enabled(client *redis.Client, channel string, gState *d
}
}
- if cs.Key != "" || cs.CustomEnabled {
- return true, false, nil
- }
-
// Return from global settings then
for _, cmd := range config.Global {
if cmd.Cmd == cs.Name {
- if cs.Key != "" {
+ if cs.Key != "" || cs.CustomEnabled {
return true, cmd.AutoDelete, nil
}
| 1 |
diff --git a/plugins/rspamd.js b/plugins/rspamd.js @@ -145,6 +145,7 @@ exports.hook_data_post = function (next, connection) {
res.on('data', function (chunk) { rawData += chunk; });
res.on('end', function () {
var r = plugin.parse_response(rawData, connection);
+ if (!r) return callNext();
if (!r.data) return callNext();
if (!r.data.default) return callNext();
if (!r.log) return callNext();
| 9 |
diff --git a/Source/dom/layers/__tests__/HotSpot.test.js b/Source/dom/layers/__tests__/HotSpot.test.js @@ -35,6 +35,7 @@ test('should create a new HotSpot from a layer', (_context, document) => {
targetId: artboard2.id,
type: 'Flow',
animationType: 'slideFromRight',
+ maintainScrollPosition: false,
})
})
| 1 |
diff --git a/src/helpers.php b/src/helpers.php @@ -273,6 +273,10 @@ if (! function_exists('oldValueDefaultOrFallback')) {
return old(square_brackets_to_dots($field_name));
}
- return $value ?? $default ?? $fallback;
+ if (array_key_exists('value', $field)) {
+ return $value;
+ }
+
+ return $default ?? $fallback;
}
}
| 13 |
diff --git a/test/jasmine/tests/gl3d_hover_click_test.js b/test/jasmine/tests/gl3d_hover_click_test.js @@ -750,6 +750,161 @@ describe('Test gl3d trace click/hover:', function() {
.then(done);
});
+ function scroll(target, amt) {
+ return new Promise(function(resolve) {
+ target.dispatchEvent(new WheelEvent('wheel', {deltaY: amt || 1, cancelable: true}));
+ setTimeout(resolve, 0);
+ });
+ }
+
+ var _scroll = function() {
+ var sceneTarget = gd.querySelector('.svg-container .gl-container #scene canvas');
+ return scroll(sceneTarget, -1);
+ };
+
+ it('@gl should pick correct points after orthographic scroll zoom - mesh3d case', function(done) {
+ var fig = {
+ data: [{
+ x: [0, 1, 0, 1, 0, 1, 0, 1],
+ y: [0, 0, 1, 1, 0, 0, 1, 1],
+ z: [0, 0, 0, 0, 1, 1, 1, 1],
+ i: [0, 3, 4, 7, 0, 6, 1, 7, 0, 5, 2, 7],
+ j: [1, 2, 5, 6, 2, 4, 3, 5, 4, 1, 6, 3],
+ k: [3, 0, 7, 4, 6, 0, 7, 1, 5, 0, 7, 2],
+ vertexcolor: ['#000', '#00F', '#0F0', '#0FF', '#F00', '#F0F', '#FF0', '#FFF'],
+ hovertemplate: 'x: %{x}<br>y: %{y}<br>z: %{z}<br>vertex color: %{vertexcolor}',
+ flatshading: true,
+ type: 'mesh3d',
+ name: 'vertex color'
+ }],
+ layout: {
+ width: 600,
+ height: 400,
+ scene: {
+ camera: {
+ projection: { type: 'orthographic' },
+ eye: { x: 1, y: 1, z: 1 }
+ }
+ }
+ },
+ config: {
+ scrollZoom: 'gl3d'
+ }
+ };
+
+ Plotly.newPlot(gd, fig)
+ .then(delay(20))
+ .then(function() { mouseEvent('mouseover', 300, 200); })
+ .then(delay(20))
+ .then(function() {
+ assertHoverText(
+ 'x: 1',
+ 'y: 1',
+ 'z: 1',
+ 'vertex color: #FFF',
+ 'vertex color'
+ );
+ })
+ .then(_scroll)
+ .then(_scroll)
+ .then(delay(20))
+ .then(function() { mouseEvent('mouseover', 300, 100); })
+ .then(delay(20))
+ .then(function() {
+ assertHoverText(
+ 'x: 0',
+ 'y: 0',
+ 'z: 1',
+ 'vertex color: #F00',
+ 'vertex color'
+ );
+ })
+ .then(delay(20))
+ .then(function() { mouseEvent('mouseover', 300, 300); })
+ .then(delay(20))
+ .then(function() {
+ assertHoverText(
+ 'x: 1',
+ 'y: 1',
+ 'z: 0',
+ 'vertex color: #0FF',
+ 'vertex color'
+ );
+ })
+ .catch(failTest)
+ .then(done);
+ });
+
+ it('@gl should pick correct points after orthographic scroll zoom - scatter3d case', function(done) {
+ var fig = {
+ data: [{
+ x: [0, 1, 0, 1, 0, 1, 0, 1],
+ y: [0, 0, 1, 1, 0, 0, 1, 1],
+ z: [0, 0, 0, 0, 1, 1, 1, 1],
+ marker: { color: ['#000', '#00F', '#0F0', '#0FF', '#F00', '#F0F', '#FF0', '#FFF'] },
+ hovertemplate: 'x: %{x}<br>y: %{y}<br>z: %{z}<br>marker color: %{marker.color}',
+ type: 'scatter3d',
+ mode: 'marker',
+ name: 'marker color'
+ }],
+ layout: {
+ width: 600,
+ height: 400,
+ scene: {
+ camera: {
+ projection: { type: 'orthographic' },
+ eye: { x: 1, y: 1, z: 1 }
+ }
+ }
+ },
+ config: {
+ scrollZoom: 'gl3d'
+ }
+ };
+
+ Plotly.newPlot(gd, fig)
+ .then(delay(20))
+ .then(function() { mouseEvent('mouseover', 300, 200); })
+ .then(delay(20))
+ .then(function() {
+ assertHoverText(
+ 'x: 1',
+ 'y: 1',
+ 'z: 1',
+ 'marker color: #FFF',
+ 'marker color'
+ );
+ })
+ .then(_scroll)
+ .then(_scroll)
+ .then(delay(20))
+ .then(function() { mouseEvent('mouseover', 300, 100); })
+ .then(delay(20))
+ .then(function() {
+ assertHoverText(
+ 'x: 0',
+ 'y: 0',
+ 'z: 1',
+ 'marker color: #F00',
+ 'marker color'
+ );
+ })
+ .then(delay(20))
+ .then(function() { mouseEvent('mouseover', 300, 300); })
+ .then(delay(20))
+ .then(function() {
+ assertHoverText(
+ 'x: 1',
+ 'y: 1',
+ 'z: 0',
+ 'marker color: #0FF',
+ 'marker color'
+ );
+ })
+ .catch(failTest)
+ .then(done);
+ });
+
it('@gl should pick latest & closest points on hover if two points overlap', function(done) {
var _mock = Lib.extendDeep({}, mock4);
| 0 |
diff --git a/semcore/flex-box/src/Box/useBox.tsx b/semcore/flex-box/src/Box/useBox.tsx @@ -153,7 +153,7 @@ export interface IBoxProps extends IStyledProps {
css?: React.CSSProperties;
/** CSS `position` property */
- position?: 'absolute' | 'fixed' | 'relative' | 'static' | 'inherit';
+ position?: 'absolute' | 'fixed' | 'relative' | 'static' | 'inherit' | 'sticky';
/** CSS `top` property */
top?: number | string;
/** CSS `left` property */
| 11 |
diff --git a/contracts/ProxyERC20.sol b/contracts/ProxyERC20.sol @@ -67,7 +67,7 @@ contract ProxyERC20 is Proxy, IERC20 {
/**
* @dev Gets the balance of the specified address.
- * @param owner The address to query the balance of.
+ * @param account The address to query the balance of.
* @return An uint256 representing the amount owned by the passed address.
*/
function balanceOf(address account) public view returns (uint256) {
| 3 |
diff --git a/packages/gluestick/src/renderer/middleware.js b/packages/gluestick/src/renderer/middleware.js @@ -124,8 +124,10 @@ const middleware: Middleware = async (req, res, { assets }) => {
);
if (redirectLocation) {
callHook(hooks.preRedirect, redirectLocation);
+ const status =
+ (redirectLocation.state && redirectLocation.state.status) || 301;
res.redirect(
- 301,
+ status,
`${redirectLocation.pathname}${redirectLocation.search}`,
);
return;
| 11 |
diff --git a/extensions/projection/README.md b/extensions/projection/README.md @@ -20,9 +20,11 @@ projections per Asset is not currently handled by this extension. The exception
default, which should be specified at the asset level, while those assets that use the defaults can remain unspecified.
## Examples
+
- [Example Landsat8](examples/example-landsat8.json)
## Schema
+
- [JSON Schema](json-schema/schema.json)
## Item Properties fields
@@ -75,14 +77,17 @@ The number of pixels should be specified in Y, X order. If the shape is defined
the default shape for all assets that don't have an overriding shape.
**proj: transform** - Linear mapping from pixel coordinate space (Pixel, Line) to projection coordinate space (Xp, Yp). It is a `3x3` matrix stored as a flat array of 9 elements in row major order. Since the last row is always `0,0,1` it can be omitted, in which case only 6 elements are recorded. This mapping can be obtained from GDAL([`GetGeoTransform`](https://gdal.org/api/gdaldataset_cpp.html#_CPPv4N11GDALDataset15GetGeoTransformEPd)) or the Rasterio ([`Transform`](https://rasterio.readthedocs.io/en/stable/api/rasterio.io.html#rasterio.io.BufferedDatasetWriter.transform)).
-```
+
+``` bash
[Xp] [a0, a1, a2] [Pixel]
[Yp] = [a3, a4, a5] * [Line ]
[1 ] [0 , 0, 1] [1 ]
```
-If the transform is defined in an item's properties it is used as the default transform for all assets that don't have an overriding shape.
+
+If the transform is defined in an item's properties it is used as the default transform for all assets that don't have an overriding transform.
### Item [`Asset Object`](../../item-spec/item-spec.md#asset-object) fields
+
| Field Name | Type | Description |
| ---------- | -------- | -------------------------------------------- |
| proj:shape | [number] | See item description. |
| 1 |
diff --git a/docs/source/platform/schema-validation.md b/docs/source/platform/schema-validation.md @@ -26,37 +26,36 @@ Here's how it works:
Engine's cloud service uses an algorithm to detect breaking changes in a schema diff. It follows the following rules to determine which potentially breaking change types should actually _fail_ the `apollo service:check` command and return a non-0 exit code.
-- **Removals**
- <ul>
- <li id="FIELD_REMOVED">`FIELD_REMOVED` A field referenced by at least one operation was removed</li>
- <li id="TYPE_REMOVED">`TYPE_REMOVED` A referenced type(scalar, object) was removed</li>
- <li id="ARG_REMOVED">`ARG_REMOVED` A referenced argument was removed</li>
- <li id="TYPE_REMOVED_FROM_UNION">`TYPE_REMOVED_FROM_UNION` A type in a union used by at least one operation was removed</li>
- <li id="INPUT_FIELD_REMOVED">`INPUT_FIELD_REMOVED` A field in an input type used by at least one operation was removed</li>
- <li id="VALUE_REMOVED_FROM_ENUM">`VALUE_REMOVED_FROM_ENUM` A value in an enum used by at least one operation was removed</li>
- <li id="TYPE_REMOVED_FROM_INTERFACE">`TYPE_REMOVED_FROM_INTERFACE` An object used by at least one operation was removed from an interface</li>
- </ul>
-- **Required arguments**
- <ul>
- <li id="REQUIRED_ARG_ADDED">`REQUIRED_ARG_ADDED` Non-nullable argument added to field used by at least one operation</li>
- <li id="NON_NULL_INPUT_FIELD_ADDED">`NON_NULL_INPUT_FIELD_ADDED` Non-null field added to an input object used by at least one operation</li>
- </ul>
-- **In-place updates**
- <ul>
- <li id="FIELD_CHANGED_TYPE">`FIELD_CHANGED_TYPE` Field used by at least one operation changed return type</li>
- <li id="INPUT_FIELD_CHANGED_TYPE">`INPUT_FIELD_CHANGED_TYPE` Field in input object referenced in field argument used by at least one operation changed type</li>
- <li id="TYPE_CHANGED_KIND">`TYPE_CHANGED_KIND` Type used by at least one operation changed, ex: scalar to object or enum to union</li>
- <li id="ARG_CHANGED_TYPE">`ARG_CHANGED_TYPE` Argument used by at least one operation changed a type</li>
- </ul>
-- **Type extensions**
- <ul>
- <li id="TYPE_ADDED_TO_UNION">`TYPE_ADDED_TO_UNION` New type added to a union used by at least one operation</li>
- <li id="TYPE_ADDED_TO_INTERFACE">`TYPE_ADDED_TO_INTERFACE` New interface added to an object used by at least one operation</li>
- </ul>
-- **Optional arguments**
- <ul>
- <li id="ARG_DEFAULT_VALUE_CHANGE">`ARG_DEFAULT_VALUE_CHANGE` Default value added or changed for argument on a field that is used by at least one operation</li>
- </ul>
+#### Removals
+
+- `FIELD_REMOVED` A field referenced by at least one operation was removed
+- `TYPE_REMOVED` A referenced type(scalar, object) was removed
+- `ARG_REMOVED` A referenced argument was removed
+- `TYPE_REMOVED_FROM_UNION` A type in a union used by at least one operation was removed
+- `INPUT_FIELD_REMOVED` A field in an input type used by at least one operation was removed
+- `VALUE_REMOVED_FROM_ENUM` A value in an enum used by at least one operation was removed
+- `TYPE_REMOVED_FROM_INTERFACE` An object used by at least one operation was removed from an interface
+
+#### Required arguments
+
+- `REQUIRED_ARG_ADDED` Non-nullable argument added to field used by at least one operation
+- `NON_NULL_INPUT_FIELD_ADDED` Non-null field added to an input object used by at least one operation
+
+#### In-place updates
+
+- `FIELD_CHANGED_TYPE` Field used by at least one operation changed return type
+- `INPUT_FIELD_CHANGED_TYPE` Field in input object referenced in field argument used by at least one operation changed type
+- `TYPE_CHANGED_KIND` Type used by at least one operation changed, ex: scalar to object or enum to union
+- `ARG_CHANGED_TYPE` Argument used by at least one operation changed a type
+
+#### Type extensions
+
+- `TYPE_ADDED_TO_UNION` New type added to a union used by at least one operation
+- `TYPE_ADDED_TO_INTERFACE` New interface added to an object used by at least one operation
+
+#### Optional arguments
+
+- `ARG_DEFAULT_VALUE_CHANGE` Default value added or changed for argument on a field that is used by at least one operation
> **Note:** This is not an exhaustive list of all possible schema change types, just _breaking_ change types. Visit the [`graphql` package's repository](https://github.com/graphql/graphql-js/blob/9e404659a15d59c5ce12aae433dd2a636ea9eb82/src/utilities/findBreakingChanges.js#L39) for more details on schema changes types.
| 4 |
diff --git a/frontend/lost/package.json b/frontend/lost/package.json },
"scripts": {
"install:tools": "npm install --prefix src/components/pipeline -d",
- "start": "bash src/frontendDev.sh && npm run install:tools && REACT_APP_PORT='8083' react-app-rewired start",
+ "start": "bash src/frontendDev.sh && npm run install:tools &&REACT_APP_PORT='' react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
"test:debug": "react-app-rewired --inspect-brk test --runInBand",
| 12 |
diff --git a/src/pages/Create/create-moreService.js b/src/pages/Create/create-moreService.js @@ -82,26 +82,25 @@ export default class Index extends PureComponent {
handleBuild = () => {
this.setState({ buildState: true });
-
const { JavaMavenData, is_deploy } = this.state;
if (JavaMavenData.length > 0) {
- const team_name = globalUtil.getCurrTeamName();
- const app_alias = this.getAppAlias();
- const serviceIds = JavaMavenData.map((item) => item.service_ids);
-
+ const teamName = globalUtil.getCurrTeamName();
+ const appAlias = this.getAppAlias();
this.props.dispatch({
type: 'appControl/createService',
payload: {
- team_name: team_name,
- app_alias: app_alias,
+ team_name: teamName,
+ app_alias: appAlias,
service_infos: JavaMavenData
},
callback: (res) => {
if (res && res._code == 200) {
+ const groupId = res.bean && res.bean.group_id;
+ const serviceIds = res.bean && res.bean.service_ids;
if (is_deploy) {
- this.BuildShape(res.bean, serviceIds);
+ this.BuildShape(groupId, serviceIds);
} else {
- this.fetchGroups(res.bean);
+ this.fetchGroups(groupId);
}
}
}
@@ -112,22 +111,25 @@ export default class Index extends PureComponent {
}
};
- BuildShape = (group_id, serviceIds) => {
+ BuildShape = (groupId, serviceIds) => {
batchOperation({
action: 'deploy',
team_name: globalUtil.getCurrTeamName(),
serviceIds: serviceIds && serviceIds.length > 0 && serviceIds.join(',')
}).then(() => {
- this.fetchGroups(group_id);
+ this.fetchGroups(groupId);
});
};
- fetchGroups = (group_id) => {
- this.props.dispatch({
+ fetchGroups = (groupId) => {
+ const teamName = globalUtil.getCurrTeamName();
+ const regionName = this.getCurrRegionName();
+ const { dispatch } = this.props;
+ dispatch({
type: 'global/fetchGroups',
payload: {
- team_name: globalUtil.getCurrTeamName(),
- region_name: globalUtil.getCurrRegionName()
+ team_name: teamName,
+ region_name: regionName
},
callback: () => {
notification.success({
@@ -135,10 +137,9 @@ export default class Index extends PureComponent {
duration: '3'
});
this.setState({ buildState: false });
-
- this.props.dispatch(
+ dispatch(
routerRedux.push(
- `/team/${globalUtil.getCurrTeamName()}/region/${globalUtil.getCurrRegionName()}/apps/${group_id}`
+ `/team/${teamName}/region/${regionName}/apps/${groupId}`
)
);
}
| 1 |
diff --git a/bin/super.js b/bin/super.js @@ -129,7 +129,7 @@ function createConstructor(version, name, enforcer) {
// store the full set of enforcer data
store.set(result, data);
- data.defToInstanceMap.set(data.definition, result);
+ if (data.definition && typeof data.definition === 'object') data.defToInstanceMap.set(data.definition, result);
if (util.isPlainObject(data.definition)) {
definitionValidator(data);
| 1 |
diff --git a/src/commands/init.js b/src/commands/init.js @@ -17,6 +17,34 @@ class InitCommand extends Command {
// Check logged in status
await this.authenticate()
+ const siteId = this.site.get('siteId')
+ // const hasFlags = !isEmpty(flags)
+ let site
+ try {
+ site = await this.netlify.getSite({ siteId })
+ } catch (e) {
+ // silent api error
+ }
+
+ if (siteId && site) {
+ const repoUrl = get(site, 'build_settings.repo_url')
+ if (repoUrl) {
+ this.log()
+ this.log(`${chalk.yellow('Warning:')} It looks like this site has already been initialized.`)
+ this.log()
+ this.log(`Site Name: ${chalk.cyan(site.name)}`)
+ this.log(`Site Url: ${chalk.cyan(site.ssl_url || site.url)}`)
+ this.log(`Site Repo: ${chalk.cyan(repoUrl)}`)
+ this.log(`Site Id: ${chalk.cyan(site.id)}`)
+ this.log(`Admin URL: ${chalk.cyan(site.admin_url)}`)
+ this.log()
+
+ this.log(`To create a new site, Please run ${chalk.cyanBright.bold('netlify unlink')}`)
+ this.log(`Or delete the siteId from ${this.site.path}`)
+ this.exit()
+ }
+ }
+
// Look for local repo
const repo = await getRepoData()
@@ -41,9 +69,8 @@ git remote add origin https://github.com/YourUserName/RepoName.git
this.error(repo.error)
}
- let site
- const NEW_SITE = 'Configure a new site'
- const EXISTING_SITE = 'Link to an existing site'
+ const NEW_SITE = 'Create & configure a new site in Netlify'
+ const EXISTING_SITE = 'Link to an existing site in your account'
const initializeOpts = [
NEW_SITE,
@@ -104,7 +131,7 @@ git remote add origin https://github.com/YourUserName/RepoName.git
this.log()
this.log(chalk.greenBright.bold.underline(`Netlify CI/CD Configured!`))
this.log()
- this.log(`Your site is now configured to automatically deploy from git`)
+ this.log(`This site is now configured to automatically deploy from ${repo.provider} branches & pull requests`)
this.log()
this.log(`Next steps:
| 9 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -34,6 +34,7 @@ import {PathFinder} from './npc-utils.js';
import {localPlayer, remotePlayers} from './players.js';
import loaders from './loaders.js';
import * as voices from './voices.js';
+import * as procgen from './procgen/procgen.js';
import {getHeight} from './avatars/util.mjs';
const localVector = new THREE.Vector3();
@@ -653,6 +654,9 @@ metaversefile.setApi({
throw new Error('usePhysics cannot be called outside of render()');
}
},
+ useProcGen() {
+ return procgen;
+ },
useCameraManager() {
return cameraManager;
},
| 0 |
diff --git a/packages/insomnia-app/app/ui/css/constants/dimensions.less b/packages/insomnia-app/app/ui/css/constants/dimensions.less html {
/* Font Size */
- --font-size-xxs: 0.5rem;
- --font-size-xs: 0.625rem;
- --font-size-sm: 0.75rem;
- --font-size-md: 0.8125rem;
- --font-size-lg: 0.9375rem;
- --font-size-xl: 1.1875rem;
- --font-size-xxl: 1.3125rem;
- --font-size-xxxl: 1.5rem;
+ --font-size-xxs: 0.6153rem;
+ --font-size-xs: 0.7692rem;
+ --font-size-sm: 0.9230rem;
+ --font-size-md: 1rem;
+ --font-size-lg: 1.1538rem;
+ --font-size-xl: 1.4615rem;
+ --font-size-xxl: 1.6153rem;
+ --font-size-xxxl: 1.8461rem;
--font-size: var(--font-size-md);
/* Padding */
| 3 |
diff --git a/game.js b/game.js @@ -29,6 +29,7 @@ import * as metaverseModules from './metaverse-modules.js';
import loadoutManager from './loadout-manager.js';
// import soundManager from './sound-manager.js';
import {generateObjectUrlCard} from './card-generator.js';
+import * as sounds from './sounds.js';
// const {contractNames} = metaversefileConstants;
@@ -1333,6 +1334,10 @@ class GameManager extends EventTarget {
};
localPlayer.addAction(newSssAction);
+ const soundFiles = sounds.getSoundFiles();
+ const audioSpec = soundFiles.limitBreak[Math.floor(Math.random() * soundFiles.limitBreak.length)];
+ sounds.playSound(audioSpec);
+
localPlayer.removeAction('dance');
const newDanceAction = {
type: 'dance',
| 0 |
diff --git a/login.js b/login.js @@ -574,7 +574,7 @@ class LoginManager extends EventTarget {
}
}
- async uploadFile(file) {
+ async uploadFile(file, {description = ''} = {}) {
if (loginToken) {
const {name} = file;
if (name) {
@@ -607,7 +607,6 @@ class LoginManager extends EventTarget {
} finally {
notifications.removeNotification(notification);
}
- const description = '';
const quantity = 1;
const fullAmount = {
t: 'uint256',
| 0 |
diff --git a/src/components/staking/UndelegationModal.vue b/src/components/staking/UndelegationModal.vue submission-error-prefix="Undelegating failed"
@close="clear"
>
+ <TmFormGroup class="action-modal-form-group">
+ <span class="form-message warning">
+ Note: Undelegated tokens will become available for use after 21 days.
+ The undelegated tokens are not usable and do not produce rewards in this
+ time.
+ </span>
+ </TmFormGroup>
<TmFormGroup
class="action-modal-form-group"
field-id="from"
>
<TmField id="from" v-model="validator.operator_address" readonly />
</TmFormGroup>
- <span class="form-message">
- Note: Undelegated tokens will become available for use after 21 days.
- </span>
<TmFormGroup
:error="$v.amount.$error && $v.amount.$invalid"
class="action-modal-form-group"
@@ -163,3 +167,9 @@ export default {
}
}
</script>
+
+<style scoped>
+.form-message.warning {
+ color: var(--warning);
+}
+</style>
| 3 |
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js @@ -15,6 +15,7 @@ var createPlot = glPlot3d.createScene;
var getContext = require('webgl-context');
var passiveSupported = require('has-passive-events');
+var isMobile = require('is-mobile')({ tablet: true });
var Registry = require('../../registry');
var Lib = require('../../lib');
@@ -91,9 +92,14 @@ var proto = Scene.prototype;
proto.tryCreatePlot = function() {
var scene = this;
- var glplotOptions = {
+ var opts = {
canvas: scene.canvas,
gl: scene.gl,
+ glOptions: {
+ preserveDrawingBuffer: isMobile,
+ premultipliedAlpha: true,
+ antialias: true
+ },
container: scene.container,
axes: scene.axesOptions,
spikes: scene.spikeOptions,
@@ -120,19 +126,19 @@ proto.tryCreatePlot = function() {
throw new Error('error creating static canvas/context for image server');
}
}
- glplotOptions.pixelRatio = scene.pixelRatio;
- glplotOptions.gl = STATIC_CONTEXT;
- glplotOptions.canvas = STATIC_CANVAS;
+
+ opts.gl = STATIC_CONTEXT;
+ opts.canvas = STATIC_CANVAS;
}
var failed = 0;
try {
- scene.glplot = createPlot(glplotOptions);
+ scene.glplot = createPlot(opts);
} catch(e) {
failed++;
try { // try second time to fix issue with Chrome 77 https://github.com/plotly/plotly.js/issues/4233
- scene.glplot = createPlot(glplotOptions);
+ scene.glplot = createPlot(opts);
} catch(e) {
failed++;
}
| 0 |
diff --git a/karma.conf.js b/karma.conf.js @@ -180,6 +180,7 @@ module.exports = (config) => {
};
} else {
options.concurrency = 1;
+ options.captureTimeout = 300000;
options.reporters.push("BrowserStack");
options.customLaunchers = {
"Chrome 26 on Windows 7": {
| 12 |
diff --git a/Specs/DataSources/EllipsoidGraphicsSpec.js b/Specs/DataSources/EllipsoidGraphicsSpec.js @@ -65,6 +65,11 @@ defineSuite([
var source = new EllipsoidGraphics();
source.material = new ColorMaterialProperty();
source.radii = new ConstantProperty();
+ source.innerRadii = new ConstantProperty();
+ source.minimumClock = new ConstantProperty();
+ source.maximumClock = new ConstantProperty();
+ source.minimumCone = new ConstantProperty();
+ source.maximumCone = new ConstantProperty();
source.show = new ConstantProperty();
source.stackPartitions = new ConstantProperty();
source.slicePartitions = new ConstantProperty();
@@ -81,6 +86,11 @@ defineSuite([
expect(target.material).toBe(source.material);
expect(target.radii).toBe(source.radii);
+ expect(target.innerRadii).toBe(source.innerRadii);
+ expect(target.minimumClock).toBe(source.minimumClock);
+ expect(target.maximumClock).toBe(source.maximumClock);
+ expect(target.minimumCone).toBe(source.minimumCone);
+ expect(target.maximumCone).toBe(source.maximumCone);
expect(target.show).toBe(source.show);
expect(target.stackPartitions).toBe(source.stackPartitions);
expect(target.slicePartitions).toBe(source.slicePartitions);
@@ -98,6 +108,11 @@ defineSuite([
var material = new ColorMaterialProperty();
var radii = new ConstantProperty();
+ var innerRadii = new ConstantProperty();
+ var minimumClock = new ConstantProperty();
+ var maximumClock = new ConstantProperty();
+ var minimumCone = new ConstantProperty();
+ var maximumCone = new ConstantProperty();
var show = new ConstantProperty();
var stackPartitions = new ConstantProperty();
var slicePartitions = new ConstantProperty();
@@ -112,6 +127,11 @@ defineSuite([
var target = new EllipsoidGraphics();
target.material = material;
target.radii = radii;
+ target.innerRadii = innerRadii;
+ target.minimumClock = minimumClock;
+ target.maximumClock = maximumClock;
+ target.minimumCone = minimumCone;
+ target.maximumCone = maximumCone;
target.show = show;
target.stackPartitions = stackPartitions;
target.slicePartitions = slicePartitions;
@@ -128,6 +148,11 @@ defineSuite([
expect(target.material).toBe(material);
expect(target.radii).toBe(radii);
+ expect(target.innerRadii).toBe(innerRadii);
+ expect(target.minimumClock).toBe(minimumClock);
+ expect(target.maximumClock).toBe(maximumClock);
+ expect(target.minimumCone).toBe(minimumCone);
+ expect(target.maximumCone).toBe(maximumCone);
expect(target.show).toBe(show);
expect(target.stackPartitions).toBe(stackPartitions);
expect(target.slicePartitions).toBe(slicePartitions);
@@ -168,6 +193,21 @@ defineSuite([
expect(result.outlineWidth).toBe(source.outlineWidth);
expect(result.shadows).toBe(source.shadows);
expect(result.distanceDisplayCondition).toBe(source.distanceDisplayCondition);
+
+ // Clone with source passed
+ var result = source.clone(source);
+ expect(result.material).toBe(source.material);
+ expect(result.radii).toBe(source.radii);
+ expect(result.show).toBe(source.show);
+ expect(result.stackPartitions).toBe(source.stackPartitions);
+ expect(result.slicePartitions).toBe(source.slicePartitions);
+ expect(result.subdivisions).toBe(source.subdivisions);
+ expect(result.fill).toBe(source.fill);
+ expect(result.outline).toBe(source.outline);
+ expect(result.outlineColor).toBe(source.outlineColor);
+ expect(result.outlineWidth).toBe(source.outlineWidth);
+ expect(result.shadows).toBe(source.shadows);
+ expect(result.distanceDisplayCondition).toBe(source.distanceDisplayCondition);
});
it('merge throws if source undefined', function() {
| 3 |
diff --git a/public/javascripts/SVLabel/src/SVLabel/onboarding/Onboarding.js b/public/javascripts/SVLabel/src/SVLabel/onboarding/Onboarding.js @@ -734,28 +734,28 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
// Ideally we need a for loop that goes through every element of the property array
// and calls the corresponding action's handler.
// Not just the label accessibility attribute's handler
- if (state.properties[0].action == "LabelAccessibilityAttribute") {
+ if (state.properties[0].action === "LabelAccessibilityAttribute") {
_visitLabelAccessibilityAttributeState(state, annotationListener);
}
}
else {
- //Restrict panning
+ // Restrict panning.
mapService.setHeadingRange([state.properties.minHeading, state.properties.maxHeading]);
- if (state.properties.action == "Introduction") {
+ if (state.properties.action === "Introduction") {
_visitIntroduction(state, annotationListener);
- } else if (state.properties.action == "SelectLabelType") {
+ } else if (state.properties.action === "SelectLabelType") {
_visitSelectLabelTypeState(state, annotationListener);
- } else if (state.properties.action == "Zoom") {
+ } else if (state.properties.action === "Zoom") {
_visitZoomState(state, annotationListener);
- } else if (state.properties.action == "RateSeverity" || state.properties.action == "RedoRateSeverity") {
+ } else if (state.properties.action === "RateSeverity" || state.properties.action === "RedoRateSeverity") {
_visitRateSeverity(state, annotationListener);
- } else if (state.properties.action == "AddTag" || state.properties.action == "RedoAddTag") {
+ } else if (state.properties.action === "AddTag" || state.properties.action === "RedoAddTag") {
_visitAddTag(state, annotationListener);
- } else if (state.properties.action == "AdjustHeadingAngle") {
+ } else if (state.properties.action === "AdjustHeadingAngle") {
_visitAdjustHeadingAngle(state, annotationListener);
- } else if (state.properties.action == "WalkTowards") {
+ } else if (state.properties.action === "WalkTowards") {
_visitWalkTowards(state, annotationListener);
- } else if (state.properties.action == "Instruction") {
+ } else if (state.properties.action === "Instruction") {
_visitInstruction(state, annotationListener);
}
}
@@ -1025,15 +1025,15 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
var transition = state.transition;
var callback = function (e) {
-
var i = 0;
+ var labelAppliedCorrectly = false;
- while (i < properties.length) {
+ while (i < properties.length && !labelAppliedCorrectly) {
var imageX = properties[i].imageX;
var imageY = properties[i].imageY;
var tolerance = properties[i].tolerance;
- var labelType = state.properties[i].labelType;
- var subCategory = state.properties[i].subcategory;
+ var labelType = properties[i].labelType;
+ var subCategory = properties[i].subcategory;
var clickCoordinate = mouseposition(e, this),
pov = mapService.getPov(),
@@ -1045,8 +1045,9 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
currentLabelState = state;
+ // Label applied at the correct location.
if (distance < tolerance * tolerance) {
- // Label applied at the correct location
+ labelAppliedCorrectly = true;
// Disable deleting of label
canvas.unlockDisableLabelDelete();
@@ -1062,8 +1063,12 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
if (listener) google.maps.event.removeListener(listener);
next(transition[i]);
break;
- } else {
- // Label placed too far from where they are supposed to put it. Disable labeling, enable deleting.
+ }
+ i = i + 1;
+ }
+
+ // Label placed too far from desired location. Disable labeling, enable deleting, ask them to reapply label.
+ if (!labelAppliedCorrectly) {
ribbon.disableMode(labelType, subCategory);
ribbon.enableMode("Walk");
canvas.unlockDisableLabelDelete();
@@ -1071,11 +1076,9 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
canvas.lockDisableLabelDelete();
$target.off("click", callback);
- // 2. Ask user to delete label and reapply the label.
+ // Ask user to delete label and reapply the label.
_incorrectLabelApplication(state, listener);
}
- i = i + 1;
- }
};
$target.on("click", callback);
}
| 1 |
diff --git a/src/pages/index.hbs b/src/pages/index.hbs <div class="sprk-o-Stack sprk-o-Stack--medium sprk-o-Stack--split@s">
<div class="sprk-o-Stack__item">
- <a class="drizzle-b-Button" href="/gettingstarted/developers.html">
- Getting Started for Developers
+ <a class="drizzle-b-Button" href="/gettingstarted/html.html">
+ Getting Started for HTML
</a>
</div>
<div class="sprk-o-Stack__item">
- <a class="drizzle-b-Button" href="/gettingstarted/designers.html">
- Getting Started for Designers
+ <a class="drizzle-b-Button" href="/gettingstarted/angular.html">
+ Getting Started for Angular
+ </a>
+ </div>
+ </div>
+ <div class="sprk-o-Stack sprk-o-Stack--medium">
+ <div class="sprk-o-Stack__item">
+ <a class="drizzle-b-Button" href="/gettingstarted/react.html">
+ Getting Started for React
</a>
</div>
</div>
| 3 |
diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js b/lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/analysis-form-models/merge-form-model.js @@ -143,13 +143,13 @@ module.exports = BaseAnalysisFormModel.extend({
left_source_column: {
type: 'Select',
title: this._getLeftSourceLabel(),
- options: this._leftColumnOptions.filterByType(['string', 'number', 'date']),
+ options: this._leftColumnOptions.all(),
validators: ['required']
},
right_source_column: {
type: 'Select',
title: this._getRightSourceLabel(),
- options: this._rightColumnOptions.filterByType(['string', 'number', 'date']),
+ options: this._rightColumnOptions.all(),
validators: ['required']
},
source_geometry_selector: {
@@ -163,12 +163,12 @@ module.exports = BaseAnalysisFormModel.extend({
left_source_columns: {
type: 'MultiSelect',
title: this._getLeftSourceLabel(),
- options: this._leftColumnOptions.filterByType(['string', 'number', 'date'])
+ options: this._leftColumnOptions.all()
},
right_source_columns: {
type: 'MultiSelect',
title: this._getRightSourceLabel(),
- options: this._rightColumnOptions.filterByType(['string', 'number', 'date'])
+ options: this._rightColumnOptions.all()
}
}));
},
| 11 |
diff --git a/test/versioned/hapi-latest/hapi-router.tap.js b/test/versioned/hapi-latest/hapi-router.tap.js @@ -189,14 +189,15 @@ test("Hapi router introspection", function(t) {
server.route(route)
server.start(function() {
- request.post('http://localhost:8089/test/31337',
+ request.post(
+ 'http://localhost:8089/test/31337',
{json : true},
function(error, res, body) {
-
t.equal(res.statusCode, 200, "nothing exploded")
t.deepEqual(body, {status : 'ok'}, "got expected response")
t.end()
- })
+ }
+ )
})
})
})
| 4 |
diff --git a/assets/js/hooks/useChecks.js b/assets/js/hooks/useChecks.js @@ -42,15 +42,13 @@ export function useChecks( checks ) {
const [ complete, setComplete ] = useState( isSiteKitConnected );
const [ error, setError ] = useState( undefined );
useEffect( () => {
- setComplete( false );
const runChecks = async () => {
try {
await Promise.all( checks.map( ( check ) => check() ) );
- setComplete( true );
} catch ( err ) {
setError( err );
- setComplete( true );
}
+ setComplete( true );
};
runChecks();
| 2 |
diff --git a/manager/src/backend/internal/ssl.js b/manager/src/backend/internal/ssl.js @@ -26,13 +26,14 @@ const internalSsl = {
processExpiringHosts: () => {
if (!internalSsl.interval_processing) {
logger.info('Renewing SSL certs close to expiry...');
- return utils.exec('/usr/bin/certbot renew --webroot=/config/letsencrypt-acme-challenge')
+ return utils.exec('/usr/bin/certbot renew -q')
.then(result => {
logger.info(result);
internalSsl.interval_processing = false;
return internalNginx.reload()
.then(() => {
+ logger.info('Renew Complete');
return result;
});
})
@@ -59,7 +60,7 @@ const internalSsl = {
requestSsl: host => {
logger.info('Requesting SSL certificates for ' + host.hostname);
- return utils.exec('/usr/bin/letsencrypt certonly --agree-tos --email "' + host.letsencrypt_email + '" -n -a webroot --webroot-path=/config/letsencrypt-acme-challenge -d "' + host.hostname + '"')
+ return utils.exec('/usr/bin/letsencrypt certonly --agree-tos --email "' + host.letsencrypt_email + '" -n -a webroot -d "' + host.hostname + '"')
.then(result => {
logger.info(result);
return result;
@@ -73,7 +74,7 @@ const internalSsl = {
renewSsl: host => {
logger.info('Renewing SSL certificates for ' + host.hostname);
- return utils.exec('/usr/bin/certbot renew --force-renewal --disable-hook-validation --webroot-path=/config/letsencrypt-acme-challenge --cert-name "' + host.hostname + '"')
+ return utils.exec('/usr/bin/certbot renew --force-renewal --disable-hook-validation --cert-name "' + host.hostname + '"')
.then(result => {
logger.info(result);
return result;
| 1 |
diff --git a/shared/js/ui/pages/options.es6.js b/shared/js/ui/pages/options.es6.js @@ -8,6 +8,8 @@ const WhitelistModel = require('./../models/whitelist.es6.js')
const whitelistTemplate = require('./../templates/whitelist.es6.js')
const BackgroundMessageModel = require('./../models/background-message.es6.js')
const parseUserAgentString = require('./../models/mixins/parse-user-agent.es6.js')
+const renderFeedbackHref = require('./../templates/shared/render-feedback-href.es6.js')
+const renderBrokenSiteHref = require('./../templates/shared/render-broken-site-href.es6.js')
function Options (ops) {
Parent.call(this, ops)
@@ -26,7 +28,7 @@ Options.prototype = window.$.extend({},
Parent.prototype.ready.call(this)
this.setBrowserClassOnBodyTag()
- this.isBrowser = this.parseUserAgentString().browser
+ this.browserInfo = this.parseUserAgentString()
this.generateFeedbackLink()
this.generateReportSiteLink()
@@ -48,12 +50,12 @@ Options.prototype = window.$.extend({},
},
generateFeedbackLink: function () {
- const mailto = `mailto:[email protected]?subject=${this.isBrowser}%20Extension%20Feedback&body=Help%20us%20improve%20by%20sharing%20a%20little%20info%20about%20the%20issue%20you%27ve%20encountered%2E%0A%0ATell%20us%20which%20features%20or%20functionality%20your%20feedback%20refers%20to%2E%20What%20do%20you%20love%3F%20What%20isn%27t%20working%3F%20How%20could%20it%20be%20improved%3F%20%20%0A%0A`
+ const mailto = renderFeedbackHref(this.browserInfo, '')
window.$('.js-feedback-link').attr('href', mailto)
},
generateReportSiteLink: function () {
- const mailto = `mailto:[email protected]?subject=${this.isBrowser}%20Extension%20Broken%20Site%20Report&body=Help%20us%20improve%20by%20sharing%20a%20little%20info%20about%20the%20issue%20you%27ve%20encountered%2E%0A%0A1%2E%20Which%20website%20is%20broken%3F%20%28copy%20and%20paste%20the%20URL%29%0A%0A2%2E%20Describe%20the%20issue%2E%20%28What%27s%20breaking%20on%20the%20page%3F%20Attach%20a%20screenshot%20if%20possible%29%0A%0A`
+ const mailto = renderBrokenSiteHref(this.browserInfo, '')
window.$('.js-report-site-link').attr('href', mailto)
}
}
| 4 |
diff --git a/src/constants/cookieNameKey.js b/src/constants/cookieNameKey.js @@ -13,4 +13,3 @@ governing permissions and limitations under the License.
export const IDENTITY = "identity";
export const CONSENT = "consent";
export const CLUSTER = "cluster";
-export const MBOX = "mbox";
| 2 |
diff --git a/articles/support/matrix.md b/articles/support/matrix.md @@ -697,119 +697,102 @@ In this section covering SDKs and Libraries, we will use the following terms to
<th>Community Support Only</th>
</tr>
<tr>
- <td>[.NET WCF](/quickstart/backend/wcf-service)</td>
<td><a href="/quickstart/backend/wcf-service">.NET WCF</a></td>
<td></td>
<td></td>
<td>X</td>
</tr>
<tr>
- <td>[ASP.NET Core Web API](/quickstart/backend/aspnet-core-webapi)</td>
<td><a href="/quickstart/backend/aspnet-core-webapi">ASP.NET Core Web API</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[ASP.NET Web API (OWIN)](/quickstart/backend/webapi-owin)</td>
<td><a href="/quickstart/backend/webapi-owin">ASP.NET Web API (OWIN)</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[ASP.NET Web API (System.Web)](/quickstart/backend/aspnet-webapi)</td>
<td><a href="/quickstart/backend/aspnet-webapi">ASP.NET Web API (System.Web)</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Falcor](/quickstart/backend/falcor)</td>
<td><a href="/quickstart/backend/falcor">Falcor</a></td>
<td></td>
<td></td>
<td>X</td>
</tr>
<tr>
- <td>[Go](/quickstart/backend/golang)</td>
<td><a href="/quickstart/backend/golang">Go</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Hapi.js](/quickstart/backend/hapi)</td>
<td><a href="/quickstart/backend/hapi">Hapi.js</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Java Spring Security](/quickstart/backend/java-spring-security)</td>
<td><a href="/quickstart/backend/java-spring-security">Java Spring Security</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Nginx](/quickstart/backend/nginx)</td>
<td><a href="/quickstart/backend/nginx">Nginx</a></td>
<td></td>
<td></td>
<td>X</td>
</tr>
<tr>
- <td>[Node.js (Express)](/quickstart/backend/nodejs)</td>
<td><a href="/quickstart/backend/nodejs">Node.js (Express)</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[PHP](/quickstart/backend/php)</td>
<td><a href="/quickstart/backend/php">PHP</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[PHP (Laravel)](/quickstart/backend/php-laravel)</td>
<td><a href="/quickstart/backend/php-laravel">PHP (Laravel)</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[PHP (Symfony)](/quickstart/backend/php-symfony)</td>
<td><a href="/quickstart/backend/php-symfony">PHP (Symfony)</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Python](/quickstart/backend/python)</td>
<td><a href="/quickstart/backend/python">Python</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Relay](/quickstart/backend/relay)</td>
<td><a href="/quickstart/backend/relay">Relay</a></td>
<td></td>
<td></td>
<td>X</td>
</tr>
<tr>
- <td>[Ruby](/quickstart/backend/ruby)</td>
<td><a href="/quickstart/backend/ruby">Ruby</a></td>
<td></td>
<td>X</td>
<td></td>
</tr>
<tr>
- <td>[Ruby on Rails](/quickstart/backend/rails)</td>
<td><a href="/quickstart/backend/rails">Ruby on Rails</a></td>
<td></td>
<td>X</td>
| 2 |
diff --git a/lib/file.js b/lib/file.js @@ -54,7 +54,7 @@ var LINK_STYLE_REGEX = File.LINK_STYLE_REGEX = /\[(.+?)\]\(#([\w\-]+?)(:)(\d+?\.
var CODE_BLOCK_REGEX = File.CODE_BLOCK_REGEX = /`{3}[\s\S]*?`{3}/gm;
var INLINE_CODE_REGEX = File.INLINE_CODE_REGEX = /`[\s\S]*?`/g;
var CODE_STYLE_END = "((:)(\\d+)?)?(.*)$";
-var CODE_STYLE_PATTERN = File.CODE_STYLE_PATTERN = "([A-Z]+[A-Z-_]{2,})" + CODE_STYLE_END;
+var CODE_STYLE_PATTERN = File.CODE_STYLE_PATTERN = "([A-Z]+[A-Z-_]+?)" + CODE_STYLE_END;
var HASH_STYLE_REGEX = File.HASH_STYLE_REGEX = /#([\w\-]+?):(\d+?\.?\d*?)?\s+(.*)$/gm;
var getTaskId = File.getTaskId = function(path, line, text) {
| 11 |
diff --git a/app/models/post.rb b/app/models/post.rb @@ -61,16 +61,75 @@ class Post < ActiveRecord::Base
preference :formatting, :string, default: FORMATTING_SIMPLE
ALLOWED_TAGS = %w(
- a abbr acronym b blockquote br cite code dl dt em embed h1 h2 h3 h4 h5 h6 hr i
- iframe img li object ol p param pre s small strike strong sub sup tt ul
- table thead tfoot tr td th
- audio source
+ a
+ abbr
+ acronym
+ audio
+ b
+ blockquote
+ br
+ cite
+ code
div
+ dl
+ dt
+ em
+ embed
+ h1
+ h2
+ h3
+ h4
+ h5
+ h6
+ hr
+ i
+ iframe
+ img
+ li
+ object
+ ol
+ p
+ param
+ pre
+ s
+ small
+ source
+ strike
+ strong
+ sub
+ sup
+ table
+ td
+ tfoot
+ th
+ thead
+ tr
+ tt
+ ul
)
ALLOWED_ATTRIBUTES = %w(
- href src width height alt cite title class name xml:lang abbr value align style controls preload
- frameborder frameBorder seamless
+ abbr
+ align
+ alt
+ cite
+ class
+ controls
+ frameborder
+ frameBorder
+ height
+ href
+ name
+ preload
+ rel
+ seamless
+ src
+ style
+ target
+ title
+ value
+ width
+ xml:lang
)
def user_must_be_on_site_long_enough
| 11 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -6,6 +6,9 @@ The history of all changes to react-polymorph.
vNext
=====
+0.9.2
+=====
+
### Features
- Adds new `ScrollBar` component and integrates it into existing react-polymorph components. Refactors all snapshot tests to use enzyme for full DOM node rendering. [PR 129](https://github.com/input-output-hk/react-polymorph/pull/129)
| 6 |
diff --git a/src/common/blockchain/interface-blockchain/blocks/Interface-Blockchain-Block.js b/src/common/blockchain/interface-blockchain/blocks/Interface-Blockchain-Block.js @@ -29,6 +29,11 @@ class InterfaceBlockchainBlock {
this.height = (typeof height === "number" ? height : null); // index set by me
+ if (blockValidation === undefined)
+ blockValidation = this.blockchain.createBlockValidation();
+
+ this.blockValidation = blockValidation;
+
if ( timeStamp === undefined || timeStamp === null) {
timeStamp = this.blockchain.timestamp.networkAdjustedTime - BlockchainGenesis.timeStampOffset;
@@ -67,11 +72,6 @@ class InterfaceBlockchainBlock {
this.reward = undefined;
- if (blockValidation === undefined)
- blockValidation = this.blockchain.createBlockValidation();
-
- this.blockValidation = blockValidation;
-
this.db = db;
this._socketPropagatedBy = undefined;
| 12 |
diff --git a/components/Article/Progress/index.js b/components/Article/Progress/index.js @@ -56,14 +56,10 @@ class Progress extends Component {
}
this.onScroll = () => {
- const { article } = this.props
-
+ this.saveProgress()
+ if (this.state.restore) {
const y = window.pageYOffset
- const downwards = this.lastY === undefined || y > this.lastY
- if (article) {
- this.saveProgress(article.id, downwards)
- if (this.state.restore) {
const restoreOpacity = 1 - Math.min(
1,
Math.max(RESTORE_MIN, y - RESTORE_AREA) / RESTORE_FADE_AREA
@@ -73,33 +69,40 @@ class Progress extends Component {
}
}
}
- this.lastY = y
- }
- this.saveProgress = debounce((documentId, downwards) => {
- if (!this.isTrackingAllowed()) {
+ this.saveProgress = debounce(() => {
+ const { article } = this.props
+ if (!article || !this.isTrackingAllowed()) {
return
}
- // We only persist progress for a downward scroll, but we still measure
- // an upward scroll to keep track of the current reading position.
+ // measure between debounced calls
+ // - to handle bouncy upwards scroll on iOS
+ // e.g. y200 -> y250 in onScroll -> bounce back to y210
+ const y = window.pageYOffset
+ const downwards = this.lastY === undefined || y > this.lastY
+ this.lastY = y
+
+ if (!downwards) {
+ return
+ }
const element = this.getClosestElement()
const percentage = this.getPercentage()
- const storedUserProgress = this.props.article && this.props.article.userProgress
+
if (
- downwards &&
element &&
element.nodeId &&
percentage > 0 &&
- element.index >= MIN_INDEX && // ignore first two elements.
+ // ignore elements until min index
+ element.index >= MIN_INDEX &&
(
- !storedUserProgress ||
- storedUserProgress.nodeId !== element.nodeId ||
- Math.floor(storedUserProgress.percentage * 100) !== Math.floor(percentage * 100)
+ !article.userProgress ||
+ article.userProgress.nodeId !== element.nodeId ||
+ Math.floor(article.userProgress.percentage * 100) !== Math.floor(percentage * 100)
)
) {
this.props.upsertDocumentProgress(
- documentId,
+ article.id,
percentage,
element.nodeId
)
| 9 |
diff --git a/src/components/dashboard/Marketplace.web.js b/src/components/dashboard/Marketplace.web.js @@ -27,8 +27,10 @@ const MarketTab = props => {
if (newtoken !== undefined && newtoken !== token) {
token = newtoken
userStorage.setProfileField('marketToken', newtoken)
+ if (token == null) {
setLoginToken(newtoken)
}
+ }
log.debug('got market login token', token)
if (token == null) {
//continue to market without login in
@@ -59,12 +61,11 @@ const MarketTab = props => {
return (
<iframe
title="GoodMarket"
- scrolling="yes"
onLoad={isLoaded}
src={src}
seamless
frameBorder="0"
- style={{ flex: 1 }}
+ style={{ flex: 1, overflow: 'scroll' }}
/>
)
}
| 0 |
diff --git a/src/layouts/EnterpriseLayout.js b/src/layouts/EnterpriseLayout.js @@ -282,8 +282,7 @@ class EnterpriseLayout extends PureComponent {
if (!currentUser || !rainbondInfo || enterpriseList.length === 0) {
return <Redirect to={`/user/login?${queryString}`} />;
}
- const fetchLogo =
- rainbondUtil.fetchLogo(enterpriseInfo, enterprise) || logo;
+ const fetchLogo = rainbondUtil.fetchLogo(rainbondInfo, enterprise) || logo;
const customHeader = () => {
return (
<div className={headerStype.enterprise}>
| 1 |
diff --git a/articles/support/matrix.md b/articles/support/matrix.md @@ -152,60 +152,6 @@ At this time, Auth0 only supports use of the Dashboard with desktop browsers.
</tbody>
</table>
-#### Desktop Browsers
-
-<table class="table">
- <thead>
- <tr>
- <th width="80%">Browser</th>
- <th width="20%">Level of Support</td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Google Chrome (Latest version)</td>
- <td><div class="label label-primary">Supported</div></td>
- </tr>
- <tr>
- <td>Apple Safari (Latest version)</td>
- <td><div class="label label-warning">Supported</div></td>
- </tr>
- <tr>
- <td>Microsoft Internet Explorer 10/11</td>
- <td><div class="label label-warning">Supported</div></td>
- </tr>
- <tr>
- <td>Microsoft Edge (Latest version)</td>
- <td><div class="label label-warning">Supported</div></td>
- </tr>
- <tr>
- <td>Mozilla Firefox (Latest version)</td>
- <td><div class="label label-warning">Supported</div></td>
- </tr>
- </tbody>
-</table>
-
-#### Mobile Browsers
-
-<table class="table">
- <thead>
- <tr>
- <th width="80%">Mobile browser</th>
- <th width="20%">Level of Support</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Apple Safari for iOS 9 (or later)</td>
- <td><div class="label label-primary">Supported</div></td>
- </tr>
- <tr>
- <td>Google Chrome for Android KitKat (4.4) or later</td>
- <td><div class="label label-primary">Supported</div></td>
- </tr>
- </tbody>
-</table>
-
## Operating Systems
This section covers the operating systems (OS) that Auth0 will support when using the Auth0 Dashboard, Lock Library or executing authentication transactions.
| 2 |
diff --git a/token-metadata/0x8a6f3BF52A26a21531514E23016eEAe8Ba7e7018/metadata.json b/token-metadata/0x8a6f3BF52A26a21531514E23016eEAe8Ba7e7018/metadata.json "symbol": "MXX",
"address": "0x8a6f3BF52A26a21531514E23016eEAe8Ba7e7018",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/nodes/addon/components/driver-vmwarevsphere/component.js b/lib/nodes/addon/components/driver-vmwarevsphere/component.js @@ -149,7 +149,6 @@ export default Component.extend(NodeDriver, {
let config = get(this, 'globalStore').createRecord({
type: CONFIG,
- password: '',
cpuCount: 2,
memorySize: 2048,
diskSize: 20000,
| 2 |
diff --git a/semcore/widget-empty/src/WidgetEmpty.js b/semcore/widget-empty/src/WidgetEmpty.js @@ -10,7 +10,7 @@ const version = preval`
`;
export const getIconPath = (name) => {
- return `http://static.semrush.com/ui-kit/widget-empty/${version}/${name}.svg`;
+ return `https://static.semrush.com/ui-kit/widget-empty/${version}/${name}.svg`;
};
class WidgetEmpty extends Component {
| 13 |
diff --git a/src/service/alert.service.ts b/src/service/alert.service.ts @@ -40,7 +40,7 @@ export class AlertService {
private alerts: Alert[];
private timeout: number;
- constructor(private sanitizer: Sanitizer, private toast?: boolean, private translateService?: TranslateService) {
+ constructor(private sanitizer: Sanitizer, private toast = false, private translateService?: TranslateService) {
this.alertId = 0; // unique id for each alert. Starts from 0.
this.alerts = [];
this.timeout = 5000; // default timeout in milliseconds
| 7 |
diff --git a/build.gradle b/build.gradle @@ -153,17 +153,19 @@ distributions {
from jar
from runner
from modules
- from javadoc
+ from(javadoc) {
+ into 'docs/java'
+ }
}
}
}
assemble.dependsOn(modules, runner)
distZip {
- dependsOn copyDependencies
+ dependsOn clean, copyDependencies
}
distTar {
- dependsOn copyDependencies
+ dependsOn clean, copyDependencies
compression Compression.GZIP
}
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,15 @@ 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.29.1] -- 2017-07-25
+
+### Fixed
+- Fix axis line rendering when `showticklabels` is false
+ (bug introduced in 1.29.0) [#1910]
+- Fix histogram auto bin restyle [#1901]
+- Fix colorbar edge case that caused infinite loops [#1906]
+
+
## [1.29.0] -- 2017-07-19
### Added
| 3 |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml name: End-to-end tests
-on: [push]
+on: [push, pull_request]
jobs:
tests:
- runs-on: windows-latest
+ runs-on: ubuntu-20.04
strategy:
matrix:
adapter: ['vue']
- browser: ['chrome', 'edge', 'firefox']
+ browser: ['chrome', 'firefox']
steps:
- name: Checkout
| 8 |
diff --git a/package.json b/package.json "hot-shots": "^6.3.0",
"klasa": "github:dirigeants/klasa#master",
"klasa-dashboard-hooks": "github:PenguBot/klasa-dashboard-hooks",
- "klasa-member-gateway": "github:dirigeants/klasa-member-gateway",
+ "klasa-member-gateway": "github:MrJacz/klasa-member-gateway",
"kurasuta": "^0.2.18",
"node-fetch": "^2.6.0",
"raven": "^2.6.4",
| 4 |
diff --git a/ui/component/claimMenuList/view.jsx b/ui/component/claimMenuList/view.jsx @@ -271,7 +271,7 @@ function ClaimMenuList(props: Props) {
</>
)}
- {channelUri && !claimIsMine && !isMyCollection ? !incognito && (
+ {(!claimIsMine || channelIsBlocked) && channelUri && !isMyCollection ? !incognito && (
<>
<MenuItem className="comment__menu-option" onSelect={handleToggleBlock}>
<div className="menu__link">
| 11 |
diff --git a/lib/elastic_model/acts_as_elastic_model.rb b/lib/elastic_model/acts_as_elastic_model.rb @@ -76,8 +76,10 @@ module ActsAsElasticModel
scope = scope.where(id: filter_ids)
end
if indexed_before = options.delete(:indexed_before)
+ if column_names.include?( "last_indexed_at" )
scope = scope.where("last_indexed_at IS NULL OR last_indexed_at < ?", indexed_before)
end
+ end
# indexing can be delayed
if options.delete(:delay)
# make sure to fetch the results of the scope and store
| 1 |
diff --git a/snippets/social/docomo/3.md b/snippets/social/docomo/3.md ### Set up app in Docomo
-Set up an app in the [docomo Developer Portal](https://dev.smt.docomo.ne.jp/?p=login) using Docomo's [Beginner's Guide](https://dev.smt.docomo.ne.jp/?p=about.api).
+Set up an app following the steps on the [dAccount Connect Page](https://id.smt.docomo.ne.jp/src/dlogin/ctop_method.html).
While setting up your app, use the following settings:
| 3 |
diff --git a/src/structs/db/Feed.js b/src/structs/db/Feed.js @@ -380,7 +380,7 @@ class Feed extends FilterBase {
if (this.title.length > 200) {
this.title = this.title.slice(0, 200) + '...'
}
- const allArticlesHaveDates = articleList.reduce((acc, article) => acc && (!!article.pubdate), true)
+ const allArticlesHaveDates = articleList.every(article => !!article.pubdate)
if (!allArticlesHaveDates) {
this.checkDates = false
}
| 14 |
diff --git a/js/webcomponents/bisweb_treeviewer.js b/js/webcomponents/bisweb_treeviewer.js @@ -716,10 +716,10 @@ class TreeViewer extends HTMLElement {
loadNetworkFromFile() {
let existingNetwork = this.network;
let hiddenFileButton = webutil.createhiddeninputfile('.json, .JSON', (file) => {
- let reader = new FileReader();
- reader.onload = () => {
+ io.read(file).then( (text) => {
+ console.log('text', text);
try {
- let newNetwork = JSON.parse(reader.result).network;
+ let newNetwork = JSON.parse(text.data).network;
//recursive function that will replace the id of a given node then call itself on all the node's children
let parseNode = (node) => {
@@ -746,10 +746,7 @@ class TreeViewer extends HTMLElement {
} catch (err) {
console.log('an error occured when parsing the file', err);
}
- }
-
- reader.readAsText(file);
-
+ });
}, false);
hiddenFileButton.click();
| 1 |
diff --git a/app/shared/containers/Global/Account/Fragment/Ram/Value.js b/app/shared/containers/Global/Account/Fragment/Ram/Value.js @@ -47,8 +47,7 @@ class GlobalAccountFragmentRamValue extends PureComponent<Props> {
const mapStateToProps = (state, ownProps) => {
const account = ownProps.account.replace('.', '\\.');
const { ram } = state.globals;
-
- if (Object.keys(ram).length === 0) {
+ if (!ram || Object.keys(ram).length === 0) {
return {};
}
const quote = parseFloat(get(ram, 'quote_balance', '0').split(' ')[0]);
| 1 |
diff --git a/includes/Discovery.php b/includes/Discovery.php @@ -41,15 +41,7 @@ class Discovery {
* @return void
*/
public function init() {
- add_action(
- 'web_stories_story_head',
- static function () {
- // Theme support for title-tag is implied for stories. See _wp_render_title_tag().
- echo '<title>' . esc_html( wp_get_document_title() ) . '</title>' . "\n";
- },
- 1
- );
-
+ add_action( 'web_stories_story_head', [ $this, 'print_metadata' ], 1 );
add_action( 'web_stories_story_head', [ $this, 'print_schemaorg_metadata' ] );
add_action( 'web_stories_story_head', [ $this, 'print_open_graph_metadata' ] );
add_action( 'web_stories_story_head', [ $this, 'print_twitter_metadata' ] );
@@ -70,6 +62,21 @@ class Discovery {
add_action( 'web_stories_story_head', 'wp_oembed_add_discovery_links' );
}
+ /**
+ * Prints general metadata on the single story template.
+ *
+ * Theme support for title tag is implied for stories.
+ *
+ * @see _wp_render_title_tag().
+ *
+ * @return void
+ */
+ public function print_metadata() {
+ ?>
+ <title><?php echo esc_html( wp_get_document_title() ); ?></title>
+ <?php
+ }
+
/**
* Prints the schema.org metadata on the single story template.
*
| 14 |
diff --git a/_config.yml b/_config.yml @@ -160,9 +160,9 @@ sass:
# AlgoliaSearch-Jekyll: https://github.com/algolia/algoliasearch-jekyll/
algolia:
- application_id: 'ITI5JHZJM9'
+ application_id: 'QHKS75PWSL'
index_name: 'diybiosphere'
- search_only_api_key: 'b427318cf6d881e5d3ffd84adf39219e'
+ search_only_api_key: '673caf95bfb06c37851128315e930c73'
indexing_batch_size: 100
nodes_to_index: 'p,blockquote,li'
files_to_exclude:
| 3 |
diff --git a/utility_scripts/configureCMK.py b/utility_scripts/configureCMK.py @@ -52,8 +52,11 @@ cmk_roles_logical_ids = [
'S3AccessRole',
'FirehoseESS3Role',
'AdminRole',
- 'ESProxyLambdaRole',
- 'FulfillmentLambdaRole'
+ 'ExportRole',
+ 'ImportRole',
+ 'ApiGatewayRole',
+ 'ESCognitoRole',
+ 'KibanaRole',
]
cmk_roles_physical_ids = []
@@ -197,8 +200,9 @@ def process_stacks(stackname):
}
)
- role_resources = filter(lambda x: x["LogicalResourceId"] in cmk_roles_logical_ids, response["StackResourceSummaries"])
+ role_resources = filter(lambda x: 'LambdaRole' in x["LogicalResourceId"] or x["LogicalResourceId"] in cmk_roles_logical_ids , response["StackResourceSummaries"])
for role_resource in role_resources:
+ print(f"role_resource: {role_resource['PhysicalResourceId']}")
cmk_roles_physical_ids.append(role_resource["PhysicalResourceId"])
assign_role(role_resource["PhysicalResourceId"])
| 3 |
diff --git a/nightwatch.json b/nightwatch.json "start_process": true,
"server_path": "./node_modules/.bin/chromedriver",
"port": 9515,
- "log_path": false
+ "log_path": "tests/browser/output"
},
"desiredCapabilities": {
"browserName": "chrome"
| 0 |
diff --git a/app/native/src/types/Navigation.js b/app/native/src/types/Navigation.js // @flow
+type NavigationStateParameters = Object;
+
+/**
+ * @see https://reactnavigation.org/docs/navigators/navigation-prop
+ */
export type Navigation = {
- navigate: (screen: string, parameters?: Object) => void,
+ navigate: (routeName: string, parameters?: NavigationStateParameters) => void,
state: {
- params: Object,
+ params: NavigationStateParameters,
},
+ setParams: (newParameters: NavigationStateParameters) => void,
+ goBack: () => void,
};
| 7 |
diff --git a/react/src/components/footer/SprkFooter.js b/react/src/components/footer/SprkFooter.js @@ -340,7 +340,7 @@ SprkFooter.propTypes = {
altText: PropTypes.string.isRequired,
/**
* Expects a space separated string of
- * classes to be added to the component.
+ * classes to be added to the award image.
*/
addClasses: PropTypes.string,
/**
| 7 |
diff --git a/src/clipboard.js b/src/clipboard.js @@ -20,7 +20,7 @@ export function onPaste(e, saver, invalidImageSelector, fileTypes, sanitize) {
function onPasteBlob(event, file, saver, fileTypes) {
event.preventDefault()
if (fileTypes.indexOf(file.type) >= 0) {
- saver({ data: file, type: file.type, id: String(new Date().getTime()) }).then((screenshotUrl) => {
+ saver({ data: file, type: file.type }).then((screenshotUrl) => {
const img = `<img src="${screenshotUrl}"/>`
window.document.execCommand('insertHTML', false, img)
})
@@ -59,11 +59,7 @@ function markAndGetInlineImagesAndRemoveForbiddenOnes($editor, invalidImageSelec
const images = $editor
.find('img[src^="data:image/"]')
.toArray()
- .map((el) =>
- Object.assign(decodeBase64Image(el.getAttribute('src')), {
- el: el,
- })
- )
+ .map((el) => ({ ...decodeBase64Image(el.getAttribute('src')), el }))
images
.filter(({ type }) => fileTypes.indexOf(type) === -1 && type !== 'image/svg+xml')
.forEach(({ el }) => el.remove())
| 2 |
diff --git a/packages/cx/src/widgets/overlay/Window.d.ts b/packages/cx/src/widgets/overlay/Window.d.ts -import * as Cx from '../../core';
-import { OverlayProps } from './Overlay';
+import * as Cx from "../../core";
+import { OverlayProps } from "./Overlay";
interface WindowProps extends OverlayProps {
-
/** Text to be displayed in the header. */
- title?: Cx.StringProp,
+ title?: Cx.StringProp;
/** Controls the close button visibility. Defaults to `true`. */
- closable?: Cx.BooleanProp,
+ closable?: Cx.BooleanProp;
/** A custom style which will be applied to the body. */
- bodyStyle?: Cx.StyleProp,
+ bodyStyle?: Cx.StyleProp;
/** A custom style which will be applied to the header. */
- headerStyle?: Cx.StyleProp,
+ headerStyle?: Cx.StyleProp;
/** A custom style which will be applied to the footer. */
- footerStyle?: Cx.StyleProp
+ footerStyle?: Cx.StyleProp;
/** Base CSS class to be applied to the field. Defaults to `window`. */
- baseClass?: string,
+ baseClass?: string;
+
+ /** Additional CSS class to be applied to the section body. */
+ bodyClass?: Cx.ClassProp;
/** Set to `true` to enable resizing. */
- resizable?: boolean,
+ resizable?: boolean;
/** Set to `true` to automatically focus the field, after it renders for the first time. */
- autoFocus?: boolean,
+ autoFocus?: boolean;
/** Set to `false` to prevent the window itself to be focusable. Default value is true.*/
- focusable?: boolean,
+ focusable?: boolean;
/** Set to `true` to disable moving the window by dragging the header. */
- fixed?: boolean,
-
+ fixed?: boolean;
}
export class Window extends Cx.Widget<WindowProps> {}
| 0 |
diff --git a/JSONSchema/st-filler-schema.json b/JSONSchema/st-filler-schema.json { "$ref": "#/definitions/ConfusedHexType" }
]
},
+ "PrefixedHexOrInteger": {
+ "anyOf": [
+ { "$ref": "#/definitions/IntegerString" },
+ { "$ref": "#/definitions/HexData" }
+ ]
+ },
"PreStateAccount": {
"type": "object",
"additionalproperties": true,
"additionalProperties": false,
"patternProperties": {
"^0x[0-9a-f]+": {
- "description": "storage key with 0x prefix, just the prefix `0x` is null and thus not permitted, a hex quantity is permitted. for the storage value, only hex data is permitted.",
- "$ref": "#/definitions/HexData"
+ "description": "storage key with 0x prefix, just the prefix `0x` is null and thus not permitted, a hex quantity is permitted. for the storage value, only hex data is permitted in filled test. Both decimal and hex allowed for the fillers.",
+ "$ref": "#/definitions/PrefixedHexOrInteger"
}
}
}
| 11 |
diff --git a/common/lib/client/auth.ts b/common/lib/client/auth.ts @@ -443,11 +443,11 @@ class Auth {
} else if(authOptions.authUrl) {
Logger.logAction(Logger.LOG_MINOR, 'Auth.requestToken()', 'using token auth with authUrl');
tokenRequestCallback = function(params: Record<string, unknown>, cb: Function) {
- var authHeaders = Utils.mixin({accept: 'application/json, text/plain'}, authOptions.authHeaders) as Record<string, string>,
- usePost = authOptions.authMethod && authOptions.authMethod.toLowerCase() === 'post',
- providedQsParams;
+ const authHeaders = Utils.mixin({accept: 'application/json, text/plain'}, authOptions.authHeaders) as Record<string, string>;
+ const usePost = authOptions.authMethod && authOptions.authMethod.toLowerCase() === 'post';
+ let providedQsParams;
/* Combine authParams with any qs params given in the authUrl */
- var queryIdx = authOptions.authUrl.indexOf('?');
+ const queryIdx = authOptions.authUrl.indexOf('?');
if(queryIdx > -1) {
providedQsParams = Utils.parseQueryString(authOptions.authUrl.slice(queryIdx));
authOptions.authUrl = authOptions.authUrl.slice(0, queryIdx);
| 14 |
diff --git a/bin/definition/index.js b/bin/definition/index.js @@ -104,7 +104,7 @@ function normalize(data) {
// check if enum matches
} else if (validator.enum && (message = checkEnum(data))) {
message.length === 1
- ? exception('Value must equal: ' + message[0] + '. Received: ' + util.smart(value))
+ ? exception('Value must be ' + util.smart(message[0]) + '. Received: ' + util.smart(value))
: exception('Value must be one of: ' + message.join(', ') + '. Received: ' + util.smart(value));
} else if (type === 'array') {
@@ -126,7 +126,7 @@ function normalize(data) {
result = {};
if (validator.additionalProperties) {
Object.keys(value).forEach(key => {
- result[key] = normalize({
+ const param = {
exception: exception.at(key),
key,
major,
@@ -136,7 +136,19 @@ function normalize(data) {
validator: validator.additionalProperties,
value: value[key],
warn: warn.at(key)
- });
+ };
+
+ const allowed = validator.additionalProperties.hasOwnProperty('allowed')
+ ? fn(validator.additionalProperties.allowed, param)
+ : true;
+
+ if (allowed === true) {
+ result[key] = normalize(param);
+ } else {
+ let message = 'Property not allowed: ' + key;
+ if (typeof allowed[key] === 'string') message += '. ' + allowed[key];
+ exception(message)
+ }
});
} else if (!validator.properties) {
@@ -147,7 +159,6 @@ function normalize(data) {
} else {
const allowed = {};
const missingRequired = [];
- const notAllowed = [];
const properties = validator.properties;
// check for missing required and set defaults
@@ -175,7 +186,8 @@ function normalize(data) {
if (validator.required && fn(validator.required, param)) {
missingRequired.push(key);
} else if (validator.hasOwnProperty('default')) {
- value[key] = fn(validator.default, param);
+ const defaultValue = fn(validator.default, param);
+ if (defaultValue !== undefined) value[key] = defaultValue;
}
}
});
@@ -188,8 +200,10 @@ function normalize(data) {
result[key] = value[key];
// check if property allowed
- } else if (!allowed[key]) {
- notAllowed.push(key);
+ } else if (allowed[key] !== true) {
+ let message = 'Property not allowed: ' + key;
+ if (typeof allowed[key] === 'string') message += '. ' + allowed[key];
+ exception(message)
} else if (!validator.ignore || !fn(validator.ignore, {
exception,
@@ -221,11 +235,6 @@ function normalize(data) {
missingRequired.sort();
exception('Missing required propert' + (missingRequired.length === 1 ? 'y' : 'ies') + ': ' + missingRequired.join(', '));
}
-
- // report not allowed properties
- if (notAllowed.length) {
- exception('Propert' + (notAllowed.length === 1 ? 'y' : 'ies') + ' not allowed: ' + notAllowed.join(', '));
- }
}
} else {
| 7 |
diff --git a/src/js/modules/Download/defaults/downloaders/pdf.js b/src/js/modules/Download/defaults/downloaders/pdf.js @@ -98,7 +98,7 @@ export default function(list, options, setFileContents){
}
if(title){
- autoTableParams.addPageContent = function(data) {
+ autoTableParams.didDrawPage = function(data) {
doc.text(title, 40, 30);
};
}
| 14 |
diff --git a/package.json b/package.json "bootstrap-colorpicker": "2.5.0",
"browserify": "13.0.0",
"browserify-shim": "3.8.12",
- "camshaft-reference": "0.32.0",
+ "camshaft-reference": "0.33.0",
"carto": "cartodb/carto#master",
"cartodb-deep-insights.js": "cartodb/deep-insights.js#master",
"cartodb-pecan": "0.2.x",
| 3 |
diff --git a/src/selectors/index.js b/src/selectors/index.js @@ -25,9 +25,6 @@ export const selectEventFilters = (state: State): EventFiltersState =>
export const selectSavedEvents = (state: State): SavedEvents =>
state.savedEvents;
-// The selectors below are temporary so that we can memoize across
-// multiple components. This will be refactored.
-
const getEvents = createSelector([selectData], selectEvents);
const getShowEventsAfter = createSelector(
| 2 |
diff --git a/OurUmbraco/Documentation/Busineslogic/GithubSourcePull/ZipDownloader.cs b/OurUmbraco/Documentation/Busineslogic/GithubSourcePull/ZipDownloader.cs @@ -253,7 +253,7 @@ namespace OurUmbraco.Documentation.Busineslogic.GithubSourcePull
return 5;
case "add-ons":
return 6;
- case "umbraco-as-a-service":
+ case "umbraco-cloud":
return 7;
}
break;
@@ -320,8 +320,15 @@ namespace OurUmbraco.Documentation.Busineslogic.GithubSourcePull
return 1;
case "deployment":
return 2;
- case "troubleshooting":
+ case "databases":
return 3;
+ case "upgrades":
+ return 4;
+ case "troubleshooting":
+ return 5;
+ case "frequently-asked-questions":
+ return 6;
+
}
break;
@@ -442,21 +449,59 @@ namespace OurUmbraco.Documentation.Busineslogic.GithubSourcePull
case "architechture":
return 3;
- //UaaS - Getting Started
+ //Umbraco Cloud - Getting Started
case "baselines":
return 0;
- case "baseline-merge-conflicts":
+ case "migrate-existing-site":
return 1;
- //UaaS - Set Up
+ //Umbraco Cloud - Set Up
case "working-locally":
return 0;
- case "team-members":
- return 1;
case "visual-studio":
+ return 1;
+ case "working-with-visual-studio":
return 2;
+ case "working-with-uaas-cli":
+ return 3;
+ case "team-members":
+ return 4;
case "media":
+ return 5;
+ case "smtp-settings":
+ return 6;
+ case "config-transforms":
+ return 7;
+ case "power-tools":
+ return 8;
+
+ //Umbraco Cloud - Deployment
+ case "local-to-cloud":
+ return 0;
+ case "cloud-to-cloud":
+ return 1;
+ case "content-transfer":
+ return 2;
+ case "restoring-content":
+ return 3;
+ case "deployment-webhook":
+ return 4;
+
+ //Umbraco Cloud - Troubleshooting
+ case "content-deploy-schema":
+ return 0;
+ case "content-deploy-error":
+ return 1;
+ case "structure-error":
+ return 2;
+ case "duplicate-dictionary-items":
return 3;
+ case "moving-from-courier-to-deploy":
+ return 4;
+ case "minor-upgrades":
+ return 5;
+ case "plugins-known-issues":
+ return 6;
}
break;
| 3 |
diff --git a/src/components/common/TmSessionExplore.vue b/src/components/common/TmSessionExplore.vue </div>
<div class="tm-li-session-text">
<div class="tm-li-session-title">
- <span>{{ shortenAddress(account.address) }}</span>
+ <span>{{ account.address | formatBech32(false, 12) }}</span>
<p class="tm-li-session-subtitle">
{{ getAddressTypeDescription(account.type) }}
</p>
@@ -75,6 +75,8 @@ import TmFormStruct from "common/TmFormStruct"
import TmField from "common/TmField"
import TmFormMsg from "common/TmFormMsg"
import bech32 from "bech32"
+import { formatBech32 } from "src/filters"
+
export default {
name: `session-explore`,
components: {
@@ -85,6 +87,9 @@ export default {
TmFormMsg,
TmFormStruct
},
+ filters: {
+ formatBech32
+ },
data: () => ({
address: ``,
error: ``
@@ -132,9 +137,6 @@ export default {
if (addressType === "ledger") return `Ledger Nano S`
if (addressType === "extension") return `Lunie Browser Extension`
},
- shortenAddress(address) {
- return `${address.substring(0, 12)}...${address.substring(address.length - 12)}`
- },
exploreWith(address) {
this.address = address
this.onSubmit()
| 14 |
diff --git a/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/index.test.js b/assets/js/modules/analytics-4/components/dashboard/ActivationBanner/index.test.js @@ -27,7 +27,6 @@ import {
unsubscribeFromAll,
} from '../../../../../../../tests/js/test-utils';
import ActivationBanner from './index';
-import { MODULES_ANALYTICS } from '../../../../analytics/datastore/constants';
describe( 'ActivationBanner', () => {
let registry;
@@ -89,7 +88,6 @@ describe( 'ActivationBanner', () => {
slug: 'analytics',
active: true,
connected: true,
- owner: { id: 1, login: 'test-owner-username' },
},
{
slug: 'analytics-4',
@@ -97,20 +95,12 @@ describe( 'ActivationBanner', () => {
connected: false,
},
] );
- fetchMock.postOnce(
- /^\/google-site-kit\/v1\/core\/modules\/data\/check-access/,
- { body: { access: true } }
- );
- registry
- .dispatch( MODULES_ANALYTICS )
- .receiveGetSettings( { ownerID: 1 } );
} );
const { container, waitForRegistry } = render( <ActivationBanner />, {
registry,
} );
await waitForRegistry();
-
expect( container.childElementCount ).toBe( 1 );
} );
} );
| 2 |
diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx @@ -129,7 +129,7 @@ class Splash extends React.Component {
useCsrf: true,
json: {cue: cue, value: false}
}, err => {
- if (!err) this.props.dispatch(sessionActions.refreshSession());
+ if (!err) this.props.refreshSession();
});
}
shouldShowWelcome () {
@@ -178,7 +178,6 @@ class Splash extends React.Component {
Splash.propTypes = {
activity: PropTypes.arrayOf(PropTypes.object).isRequired,
- dispatch: PropTypes.func,
featured: PropTypes.shape({
community_featured_projects: PropTypes.array,
community_featured_studios: PropTypes.array,
@@ -204,6 +203,7 @@ Splash.propTypes = {
isAdmin: PropTypes.bool,
isEducator: PropTypes.bool,
loved: PropTypes.arrayOf(PropTypes.object).isRequired,
+ refreshSession: PropTypes.func.isRequired,
sessionStatus: PropTypes.string,
setRows: PropTypes.func.isRequired,
shared: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -257,6 +257,9 @@ const mapDispatchToProps = dispatch => ({
getLovedByFollowing: (username, token) => {
dispatch(splashActions.getLovedByFollowing(username, token));
},
+ refreshSession: () => {
+ dispatch(sessionActions.refreshSession());
+ },
setRows: (type, rows) => {
dispatch(splashActions.setRows(type, rows));
}
| 4 |
diff --git a/www/tablet/js/widget_pagebutton.js b/www/tablet/js/widget_pagebutton.js @@ -18,7 +18,9 @@ var Modul_pagebutton = function () {
function loadPage(elem) {
console.time('fetch content');
var sel = elem.data('load');
- var hashUrl = elem.data('url').replace('#', '');
+ var url = elem.data('url');
+ if (ftui.isValid(url)) {
+ var hashUrl = url.replace('#', '');
var lockID = ['ftui', me.widgetname, hashUrl, sel].join('_');
if (localStorage.getItem(lockID)) {
ftui.log(1, 'pagebutton load locked ID=' + lockID);
@@ -44,6 +46,7 @@ var Modul_pagebutton = function () {
});
});
}
+ }
function startReturnTimer(elem) {
| 1 |
diff --git a/src/containers/FlightDirector/SoftwarePanels/style.scss b/src/containers/FlightDirector/SoftwarePanels/style.scss left: 0;
border-right: solid 1px #eee;
transform: translateX(-100%);
- background-color: white;
+ background-color: rgba(0, 0, 0, 0.9);
transition: transform 0.5s ease;
z-index: 3;
}
| 1 |
diff --git a/.github/scripts/validateActionsAndWorkflows.sh b/.github/scripts/validateActionsAndWorkflows.sh #!/bin/bash
#
-# 1) Lints the yaml style
-# 2) Validates the Github Actions and workflows using the json schemas provided by https://www.schemastore.org/json/
+# Validates the Github Actions and workflows using the json schemas provided by https://www.schemastore.org/json/
-# Track exit codes so we can run a full lint, report errors, and exit with the correct code
+# Track exit codes separately so we can run a full validation, report errors, and exit with the correct code
declare EXIT_CODE=0
# Download the up-to-date json schemas for github actions and workflows
cd ./.github && mkdir ./tempSchemas || exit 1
-curl https://json.schemastore.org/github-action.json --output ./tempSchemas/github-action.json --silent
-curl https://json.schemastore.org/github-workflow.json --output ./tempSchemas/github-workflow.json --silent
+curl https://json.schemastore.org/github-action.json --output ./tempSchemas/github-action.json --silent || exit 1
+curl https://json.schemastore.org/github-workflow.json --output ./tempSchemas/github-workflow.json --silent || exit 1
# Validate the actions and workflows using the JSON schemas and ajv https://github.com/ajv-validator/ajv-cli
find ./actions/ -type f -name "*.yml" -print0 | xargs -0 -I file ajv -s ./tempSchemas/github-action.json -d file --strict=false || EXIT_CODE=1
| 7 |
diff --git a/src/components/TouchableWithoutFocus.js b/src/components/TouchableWithoutFocus.js @@ -26,10 +26,10 @@ const defaultProps = {
class TouchableWithoutFocus extends React.Component {
constructor(props) {
super(props);
- this.onPress = this.onPress.bind(this);
+ this.pressAndBlur = this.onPress.bind(this);
}
- onPress() {
+ pressAndBlur() {
if (!this.props.onPress) {
return;
}
@@ -39,7 +39,7 @@ class TouchableWithoutFocus extends React.Component {
render() {
return (
- <TouchableOpacity onPress={this.onPress} ref={e => this.touchableRef = e} style={this.props.styles}>
+ <TouchableOpacity onPress={this.pressAndBlur} ref={e => this.touchableRef = e} style={this.props.styles}>
{this.props.children}
</TouchableOpacity>
);
| 10 |
diff --git a/generators/cleanup.js b/generators/cleanup.js @@ -99,6 +99,10 @@ function cleanupOldFiles(generator) {
if (generator.isJhipsterVersionLessThan('6.6.1') && generator.configOptions && generator.configOptions.clientFramework === 'angularX') {
generator.removeFile(`${ANGULAR_DIR}core/language/language.helper.ts`);
}
+
+ if (generator.isJhipsterVersionLessThan('6.8.0') && generator.configOptions && generator.configOptions.clientFramework === 'angularX') {
+ generator.removeFile(`${ANGULAR_DIR}tsconfig-aot.json`);
+ }
}
/**
| 2 |
diff --git a/src/lib/constructor.js b/src/lib/constructor.js @@ -500,6 +500,11 @@ export default {
['preview', 'print']
];
+ /** RTL - buttons */
+ if (options.rtl) {
+ options.buttonList = options.buttonList.reverse();
+ }
+
/** --- Define icons --- */
// custom icons
options.icons = (!options.icons || typeof options.icons !== 'object') ? _icons : [_icons, options.icons].reduce(function (_default, _new) {
| 3 |
diff --git a/styles/es-component-styles.scss b/styles/es-component-styles.scss --es-admin-gray-900: #1E1E1E;
--es-admin-gray-950: #111111;
- --es-admin-red-500: #F44336;
+ --es-admin-red-500: #CF2E2E;
--es-admin-on-red-500: #FFFFFF;
- --es-admin-yellow-500: #FFEB3B;
+ --es-admin-yellow-500: #FF6900;
--es-admin-on-yellow-500: #212121;
--es-admin-green-500: #4CAF50;
--es-admin-on-green-500: #FFFFFF;
+ --es-admin-blue-500: #0693E3;
+ --es-admin-on-blue-500: #FFFFFF;
+
--es-admin-blue-gray-50: #ECEFF1;
--es-admin-on-blue-gray-50: #263238;
| 7 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-pagination/sprk-pagination.component.spec.ts b/angular/projects/spark-angular/src/lib/components/sprk-pagination/sprk-pagination.component.spec.ts import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
import { SprkIconComponent } from '../sprk-icon/sprk-icon.component';
-import { SprkLinkComponent } from '../sprk-link/sprk-link.component';
+import { SprkLinkDirective } from '../../directives/sprk-link/sprk-link.directive';
import {
SprkUnorderedListComponent
} from '../sprk-unordered-list/sprk-unordered-list.component';
@@ -17,12 +16,11 @@ describe('SprkPaginationComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- imports: [RouterTestingModule],
declarations: [
SprkPaginationComponent,
SprkUnorderedListComponent,
SprkIconComponent,
- SprkLinkComponent,
+ SprkLinkDirective,
SprkListItemComponent
]
}).compileComponents();
| 3 |
diff --git a/src/server/util.js b/src/server/util.js /* @flow */
-export const isJS = (file: string): boolean => /\.js($|\?)/.test(file)
+export const isJS = (file: string): boolean => /\.js(\?[^.]+)?$/.test(file)
-export const isCSS = (file: string): boolean => /\.css($|\?)/.test(file)
+export const isCSS = (file: string): boolean => /\.css(\?[^.]+)?$/.test(file)
| 7 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs:
if [[ $LOCAL_VERSION != $NPM_VERSION ]]; then
echo "The versions are different..."
echo "$LOCAL_VERSION"
- if [[ "'beta' in $LOCAL_VERSION" ]]; then
+ if [[ 'beta' in $LOCAL_VERSION ]]; then
echo "It's a beta package..."
else
echo "It's not a beta package..."
| 2 |
diff --git a/packages/shared/styles/components/SfHeading.scss b/packages/shared/styles/components/SfHeading.scss @import '../variables';
+$heading--border-color: #f1f2f4 !default;
+$heading--underline-subtitle-color: #a3a5ad !default;
$heading__subtitle-font-family: $body-font-family-primary !default;
$heading__subtitle-font-size: $font-size-regular-mobile !default;
$heading__subtitle-font-size--desktop: $font-size-big-desktop !default;
$heading__subtitle-line-height: 1.6 !default;
-$heading--border-color: #f1f2f4 !default;
-$heading--underline-subtitle-color: #a3a5ad !default;
.sf-heading {
padding-bottom: 10px;
| 1 |
diff --git a/articles/clients/client-grant-types.md b/articles/clients/client-grant-types.md @@ -63,7 +63,13 @@ Depending on whether a newly-created Client is **public** or **confidential**, t
### Public Clients
-Public Clients, indicated by the `token_endpoint_auth_method` flag set to `none`, are those created in the Dashboard for Native and Single Page Applications. By default, Public Clients are created with the following `grant_types`:
+Public Clients, indicated by the `token_endpoint_auth_method` flag set to `none`, are those created in the Dashboard for Native and Single Page Applications.
+
+::: note
+You can update the `token_endpoint_auth_method` flag using the Management API's [Update a Client endpoint](/api/management/v2#!/Clients/patch_clients_by_id).
+:::
+
+By default, Public Clients are created with the following `grant_types`:
* `implicit`;
* `authorization_code`;
| 0 |
diff --git a/articles/libraries/auth0js/index.md b/articles/libraries/auth0js/index.md @@ -9,6 +9,10 @@ url: /libraries/auth0js
Auth0.js is a client-side library for [Auth0](http://auth0.com), for use in your web apps. It allows you to trigger the authentication process and parse the [JSON Web Token](http://openid.net/specs/draft-jones-json-web-token-07.html) (JWT) with just the Auth0 `clientID`. Once you have the JWT, you can use it to authenticate requests to your HTTP API and validate the JWT in your server-side logic with the `clientSecret`.
+::: panel-warning Auth0.js v7
+This document covers a recently out-of-date version of auth0.js - version 7. The documentation for version 8 will be released soon!
+:::
+
## Ready-to-Go Example
The [example directory](https://github.com/auth0/auth0.js/tree/master/example) of the auth0.js library is a ready-to-go app that can help you to quickly and easily try out auth0.js. In order to run it, follow these quick steps:
| 0 |
diff --git a/vis/js/streamgraph.js b/vis/js/streamgraph.js @@ -508,6 +508,19 @@ streamgraph.stream_mouseout = function() {
d3.selectAll(".stream").transition()
.duration(100)
.attr('class', 'stream')
+ } else {
+ d3.selectAll(".stream").transition()
+ .duration(100)
+ .attr("class", function (d, j) {
+ let stream_class = 'stream';
+ if(typeof mediator.current_stream !== "undefined" && d.key !== mediator.current_stream) {
+ stream_class = 'stream lower-opacity';
+ }
+ if (typeof mediator.current_stream !== "undefined" && mediator.current_stream === d.key) {
+ stream_class = 'stream';
+ }
+ return stream_class;
+ })
}
d3.select('#tooltip').classed("hidden", true);
| 1 |
diff --git a/components/social-media.js b/components/social-media.js @@ -21,12 +21,10 @@ function SocialMedia() {
</a>
</Link>
- <Link href='https://twitter.com/adressedatagouv?lang=fr'>
- <a>
+ <a href='https://twitter.com/adressedatagouv?lang=fr'>
<Image src='/images/logos/twitter.svg' height={88} width={88} alt='Twitter' />
<div>Sur notre fil Twitter</div>
</a>
- </Link>
<div onClick={handleNewsletter} className='newsletter'>
<Image src='/images/logos/newsletter.svg' height={88} width={88} alt='Newsletter' />
| 2 |
diff --git a/packages/lib-classifier/src/components/Classifier/components/SubjectViewer/components/FlipbookViewer/components/FlipbookControls.js b/packages/lib-classifier/src/components/Classifier/components/SubjectViewer/components/FlipbookViewer/components/FlipbookControls.js @@ -123,7 +123,7 @@ const FlipbookControls = ({
if (playing) {
timeoutRef.current = setTimeout(() => {
handleNext()
- }, 1000 / playbackSpeed)
+ }, 500 / playbackSpeed)
}
return () => {
| 12 |
diff --git a/src/lib/storage.js b/src/lib/storage.js @@ -9,13 +9,7 @@ import defaultProject from './default-project';
class Storage extends ScratchStorage {
constructor () {
super();
- const defaultProjectAssets = defaultProject(this.translator);
- defaultProjectAssets.forEach(asset => this.cache(
- this.AssetType[asset.assetType],
- this.DataFormat[asset.dataFormat],
- asset.data,
- asset.id
- ));
+ this.cacheDefaultProject();
this.addWebStore(
[this.AssetType.Project],
this.getProjectGetConfig.bind(this),
| 4 |
diff --git a/test/p2p.jenkinsfile b/test/p2p.jenkinsfile @@ -27,7 +27,7 @@ pipeline {
withEnv(['JENKINS_NODE_COOKIE=dontkill']) {
sh "python ${env.startServerScript} --p2p-server-path ${env.p2pServerPath} \
--owner open-webrtc-toolkit --repo owt-client-javascript --commit-id ${GIT_COMMIT} \
- --github-script ${env.serverGithubScriptPath} --mode p2p"
+ --git-branch ${GIT_BRANCH} --github-script ${env.serverGithubScriptPath} --mode p2p --workspace ${WORKSPACE}"
}
}
}
@@ -43,7 +43,7 @@ pipeline {
steps {
sh "python ${env.jsCiScriptPath}/runTest.py --mode ci --source-path ${env.jsSourcePath} \
--browsers chrome --mode ci --owner open-webrtc-toolkit --repo owt-client-javascript \
- --commit-id ${GIT_COMMIT} --github-script ${env.jsP2PTestGithubScriptPath}"
+ --git-branch ${GIT_BRANCH} --github-script ${env.jsP2PTestGithubScriptPath}"
}
}
}
| 4 |
diff --git a/src/assets/js/science/plotly-1.57.1.js b/src/assets/js/science/plotly-1.57.1.js }, r.revokeObjectURL = function (t) {
return i.revokeObjectURL(t)
}, r.createBlob = function (t, e) {
- if ("svg" === e) return new window.Blob([t], {
+ if ("svg" === e) {
+ let blob = new window.Blob([t], {
type: "image/svg+xml;charset=utf-8"
});
+ blobToBase64(blob).then(res => {
+ base64SvgToBase64Png(res,1000).then(img => {
+ let dlLink = document.createElement('a');
+ dlLink.download = 'newplot.png';
+ dlLink.href = img
+ dlLink.click();
+ })
+ });
+ return;
+ }
if ("full-json" === e) return new window.Blob([t], {
type: "application/json;charset=utf-8"
});
}, {}]
}, {}, [26])(26)
}));
+
+function base64SvgToBase64Png (originalBase64, width) {
+ return new Promise(resolve => {
+ let img = document.createElement('img');
+ img.onload = function () {
+ document.body.appendChild(img);
+ let canvas = document.createElement("canvas");
+ let ratio = (img.clientWidth / img.clientHeight) || 1;
+ document.body.removeChild(img);
+ canvas.width = width;
+ canvas.height = width / ratio;
+ let ctx = canvas.getContext("2d");
+ ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
+ try {
+ let data = canvas.toDataURL('image/png');
+ resolve(data);
+ } catch (e) {
+ resolve(null);
+ }
+ };
+ img.src = originalBase64;
+ });
+}
+const blobToBase64 = blob => {
+ const reader = new FileReader();
+ reader.readAsDataURL(blob);
+ return new Promise(resolve => {
+ reader.onloadend = () => {
+ resolve(reader.result);
+ };
+ });
+};
\ No newline at end of file
| 14 |
diff --git a/examples/cmdline/duk_cmdline.c b/examples/cmdline/duk_cmdline.c @@ -245,7 +245,7 @@ static duk_ret_t wrapped_compile_execute(duk_context *ctx, void *udata) {
duk_load_function(ctx);
} else {
/* Source code. */
- comp_flags = 0;
+ comp_flags = DUK_COMPILE_SHEBANG;
duk_compile_lstring_filename(ctx, comp_flags, src_data, src_len);
}
| 11 |
diff --git a/src/mode/cam/driver.js b/src/mode/cam/driver.js let tops = slice.shadow.clone(true);
let offset = POLY.expand(tops, diameter / 2, slice.z);
+ if (!inside)
+ POLY.offset(shell, diameter/2, { outs: offset, flat: true, z: slice.z });
+
// when pocket only, drop first outer poly
// if it matches the shell and promote inner polys
if (inside) {
});
}
- const output = POLY.flatten(offset, [], true);
-
- slice.tops[0].traces = output;
+ slice.tops[0].traces = offset;
};
/**
slice.tops[0].traces = nutrace;
}
- // called when z-index slicing complete
- const camSlicesDone = function(slices) {
-
- // return outermost (bottom layer) "top" polys
- // const camShell = pancake(slices, function(update) {
- // onupdate(0.25 + update * 0.15, "shelling");
- // });
- //
- // // set all default shells
- // const camShellPolys = shellOutline = facePolys = camShell.gatherTopPolys([]);
-
- if (procDrillReg) {
- sliceDrillReg(settings, widget, sliceAll, zThru);
- }
-
- if (procDrill) {
- sliceDrill(settings, widget, slices, sliceAll);
- }
-
- // if (procOutline) {
- // if (!procOutlineOn) {
- // // expand shell minimally triggering a clean
- // shellOutline = POLY.expand(shellOutline, -outlineToolDiam / 2, 0);
- // } else {
- // // expand shell by half tool diameter (not needed because only one offset)
- // // shellOutline = POLY.expand(shellOutline, outlineToolDiam / 2, 0);
- // }
- // }
-
- // clear area from top of stock to top of part
- // if (procFacing) {
- // let ztop = bounds.max.z,
- // zpos = ztop + ztoff,
- // zstep = camRoughDown;
- //
- // while (zpos >= ztop) {
- // zpos = zpos - Math.min(zstep, zpos - ztop);
- //
- // const slice = newSlice(zpos, mesh.newGroup ? mesh.newGroup() : null);
- // slice.camMode = CPRO.LEVEL;
- // sliceAll.append(slice);
- //
- // shellRough.clone().forEach(function(poly) {
- // slice.addTop(poly);
- // })
- //
- // if (Math.abs(zpos - ztop) < 0.001) break;
- // }
- // }
-
- // if (procOutline) {
- // let selected = [];
- // selectSlices(slices, proc.camOutlineDown * units, CPRO.OUTLINE, selected);
- // if (zThru) {
- // addZThru(selected);
- // }
- // sliceAll.appendAll(selected);
- // }
- }
-
+ // TODO cache terrain slicer info in widget
+ // TODO pass widget.isModified() on slice and re-use if false
+ // TODO pre-slice in background from client signal
+ // TODO same applies to topo map generation
let slicer = new KIRI.slicer2(widget.getPoints(), {
zlist: true,
zline: true
});
+ let tslices = [];
let tshadow = [];
- let tzindex = slicer.interval(1); // bottom up
+ let tzindex = slicer.interval(1); // bottom up 1mm steps
let terrain = slicer.slice(tzindex, { each: (data, index, total) => {
console.log('terrain', index, total, data);
tshadow = POLY.union(tshadow.appendAll(data.tops), 0.01, true);
- } });
+ tslices.push(data.slice);
+ onupdate(0.0 + (index/total) * 0.1, "mapping");
+ }, genso: true });
console.log({slicer, tzindex, tshadow, terrain});
+ if (procDrillReg) {
+ sliceDrillReg(settings, widget, sliceAll, zThru);
+ }
+
+ if (procDrill) {
+ sliceDrill(settings, widget, tslices, sliceAll);
+ }
+
// creating roughing slices
if (procRough) {
// identify through holes
data.slice.camMode = CPRO.ROUGH;
data.slice.shadow = data.shadow;
slices.push(data.slice);
+ onupdate(0.1 + (index/total) * 0.1, "roughing");
}, genso: true });
// inset or eliminate thru holes from shadow
data.slice.camMode = CPRO.OUTLINE;
data.slice.shadow = data.shadow;
slices.push(data.slice);
+ onupdate(0.2 + (index/total) * 0.1, "roughing");
}, genso: true });
shellOutline = tshadow;
sliceAll.appendAll(slices);
}
- // horizontal slices for rough/outline
- doSlicing(widget, {height:sliceDepth, cam:true, zmin:zBottom, noEmpty:true}, camSlicesDone, function(update) {
- onupdate(0.0 + update * 0.25, "slicing");
- });
-
// we need topo for safe travel moves when roughing and outlining
// not generated when drilling-only. then all z moves use bounds max.
// also generates x and y contouring when selected
- // if (procRough || procOutline || procContour)
- // generateTopoMap(widget, settings, function(slices) {
- // sliceAll.appendAll(slices);
- // // todo union rough / outline shells
- // // todo union rough / outline tabs
- // // todo append to generated topo map
- // }, function(update, msg) {
- // onupdate(0.40 + update * 0.50, msg || "create topo");
- // });
+ if (procContour)
+ generateTopoMap(widget, settings, function(slices) {
+ sliceAll.appendAll(slices);
+ }, function(update, msg) {
+ onupdate(0.40 + update * 0.50, msg || "create topo");
+ });
// prepare for tracing paths
let traceTool;
| 2 |
diff --git a/admin-base/materialize/custom/_debugger.scss b/admin-base/materialize/custom/_debugger.scss position: fixed;
bottom: 60px;
left: 0;
- // .toggle-debugger {
- // width: 2rem;
- // height: 40px;
- // position: absolute;
- // border: 1px solid color("blue-grey", "lighten-4");
- // border-left: 0;
- // background-color: color("blue-grey", "lighten-5") !important;
- // }
-
.toggle-debugger {
- width: 2rem;
- height: 40px;
+ width: 2.5rem;
+ height: 2.5rem;
position: absolute;
- .material-icons {
- position: relative;
- left: -.25rem;
- font-size: 40px;
- }
&.show-debugger {
- background-color: color("blue-grey", "lighten-5");
- border: 1px solid color("blue-grey", "lighten-4");
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: color("blue-grey", "darken-3");
+ border: none;
border-left: 0;
- color: color("blue-grey", "darken-3");
+ color: #fff;
+ border-top-right-radius: 0.375rem;
+ text-align: center;
+ transition: background-color .25s;
+ .material-icons {
+ font-size: 2rem;
+ line-height: 2.5rem;
+ }
+ &:hover,
+ &:focus,
+ &:active {
+ background-color: color("blue-grey", "darken-2");
+ }
}
&.hide-debugger {
z-index: 1;
right: 0.75rem;
left: auto;
bottom: auto;
+ .material-icons {
+ font-size: 2.5rem;
+ }
}
}
| 7 |
diff --git a/routes/base.js b/routes/base.js @@ -10,10 +10,16 @@ module.exports = (options) => {
options.res.send(reply);
}
else {
+ try {
options.getHTML((html) => {
redis.set(options.req.url, html);
options.res.send(html);
});
}
+ catch (e) {
+ redis.set(options.req.url, '');
+ options.res.send('');
+ }
+ }
});
};
\ No newline at end of file
| 9 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.