code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/articles/libraries/_includes/_get_lock_latest_version.md b/articles/libraries/_includes/_get_lock_latest_version.md -### Update Lock.js
+### Update Lock
-Update the Lock.js library using npm or yarn.
+Update the Lock library using npm or yarn.
```bash
# installation with npm
@@ -16,7 +16,7 @@ Once updated, you can add it to your build system or bring it in to your project
<script type="text/javascript" src="node_modules/auth0-lock/build/lock.js"></script>
```
-If you do not want to use a package manager, you can retrieve Lock.js from Auth0's CDN.
+If you do not want to use a package manager, you can retrieve Lock from Auth0's CDN.
```html
<script src="${lock_url}"></script>
| 14 |
diff --git a/build/avalanchego-apis/health-api.md b/build/avalanchego-apis/health-api.md @@ -16,14 +16,14 @@ This API uses the `json 2.0` RPC format. For more information on making JSON RPC
## Methods
-### health.getLiveness
+### health.health
The node runs a set of health checks every 30 seconds, including a health check for each chain. This method returns the last set of health check results.
#### **Signature**
```cpp
-health.getLiveness() -> {
+health.health() -> {
checks: []{
checkName: {
message: JSON,
@@ -57,7 +57,7 @@ More information on these measurements can be found in the documentation for the
curl -X POST --data '{
"jsonrpc":"2.0",
"id" :1,
- "method" :"health.getLiveness"
+ "method" :"health.health"
}' -H 'content-type:application/json;' 127.0.0.1:9650/ext/health
```
| 10 |
diff --git a/src/dom_components/view/ComponentTextView.js b/src/dom_components/view/ComponentTextView.js @@ -23,12 +23,13 @@ module.exports = ComponentView.extend({
* @private
* */
enableEditing(e) {
- e && e.stopPropagation && e.stopPropagation();
- const rte = this.rte;
-
+ // We place this before stopPropagation in case of nested
+ // text components will not block the editing (#1394)
if (this.rteEnabled || !this.model.get('editable')) {
return;
}
+ e && e.stopPropagation && e.stopPropagation();
+ const rte = this.rte;
if (rte) {
try {
@@ -77,6 +78,8 @@ module.exports = ComponentView.extend({
removable: 0,
draggable: 0,
copyable: 0,
+ selectable: 0,
+ hoverable: 0,
toolbar: ''
});
model.get('components').each(model => clean(model));
| 7 |
diff --git a/src/encoded/audit/file.py b/src/encoded/audit/file.py @@ -804,7 +804,12 @@ def extract_award_version(bam_file):
'derived_from.controlled_by.dataset.original_files.analysis_step_version.analysis_step.pipelines',
'derived_from.controlled_by.dataset.original_files.analysis_step_version.software_versions',
'derived_from.controlled_by.dataset.original_files.analysis_step_version.software_versions.software'])
-def audit_file_chip_seq_control_read_depth(value, system):
+def audit_file_chip_seq_control_read_depth(value, system,
+ condition=rfa('ENCODE3',
+ 'ENCODE2-Mouse',
+ 'ENCODE2',
+ 'ENCODE',
+ 'Roadmap')):
'''
An alignment file from the ENCODE Processing Pipeline should have read depth
in accordance with the criteria
@@ -819,43 +824,35 @@ def audit_file_chip_seq_control_read_depth(value, system):
if value['output_type'] in ['transcriptome alignments', 'unfiltered alignments']:
return
- if value['lab'] not in ['/labs/encode-processing-pipeline/', '/labs/kevin-white/']:
- return
-
- if value['lab'] == '/labs/kevin-white/' and value['award']['rfa'] != 'modERN':
+ if value['lab'] not in ['/labs/encode-processing-pipeline/']:
return
- prefix = 'ENCODE Processed '
-
- if value['lab'] == '/labs/kevin-white/':
- prefix = 'modERN Processed '
-
if 'analysis_step_version' not in value:
- detail = prefix + 'alignment file {} has '.format(value['@id']) + \
+ detail = 'ENCODE Processed alignment file {} has '.format(value['@id']) + \
'no analysis step version'
yield AuditFailure('missing analysis step version', detail, level='INTERNAL_ACTION')
return
if 'analysis_step' not in value['analysis_step_version']:
- detail = prefix + 'alignment file {} has '.format(value['@id']) + \
+ detail = 'ENCODE Processed alignment file {} has '.format(value['@id']) + \
'no analysis step in {}'.format(value['analysis_step_version']['@id'])
yield AuditFailure('missing analysis step', detail, level='INTERNAL_ACTION')
return
if 'pipelines' not in value['analysis_step_version']['analysis_step']:
- detail = prefix + 'alignment file {} has '.format(value['@id']) + \
+ detail = 'ENCODE Processed alignment file {} has '.format(value['@id']) + \
'no pipelines in {}'.format(value['analysis_step_version']['analysis_step']['@id'])
yield AuditFailure('missing pipelines in analysis step', detail, level='INTERNAL_ACTION')
return
if 'software_versions' not in value['analysis_step_version']:
- detail = prefix + 'alignment file {} has '.format(value['@id']) + \
+ detail = 'ENCODE Processed alignment file {} has '.format(value['@id']) + \
'no software_versions in {}'.format(value['analysis_step_version']['@id'])
yield AuditFailure('missing software versions', detail, level='INTERNAL_ACTION')
return
if value['analysis_step_version']['software_versions'] == []:
- detail = prefix + 'alignment file {} has no '.format(value['@id']) + \
+ detail = 'ENCODE Processed alignment file {} has no '.format(value['@id']) + \
'softwares listed in software_versions,' + \
' under {}'.format(value['analysis_step_version']['@id'])
yield AuditFailure('missing software', detail, level='INTERNAL_ACTION')
@@ -914,7 +911,6 @@ def check_control_read_depth_standards(value,
standards_version):
marks = pipelines_with_read_depth['ChIP-seq read mapping']
- modERN_cutoff = pipelines_with_read_depth['Transcription factor ChIP-seq pipeline (modERN)']
if is_control_file is True: # treat this file as control_bam -
# raising insufficient control read depth
@@ -982,16 +978,6 @@ def check_control_read_depth_standards(value,
yield AuditFailure('control extremely low read depth', detail, level='ERROR')
else:
- if value['lab'] == '/labs/kevin-white/':
- if read_depth < modERN_cutoff:
- detail = 'Control modERN processed alignment file {} has {} '.format(
- value['@id'], read_depth) + 'usable fragments. Control for ChIP-seq ' + \
- 'assays and target {} '.format(control_to_target) + \
- 'and investigated as a transcription factor requires ' + \
- '{} usable fragments, according to '.format(modERN_cutoff) + \
- 'the standards defined by the modERN project.'
- yield AuditFailure('control insufficient read depth', detail, level='NOT_COMPLIANT')
- return
if 'assembly' in value:
detail = 'Control alignment file {} mapped to {} assembly has {} '.format(
value['@id'],
| 2 |
diff --git a/pages/app/ExploreDetail.js b/pages/app/ExploreDetail.js @@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import { Autobind } from 'es-decorators';
import MediaQuery from 'react-responsive';
import { toastr } from 'react-redux-toastr';
+import classnames from 'classnames';
// Redux
import withRedux from 'next-redux-wrapper';
@@ -49,9 +50,6 @@ import SubscribeToDatasetModal from 'components/modal/SubscribeToDatasetModal';
import DatasetList from 'components/app/explore/DatasetList';
import Banner from 'components/app/common/Banner';
-// constants
-const LIMIT_CHAR_DESCRIPTION = 1120;
-
class ExploreDetail extends Page {
static async getInitialProps({ asPath, pathname, query, req, store, isServer }) {
const { user } = isServer ? req : store.getState();
@@ -272,34 +270,31 @@ class ExploreDetail extends Page {
// Router.pushRoute('explore', { topics: topicsSt });
}
- shortenerText(text = '', fieldToManage, limitChar = 0) {
- const localText = text || '';
- if ((localText || '').length <= limitChar) {
- return localText;
+ /**
+ * Shorten the given text and format it so the full length
+ * can be toggled via a button modifying the state
+ * @param {string} [text=''] Text to shorten
+ * @param {string} fieldToManage Property of the state to toggle
+ * @param {number} [limitChar=1120] Limit of characters
+ * @returns
+ */
+ shortenAndFormat(text = '', fieldToManage, limitChar = 1120) {
+ if (text.length <= limitChar) {
+ return text;
}
- const fieldVisibility = this.state[fieldToManage] || false;
- const initialText = localText.substr(0, limitChar);
- const leftText = localText.substr(limitChar, localText.length - initialText.length);
+ const visible = this.state[fieldToManage] || false;
+ const shortenedText = text.substr(0, limitChar);
return (
<div className="shortened-text">
- <span>{initialText}</span>
- {!fieldVisibility && <span>...</span>}
- {!fieldVisibility && <button
- className="read-more"
- onClick={() => this.setState({ [fieldToManage]: true })}
- >
- Read more
- </button>}
- {fieldVisibility &&
- <span>{leftText}</span>}
- {fieldVisibility && <button
- className="read-more -less"
- onClick={() => this.setState({ [fieldToManage]: false })}
+ {!visible ? `${shortenedText}...` : text}
+ <button
+ className={classnames('read-more', { '-less': visible })}
+ onClick={() => this.setState({ [fieldToManage]: !visible })}
>
- Read less
- </button>}
+ {visible ? 'Read less' : 'Read more'}
+ </button>
</div>
);
}
@@ -314,9 +309,9 @@ class ExploreDetail extends Page {
const { description } = metadataAttributes;
const { functions, cautions } = metadataInfo;
- const formattedDescription = this.shortenerText(description, 'showDescription', LIMIT_CHAR_DESCRIPTION);
- const formattedFunctions = this.shortenerText(functions, 'showFunction', LIMIT_CHAR_DESCRIPTION);
- const formattedCautions = this.shortenerText(cautions, 'showCautions', LIMIT_CHAR_DESCRIPTION);
+ const formattedDescription = this.shortenAndFormat(description, 'showDescription');
+ const formattedFunctions = this.shortenAndFormat(functions, 'showFunction');
+ const formattedCautions = this.shortenAndFormat(cautions, 'showCautions');
return (
<Layout
| 7 |
diff --git a/docs/modules/tweakToolContainer.js b/docs/modules/tweakToolContainer.js @@ -61,8 +61,6 @@ const addLabel = (tool) => {
let result = [];
const push = (title, className) => result.push(createLabel(title, className));
- tool.innerHTML.includes('iOS 11 UI kit for Adobe XD') && console.log(tool.innerHTML);
-
if (check('alt="sketch.svg"') || check('alt="Sketch"')) {
push('Sketch', 'sketch');
}
| 2 |
diff --git a/src/tests/addons.test.js b/src/tests/addons.test.js @@ -5,8 +5,6 @@ const cliPath = require('./utils/cliPath')
const exec = require('./utils/exec')
const sitePath = path.join(__dirname, 'dummy-site')
-let siteId
-
const execOptions = {
stdio: [0, 1, 2],
cwd: sitePath,
@@ -31,8 +29,6 @@ test.before(async t => {
t.truthy(matches)
t.truthy(matches.hasOwnProperty(1))
t.truthy(matches[1])
-
- siteId = matches[1]
// Set the site id
execOptions.env.NETLIFY_SITE_ID = matches[1]
})
| 2 |
diff --git a/src/views/community/index.js b/src/views/community/index.js @@ -214,7 +214,7 @@ class CommunityView extends React.Component<Props, State> {
) : null}
{currentUser &&
- isOwner && (
+ (isOwner || isModerator) && (
<Link to={`/${community.slug}/settings`}>
<LoginButton icon={'settings'} isMember>
Settings
| 11 |
diff --git a/scenes/street.scn b/scenes/street.scn "position": [-2, 1, 2],
"quaternion": [0, 0.7071067811865475, 0, 0.7071067811865476],
"start_url": "https://webaverse.github.io/helm/"
- },
- {
- "position": [0, -60, 0],
- "start_url": "../metaverse_modules/land/"
}
]
}
\ No newline at end of file
| 2 |
diff --git a/src/swaps/views/Timeline.vue b/src/swaps/views/Timeline.vue <td v-if="item.agent" class="text-muted text-right small-12">Counter-party</td>
<td>{{ item.agent }}</td>
</tr>
- <tr>
+ <tr v-if="orderLink">
<td class="text-muted text-right small-12">Order ID</td>
<td id="swap_details_order_id"><a :href="orderLink" id="order_id_href_link" rel="noopener" target="_blank">{{ item.id }}</a></td>
</tr>
@@ -284,6 +284,9 @@ export default {
return BN(1).div(calculateQuoteRate(this.item)).dp(8)
},
orderLink () {
+ if (this.item.provider !== 'liquality') {
+ return ''
+ }
const agent = getSwapProviderConfig(this.item.network, this.item.provider).agent
return agent + '/api/swap/order/' + this.item.id + '?verbose=true'
},
| 1 |
diff --git a/docs/api.md b/docs/api.md @@ -412,7 +412,7 @@ defaultLogLevel: 'error'
Note that this value can be overriden by passing 'logLevel' as a prop when rendering the component.
-#### autoResize `boolean | Object<String, Boolean>`
+#### autoResize `boolean | { height: boolean, width: boolean, element: string }`
When set to `true`, makes the xcomponent parent iframe resize automatically when the child component size changes.
You can also decide whether you want autoresizing for `width` or `height`
@@ -427,6 +427,17 @@ autoResize: {
}
```
+Note that by default it matches the `html` element of your content. (`body` if you are using IE9 or IE10).
+You can override this setting by specifying a custom selector as an `element` property.
+
+```javascript
+autoResize: {
+ width: true,
+ height: true,
+ element: '.my-selector',
+}
+```
+
#### allowedParentDomains `string | Array<string | RegEx>`
A string, array of strings or reqular expresions to be used to validate parent domain. If parent domain doesn't match any item, communication from child to parent will be prevented. The default value is '*' which match any domain.
| 7 |
diff --git a/test/map/MapSpec.js b/test/map/MapSpec.js @@ -575,6 +575,9 @@ describe('Map.Spec', function () {
describe('Map.FullScreen', function () {
it('requestFullScreen', function () {
+ if (maptalks.Browser.ie) {
+ return;
+ }
map.requestFullScreen();
// Failed to execute 'requestFullscreen' on 'Element': API can only be initiated by a user gesture.
// So,the value of 'map.isFullScreen()' is false.
@@ -582,6 +585,9 @@ describe('Map.Spec', function () {
});
it('cancelFullScreen', function () {
+ if (maptalks.Browser.ie) {
+ return;
+ }
map.cancelFullScreen();
expect(map.isFullScreen()).not.to.be.ok();
});
| 8 |
diff --git a/articles/metadata/index.md b/articles/metadata/index.md @@ -107,36 +107,6 @@ Currently, Auth0 limits the total size of your user metadata to 16 MB. However,
When setting this field with the [Authentication API Signup endpoint](/api/authentication?javascript#signup) size is limited to no more than 10 fields and must be less than 500 characters.
-### A word about metadata structure
-
-Whenever you use metadata Auth0 will infer a schema for it. This means that once you use metadata for a user we will expect the same format on every other user. This schema is inferred when a property is presented for the first time. Following usages on different users that do not follow such schema will result on Auth0 not allowing such users to be retrieved by a search querying for the offending attribute.
-
-When this happens, we will generate a log entry letting you know of the user that contains the problem so you can normalize its schema.
-
-As an example, suppose that the first time that you use the metadata attribute it contains the following:
-
-```json
-{
- "address": {
- "street": "My Street"
- }
-}
-```
-
-Auth0 will now expect the `address` key to be an object on any following user that contains such field, and will expect `street` to be a String.
-
-Suppose you now update a second user with the following metadata:
-
-```json
-{
- "address": "My Street"
-}
-```
-
-This second user will be violating the formerly inferred schema since `address` is now a String. The net result is that any User Search containing any metadata field in the query will not return the second user as part of the results.
-
-Keep in mind that while the user won't participate of searches on the `address` attribute, you will be able to search for any other attribute and the result will contain all matching users.
-
## Keep reading
::: next-steps
| 2 |
diff --git a/packages/gatsby/src/utils/api-runner-node.js b/packages/gatsby/src/utils/api-runner-node.js @@ -136,18 +136,20 @@ module.exports = async (api, args = {}, pluginSource) =>
apisRunning.push(apiRunInstance)
+ let currentPluginName = null
+
mapSeries(
noSourcePluginPlugins,
(plugin, callback) => {
+ currentPluginName = plugin.name
Promise.resolve(runAPI(plugin, api, args)).asCallback(callback)
},
(err, results) => {
if (err) {
console.log(``)
- console.log(`A plugin returned an error`)
+ console.log(`Plugin ${currentPluginName} returned an error:`)
console.log(``)
console.log(err)
- process.exit(1)
}
// Remove runner instance
apisRunning = apisRunning.filter(runner => runner !== apiRunInstance)
| 7 |
diff --git a/vendor/assets/javascripts/cartodb.uncompressed.js b/vendor/assets/javascripts/cartodb.uncompressed.js // cartodb.js version: 3.15.12
// uncompressed version: cartodb.uncompressed.js
-// sha: 77e8d5e7f13024a0fd2201dd4af71747ed366b5b
+// sha: fd59cdbd94906f554d820cef55009ec795aaf5f0
(function() {
var define; // Undefine define (require.js), see https://github.com/CartoDB/cartodb.js/issues/543
var root = this;
@@ -26925,7 +26925,6 @@ cdb.geo.geocoder.MAPZEN = {
}
$.getJSON(protocol + '//search.mapzen.com/v1/search?text=' + encodeURIComponent(address) + '&api_key=' + this.keys.app_id, function(data) {
-
var coordinates = [];
if (data && data.features && data.features.length > 0) {
var res = data.features;
@@ -40078,6 +40077,8 @@ cdb.vis.Vis = Vis;
this.no_cdn = options.no_cdn;
+ this.auth_tokens = options.auth_tokens;
+
this.userOptions = options;
options = _.defaults({ vizjson: vizjson, temp_id: "s" + this._getUUID() }, this.defaults);
@@ -40140,7 +40141,6 @@ cdb.vis.Vis = Vis;
this.options.maps_api_template = dataLayer.options.maps_api_template;
}
- this.auth_tokens = data.auth_tokens;
this.endPoint = "/api/v1/map";
var bbox = [];
| 3 |
diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js @@ -170,17 +170,20 @@ export default PropertyCompositeView.extend({
// With detached layers values will be assigned to their properties
if (detached) {
style = target ? target.getStyle() : {};
+ const hasDetachedStyle = rule => {
+ const name = model
+ .get('properties')
+ .at(0)
+ .get('property');
+ return rule && !isUndefined(rule.getStyle()[name]);
+ };
// If the style object is empty but the target has a computed value,
// that means the style might exist in some other place
if (!keys(style).length && valueComput && selected) {
// Styles of the same target but with a higher rule
- const nameFirstProp = model
- .get('properties')
- .at(0)
- .get('property');
targetAltDevice = this._getParentTarget(target, {
- isValid: rule => !isUndefined(rule.getStyle()[nameFirstProp])
+ isValid: rule => hasDetachedStyle(rule)
});
if (targetAltDevice) {
@@ -188,7 +191,14 @@ export default PropertyCompositeView.extend({
} else {
// The target is a component but the style is in the class rules
targetAlt = this._getClassRule();
- style = targetAlt ? targetAlt.getStyle() : {};
+ const valueTargetAlt =
+ hasDetachedStyle(targetAlt) && targetAlt.getStyle();
+ targetAltDevice =
+ !valueTargetAlt &&
+ this._getParentTarget(this._getClassRule({ skipAdd: 0 }));
+ const valueTrgAltDvc =
+ hasDetachedStyle(targetAltDevice) && targetAltDevice.getStyle();
+ style = valueTargetAlt || valueTrgAltDvc || {};
}
}
| 7 |
diff --git a/server/src/fetchers/thread-permission-fetchers.js b/server/src/fetchers/thread-permission-fetchers.js @@ -16,6 +16,11 @@ import { dbQuery, SQL } from '../database/database';
import { fetchKnownUserInfos } from '../fetchers/user-fetchers';
import { fetchThreadInfos } from '../fetchers/thread-fetchers';
+// Note that it's risky to verify permissions by inspecting the blob directly.
+// There are other factors that can override permissions in the permissions
+// blob, such as when one user blocks another. It's always better to go through
+// checkThreads and friends, or by looking at the ThreadInfo through
+// threadHasPermission.
async function fetchThreadPermissionsBlob(
viewer: Viewer,
threadID: string,
| 0 |
diff --git a/packages/wast-parser/src/tokenizer.js b/packages/wast-parser/src/tokenizer.js @@ -139,19 +139,16 @@ function tokenize(input: string) {
return input.substring(current - offset, current - offset + length);
}
- function eatToken() {
- column++;
- current++;
- }
-
+ /**
+ * Advances the cursor in the input by a certain amount
+ */
function eatCharacter(amount = 1) {
column += amount;
- char = input[(current += amount)];
+ current += amount;
+ char = input[current];
}
while (current < input.length) {
- char = input[current];
-
// ;;
if (char === ";" && lookahead() === ";") {
eatCharacter(2);
@@ -186,8 +183,7 @@ function tokenize(input: string) {
char = input[current];
if (char === ";" && lookahead() === ")") {
- eatToken(); // ;
- eatToken(); // )
+ eatCharacter(2);
break;
}
@@ -201,7 +197,7 @@ function tokenize(input: string) {
column++;
}
- eatToken();
+ eatCharacter();
}
tokens.push(CommentToken(text, line, column, { type: "block" }));
| 14 |
diff --git a/src/js/components/Clock/Digital.js b/src/js/components/Clock/Digital.js @@ -29,17 +29,17 @@ class Digit extends Component {
return (
<StyledDigitalDigit size={size} theme={theme}>
<StyledDigitalPrevious direction={direction}>
- {previous}
+ {Math.floor(previous)}
</StyledDigitalPrevious>
<StyledDigitalNext direction={direction}>
- {number}
+ {Math.floor(number)}
</StyledDigitalNext>
</StyledDigitalDigit>
);
}
return (
<StyledDigitalDigit size={size} theme={theme}>
- {number}
+ {Math.floor(number)}
</StyledDigitalDigit>
);
}
| 1 |
diff --git a/guide/english/certifications/front-end-libraries/jquery/change-text-inside-an-element-using-jquery/index.md b/guide/english/certifications/front-end-libraries/jquery/change-text-inside-an-element-using-jquery/index.md @@ -42,5 +42,5 @@ title: Change Text Inside an Element Using jQuery
[jQuery API Documentation](http://api.jquery.com/html/)
-[freeCoceCamp Guide](https://guide.freecodecamp.org/jquery/jquery-html-method)
+[freeCodeCamp Guide](https://guide.freecodecamp.org/jquery/jquery-html-method)
| 14 |
diff --git a/src/utils/notify_props.ts b/src/utils/notify_props.ts // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {Preferences} from '../constants';
-export function getEmailInterval(enableEmailNotification: boolean, enableEmailBatching: number, emailIntervalPreference: number): number {
+export function getEmailInterval(enableEmailNotification: boolean, enableEmailBatching: boolean, emailIntervalPreference: number): number {
const {
INTERVAL_NEVER,
INTERVAL_IMMEDIATE,
| 1 |
diff --git a/package-lock.json b/package-lock.json },
"dependencies": {
"debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
- "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
- "ms": "2.0.0"
+ "ms": "^2.1.1"
}
},
"follow-redirects": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
- "integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+ "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
"dev": true,
"requires": {
- "debug": "=3.1.0"
+ "debug": "^3.2.6"
}
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
}
},
"prop-types": {
- "version": "15.7.1",
- "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.1.tgz",
- "integrity": "sha512-f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw==",
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
"requires": {
+ "loose-envify": "^1.4.0",
"object-assign": "^4.1.1",
"react-is": "^16.8.1"
}
| 13 |
diff --git a/js/app/toggleMatchHighlight.js b/js/app/toggleMatchHighlight.js @@ -23,7 +23,7 @@ function refreshHighlightOption()
objBrowser.tabs.sendMessage(tabs[0].id, {
"func":strMethod
}, function(objResponse) {
- if(objResponse.status) {
+ if(objResponse && objResponse.status) {
console.log("Response from tab: " + objResponse.status);
} else {
console.log("Cannot "+ strMethod +" on tab.");
| 1 |
diff --git a/activities/Etoys.activity/activity/activity-etoys.svg b/activities/Etoys.activity/activity/activity-etoys.svg ]>
<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="activity-etoys">
<g display="inline">
- <path d=" M38.395,40.393c-0.614,0.214-9.218-9.666-9.849-9.828c-0.632-0.163-13.004,3.906-13.416,3.423 c-0.412-0.484,6.202-11.419,6.177-12.038c-0.024-0.619-8.007-10.704-7.643-11.22c0.363-0.517,13.466,2.533,14.08,2.317 c0.613-0.216,8.677-10.799,9.305-10.634c0.627,0.165,1.631,12.98,2.036,13.472c0.402,0.49,12.795,4.16,12.813,4.783 c0.021,0.621-12.244,5.76-12.601,6.282C38.941,27.473,39.009,40.179,38.395,40.393z" fill="#FFFFFF" id="path4637" stroke="#010101" stroke-linecap="round" stroke-linejoin="bevel" stroke-width="3.5"/>
- <path d="M12.729,38.05L3.156,52.411l0,0" fill="none" id="path5528" stroke="#010101" stroke-linecap="round" stroke-width="3.5"/>
- <path d="M21.283,38.05l-9.574,14.361" fill="none" id="path5530" stroke="#010101" stroke-linecap="round" stroke-width="3.5"/>
- <path d="M29.834,38.05l-9.572,14.361" fill="none" id="path5532" stroke="#010101" stroke-linecap="round" stroke-width="3.5"/>
+ <path d=" M38.395,40.393c-0.614,0.214-9.218-9.666-9.849-9.828c-0.632-0.163-13.004,3.906-13.416,3.423 c-0.412-0.484,6.202-11.419,6.177-12.038c-0.024-0.619-8.007-10.704-7.643-11.22c0.363-0.517,13.466,2.533,14.08,2.317 c0.613-0.216,8.677-10.799,9.305-10.634c0.627,0.165,1.631,12.98,2.036,13.472c0.402,0.49,12.795,4.16,12.813,4.783 c0.021,0.621-12.244,5.76-12.601,6.282C38.941,27.473,39.009,40.179,38.395,40.393z" fill="&fill_color;" id="path4637" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="bevel" stroke-width="3.5"/>
+ <path d="M12.729,38.05L3.156,52.411l0,0" fill="none" id="path5528" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+ <path d="M21.283,38.05l-9.574,14.361" fill="none" id="path5530" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
+ <path d="M29.834,38.05l-9.572,14.361" fill="none" id="path5532" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3.5"/>
</g>
</g></svg>
| 9 |
diff --git a/src/pages/Group/ComponentList.js b/src/pages/Group/ComponentList.js @@ -55,13 +55,10 @@ export default class ComponentList extends Component {
operationState: false,
query: '',
changeQuery: '',
- tableDataLoading: false
+ tableDataLoading: true
};
}
componentDidMount() {
- this.setState({
- tableDataLoading: true
- });
this.updateApp();
document
.querySelector('.ant-table-footer')
@@ -582,7 +579,7 @@ export default class ComponentList extends Component {
</Form>
<ScrollerX sm={750}>
<Table
- style={{ position: 'relative' }}
+ style={{ position: 'relative', overflow: 'hidden' }}
pagination={pagination}
rowSelection={rowSelection}
columns={columns}
| 1 |
diff --git a/test/plot-schema.json b/test/plot-schema.json "valType": "color"
},
"colorsrc": {
- "description": "Sets the source reference on Chart Studio Cloud for color .",
+ "description": "Sets the source reference on Chart Studio Cloud for `color`.",
"editType": "none",
"valType": "string"
},
"valType": "number"
},
"opacitysrc": {
- "description": "Sets the source reference on Chart Studio Cloud for opacity .",
+ "description": "Sets the source reference on Chart Studio Cloud for `opacity`.",
"editType": "none",
"valType": "string"
},
"valType": "number"
},
"sizesrc": {
- "description": "Sets the source reference on Chart Studio Cloud for size .",
+ "description": "Sets the source reference on Chart Studio Cloud for `size`.",
"editType": "none",
"valType": "string"
},
"valType": "number"
},
"stepsrc": {
- "description": "Sets the source reference on Chart Studio Cloud for step .",
+ "description": "Sets the source reference on Chart Studio Cloud for `step`.",
"editType": "none",
"valType": "string"
}
| 3 |
diff --git a/generators/generator-transforms.js b/generators/generator-transforms.js @@ -22,9 +22,15 @@ const prettier = require('prettier');
const prettierTransform = function (defaultOptions) {
return through.obj((file, encoding, callback) => {
+ if (file.state === 'deleted') {
+ callback(null, file);
+ return;
+ }
/* resolve from the projects config */
- prettier.resolveConfig(file.relative).then(resolvedDestinationFileOptions => {
- if (file.state !== 'deleted') {
+ let fileContent;
+ prettier
+ .resolveConfig(file.relative)
+ .then(function (resolvedDestinationFileOptions) {
const options = {
...defaultOptions,
// Config from disk
@@ -32,19 +38,17 @@ const prettierTransform = function (defaultOptions) {
// for better errors
filepath: file.relative,
};
- const str = file.contents.toString('utf8');
- try {
- const data = prettier.format(str, options);
+ fileContent = file.contents.toString('utf8');
+ const data = prettier.format(fileContent, options);
file.contents = Buffer.from(data);
- } catch (error) {
+ callback(null, file);
+ })
+ .catch(error => {
callback(
new Error(`Error parsing file ${file.relative}: ${error}
- At: ${str}`)
+
+At: ${fileContent}`)
);
- return;
- }
- }
- callback(null, file);
});
});
};
| 9 |
diff --git a/module/gurps.js b/module/gurps.js @@ -427,13 +427,11 @@ const actionFuncs = {
//
iftest({ action }) {
- if (!GURPS.lastTargetedRoll)
- return false
- if (action.name == 'isCritSuccess')
- return !!GURPS.lastTargetedRoll.isCritSuccess
- if (action.name == 'isCritFailure')
- return !!GURPS.lastTargetedRoll.isCritFailure
- if (!action.equation) // if [@margin] tests for >=0
+ if (!GURPS.lastTargetedRoll) return false
+ if (action.name == 'isCritSuccess') return !!GURPS.lastTargetedRoll.isCritSuccess
+ if (action.name == 'isCritFailure') return !!GURPS.lastTargetedRoll.isCritFailure
+ if (!action.equation)
+ // if [@margin] tests for >=0
return GURPS.lastTargetedRoll.margin >= 0
else {
let m = action.equation.match(/ *([=<>]+) *([+-]?[\d\.]+)/)
@@ -1222,8 +1220,16 @@ async function handleRoll(event, actor, targets) {
if (!!actor) GURPS.SetLastActor(actor)
if ('damage' in element.dataset) {
- // expect text like '2d+1 cut'
+ // expect text like '2d+1 cut' or '1d+1 cut,1d-1 ctrl' (linked damage)
let f = !!element.dataset.otf ? element.dataset.otf : element.innerText.trim()
+ if (f.includes(',')) {
+ let parts = f.split(',')
+ for (let part of parts) {
+ let result = parseForRollOrDamage(part.trim())
+ if (result?.action) performAction(result.action, actor, event, targets)
+ }
+ return
+ }
let result = parseForRollOrDamage(f)
if (result?.action) performAction(result.action, actor, event, targets)
return
@@ -2135,29 +2141,27 @@ Hooks.once('ready', async function () {
let updates = []
if (!!target && !!src) {
if (target.initiative < src.initiative)
- updates.push({_id: dropData.combatant, initiative: target.initiative - 0.00001});
- else
- updates.push({_id: dropData.combatant, initiative: target.initiative + 0.00001});
- game.combat.updateEmbeddedDocuments("Combatant", updates);
+ updates.push({ _id: dropData.combatant, initiative: target.initiative - 0.00001 })
+ else updates.push({ _id: dropData.combatant, initiative: target.initiative + 0.00001 })
+ game.combat.updateEmbeddedDocuments('Combatant', updates)
}
}
})
}
-
if (game.user.isGM) {
html.find('.combatant').each((_, li) => {
li.setAttribute('draggable', true)
li.addEventListener('dragstart', ev => {
let display = ''
if (!!ev.currentTarget.dataset.action) display = ev.currentTarget.innerText
- let dragIcon = $(event.currentTarget).find('.token-image')[0];
- ev.dataTransfer.setDragImage(dragIcon, 25, 25);
+ let dragIcon = $(event.currentTarget).find('.token-image')[0]
+ ev.dataTransfer.setDragImage(dragIcon, 25, 25)
return ev.dataTransfer.setData(
'text/plain',
JSON.stringify({
type: 'initiative',
- combatant: li.getAttribute('data-combatant-id')
+ combatant: li.getAttribute('data-combatant-id'),
})
)
})
@@ -2165,9 +2169,6 @@ Hooks.once('ready', async function () {
}
})
-
-
-
// @ts-ignore
game.socket.on('system.gurps', async resp => {
if (resp.type == 'updatebucket') {
| 9 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -9,11 +9,11 @@ jobs:
name: fail if the branch name does not start with a valid prefix
command: |
branch=$CIRCLE_BRANCH
- if [[ "$branch" =~ ^(fix|feature|breaking)/ || "$branch" == 'master' ]]
+ if [[ "$branch" =~ ^(dependabot|fix|feature|breaking)/ || "$branch" == 'master' ]]
then
echo $branch is a valid name
else
- echo $branch is not valid because the branch name must match '^(fix|feature|breaking)/' or be master
+ echo $branch is not valid because the branch name must match '^(dependabot|fix|feature|breaking)/' or be master
exit 1
fi
deploy_test_environment:
@@ -72,7 +72,9 @@ jobs:
command: |
branch=`git log --oneline | grep '[0-9a-f]\{6,40\} Merge pull request #[0-9]\+ from brainhubeu/' | head -1 | sed 's@.* from brainhubeu/@@g' || true`
echo branch=$branch
- if [[ "$branch" =~ ^(fix)/ ]]; then
+ if [[ "$branch" =~ ^(dependabot)/ ]]; then
+ npm version patch -m "%s [ci skip]"
+ elif [[ "$branch" =~ ^(fix)/ ]]; then
npm version patch -m "%s [ci skip]"
elif [[ "$branch" =~ ^(feature)/ ]]; then
npm version minor -m "%s [ci skip]"
| 11 |
diff --git a/angular/projects/spark-angular/src/lib/components/sprk-flag/sprk-flag.stories.ts b/angular/projects/spark-angular/src/lib/components/sprk-flag/sprk-flag.stories.ts @@ -14,7 +14,15 @@ export default {
)
],
parameters: {
- info: `${markdownDocumentationLinkBuilder('flag')}`,
+ info: `
+${markdownDocumentationLinkBuilder('flag')}
+- The Flag component has two slots to inject markup
+into the component template.
+ - \`figure-slot\`: Used for adding the media to the component.
+ - \`body-slot\`: Used for adding the body content to the component.
+- If you pass something into the Flag component that is not
+in one of the slots mentioned above, it will not render.
+`,
},
};
| 3 |
diff --git a/gulpfile.mjs b/gulpfile.mjs @@ -15,8 +15,8 @@ import { npmScriptTask } from './tasks/run.mjs'
*/
gulp.task('scripts', gulp.series(
npmScriptTask('lint:js'),
- npmScriptTask('build:jsdoc'),
- compileJavaScripts
+ compileJavaScripts,
+ npmScriptTask('build:jsdoc')
))
/**
| 11 |
diff --git a/grails-app/assets/javascripts/streama/controllers/createFromFileCtrl.modal.js b/grails-app/assets/javascripts/streama/controllers/createFromFileCtrl.modal.js @@ -139,7 +139,11 @@ function modalCreateFromFileCtrl($scope, $uibModalInstance, apiService, uploadSe
}
apiService.file.bulkAddMediaFromFile(allFoundMatches).success(function (result) {
+ if(_.some(result, {status: 4})){
+ alertify.log("not all files were added unfortunately. This is due to TheMovieDB API LIMIT constraints. We are sorry and we hope to have a fix soon. ")
+ }else{
alertify.success("All matches have been added to the database and files connected");
+ }
mergeMatchResults(result);
});
@@ -148,7 +152,11 @@ function modalCreateFromFileCtrl($scope, $uibModalInstance, apiService, uploadSe
function addSelectedFile(file) {
var fileMatch = _.find(vm.matchResult, {"file": file.path});
apiService.file.bulkAddMediaFromFile([fileMatch]).success(function (result) {
+ if(_.some(result, {status: 4})){
+ alertify.log("not all files were added unfortunately. This is due to TheMovieDB API LIMIT constraints. We are sorry and we hope to have a fix soon. ")
+ }else{
alertify.success(fileMatch.title || fileMatch.episodeName + " has been added");
+ }
mergeMatchResults(result);
});
}
| 7 |
diff --git a/package.json b/package.json "license": "MIT",
"author": "Government Digital Service developers (https://gds.blog.gov.uk/)",
"homepage": "https://github.com/alphagov/govuk-frontend#readme",
+ "scripts": {
+ "test": "standard"
+ },
"devDependencies": {
- "gulp": "^3.9.1"
+ "gulp": "^3.9.1",
+ "standard": "^10.0.2"
}
}
| 12 |
diff --git a/imports/client/ui/pages/Home/ProjectsSection/Item/index.js b/imports/client/ui/pages/Home/ProjectsSection/Item/index.js @@ -25,9 +25,12 @@ const Item = ({ item, loginButton }) =>
className="images"
/>
<CardTitle tag="h5">
- <CardLink href={item.url}>
+ {/*<CardLink href={item.url}>
{item.title}
- </CardLink>
+ </CardLink>*/}
+ <Link to={item.url}>
+ {item.title}
+ </Link>
</CardTitle>
<CardText style={{marginTop: '1rem'}}>
{item.description}
@@ -36,12 +39,18 @@ const Item = ({ item, loginButton }) =>
<CardBody>
<div style={{display: 'flex', flexFlow: 'wrap'}}>
{item.categories.map((category, i) => (
- <CardLink href={category.url}>
+ /*<CardLink href={category.url}>
+ <span style={{display: 'flex', alignItems: 'center', marginRight: '12px'}}>
+ <span style={{backgroundColor: item.color, display: 'inline-block', width: '9px', height: '9px', marginRight: '5px', border: `5.6px solid ${item.color}`}}> </span>
+ {category.title}
+ </span>
+ </CardLink>*/
+ <Link to={item.url}>
<span style={{display: 'flex', alignItems: 'center', marginRight: '12px'}}>
<span style={{backgroundColor: item.color, display: 'inline-block', width: '9px', height: '9px', marginRight: '5px', border: `5.6px solid ${item.color}`}}> </span>
{category.title}
</span>
- </CardLink>
+ </Link>
))}
</div>
</CardBody>
| 14 |
diff --git a/sirepo/package_data/static/js/radia.js b/sirepo/package_data/static/js/radia.js @@ -3811,7 +3811,7 @@ SIREPO.viewLogic('objectShapeView', function(appState, panelState, radiaService,
if (modelType === 'jay') {
const j = appState.models.jay;
const jx1 = c[0] + s[0] / 2 - j.hookWidth;
- const jy1 = sy2 + j.hookHeight;
+ const jy1 = ay2 - j.hookHeight;
pts = [
[ax1, ay1], [ax2, ay1], [ax2, jy1], [jx1, jy1], [jx1, ay2],
[sx2, ay2], [sx2, sy1], [sx1, sy1],
| 1 |
diff --git a/assets/sass/components/user-input/googlesitekit-user-input-preview.scss b/assets/sass/components/user-input/googlesitekit-user-input-preview.scss .googlesitekit-user-input__preview-group .googlesitekit-user-input__select-option .mdc-radio {
margin-left: -10px;
}
+
+ .googlesitekit-user-input__preview-group .googlesitekit-user-input__select-option:not(:last-child) {
+ border-bottom: none;
+ }
}
| 2 |
diff --git a/docker-compose.yml b/docker-compose.yml @@ -37,9 +37,10 @@ services:
MC_APP_ENTRYPOINT: '/hello-world/index.js'
build:
context: mediacontroller
- entrypoint: sh -c 'sh ./run.sh'
+ entrypoint: sh -c 'sh ./run2.sh'
volumes:
- ./functions:/functions:ro
+ - ./mediacontroller/run.sh:/run2.sh:ro
expose:
- ${MC_AGI_PORT}
datasource:
| 14 |
diff --git a/assets/js/components/higherorder/withdata.js b/assets/js/components/higherorder/withdata.js @@ -142,7 +142,7 @@ const withData = (
}
) => {
// ...and returns another component...
- return class NewComponent extends Component {
+ class NewComponent extends Component {
constructor( props ) {
super( props );
@@ -293,7 +293,12 @@ const withData = (
/>
);
}
- };
+ }
+
+ const displayName = DataDependentComponent.displayName || DataDependentComponent.name || 'AnonymousComponent';
+ NewComponent.displayName = `withData(${ displayName })`;
+
+ return NewComponent;
};
export default withData;
| 12 |
diff --git a/elements/simple-toolbar/lib/simple-toolbar-button.js b/elements/simple-toolbar/lib/simple-toolbar-button.js @@ -88,6 +88,14 @@ const SimpleToolbarButtonBehaviors = function (SuperClass) {
reflect: true,
},
+ /**
+ * Optional to set aria-describedby.
+ */
+ describedby: {
+ type: String,
+ attribute: "describedby",
+ },
+
/**
* Optional iron icon name for the button.
*/
@@ -458,7 +466,7 @@ const SimpleToolbarButtonBehaviors = function (SuperClass) {
* @returns
*/
_uniqueText(string1 = "", string2 = "") {
- return (string1 || "").trim() !== (string2 || "").trim();
+ return String(string1 || "").trim() !== String(string2 || "").trim();
}
/**
* template for button icon
@@ -527,6 +535,9 @@ const SimpleToolbarButtonBehaviors = function (SuperClass) {
? html` <button
id="button"
aria-checked="${this.isToggled ? "true" : "false"}"
+ aria-describedby="${!!this.describedby && this.describedby !== ""
+ ? this.describedby
+ : undefined}"
class="simple-toolbar-button"
?disabled="${this.disabled}"
?controls="${this.controls}"
@@ -546,6 +557,9 @@ const SimpleToolbarButtonBehaviors = function (SuperClass) {
? html` <button
id="button"
aria-pressed="${this.isToggled ? "true" : "false"}"
+ aria-describedby="${!!this.describedby && this.describedby !== ""
+ ? this.describedby
+ : undefined}"
class="simple-toolbar-button"
?disabled="${this.disabled}"
?controls="${this.controls}"
@@ -561,6 +575,9 @@ const SimpleToolbarButtonBehaviors = function (SuperClass) {
${this.tooltipTemplate}`
: html` <button
id="button"
+ aria-describedby="${!!this.describedby && this.describedby !== ""
+ ? this.describedby
+ : undefined}"
class="simple-toolbar-button"
?disabled="${this.disabled}"
?controls="${this.controls}"
| 1 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,21 @@ 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.45.1] -- 2019-03-05
+
+### Fixed
+- Fix axis automargin pushes for rotated tick labels [#3605]
+- Fix automargin logic on (very) small graphs [#3605]
+- Fix locales support in `hovertemplate` strings [#3586]
+- Fix gl3d reset camera buttons for scenes with orthographic projection [#3597]
+- Fix typed array support for `parcoords` dimensions values and `line.color` [#3598]
+- Fix `cone` rendering on some older browsers [#3591]
+- Fix `lightposition` behavior for `cone` traces [#3591]
+- Fix `lightposition` behavior for `streamtube` trace [#3593]
+- Remove unused files from `gl-cone3d` dependency [#3591]
+- Remove unused files from `gl-streamtube3d` dependency [#3593]
+
+
## [1.45.0] -- 2019-02-26
### Added
| 3 |
diff --git a/articles/api-auth/index.html b/articles/api-auth/index.html @@ -86,6 +86,9 @@ title: API Authorization
<li>
<i class="icon icon-budicon-695"></i><a href="/api-auth/tutorials/silent-authentication">Silent authentication for SPAs</a>
</li>
+ <li>
+ <i class="icon icon-budicon-695"></i><a href="/api-auth/tutorials/nonce">Protect against replay attacks</a>
+ </li>
</ul>
</li>
<li>
| 0 |
diff --git a/package.json b/package.json "scripts": {
"heroku-prebuild": "bash prebuild.sh",
"heroku-postbuild": "bash postbuild.sh",
- "precommit": "lint-staged",
- "lint-markdown": "node ./check-markdown.js"
+ "precommit": "lint-staged"
},
"lint-staged": {
- "*.md": "npm run lint-markdown"
+ "*.md": "markdownlint"
},
"engines": {
"node": "4.5"
},
"devDependencies": {
"commander": "^2.8.1",
- "filehound": "^1.16.1",
"husky": "^0.13.3",
"imagemin": "^4.0.0",
"imagemin-optipng": "^4.3.0",
| 14 |
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html to return nothing in order to halt a flow.</p>
<p>The <b>Setup</b> tab contains code that will be run whenever the node is started.
The <b>Close</b> tab contains code that will be run when the node is stopped.</p>
+ <p>If an promise object is returned from the setup code, input message processing starts after its completion.</p>
<h3>Details</h3>
<p>See the <a target="_blank" href="http://nodered.org/docs/writing-functions.html">online documentation</a>
for more information on writing functions.</p>
<li>a single message object - passed to nodes connected to the first output</li>
<li>an array of message objects - passed to nodes connected to the corresponding outputs</li>
</ul>
+ <p>Note: The setup code is executed during the initialization of nodes. Therefore, if <code>node.send</code> is called in the setup tab, subsequent nodes may not be able to receive the message.</p>
<p>If any element of the array is itself an array of messages, multiple
messages are sent to the corresponding output.</p>
<p>If null is returned, either by itself or as an element of the array, no
| 3 |
diff --git a/src/og/ajax.js b/src/og/ajax.js @@ -88,24 +88,6 @@ const defaultParams = {
responseType: "text"
};
-function createXMLHttp() {
- var xhr = null;
- if (typeof XMLHttpRequest != "undefined") {
- xhr = new XMLHttpRequest();
- return xhr;
- } else if (window.ActiveXObject) {
- var ieXMLHttpVersions = ['MSXML2.XMLHttp.5.0', 'MSXML2.XMLHttp.4.0', 'MSXML2.XMLHttp.3.0', 'MSXML2.XMLHttp', 'Microsoft.XMLHttp'];
- for (var i = 0; i < ieXMLHttpVersions.length; i++) {
- try {
- xhr = new ActiveXObject(ieXMLHttpVersions[i]);
- return xhr;
- } catch (e) {
- throw new Error('og.ajax.createXMLHttp creation failed.');
- }
- }
- }
-}
-
/**
* Send an ajax request.
* @function
@@ -137,7 +119,7 @@ ajax.request = function (url, params) {
p.data = params.data;
- var xhr = createXMLHttp();
+ var xhr = new XMLHttpRequest();
var customXhr = new Xhr(xhr);
| 2 |
diff --git a/unlock-app/src/services/web3Service.js b/unlock-app/src/services/web3Service.js /* eslint no-console: 0 */ // TODO: remove me when this is clean
import Web3 from 'web3'
+import Web3Utils from 'web3-utils'
import { networks } from '../config'
import LockContract from '../artifacts/contracts/Lock.json'
@@ -292,7 +293,7 @@ export const getLock = (address) => {
*/
export const purchaseKey = (lockAddress, account, keyPrice, keyData) => {
const lock = new web3.eth.Contract(LockContract.abi, lockAddress)
- const data = lock.methods.purchase(keyData).encodeABI()
+ const data = lock.methods.purchase(Web3Utils.utf8ToHex(keyData)).encodeABI()
// The transaction object (conflict if other transactions have not been confirmed yet?)
// TODO: We have a race condition because this will keep emitting even after
| 4 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -12,7 +12,6 @@ Contributions to CouchDB are governed by our [Code of Conduct][6] and a set of
[Project Bylaws][7]. Apache CouchDB itself also has a [CONTRIBUTING.md][9] if
you want to help with the larger project. Come join us!
-
## Contributor quick start
If you never created a pull request before, welcome :tada: :smile: [Here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
@@ -57,6 +56,20 @@ Now run:
And your Fauxton dev server will be up and running at `localhost:8000`.
+Caveats:
+
+If the Fauxton UI appears to be held up loading data, check the
+browser dev tool error logs. If you see an error message like:
+
+```
+Refused to connect to '<URL>' because it violates the following Content Security Policy directive: "default-src 'self'". Note that 'connect-src' was not explicitly set, so 'default-src' is used as a fallback.
+```
+
+It means you need to enable CORS on CouchDB. There are a few ways of doing this:
+
+1. Directly in Fauxton through the Config panel (Gear icon on the side menu) under the CORS tab
+2. Use the [add-cors-to-couchdb](https://github.com/pouchdb/add-cors-to-couchdb) CLI
+3. Manually set it in CouchDB's [configuration files](https://docs.couchdb.org/en/1.3.0/cors.html#enabling-cors)
## Guide to Contributions
@@ -105,7 +118,6 @@ there is room for improvement.
-- Fauxton team
-
[6]: http://couchdb.apache.org/conduct.html
[7]: http://couchdb.apache.org/bylaws.html
[8]: http://webchat.freenode.net?channels=%23couchdb-dev
| 0 |
diff --git a/articles/libraries/auth0js/index.md b/articles/libraries/auth0js/index.md @@ -20,10 +20,6 @@ The [example directory](https://github.com/auth0/auth0.js/tree/master/example) o
1. Download dependencies by running `npm install` from the root of this project
1. Finally, execute `npm run example` from the root of this project, and then browse to your app running on the node server, presumably at `http://localhost:3000`.
-<img width="600" src="/media/articles/libraries/auth0js/auth0js-example.png" />
-
-It's that easy!
-
## Setup and Initialization
Now, let's get started integrating auth0.js into your project. We'll cover [methods of installation](#installation-options), [how to initialize auth0.js](#initialization), [signup](#signup), [login](#login), [logout](#logout), and more!
| 2 |
diff --git a/src/encoded/commands/generate_ontology.py b/src/encoded/commands/generate_ontology.py @@ -238,45 +238,6 @@ ntr_assays = {
"systems": [],
"types": []
},
- "NTR:0001684": {
- "assay": ['Transcription'],
- "category": [],
- "developmental": [],
- "name": "5' RLM RACE",
- "objectives": [],
- "organs": [],
- "preferred_name": "",
- "slims": [],
- "synonyms": [],
- "systems": [],
- "types": []
- },
- "NTR:0002490": {
- "assay": ['DNA methylation'],
- "category": [],
- "developmental": [],
- "name": "TAB-seq",
- "objectives": [],
- "organs": [],
- "preferred_name": "",
- "slims": [],
- "synonyms": [],
- "systems": [],
- "types": []
- },
- "NTR:0003027": {
- "assay": ['RNA binding'],
- "category": [],
- "developmental": [],
- "name": "eCLIP",
- "objectives": [],
- "organs": [],
- "preferred_name": "",
- "slims": [],
- "synonyms": [],
- "systems": [],
- "types": []
- },
"NTR:0001132": {
"assay": ['RNA binding'],
"category": [],
@@ -303,14 +264,14 @@ ntr_assays = {
"systems": [],
"types": []
},
- "NTR:0003508": {
- "assay": ['Genotyping'],
+ "NTR:0004774": {
+ "assay": ['DNA accessibility'],
"category": [],
"developmental": [],
- "name": "Whole genome shotgun sequencing",
+ "name": "genetic modification followed by DNase-seq",
"objectives": [],
"organs": [],
- "preferred_name": "WGS",
+ "preferred_name": "genetic modification DNase-seq",
"slims": [],
"synonyms": [],
"systems": [],
| 2 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -109,7 +109,7 @@ fabric-android-secrets: &fabric-android-secrets
fabric-ios-secrets: &fabric-ios-secrets
run:
name: Set Fabric secret
- command: echo -e "$FABRIC_API_KEY\n$FABRIC_BUILD_SECRET" >> ./PrideLondonApp/fabric.properties
+ command: echo -e "$FABRIC_API_KEY\n$FABRIC_BUILD_SECRET" >> /Users/distiller/project/ios/PrideLondonApp/fabric.properties
docker-android-job-defaults: &docker-android-job-defaults
working_directory: ~/project/android
| 12 |
diff --git a/components/Discussion/DiscussionProvider/DiscussionProvider.tsx b/components/Discussion/DiscussionProvider/DiscussionProvider.tsx @@ -104,7 +104,7 @@ const DiscussionProvider: FC<Props> = ({
actions: {
...actions,
shareHandler,
- openDiscussionPreferences: () => {
+ preferencesHandler: () => {
preferencesOverlay.handleOpen()
return Promise.resolve({ ok: true })
}
| 10 |
diff --git a/sources/li/countrywide.json b/sources/li/countrywide.json },
"country": "li"
},
- "data": "https://www.dropbox.com/s/t77mtmevrdddd4q/li_countrywide.zip?dl=1",
+ "data": "https://s3.amazonaws.com/data.openaddresses.io/cache/uploads/sergiyprotsiv/3b8bdb/li_countrywide.zip",
"website": "http://geodaten.llv.li/geoportal/gebaeudeidentifikator.html",
"type": "http",
"compression": "zip",
"city": "ortschaft",
"postcode": "plz",
"type": "shapefile",
- "accuracy": 1
+ "accuracy": 1,
+ "srs":"EPSG:2056"
}
}
| 12 |
diff --git a/avatars/avatars.js b/avatars/avatars.js @@ -340,6 +340,8 @@ const loadPromise = (async () => {
`left strafe.fbx`,
`right strafe walking.fbx`,
`right strafe.fbx`,
+ `Crouched Sneaking Left.fbx`,
+ `Crouched Sneaking Right.fbx`,
];
for (const name of reversibleAnimationNames) {
const animation = animations.find(a => a.name === name);
| 0 |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
- node-version: '12.x'
+ node-version: '14.x'
- run: npm install
- run: npm test
| 3 |
diff --git a/doc/manual.html b/doc/manual.html @@ -3178,14 +3178,14 @@ editor.setOption("extraKeys", {
<dt id="addon_tern"><a href="../addon/tern/tern.js"><code>tern/tern.js</code></a></dt>
<dd>Provides integration with
- the <a href="http://ternjs.net">Tern</a> JavaScript analysis
+ the <a href="https://ternjs.net">Tern</a> JavaScript analysis
engine, for completion, definition finding, and minor
refactoring help. See the <a href="../demo/tern.html">demo</a>
for a very simple integration. For more involved scenarios, see
the comments at the top of
the <a href="../addon/tern/tern.js">addon</a> and the
implementation of the
- (multi-file) <a href="http://ternjs.net/doc/demo.html">demonstration
+ (multi-file) <a href="https://ternjs.net/doc/demo/index.html">demonstration
on the Tern website</a>.</dd>
</dl>
</section>
| 1 |
diff --git a/src/actor.js b/src/actor.js @@ -96,6 +96,7 @@ const addInputOptionsOrThrow = (input, contentType, options) => {
/**
* Parsed representation of the `APIFY_XXX` environmental variables.
+ * This object is returned by the {@link Apify#getEnv} function.
*
* @typedef ApifyEnv
* @property {string|null} actorId ID of the actor (APIFY_ACTOR_ID)
| 7 |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -image: docker:latest
+image: docker:18.06-dind
services:
- docker:dind
@@ -66,7 +66,7 @@ test-lost:
# image: docker/compose:1.24.0
stage: test-lost
before_script:
- - apk add --update python py-pip python-dev && pip install --upgrade --force-reinstall pip==9.0.3 && pip install docker-compose
+ - apk add --update python py-pip python-dev && pip install docker-compose
script:
- cd docker/compose && docker-compose run -e LOST_VERSION=$LOST_VERSION lost bash /pytest.sh
except:
| 4 |
diff --git a/src/registry/domain/repository.js b/src/registry/domain/repository.js @@ -19,6 +19,10 @@ const errorToString = require('../../utils/error-to-string');
module.exports = function(conf) {
const cdn = !conf.local && new conf.storage.adapter(conf.storage.options);
const options = !conf.local && conf.storage.options;
+ const storagePath =
+ options && options.path.match(/^http/)
+ ? options.path
+ : `https:${options.path}`;
const repositorySource = conf.local
? 'local repository'
: cdn.adapterType + ' cdn';
@@ -204,7 +208,7 @@ module.exports = function(conf) {
getComponentPath: (componentName, componentVersion) => {
const prefix = conf.local
? conf.baseUrl
- : `https:${options.path}${options.componentsDir}/`;
+ : `${storagePath}${options.componentsDir}/`;
return `${prefix}${componentName}/${componentVersion}/`;
},
getComponents: callback => {
@@ -248,14 +252,14 @@ module.exports = function(conf) {
);
},
getStaticClientPath: () =>
- `https:${options.path}${getFilePath(
+ `${storagePath}${getFilePath(
'oc-client',
packageInfo.version,
'src/oc-client.min.js'
)}`,
getStaticClientMapPath: () =>
- `https:${options.path}${getFilePath(
+ `${storagePath}${getFilePath(
'oc-client',
packageInfo.version,
'src/oc-client.min.map'
| 11 |
diff --git a/speech.js b/speech.js @@ -40,7 +40,7 @@ app.use((req, res, next) => { // custom logging middleware to log all incoming
});
// initialize passport
-app.use(session({ secret: 'cats' }));
+app.use(session({ secret: 'cats', resave: false, saveUninitialized: false }));
app.use(passport.initialize());
app.use(passport.session());
passport.serializeUser(serializeSpeechUser); // takes the user id from the db and serializes it
| 12 |
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js @@ -3150,7 +3150,7 @@ describe('Test axes', function() {
})
.then(function() {
var size = gd._fullLayout._size;
- expect(size.l).toBe(previousSize.l);
+ expect(size.l).toBeWithin(previousSize.l, 1.1);
expect(size.r).toBe(previousSize.r);
expect(size.b).toBe(previousSize.b);
expect(size.t).toBe(previousSize.t);
@@ -3187,7 +3187,7 @@ describe('Test axes', function() {
expect(size.l).toBe(initialSize.r);
expect(size.r).toBe(previousSize.l);
expect(size.b).toBe(initialSize.b);
- expect(size.t).toBe(previousSize.b);
+ expect(size.t).toBeWithin(previousSize.b, 1.1);
return Plotly.relayout(gd, {
'xaxis.automargin': false,
| 0 |
diff --git a/packages/gatsby-source-filesystem/src/create-remote-file-node.js b/packages/gatsby-source-filesystem/src/create-remote-file-node.js @@ -7,7 +7,7 @@ const { isWebUri } = require(`valid-url`)
const { createFileNode } = require(`./create-file-node`)
const cacheId = url => `create-remote-file-node-${url}`
-module.exports = ({ url, store, cache, createNode, _auth }) =>
+module.exports = ({ url, store, cache, createNode, auth = {} }) =>
new Promise(async (resolve, reject) => {
if (!url || isWebUri(url) === undefined) {
resolve()
@@ -27,7 +27,7 @@ module.exports = ({ url, store, cache, createNode, _auth }) =>
// from a previous request.
const cachedHeaders = await cache.get(cacheId(url))
const headers = {
- auth: _auth.htaccess_user + `:` + _auth.htaccess_pass,
+ auth: auth.htaccess_user + `:` + auth.htaccess_pass,
}
if (cachedHeaders && cachedHeaders.etag) {
headers[`If-None-Match`] = cachedHeaders.etag
| 12 |
diff --git a/assets/js/modules/search-console/components/dashboard/SearchFunnelWidget/PreviewGraph.js b/assets/js/modules/search-console/components/dashboard/SearchFunnelWidget/PreviewGraph.js @@ -37,7 +37,7 @@ export default function PreviewGraph( { title, GraphSVG } ) {
</div>
<div className="googlesitekit-analytics-cta__preview-graph--icons">
<UpArrow className="googlesitekit-analytics-cta__preview-graph--up-arrow" />
- <div className="googlesitekit-analytics-cta__preview-graph--bar" />
+ <span className="googlesitekit-analytics-cta__preview-graph--bar" />
</div>
</div>
);
| 14 |
diff --git a/README.md b/README.md @@ -509,6 +509,10 @@ meteor: {
```
+You also need to:
+1. Make sure `meteor.env.ROOT_URL` starts with `https://`
+2. Setup DNS for each of the domains in `meteor.ssl.autogenerate.domains`
+
Then run `mup deploy`. It will automatically create certificates and set up SSL, which can take up to a few minutes. The certificates will be automatically renewed when they expire within 30 days.
### Upload certificates
@@ -633,6 +637,16 @@ If it silently fails for a different reason, please create an issue.
This usually happens when meteor is not installed.
+#### Let's Encrypt is not working
+
+Make sure your `meteor.env.ROOT_URL` starts with `https://`. Also, check that the dns for all of the domains in `ssl.autogenerate.domains` is correctly configured to point to the server. Port 80 needs to be open in the server so it can verify that you control the domain.
+
+You can view the Let's Encrypt logs by running this command on the server:
+```
+docker logs <AppName>-nginx-letsencrypt
+```
+Replace `<AppName>` with the name of the app.
+
#### Unwanted redirects to https
Make sure `force-ssl` is not in `.meteor/versions`. If it is, either your app, or a package it uses has `force-ssl` as a dependency.
| 7 |
diff --git a/tokensale/Tokensale.sol b/tokensale/Tokensale.sol @@ -74,12 +74,12 @@ pragma solidity ^0.4.19
START_DATE:
Date after which the token sale will be live.
+ `node> + new Date('1 February 2018 GMT+0')/1000`
MAX_FUNDING_PERIOD:
Period of time the tokensale will be live. Note that the owner
can finalise the contract early.
-
*/
contract HavvenConfig {
@@ -89,36 +89,132 @@ contract HavvenConfig {
address public owner = msg.sender;
address public FUND_WALLET = 0x0;
uint public constant MAX_TOKENS = 150000000;
- uint public constant START_DATE = 1502668800;
+ uint public constant START_DATE = 1517443200;
uint public constant MAX_FUNDING_PERIOD = 60 days;
}
library SafeMath {
// a add to b
- function add(uint a, uint b) internal returns (uint c) {
+ function add(uint a, uint b) internal pure returns (uint c) {
c = a + b;
assert(c >= a);
}
// a subtract b
- function sub(uint a, uint b) internal returns (uint c) {
+ function sub(uint a, uint b) internal pure returns (uint c) {
c = a - b;
assert(c <= a);
}
// a multiplied by b
- function mul(uint a, uint b) internal returns (uint c) {
+ function mul(uint a, uint b) internal pure returns (uint c) {
c = a * b;
assert(a == 0 || c / a == b);
}
// a divided by b
- function div(uint a, uint b) internal returns (uint c) {
+ function div(uint a, uint b) internal pure returns (uint c) {
+ assert(b != 0);
c = a / b;
- // No assert required as no overflows are posible.
}
+}
+
+
+contract ERC20Token {
+
+ using SafeMath for uint;
+
+ /* State variables */
+
+ uint public totalSupply;
+ mapping (address => uint) balances;
+ mapping (address => mapping (address => uint)) allowed;
+
+
+ /* Events */
+
+ event Transfer(
+ address indexed _from,
+ address indexed _to,
+ uint256 _amount
+ );
+
+ event Approval(
+ address indexed _owner,
+ address indexed _spender,
+ uint256 _amount
+ );
+
+
+
+ /* Functions */
+
+ // Using an explicit getter allows for function overloading
+ function balanceOf(address _addr)
+ public
+ view
+ returns (uint)
+ {
+ return balances[_addr];
+ }
+
+ // Using an explicit getter allows for function overloading
+ function allowance(address _owner, address _spender)
+ public
+ constant
+ returns (uint)
+ {
+ return allowed[_owner][_spender];
+ }
+
+ // Send _value amount of tokens to address _to
+ function transfer(address _to, uint256 _amount)
+ public
+ returns (bool)
+ {
+ return xfer(msg.sender, _to, _amount);
+ }
+
+ // Send _value amount of tokens from address _from to address _to
+ function transferFrom(address _from, address _to, uint256 _amount)
+ public
+ returns (bool)
+ {
+ require(_amount <= allowed[_from][msg.sender]);
+
+ allowed[_from][msg.sender] = allowed[_from][msg.sender].sub(_amount);
+ return xfer(_from, _to, _amount);
+ }
+
+ // Process a transfer internally.
+ function xfer(address _from, address _to, uint _amount)
+ internal
+ returns (bool)
+ {
+ require(_amount <= balances[_from]);
+
+ Transfer(_from, _to, _amount);
+
+ // avoid wasting gas on 0 token transfers
+ if(_amount == 0) return true;
+
+ balances[_from] = balances[_from].sub(_amount);
+ balances[_to] = balances[_to].add(_amount);
+
+ return true;
+ }
+
+ // Approves a third-party spender
+ function approve(address _spender, uint256 _amount)
+ public
+ returns (bool)
+ {
+ allowed[msg.sender][_spender] = _amount;
+ Approval(msg.sender, _spender, _amount);
+ return true;
+ }
}
contract Havven {
| 3 |
diff --git a/addon/start-mirage.js b/addon/start-mirage.js -import { getWithDefault } from '@ember/object';
import readModules from './utils/read-modules';
import Server from './server';
import { singularize, pluralize } from 'ember-inflector';
@@ -30,10 +29,12 @@ export default function startMirage(owner, { env, baseConfig, testConfig } = {})
}
let environment = env.environment;
- let discoverEmberDataModels = getWithDefault(env['ember-cli-mirage'] || {}, 'discoverEmberDataModels', true);
+ let mirageEnvironment = env['ember-cli-mirage'] || {};
+ let discoverEmberDataModels = mirageEnvironment.discoverEmberDataModels;
+ if (discoverEmberDataModels === undefined) { discoverEmberDataModels = true; }
let modules = readModules(env.modulePrefix);
let options = Object.assign(modules, {environment, baseConfig, testConfig, discoverEmberDataModels});
- options.trackRequests = env['ember-cli-mirage'].trackRequests;
+ options.trackRequests = mirageEnvironment.trackRequests;
options.inflector = { singularize, pluralize };
return new Server(options);
| 14 |
diff --git a/modules/layers/src/solid-polygon-layer/solid-polygon-layer-vertex-main.glsl.js b/modules/layers/src/solid-polygon-layer/solid-polygon-layer-vertex-main.glsl.js @@ -75,7 +75,10 @@ void calculatePosition(PolygonProps props) {
pos.z += props.elevations * vertexPositions.y * elevationScale;
#ifdef IS_SIDE_VERTEX
- normal = vec3(props.positions.y - props.nextPositions.y, props.nextPositions.x - props.positions.x, 0.0);
+ normal = vec3(
+ props.positions.y - props.nextPositions.y + (props.positions64Low.y - props.nextPositions64Low.y),
+ props.nextPositions.x - props.positions.x + (props.nextPositions64Low.x - props.positions64Low.x),
+ 0.0);
normal = project_offset_normal(normal);
#else
normal = vec3(0.0, 0.0, 1.0);
| 7 |
diff --git a/app/shared/components/Producers/BlockProducers.js b/app/shared/components/Producers/BlockProducers.js @@ -78,7 +78,7 @@ class BlockProducers extends Component<Props> {
} = this.state;
const account = accounts[settings.account];
- const isMainnet = (connection && connection.chain === 'eos-mainnet');
+ const isMainnet = connection.chainKey && connection.chainKey.toLowerCase().indexOf('mainnet') !== -1;
const isProxying = !!(account && account.voter_info && account.voter_info.proxy);
const isValidUser = !!((keys && keys.key && settings.walletMode !== 'wait') || ['watch','ledger'].includes(settings.walletMode));
| 12 |
diff --git a/js/node/bis_netwebsocketfileserver.js b/js/node/bis_netwebsocketfileserver.js @@ -460,7 +460,7 @@ class BisNetWebSocketFileServer extends BaseFileServer {
return name;
};
- function addToCurrentTransfer(upload, socket, control) {
+ function addToCurrentTransfer(upload, socket) {
let dataInProgress=self.fileInProgress;
@@ -534,9 +534,8 @@ class BisNetWebSocketFileServer extends BaseFileServer {
*
* @param {Object|Uint8Array} upload - Either the first transmission initiating the transfer loop or a chunk.
* @param {Net.Socket} socket - The control socket that will negotiate the opening of the data socket and send various communications about the transfer.
- * @param {Object} control - Parsed WebSocket header for the file request.
*/
- getFileFromClientAndSave(upload, socket, control) {
+ getFileFromClientAndSave(upload, socket) {
if (this.opts.readonly) {
console.log('.....','Server is in read-only mode and will not accept writes.');
| 2 |
diff --git a/assets/src/home/LibrarySelector.test.js b/assets/src/home/LibrarySelector.test.js @@ -8,14 +8,19 @@ describe('LibrarySelector', () => {
let librarySelector;
let bookService;
let profileService;
- const libraries = [
+ const libraries = {
+ count: 1,
+ next: null,
+ previous: null,
+ results: [
{
id: 1,
url: "http://localhost:8000/api/libraries/bh/",
name: "Belo Horizonte",
slug: "bh",
}
- ];
+ ]
+ };
beforeEach(() => {
global.window = {location: {href: ''}};
@@ -25,7 +30,8 @@ describe('LibrarySelector', () => {
};
profileService = {
- setRegion: () => {}
+ setRegion: () => {
+ }
};
librarySelector = shallow(<LibrarySelector bookService={bookService} profileService={profileService}/>);
| 1 |
diff --git a/packages/yoroi-extension/features/support/webdriver.js b/packages/yoroi-extension/features/support/webdriver.js @@ -126,7 +126,7 @@ function CustomWorld(cmdInput: WorldInput) {
this.getElementsBy = (locator, method = By.css) => this.driver.findElements(method(locator));
- this.getText = locator => this.getElementBy(locator).getText();
+ this.getText = (locator, method = By.css) => this.getElementBy(locator, method).getText();
// $FlowExpectedError[prop-missing] Flow doesn't like that we add a new function to driver
this.getValue = this.driver.getValue = async locator =>
this.getElementBy(locator).getAttribute('value');
@@ -176,10 +176,10 @@ function CustomWorld(cmdInput: WorldInput) {
return this.driver.wait(condition);
};
- this.waitUntilText = async (locator, text, timeout = 75000) => {
+ this.waitUntilText = async (locator, text, timeout = 75000, method = By.css) => {
await this.driver.wait(async () => {
try {
- const value = await this.getText(locator);
+ const value = await this.getText(locator, method);
return value === text;
} catch (err) {
return false;
| 7 |
diff --git a/src/input/pointer.js b/src/input/pointer.js // legacy mouse event type
var mouseEventList = [
WHEEL[0],
+ POINTER_MOVE[1],
+ POINTER_DOWN[1],
+ POINTER_UP[1],
+ POINTER_CANCEL[1],
+ POINTER_ENTER[1],
+ POINTER_LEAVE[1]
+ ];
+
+ // iOS style touch event type
+ var touchEventList = [
POINTER_MOVE[2],
POINTER_DOWN[2],
POINTER_UP[2],
POINTER_LEAVE[2]
];
- // iOS style touch event type
- var touchEventList = [
- POINTER_MOVE[3],
- POINTER_DOWN[3],
- POINTER_UP[3],
- POINTER_CANCEL[3],
- POINTER_ENTER[3],
- POINTER_LEAVE[3]
- ];
-
var pointerEventMap = {
wheel : WHEEL,
pointermove: POINTER_MOVE,
var eventTypes = findAllActiveEvents(activeEventList, pointerEventMap[eventType]);
var handlers = evtHandlers.get(region);
+ if (typeof (handlers) !== "undefined") {
for (var i = 0; i < eventTypes.length; i++) {
eventType = eventTypes[i];
if (handlers.callbacks[eventType]) {
if (Object.keys(handlers.callbacks).length === 0) {
evtHandlers.delete(region);
}
+ }
};
/**
| 1 |
diff --git a/package.json b/package.json "author": "Marius Andra",
"license": "MIT",
"main": "lib/index.js",
- "jsnext:main": "src/index.js",
+ "module": "src/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/keajs/kea.git"
| 14 |
diff --git a/README.md b/README.md @@ -6,20 +6,20 @@ TA.Gui is a tool for non-developers and business users to automate web apps
# Why This
Automate repetitive parts of your work - use cases include data acquisition, process and test automations.
-TA.Gui converts automation flows in simple natural language into lines of JavaScript code for CasperJS & PhantomJS to perform their web automation magic. For example, TA.Gui will instantly convert the flow below into ~100 lines of working JavaScript code and perform the series of steps to download a Typeform report automatically.
+TA.Gui converts automation flows in simple natural language into lines of JavaScript code for CasperJS & PhantomJS to perform their web automation magic. For example, TA.Gui will instantly convert the flow below into 100+ lines of working JavaScript code and perform the series of steps to download a Typeform report automatically.
The flow can be triggered from scheduling, command line, REST API, URL, email etc. Everything happens in the background without seeing any web browser, so that you can continue to use the computer or server uninterrupted. Running on a visible web browser is also supported, using Firefox and SlimerJS (see firefox option below).
```
https://www.typeform.com
click login
-type username|[email protected]
-type password|12345678
+type username as [email protected]
+type password as 12345678
click btnlogin
hover Test Event
click action results tooltip
click section_results
-download https://admin.typeform.com/form/2592751/analyze/csv|report.csv
+download https://admin.typeform.com/form/2592751/analyze/csv to report.csv
```
# Set Up
@@ -42,7 +42,7 @@ debug|show run-time backend messages from PhantomJS for detailed tracing or logg
# Pipeline
Feature|Purpose
:-----:|:------
-Enhancements|natural language, keywords, object repo
+Enhancements|add keywords, object repository
Active I/O|triggering and actioning from email/API
Passive I/O|xls/csv datatables and web-based results
Chrome Extension|facilitate creation of automation flows
@@ -59,24 +59,22 @@ Word|Parameter(s)|Purpose
:---|:-----------|:------
tap / click|element to click|click on an element
hover / move|element to hover|move cursor to element
-type / enter|element to type in | text to type|enter text in element
-read / fetch|element to read from | variable name|fetch text into variable
-show / print|element to read from|print element text to screen and logfile
-download|url to download | filename to save|download file from url
-file|url keyword to watch for | filename to save|download when resource received
+type / enter|element to type ***as*** text to type|enter element as text
+read / fetch|element to read ***to*** variable name|fetch text to variable
+show / print|element to read |print element text to screen and logfile
+download|url to download ***to*** filename to save|download url to file
+file|url keyword to watch ***to*** filename to save|download when resource received
echo|text and variables (text in quotes)|print text/variables to screen and logfile
-save|element to read from | optional filename|save element text to file
-dump|variable name | optional filename|save variable to file
-snap|element (page = screen) | optional filename|save screenshot to file
+save|element to read ***to*** optional filename|save text to file
+dump|variable name ***to*** optional filename|save variable to file
+snap|element (page = screen) ***to*** optional filename|save screenshot to file
wait|time in milliseconds|wait for some time
test|condition to test | text if true | text if false|test condition and print result
-frame|frame name | subframe name if any|specify next step is within frame/subframe
+frame|frame name | subframe name if any|next step is within frame/subframe
-- Above words are case-insensitive to let users write flexibly in the way they want
-- Extra spaces between parameters and | are optional, for flexible user formatting
- JavaScript code can be used (in CasperJS's context); if/for/while applies to next step
- XPath is robust for identification and used to check for a particular webpage element
-- XPath is checked in following order of priority full-xpath, id, name, class, title, text()
+- XPath checked in following order of priority full-xpath, id, name, class, title, text()
# License
TA.Gui is open-source software released under the MIT license
| 7 |
diff --git a/package.json b/package.json {
"name": "minimap",
"main": "./lib/main",
- "version": "4.28.2",
+ "version": "4.28.3",
"private": true,
"description": "A preview of the full source code.",
"author": "Fangdun Cai <[email protected]>",
| 6 |
diff --git a/README.md b/README.md @@ -45,7 +45,7 @@ environment build for anything "serious."
ember serve --environment production
```
-You can also specify the port (default is 3000):
+You can also specify the port (default is 4200):
```
ember serve --port 8088
| 12 |
diff --git a/new-client/src/models/DrawModel.js b/new-client/src/models/DrawModel.js @@ -426,6 +426,9 @@ class DrawModel {
this.#drawTooltipElement.innerHTML = null;
this.#currentPointerCoordinate = null;
this.#drawTooltip.setPosition(this.#currentPointerCoordinate);
+ // We set the USER_DRAWN prop to true so that we can keep track
+ // of the user drawn features.
+ feature.set("USER_DRAWN", true);
// And set a nice style on the feature to be added.
feature.setStyle(this.#getFeatureStyle(feature));
};
| 12 |
diff --git a/src/resources/views/columns/email.blade.php b/src/resources/views/columns/email.blade.php @endphp
{{-- email link --}}
-<span><a href="mailto:{{ $entry->{$column['name']} }}">{{ str_limit(strip_tags($value), array_key_exists('limit', $column) ? $column['limit'] : 50, "[...]") }}</a></span>
+<span><a href="mailto:{{ $entry->{$column['name']} }}">{{ str_limit(strip_tags($value), array_key_exists('limit', $column) ? $column['limit'] : 254, "[...]") }}</a></span>
| 12 |
diff --git a/src/enforcers/MediaType.js b/src/enforcers/MediaType.js @@ -49,11 +49,16 @@ module.exports = {
additionalProperties: EnforcerRef('Example')
},
schema: EnforcerRef('Schema')
+ },
+ errors: ({ parent, key, warn }) => {
+ if (parent && parent.key === 'content') {
+ if (!module.exports.rx.mediaType.test(key)) warn.message('Media type appears invalid');
+ }
}
}
},
rx: {
- mediaType: /^(application|audio|example|font|image|message|model|multipart|text|video)\/(?:([a-z.\-]+)\+)?([a-z.\-]+)(?:; (.+))?$/
+ mediaType: /^(application|audio|example|font|image|message|model|multipart|text|video|x-\S+)\/(?:([a-z.\-]+)\+)?([a-z.\-]+)(?:; *(.+))?$/
}
};
| 7 |
diff --git a/app/templates/_package.json b/app/templates/_package.json "postinstall": "tsc",
<% } %>
<% if (clientOnly) { %>
- "start": "aliv",
- "dev": "aliv",
+ "start": "gulp",
+ "dev": "gulp",
+ "watch": "gulp",
"test": "gulp client.unit_test",
"build-dist": "gulp client.build:dist"
<%} else {%>
| 4 |
diff --git a/projects/ngx-extended-pdf-viewer/src/assets/viewer.js b/projects/ngx-extended-pdf-viewer/src/assets/viewer.js @@ -12928,7 +12928,6 @@ document.webL10n = function (window, document, undefined) {
if (!gMacros._pluralRules) {
gMacros._pluralRules = getPluralRules(gLanguage);
}
- debugger;
var index = '[' + gMacros._pluralRules(n) + ']';
if (n === 0 && key + '[zero]' in gL10nData) {
str = gL10nData[key + '[zero]'][prop];
| 13 |
diff --git a/vis/stylesheets/modules/_modal.scss b/vis/stylesheets/modules/_modal.scss }
#images_modal {
- .modal-lg, .modal-dialog {
+ .modal-lg,
+ .modal-dialog {
max-width: 788px;
}
+ .modal-body {
+ height: 80vh;
+ width: 100%;
+ display: table;
+ overflow: scroll;
+
+ #images_holder {
+ width: 100%;
+ height: 75vh;
+ overflow-y: scroll;
+ }
+ }
+ }
+
#edit-button-text p {
margin: 0 0 30px !important;
}
}
}
- .modal-body {
- height: 80vh;
- width: 100%;
- display: table;
- overflow: scroll;
-
- #images_holder {
- width: 100%;
- height: 75vh;
- overflow-y: scroll;
- }
- }
- }
-
div {
&#preview_page_index {
font-size: 12px;
| 1 |
diff --git a/assets/js/util/i18n.js b/assets/js/util/i18n.js @@ -186,15 +186,7 @@ export const numFmt = ( number, options = {} ) => {
return prepareSecondsForDisplay( number );
}
- try {
return numberFormat( number, formatOptions );
- } catch ( _ ) {
- if ( !! options && typeof options === 'string' ) {
- // if the formatting doesn't work, return the concatenated options(assuming as a custom unit) and number
- return numberFormat( number );
- }
- return undefined;
- }
};
/**
| 2 |
diff --git a/assets/js/modules/analytics/datastore/accounts.js b/assets/js/modules/analytics/datastore/accounts.js @@ -156,10 +156,10 @@ export const actions = {
* @return {Function} Generator function action.
*/
*createAccount( { accountName, propertyName, profileName, timezone } ) {
- invariant( accountName, 'accountName is required.' );
- invariant( propertyName, 'propertyName is required.' );
- invariant( profileName, 'profileName is required.' );
- invariant( timezone, 'timezone is required.' );
+ invariant( accountName, 'accountName is required to create an account.' );
+ invariant( propertyName, 'propertyName is required to create an account.' );
+ invariant( profileName, 'profileName is required to create an account.' );
+ invariant( timezone, 'timezone is required to create an account.' );
let response,
error;
| 7 |
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ Thanks for your interest in contributing to Tailwind CSS! Please take a moment t
**Please ask first before starting work on any significant new features.**
-It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create [an issue](https://github.com/tailwindcss/tailwindcss/issues) to first discuss any significant new features. This includes things like adding new utilities, creating new at-rules, or adding new component examples to the documentation.
+It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create [an issue](https://github.com/tailwindcss/tailwindcss/issues) to first discuss any significant new features. This includes things like adding new utilities, creating new at-rules, etc.
## Coding standards
| 2 |
diff --git a/core/algorithm-builder/dockerfile/get-deps-java.sh b/core/algorithm-builder/dockerfile/get-deps-java.sh @@ -8,4 +8,4 @@ docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dep
docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dependency:get -Dartifact=io.hkube:java-algo-parent:$javaWrapperVersion:pom -DremoteRepositories=https://oss.sonatype.org/content/repositories/snapshots -Ddest=/jars/java-algo-parent.xml
mkdir -p $SCRIPTPATH/../environments/java/debs
cd $SCRIPTPATH/../environments/java/debs
-docker run --rm -it --workdir /tmp/pkg -v $PWD:/tmp/pkg adoptopenjdk/openjdk11:jre-11.0.8_10-ubuntu apt-get update && apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances --no-pre-depends libzmq-java | grep "^\w")
+docker run --rm --workdir /tmp/pkg -v $PWD:/tmp/pkg adoptopenjdk/openjdk11:jre-11.0.8_10-ubuntu apt-get update && apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances --no-pre-depends libzmq-java | grep "^\w")
| 2 |
diff --git a/dist/doc.md b/dist/doc.md @@ -216,6 +216,9 @@ html('div')
import { svg, mount } from 'redom';
const drawing = svg('svg',
+ svg('symbol', { id: 'box', viewBox: '0 0 100 100' },
+ svg('rect', { x: 25, y: 25, width: 50, height: 50 })
+ ),
svg('circle', { r: 50, cx: 25, cy: 25 })
);
@@ -224,7 +227,11 @@ mount(document.body, drawing);
```html
<body>
<svg>
+ <symbol id="box" viewBox="0 0 100 100">
+ <rect x="25" y="25" width="50" height="50"></rect>
+ </symbol>
<circle r="50" cx="25" cy="25"></circle>
+ <use xlink:href="#box"></use>
</svg>
</body>
```
| 0 |
diff --git a/articles/users/concepts/overview-user-account-linking.md b/articles/users/concepts/overview-user-account-linking.md @@ -173,10 +173,6 @@ Here are two scenarios that implement account linking:
* [User-initiated account linking](#user-initiated-account-linking): allow your users to link their accounts using an admin screen in your app
* [Suggested account linking](#suggested-account-linking): identify accounts with the same email address and prompt the user in your app to link them
-::: warning
-For security purposes, link accounts **only if both emails are verified**.
-:::
-
### User-initiated account linking
Typically, account linking will be initiated by an authenticated user. Your app must provide the UI, such as a **Link accounts** button on the user's profile page.
| 2 |
diff --git a/edit.js b/edit.js @@ -344,7 +344,6 @@ const _setCurrentChunkMesh = chunkMesh => {
let stairsMesh = null;
let platformMesh = null;
let wallMesh = null;
-let spikesMesh = null;
let woodMesh = null;
let stoneMesh = null;
let metalMesh = null;
@@ -980,23 +979,6 @@ const [
scale: new THREE.Vector3(2, 2, 0.1),
};
- spikesMesh = result['StairsWood2'].clone();
- spikesMesh.geometry = spikesMesh.geometry.clone()
- .applyMatrix4(new THREE.Matrix4().makeScale(0.01, 0.01, 0.01))
- .applyMatrix4(new THREE.Matrix4().makeTranslation(0, 0.5, 0));
- spikesMesh.buildMeshType = 'trap';
- spikesMesh.traverse(o => {
- if (o.isMesh) {
- o.isBuildMesh = true;
- }
- });
- spikesMesh.instancedMesh = _makeInstancedMesh(spikesMesh);
- spikesMesh.physicsOffset = {
- position: new THREE.Vector3(0, 0, 0),
- quaternion: new THREE.Quaternion(),
- scale: new THREE.Vector3(2, 0.1, 2),
- };
-
/* stairsMesh = result['StairsBrickFinal'].clone();
stairsMesh.geometry = stairsMesh.geometry.clone()
.applyMatrix4(new THREE.Matrix4().makeScale(1, Math.sqrt(2)*0.9, Math.sqrt(2)*0.8))
@@ -1035,19 +1017,7 @@ const [
o.isBuildMesh = true;
}
});
- wallMesh.instancedMesh = _makeInstancedMesh(wallMesh);
-
- spikesMesh = result['FloorBrickFInal'].clone();
- spikesMesh.geometry = spikesMesh.geometry.clone()
- .applyMatrix4(new THREE.Matrix4().makeScale(0.01, 0.01, 0.01))
- .applyMatrix4(new THREE.Matrix4().makeTranslation(0, 0.5, 0));
- spikesMesh.buildMeshType = 'trap';
- spikesMesh.traverse(o => {
- if (o.isMesh) {
- o.isBuildMesh = true;
- }
- });
- spikesMesh.instancedMesh = _makeInstancedMesh(spikesMesh); */
+ wallMesh.instancedMesh = _makeInstancedMesh(wallMesh); */
/* stairsMesh = result['WallMetal3'].clone();
stairsMesh.geometry = stairsMesh.geometry.clone()
@@ -1087,19 +1057,7 @@ const [
o.isBuildMesh = true;
}
});
- wallMesh.instancedMesh = _makeInstancedMesh(wallMesh);
-
- spikesMesh = result['WallMetal3'].clone();
- spikesMesh.geometry = spikesMesh.geometry.clone()
- .applyMatrix4(new THREE.Matrix4().makeScale(0.01, 0.01, 0.01))
- .applyMatrix4(new THREE.Matrix4().makeTranslation(0, 0.5, 0));
- spikesMesh.buildMeshType = 'trap';
- spikesMesh.traverse(o => {
- if (o.isMesh) {
- o.isBuildMesh = true;
- }
- });
- spikesMesh.instancedMesh = _makeInstancedMesh(spikesMesh); */
+ wallMesh.instancedMesh = _makeInstancedMesh(wallMesh); */
})(),
(async () => {
geometryWorker = await (async () => {
@@ -2393,7 +2351,6 @@ const _makeChunkMesh = (seedString, parcelSize, subparcelSize) => {
case 'wall': return wallMesh;
case 'floor': return platformMesh;
case 'stair': return stairsMesh;
- case 'trap': return spikesMesh;
default: return null;
}
})();
@@ -3969,7 +3926,7 @@ function animate(timestamp, frame) {
}
}
if (wallMesh && currentChunkMesh) {
- [wallMesh, platformMesh, stairsMesh, spikesMesh].forEach(buildMesh => {
+ [wallMesh, platformMesh, stairsMesh].forEach(buildMesh => {
buildMesh.parent && buildMesh.parent.remove(buildMesh);
});
if (buildMode) {
@@ -3978,7 +3935,6 @@ function animate(timestamp, frame) {
case 'wall': return wallMesh;
case 'floor': return platformMesh;
case 'stair': return stairsMesh;
- case 'trap': return spikesMesh;
default: return null;
}
})();
@@ -4300,7 +4256,6 @@ function animate(timestamp, frame) {
case 'wall': return wallMesh;
case 'floor': return platformMesh;
case 'stair': return stairsMesh;
- case 'trap': return spikesMesh;
default: return null;
}
})();
@@ -5009,11 +4964,6 @@ window.addEventListener('keydown', e => {
buildMode = 'stair';
break;
}
- case 86: { // V
- document.querySelector('.weapon[weapon="build"]').click();
- buildMode = 'trap';
- break;
- }
/* case 80: { // P
physics.resetObjectMesh(physicalMesh);
break;
| 2 |
diff --git a/package.json b/package.json {
"name": "nativescript-doctor",
- "version": "0.8.0",
+ "version": "0.9.0",
"description": "Library that helps identifying if the environment can be used for development of {N} apps.",
"main": "lib/index.js",
"types": "./typings/nativescript-doctor.d.ts",
| 12 |
diff --git a/tasks/partial_bundle.js b/tasks/partial_bundle.js @@ -8,7 +8,6 @@ var header = constants.licenseDist + '\n';
var allTransforms = constants.allTransforms;
var allTraces = constants.allTraces;
var mainIndex = constants.mainIndex;
-var excludedTraces = constants.excludedTraces;
// Browserify the plotly.js partial bundles
module.exports = function partialBundle(tasks, opts) {
@@ -26,8 +25,7 @@ module.exports = function partialBundle(tasks, opts) {
var all = ['calendars'].concat(allTransforms).concat(allTraces);
var includes = (calendars ? ['calendars'] : []).concat(transformList).concat(traceList);
- var excludes = all.filter(function(e) { return includes.indexOf(e) === -1 && excludedTraces.indexOf(e) === -1; });
- var missing = includes.filter(function(e) { return excludedTraces.indexOf(e) !== -1; });
+ var excludes = all.filter(function(e) { return includes.indexOf(e) === -1; });
excludes.forEach(function(t) {
var WHITESPACE_BEFORE = '\\s*';
@@ -48,18 +46,6 @@ module.exports = function partialBundle(tasks, opts) {
partialIndex = newCode;
});
- missing.forEach(function(t) {
- // find 'Plotly.register([' and add require('./<trace>')
- var REGEX_BEFORE = new RegExp(
- 'Plotly\\.register\\(\\[\\n',
- 'g');
- partialIndex = partialIndex.replace(
- REGEX_BEFORE,
- 'Plotly.register([\n' +
- ' require(\'./' + t + '\'),\n'
- );
- });
-
common.writeFile(index, partialIndex, done);
});
| 13 |
diff --git a/scenes/battalion.scn b/scenes/battalion.scn 300
],
"start_url": "https://webaverse.github.io/dreadnought/"
+ },
+ {
+ "position": [
+ -8,
+ 34,
+ -67
+ ],
+ "quaternion": [
+ 0,
+ 1,
+ 0,
+ 0
+ ],
+ "start_url": "https://webaverse.github.io/infinistreet/"
}
]
}
| 0 |
diff --git a/LICENSE b/LICENSE same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2019 Gladys Assistant
+ Copyright 2013-2021 Gladys Assistant
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
| 7 |
diff --git a/src/encoded/search.py b/src/encoded/search.py @@ -1237,8 +1237,10 @@ def audit(context, request):
# Don't use these groupings for audit matrix
x_grouping = matrix['x']['group_by']
y_groupings = audit_list_field
- y_groupings.append("no.audits")
+ no_audits_groupings = ['no.error', 'no.not_compliant', 'no.warning']
#y_groupings.append("no.error")
+ #y_groupings.append("no.not_compliant")
+ #y_groupings.append("no.warning")
x_agg = {
"terms": {
"field": 'embedded.' + x_grouping + '.raw',
@@ -1302,9 +1304,15 @@ def audit(context, request):
"field": "audit.ERROR.category"
},
"aggs": {
- "no.warning": {
+ "assay_title": {
+ "terms": {
+ "field": "embedded.assay_title.raw",
+ "size": 0
+ }
+ },
+ "no.not_compliant": {
"missing": {
- "field": "audit.WARNING.category"
+ "field": "audit.NOT_COMPLIANT.category"
},
"aggs": {
"assay_title": {
@@ -1313,9 +1321,9 @@ def audit(context, request):
"size": 0
}
},
- "no.not_compliant": {
+ "no.warning": {
"missing": {
- "field": "audit.NOT_COMPLIANT"
+ "field": "audit.WARNING.category"
},
"aggs": {
"assay_title": {
@@ -1369,8 +1377,7 @@ def audit(context, request):
# Execute the query
es_results = es.search(body=query, index=es_index, search_type='count')
- import pdb
- pdb.set_trace()
+
# Format matrix for results
aggregations = es_results['aggregations']
result['matrix']['doc_count'] = total = aggregations['matrix']['doc_count']
@@ -1387,13 +1394,18 @@ def audit(context, request):
result['facets'] = format_facets(
es_results, facets, used_filters, (schema,), total, principals)
+
def summarize_buckets(matrix, x_buckets, outer_bucket, grouping_fields):
+ # Get audit category and then decide whether it is one that includes or excludes audits
for category in grouping_fields: # for each audit category
- group_by = grouping_fields[0]
- grouping_fields = grouping_fields[1:]
- if grouping_fields:
+ # Gets first index of grouping_fields and keeps shortening grouping_fields until
+ # only the no audits fields are left. This allows the recursion to happen in the
+ # else statement.
+ #group_by = grouping_fields[0]
+ #grouping_fields = grouping_fields[1:]
+ #if grouping_fields:
counts = {}
- if "no" not in category: # if an audit category and not one that excludes audits
+ #if "no" not in category : # if includes audit category
for bucket in outer_bucket[category]['buckets']:
counts = {}
for assay in bucket['assay_title']['buckets']:
@@ -1413,10 +1425,17 @@ def audit(context, request):
for xbucket in x_buckets:
summary.append(counts.get(xbucket['key'], 0))
bucket['assay_title'] = summary
- else: # for no audits row
- for assay in outer_bucket[category]['assay_title']['buckets']:
- import pdb
- pdb.set_trace()
+
+ def summarize_no_audits(matrix, x_buckets, outer_bucket, grouping_fields, aggregations):
+ # If it excludes audits then needs to go through nested aggs through recursion
+ group_by = grouping_fields[0]
+ grouping_fields = grouping_fields[1:]
+
+ if grouping_fields:
+ summarize_no_audits(matrix, x_buckets, outer_bucket[group_by], grouping_fields, aggregations)
+
+ counts = {}
+ for assay in outer_bucket[group_by]['assay_title']['buckets']:
doc_count = assay['doc_count']
if doc_count > matrix['max_cell_doc_count']:
matrix['max_cell_doc_count'] = doc_count
@@ -1430,14 +1449,21 @@ def audit(context, request):
summary = []
for xbucket in x_buckets:
summary.append(counts.get(xbucket['key'], 0))
- outer_bucket[category]['assay_title'] = summary
-
+ aggregations[group_by] = outer_bucket[group_by]
+ aggregations[group_by]['assay_title'] = summary
summarize_buckets(
result['matrix'],
aggregations['matrix']['x']['buckets'],
aggregations['matrix'],
- y_groupings + [x_grouping])
+ y_groupings)
+
+ summarize_no_audits(
+ result['matrix'],
+ aggregations['matrix']['x']['buckets'],
+ aggregations['matrix'],
+ no_audits_groupings,
+ aggregations['matrix'])
result['matrix']['y']['label'] = "Audit Category"
result['matrix']['y']['group_by'][0] = "audit_category"
| 0 |
diff --git a/src/internal.d.ts b/src/internal.d.ts @@ -131,9 +131,9 @@ export interface DevtoolsHook {
_renderers: Record<string, any>;
_roots: Set<VNode>;
on(ev: string, listener: () => void): void;
- emit(ev: string, object): void;
+ emit(ev: string, data?: object): void;
helpers: Record<string, any>;
- getFiberRoots(rendererId: string): any;
+ getFiberRoots(rendererId: string): Set<any>;
inject(config: DevtoolsInjectOptions): string;
onCommitFiberRoot(rendererId: string, root: VNode): void;
onCommitFiberUnmount(rendererId: string, vnode: VNode): void;
| 1 |
diff --git a/README.md b/README.md # themer [](https://travis-ci.org/mjswensen/themer) [](https://github.com/mjswensen/themer#installation)
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/hHKoUkX4tpsdAzjvSfNXFb22/mjswensen/themer'>
- <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/hHKoUkX4tpsdAzjvSfNXFb22/mjswensen/themer.svg' />
-</a>
-
`themer` takes a set of colors and generates [editor themes](#editorsides), [terminal themes](#terminals), and [desktop/device wallpapers](#wallpapers).
+<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/hHKoUkX4tpsdAzjvSfNXFb22/mjswensen/themer'>
+ <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/hHKoUkX4tpsdAzjvSfNXFb22/mjswensen/themer.svg' />
+</a>
+
## Table of Contents
* [Installation](#installation)
| 5 |
diff --git a/src/libraries/controllers/ApiUserController.php b/src/libraries/controllers/ApiUserController.php @@ -91,7 +91,7 @@ class ApiUserController extends ApiBaseController
$password = $_POST['password'];
$passwordConfirm = $_POST['password-confirm'];
$tokenFromDb = $user->getAttribute('passwordToken');
- if($tokenFromDb != $token)
+ if($tokenFromDb !== $token)
return $this->error('Could not validate password reset token.', false);
elseif($password !== $passwordConfirm)
return $this->error('Password confirmation did not match.', false);
| 4 |
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js @@ -54,16 +54,16 @@ TxView.prototype.render = function () {
style: {
margin: '1em 0.9em',
alignItems: 'center'
- }
+ },
+ onClick: () => {
+ this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
+ },
}, [
// burger
h('div.fa.fa-bars', {
style: {
fontSize: '1.3em',
},
- onClick: () => {
- this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
- }
}, []),
//account display
| 11 |
diff --git a/token-metadata/0xc75F15AdA581219c95485c578E124df3985e4CE0/metadata.json b/token-metadata/0xc75F15AdA581219c95485c578E124df3985e4CE0/metadata.json "symbol": "ZZZ",
"address": "0xc75F15AdA581219c95485c578E124df3985e4CE0",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js @@ -305,6 +305,14 @@ export const settingsAPIs = {
operator: "Witness: xbtsio-wallet",
contact: "telegram: xbtsio"
},
+ {
+ url: "wss://api.gbacenter.org/ws",
+ region: "Northern America",
+ country: "U.S.A.",
+ location: "Fremont, CA",
+ operator: "Witness: gbac-ety001",
+ contact: "email:[email protected]"
+ },
// Testnet
{
@@ -323,14 +331,6 @@ export const settingsAPIs = {
operator: "Witness: zapata42-witness",
contact: "telegram:Zapata_42"
},
- {
- url: "wss://api.gbacenter.org/ws",
- region: "Northern America",
- country: "U.S.A.",
- location: "Fremont, CA",
- operator: "Witness: gbac-ety001",
- contact: "email:[email protected]"
- },
{
url: "wss://testnet.xbts.io/ws",
region: "TESTNET - Europe",
| 5 |
diff --git a/apps.json b/apps.json "type": "app",
"description": "Learn the NATO Phonetic alphabet plus some numbers.",
"tags": "app,learn,visual",
+ "allow_emulator":true,
"storage": [
{"name":"nato.app.js","url":"nato.js"},
{"name":"nato.img","url":"nato-icon.js","evaluate":true}
| 11 |
diff --git a/app/catalog-tab/index/template.hbs b/app/catalog-tab/index/template.hbs <ul class="dropdown-menu dropdown-menu-right">
{{#each filters as |opt|}}
<li class="text-capitalize {{if (eq catalogId opt.queryParams.catalogId) 'active'}}">
- {{#link-to parentRoute (query-params catalogId=opt.queryParams.catalogId)}}
+ <a href="{{href-to parentRoute (query-params catalogId=opt.queryParams.catalogId)}}">
<i class="{{opt.icon}}"></i>
{{#if opt.localizedLabel}}
{{t opt.localizedLabel}}
{{else}}
{{opt.label}}
{{/if}}
- {{/link-to}}
+ </a>
</li>
{{/each}}
</ul>
</li>
{{#each categoryWithCounts as |cat|}}
<li class=" {{if (eq cat.name category) 'active' ''}}">
- {{#link-to parentRoute (query-params category=cat.name) classNames="btn has-label bg-default btn-md"}}
- <span class="clip">{{cat.name}}</span> <span class="btn-label">{{cat.count}}</span>
- {{/link-to}}
+ <a href="{{href-to parentRoute (query-params category=cat.name)}}" class="btn has-label bg-default btn-md"><span class="clip">{{cat.name}}</span> <span class="btn-label">{{cat.count}}</span></a>
</li>
{{/each}}
</ul>
| 14 |
Subsets and Splits