code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/src/sdk/conference/conference.js b/src/sdk/conference/conference.js self.dispatchEvent(evt);
break;
case 'leave':
- participant = self.participants[data.data.id];
+ participant = self.participants[data.data];
if (!participant) {
return;
}
type: 'user-left',
user: participant
});
- delete self.participants[data.data.id];
+ delete self.participants[data.data];
self.dispatchEvent(evt);
break;
default:
| 1 |
diff --git a/test-integration/samples/ngx-psql-es-noi18n-mapsid/.yo-rc.json b/test-integration/samples/ngx-psql-es-noi18n-mapsid/.yo-rc.json "clientFramework": "angularX",
"useSass": true,
"clientPackageManager": "npm",
- "testFrameworks": ["gatling", "protractor"],
+ "testFrameworks": ["gatling", "cypress"],
"jhiPrefix": "jhi",
"otherModules": [],
"enableTranslation": false,
| 2 |
diff --git a/docs/theming.md b/docs/theming.md @@ -10,15 +10,15 @@ Themes follow and build upon the Levels of Configuration, and employ `directives
## Deployable Themes
The following are a list of **Deployable themes**, sample `%%init%%` directives and `initialize` calls.
-1. **Base**- Designed to modified, as the name implies it is supposed to be used as the base for making custom themes.
+1. **base**- Designed to be modified, as the name implies it is supposed to be used as the base for making custom themes.
-2. **Forest**- A theme full of light greens that is easy on the eyes.
+2. **forest**- A theme full of light greens that is easy on the eyes.
-3. **Dark**- A theme that would go well with other dark colored elements.
+3. **dark**- A theme that would go well with other dark-colored elements.
-4. **Default**- The default theme for all diagrams.
+4. **default**- The default theme for all diagrams.
-5. **Neutral**- The theme to be used for black and white printing
+5. **neutral**- The theme to be used for black and white printing.
## Site-wide Themes
| 10 |
diff --git a/src/modules/anchor.js b/src/modules/anchor.js @@ -75,6 +75,12 @@ export default class AnchorModule {
batchDocumentsInMerkleTree(documents) {
// Hash all documents
const leafHashes = documents.map(this.hash);
+
+ // If only one document was hashed, just return that as the root with no proofs (single anchor)
+ if (leafHashes.length === 1) {
+ return [Uint8Array.from(leafHashes), []];
+ }
+
// Concatenate all leaf hashes into one bytearray
const packed = new Uint8Array(leafHashes.map((a) => [...a]).flat());
const [root, proofs] = construct(packed);
| 9 |
diff --git a/configs/apache_mxnet.json b/configs/apache_mxnet.json {
"index_name": "apache_mxnet",
"start_urls": [
- {
- "url": "https://mxnet.apache.org/get_started",
- "selectors_key": "get_started"
- },
- {
- "url": "https://mxnet.apache.org/blog",
- "selectors_key": "blog"
- },
- {
- "url": "https://mxnet.apache.org/features",
- "selectors_key": "features"
- },
- {
- "url": "https://mxnet.apache.org/ecosystem",
- "selectors_key": "ecosystem"
- },
- "https://mxnet.apache.org/api",
- {
- "url": "https://mxnet.apache.org/community/contribute",
- "selectors_key": "contribute"
- },
- {
- "url": "https://mxnet.apache.org/",
- "selectors_key": "home"
- }
+ "https://mxnet.apache.org/"
],
"stop_urls": [
"/scala/docs/",
"lvl5": "article h6, .section h6",
"text": ".section p, .section li, article p, article li",
"version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
- "global": true
- }
- },
- "home": {
- "lvl0": {
- "selector": ".home h1",
- "default_value": "Home"
- },
- "lvl1": ".key-features-section h2",
- "lvl2": ".key-features-section h3",
- "text": ".home p, .key-features-section .key-features p",
- "version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
- "global": true
- }
- },
- "get_started": {
- "lvl0": {
- "selector": "article header h1",
- "default_value": "Get started"
- },
- "lvl1": ".install-selector h2",
- "lvl2": ".get-started-from-source h2",
- "text": ".get-started-from-source p",
- "version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
- "global": true
- }
- },
- "blog": {
- "lvl0": {
- "selector": "article header h1",
- "global": true,
- "default_value": "Blog"
- },
- "lvl1": {
- "selector": "article header h3",
- "global": true,
- "default_value": "Latest News"
- },
- "lvl2": "article .post-content section a",
- "text": "article .post-content section .medium-widget-article__description",
- "version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
- "global": true
- }
- },
- "features": {
- "lvl0": {
- "selector": "article header h1",
- "global": true,
- "default_value": "Features"
- },
- "lvl1": "article header h3",
- "lvl2": "article .post-content h3",
- "text": "article .post-content p",
- "version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
- "global": true
- }
- },
- "ecosystem": {
- "lvl0": {
- "selector": "article header h1",
- "global": true,
- "default_value": "Ecosystem"
- },
- "lvl1": "article header h3",
- "lvl2": "article .post-content h2",
- "text": "article .post-content p",
- "version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
- "global": true
- }
- },
- "contribute": {
- "lvl0": {
- "selector": "article header h1",
- "global": true,
- "default_value": "Contribute"
- },
- "lvl1": "article header h3",
- "lvl2": ".post-content h1",
- "lvl3": ".post-content h2",
- "text": ".post-content p",
- "version": {
- "selector": "body > header > div > nav > div > div > span, #dropdown-menu-position-anchor-version > a",
+ "selector": "body > header > div > nav > div > div > span, body > header > div > nav > div > div > div > a.dropdown-option-active, #dropdown-menu-position-anchor-version > a",
"global": true
}
}
"version"
]
},
- "selectors_exclude": [
- "body > header",
- "body > footer.site-footer.h-card",
- "body > footer.site-footer2"
- ],
"conversation_id": [
"1151361772"
],
| 13 |
diff --git a/Makefile b/Makefile +TX_VERSION ?= 2_6
+DEMO_BRANCH ?= prod-2-6
+
ANGULAR_VERSION := $(shell buildtools/get-version angular)
ESLINT_CONFIG_FILES := $(shell find * -not -path 'node_modules/*' -type f -name '.eslintrc*')
@@ -48,7 +51,6 @@ L10N_PO_FILES = \
LANGUAGES = en $(L10N_LANGUAGES)
ANGULAR_LOCALES_FILES = $(addprefix contribs/gmf/build/angular-locale_, $(addsuffix .js, $(LANGUAGES)))
-TX_VERSION ?= 2_6
ifeq (,$(wildcard $(HOME)/.transifexrc))
TOUCHBACK_TXRC = $(TOUCH_DATE) "$(shell date --iso-8601=seconds)" $(HOME)/.transifexrc
else
@@ -434,7 +436,7 @@ transifex-init: .build/python-venv.timestamp \
.PRECIOUS: .build/locale/%/LC_MESSAGES/demo.po
.build/locale/%/LC_MESSAGES/demo.po:
mkdir -p $(dir $@)
- wget -O $@ https://raw.githubusercontent.com/camptocamp/demo_geomapfish/prod-2-5/geoportal/geomapfish_geoportal/locale/$*/LC_MESSAGES/geomapfish_geoportal-client.po
+ wget -O $@ https://raw.githubusercontent.com/camptocamp/demo_geomapfish/$(DEMO_BRANCH)/geoportal/geomapfish_geoportal/locale/$*/LC_MESSAGES/geomapfish_geoportal-client.po
contribs/gmf/build/gmf-%.json: \
.build/locale/%/LC_MESSAGES/ngeo.po \
| 4 |
diff --git a/website/docs/guides/ldp-server.md b/website/docs/guides/ldp-server.md title: Create your first LDP server
---
-### Prerequisites
+## Setup a new Moleculer project
-docker
-docker-compose
-nodejs
-NPM
+You will need to have [NodeJS](https://nodejs.org/en/) installed on your computer.
-### Setup a new Moleculer project
+First install the [moleculer-cli](https://github.com/moleculerjs/moleculer-cli) tool globally.
-First install the [moleculer-cli](https://github.com/moleculerjs/moleculer-cli) tool.
+```bash
+npm install -g moleculer-cli
+```
Then initialize a new project based on this template with this command:
```bash
-$ moleculer init assemblee-virtuelle/semapps-template-ldp my-project
+moleculer init assemblee-virtuelle/semapps-template-ldp my-project
```
You can now go to the newly-created directory:
```bash
-$ cd my-project
+cd my-project
```
### Launch your local Jena Fuseki instance
@@ -32,7 +31,7 @@ Jena Fuseki is a semantic triple store. It is where your app's data will be stor
You need [docker](https://docs.docker.com/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed on your machine.
```bash
-$ docker-compose up
+docker-compose up
```
Jena Fuseki is now available at the URL http://localhost:3030. By default the login is `admin` and the password is also `admin`.
@@ -42,12 +41,12 @@ Please start by creating a `localData` dataset. This is where your triples will
### Run Moleculer in dev mode
```bash
-$ npm run dev
+npm run dev
```
Your instance of SemApps is available at http://localhost:3000
-### Testing your LDP server
+## Testing your LDP server
By default, the LDP service will create a LDP container in the `/resources path`.
| 7 |
diff --git a/appjs/logicjavascript.js b/appjs/logicjavascript.js @@ -4122,6 +4122,8 @@ function datecal()
var c = new Date(Date.parse(document.getElementById("datef").value));
var d = new Date(Date.parse(document.getElementById("datet").value));
var x = new Date(d.getFullYear(), d.getMonth(), 0).getDate();
+ if(d.getTime() > c.getTime())
+ {
var y = d.getFullYear()-c.getFullYear();
var m = d.getMonth()-c.getMonth();
var da = d.getDate()-c.getDate();
@@ -4149,6 +4151,35 @@ function datecal()
}
}
+ else {
+ var y = c.getFullYear()-d.getFullYear();
+ var m = c.getMonth()-d.getMonth();
+ var da = c.getDate()-d.getDate();
+ if(da<0)
+ {
+ m--;
+ da = x+ da;
+ }
+ if(m<0)
+ {
+ y--;
+ m = 12+ m;
+ }
+
+ var dd = (c.getTime() - d.getTime())/(1000 * 3600 * 24);
+ if(y>=0)
+ {
+ document.getElementById("date-1").innerHTML = `${y} Years ${m} Month ${da} Days`;
+ document.getElementById("date-2").innerHTML = `${dd}`;
+ }
+ else{
+
+ document.getElementById("date-1").innerHTML = `${-y} Years ${m} Month ${da} Days`;
+ document.getElementById("date-2").innerHTML = `${-dd}`;
+
+ }
+ }
+}
//--------------------------------------------------------------------------------
function angleplot()
| 1 |
diff --git a/index.js b/index.js @@ -89,7 +89,7 @@ Enforcer.config = {
useNewRefParser: false
};
-Enforcer.bundler = function (definition) {
+Enforcer.bundle = function (definition) {
if (Enforcer.config.useNewRefParser) {
const refParser = new NewRefParser(definition);
return refParser.bundle();
| 10 |
diff --git a/packages/dynamodb/index.test-d.ts b/packages/dynamodb/index.test-d.ts @@ -3,7 +3,7 @@ import { Context as LambdaContext } from 'aws-lambda'
import { DynamoDBClient } from '@aws-sdk/client-dynamodb'
import { captureAWSv3Client } from 'aws-xray-sdk'
import { expectType } from 'tsd'
-import dynamodb, { type Context } from '.'
+import dynamodb, { Context } from '.'
const options = {
AwsClient: DynamoDBClient,
| 13 |
diff --git a/src/commands/view/ComponentDrag.js b/src/commands/view/ComponentDrag.js @@ -39,24 +39,65 @@ module.exports = {
this.toggleDrag();
},
+ getTransform(transform, axis = 'x') {
+ let result = 0;
+ (transform || '').split(' ').forEach(item => {
+ const itemStr = item.trim();
+ const fn = `translate${axis.toUpperCase()}(`;
+ if (itemStr.indexOf(fn) === 0)
+ result = parseFloat(itemStr.replace(fn, ''));
+ });
+ return result;
+ },
+
+ setTransform(transform, axis, value) {
+ const fn = `translate${axis.toUpperCase()}(`;
+ const val = `${fn}${value})`;
+ let result = (transform || '')
+ .split(' ')
+ .map(item => {
+ const itemStr = item.trim();
+ if (itemStr.indexOf(fn) === 0) item = val;
+ return item;
+ })
+ .join(' ');
+ if (result.indexOf(fn) < 0) result += ` ${val}`;
+
+ return result;
+ },
+
getPosition() {
- const { target } = this;
- const { left, top } = target.getStyle();
- return {
- x: parseFloat(left),
- y: parseFloat(top)
- };
+ const { target, isTran } = this;
+ const { left, top, transform } = target.getStyle();
+ let x = 0;
+ let y = 0;
+
+ if (isTran) {
+ x = this.getTransform(transform);
+ y = this.getTransform(transform, 'y');
+ } else {
+ (x = parseFloat(left)), (y = parseFloat(top));
+ }
+
+ return { x, y };
},
setPosition({ x, y, end, position, width, height }) {
- const { target } = this;
+ const { target, isTran } = this;
const unit = 'px';
+ const en = !end ? 1 : ''; // this will trigger the final change
+ const left = `${x}${unit}`;
+ const top = `${y}${unit}`;
+
+ if (isTran) {
+ let transform = target.getStyle()['transform'] || '';
+ transform = this.setTransform(transform, 'x', left);
+ transform = this.setTransform(transform, 'y', top);
+ return target.addStyle({ transform, en }, { avoidStore: !end });
+ }
+
const adds = { position, width, height };
- const style = {
- left: `${x}${unit}`,
- top: `${y}${unit}`,
- e: !end ? 1 : '' // this will trigger the final change
- };
+ const style = { left, top, en };
keys(adds).forEach(add => {
const prop = adds[add];
if (prop) style[add] = prop;
@@ -65,9 +106,10 @@ module.exports = {
},
onStart() {
- const { target, editor } = this;
+ const { target, editor, isTran } = this;
const style = target.getStyle();
const position = 'absolute';
+ if (isTran) return;
if (style.position !== position) {
const { left, top, width, height } = editor.Canvas.offset(target.getEl());
| 11 |
diff --git a/src/components/common/EditableWordCloudDataCard.js b/src/components/common/EditableWordCloudDataCard.js @@ -31,6 +31,7 @@ const localMessages = {
modeTopicW2V: { id: 'wordcloud.editable.mode.topicW2V', defaultMessage: 'View Topic Specific Word2Vec 2D Layout' },
noTopicW2VData: { id: 'wordcloud.editable.mode.topicW2V.noData', defaultMessage: 'We haven\'t built a model for this topic yet. If you want to see this chart please email us at [email protected] an ask us to generate a model for this topic.' },
modeGoogleW2V: { id: 'wordcloud.editable.mode.googleW2V', defaultMessage: 'View GoogleNews Word2Vec 2D Layout' },
+ noGoogleW2VData: { id: 'wordcloud.editable.mode.googleW2V.noData', defaultMessage: 'Sorry, but the Google News word2vec data is missing.' },
invalidView: { id: 'wordcloud.editable.mode.invalid', defaultMessage: 'Sorry, but an invalid view is selected' },
downloadWordCSV: { id: 'wordcount.editable.download.wordCsv', defaultMessage: 'Download Word Frequency CSV' },
downloadBigramCSV: { id: 'wordcount.editable.download.brigramCsv', defaultMessage: 'Download Bigram Frequency CSV' },
@@ -156,6 +157,7 @@ class EditableWordCloudDataCard extends React.Component {
height={height}
xProperty="google_w2v_x"
yProperty="google_w2v_y"
+ noDataMsg={localMessages.noGoogleW2VData}
/>
);
break;
| 9 |
diff --git a/src/js/core.js b/src/js/core.js @@ -383,7 +383,6 @@ if (s.params.effect === 'cube') {
s.params.centeredSlides = false;
s.params.spaceBetween = 0;
s.params.virtualTranslate = true;
- s.params.setWrapperSize = false;
}
if (s.params.effect === 'fade' || s.params.effect === 'flip') {
s.params.slidesPerView = 1;
@@ -391,7 +390,6 @@ if (s.params.effect === 'fade' || s.params.effect === 'flip') {
s.params.slidesPerGroup = 1;
s.params.watchSlidesProgress = true;
s.params.spaceBetween = 0;
- s.params.setWrapperSize = false;
if (typeof initialVirtualTranslate === 'undefined') {
s.params.virtualTranslate = true;
}
| 5 |
diff --git a/hooks.go b/hooks.go @@ -139,12 +139,6 @@ type WorkflowHookHandler interface {
////////////////////////////////////////////////////////////////////////////////
-// RuntimeLoggerHook is responsible for adding custom hooks to the Logrus
-// logger for things like publishing to StackDriver
-type RuntimeLoggerHook func(context map[string]interface{},
- serviceName string,
- logger *logrus.Logger) error
-
////////////////////////////////////////////////////////////////////////////////
// ArchiveHandler
| 2 |
diff --git a/lib/discordgo/restapi.go b/lib/discordgo/restapi.go @@ -744,7 +744,7 @@ func (s *Session) GuildBanCreateWithReason(guildID, userID int64, reason string,
headers := make(map[string]string)
if reason != "" {
- headers["X-Audit-Log-Reason"] = url.QueryEscape(reason)
+ headers["X-Audit-Log-Reason"] = url.PathEscape(reason)
}
_, err = s.RequestWithBucketID("PUT", uri, data, headers, EndpointGuildBan(guildID, 0))
@@ -919,7 +919,7 @@ func (s *Session) GuildMemberTimeoutWithReason(guildID int64, userID int64, unti
headers := make(map[string]string)
if reason != "" {
- headers["X-Audit-Log-Reason"] = url.QueryEscape(reason)
+ headers["X-Audit-Log-Reason"] = url.PathEscape(reason)
}
_, err = s.RequestWithBucketID("PATCH", EndpointGuildMember(guildID, userID), data, headers, EndpointGuildMember(guildID, 0))
return
| 14 |
diff --git a/assets/js/modules/analytics/index.js b/assets/js/modules/analytics/index.js @@ -199,10 +199,7 @@ export const registerWidgets = ( widgets ) => {
priority: 3,
wrapWidget: false,
},
- [
- AREA_MAIN_DASHBOARD_CONTENT_PRIMARY,
- AREA_ENTITY_DASHBOARD_CONTENT_PRIMARY,
- ]
+ [ AREA_ENTITY_DASHBOARD_CONTENT_PRIMARY ]
);
widgets.registerWidget(
| 2 |
diff --git a/src/components/Modeler.vue b/src/components/Modeler.vue @@ -605,12 +605,6 @@ export default {
}
});
- this.paper.on('all', () => {
- this.graph.getLinks().forEach(element => {
- element.toFront();
- });
- });
-
this.paper.on('cell:pointerdown', cellView => {
if (cellView.model.component) {
cellView.model.toFront({ deep: true });
| 2 |
diff --git a/test/jasmine/tests/mock_test.js b/test/jasmine/tests/mock_test.js @@ -646,8 +646,13 @@ var list = [
'hot_heatmap',
'icicle_coffee',
'icicle_coffee-maxdepth3',
+ 'icicle_coffee-maxdepth3-all-directions',
+ 'icicle_count_branches',
'icicle_first',
'icicle_flare',
+ 'icicle_leaf-opacity-level',
+ 'icicle_packages_colorscale_novalue',
+ 'icicle_root-sort',
'icicle_textposition',
'icicle_values_colorscale',
'icicle_with-without_values',
@@ -1743,8 +1748,13 @@ figs['hists-on-matching-axes'] = require('@mocks/hists-on-matching-axes');
figs['hot_heatmap'] = require('@mocks/hot_heatmap');
figs['icicle_coffee'] = require('@mocks/icicle_coffee');
figs['icicle_coffee-maxdepth3'] = require('@mocks/icicle_coffee-maxdepth3');
+figs['icicle_coffee-maxdepth3-all-directions'] = require('@mocks/icicle_coffee-maxdepth3-all-directions');
+figs['icicle_count_branches'] = require('@mocks/icicle_count_branches');
figs['icicle_first'] = require('@mocks/icicle_first');
figs['icicle_flare'] = require('@mocks/icicle_flare');
+figs['icicle_leaf-opacity-level'] = require('@mocks/icicle_leaf-opacity-level');
+figs['icicle_packages_colorscale_novalue'] = require('@mocks/icicle_packages_colorscale_novalue');
+figs['icicle_root-sort'] = require('@mocks/icicle_root-sort');
figs['icicle_textposition'] = require('@mocks/icicle_textposition');
figs['icicle_values_colorscale'] = require('@mocks/icicle_values_colorscale');
figs['icicle_with-without_values'] = require('@mocks/icicle_with-without_values');
| 0 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -72,7 +72,7 @@ commands:
git config user.name "ci-build"
- add_ssh_keys:
fingerprints:
- - "c5:a7:d0:64:8d:7c:44:f7:6c:84:a9:b2:67:3e:9d:00"
+ - "01:67:4a:6d:26:9c:70:c4:1a:60:91:88:d9:dd:f0:83"
- run:
name: Deploy docs to gh-pages branch
command: gh-pages -d www --branch << parameters.target_branch >> --message '[skip ci]'
| 3 |
diff --git a/bin/release b/bin/release @@ -29,7 +29,7 @@ if [ "$(git status --porcelain | grep -v '??')" != "" ]; then
fi
npm run prepublishOnly
-npm version "$@" -m "v%s"
+npm version "$@" -m "v%s" --allow-same-version
trap cleanup INT
read -p "Press [Enter] to publish this release..."
git push && git push --tags
| 11 |
diff --git a/src/core/render/index.js b/src/core/render/index.js @@ -185,6 +185,7 @@ function renderMain(html) {
mountElm.setAttribute(isVueAttr, '');
if (vueVersion === 2) {
+ vueConfig.el = undefined;
new window.Vue(vueConfig).$mount(mountElm);
} else if (vueVersion === 3) {
const app = window.Vue.createApp(vueConfig);
| 8 |
diff --git a/guides/airflow-dbt.md b/guides/airflow-dbt.md @@ -435,7 +435,7 @@ with dag:
Using the jaffleshop demo dbt project, the parser creates the following DAG including two task groups for the `dbt_run` and `dbt_test` tasks:
-
+<video class="mt-2 mb-2" width="100%" autoplay muted loop><source src="https://videos.ctfassets.net/bsbv786nih7n/31n2GTyVE9DhhNcAqlITQr/2ceb24022a324a11a05e2b5f41a8fc62/taskgroup.mp4" type="video/mp4"></video>
One important fact to note here is that the `DbtDagParser` does not include a `dbt compile` step that updates the `manifest.json` file. Since the Airflow Scheduler parses the DAG file periodically, having a compile step as part of the DAG creation could incur some unnecessary load for the scheduler. We recommend adding a `dbt compile` step either as part of a CI/CD pipeline, or as part of a pipeline run in production before the Airflow DAG is run.
| 14 |
diff --git a/components/post.js b/components/post.js +import {useEffect} from 'react'
import PropTypes from 'prop-types'
import Link from 'next/link'
import Image from 'next/image'
@@ -7,6 +8,26 @@ import colors from '@/styles/colors'
import Section from '@/components/section'
function Post({title, published_at, feature_image, html, backLink}) {
+ useEffect(() => {
+ if (html) {
+ const dropdownDiv = [...document.querySelectorAll('div.kg-card.kg-toggle-card')]
+
+ if (dropdownDiv) {
+ dropdownDiv.forEach(d => {
+ d.addEventListener('click', () => {
+ if (d.attributes['data-kg-toggle-state'].value === 'close') {
+ d.dataset.kgToggleState = 'open'
+ d.children[0].lastChild.lastChild.classList.add('toggled')
+ } else {
+ d.dataset.kgToggleState = 'close'
+ d.children[0].lastChild.lastChild.classList.remove('toggled')
+ }
+ })
+ })
+ }
+ }
+ }, [html])
+
return (
<Section>
<Link href={backLink}>
@@ -188,6 +209,56 @@ function Post({title, published_at, feature_image, html, backLink}) {
text-decoration: none;
transition: all .2s ease;
}
+
+ .kg-toggle-card {
+ background: 0 0;
+ box-shadow: inset 0 0 0 1px rgba(124,139,154,.25);
+ border-radius: 4px;
+ padding: 1.2em;
+ margin-bottom: .5em;
+ }
+
+ .kg-toggle-heading {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ cursor: pointer;
+ }
+
+ .kg-toggle-heading h4 {
+ margin-bottom: 0;
+ }
+
+ button.kg-toggle-card-icon {
+ background-color: white;
+ border: none;
+ }
+
+ .kg-toggle-card-icon svg {
+ height: 24px;
+ width: 24px;
+ }
+
+ .toggled {
+ transform: rotate(180deg);
+ }
+
+ .kg-toggle-content {
+ height: auto;
+ opacity: 1;
+ transition: opacity 1s ease,top .35s ease;
+ top: 0;
+ position: relative;
+ }
+
+ .kg-toggle-card[data-kg-toggle-state="close"] .kg-toggle-content {
+ height: 0;
+ overflow: hidden;
+ transition: opacity .5s ease,top .35s ease;
+ opacity: 0;
+ top: -.5em;
+ position: relative;
+ }
`}</style>
</Section>
)
| 0 |
diff --git a/lib/transports/base.js b/lib/transports/base.js @@ -32,6 +32,10 @@ class base {
} else {
this._resume()
}
+
+ if (this.streamEnded) {
+ this.completeBatch(null, this.thisGetCallback)
+ }
}
setupGet (offset) {
@@ -59,7 +63,8 @@ class base {
})
this.stream.on('end', () => {
- this.completeBatch(null, this.thisGetCallback, true)
+ this.streamEnded = true
+ this.completeBatch(null, this.thisGetCallback, this.streamEnded)
})
}
@@ -92,7 +97,7 @@ class base {
// if we are skipping, have no data, and there is more to read we should continue on
if (!streamEnded && this.elementsToSkip > 0 && this.bufferedData.length === 0) {
- return this.metaStream.resume()
+ return this._resume()
}
while (this.bufferedData.length > 0) {
| 9 |
diff --git a/docs/user-guide/README.md b/docs/user-guide/README.md @@ -62,7 +62,7 @@ eslint "src/**/*.{js,vue}"
```
::: tip
-If you installed [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint) you should have `lint` script added in your `package.json`. That means you can just run `yarn lint` or `npm run lint`.
+If you installed [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint), you should have the `lint` script added to your `package.json`. That means you can just run `yarn lint` or `npm run lint`.
:::
#### How to use a custom parser?
| 7 |
diff --git a/lib/request-base.js b/lib/request-base.js @@ -129,6 +129,21 @@ RequestBase.prototype.timeout = function timeout(options){
return this;
};
+/**
+ * Set number of retry attempts on error.
+ *
+ * Failed requests will be retried 'count' times if timeout or err.code >= 500.
+ *
+ * @param {Number} count
+ * @return {Request} for chaining
+ * @api public
+ */
+
+RequestBase.prototype.retry = function retry(count){
+ this._retries = count || 0;
+ return this;
+};
+
/**
* Promise support
*
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ### New Stuff
-#### Server
-
-- Added Koa web framework for Node servers
-- Added Gin web framework for Go servers
-- Added Nodemon as a module to restart the Node server when the files change
-
-
#### Client
- Added Less and Sass support for the client side
- Added compilation/uglify step with Babili
+#### Server
+
+- Added Koa web framework for Node servers
+- Added Gin web framework for Go servers
+- Added Nodemon as a module to restart the Node server when the files change
+
+
#### Fullstack
- Added an option to choose a different git server, other than github
| 3 |
diff --git a/src/main/resources/public/js/src/localizations/en-EU.js b/src/main/resources/public/js/src/localizations/en-EU.js @@ -997,9 +997,9 @@ define(['util'], function () {
type: 'Method type',
history_depth: 'History depth',
user: 'Owner',
- issue$auto_analyzed: 'AA',
+ issue$auto_analyzed: 'Analysed by RP (AA)',
issue$ignore_analyzer: 'Ignore AA',
- issue$externalSystemIssues$ticket_id: 'Posted in BTS',
+ issue$externalSystemIssues$ticket_id: 'Issue in BTS',
number: 'Launch number'
},
filterNamePluralById: {
| 10 |
diff --git a/lib/assets/javascripts/carto-node/lib/clients/public.js b/lib/assets/javascripts/carto-node/lib/clients/public.js @@ -104,11 +104,13 @@ class PublicClient {
? this.makeAbsoluteURI(this.makeRelativeURI(uriParts))
: '';
- const requestOptions = {
- ...opts,
+ const requestOptions = Object.assign({}, opts,
+ {
success: this.successCallback(callback),
error: this.errorCallback(callback)
- };
+ }
+ );
+
$.ajax(`${baseUrl}${url}`, requestOptions);
}
}
| 2 |
diff --git a/content/intro-to-storybook/react/en/using-addons.md b/content/intro-to-storybook/react/en/using-addons.md @@ -18,7 +18,7 @@ We could write forever about configuring and using addons for all of your partic
## Setting Up Knobs
-Knobs is an amazing resource for designers and developers to experiment and play with components in a controlled environment without the need to code! You essentially provide dynamically defined fields with which a user manipulates the props being passed to the components in yours stories. Here's what we're going to implement...
+Knobs is an amazing resource for designers and developers to experiment and play with components in a controlled environment without the need to code! You essentially provide dynamically defined fields with which a user manipulates the props being passed to the components in your stories. Here's what we're going to implement...
<video autoPlay muted playsInline loop>
<source
| 1 |
diff --git a/StackOverflowDarkMode.user.js b/StackOverflowDarkMode.user.js // @description Dark theme for sites and chat on the Stack Exchange Network
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.5
+// @version 1.5.1
//
// @include https://*stackexchange.com/*
// @include https://*stackoverflow.com/*
@@ -499,7 +499,6 @@ a.comment-user.owner {
background-color: black;
}
#header-logo img,
-#footer-logo img,
#transcript-logo img {
background-color: white;
}
| 2 |
diff --git a/articles/nodejs-mongodb-custom-ranking/index.md b/articles/nodejs-mongodb-custom-ranking/index.md layout: engineering-education
status: publish
published: true
-url: /engineering-education/mongodb-nodejs-custom-ranking/
+url: /engineering-education/nodejs-mongodb-custom-ranking/
title: How to perform custom ranking for records from a MongoDB database in Node.js
description: This article will be an overview on custom ranking of data in MongoDB. We will learn how to create a database, collection, insert, and query the results.
author: terrence-aluda
@@ -11,7 +11,7 @@ topics: []
excerpt_separator: <!--more-->
images:
- - url: /engineering-education/mongodb-nodejs-custom-ranking/hero.jpg
+ - url: /engineering-education/nodejs-mongodb-custom-ranking/hero.jpg
alt: Custom ranking image
---
This article will give us a heads-up on how to rank the records from a MongoDB database. We are going to add a bit of sorting functionality to the `sort()` function to give the records positions.
@@ -271,7 +271,7 @@ If the value contained in `[i]` is not equal to `[i-1]`, increment the `rank` va
Otherwise, if the value contained in `[i]` is equal to `[i-1]`, assign the position the value stored in the `prev_rank` variable then increment the value stored in the `rank` variable.
-
+
*Screenshot of the output*
### Conclusion
| 10 |
diff --git a/src/react/projects/spark-core-react/src/SprkTable/SprkTable.js b/src/react/projects/spark-core-react/src/SprkTable/SprkTable.js @@ -37,7 +37,7 @@ const SprkTable = props => {
<div className={wrapperClassNames} data-id={idString}>
<table className={tableClassNames} {...other}>
<thead className="sprk-b-Table__head">
- {columns &&
+ {columns.length > 0 &&
columns.map(row => (
<tr key={uniqueId('row_')}>
{row.map(col => (
@@ -53,7 +53,7 @@ const SprkTable = props => {
))}
</thead>
- {rows && (
+ {rows.length > 0 && (
<tbody>
{rows.map(row => (
<tr key={uniqueId('row_')}>
@@ -73,7 +73,7 @@ const SprkTable = props => {
<div className={wrapperClassNames} data-id={idString}>
<table className={tableClassNames} {...other}>
<thead className="sprk-b-Table__head">
- {columns && (
+ {columns.length > 0 && (
<tr>
<th className="sprk-b-Table__empty-heading" />
{columns.map(col => (
@@ -83,12 +83,12 @@ const SprkTable = props => {
)}
</thead>
- {rows && (
+ {rows.length > 0 && (
<tbody>
{rows.map(row => (
<tr key={uniqueId('row_')}>
<th>{row.rowHeading}</th>
- {columns &&
+ {columns.length > 0 &&
columns.map(col => (
<td key={uniqueId('td_')}>{row[col.name]}</td>
))}
@@ -104,12 +104,12 @@ const SprkTable = props => {
return (
<div className={wrapperClassNames} data-id={idString}>
<table className={tableClassNames} {...other}>
- {rows && (
+ {rows.length > 0 && (
<tbody>
{rows.map(row => (
<tr key={uniqueId('row_')}>
<th>{row.rowHeading}</th>
- {columns &&
+ {columns.length > 0 &&
columns.map(col => (
<td key={uniqueId('td_')}>{row[col.name]}</td>
))}
@@ -136,7 +136,7 @@ const SprkTable = props => {
<div className={wrapperClassNames} data-id={idString}>
<table className={tableClassNames} {...other}>
<thead className="sprk-b-Table__head">
- {columns && (
+ {columns.length > 0 && (
<tr>
{columns.map(col => (
<th key={uniqueId('th_')}>{col.header}</th>
@@ -145,11 +145,11 @@ const SprkTable = props => {
)}
</thead>
- {rows && (
+ {rows.length > 0 && (
<tbody>
{rows.map(row => (
<tr key={uniqueId('row_')}>
- {columns &&
+ {columns.length > 0 &&
columns.map(col => (
<td key={uniqueId('td_')}>{row[col.name]}</td>
))}
@@ -193,13 +193,13 @@ SprkTable.propTypes = {
};
SprkTable.defaultProps = {
- columns: undefined,
- rows: undefined,
+ columns: [],
+ rows: [],
variant: 'default',
- idString: undefined,
- additionalContainerClasses: undefined,
- additionalTableClasses: undefined,
- children: undefined,
+ idString: '',
+ additionalContainerClasses: '',
+ additionalTableClasses: '',
+ children: '',
};
export default SprkTable;
| 3 |
diff --git a/.github/label-actions.yml b/.github/label-actions.yml unlabel:
- 'STATE: Outdated issue'
- 'STATE: Need response'
+
+? 'STATE: No workarounds'
+:
+ # Post a comment
+ comment: |
+ There are no workarounds. Once we get any updates, we will post them in this thread.
+ unlabel:
+ - 'STATE: No workarounds'
+ - 'STATE: Need response'
| 0 |
diff --git a/shared/js/background/atb.es6.js b/shared/js/background/atb.es6.js @@ -126,7 +126,7 @@ var ATB = (() => {
})
chrome.tabs.insertCSS(tab.id, {
- file: 'css/noatb.css'
+ file: 'public/css/noatb.css'
})
}
})
| 3 |
diff --git a/procgen/map-gen.js b/procgen/map-gen.js @@ -46,12 +46,12 @@ export class MapBlock extends THREE.Vector3 {
constructor(x, y) {
super(x, y, 0);
- this.walls = {
+ /* this.walls = {
left: false,
right: false,
up: false,
down: false,
- };
+ }; */
this.exitTarget = false;
this.centerTarget = false;
this.path = false;
| 2 |
diff --git a/src/editor/components/BookCitationPreview.js b/src/editor/components/BookCitationPreview.js import { Component } from 'substance'
-import ElementCitationAuthorsList from './ElementCitationAuthorsList'
+import PersonGroupPreview from './PersonGroupPreview'
+import SourcePreviewComponent from './SourcePreviewComponent'
+import EditionPreviewComponent from './EditionPreviewComponent'
+import YearPreviewComponent from './YearPreviewComponent'
+import PublisherLocPreviewComponent from './PublisherLocPreviewComponent'
+import PublisherNamePreviewComponent from './PublisherNamePreviewComponent'
export default class BookCitationPreview extends Component {
render($$) {
let node = this.props.node
- let source = node.find('source').text()
- let year = node.find('year').text()
- let publisherLoc = node.find('publisher-loc').text()
- let publisherName = node.find('publisher-name').text()
let el = $$('div').addClass('sc-book-citation-preview')
el.append(
- source,
- '. ',
- $$(ElementCitationAuthorsList, {node: node}),
- ', editors. ',
+ $$(SourcePreviewComponent, {node: node}),
' (',
- year,
+ $$(EditionPreviewComponent, {node: node}),
+ '). ',
+ $$(PersonGroupPreview, {node: node, type: 'editor', label: 'Editors'}),
+ ', editors. (',
+ $$(YearPreviewComponent, {node: node}),
') ',
- publisherLoc,
+ $$(PublisherLocPreviewComponent, {node: node}),
': ',
- publisherName
+ $$(PublisherNamePreviewComponent, {node: node})
)
return el
| 7 |
diff --git a/lib/modules/console/suggestions.js b/lib/modules/console/suggestions.js @@ -2,6 +2,7 @@ let utils = require('../../utils/utils');
class Suggestions {
constructor(embark, options) {
+ this.embark = embark;
this.events = embark.events;
this.plugins = options.plugins;
this.registerApi();
@@ -10,8 +11,7 @@ class Suggestions {
}
registerApi() {
- let plugin = this.plugins.createPlugin('consoleApi', {});
- plugin.registerAPICall('post', '/embark-api/suggestions', (req, res) => {
+ this.embark.registerAPICall('post', '/embark-api/suggestions', (req, res) => {
let suggestions = this.getSuggestions(req.body.command)
res.send({result: suggestions})
});
| 4 |
diff --git a/generators/generator-base.js b/generators/generator-base.js @@ -447,33 +447,6 @@ module.exports = class extends PrivateBase {
this.needleApi.clientAngular.addModule(appName, angularName, folderName, fileName, enableTranslation, clientFramework);
}
- /**
- * Add a new http interceptor to the angular application in "blocks/config/http.config.js".
- * The interceptor should be in its own .js file inside app/blocks/interceptor folder
- * @param {string} interceptorName - angular name of the interceptor
- *
- */
- addAngularJsInterceptor(interceptorName) {
- const fullPath = `${CLIENT_MAIN_SRC_DIR}app/blocks/config/http.config.js`;
- try {
- jhipsterUtils.rewriteFile(
- {
- file: fullPath,
- needle: 'jhipster-needle-angularjs-add-interceptor',
- splicable: [`$httpProvider.interceptors.push('${interceptorName}');`]
- },
- this
- );
- } catch (e) {
- this.log(
- chalk.yellow('\nUnable to find ') +
- fullPath +
- chalk.yellow(' or missing required jhipster-needle. Interceptor not added to JHipster app.\n')
- );
- this.debug('Error:', e);
- }
- }
-
/**
* Add a new entity to Ehcache, for the 2nd level cache of an entity and its relationships.
*
| 2 |
diff --git a/test/image/mocks/zzz_smith_basic.json b/test/image/mocks/zzz_smith_basic.json "data": [
{
"type": "scattersmith",
- "real": [0, 0, 1, 1, 2, 5, 10, "Infinity"],
- "imag": [0, 1, 0, -2, -2, -5, -10, "Infinity"],
+ "real": [0, 0, 1, 1, 2, 5, 10],
+ "imag": [0, 1, 0, -2, -2, -5, -10],
"mode": "lines+markers",
"marker": {
"size": 20,
| 2 |
diff --git a/server/game/cards/02.5-FHNS/SeppunIshikawa.js b/server/game/cards/02.5-FHNS/SeppunIshikawa.js @@ -5,7 +5,6 @@ class SeppunIshikawa extends DrawCard {
setupCardAbilities(ability) {
this.persistentEffect({
match: this,
- recalculateWhen: ['onMove', 'onPlayIntoConflict', 'onCardTraitChanged', 'onCardEntersPlay', 'onProvinceRevealed', 'onCardTakenControl', 'onCardLeavesPlay', 'onCardSacrificed', 'onCardAttached', 'onBreakProvince'],
effect: [
ability.effects.dynamicMilitarySkill(() => this.getImperialCardsInPlay()),
ability.effects.dynamicPoliticalSkill(() => this.getImperialCardsInPlay())
@@ -14,24 +13,15 @@ class SeppunIshikawa extends DrawCard {
}
getImperialCardsInPlay() {
- if(this.controller && this.controller.cardsInPlay) {
- return _.reduce(_.flatten([this.controller.cardsInPlay._wrapped, this.getProvinces()]), (sum, card) => {
- if(card.hasTrait('imperial')) {
+ return this.game.allCards.reduce((sum, card) => {
+ if(card.controller === this.controller && card.hasTrait('imperial') && !card.facedown &&
+ (card.location === 'play area' || (card.isProvince && !card.isBroken && ) ||
+ (['province 1', 'province 2', 'province 3', 'province 4', 'stronghold province'].includes(card.location) &&
+ card.type === 'holding'))) {
return sum + 1;
}
return sum;
- }, -1);
- }
- return 0;
- }
-
- getProvinces() {
- let provinces = _.map(['province 1', 'province 2', 'province 3', 'province 4'], location => {
- return this.controller.getProvinceCardInProvince(location);
- });
- return _.filter(provinces, province => {
- return !province.isBroken && !province.facedown;
- });
+ }, 0);
}
}
| 2 |
diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js @@ -305,7 +305,7 @@ module.exports = function (webpackEnv) {
// https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
splitChunks: {
chunks: 'all',
- name: false,
+ name: isEnvDevelopment,
},
// Keep the runtime chunk separated to enable long term caching
// https://twitter.com/wSokra/status/969679223278505985
| 7 |
diff --git a/src/VR.js b/src/VR.js @@ -656,7 +656,7 @@ const controllerIDs = {
fake: 'OpenVR Gamepad',
openvr: 'OpenVR Gamepad',
// oculusMobile: 'Oculus Go',
- openvrTracker: 'Tracker',
+ openvrTracker: 'OpenVR Tracker',
oculusLeft: 'Oculus Touch (Left)',
oculusRight: 'Oculus Touch (Right)',
oculusMobileLeft: 'Oculus Touch (Left)',
| 10 |
diff --git a/fastlane/Fastfile b/fastlane/Fastfile @@ -34,6 +34,14 @@ platform :android do
task: 'bundle',
build_type: 'Release',
)
+
+ upload_to_play_store(
+ package_name: "com.expensify.chat",
+ json_key: './android/app/android-fastlane-json-key.json',
+ aab: './android/app/build/outputs/bundle/release/app-release.aab',
+ track: 'internal',
+ rollout: '1.0'
+ )
end
end
@@ -44,7 +52,7 @@ platform :ios do
build_app(
workspace: "./ios/ReactNativeChat.xcworkspace",
- scheme: "wrong_scheme"
+ scheme: "ReactNativeChat"
)
end
@@ -67,7 +75,7 @@ platform :ios do
import_certificate(
certificate_path: "./ios/Certificates.p12",
keychain_name: "ios-build.keychain",
- keychain_password: "wrong_password"
+ keychain_password: keychain_password
)
install_provisioning_profile(
@@ -79,6 +87,24 @@ platform :ios do
scheme: "ReactNativeChat"
)
+ upload_to_testflight(
+ distribute_external: true,
+ reject_build_waiting_for_review: true,
+ changelog: "Thank you for beta testing the Expensify Chat, this version includes bug fixes and improvements.",
+ groups: ["Beta"],
+ demo_account_required: true,
+ beta_app_review_info: {
+ contact_email: "[email protected]",
+ contact_first_name: "Andrew",
+ contact_last_name: "Gable",
+ contact_phone: "+1 916 698 2582",
+ demo_account_name: "[email protected]",
+ demo_account_password: "asdfASDF00",
+ notes: "Use the account provided. Thank you for the review."
+ }
+ )
+
+
upload_symbols_to_crashlytics(
dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH],
gsp_path: "./ios/GoogleService-Info.plist",
| 4 |
diff --git a/package.json b/package.json "name": "marklogic",
"description": "The official MarkLogic Node.js client API.",
"homepage": "http://github.com/marklogic/node-client-api",
- "version": "2.9.0",
+ "version": "2.9.1",
"license": "Apache-2.0",
"main": "./lib/marklogic.js",
"scripts": {
| 3 |
diff --git a/lib/taiko.js b/lib/taiko.js @@ -8,7 +8,7 @@ const fs = require('fs');
const EventEmiter = require('events').EventEmitter;
const path = require('path');
const ChromiumRevision = require(path.join(helper.projectRoot(), 'package.json')).taiko.chromium_revision;
-const default_timeout = 5000;
+const default_timeout = 2000;
let chromeProcess, page, network, runtime, input, client, dom, browser;
let rootId = null;
const xhrEvent = new EventEmiter();
| 13 |
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-narrow-navigation-item/sprk-narrow-navigation-item.component.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-narrow-navigation-item/sprk-narrow-navigation-item.component.ts -import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
import * as _ from 'lodash';
+import {
+ trigger,
+ state,
+ style,
+ animate,
+ transition
+} from '@angular/animations';
@Component({
selector: 'sprk-narrow-navigation-item',
template: `
- <li [ngClass]="getClasses()">
+ <li [ngClass]="getClasses()" routerLinkActive="sprk-c-Accordion__item--active">
<div *ngIf="subNav != null; then menu; else link;"></div>
<ng-template #link>
<a [attr.aria-controls]="controls_id"
@@ -25,9 +32,10 @@ import * as _ from 'lodash';
<span class="sprk-b-TypeBodyTwo sprk-c-Accordion__heading ">
{{ text }}
</span>
- <sprk-icon [iconType]="iconType" additionalClasses="sprk-c-Accordion__icon"></sprk-icon>
+ <sprk-icon [iconType]="iconType" additionalClasses="sprk-c-Icon--l sprk-c-Accordion__icon"></sprk-icon>
</a>
- <ul [id]="controls_id" *ngIf="isOpen" class="sprk-b-List sprk-b-List--bare sprk-c-Accordion__details sprk-u-HideWhenJs">
+ <div [@toggleContent]="animState">
+ <ul [id]="controls_id" class="sprk-b-List sprk-b-List--bare sprk-c-Accordion__details sprk-u-HideWhenJs">
<li *ngFor="let navItem of subNav">
<a class="sprk-b-Link sprk-b-Link--standalone sprk-u-pam"
[routerLink]="navItem.href"
@@ -35,10 +43,32 @@ import * as _ from 'lodash';
>{{ navItem.text }}</a>
</li>
</ul>
+ </div>
</ng-template>
- </li>`
+ </li>`,
+ animations: [
+ trigger('toggleContent', [
+ state(
+ 'closed',
+ style({
+ height: '0',
+ display: 'none',
+ overflow: 'hidden'
})
-export class SparkNarrowNavigationItemComponent {
+ ),
+ state(
+ 'open',
+ style({
+ height: '*',
+ display: 'block'
+ })
+ ),
+ transition('closed => open', animate('300ms ease-in')),
+ transition('open => closed', animate('300ms ease-out'))
+ ])
+ ]
+})
+export class SparkNarrowNavigationItemComponent implements OnInit {
@Input()
additionalClasses: string;
@Input()
@@ -55,6 +85,22 @@ export class SparkNarrowNavigationItemComponent {
iconType = 'chevron-down';
componentID = _.uniqueId();
controls_id = `sprk-narrow-navigation-item__${this.componentID}`;
+ public iconStateClass = '';
+ public animState = 'closed';
+
+ accordionState(): void {
+ this.isOpen === false
+ ? (this.animState = 'closed')
+ : (this.animState = 'open');
+
+ this.isOpen === false
+ ? (this.iconType = 'chevron-down')
+ : (this.iconType = 'chevron-up');
+
+ this.isOpen === false
+ ? (this.iconStateClass = '')
+ : (this.iconStateClass = 'sprk-c-Icon--open');
+ }
getClasses(): string {
const classArray: string[] = ['sprk-c-Accordion__item'];
@@ -68,11 +114,13 @@ export class SparkNarrowNavigationItemComponent {
return classArray.join(' ');
}
+ ngOnInit() {
+ this.accordionState();
+ }
+
toggleAccordion(event): void {
event.preventDefault();
this.isOpen = !this.isOpen;
- this.iconType === 'chevron-down'
- ? (this.iconType = 'chevron-up')
- : (this.iconType = 'chevron-down');
+ this.accordionState();
}
}
| 3 |
diff --git a/react/src/components/masthead/components/SprkMastheadLittleNav/SprkMastheadLittleNav.js b/react/src/components/masthead/components/SprkMastheadLittleNav/SprkMastheadLittleNav.js @@ -88,16 +88,34 @@ class SprkMastheadLittleNav extends Component {
}
SprkMastheadLittleNav.propTypes = {
- /** classes to be added to the masthead */
+ /**
+ * Expects a space separated string
+ * of classes to be added to the
+ * component.
+ */
additionalClasses: PropTypes.string,
- /** assigned to data-analytics */
+ /**
+ * The value supplied will be assigned to the
+ * `data-analytics` attribute on the component.
+ * Intended for an outside
+ * library to capture data.
+ */
analyticsString: PropTypes.string,
- /** assigned to data-id */
+ /**
+ * Value assigned
+ * to the `data-id` attribute on the
+ * component. This is intended to be
+ * used as a selector for automated
+ * tools. This value should be unique
+ * per page.
+ */
idString: PropTypes.string,
- /** used to render navigation inside */
+ /** Used to render navigation links inside the little nav */
links: PropTypes.arrayOf(
PropTypes.shape({
- /** The element to render, can be 'a' or a Component like Link */
+ /**
+ * Determines if link renders as an anchor tag, or router link.
+ */
element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
/** Classes to apply to the container of the link */
additionalContainerClasses: PropTypes.string,
@@ -107,14 +125,23 @@ SprkMastheadLittleNav.propTypes = {
text: PropTypes.string,
}),
),
- /** Choices object that builds the dropdown contents */
+ /**
+ * Expects a selector object that
+ * represents choices to be supplied
+ * to the selector in the wide viewport
+ * version of the masthead.
+ */
selector: PropTypes.shape({
- /** An array of objects that describe the items in the menu */
+ /**
+ * An array of objects that describe the items in the menu
+ */
items: PropTypes.arrayOf(
PropTypes.shape({
- /** The element to render for each menu item */
+ /**
+ * Determines if link renders as an anchor tag, or router link.
+ */
element: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
- /** Assigned to href of the element is 'a' */
+ /** Assigned to href if the element is an anchor */
href: PropTypes.string,
/** The text inside the item */
text: PropTypes.string,
@@ -123,7 +150,11 @@ SprkMastheadLittleNav.propTypes = {
}),
/** Determines the spacing between little nav items */
spacing: PropTypes.oneOf(['medium', 'large']),
- /** An array of components to fill the utility area with */
+ /**
+ * Expects an array containing components
+ * to render in the utility area of littleNav,
+ * in the wide viewport version of the masthead.
+ */
utilityContents: PropTypes.arrayOf(PropTypes.node),
};
| 7 |
diff --git a/src/pages/bitcoin-farm-calculator/index.js b/src/pages/bitcoin-farm-calculator/index.js @@ -3,7 +3,7 @@ import './index.css';
import { useItemByIdQuery } from '../../features/items/queries';
import useStateWithLocalStorage from '../../hooks/useStateWithLocalStorage';
-import { InputFilter, ToggleFilter } from '../../components/filter';
+import { Filter, InputFilter, ToggleFilter } from '../../components/filter';
import formatPrice from '../../modules/format-price';
import Loading from '../../components/loading';
@@ -50,32 +50,7 @@ const BitcoinFarmCalculator = () => {
return (
<div className={'page-wrapper'}>
<h1>{t('Bitcoin Farm Calculator')}</h1>
- {Boolean(graphicCardItem) && (
- <div>
- <img
- alt={graphicCardItem.name}
- className={'item-image'}
- loading="lazy"
- src={graphicCardItem.iconLink}
- />
- Buy for {formatPrice(graphicsCardBuy.price)} from{' '}
- {capitalizeFirst(graphicsCardBuy.source)}
- </div>
- )}
-
- {Boolean(bitcoinItem) && (
- <div>
- <img
- alt={bitcoinItem.name}
- className={'item-image'}
- loading="lazy"
- src={bitcoinItem.iconLink}
- />
- Sell for {formatPrice(btcSell.price)} to{' '}
- {capitalizeFirst(btcSell.source)}
- </div>
- )}
- <div className="settings-group-wrapper">
+ <Filter>
<InputFilter
label={t('Graphic cards count')}
defaultValue={graphicCardsCount?.toString() ?? ''}
| 4 |
diff --git a/gulpfile.js b/gulpfile.js @@ -48,14 +48,10 @@ function styles(){
}
//build tabulator
-function tabulator(){
- //return gulp.src('src/js/**/*.js')
- return gulp.src('src/js/core_modules.js')
+function umd(){
+ return gulp.src('src/js/umd.js')
.pipe(insert.prepend(version + "\n"))
- //.pipe(sourcemaps.init())
.pipe(include())
- //.pipe(jshint())
- // .pipe(jshint.reporter('default'))
.pipe(babel({
//presets:['es2015']
compact: false,
@@ -67,12 +63,11 @@ function tabulator(){
modules: false,
}, ], { }]
}))
- .pipe(concat('tabulator.js'))
+ .pipe(concat('umd.js'))
.pipe(gulp.dest('dist/js'))
.pipe(rename({suffix: '.min'}))
.pipe(uglify())
.pipe(insert.prepend(version))
- // .pipe(sourcemaps.write('.'))
.pipe(gulp.dest('dist/js'))
//.pipe(notify({ message: 'Scripts task complete' }));
.on('end', function(){ gutil.log('Tabulator Complete'); })
@@ -84,21 +79,7 @@ function esm(){
//return gulp.src('src/js/**/*.js')
return gulp.src('src/js/core_esm.js')
.pipe(insert.prepend(version + "\n"))
- //.pipe(sourcemaps.init())
.pipe(include())
- //.pipe(jshint())
- // .pipe(jshint.reporter('default'))
- .pipe(babel({
- //presets:['es2015']
- compact: false,
- presets: [["env",{
- "targets": {
- "browsers": ["last 4 versions"]
- },
- loose: true,
- modules: false,
- }, ], { }]
- }))
.pipe(concat('tabulator.es2015.js'))
.pipe(gulp.dest('dist/js'))
.pipe(rename({suffix: '.min'}))
@@ -230,7 +211,7 @@ function dev(){
gulp.watch('src/js/**/*.js', devscripts);
}
-exports.tabulator = gulp.series(tabulator);
+exports.umd = gulp.series(umd);
exports.styles = gulp.series(styles);
exports.esm = gulp.series(esm);
exports.core = gulp.series(core);
| 3 |
diff --git a/.travis.yml b/.travis.yml @@ -67,6 +67,8 @@ jobs:
services:
- xvfb
- name: react-recurly
+ allow_failures:
+ if: env(TRAVIS_PULL_REQUEST) != false
env: RECURLY_JS_SHA=$TRAVIS_COMMIT
script:
- mkdir -p vendor && cd vendor
| 11 |
diff --git a/sirepo/template/warpvnd.py b/sirepo/template/warpvnd.py @@ -983,7 +983,7 @@ def _prepare_conductors(data):
if ct is None:
continue
type_by_id[ct.id] = ct
- pkdp('!PREP CONDS {}', ct)
+ #pkdp('!PREP CONDS {}', ct)
for f in ('xLength', 'yLength', 'zLength'):
ct[f] = _meters(ct[f])
if not _is_3D(data):
@@ -1148,6 +1148,5 @@ def _save_stl_polys(data):
with h5py.File(_stl_polygon_file(data.file)) as hf:
template_common.dict_to_h5(data, hf, path='/')
except Exception as e:
- pkdp('!save_stl_polys FAIL: {}', e)
+ pkdlog('!save_stl_polys FAIL: {}', e)
pass
-
| 14 |
diff --git a/ui/src/utils/extend.js b/ui/src/utils/extend.js @@ -2,7 +2,7 @@ const
toString = Object.prototype.toString,
hasOwn = Object.prototype.hasOwnProperty,
notPlainObject = new Set(
- [ 'Boolean', 'Number', 'String', 'Function', 'Array', 'Date', 'RegExp', 'Object' ]
+ [ 'Boolean', 'Number', 'String', 'Function', 'Array', 'Date', 'RegExp' ]
.map(name => '[object ' + name + ']')
)
@@ -14,7 +14,7 @@ function isPlainObject (obj) {
if (
obj.constructor
&& hasOwn.call(obj, 'constructor') === false
- && !hasOwn.call(obj.constructor.prototype, 'isPrototypeOf') === false
+ && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf') === false
) {
return false
}
| 1 |
diff --git a/src/components/text-input/index.js b/src/components/text-input/index.js @@ -126,7 +126,15 @@ class TextInput extends Component {
if (typeof attributes === 'object' && attributes !== null) {
attr = Object.keys (attributes).map ((key) => {
- return `${key}="${attributes[key]}"`;
+ let value = attributes[key];
+
+ // If it's a string value, we'll do the variable interpolation
+ // for it.
+ if (typeof value === 'string') {
+ value = this.engine.replaceVariables (value);
+ }
+
+ return `${key}="${value}"`;
}).join (' ');
}
@@ -136,12 +144,19 @@ class TextInput extends Component {
const optionElements = options.map ((o) => {
let selected = '';
let parsedDefault = defaultValue;
+
+ // If the default value provided is a string, we need to do the variable
+ // interpolation for it.
if (typeof defaultValue === 'string' && defaultValue !== null && defaultValue !== '') {
parsedDefault = this.engine.replaceVariables (defaultValue);
+ // We're doing a == comparisson instead of === since the numeric
+ // values could be a string.
if (parsedDefault == this.engine.replaceVariables (o.value)) {
selected = 'selected';
}
} else if (typeof defaultValue === 'number') {
+ // We're doing a == comparisson instead of === since the numeric
+ // values could be a string.
if (parsedDefault == o.value) {
selected = 'selected';
}
@@ -155,12 +170,19 @@ class TextInput extends Component {
input = options.map ((o, index) => {
let checked = '';
let parsedDefault = defaultValue;
+
+ // If the default value provided is a string, we need to do the variable
+ // interpolation for it.
if (typeof defaultValue === 'string' && defaultValue !== null && defaultValue !== '') {
parsedDefault = this.engine.replaceVariables (defaultValue);
+ // We're doing a == comparisson instead of === since the numeric
+ // values could be a string.
if (parsedDefault == this.engine.replaceVariables (o.value)) {
checked = 'checked';
}
} else if (typeof defaultValue === 'number') {
+ // We're doing a == comparisson instead of === since the numeric
+ // values could be a string.
if (parsedDefault == o.value) {
checked = 'checked';
}
| 11 |
diff --git a/README.md b/README.md @@ -144,11 +144,6 @@ Open-source clients to the plotly.js APIs are available at these links:
|**Python / Pandas / IPython notebook**| [plotly/plotly.py](https://github.com/plotly/plotly.py) | [plotly/python/getting-started](https://plotly.com/python/getting-started) |
|**MATLAB**| [plotly/matlab-api](https://github.com/plotly/matlab-api) | [plotly/matlab/getting-started](https://plotly.com/matlab/getting-started) |
|**node.js / Tonicdev / Jupyter notebook**| [plotly/plotly-notebook-js](https://github.com/plotly/plotly-notebook-js) | |
-|**node.js cloud client**| [plotly/plotly-nodejs](https://github.com/plotly/plotly-nodejs) | [plotly/nodejs/getting-started](https://plotly.com/nodejs/getting-started) |
-|**Julia**| [plotly/Plotly.jl](https://github.com/plotly/Plotly.jl) | [plotly/julia/getting-started](https://plotly.com/julia/getting-started) |
-
-plotly.js charts can also be created and saved online for free at [plotly/create](https://chart-studio.plotly.com/create).
-
## Creators
### Active
| 2 |
diff --git a/manifest.json b/manifest.json "persistent": true
},
- "applications": {
+ "browser_specific_settings": {
"gecko": {
- "id": "maxurl@qsniyg"
+ "id": "maxurl@qsniyg",
+ "strict_min_version": "48.0"
}
},
| 12 |
diff --git a/generators/generator-base.js b/generators/generator-base.js @@ -155,7 +155,7 @@ module.exports = class extends Generator {
splicable: [
this.stripMargin(
`|<li uiSrefActive="active">
- | <a class="dropdown-item" routerLink="${routerName}" (click)="collapseNavbar()">
+ | <a class="dropdown-item" routerLink="${routerName}" routerLinkActive="active" (click)="collapseNavbar()">
| <i class="fa fa-fw fa-asterisk" aria-hidden="true"></i>
| <span${enableTranslation ? ` jhiTranslate="global.menu.entities.${_.camelCase(routerName)}"` : ''}>${_.startCase(routerName)}</span>
| </a>
| 1 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,68 @@ 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.50.0] -- 2019-10-07
+
+### Added
+- Add `treemap` trace type [#4185, #4219, #4227, #4242]
+- Add `texttemplate` attribute to all traces that support on-graph text [#4071, #4179]
+- Add date custom formatting in `hovertemplate` and `texttemplate` e.g.
+ `'%{x|%b %-d, %Y}'` [#4071]
+- Add transition support to `bar` trace length, width, on-graph text positioning,
+ marker style and error bars [#4180, #4186]
+- Add attribute `count`, colorscale support and many `hoverinfo` / `textinfo` flags
+ to `sunburst` traces [#4185, #4245]
+- Add constraint info to `parcats` click and hover events [#4211]
+- Add support for legend scrolling via touch interactions [#3873, #4214]
+- Add `ru` and `uk` locales [#4204]
+- Publish minified dist npm packages for the main plotly.js bundle and
+ all our partial bundles [#4169]
+
+### Changed
+- Cap the number of redraws triggered by the auto-margin routine,
+ which should prevent all potential infinite redraw loops [#4216]
+- Improve cartesian axis draw performance by (1) computing its bounding box
+ only when required and (2) using a bounding-box computation cache [#4165]
+- Log message when margin-push values are too big to be considered during
+ auto-margin computations [#4160]
+- Log message when legend position is constrained into graph viewbox [#4160]
+- Process layout image using data URI synchronously [#4105]
+- Adapt default axis ranges to `rangemode` values `'tozero'` and `'nonnegative'` [#4171]
+- Show zeroline even when no grid lines are present [#4189]
+- Use `mapbox-gl` version 1.3.2 [#4230]
+- Make `touchmove` event listener non passive on mobile drag [#4231]
+- Improve `streamtube` trace description [#4181]
+- Improve `indicator` trace description [#4246]
+- Improve legend `x` and `y` attribute descriptions [#4160]
+
+### Fixed
+- Fix attempt at fixing gl3d in Chrome 77 problems [#4256]
+- Fix numerous legend positioning bug [#4160]
+- Fix numerous axis `automargin` bugs [#4165, #4216]
+- Correctly handle `<br>` and `\n` in `scattermapbox` on-graph text [#4176]
+- Fix `scattergl` hover over nulls (bug introduced in 1.45.0) [#4213]
+- Correctly remove off-screen annotations during pan interactions
+ (bug introduced in 1.40.0) [#4170]
+- Fix `contour` and `contourcarpet` label formatting via colorbar settings
+ (bug introduced in 1.48.0) [#4177]
+- Fix background rectangle dimensions for horizontal grouped legends [#4160]
+- Correctly handle non-linear axis types during transitions [#4249]
+- Fix `branchvalues: 'total'` for generated sunburst sectors [#4253]
+- Fix `Download plot` translations [#4148]
+- Fix `fr` translations for "Click to enter --- title" [#4204]
+- Fix tiny zoombox behavior [#4188]
+- Fix rendering of constraint contours with rounded-off edge path [#4102]
+- Fix "autoscale" modebar button bug where it sometimes toggled axis `showspikes` [#4241]
+- Fix multi-axis transition axis-to-axis range "leaks" [#4167]
+- Fix `toggleHover` and `resetViews` modebar buttons for
+ some partial bundle + graph setups [#4184]
+- Correctly list `color-rgba` module as dependency [#4207]
+- Fix third-party dependency listing for `gl-cone3d` and `gl-streamtube3d` [#4208, #4215]
+- Fix `line.width` attr declaration in `*contour` traces [#4218]
+- Remove hover attribute from `carpet` and `contourcarpet` schema
+ (as they do not support hover yet) [#4102]
+
+
## [1.49.5] -- 2019-09-18
### Fixed
| 3 |
diff --git a/src/plugins/Dashboard/FileCard.js b/src/plugins/Dashboard/FileCard.js @@ -8,7 +8,10 @@ module.exports = function fileCard (props) {
const tempStoreMetaOrSubmit = (ev) => {
if (ev.keyCode === 13) {
+ ev.stopPropagation()
+ ev.preventDefault()
props.done(meta, file.id)
+ return
}
const value = ev.target.value
@@ -26,7 +29,9 @@ module.exports = function fileCard (props) {
data-name="${field.id}"
value="${file.meta[field.id]}"
placeholder="${field.placeholder || ''}"
- onkeyup=${tempStoreMetaOrSubmit} /></fieldset>`
+ onkeyup=${tempStoreMetaOrSubmit}
+ onkeydown=${tempStoreMetaOrSubmit}
+ onkeypress=${tempStoreMetaOrSubmit} /></fieldset>`
})
}
| 9 |
diff --git a/src/tests/structs/db/int_PendingArticle.database.test.js b/src/tests/structs/db/int_PendingArticle.database.test.js @@ -47,4 +47,7 @@ describe('Int::structs/db/PendingArticle Database', function () {
const docs = await collection.find({}).toArray()
expect(docs[0].article).toEqual(expect.objectContaining(data.article))
})
+ afterAll(async function () {
+ await con.close()
+ })
})
| 1 |
diff --git a/edit.js b/edit.js @@ -995,6 +995,33 @@ const _initializeLogin = async () => {
};
_initializeLogin();
+const wheelCanvas = (() => {
+ const size = 512;
+ const canvas = document.createElement('canvas');
+ canvas.style.cssText = `
+ position: absolute;
+ top: 100px;
+ left: 100px;
+ width: auto !important;
+ height: auto !important;
+ `;
+ canvas.width = size;
+ canvas.height = size;
+
+ const ctx = canvas.getContext('2d');
+ const numSlices = 6;
+ for (let i = 0; i < numSlices; i++) {
+ ctx.beginPath();
+ ctx.arc(size/2, size/2, size/2, i*Math.PI*2/numSlices + Math.PI*0.02, (i+1)*Math.PI*2/numSlices - Math.PI*0.02, false);
+ ctx.arc(size/2, size/2, size/4, (i+1)*Math.PI*2/numSlices - Math.PI*0.02, i*Math.PI*2/numSlices + Math.PI*0.02, true);
+ // ctx.lineTo(size/2, size/2);
+ ctx.fill();
+ }
+
+ return canvas;
+})();
+document.body.appendChild(wheelCanvas);
+
const _initializeXr = () => {
let currentSession = null;
function onSessionStarted(session) {
| 0 |
diff --git a/bin/sails-debug.js b/bin/sails-debug.js @@ -18,7 +18,10 @@ var Sails = require('../lib/app');
* @stability 2
* @see http://sailsjs.com/documentation/reference/command-line-interface/sails-debug
*/
-module.exports = function() {
+module.exports = function(cmd) {
+
+ var extraArgs = cmd.parent.rawArgs.slice(3);
+
var log = CaptainsLog();
// Use the app's local Sails in `node_modules` if one exists
@@ -47,7 +50,7 @@ module.exports = function() {
console.log();
// Spin up child process for Sails
- Womb.spawn('node', ['--debug', pathToSails, 'lift'], {
+ Womb.spawn('node', ['--debug', pathToSails, 'lift'].concat(extraArgs), {
stdio: 'inherit'
});
});
| 11 |
diff --git a/components/App.js b/components/App.js @@ -6,6 +6,7 @@ import {loginManager} from '../login.js';
import {planet} from '../planet.js';
import {state, getState, setState, getSpecificState} from '../state.js';
import {setBindings} from './bindings.js';
+import {getContractSource} from '../blockchain.js';
let appState = state;
@@ -145,7 +146,7 @@ export const onclickBindings = {
menu,
});
},
- 'twoD-trade-accept': e => {
+ 'twoD-trade-accept': async (e) => {
const { menu } = getState();
if (menu.trade.agreement && menu.trade.toPeer && menu.trade.fromPeer && menu.trade.selectedItem) {
@@ -157,6 +158,23 @@ export const onclickBindings = {
}
console.log(trade)
+ const contractSource = await getContractSource('transferNft.cdc');
+ const res = await fetch(`https://accounts.exokit.org/sendTransaction`, {
+ method: 'POST',
+ body: JSON.stringify({
+ address: trade.fromPeer,
+ mnemonic: loginManager.getMnemonic(),
+ limit: 1000,
+ transaction: contractSource
+ .replace(/ARG0/g, trade.item)
+ .replace(/ARG1/g, '0x' + trade.toPeer)
+ .replace(/ARG2/g, 1),
+ wait: true,
+ }),
+ });
+ const response2 = await res.json();
+ console.log(response2)
+
menu.trade = {
visible: false,
toPeer: null,
| 0 |
diff --git a/src/components/DayPickerNavigation.jsx b/src/components/DayPickerNavigation.jsx @@ -191,7 +191,10 @@ export default withStyles(({ reactDates: { color, zIndex } }) => ({
zIndex: zIndex + 2,
},
- DayPickerNavigation__horizontal: {},
+ DayPickerNavigation__horizontal: {
+ height: 0,
+ },
+
DayPickerNavigation__vertical: {},
DayPickerNavigation__verticalScrollable: {},
| 12 |
diff --git a/src/providers/UniversalAnalytics.js b/src/providers/UniversalAnalytics.js @@ -455,6 +455,8 @@ class UniversalAnalyticsProvider extends BaseProvider
type = "Page View";
} else if(value === "transaction" || value === "item") {
type = "Ecommerce " + value.charAt(0).toUpperCase() + value.slice(1);
+ } else if(value === "dc") {
+ type = "DoubleClick";
} else {
type = value.charAt(0).toUpperCase() + value.slice(1);
}
| 12 |
diff --git a/lib/voice/VoiceConnectionManager.js b/lib/voice/VoiceConnectionManager.js @@ -18,13 +18,21 @@ class VoiceConnectionManager extends Collection {
return new Promise((res, rej) => {
var disconnectHandler = () => {
connection.removeListener("ready", readyHandler);
+ connection.removeListener("error", errorHandler);
rej(new Error("Disconnected"));
};
var readyHandler = () => {
connection.removeListener("disconnect", disconnectHandler);
+ connection.removeListener("error", errorHandler);
res(connection);
};
- connection.once("ready", readyHandler).once("disconnect", disconnectHandler);
+ var errorHandler = (err) => {
+ connection.removeListener("disconnect", disconnectHandler);
+ connection.removeListener("ready", readyHandler);
+ connection.disconnect();
+ rej(err);
+ };
+ connection.once("ready", readyHandler).once("disconnect", disconnectHandler).once("error", errorHandler);
});
}
}
| 9 |
diff --git a/public/index.html b/public/index.html ga('govuk_shared.require', 'linker');
ga('govuk_shared.set', 'anonymizeIp', true);
ga('govuk_shared.set', 'allowAdFeatures', false);
- ga('govuk_shared.linker:autoLink', ['www.gov.uk', 'coronavirus.data.gov.uk']);
+ ga('govuk_shared.linker:autoLink', ['www.gov.uk', 'coronavirus.data.gov.uk', 'data.gov.uk']);
ga('send', 'pageview');
ga('govuk_shared.send', 'pageview');
| 9 |
diff --git a/app/components/job/Index/jobs.js b/app/components/job/Index/jobs.js @@ -67,12 +67,14 @@ class Jobs extends React.PureComponent {
// Ensure the states are all upper case since it's a GraphQL enum
const states = searchQueryParams['state'];
+ if(states) {
if (typeof states === 'string') {
variables.states = states.toUpperCase();
} else {
variables.states = states.map((state) => state.toUpperCase());
}
}
+ }
return variables;
}
| 9 |
diff --git a/css/style.css b/css/style.css @@ -691,6 +691,25 @@ input[type='number'] {
font-size: 1.4em;
}
+.fa-instagram:hover {
+ /* color: #bc2a8d; */
+ background: #d6249f;
+ background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 45%,#d6249f 60%,#285AEB 90%);
+ border-radius: 10%;
+}
+
+.fa-linkedin:hover {
+ color:#0077b5;
+}
+
+.fa-envelope:hover {
+ color: #d34836;
+}
+
+.fa-discord:hover {
+ color: #7289da;
+}
+
@media (max-width:420px) {
#box{
margin-right:11em;
| 3 |
diff --git a/src/components/accounts/SetRecoveryInfo.js b/src/components/accounts/SetRecoveryInfo.js @@ -51,8 +51,10 @@ class SetRecoveryInfo extends Component {
this.props.requestCode(this.state.phoneNumber, this.props.accountId)
.finally(() => {
this.setState(() => ({
- loader: false
+ loader: false,
+ isLegit: false
}))
+ this.props.clear()
})
} else {
this.props.setupAccountRecovery(this.state.phoneNumber, this.props.accountId, this.state.securityCode)
| 12 |
diff --git a/test/test_taskfiles.js b/test/test_taskfiles.js @@ -41,7 +41,7 @@ const tsvPath2_2 = path.normalize(path.resolve('./testdata/tasks2/task-sample_ru
if seconds 10, durations=1.0
if frames 10-0.5TR, 11+0.5*TR
-
+*/
let errFn = (e, done) => {
console.log(colors.red('---- An error occured while reading', e));
| 1 |
diff --git a/src/components/dropdown.js b/src/components/dropdown.js @@ -17,6 +17,7 @@ class Dropdown extends React.Component {
this.onExpandButtonClick = this.onExpandButtonClick.bind(this)
this.handleClickOutside = this.handleClickOutside.bind(this)
+ this.handleBlur = this.handleBlur.bind(this)
this.handleEscapeKey = this.handleEscapeKey.bind(this)
}
@@ -33,16 +34,39 @@ class Dropdown extends React.Component {
}
handleClickOutside(event) {
- if (this.state.expanded && this.container.current && !this.container.current.contains(event.target)) {
+ if (!this.state.expanded) return
+ if (!this.container.current) return
+ if (this.container.current.contains(event.target)) return
+
this.setState({
expanded: false
})
}
+
+ handleBlur(event) {
+ if (this.willEscape) return
+ if (!this.state.expanded) return
+ if (!this.button.current || !this.container.current) return
+
+ const activeElement = event.relatedTarget
+
+ if (activeElement === this.button.current) {
+ event.preventDefault()
+ const focusIndex = this.focusGroup.getMembers().length - 1
+ this.focusGroup.focusNodeAtIndex(focusIndex)
+ }
+
+ else if (!this.container.current.contains(event.relatedTarget)) {
+ event.preventDefault()
+ this.focusGroup.focusNodeAtIndex(0)
+ }
}
handleEscapeKey(event) {
if (event.key !== "Escape") return
+ this.willEscape = true
+
if (this.button.current) {
this.button.current.focus()
}
@@ -70,6 +94,7 @@ class Dropdown extends React.Component {
componentDidUpdate(prevProps, prevState) {
if (!prevState.expanded && this.state.expanded) {
this.focusGroup.activate()
+ this.willEscape = false
document.addEventListener("click", this.handleClickOutside)
document.addEventListener("keyup", this.handleEscapeKey)
}
@@ -93,7 +118,7 @@ class Dropdown extends React.Component {
buttonClassName += (className ? " " : "") + "Button"
return (
- <div className={className} ref={this.container} data-expanded={expanded}>
+ <div className={className} ref={this.container} data-expanded={expanded} onBlur={this.handleBlur}>
<button
ref={this.button}
className={buttonClassName}
| 7 |
diff --git a/scenes/street.scn b/scenes/street.scn "start_url": "https://avaer.github.io/rainbow-dash/",
"dynamic": true
},
+ {
+ "position": [
+ 0,
+ 0,
+ -6
+ ],
+ "quaternion": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "start_url": "https://webaverse.github.io/silk-grass/"
+ },
{
"position": [
-13,
| 0 |
diff --git a/server/src/rest.js b/server/src/rest.js @@ -47,7 +47,7 @@ function sendObjectAsJsonFile(res, data, filename) {
const readStream = new stream.PassThrough();
readStream.end(fileContents);
res.set('Content-disposition', 'attachment; filename=' + filename);
- res.set('Content-Type', 'text/plain');
+ res.set('Content-Type', 'application/json');
readStream.pipe(res);
}
| 12 |
diff --git a/config/sidebar.yml b/config/sidebar.yml @@ -40,22 +40,6 @@ articles:
- title: "For Client-side Web Apps"
url: "/client-auth/client-side-web"
- - title: "Auth0 Hooks"
- url: "/auth0-hooks"
- children:
-
- - title: "Overview"
- url: "/auth0-hooks/overview"
-
- - title: "Extensibility Points"
- url: "/auth0-hooks/extensibility-points"
-
- - title: "Work with Hooks in the Dashboard"
- url: "/auth0-hooks/dashboard"
-
- - title: "Work with Hooks Using the CLI"
- url: "/auth0-hooks/cli"
-
- title: "API Authorization"
url: "/api-auth"
children:
| 2 |
diff --git a/plugins/downloader/front.js b/plugins/downloader/front.js @@ -31,11 +31,16 @@ const reinit = () => {
}
};
+const baseUrl = "https://music.youtube.com";
// TODO: re-enable once contextIsolation is set to true
// contextBridge.exposeInMainWorld("downloader", {
// download: () => {
global.download = () => {
- const videoUrl = global.songInfo.url || window.location.href;
+ let videoUrl = getSongMenu()
+ .querySelector("ytmusic-menu-navigation-item-renderer")
+ .querySelector("#navigation-endpoint")
+ .getAttribute("href");
+ videoUrl = !videoUrl ? (global.songInfo.url || window.location.href) : (baseUrl + videoUrl);
downloadVideoToMP3(
videoUrl,
| 11 |
diff --git a/detox/src/devices/android/ADB.test.js b/detox/src/devices/android/ADB.test.js @@ -39,14 +39,14 @@ describe('ADB', () => {
adb = new ADB();
});
- describe.only('devices', () => {
+ describe('devices', () => {
it(`should invoke ADB`, async () => {
await adb.devices();
expect(exec).toHaveBeenCalledWith(`${adbBinPath} devices`, { verbosity: 'high' }, undefined, 1);
expect(exec).toHaveBeenCalledTimes(1);
});
- it.only(`should parse emulator devices`, async () => {
+ it(`should parse emulator devices`, async () => {
exec.mockReturnValue({
stdout: 'List of devices attached\nemulator-5554\tdevice\nemulator-5555\tdevice\n'
});
| 2 |
diff --git a/packages/app/src/components/PageEditor/CodeMirrorEditor.jsx b/packages/app/src/components/PageEditor/CodeMirrorEditor.jsx @@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
import urljoin from 'url-join';
import * as codemirror from 'codemirror';
-import { UnControlled as UncontrolledCodeMirror } from 'react-codemirror2';
-
import { Button } from 'reactstrap';
import { JSHINT } from 'jshint';
@@ -13,6 +11,7 @@ import * as loadScript from 'simple-load-script';
import * as loadCssSync from 'load-css-file';
import { createValidator } from '@growi/codemirror-textlint';
+import { UncontrolledCodeMirror } from '../UncontrolledCodeMirror';
import InterceptorManager from '~/services/interceptor-manager';
import loggerFactory from '~/utils/logger';
@@ -110,7 +109,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
this.state = {
value: this.props.value,
- isGfmMode: this.props.isGfmMode ?? true,
+ isGfmMode: this.props.isGfmMode,
isEnabledEmojiAutoComplete: false,
isLoadingKeymap: false,
isSimpleCheatsheetShown: this.props.isGfmMode && this.props.value.length === 0,
@@ -909,7 +908,6 @@ export default class CodeMirrorEditor extends AbstractEditor {
}
render() {
- const mode = this.state.isGfmMode ? 'gfm-growi' : undefined;
const lint = this.props.isTextlintEnabled ? this.codemirrorLintConfig : false;
const additionalClasses = Array.from(this.state.additionalClassSet).join(' ');
const placeholder = this.state.isGfmMode ? 'Input with Markdown..' : 'Input with Plain Text..';
@@ -936,12 +934,6 @@ export default class CodeMirrorEditor extends AbstractEditor {
}}
value={this.state.value}
options={{
- mode,
- theme: this.props.editorOptions.theme,
- styleActiveLine: this.props.editorOptions.styleActiveLine,
- lineNumbers: this.props.lineNumbers,
- tabSize: 4,
- indentUnit: this.props.indentSize,
lineWrapping: true,
scrollPastEnd: true,
autoRefresh: { force: true }, // force option is enabled by autorefresh.ext.js -- Yuki Takei
| 13 |
diff --git a/docs/documentation/Configuration/index.md b/docs/documentation/Configuration/index.md @@ -45,7 +45,7 @@ Your Google Analytics Domain. Will default to `process.env.GA_DOMAIN`.
### Google Maps
-Keystone's [Location field type](/api/field/location/) supports integration with the [Google Maps API](www.morethanamap.com/) to auto-improve values (including discovering latitude and longitude) via the [Places Autocomplete API](developers.google.com/places/web-service/autocomplete).
+Keystone's [Location field type](/api/field/location/) supports integration with the [Google Maps API](https://www.morethanamap.com/) to auto-improve values (including discovering latitude and longitude) via the [Places Autocomplete API](https://developers.google.com/places/web-service/autocomplete).
To enable these features, [obtain an API Key from Google](https://code.google.com/apis/console/) and enable the Google Maps v3 and Google Places APIs for it, then set the following options:
| 3 |
diff --git a/source/themes/simple/SimpleSwitch.scss b/source/themes/simple/SimpleSwitch.scss // OVERRIDABLE CONFIGURATION VARIABLES
-$switch-on-accent-color: #2f496e !default;
-$switch-off-accent-color: #b4bdca !default;
+$switch-accent-color-on: #2f496e !default;
+$switch-accent-color-off: #b4bdca !default;
$switch-thumb-accent-color: #ffffff !default;
$switch-track-height: 23px !default;
$switch-track-length: 50px !default;
$switch-label-color: #5e6066 !default;
-$switch-label-disabled-color: $theme-color-light-grey !default;
+$switch-label-color-disabled: $theme-color-light-grey !default;
@mixin thumbBoxShadow($color) {
box-shadow: -1.5px -1.5px 0 $color inset, 1.5px 1.5px 0 $color inset,
@@ -40,7 +40,7 @@ $switch-label-disabled-color: $theme-color-light-grey !default;
.disabled {
.label {
- color: $switch-label-disabled-color;
+ color: $switch-label-color-disabled;
}
}
@@ -56,10 +56,10 @@ $switch-label-disabled-color: $theme-color-light-grey !default;
&:not(.checked) {
@extend %switch;
- background-color: $switch-off-accent-color;
+ background-color: $switch-accent-color-off;
.thumb {
left: 0;
- @include thumbBoxShadow($switch-off-accent-color);
+ @include thumbBoxShadow($switch-accent-color-off);
background-color: $switch-thumb-accent-color;
}
}
@@ -68,10 +68,10 @@ $switch-label-disabled-color: $theme-color-light-grey !default;
.checked {
.switch {
@extend %switch;
- background-color: $switch-on-accent-color;
+ background-color: $switch-accent-color-on;
.thumb {
left: $switch-track-length - $switch-track-height;
- @include thumbBoxShadow($switch-on-accent-color);
+ @include thumbBoxShadow($switch-accent-color-on);
background-color: $switch-thumb-accent-color;
}
}
| 10 |
diff --git a/examples/extended-item.json b/examples/extended-item.json {
"stac_version": "1.0.0-rc.1",
"stac_extensions": [
- "eo",
- "projection",
- "scientific",
- "view",
+ "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+ "https://stac-extensions.github.io/projection/v1.0.0/schema.json",
+ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json",
+ "https://stac-extensions.github.io/view/v1.0.0/schema.json",
"https://stac-extensions.github.io/remote-data/v1.0.0/schema.json"
],
"type": "Feature",
| 3 |
diff --git a/assets/src/libraries/BookList.js b/assets/src/libraries/BookList.js @@ -11,6 +11,7 @@ export default class BookList extends Component {
currentBook: {}
};
this.showDetail = this.showDetail.bind(this);
+ this.fetchBook = this.fetchBook.bind(this);
}
componentWillMount() {
@@ -26,7 +27,22 @@ export default class BookList extends Component {
}
showDetail(book) {
- this.setState({open: !this.state.open, currentBook: book});
+ if (book) {
+ return this.fetchBook(book);
+ }
+ this.setState({open: !this.state.open, currentBook: {}});
+ }
+
+ fetchBook(book) {
+ this.props.service.getBookDetail(book).then(book => {
+ console.log(book);
+ this.setState({
+ currentBook: book,
+ open: !this.state.open
+ });
+ }).catch(error => {
+ console.error(error);
+ });
}
render() {
| 0 |
diff --git a/token-metadata/0x4Eeea7B48b9C3ac8F70a9c932A8B1E8a5CB624c7/metadata.json b/token-metadata/0x4Eeea7B48b9C3ac8F70a9c932A8B1E8a5CB624c7/metadata.json "symbol": "MBN",
"address": "0x4Eeea7B48b9C3ac8F70a9c932A8B1E8a5CB624c7",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/jasmine/tests/sliders_test.js b/test/jasmine/tests/sliders_test.js @@ -334,13 +334,13 @@ describe('sliders interactions', function() {
d3.select(gd).selectAll('.slider-group').each(function(d, i) {
var sliderBB = this.getBoundingClientRect();
var gdBB = gd.getBoundingClientRect();
+
if(i === 0) {
expect(sliderBB.left - gdBB.left)
- .toBeWithin(12, 3, 'left: ' + msg);
- }
- else {
+ .toBeWithin(12, 5.1, 'left: ' + msg);
+ } else {
expect(gdBB.bottom - sliderBB.bottom)
- .toBeWithin(8, 3, 'bottom: ' + msg);
+ .toBeWithin(8, 5.1, 'bottom: ' + msg);
}
});
}
| 0 |
diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css @@ -448,8 +448,7 @@ a {
}
.RoomHeader .room-options {
- font-weight: bold;
- font-size: 1.5rem;
+ background-image: url("./icons/vertical-ellipsis.svg");
}
.RoomView_error {
| 12 |
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js @@ -154,22 +154,22 @@ function getChatReportName(fullReport, chatType) {
* @returns {Object}
*/
function getSimplifiedReportObject(report) {
- const lastReportAction = !_.isEmpty(report.mostRecentReportAction) ? report.mostRecentReportAction : null;
- const createTimestamp = lastReportAction ? lastReportAction.created : 0;
+ const createTimestamp = lodashGet(report, 'lastActionCreated', 0);
const lastMessageTimestamp = moment.utc(createTimestamp).unix();
- const isLastMessageAttachment = /<img([^>]+)\/>/gi.test(lodashGet(lastReportAction, ['message', 'html'], ''));
+ const lastActionMessage = lodashGet(report, ['lastActionMessage', 'html'], '');
+ const isLastMessageAttachment = /<img([^>]+)\/>/gi.test(lastActionMessage);
const chatType = lodashGet(report, ['reportNameValuePairs', 'chatType'], '');
// We are removing any html tags from the message html since we cannot access the text version of any comments as
// the report only has the raw reportActionList and not the processed version returned by Report_GetHistory
// We convert the line-breaks in html to space ' ' before striping the tags
- const lastMessageText = lodashGet(lastReportAction, ['message', 'html'], '')
+ const lastMessageText = lastActionMessage
.replace(/((<br[^>]*>)+)/gi, ' ')
.replace(/(<([^>]+)>)/gi, '');
const reportName = lodashGet(report, ['reportNameValuePairs', 'type']) === 'chat'
? getChatReportName(report, chatType)
: report.reportName;
- const lastActorEmail = lodashGet(lastReportAction, 'accountEmail', '');
+ const lastActorEmail = lodashGet(report, 'lastActionActorEmail', '');
const notificationPreference = isDefaultRoom({chatType})
? lodashGet(report, ['reportNameValuePairs', 'notificationPreferences', currentUserAccountID], 'daily')
: '';
@@ -181,7 +181,7 @@ function getSimplifiedReportObject(report) {
ownerEmail: lodashGet(report, ['ownerEmail'], ''),
policyID: lodashGet(report, ['reportNameValuePairs', 'expensify_policyID'], ''),
unreadActionCount: getUnreadActionCount(report),
- maxSequenceNumber: report.reportActionListLength,
+ maxSequenceNumber: lodashGet(report, 'reportActionCount', 0),
participants: getParticipantEmailsFromReport(report),
isPinned: report.isPinned,
lastVisitedTimestamp: lodashGet(report, [
| 4 |
diff --git a/server/preprocessing/other-scripts/test/create_snapshots.R b/server/preprocessing/other-scripts/test/create_snapshots.R @@ -33,10 +33,13 @@ ADDITIONAL_STOP_WORDS = "english"
test_cases <- read.csv("queries.csv")
-commit_id <- "334154e" # latest master commit considered stable; switch to release tag later
+commit_id <- "60bb5eb" # latest master commit considered stable; switch to release tag later
# check that you actually are on that commit when creating snapshots
for (service in c("base", "pubmed")) {
+ params <- NULL
+ params_file <- paste0("params_", service, "_snapshot.json")
+ params <- fromJSON(params_file)
switch(service,
base={
source('../base.R')
@@ -49,9 +52,6 @@ for (service in c("base", "pubmed")) {
list_size = -1
}
)
- params <- NULL
- params_file <- paste0("params_", service, "_snapshot.json")
- params <- fromJSON(params_file)
for (query in test_cases$query) {
tryCatch({
| 3 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js @@ -569,7 +569,13 @@ RED.editor = (function() {
var inputsDiv = $("#node-label-form-inputs");
var outputsDiv = $("#node-label-form-outputs");
- var inputCount = node.inputs || node._def.inputs || 0;
+ var inputCount;
+ if (node.type === 'subflow') {
+ inputCount = node.in.length;
+ } else {
+ inputCount = node.inputs || node._def.inputs || 0;
+ }
+
var children = inputsDiv.children();
var childCount = children.length;
if (childCount === 1 && $(children[0]).hasClass('node-label-form-none')) {
@@ -598,7 +604,11 @@ RED.editor = (function() {
var formOutputs = $("#node-input-outputs").val();
if (formOutputs === undefined) {
- outputCount = node.outputs || node._def.outputs || 0;
+ if (node.type === 'subflow') {
+ outputCount = node.out.length;
+ } else {
+ inputCount = node.outputs || node._def.outputs || 0;
+ }
} else if (isNaN(formOutputs)) {
var outputMap = JSON.parse(formOutputs);
var keys = Object.keys(outputMap);
| 9 |
diff --git a/src/components/auth/torus/AuthTorus.web.js b/src/components/auth/torus/AuthTorus.web.js // @flow
-
/*eslint-disable*/
import React, { useCallback, useMemo, useState } from 'react'
import { Image, TouchableOpacity, View } from 'react-native'
@@ -31,7 +30,7 @@ import SimpleStore from '../../../lib/undux/SimpleStore'
import { useDialog } from '../../../lib/undux/utils/dialog'
import retryImport from '../../../lib/utils/retryImport'
import { getDesignRelativeHeight, getDesignRelativeWidth } from '../../../lib/utils/sizes'
-import { isSmallDevice, isMediumDevice } from '../../../lib/utils/mobileSizeDetect'
+import { isSmallDevice } from '../../../lib/utils/mobileSizeDetect'
import normalizeText from '../../../lib/utils/normalizeText'
import { isBrowser } from '../../../lib/utils/platform'
import { userExists } from '../../../lib/login/userExists'
@@ -290,7 +289,7 @@ const AuthTorus = ({ screenProps, navigation, styles, store }) => {
onPress={signupAuth0Mobile}
disabled={!sdkInitialized}
testID="login_via_mobile"
- compact={isSmallDevice || isMediumDevice}
+ compact={isSmallDevice}
>
Via Phone Code
</CustomButton>
@@ -301,7 +300,7 @@ const AuthTorus = ({ screenProps, navigation, styles, store }) => {
onPress={signupAuth0Email}
disabled={!sdkInitialized}
testID="login_via_email"
- compact={isSmallDevice || isMediumDevice}
+ compact={isSmallDevice}
>
Via Email Code
</CustomButton>
@@ -398,7 +397,7 @@ const AuthTorus = ({ screenProps, navigation, styles, store }) => {
</>
)}
<CustomButton
- compact={isSmallDevice || isMediumDevice}
+ compact={isSmallDevice}
mode="outlined"
style={styles.googleButtonLayout}
textStyle={{ width: '100%' }}
@@ -414,7 +413,7 @@ const AuthTorus = ({ screenProps, navigation, styles, store }) => {
</View>
</CustomButton>
<CustomButton
- compact={isSmallDevice || isMediumDevice}
+ compact={isSmallDevice}
color={mainTheme.colors.facebookBlue}
style={styles.buttonLayout}
textStyle={[styles.buttonText, facebookButtonTextStyle]}
@@ -431,6 +430,8 @@ const AuthTorus = ({ screenProps, navigation, styles, store }) => {
}
const getStylesFromProps = ({ theme }) => {
+ const buttonFontSize = normalizeText(isSmallDevice ? 13 : 16)
+
return {
mainWrapper: {
paddingHorizontal: 0,
@@ -466,7 +467,7 @@ const getStylesFromProps = ({ theme }) => {
marginRight: getDesignRelativeWidth(10, false),
},
buttonText: {
- fontSize: normalizeText(isSmallDevice ? 13 : 16),
+ fontSize: buttonFontSize,
},
acceptTermsLink: {
marginTop: getDesignRelativeHeight(theme.sizes.default),
@@ -494,7 +495,6 @@ const getStylesFromProps = ({ theme }) => {
},
}
}
-
const auth = withStyles(getStylesFromProps)(SimpleStore.withStore(AuthTorus))
auth.navigationOptions = {
title: 'Auth',
| 13 |
diff --git a/client/GameComponents/StrongholdRow.jsx b/client/GameComponents/StrongholdRow.jsx @@ -14,7 +14,7 @@ class StrongholdRow extends React.Component {
player &&
<img
className={ `card-image imperial-favor ${ this.props.cardSize } ${player.imperialFavor ? '' : 'hidden'} ` }
- src={ '/img/' + (player.imperialFavor ? player.imperialFavor : 'political') + '-favor.png' }
+ src={ '/img/' + (player.imperialFavor ? player.imperialFavor : 'political') + '-favor.jpg' }
/>
}
</div>
| 4 |
diff --git a/edit.js b/edit.js @@ -1613,6 +1613,109 @@ const _tickPlanetAnimation = factor => {
}
}; */
+const cometFireMesh = (() => {
+ const radius = 1;
+ const opacity = 0.5;
+ const _makeSphereGeometry = (radius, color, position, scale) => {
+ const geometry = new THREE.SphereBufferGeometry(radius, 8, 5);
+ // .applyMatrix4(new THREE.Matrix4().makeTranslation(0, radius/2, 0));
+ /* for (let i = 0; i < cometFireGeometry.attributes.position.array.length; i += 3) {
+ if (cometFireGeometry.attributes.position.array[i+1] > 0) {
+ cometFireGeometry.attributes.position.array[i] *= (1 + cometFireGeometry.attributes.position.array[i+1]);
+ cometFireGeometry.attributes.position.array[i+2] *= (1 + cometFireGeometry.attributes.position.array[i+1]);
+ }
+ } */
+ for (let i = 0; i < geometry.attributes.position.array.length; i += 3) {
+ if (geometry.attributes.position.array[i+1] > 0) {
+ geometry.attributes.position.array[i] = Math.sign(geometry.attributes.position.array[i]);
+ geometry.attributes.position.array[i+2] = Math.sign(geometry.attributes.position.array[i+2]);
+ }
+ }
+
+ geometry
+ .applyMatrix4(new THREE.Matrix4().makeTranslation(position.x, position.y, position.z))
+ .applyMatrix4(new THREE.Matrix4().makeScale(scale.x, scale.y, scale.z))
+
+ const c = new THREE.Color(color);
+ const colors = new Float32Array(geometry.attributes.position.array.length);
+ for (let i = 0; i < colors.length; i += 3) {
+ c.toArray(colors, i);
+ }
+ geometry.setAttribute('color', new THREE.BufferAttribute(colors, 3));
+
+ return geometry;
+ };
+ const cometFireGeometry = BufferGeometryUtils.mergeBufferGeometries([
+ _makeSphereGeometry(radius, 0x5c6bc0, new THREE.Vector3(0, 0.9, 0), new THREE.Vector3(0.8, 10, 0.8)),
+ _makeSphereGeometry(radius, 0xef5350, new THREE.Vector3(0, 0.7, 0), new THREE.Vector3(1.5, 5, 1.5)),
+ _makeSphereGeometry(radius, 0xffa726, new THREE.Vector3(0, 0, 0), new THREE.Vector3(1, 1, 1)),
+ ]);
+ /* const ys = new Float32Array(cometFireGeometry.attributes.position.array.length/3);
+ for (let i = 0; i < cometFireGeometry.attributes.position.array.length/3; i++) {
+ ys[i] = 1-(-radius/2 - cometFireGeometry.attributes.position.array[i*3+1]/radius);
+ }
+ cometFireGeometry.setAttribute('y', new THREE.BufferAttribute(ys, 1)); */
+ const cometFireMaterial = new THREE.ShaderMaterial({
+ uniforms: {
+ uAnimation: {
+ type: 'f',
+ value: 0,
+ },
+ },
+ vertexShader: `\
+ #define PI 3.1415926535897932384626433832795
+
+ uniform float uAnimation;
+ attribute vec3 color;
+ attribute float y;
+ attribute vec3 barycentric;
+ // varying float vY;
+ varying vec2 vUv;
+ varying float vOpacity;
+ varying vec3 vColor;
+ void main() {
+ // vY = y * ${opacity.toFixed(8)};
+ // vUv = uv.x + uAnimation;
+ vUv = uv;
+ // vOpacity = 0.8 + 0.2 * (sin(uAnimation*5.0*PI*2.0)+1.0)/2.0;
+ // vOpacity *= 1.0-(uv.y/0.5);
+ // vOpacity = (0.5 + 0.5 * (sin(uv.x*PI*2.0/0.05) + 1.0)/2.0) * (0.3 + 1.0-uv.y/0.5);
+ /* vec3 p = position;
+ if (p.y > 0.0) {
+ p.x = sign(p.x) * 1.0;
+ p.z = sign(p.z) * 1.0;
+ } */
+ gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
+ vColor = color;
+ }
+ `,
+ fragmentShader: `\
+ #define PI 3.1415926535897932384626433832795
+
+ uniform float uAnimation;
+ uniform sampler2D uCameraTex;
+ // varying float vY;
+ varying vec2 vUv;
+ varying float vOpacity;
+ varying vec3 vColor;
+
+ void main() {
+ vec3 c2 = vColor * (2.0-vUv.y/0.5);
+ float a = 0.2 + (0.5 + 0.5 * pow((sin((vUv.x + uAnimation) *PI*2.0/0.1) + 1.0)/2.0, 2.0)) * (1.0-vUv.y/0.5);
+ gl_FragColor = vec4(c2, a);
+ }
+ `,
+ side: THREE.DoubleSide,
+ transparent: true,
+ depthWrite: false,
+ });
+ const cometFireMesh = new THREE.Mesh(cometFireGeometry, cometFireMaterial);
+ cometFireMesh.position.y = 1;
+ cometFireMesh.frustumCulled = false;
+ return cometFireMesh;
+})();
+scene.add(cometFireMesh);
+
const velocity = new THREE.Vector3();
const lastGrabs = [false, false];
const lastAxes = [[0, 0], [0, 0]];
@@ -1635,6 +1738,7 @@ function animate(timestamp, frame) {
for (let i = 0; i < remoteChunkMeshes.length; i++) {
remoteChunkMeshes[i].material[0].uniforms.uTime.value = (Date.now() % timeFactor) / timeFactor;
}
+ cometFireMesh.material.uniforms.uAnimation.value = (Date.now() % 2000) / 2000;
const session = renderer.xr.getSession();
if (session) {
| 0 |
diff --git a/articles/migrations/index.md b/articles/migrations/index.md @@ -23,6 +23,51 @@ If you need help with the migration, create a ticket in our [Support Center](htt
## Current Migrations
Current migrations are listed below, newest first. For migrations that have already been enabled see [Past Migrations](#past-migrations).
+### Whitelisting IP Address Ranges
+
+| Severity | Grace Period Start | Mandatory Opt-In|
+| --- | --- | --- |
+| Low | 2011-01-15 | 2017-01-31 |
+
+Auth0 is expanding into new US regions, and traffic originating from these regions will have new IP addresses. If you are whitelisting IP addresses, you will need to add the new addresses to your firewall rules.
+
+#### Am I affected by the change?
+
+If you are using a custom database connection, rule, and/or custom email provider that connects to your environment, **and** you have implemented firewall restrictions for IP address ranges, then you are affected by this change. You will need to add the following IP addresses to your firewall rules:
+
+<table>
+ <tr>
+ <td>138.91.154.99</td>
+ <td>54.221.228.15</td>
+ <td>54.183.64.135</td>
+ <td>54.67.77.38</td>
+ </tr>
+ <tr>
+ <td>54.67.15.170</td>
+ <td>54.183.204.205</td>
+ <td>54.173.21.107</td>
+ <td>54.85.173.28</td>
+ </tr>
+ <tr>
+ <td>35.167.74.121</td>
+ <td>35.160.3.103</td>
+ <td>35.166.202.113</td>
+ <td>35.165.143.35</td>
+ </tr>
+ <tr>
+ <td>35.167.53.126</td>
+ <td>35.167.33.107</td>
+ <td>52.14.40.253</td>
+ <td>52.14.38.78</td>
+ </tr>
+ <tr>
+ <td>52.14.17.114</td>
+ <td>52.71.209.77</td>
+ <td>34.195.142.251</td>
+ <td>52.200.94.42</td>
+ </tr>
+</table>
+
### SAML Validations
| Severity | Grace Period Start | Mandatory Opt-In|
| 0 |
diff --git a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js @@ -61,7 +61,6 @@ class AuthenticatedClient extends PublicClient {
deleteLikeMap (mapId, callback) {
const CONFIG_PATH = 'api/v1/viz';
var opts = {
- data: JSON.stringify(mapId),
dataType: 'json'
};
return this.delete([CONFIG_PATH, mapId, 'like'], opts, callback);
| 2 |
diff --git a/articles/api-auth/tutorials/adoption/scope-custom-claims.md b/articles/api-auth/tutorials/adoption/scope-custom-claims.md @@ -69,6 +69,8 @@ This follows a [recommendation from the OIDC specification](https://openid.net/s
If you need to add custom claims to the access token, the same applies but using `context.accessToken` instead.
+Please note that adding custom claims to id tokens trough this method will also let you obtain them when calling the `/userinfo` endpoint. However, rules run when the user is authenticating, not when `/userinfo` is called.
+
## Further reading
<%= include('./_index.md') %>
| 0 |
diff --git a/src/intl/index.js b/src/intl/index.js @@ -64,7 +64,7 @@ const messageFormatCache: {[MessageIdType]: typeof IntlMessageFormat} = {}
function formatMessage (id: MessageIdType, values: ?Object, targetLocale: string): string {
let messageFormat = messageFormatCache[id]
if (!messageFormat) {
- messageFormat = new IntlMessageFormat(getMessage(id, targetLocale), targetLocale)
+ messageFormat = new IntlMessageFormat(getMessage(id, targetLocale), targetLocale, {}, { ignoreTag: true })
messageFormatCache[id] = messageFormat
}
return messageFormat.format(values)
| 8 |
diff --git a/accessibility-checker-engine/src/v2/aria/ARIADefinitions.ts b/accessibility-checker-engine/src/v2/aria/ARIADefinitions.ts @@ -227,7 +227,7 @@ export class ARIADefinitions {
* - reqProps: required states or properties for this role
* - reqChildren: required children for this role
* - htmlEquiv: HTML equivalent for this role
- * - roleType: one of widget, landmark, etc.
+ * - roleType: one of widget, structure, landmark, liveRegion, window (as seen in https://www.w3.org/TR/wai-aria-1.2/#roles_categorization)
* - nameRequired: determines whether an accessible name is required for a widget (see ARIA spec.)
* - nameFrom: determines how an accessible name is supplied (author or content - see ARIA spec.)
*/
@@ -250,7 +250,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "liveRegion"
+ roleType: "liveRegion",
nameRequired: false,
nameFrom: ["author"]
},
@@ -261,7 +261,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "window"
+ roleType: "window",
nameRequired: true,
nameFrom: ["author"]
},
@@ -429,7 +429,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "window"
+ roleType: "window",
nameRequired: true,
nameFrom: ["author"]
},
@@ -649,7 +649,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "liveRegion"
+ roleType: "liveRegion",
nameFrom: ["author"]
},
@@ -669,7 +669,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "liveRegion"
+ roleType: "liveRegion",
nameRequired: true,
nameFrom: ["author"]
},
@@ -964,7 +964,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "liveRegion"
+ roleType: "liveRegion",
nameFrom: ["author"]
},
@@ -1091,7 +1091,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "liveRegion"
+ roleType: "liveRegion",
nameFrom: ["author"]
},
@@ -1101,7 +1101,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "structure"
+ roleType: "structure",
nameFrom: ["author"]
},
@@ -1111,7 +1111,7 @@ export class ARIADefinitions {
reqProps: null,
reqChildren: null,
htmlEquiv: null,
- roleType: "widget", // "structure"
+ roleType: "structure",
nameRequired: true,
nameFrom: ["author", "contents"]
},
| 3 |
diff --git a/stories/index.tsx b/stories/index.tsx @@ -104,6 +104,25 @@ storiesOf('Griddle main', module)
</Griddle>
)
})
+ .add('with Cell events', () => {
+ return (
+ <Griddle
+ data={fakeData}
+ plugins={[LocalPlugin]}
+ components={{
+ CellEnhancer: OriginalComponent =>
+ props => (
+ <OriginalComponent
+ {...props}
+ onClick={() => console.log(`Click ${props.value}`)}
+ onMouseEnter={() => console.log(`MouseEnter ${props.value}`)}
+ onMouseLeave={() => console.log(`MouseLeave ${props.value}`)}
+ />
+ ),
+ }}
+ />
+ );
+ })
.add('with local and sort set', () => {
const sortProperties = [
{ id: 'name', sortAscending: true }
| 0 |
diff --git a/app/models/project_observation.rb b/app/models/project_observation.rb @@ -404,12 +404,12 @@ class ProjectObservation < ActiveRecord::Base
false
end
- def in_project?
+ def in_project?(project = nil)
return true if project.is_new_project?
false
end
- def observed_by_user?
+ def observed_by_user?(user = nil)
return true if project.is_new_project?
false
end
| 1 |
diff --git a/packages/@uppy/robodog/package.json b/packages/@uppy/robodog/package.json "@uppy/form": "file:../form",
"@uppy/google-drive": "file:../google-drive",
"@uppy/instagram": "file:../instagram",
+ "@uppy/facebook": "file:../facebook",
+ "@uppy/onedrive": "file:../onedrive",
"@uppy/status-bar": "file:../status-bar",
"@uppy/transloadit": "file:../transloadit",
"@uppy/url": "file:../url",
| 0 |
diff --git a/src/lib/actions/ActionsSession.js b/src/lib/actions/ActionsSession.js @@ -79,7 +79,9 @@ function verifyAuthToken() {
return signIn(credentials.login, credentials.password);
}
- return request('Get', {returnValueList: 'account', doNotRetry: true}).then((data) => {
+ // We make this request to see if we have a valid authToken, and we only want to retry it if we know we
+ // have credentials to re-authenticate
+ return request('Get', {returnValueList: 'account', doNotRetry: !haveCredentials}).then((data) => {
if (data && data.jsonCode === 200) {
return Ion.merge(IONKEYS.SESSION, data);
}
| 7 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.