code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js @@ -197,7 +197,10 @@ module.exports = class AggregationMapConfigAdapter {
}
_getAggregationMetadata (isVectorOnlyMapConfig, layer, adapted) {
- if (adapted) {
+ if (!adapted) {
+ return { png: false, mvt: false };
+ }
+
if (isVectorOnlyMapConfig) {
return { png: false, mvt: true };
}
@@ -205,9 +208,6 @@ module.exports = class AggregationMapConfigAdapter {
return { png: true, mvt: true };
}
- return { png: false, mvt: false };
- }
-
_getAggregationColumns (aggregation) {
const hasAggregationColumns = aggregation !== undefined &&
typeof aggregation !== 'boolean' &&
| 14 |
diff --git a/lib/assets/core/javascripts/cartodb3/components/scroll/scroll-view.js b/lib/assets/core/javascripts/cartodb3/components/scroll/scroll-view.js @@ -53,16 +53,16 @@ module.exports = CoreView.extend({
});
this._bindScroll();
- this._bindEvents();
+ // this._bindEvents();
},
- _bindEvents: function () {
- this._interval = window.requestAnimationFrame(_.bind(this._onResize, this));
- },
+ // _bindEvents: function () {
+ // this._interval = window.requestAnimationFrame(_.bind(this._onResize, this));
+ // },
- _unbindEvents: function () {
- window.cancelAnimationFrame(this._interval);
- },
+ // _unbindEvents: function () {
+ // window.cancelAnimationFrame(this._interval);
+ // },
_bindScroll: function () {
this._wrapperContainer()
@@ -84,21 +84,21 @@ module.exports = CoreView.extend({
.off('ps-scroll-y', this._bindedCheckShadows);
},
- _onResize: function () {
- var max;
- if (this._type === 'horizontal') {
- max = this._contentContainer().get(0).scrollWidth;
- } else {
- max = this._contentContainer().get(0).scrollHeight;
- }
+ // _onResize: function () {
+ // var max;
+ // if (this._type === 'horizontal') {
+ // max = this._contentContainer().get(0).scrollWidth;
+ // } else {
+ // max = this._contentContainer().get(0).scrollHeight;
+ // }
- if (max !== this._maxScroll) {
- this._maxScroll = max;
- this._checkShadows();
- }
+ // if (max !== this._maxScroll) {
+ // this._maxScroll = max;
+ // this._checkShadows();
+ // }
- this._interval = window.requestAnimationFrame(_.bind(this._onResize, this));
- },
+ // this._interval = window.requestAnimationFrame(_.bind(this._onResize, this));
+ // },
_checkShadows: function () {
var currentPos;
@@ -129,7 +129,7 @@ module.exports = CoreView.extend({
destroyScroll: function () {
this._unbindScroll();
- this._unbindEvents();
+ // this._unbindEvents();
Ps.destroy(this._wrapperContainer().get(0));
},
| 2 |
diff --git a/src/app/controllers/Marlin/MarlinController.js b/src/app/controllers/Marlin/MarlinController.js @@ -577,7 +577,7 @@ class MarlinController {
this.controller.on('pos', (res) => {
log.silly(`controller.on('pos'): source=${this.history.writeSource}, line=${JSON.stringify(this.history.writeLine)}, res=${JSON.stringify(res)}`);
- if (_.includes(['client', 'feeder'], this.history.writeSource)) {
+ if (_.includes([WRITE_SOURCE_CLIENT, WRITE_SOURCE_FEEDER], this.history.writeSource)) {
this.emit('serialport:read', res.raw);
}
});
@@ -585,7 +585,7 @@ class MarlinController {
this.controller.on('temperature', (res) => {
log.silly(`controller.on('temperature'): source=${this.history.writeSource}, line=${JSON.stringify(this.history.writeLine)}, res=${JSON.stringify(res)}`);
- if (_.includes(['client', 'feeder'], this.history.writeSource)) {
+ if (_.includes([WRITE_SOURCE_CLIENT, WRITE_SOURCE_FEEDER], this.history.writeSource)) {
this.emit('serialport:read', res.raw);
}
});
@@ -594,7 +594,7 @@ class MarlinController {
log.silly(`controller.on('ok'): source=${this.history.writeSource}, line=${JSON.stringify(this.history.writeLine)}, res=${JSON.stringify(res)}`);
if (res) {
- if (_.includes(['client', 'feeder'], this.history.writeSource)) {
+ if (_.includes([WRITE_SOURCE_CLIENT, WRITE_SOURCE_FEEDER], this.history.writeSource)) {
this.emit('serialport:read', res.raw);
} else if (!this.history.writeSource) {
this.emit('serialport:read', res.raw);
| 14 |
diff --git a/components/maplibre/ban-map/layers.js b/components/maplibre/ban-map/layers.js import theme from '@/styles/theme'
+import {positionsColors} from '@/components/base-adresse-nationale/positions'
export const sources = {
bal: {name: 'Base Adresse Locale', color: '#4dac26'},
@@ -39,6 +40,14 @@ const TOPONYME_MAX = NUMEROS_MIN + 2
const TOPONYME_COLOR = '#7c5050'
export const PARCELLES_MINZOOM = 14
+const getColors = () => {
+ const array = []
+ Object.keys(positionsColors).forEach(key => {
+ array.push(key, positionsColors[key].color)
+ })
+
+ return [...array]
+}
export const adresseCircleLayer = {
id: 'adresse',
source: 'base-adresse-nationale',
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,62 @@ 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.52.0] -- 2020-01-08
+
+### Added
+- Add `uniformtext` behavior to `bar`, `funnel`, `waterfall`, `pie`, `funnelarea`,
+ `sunburst` and `treemap` traces [#4420, #4444, #4469]
+- Add "pre-computed" q1/median/q3 input signature for `box` traces [#4432]
+- Add support for legend titles [#4386]
+- Add legend items for `choropleth`, `choroplethmapbox`, `cone`, `densitymapbox`,
+ `heatmap`, `histogram2d`, `isosurface`, `mesh3d`, `streamtube`,
+ `surface`, `volume` traces [#4386, #4441]
+- Add "auto-fitting" behavior to geo subplots via `geo.fitbounds` attribute [#4419]
+- Add support for custom geojson geometries in `choropleth`
+ and `scattergeo` traces [#4419]
+- Add "exclusive" and "inclusive" quartile-computing algorithm to `box` traces
+ via `quartilemethod` attribute [#4432]
+- Add `insidetextorientation` attribute to `pie` and `sunburst` traces [#4420]
+- Add `intensitymode` to allow cell intensity values in `mesh3d` traces [#4446]
+- Add `featureidkey` attribute to `choroplethmapbox`, `choropleth`
+ and `scattergeo` traces [#4419]
+- Add `geo.visible` shortcut attribute [#4419]
+- Add coordinates of mapbox subplot view as a derived property in `plotly_relayout`
+ event data [#4413]
+- Add modebar buttons `zoomInMapbox` and `zoomOutMapbox` [#4398]
+- Add support for typed array in `groupby` transforms `groups` [#4410]
+- Add `notifyOnLogging` config option that allows log/warn/error messages
+ to show up in notifiers pop-ups [#4464]
+- Enable loading locale bundles before plotly.js bundles [#4453]
+- Add Korean `ko` locale [#4315]
+
+### Changed
+- Skip mapbox subplot map position updates while panning/zooming removing
+ potential stuttering [#4418]
+- Optimize mapbox `raster` layout layer updates [#4418]
+- Improve `sunburst` and `treemap` click events behavior [#4454]
+- Improve attribute description of sunburst/treemap `outsidetextfont` [#4463]
+- Update source and dist file headers to 2020 [#4457]
+
+### Fixed
+- Fix `streamtube` traces with numeric string coordinates
+ (bug introduced in 1.51.0) [#4431]
+- Correctly handle different data orders in `isosurface` and `volume` traces [#4431]
+- Fix symbol numbers in `scattergl` and `splom` traces [#4465]
+- Fix `coloraxis` colorbars for `sunburst` and `treemap` with
+ values colorscales [#4444]
+- Fix inside text fitting for `bar`, `funnel` and `waterfall` traces with
+ set `textangle` [#4444]
+- Fix handling of invalid values and zero totals for `pie` and `funnelarea` [#4416]
+- Fix colorbar of `reversescale` colorscales of heatmap-coloring contours [#4437]
+- Fix colorbar templating for "non-root" colorscales [#4470]
+- Fix event data and some hover templates for x/y/z heatmap + contour [#4472]
+- Fix "toggleothers" behavior for graphs with traces not in legend [#4406]
+- Fix `histogram` bingroup logic when `calendars` module is not registered [#4439]
+- Fix "almost equal" `branchvalue: 'total'` partial sum cases [#4442]
+- Fix handling of `treemap` `pathbar.textfont` [#4444]
+
+
## [1.51.3] -- 2019-12-16
### Fixed
| 3 |
diff --git a/source/touch/Tap.js b/source/touch/Tap.js @@ -46,6 +46,7 @@ class TrackedTouch {
}
view = view.get( 'parentView' );
}
+ this.timestamp = Date.now();
this.x = x;
this.y = y;
this.target = target;
@@ -100,7 +101,7 @@ const getParents = function ( node ) {
while ( node ) {
parents.push( node );
node = node.parentNode;
- };
+ }
parents.reverse();
return parents;
};
@@ -180,11 +181,14 @@ export default new Gesture({
let target =
document.elementFromPoint( touch.clientX, touch.clientY );
const initialTarget = trackedTouch.target;
+ const duration = Date.now() - trackedTouch.timestamp;
if ( target !== initialTarget ) {
target = getCommonAncestor( target, initialTarget );
}
if ( target ) {
- const tapEvent = new TapEvent( 'tap', target );
+ const tapEvent = new TapEvent( 'tap', target, {
+ duration,
+ });
ViewEventsController.handleEvent( tapEvent );
const clickEvent = new TapEvent( 'click', target );
clickEvent.defaultPrevented = tapEvent.defaultPrevented;
| 0 |
diff --git a/core/connection.js b/core/connection.js @@ -693,12 +693,6 @@ Blockly.Connection.prototype.checkType_ = function(otherConnection) {
}
return this.checkBoundVariables(otherConnection);
}
- if (!this.typeExpr && otherConnection.typeExpr) {
- return false;
- }
- if (this.typeExpr && !otherConnection.typeExpr) {
- return false;
- }
if (!this.check_ || !otherConnection.check_) {
// One or both sides are promiscuous enough that anything will fit.
return true;
| 2 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -2248,8 +2248,9 @@ axes.draw = function(gd, arg, opts) {
var axList = (!arg || arg === 'redraw') ? axes.listIds(gd) : arg;
- // TODO: could be stored be stored in the x axis (ax._counterAx)? - {x: {left: ..., right: ...}}
- var shiftConstant = 60;
+ var fullAxList = axes.list(gd)
+ var overlayingShiftedAx = fullAxList.filter(ax => ax['shift'] === true).map(ax => ax['overlaying']);
+
var axShifts = {'false': {'left': 0, 'right': 0}};
return Lib.syncOrAsync(axList.map(function(axId) {
@@ -2257,15 +2258,16 @@ axes.draw = function(gd, arg, opts) {
if(!axId) return;
var ax = axes.getFromId(gd, axId);
- if(ax.shift === true) {
- axShifts = incrementShift(ax, shiftConstant, axShifts);
- }
if(!opts) opts = {};
opts.axShifts = axShifts;
+ opts.overlayingShiftedAx = overlayingShiftedAx;
var axDone = axes.drawOne(gd, ax, opts);
+ if(ax._shiftPusher) {
+ axShifts = incrementShift(ax, ax._fullDepth, axShifts);
+ }
ax._r = ax.range.slice();
ax._rl = Lib.simpleMap(ax._r, ax.r2l);
@@ -2318,9 +2320,11 @@ axes.drawOne = function(gd, ax, opts) {
// this happens when updating matched group with 'missing' axes
if(!mainPlotinfo) return;
-
// Only set if it hasn't been defined from drawing previously
ax._shift = ax._shift === undefined ? setShiftVal(ax, axShifts) : ax._shift;
+ // Will this axis 'push' out other axes?
+ ax._shiftPusher = opts.overlayingShiftedAx.includes(ax._id) || opts.overlayingShiftedAx.includes(ax.overlaying) || ax.shift === true;
+ ax._fullDepth = 60;
var mainAxLayer = mainPlotinfo[axLetter + 'axislayer'];
var mainLinePosition = ax._mainLinePosition;
@@ -4229,14 +4233,16 @@ function hideCounterAxisInsideTickLabels(ax, opts) {
}
function incrementShift(ax, shiftVal, axShifts) {
+ // Need to set 'overlay' for anchored axis
+ var overlay = ((ax.anchor !== 'free') && ((ax.overlaying === undefined) || (ax.overlaying === false))) ? ax._id : ax.overlaying;
var shiftValAdj = ax.side === 'right' ? shiftVal : -shiftVal;
- if(!(ax.overlaying in axShifts)) {
- axShifts[ax.overlaying] = {};
+ if(!(overlay in axShifts)) {
+ axShifts[overlay] = {};
}
- if(!(ax.side in axShifts[ax.overlaying])) {
- axShifts[ax.overlaying][ax.side] = 0;
+ if(!(ax.side in axShifts[overlay])) {
+ axShifts[overlay][ax.side] = 0;
}
- axShifts[ax.overlaying][ax.side] += shiftValAdj;
+ axShifts[overlay][ax.side] += shiftValAdj;
return axShifts;
}
| 12 |
diff --git a/src/ServerlessOffline.js b/src/ServerlessOffline.js @@ -21,7 +21,7 @@ export default class ServerlessOffline {
this._cliOptions = cliOptions
this._provider = serverless.service.provider
this._service = serverless.service
- this._version = serverless.version
+ this._serverless = serverless
setLog((...args) => serverless.cli.log(...args))
@@ -326,7 +326,7 @@ export default class ServerlessOffline {
// TODO: missing tests
_verifyServerlessVersionCompatibility() {
- const currentVersion = this._version
+ const currentVersion = this._serverless.version
const requiredVersionRange = pkg.peerDependencies.serverless
const versionIsSatisfied = satisfiesVersionRange(
| 2 |
diff --git a/package.json b/package.json "scripts": {
"build": "babel src --out-dir .",
"dev": "babel src --out-dir ${WEBAPP_DIR:-../mattermost-webapp}/node_modules/mattermost-redux",
- "dev:watch": "babel --watch src --out-dir ${WEBAPP_DIR:-../mattermost-webapp/node_modules/mattermost-redux}",
+ "dev:watch": "babel --watch src --out-dir ${WEBAPP_DIR:-../mattermost-webapp}/node_modules/mattermost-redux",
"check": "node_modules/.bin/eslint --ext \".js\" --ignore-pattern node_modules --quiet .",
"test": "NODE_ENV=test mocha --opts test/mocha.opts",
"test-no-mock": "TEST_SERVER=1 NOCK_OFF=true NODE_ENV=test mocha --opts test/mocha.opts",
| 1 |
diff --git a/src/editor/util/xrefHelpers.js b/src/editor/util/xrefHelpers.js import { includes, map, orderBy } from 'substance'
-export const XREF_TARGET_TYPES = {
- 'fn': ['fn'],
- 'fig': ['fig', 'fig-group'],
- 'bibr': ['ref'],
- 'table': ['table-wrap']
+// left side: node type
+// right side: ref-type
+export const REF_TYPES = {
+ 'fig': 'fig',
+ 'fig-group': 'fig',
+ 'fn': 'fn',
+ 'ref': 'bibr',
+ 'table-wrap': 'table'
}
+export const XREF_TARGET_TYPES = Object.keys(REF_TYPES).reduce((m, type) => {
+ const refType = REF_TYPES[type]
+ if (!m[refType]) m[refType] = []
+ m[refType].push(type)
+ return m
+}, {})
+
export function getXrefTargets(xref) {
let idrefs = xref.getAttribute('rid')
if (idrefs) {
| 7 |
diff --git a/.cloudbuild/pr-tests-windshaft.yaml b/.cloudbuild/pr-tests-windshaft.yaml @@ -148,7 +148,7 @@ steps:
--env-file .env \
gcr.io/cartodb-on-gcp-main-artifacts/tavern-tester:latest \
all dev
- echo $? >> /workspace/dev_result
+ echo $? >> dev_result
# Stop dev services and volumes
- name: 'docker/compose:1.28.0'
@@ -199,7 +199,7 @@ steps:
--env-file .env \
gcr.io/cartodb-on-gcp-main-artifacts/tavern-tester:latest \
all onprem
- echo $? >> /workspace/onprem_result
+ echo $? >> onprem_result
# Handle exit code
- name: ubuntu
@@ -207,13 +207,13 @@ steps:
args:
- -x
- |
- if [ "$(cat /workspace/dev_result)" -eq 0 ] && [ "$(cat /workspace/onprem_result)" -eq 0 ];then
+ if [ "$(cat /workspace/docker-dev-env/dev_result)" -eq 0 ] && [ "$(cat /workspace/dockerize-onpremises/onprem_result)" -eq 0 ];then
[PASSED] All tests passed
exit 0
- elif [ "$(cat /workspace/dev_result)" -ne 0 ];then
+ elif [ "$(cat /workspace/docker-dev-env/dev_result)" -ne 0 ];then
[FAILED] Development environment tests failed
exit 1
- elif [ "$(cat /workspace/onprem_result)" -ne 0 ];then
+ elif [ "$(cat /workspace/dockerize-onpremises/onprem_result)" -ne 0 ];then
[FAILED] Onprem tests failed
exit 1
else
@@ -221,7 +221,7 @@ steps:
exit 1
fi
-timeout: 1200s
+timeout: 1800s
images:
- ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}--${SHORT_SHA}
- ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}
| 12 |
diff --git a/effects.d.ts b/effects.d.ts @@ -2,12 +2,14 @@ import {Action} from "redux";
import {Channel, Task, Buffer, Predicate} from "./types";
import {SagaIterator, END} from "./index";
+type ActionType = string | number | symbol;
+
interface StringableActionCreator {
(...args: any[]): Action;
toString(): string;
}
-type SubPattern<T> = string | StringableActionCreator | Predicate<T>
+type SubPattern<T> = ActionType | StringableActionCreator | Predicate<T>
export type Pattern<T> = SubPattern<T> | SubPattern<T>[];
| 11 |
diff --git a/README.md b/README.md @@ -740,7 +740,7 @@ To add a custom pre- or post-render action, all you need to do is to create a at
// mymodule.js
module.exports = (job, settings, action, type) => {
console.log('hello from my module: ' + action.module);
- return Promose.resolve();
+ return Promise.resolve();
}
```
| 1 |
diff --git a/accessibility-checker-engine/src/v4/rules/element_lang_valid.ts b/accessibility-checker-engine/src/v4/rules/element_lang_valid.ts @@ -70,14 +70,14 @@ export let html_lang_valid: Rule = {
"Fail_2": "Specified 'lang' attribute does not conform to BCP 47",
"Fail_3": "Specified 'xml:lang' attribute does not include a valid primary language",
"Fail_4": "Specified 'xml:lang' attribute does not conform to BCP 47",
- "group": "The language of content must be valid and specified in accordance with BCP 47"
+ "group": "The default human language of the page must be valid and specified in accordance with BCP 47"
}
},
rulesets: [{
"id": ["IBM_Accessibility", "WCAG_2_1", "WCAG_2_0"],
"num": ["3.1.1"],
"level": eRulePolicy.VIOLATION,
- "toolkitLevel": eToolkitLevel.LEVEL_THREE
+ "toolkitLevel": eToolkitLevel.LEVEL_ONE
}],
act: [{
"b5c3f8": {
@@ -126,7 +126,7 @@ export let element_lang_valid: Rule = {
"Fail_2": "Specified 'lang' attribute does not conform to BCP 47",
"Fail_3": "Specified 'xml:lang' attribute does not include a valid primary language",
"Fail_4": "Specified 'xml:lang' attribute does not conform to BCP 47",
- "group": "The language of content must be valid and specified in accordance with BCP 47"
+ "group": "The change in language of specific content must be valid and specified in accordance with BCP 47"
}
},
rulesets: [{
| 3 |
diff --git a/src/main/minio.js b/src/main/minio.js @@ -1816,6 +1816,7 @@ export class Client {
if (this.sessionToken) {
postPolicy.policy.conditions.push(['eq', '$x-amz-security-token', this.sessionToken])
+ postPolicy.formData['x-amz-security-token'] = this.sessionToken
}
var policyBase64 = Buffer.from(JSON.stringify(postPolicy.policy)).toString('base64')
| 0 |
diff --git a/website/template.html b/website/template.html @@ -69,7 +69,8 @@ WebFontConfig = {
</div> <!-- site-top-nav -->
</div> <!-- site-top -->
<div id="site-dummy-github" style="position:relative">
-<a href="https://github.com/svaarala/duktape"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
+<a href="https://github.com/svaarala/duktape" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>
+<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
</div>
<div id="site-middle">
<div id="site-middle-nav">
| 14 |
diff --git a/SearchbarNavImprovements.user.js b/SearchbarNavImprovements.user.js // @description Searchbar & Nav Improvements. Advanced search helper when search box is focused. Bookmark any search for reuse (stored locally, per-site).
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 4.9.5
+// @version 4.9.6
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
.after(`<option data-url="${metaUrl}/search">Meta ${mainName}</option>`);
}
+ // Move new svg search icon before the search field
+ $('#search .svg-icon.s-input-icon__search.iconSearch').insertBefore('#search input[name="q"]');
+
// New left navigation, link to parent/meta site
if(isChildMeta) {
lsidebar.find('.pl8').removeClass('pl8');
| 5 |
diff --git a/app/builtin-pages/views/library-view.js b/app/builtin-pages/views/library-view.js @@ -342,6 +342,14 @@ async function gotoFileEditor (filePath) {
onOpenFileEditor()
}
+function resolvePaymentLink (archiveUrl, paymentLink) {
+ if (paymentLink.indexOf('://') === -1) {
+ const shouldAddSlash = !archiveUrl.endsWith('/') && !paymentLink.startsWith('/')
+ return `${archiveUrl}${shouldAddSlash ? '/' : ''}${paymentLink}`
+ }
+ return paymentLink
+}
+
// rendering
// =
@@ -835,6 +843,11 @@ function renderReadmeHint () {
</div>`
}
+function renderDonationLink (archiveUrl, paymentLink) {
+ const url = resolvePaymentLink(archiveUrl, paymentLink)
+ return yo`<a href=${url}>${url}</a>`
+}
+
function renderSettingsView () {
const isOwner = _get(archive, 'info.isOwner')
@@ -1019,7 +1032,7 @@ function renderSettingsView () {
</p>
`
: paymentLink
- ? yo`<p><a href=${paymentLink}>${paymentLink}</a></p>`
+ ? yo`<p>${renderDonationLink(archive.url, paymentLink)}</p>`
: yo`<p><em>No link provided.</em></p>`
}
</div>
| 9 |
diff --git a/src/views/ProviderView/AuthView.js b/src/views/ProviderView/AuthView.js @@ -3,7 +3,9 @@ const { h, Component } = require('preact')
class AuthBlock extends Component {
componentDidMount () {
- this.connectButton.focus()
+ setTimeout(() => {
+ this.connectButton.focus({ preventScroll: true })
+ }, 150)
}
render () {
| 1 |
diff --git a/src/component/child/index.js b/src/component/child/index.js @@ -7,7 +7,7 @@ import { SyncPromise as Promise } from 'sync-browser-mocks/src/promise';
import { BaseComponent } from '../base';
import { getParentComponentWindow, getComponentMeta, getParentDomain, getParentRenderWindow, isXComponentWindow } from '../window';
import { extend, onCloseWindow, deserializeFunctions, get, onDimensionsChange, trackDimensions, dimensionsMatchViewport,
- cycle, getDomain, globalFor, setLogLevel } from '../../lib';
+ cycle, getDomain, globalFor, setLogLevel, getElement } from '../../lib';
import { POST_MESSAGE, CONTEXT_TYPES, CLOSE_REASONS, INITIAL_PROPS } from '../../constants';
import { normalizeChildProps } from './props';
@@ -302,12 +302,27 @@ export class ChildComponent extends BaseComponent {
height = true;
}
- return { width, height };
+ let element;
+
+ if (autoResize.element) {
+ element = getElement(autoResize.element);
+ }
+
+ if (!element) {
+ // Believe me, I struggled. There's no other way.
+ if (window.navigator.userAgent.match(/MSIE (9|10)\./)) {
+ element = document.body;
+ } else {
+ element = document.documentElement;
+ }
+ }
+
+ return { width, height, element };
}
watchForResize() {
- let { width, height } = this.getAutoResize();
+ let { width, height, element } = this.getAutoResize();
if (!width && !height) {
return;
@@ -321,13 +336,6 @@ export class ChildComponent extends BaseComponent {
return;
}
- let el = document.documentElement;
-
- // Believe me, I struggled. There's no other way.
- if (window.navigator.userAgent.match(/MSIE (9|10)\./)) {
- el = document.body;
- }
-
if (this.watchingForResize) {
return;
}
@@ -336,15 +344,15 @@ export class ChildComponent extends BaseComponent {
return Promise.try(() => {
- if (!dimensionsMatchViewport(el, { width, height })) {
- return this.resizeToElement(el, { width, height });
+ if (!dimensionsMatchViewport(element, { width, height })) {
+ return this.resizeToElement(element, { width, height });
}
}).then(() => {
return cycle(() => {
- return onDimensionsChange(el, { width, height }).then(dimensions => {
- return this.resizeToElement(el, { width, height });
+ return onDimensionsChange(element, { width, height }).then(dimensions => {
+ return this.resizeToElement(element, { width, height });
});
});
});
| 11 |
diff --git a/src/client/js/components/Admin/SlackIntegration/OfficialbotSettingsAccordion.jsx b/src/client/js/components/Admin/SlackIntegration/OfficialbotSettingsAccordion.jsx @@ -16,16 +16,13 @@ const OfficialBotSettingsAccordion = (props) => {
const { t } = useTranslation();
const { appContainer } = props;
const growiUrl = appContainer.config.crowi.url;
- const currentBotType = 'customBotWithoutProxy';
+ // const currentBotType = 'customBotWithoutProxy';
const updateProxyUrl = async(proxyUri) => {
try {
- const res = await appContainer.apiv3.put('/slack-integration-settings/proxy-uri', {
+ await appContainer.apiv3.put('/slack-integration-settings/proxy-uri', {
proxyUri,
- currentBotType,
});
- console.log('res', res);
- // const { siteUrlSettingParams } = res.data;
toastSuccess(t('toaster.update_successed', { target: t('Proxy URL') }));
}
catch (err) {
@@ -129,7 +126,7 @@ const OfficialBotSettingsAccordion = (props) => {
<AdminUpdateButtonRow
disabled={false}
// TODO: Add Proxy URL submit logic
- onClick={() => updateProxyUrl('ProxyUrl')}
+ onClick={() => updateProxyUrl('https://www.google.com/')}
/>
</div>
</Accordion>
| 7 |
diff --git a/userscript.user.js b/userscript.user.js @@ -21772,7 +21772,7 @@ var $$IMU_EXPORT$$;
url: tmatch[1],
is_original: true,
extra: {
- page: result.finalUrl
+ page: urljoin(result.finalUrl + "/", tmatch[1].replace(/.*\/([^/.]*).*?$/, "$1"), true)
}
});
}
| 7 |
diff --git a/ui/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js @@ -1389,7 +1389,7 @@ export default createComponent({
filter, updateMenuPosition, updateInputValue,
isOptionSelected,
getEmittingOptionValue,
- isOptionDisabled: (...args) => isOptionDisabled.value.apply(null, args),
+ isOptionDisabled: (...args) => isOptionDisabled.value.apply(null, args) === true,
getOptionValue: (...args) => getOptionValue.value.apply(null, args),
getOptionLabel: (...args) => getOptionLabel.value.apply(null, args)
})
| 1 |
diff --git a/config/categories.js b/config/categories.js @@ -119,29 +119,29 @@ window.categories = [
_('ticketing'),
_('coworking'),
_('pitch'),
- _('football_pitch'),
- _('boules_pitch'),
- _('basketball_pitch'),
- _('rugby_pitch'),
- _('tennis_pitch'),
- _('skateboard_pitch'),
- _('table_tennis_pitch'),
- _('equestrian_pitch'),
- _('running_track'),
- _('sports_hall'),
- _('sport_climbing'),
- _('sport_martial_art'),
- _('sport_badminton'),
- _('sport_baseball'),
- _('sport_beach_volley_ball'),
- _('sport_golf'),
- _('sport_handball'),
- _('sport_ice_skating'),
- _('sport_karting'),
- _('sport_motor'),
- _('sport_skiing'),
- _('sport_volleyball'),
- _('sport_sailing'),
+ _('soccer pitch'),
+ _('boules pitch'),
+ _('basketball pitch'),
+ _('rugby pitch'),
+ _('tennis pitch'),
+ _('skateboard pitch'),
+ _('table tennis pitch'),
+ _('equestrian pitch'),
+ _('running track'),
+ _('sports hall'),
+ _('climbing'),
+ _('martial art'),
+ _('badminton'),
+ _('baseball'),
+ _('beach-volley'),
+ _('golf'),
+ _('handball'),
+ _('ice skating'),
+ _('karting'),
+ _('car circuit'),
+ _('skiing'),
+ _('volleyball'),
+ _('sailing'),
_('stadium'),
_('viewpoint'),
];
| 4 |
diff --git a/python/ccxtpro/base/cache.py b/python/ccxtpro/base/cache.py @@ -15,7 +15,6 @@ class ArrayCache(list):
# all method lookups obey the descriptor protocol
# this is how the implicit api is defined in ccxt under the hood
__iter__ = Delegate('__iter__')
- __getitem__ = Delegate('__getitem__')
__setitem__ = Delegate('__setitem__')
__delitem__ = Delegate('__delitem__')
__len__ = Delegate('__len__')
@@ -38,3 +37,11 @@ class ArrayCache(list):
def __add__(self, other):
return list(self) + other
+
+ def __getitem__(self, item):
+ deque = super(list, self).__getattribute__('_deque')
+ if isinstance(item, slice):
+ start, stop, step = item.indices(len(deque))
+ return [deque[i] for i in range(start, stop, step)]
+ else:
+ return deque[item]
| 1 |
diff --git a/react/src/components/masthead/components/SprkMastheadBigNav/SprkMastheadBigNav.js b/react/src/components/masthead/components/SprkMastheadBigNav/SprkMastheadBigNav.js @@ -99,9 +99,11 @@ SprkMastheadBigNav.propTypes = {
/** Used to render navigation inside. */
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. */
+ /** Additional classes to apply to the container of the link. */
additionalContainerClasses: PropTypes.string,
/** Adds a class if the link is active. */
isActive: PropTypes.bool,
| 7 |
diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js @@ -185,7 +185,8 @@ export function stringifyPath(path) {
}
break;
case "right-panel":
- // Ignore right-panel in url
+ case "sso":
+ // Do not put these segments in URL
continue;
default:
urlPath += `/${segment.type}`;
| 8 |
diff --git a/src/utils/utils.js b/src/utils/utils.js @@ -82,8 +82,6 @@ export const validateLaterTime = (laterTime, previousTime) => getTimeAsNumber(la
export const validateLaterOrEqualTime = (laterTime, previousTime) => getTimeAsNumber(laterTime) >= getTimeAsNumber(previousTime)
-export const validateRate = (rate) => isNaN(Number(rate)) === false && Number(rate) > 0
-
export const validateAddress = (address) => !(!address || address.length !== 42)
export function toFixed(x) {
| 2 |
diff --git a/source/Overture/views/controls/ButtonView.js b/source/Overture/views/controls/ButtonView.js @@ -115,15 +115,6 @@ var ButtonView = NS.Class({
*/
icon: null,
- /**
- Property: O.ButtonView#tabIndex
- Type: Number
- Default: -1
-
- Overrides default in <O.AbstractControlView#tabIndex>.
- */
- tabIndex: -1,
-
// --- Render ---
/**
| 2 |
diff --git a/config/initializers/zz_patch_reconnect.rb b/config/initializers/zz_patch_reconnect.rb module PostgreSQLAutoReconnectionPatch
# Queries the database and returns the results in an Array-like object
def query(sql, name = nil) #:nodoc:
- wrap_execute(sql, name) do
+ with_auto_reconnect(sql, name) do
super
end
end
@@ -26,36 +26,30 @@ module PostgreSQLAutoReconnectionPatch
# Executes an SQL statement, returning a PGresult object on success
# or raising a PGError exception otherwise.
def execute(sql, name = nil)
- wrap_execute(sql, name) do
+ with_auto_reconnect do
super
end
end
def exec_query(sql, name = 'SQL', binds = [])
- wrap_execute(sql, name, binds) do
+ with_auto_reconnect do
super
end
end
def exec_delete(sql, name = 'SQL', binds = [])
- wrap_execute(sql, name, binds) do
+ with_auto_reconnect do
super
end
end
private
- def wrap_execute(sql, name = "SQL", binds = [])
- with_auto_reconnect do
- yield
- end
- end
-
def with_auto_reconnect
yield
rescue ActiveRecord::StatementInvalid
raise unless @connection.status == PG::CONNECTION_BAD
- raise unless open_transactions == 0
+ raise unless open_transactions.zero?
reconnect!
yield
| 2 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -914,6 +914,13 @@ axes.autoTicks = function(ax, roughDTick) {
// this will also move the base tick off 2000-01-01 if dtick is
// 2 or 3 days... but that's a weird enough case that we'll ignore it.
ax.tick0 = Lib.dateTick0(ax.calendar, true);
+
+ if(/%[uVW]/.test(ax.tickformat)) {
+ // replace Sunday with Monday for ISO and Monday-based formats
+ var len = ax.tick0.length;
+ var lastD = +ax.tick0[len - 1];
+ ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
+ }
} else if(roughX2 > ONEHOUR) {
ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
} else if(roughX2 > ONEMIN) {
| 14 |
diff --git a/src/runtime/html/AsyncStream.js b/src/runtime/html/AsyncStream.js @@ -190,7 +190,9 @@ var proto = (AsyncStream.prototype = {
timeout = AsyncStream.DEFAULT_TIMEOUT;
}
- newStream._stack = AsyncStream.INCLUDE_STACK ? new Error().stack : null;
+ newStream._stack = AsyncStream.INCLUDE_STACK
+ ? getNonMarkoStack(new Error())
+ : null;
newStream.name = name;
if (timeout > 0) {
@@ -422,21 +424,16 @@ var proto = (AsyncStream.prototype = {
},
error: function(e) {
- var stack = this._stack;
var name = this.name;
+ var stack = this._stack;
- var message;
-
- if (name) {
- message = "Render async fragment error (" + name + ")";
- } else {
- message = "Render error";
- }
-
- message += ". Exception: " + (e.stack || e);
+ var message = e instanceof Error ? e.stack : JSON.stringify(e);
- if (stack) {
- message += "\nCreation stack trace: " + stack;
+ if (name || stack) {
+ message +=
+ "\nRendered by" +
+ (name ? " " + name : "") +
+ (stack ? ":\n" + stack : "");
}
e = new Error(message);
@@ -593,3 +590,12 @@ proto.___beginElementDynamic = proto.beginElement;
proto.___endElement = proto.endElement;
module.exports = AsyncStream;
+
+function getNonMarkoStack(error) {
+ return error.stack
+ .toString()
+ .split("\n")
+ .slice(1)
+ .filter(line => !/\/node_modules\/marko\//.test(line))
+ .join("\n");
+}
| 7 |
diff --git a/assets/js/modules/analytics/components/common/AcquisitionPieChart.js b/assets/js/modules/analytics/components/common/AcquisitionPieChart.js @@ -105,6 +105,7 @@ function AcquisitionPieChart( { data, args, source } ) {
key="link"
href={ sourceURI }
inherit
+ external
/>,
}
) }
| 12 |
diff --git a/stories/index.tsx b/stories/index.tsx @@ -461,6 +461,61 @@ storiesOf('Griddle main', module)
}}
/>
})
+ .add('with list row component', () => {
+ // Ported from https://github.com/GriddleGriddle/griddle-docs/blob/429f318778604c5e7500c1c949fe1c3137972419/components/GriddleList.js
+ const CustomRowComponent = connect((state, props) => ({
+ rowData: plugins.LocalPlugin.selectors.rowDataSelector(state, props)
+ }))(({ rowData }) => (
+ <div style={{
+ backgroundColor: "#EEE",
+ border: "1px solid #AAA",
+ padding: 5,
+ margin: "10px 0 10px 0",
+ }}>
+ <h1>{rowData.name}</h1>
+ <ul>
+ <li><strong>State</strong>: {rowData.state}</li>
+ <li><strong>Company</strong>: {rowData.company}</li>
+ </ul>
+ </div>
+ ));
+
+ // HoC for overriding Table component to just render the default TableBody component
+ // We could use this entirely if we wanted and connect and map over visible rows but
+ // Using this + tableBody to take advantange of code that Griddle LocalPlugin already has
+ const CustomTableComponent = OriginalComponent =>
+ class CustomTableComponent extends React.Component<{}, void> {
+ static contextTypes = {
+ components: React.PropTypes.object
+ }
+
+ render() {
+ return <this.context.components.TableBody />
+ }
+ }
+
+ const CustomTableBody = ({ rowIds, Row, style, className }) => (
+ <div style={style} className={className}>
+ { rowIds && rowIds.map(r => <Row key={r} griddleKey={r} />) }
+ </div>
+ );
+
+ return (
+ <Griddle
+ data={fakeData}
+ pageProperties={{
+ pageSize: 5
+ }}
+ plugins={[plugins.LocalPlugin]}
+ components={{
+ Row: CustomRowComponent,
+ TableContainer: CustomTableComponent,
+ TableBody: CustomTableBody,
+ SettingsToggle: (props) => null
+ }}
+ />
+ );
+ })
.add('with virtual scrolling', () => {
return (
<Griddle data={fakeData} plugins={[LocalPlugin, PositionPlugin({ tableHeight: 300 })]}>
| 0 |
diff --git a/AdditionalPostModActions.user.js b/AdditionalPostModActions.user.js // @description Adds a menu with mod-only quick actions in post sidebar
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.5
+// @version 1.5.1
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
menuitems += `<a data-action="meta-incorrect">close + delete (incorrectly posted)</a>`;
}
else {
- menuitems += `<a data-action="mod-delete" class="${isModDeleted ? 'disabled' : ''}">mod-delete post</a>`; // Not currently deleted by mod only
+ menuitems += `<a data-action="mod-delete">mod-delete post</a>`;
}
menuitems += `<a data-action="lock-dispute" class="${isLocked ? 'dno' : ''}">lock - dispute (3d)</a>`; // unlocked-only
| 11 |
diff --git a/src/server/service/slackbot.js b/src/server/service/slackbot.js @@ -304,7 +304,9 @@ class SlackBotService extends S2sMessageHandlable {
await client.chat.postEphemeral({
channel: this.channel_id,
user: payload.user.id,
- text: 'created!!',
+ blocks: [
+ this.generateMarkdownSectionBlock(`The page \`${path}\` has been created.`),
+ ],
});
}
catch (err) {
| 14 |
diff --git a/src/nanoexpress.js b/src/nanoexpress.js @@ -79,8 +79,6 @@ const nanoexpress = (options = {}) => {
return undefined;
}
app.listen(port, host, (token) => {
- if (token) {
- _app._instance = token;
if (typeof host === 'string') {
config.host = host;
} else {
@@ -89,18 +87,22 @@ const nanoexpress = (options = {}) => {
if (typeof port === 'number') {
config.port = port;
}
+
+ if (token) {
+ _app._instance = token;
console.log(
- `[Server]: started successfully at [localhost:${port}] in [${Date.now() -
- time}ms]`
+ `[Server]: started successfully at [${
+ config.host
+ }:${port}] in [${Date.now() - time}ms]`
);
resolve(_app);
} else {
- config.host = null;
- config.port = null;
- console.log(`[Server]: failed to host at [localhost:${port}]`);
+ console.log(`[Server]: failed to host at [${config.host}:${port}]`);
reject(
- new Error(`[Server]: failed to host at [localhost:${port}]`)
+ new Error(`[Server]: failed to host at [${config.host}:${port}]`)
);
+ config.host = null;
+ config.port = null;
}
});
}),
| 7 |
diff --git a/src/network/send.ts b/src/network/send.ts @@ -6,7 +6,7 @@ import { tribeOwnerAutoConfirmation } from '../controllers/confirmations'
import { typesToForward } from './receive'
import * as intercept from './intercept'
import constants from '../constants'
-import { logging } from '../utils/logger'
+import { logging, sphinxLogger } from '../utils/logger'
import { Msg } from './interfaces'
type NetworkType = undefined | 'mqtt' | 'lightning'
@@ -75,9 +75,10 @@ export async function sendMessage(params) {
// decrypt message.content and message.mediaKey w groupKey
msg = await decryptMessage(msg, chat)
// console.log("SEND.TS isBotMsg")
- if (logging.Network) {
- console.log('[Network] => isTribeAdmin msg sending...', msg)
- }
+ sphinxLogger.info(
+ `[Network] => isTribeAdmin msg sending... ${msg}`,
+ logging.Network
+ )
const isBotMsg = await intercept.isBotMsg(
msg,
true,
@@ -85,9 +86,7 @@ export async function sendMessage(params) {
forwardedFromContactId
)
if (isBotMsg === true) {
- if (logging.Network) {
- console.log('[Network] => isBotMsg')
- }
+ sphinxLogger.info(`[Network] => isBotMsg`, logging.Network)
// return // DO NOT FORWARD TO TRIBE, forwarded to bot instead?
}
}
@@ -121,9 +120,10 @@ export async function sendMessage(params) {
let yes: any = true
let no: any = null
- if (logging.Network) {
- console.log('=> sending to', contactIds.length, 'contacts')
- }
+ sphinxLogger.info(
+ `=> sending to ${contactIds.length} 'contacts'`,
+ logging.Network
+ )
await asyncForEach(contactIds, async (contactId) => {
// console.log("=> TENANT", tenant)
if (contactId === tenant) {
@@ -179,7 +179,7 @@ export async function sendMessage(params) {
const r = await signAndSend(opts, sender, mqttTopic)
yes = r
} catch (e) {
- console.log('KEYSEND ERROR', e)
+ sphinxLogger.error(`KEYSEND ERROR ${e}`)
no = e
}
await sleep(10)
| 3 |
diff --git a/token-metadata/0x9355372396e3F6daF13359B7b607a3374cc638e0/metadata.json b/token-metadata/0x9355372396e3F6daF13359B7b607a3374cc638e0/metadata.json "symbol": "WHALE",
"address": "0x9355372396e3F6daF13359B7b607a3374cc638e0",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/app/templates/_package.json b/app/templates/_package.json "test": "gulp client.unit_test",
"build-dist": "gulp client.build:dist",
"start": "gulp client.watch",
+ "start-dist": "aliv --root client/dist --port 3001",
"dev": "gulp client.watch",
<% } else {%>
<% if (clientBundler === "webpack") { %>
"build-dist": "webpack --config webpack.config.prod.js -p",
"start": "webpack-dev-server --progress --config webpack.config.dev.js --content-base client/dev/",
+ "start-dist": "aliv --root client/dist --port 3001",
"dev": "webpack-dev-server --progress --config webpack.config.dev.js --content-base client/dev/",
<% } else if (clientBundler === "parcel") { %>
"test": "gulp client.unit_test",
"build-dist": "parcel build client/dev/index.html --out-dir client/dev && gulp client.build:dist",
"start": "parcel client/dev/index.html --out-dir client/dev",
+ "start-dist": "aliv --root client/dist --port 3001",
"dev": "parcel client/dev/index.html --out-dir client/dev",
<% } %>
<% } %>
| 0 |
diff --git a/components/post.js b/components/post.js @@ -379,6 +379,17 @@ function Post({title, published_at, feature_image, html, backLink}) {
min-width: 80px;
background-color: ${colors.lighterGrey}
}
+
+ .kg-header-card {
+ padding: 4em;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ text-align: center;
+ background-color: black;
+ color: white;
+ margin-bottom: 1em;
+ }
`}</style>
</Section>
)
| 0 |
diff --git a/packages/inertia-react/src/useForm.js b/packages/inertia-react/src/useForm.js @@ -2,12 +2,12 @@ import { Inertia } from '@inertiajs/inertia'
import { useCallback, useRef, useState } from 'react'
import useRemember from './useRemember'
-export default function useForm(defaults, key) {
+export default function useForm(defaults, { remember = true, key = 'form' } = {}) {
let transform = (data) => data
const recentlySuccessfulTimeoutId = useRef(null)
- const [data, setData] = useRemember(defaults, key ? `${key}-form-data` : 'form-data')
- const [errors, setErrors] = useRemember({}, key ? `${key}-form-errors` : 'form-errors')
+ const [data, setData] = remember ? useRemember(defaults, `${key}-data`) : useState(defaults)
+ const [errors, setErrors] = remember ? useRemember({}, `${key}-errors`) : useState({})
const [hasErrors, setHasErrors] = useState(false)
const [processing, setProcessing] = useState(false)
const [progress, setProgress] = useState(null)
| 7 |
diff --git a/token-metadata/0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0/metadata.json b/token-metadata/0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0/metadata.json "symbol": "MATIC",
"address": "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/web/components/App.js b/web/components/App.js @@ -22,7 +22,8 @@ export default class App extends Component {
onLogin = () => {
const {redirect} = this.props.location.query;
- if (!AccountStore.getOrganisation() && this.props.location.pathname != '/invite') { //If user has no organisation redirect to /create
+
+ if (!AccountStore.getOrganisation() && document.location.href.indexOf('invite')==-1) { //If user has no organisation redirect to /create
this.context.router.replace('/create');
return
}
| 9 |
diff --git a/src/plugins/tools-plugin.js b/src/plugins/tools-plugin.js @@ -40,10 +40,16 @@ export default function ToolsPlugin(editor) {
toolbar.setMenuItems(getMenuItems(editor.state));
// show about modal on startup by default
- // exceptions if you are on localhost or set 'dev' in URL
+ // exceptions if you last were on this map, or set 'dev' in URL
try {
- if (window.location.href.indexOf('dev') === -1) {
+ if (
+ (window.location.href.indexOf("dev") === -1)
+ && (
+ !localStorage || (localStorage.getItem("lastVisit") !== state.place.id)
+ )
+ ) {
renderAboutModal(editor.state);
+ localStorage.setItem("lastVisit", state.place.id);
}
} catch(e) {
// likely no About page exists - silently fail to console
| 4 |
diff --git a/lib/DllPlugin.js b/lib/DllPlugin.js @@ -20,10 +20,6 @@ class DllPlugin {
constructor(options) {
validateOptions(schema, options, "Dll Plugin");
this.options = options;
-
- if (!options.format) {
- this.options.format = false;
- }
}
apply(compiler) {
| 2 |
diff --git a/token-metadata/0x967da4048cD07aB37855c090aAF366e4ce1b9F48/metadata.json b/token-metadata/0x967da4048cD07aB37855c090aAF366e4ce1b9F48/metadata.json "symbol": "OCEAN",
"address": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48",
"decimals": 18,
- "dharmaVerificationStatus": "VERIFIED"
+ "dharmaVerificationStatus": "VERIFIED",
+ "description": "Ocean Protocol is a decentralised data exchange protocol which enables data providers to monetise their private data using compute-to-data technology. Ocean Protocol's datatokens acts as on-ramp and off-ramp for data assets into DeFi.",
+ "socialLinks": [
+ {
+ "type": "twitter",
+ "value": "https://twitter.com/oceanprotocol"
+ },
+ {
+ "type": "website",
+ "value": "https://oceanprotocol.com"
+ },
+ {
+ "type": "discord",
+ "value": "https://discord.gg/TnXjkR5"
+ },
+ {
+ "type": "github",
+ "value": "https://github.com/oceanprotocol"
+ },
+ {
+ "type": "telegram",
+ "value": "https://t.me/OceanProtocol_Community"
+ }
+ ],
+ "tags": ["data", "compute", "ai", "dex", "defi"]
}
| 3 |
diff --git a/src/index.js b/src/index.js @@ -333,7 +333,7 @@ const handsArray = [
new Float32Array(handEntrySize),
new Float32Array(handEntrySize),
];
-const controllersArray = new Float32Array((3 + 4 + 6) * 2);
+const controllersArray = new Float32Array((1 + 3 + 4 + 6) * 2);
const localVector = new THREE.Vector3();
const localVector2 = new THREE.Vector3();
@@ -1465,6 +1465,8 @@ const _bindWindow = (window, newWindowCb) => {
frameData.rightProjectionMatrix.set(projectionArray.slice(16, 32));
let controllersArrayIndex = 0;
+ leftGamepad.connected = controllersArray[controllersArrayIndex] > 0;
+ controllersArrayIndex++;
leftGamepad.pose.position.set(controllersArray.slice(controllersArrayIndex, controllersArrayIndex + 3));
controllersArrayIndex += 3;
leftGamepad.pose.orientation.set(controllersArray.slice(controllersArrayIndex, controllersArrayIndex + 4));
@@ -1500,6 +1502,8 @@ const _bindWindow = (window, newWindowCb) => {
gamepads[0] = leftGamepad;
+ rightGamepad.connected = controllersArray[controllersArrayIndex] > 0;
+ controllersArrayIndex++;
rightGamepad.pose.position.set(controllersArray.slice(controllersArrayIndex, controllersArrayIndex + 3));
controllersArrayIndex += 3;
rightGamepad.pose.orientation.set(controllersArray.slice(controllersArrayIndex, controllersArrayIndex + 4));
| 12 |
diff --git a/lib/recurly/element/element.js b/lib/recurly/element/element.js +import deepAssign from '../../util/deep-assign';
import dom from '../../util/dom';
import pick from 'lodash.pick';
import Emitter from 'component-emitter';
@@ -223,7 +224,7 @@ export default class Element extends Emitter {
*/
configure (options = {}) {
const { _config } = this;
- const newConfig = { ..._config, ...pick(options, OPTIONS) };
+ const newConfig = deepAssign({}, _config, pick(options, OPTIONS));
if (JSON.stringify(_config) === JSON.stringify(newConfig)) return this;
this._config = newConfig;
this.update();
| 1 |
diff --git a/bin/install_customizations b/bin/install_customizations @@ -17,6 +17,8 @@ if ! [[ -z ${CUSTOMIZATION_GIT_REPO} ]];
npm i;
# force overwriting of packages if necessary
yes | cp -rf ./node_modules/* ../node_modules;
+ # copy custom images/assets
+ yes | cp -rf ./public/* ../public;
else
echo "Not found. Continuing with standard Library deploy";
fi;
| 11 |
diff --git a/src/components/oc-client/src/oc-client.js b/src/components/oc-client/src/oc-client.js @@ -32,8 +32,6 @@ var oc = oc || {};
// Constants
var CDNJS_BASEURL = 'https://cdnjs.cloudflare.com/ajax/libs/',
IE9_AJAX_POLYFILL_URL = CDNJS_BASEURL + 'jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js',
- HANDLEBARS_URL = CDNJS_BASEURL + 'handlebars.js/4.0.5/handlebars.runtime.min.js',
- JADE_URL = CDNJS_BASEURL + 'jade/1.11.0/runtime.min.js',
JQUERY_URL = CDNJS_BASEURL + 'jquery/1.11.2/jquery.min.js',
RETRY_INTERVAL = oc.conf.retryInterval || 5000,
RETRY_LIMIT = oc.conf.retryLimit || 30,
@@ -72,6 +70,20 @@ var oc = oc || {};
}
};
+ var coreTemplates = {
+ 'handlebars': {
+ externals: [
+ { global: 'Handlebars', url: 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.runtime.min.js' }
+ ]
+ },
+ 'jade': {
+ externals: [
+ { global: 'jade', url: 'https://cdnjs.cloudflare.com/ajax/libs/jade/1.11.0/runtime.min.js' }
+ ]
+ }
+ };
+ var registeredTemplates = oc.conf.templates ? oc.registerTemplates(oc.conf.templates) : coreTemplates;
+
var retry = function(component, cb, failedRetryCb){
if(retries[component] === undefined){
retries[component] = RETRY_LIMIT;
@@ -100,6 +112,19 @@ var oc = oc || {};
return href;
};
+ oc.registerTemplates = function (templates) {
+ templates = Array.isArray(templates) ? templates : [templates];
+ templates.forEach(function(template){
+ if (!registeredTemplates[template.type]) {
+ registeredTemplates[template.type] = {
+ externals: template.externals
+ };
+ }
+ });
+ oc.ready(oc.renderUnloadedComponents);
+ return templates;
+ };
+
// A minimal require.js-ish that uses head.js
oc.require = function(nameSpace, url, callback){
if(typeof(url) === 'function'){
@@ -294,27 +319,36 @@ var oc = oc || {};
oc.render = function(compiledViewInfo, model, callback){
oc.ready(function(){
- if(!!compiledViewInfo.type.match(/jade|handlebars/g)){
+ var template = registeredTemplates[compiledViewInfo.type];
+
+ if(!!template){
oc.require(['oc', 'components', compiledViewInfo.key], compiledViewInfo.src, function(compiledView){
if(!compiledView){
callback(MESSAGES_ERRORS_LOADING_COMPILED_VIEW.replace('{0}', compiledViewInfo.src));
} else {
+
+ var externals = template.externals;
+ var externalsRequired = 0;
+
+ externals.forEach(function(library, _index, externals){
+ oc.require(library.global, library.url, function(){
+ externalsRequired++;
+ if(externalsRequired === externals.length) {
if(compiledViewInfo.type === 'handlebars'){
- oc.require('Handlebars', HANDLEBARS_URL, function(){
try {
var linked = $window.Handlebars.template(compiledView, []);
callback(null, linked(model));
} catch(e){
callback(e.toString());
}
- });
- } else if(compiledViewInfo.type === 'jade'){
- oc.require('jade', JADE_URL, function(){
+ } else {
callback(null, compiledView(model));
- });
}
}
});
+ });
+ }
+ });
} else {
callback(MESSAGES_ERRORS_VIEW_ENGINE_NOT_SUPPORTED.replace('{0}', compiledViewInfo.type));
}
| 7 |
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js @@ -67,11 +67,11 @@ function getDisplayName(login, personalDetail) {
/**
* Returns max character error text if true.
*
- * @param {Boolean} shouldReturnError
+ * @param {Boolean} isError
* @returns {String}
*/
-function getMaxCharacterError(shouldReturnError) {
- return shouldReturnError ? Localize.translateLocal('personalDetails.error.characterLimit', {limit: 50}) : '';
+function getMaxCharacterError(isError) {
+ return isError ? Localize.translateLocal('personalDetails.error.characterLimit', {limit: 50}) : '';
}
| 10 |
diff --git a/src/workingtitle-aircraft-cj4/Effects/LIGHT_CJ4_Pulse.fx b/src/workingtitle-aircraft-cj4/Effects/LIGHT_CJ4_Pulse.fx @@ -64,10 +64,10 @@ MinProjSize= 0.4
[LightAttributes.0]
Type=spot
Size=0.1
-Range=1000.0
-Intensity=50.0
+Range=3000.0
+Intensity=400.0
Softness=0.0
-SpotInner=6
-SpotOuter=9
-Volumetric=1
+SpotInner=14
+SpotOuter=17
+Volumetric=0
ScatDir=0.0
\ No newline at end of file
| 1 |
diff --git a/examples/viper/building_map.php b/examples/viper/building_map.php @@ -115,7 +115,7 @@ include 'config.php';
$(".waiting-description").hide();
$(".waiting-title").html('Creating an overview for <span class="project_name">' + window.dataParamsForOpening.acronymtitle + '</span> failed.');
$("#progress").html(
- 'Sorry! Something went wrong. Please <a href=\"index.php\">try again</a> in a few minutes. If you think that If you think that there is something wrong with our site, please let us know at <a href="mailto:[email protected]">[email protected]</a>.'
+ 'Sorry! Something went wrong. Please <a href=\"index.php\">try again</a> in a few minutes. If you think that there is something wrong with our site, please let us know at <a href="mailto:[email protected]">[email protected]</a>.'
)
console.log(error)
}
| 7 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ### Fixed
- WebGL: fix a regression with global opacity not being properly cascaded to texture in WebGL mode (thanks @wpernath)
-- Canvas: fix default "non transparent" mode with the canvas renderer
+- Canvas: fix the "transparent" canvas mode with the canvas renderer (thanks @wpernath)
## [13.1.1] (melonJS 2) - _2022-08-10_
| 1 |
diff --git a/src/index.test.js b/src/index.test.js -import React from 'react'
-import ReactDOM from 'react-dom'
-import App from './App'
-
it('renders without crashing', () => {
const div = document.createElement('div')
- ReactDOM.render(<App />, div)
- ReactDOM.unmountComponentAtNode(div)
})
| 2 |
diff --git a/shared/js/background/safari-events.es6.js b/shared/js/background/safari-events.es6.js @@ -128,7 +128,7 @@ safari.extension.globalPage.contentWindow.message = handleUIMessage
let updateSetting = (e) => {
let name = e.message.updateSetting.name
let val = e.message.updateSetting.value
- if (name && val) {
+ if (name) {
settings.updateSetting(name, val)
}
}
| 11 |
diff --git a/view/frontend/templates/menu-custom.phtml b/view/frontend/templates/menu-custom.phtml }
if ($item['children']) {
- $html .= renderSnowdogMenuSubList($item['children'], $listLevel + 1);
+ $html .= renderSnowdogMenuSubList($block, $item['children'], $listLevel + 1);
}
$html .= '</li>';
| 1 |
diff --git a/includes/Core/Authentication/Authentication.php b/includes/Core/Authentication/Authentication.php @@ -538,11 +538,11 @@ final class Authentication {
* @return array Filtered $data.
*/
private function inline_js_admin_data( $data ) {
- $profile_data = $this->profile->get();
- if ( $profile_data ) {
if ( ! isset( $data['userData'] ) ) {
$data['userData'] = array();
}
+ $profile_data = $this->profile->get();
+ if ( $profile_data ) {
$data['userData']['email'] = $profile_data['email'];
$data['userData']['picture'] = $profile_data['photo'];
}
| 1 |
diff --git a/generators/heroku/templates/Procfile.ejs b/generators/heroku/templates/Procfile.ejs See the License for the specific language governing permissions and
limitations under the License.
-%>
-web: java $JAVA_OPTS <% if (applicationType === 'gateway' || dynoSize === 'Free') { %>-Xmx256m<% } %> -jar <% if (buildTool === 'maven') { %>target<% } %><% if (buildTool === 'gradle') { %>build/libs<% } %>/*.jar --spring.profiles.active=prod,heroku<% if (buildTool == 'maven' && herokuDeployType == 'git') { %>,no-liquibase<% } %> <% if (prodDatabaseType === 'mongodb') { %>--spring.data.mongodb.database=$(echo "$MONGODB_URI" | sed "s/^.*:[0-9]*\///g")<% } %>
-<%_ if (buildTool == 'maven' && herokuDeployType == 'git' && (prodDatabaseType === 'postgresql' || prodDatabaseType === 'mysql' || prodDatabaseType === 'mariadb')) { _%>
-release: cp -R src/main/resources/config config && ./mvnw -ntp liquibase:update -Pprod,heroku
-<%_ } _%>
+web: java $JAVA_OPTS <% if (applicationType === 'gateway' || dynoSize === 'Free') { %>-Xmx256m<% } %> -jar <% if (buildTool === 'maven') { %>target<% } %><% if (buildTool === 'gradle') { %>build/libs<% } %>/*.jar --spring.profiles.active=prod,heroku <% if (prodDatabaseType === 'mongodb') { %>--spring.data.mongodb.database=$(echo "$MONGODB_URI" | sed "s/^.*:[0-9]*\///g")<% } %>
| 2 |
diff --git a/app/components/Features/DonateForm/index.js b/app/components/Features/DonateForm/index.js @@ -10,18 +10,18 @@ import { withFormik } from 'formik';
import * as Yup from 'yup';
// @material-ui/icons
-// import CardGiftcard from '@material-ui/icons/CardGiftcard';
+import CardGiftcard from '@material-ui/icons/CardGiftcard';
import Tool from 'components/Tool/Tool';
-// import ToolSection from 'components/Tool/ToolSection';
-// import ToolBody from 'components/Tool/ToolBody';
+import ToolSection from 'components/Tool/ToolSection';
+import ToolBody from 'components/Tool/ToolBody';
import GridItem from "components/Grid/GridItem";
-// import Donate from 'components/Information/Donate';
+import Donate from 'components/Information/Donate';
-// import FormObject from './FormObject';
+import FormObject from './FormObject';
-// import messages from './messages';
+import messages from './messages';
import commonMessages from '../../messages';
import genpoolWeb from '../../../assets/img/genpool.png';
@@ -53,7 +53,7 @@ const makeTransaction = (values, networkIdentity) => {
name: 'transfer',
data: {
from: networkIdentity ? networkIdentity.name : '',
- to: 'aussiedonate',
+ to: 'aus1genereos',
memo: values.memo,
quantity: `${Number(values.quantity)
.toFixed(4)
@@ -75,6 +75,16 @@ const DonateForm = props => {
</div>
</a>
</GridItem>
+ <ToolSection lg={12}>
+ <ToolBody color="warning"
+ icon={CardGiftcard}
+ header={intl.formatMessage(messages.donateText)}
+ style={{backgroundImage:
+ 'linear-gradient(10deg, #ff0000 0%, #ffed00 74%)' }}>
+ <Donate />
+ <FormObject submitColor="success" submitText="Donate" {...props} />
+ </ToolBody>
+ </ToolSection>
</Tool>
);
};
@@ -88,7 +98,7 @@ const enhance = compose(
pushTransaction(transaction, props.history);
},
mapPropsToValues: props =>({
- quantity: '5',
+ quantity: '1',
memo: 'Donation - Australian Bushfire Relief',
activeNetwork:props.activeNetwork?props.activeNetwork: '',
}),
| 13 |
diff --git a/pelicanconf.py b/pelicanconf.py @@ -28,7 +28,7 @@ MARKDOWN = {
PLUGIN_PATHS = ['plugins/']
PLUGINS = ['sitemap', 'extract_toc', 'tipue_search', 'liquid_tags.img',
'neighbors', 'render_math', 'related_posts', 'assets', 'share_post',
- 'multi_part']
+ 'series']
SITEMAP = {
'format': 'xml',
'priorities': {
| 14 |
diff --git a/src/core/operations/GenerateQRCode.mjs b/src/core/operations/GenerateQRCode.mjs import Operation from "../Operation";
import OperationError from "../errors/OperationError";
import qr from "qr-image";
-
+import { toBase64 } from "../lib/Base64";
+import Magic from "../lib/Magic";
/**
* Generate QR Code operation
@@ -21,12 +22,29 @@ class GenerateQRCode extends Operation {
super();
this.name = "Generate QR Code";
- this.module = "Default";
+ this.module = "QRCode";
this.description = "Generates a QR code from text.";
this.infoURL = "https://en.wikipedia.org/wiki/QR_code";
this.inputType = "string";
this.outputType = "byteArray";
- this.args = [];
+ this.presentType = "html";
+ this.args = [
+ {
+ "name": "Image Format",
+ "type": "option",
+ "value": ["SVG", "PNG"]
+ },
+ {
+ "name": "Size of QR module",
+ "type": "number",
+ "value": 5
+ },
+ {
+ "name": "Margin",
+ "type": "number",
+ "value": 2
+ }
+ ];
}
/**
@@ -35,11 +53,50 @@ class GenerateQRCode extends Operation {
* @returns {File}
*/
run(input, args) {
- const qrImage = new Buffer(qr.imageSync(input, { type : "png" }));
+ // Create new QR image from the input data, and convert it to a buffer
+ const [format, size, margin] = args;
+ const qrImage = qr.imageSync(input, { type: format, size: size, margin: margin });
if (qrImage == null) {
- return [input];
+ throw new OperationError("Error generating QR code.");
}
+ if (format === "SVG") {
+ return [...Buffer.from(qrImage)];
+ } else if (format === "PNG") {
+ // Return the QR image buffer as a byte array
return [...qrImage];
+ } else {
+ throw new OperationError("Error generating QR code.");
+ }
+ }
+
+ /**
+ * Displays the QR image using HTML for web apps
+ *
+ * @param {byteArray} data
+ * @returns {html}
+ */
+ present(data, args) {
+ if (!data.length) return "";
+
+ const [format] = args;
+ if (format === "SVG") {
+ let outputData = "";
+ for (let i = 0; i < data.length; i++){
+ outputData += String.fromCharCode(parseInt(data[i]));
+ }
+ return outputData;
+ } else if (format === "PNG") {
+ let dataURI = "data:";
+ const type = Magic.magicFileType(data);
+ if (type && type.mime.indexOf("image") === 0){
+ dataURI += type.mime + ";";
+ } else {
+ throw new OperationError("Invalid file type");
+ }
+ dataURI += "base64," + toBase64(data);
+
+ return "<img src='" + dataURI + "'>";
+ }
}
}
| 0 |
diff --git a/packages/idyll-components/src/switch.js b/packages/idyll-components/src/switch.js @@ -17,10 +17,9 @@ class Switch extends React.Component {
child.type.name.toLowerCase() === 'case' && child.props.test === value;
const matchDefault = child => child.type.name.toLowerCase() === 'default';
- const child = filterChildren(children, child => {
- return matchCase(child) || matchDefault(child);
- });
- const [matchedCase, defaultCase] = child;
+ const matchedCase = filterChildren(children, matchCase);
+ const defaultCase = filterChildren(children, matchDefault);
+
return <div>{matchedCase ? matchedCase : defaultCase}</div>;
}
return '';
| 4 |
diff --git a/token-metadata/0xf485C5E679238f9304D986bb2fC28fE3379200e5/metadata.json b/token-metadata/0xf485C5E679238f9304D986bb2fC28fE3379200e5/metadata.json "symbol": "UGC",
"address": "0xf485C5E679238f9304D986bb2fC28fE3379200e5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss min-height: em(40px, 19px);
margin-top: 0;
padding: 0 em($govuk-spacing-scale-3, 19px) 0;
- border-width: 2px;
+ border-width: $govuk-border-width-form-element;
border-radius: 0;
- border-color: transparent transparent darken($govuk-button-colour, 15%) transparent;
+ border-color: transparent transparent $govuk-button-colour-darken-15 transparent;
outline: 1px solid transparent; // keep some button appearance when changing colour settings in browsers
outline-offset: -1px; // fixes bug in Safari that outline width on focus is not overwritten, is reset to 0 on focus in govuk_template
background-color: $govuk-button-colour;
&:active {
top: 0;
- box-shadow: 0 2px 0 darken($govuk-button-colour, 15%);
+ box-shadow: 0 $govuk-border-width-form-element 0 $govuk-button-colour-darken-15;
@include ie-lte(8) {
- border-bottom: 2px solid darken($govuk-button-colour, 15%);
+ border-bottom: $govuk-border-width-form-element solid $govuk-button-colour-darken-15;
}
}
}
background-image: file-url("icon-pointer.png");
background-repeat: no-repeat;
background-position: 100% 50%;
- box-shadow: 0 2px 0 darken($govuk-button-colour, 15%);
+ box-shadow: 0 $govuk-border-width-form-element 0 $govuk-button-colour-darken-15;
@include ie-lte(8) {
- border-bottom: 2px solid darken($govuk-button-colour, 15%);
+ border-bottom: $govuk-border-width-form-element solid $govuk-button-colour-darken-15;
}
}
| 14 |
diff --git a/app/controllers/carto/api/public/oauth_app_presenter.rb b/app/controllers/carto/api/public/oauth_app_presenter.rb @@ -4,10 +4,11 @@ module Carto
class OauthAppPresenter
PRIVATE_ATTRIBUTES = %i(
- id user_id name created_at updated_at client_id client_secret redirect_uris icon_url restricted
+ id user_id name created_at updated_at client_id client_secret
+ redirect_uris icon_url restricted description website_url
).freeze
- PUBLIC_ATTRIBUTES = %i(id name created_at updated_at).freeze
+ PUBLIC_ATTRIBUTES = %i(id name created_at updated_at description website_url icon_url).freeze
def initialize(oauth_app, user: nil)
@oauth_app = oauth_app
| 3 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -1165,93 +1165,6 @@ RED.nodes = (function() {
return node;
}
- /**
- * Create a node from a type string.
- * **NOTE:** Can throw on error - use `try` `catch` block when calling
- * @param {string} type The node type to create
- * @param {number} [x] (optional) The horizontal position on the workspace
- * @param {number} [y] (optional)The vertical on the workspace
- * @param {string} [z] (optional) The flow tab this node will belong to. Defaults to active workspace.
- * @returns An object containing the `node` and a `historyEvent`
- * @private
- */
- function createNode(type, x, y, z) {
- var m = /^subflow:(.+)$/.exec(type);
- var activeSubflow = z ? RED.nodes.subflow(z) : null;
- if (activeSubflow && m) {
- var subflowId = m[1];
- if (subflowId === activeSubflow.id) {
- throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddSubflowToItself") }))
- }
- if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
- throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddCircularReference") }))
- }
- }
-
- var nn = { id: RED.nodes.id(), z: z || RED.workspaces.active() };
-
- nn.type = type;
- nn._def = RED.nodes.getType(nn.type);
-
- if (!m) {
- nn.inputs = nn._def.inputs || 0;
- nn.outputs = nn._def.outputs;
-
- for (var d in nn._def.defaults) {
- if (nn._def.defaults.hasOwnProperty(d)) {
- if (nn._def.defaults[d].value !== undefined) {
- nn[d] = JSON.parse(JSON.stringify(nn._def.defaults[d].value));
- }
- }
- }
-
- if (nn._def.onadd) {
- try {
- nn._def.onadd.call(nn);
- } catch (err) {
- console.log("Definition error: " + nn.type + ".onadd:", err);
- }
- }
- } else {
- var subflow = RED.nodes.subflow(m[1]);
- nn.name = "";
- nn.inputs = subflow.in.length;
- nn.outputs = subflow.out.length;
- }
-
- nn.changed = true;
- nn.moved = true;
-
- nn.w = RED.view.node_width;
- nn.h = Math.max(RED.view.node_height, (nn.outputs || 0) * 15);
- nn.resize = true;
- if (x != null && typeof x == "number" && x >= 0) {
- nn.x = x;
- }
- if (y != null && typeof y == "number" && y >= 0) {
- nn.y = y;
- }
- var historyEvent = {
- t: "add",
- nodes: [nn.id],
- dirty: RED.nodes.dirty()
- }
- if (activeSubflow) {
- var subflowRefresh = RED.subflow.refresh(true);
- if (subflowRefresh) {
- historyEvent.subflow = {
- id: activeSubflow.id,
- changed: activeSubflow.changed,
- instances: subflowRefresh.instances
- }
- }
- }
- return {
- node: nn,
- historyEvent: historyEvent
- }
- }
-
function convertSubflow(n, opts) {
var exportCreds = true;
var exportDimensions = false;
@@ -2768,7 +2681,6 @@ RED.nodes = (function() {
getType: registry.getNodeType,
getNodeHelp: getNodeHelp,
convertNode: convertNode,
- createNode: createNode,
add: addNode,
remove: removeNode,
clear: clear,
| 2 |
diff --git a/src/components/charts/bar-chart.js b/src/components/charts/bar-chart.js @@ -60,13 +60,18 @@ const BarChart = ({
.domain(dateDomain)
.range([marginLeft, width - marginRight])
+ const yMaxEffective =
+ yMax || max([...data, ...(refLineData || [])], d => d.value)
+
const yScale = scaleLinear()
- .domain([0, yMax || max([...data, ...(refLineData || [])], d => d.value)])
+ .domain([0, yMaxEffective])
.nice()
.range([height - totalYMargin, 0])
const xTickAmount = timeMonth.every(1)
-
+ const yTicksThreshold = 4
+ const yTicksEffective =
+ yTicks || yMaxEffective < yTicksThreshold ? yMaxEffective : yTicksThreshold
const lastTime = xScaleTime.ticks(timeDay.every(1)).pop()
let lineFn = null
@@ -106,7 +111,7 @@ const BarChart = ({
>
{/* y ticks */}
<g transform={`translate(${marginLeft} ${marginTop})`}>
- {yScale.ticks(yTicks).map(
+ {yScale.ticks(yTicksEffective).map(
(tick, i) =>
i < showTicks && (
<g key={tick}>
@@ -292,7 +297,7 @@ BarChart.defaultProps = {
width: 300,
height: 300,
yMax: null,
- yTicks: 4,
+ yTicks: null,
showTicks: 4,
renderTooltipContents: null,
perCapLabel: null,
| 1 |
diff --git a/token-metadata/0x6e4D93Efc2BeaC20992197278AD41f8d10b3EFAA/metadata.json b/token-metadata/0x6e4D93Efc2BeaC20992197278AD41f8d10b3EFAA/metadata.json "symbol": "FAZR",
"address": "0x6e4D93Efc2BeaC20992197278AD41f8d10b3EFAA",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/test/jasmine/tests/select_test.js b/test/jasmine/tests/select_test.js @@ -42,11 +42,13 @@ function drag(path, options) {
mouseEvent('mouseup', path[len - 1][0], path[len - 1][1], options);
}
-function assertSelectionNodes(cornerCnt, outlineCnt) {
+function assertSelectionNodes(cornerCnt, outlineCnt, _msg) {
+ var msg = _msg ? ' - ' + _msg : '';
+
expect(d3.selectAll('.zoomlayer > .zoombox-corners').size())
- .toBe(cornerCnt, 'selection corner count');
+ .toBe(cornerCnt, 'selection corner count' + msg);
expect(d3.selectAll('.zoomlayer > .select-outline').size())
- .toBe(outlineCnt, 'selection outline count');
+ .toBe(outlineCnt, 'selection outline count' + msg);
}
var selectingCnt, selectingData, selectedCnt, selectedData, deselectCnt, doubleClickData;
| 0 |
diff --git a/templates/docs/examples/_blog_app.md b/templates/docs/examples/_blog_app.md <%= title("Blog App") %>
-This is an open source simple blogging app that allows users who are admins to create blog posts in markdown format and allows all logged in users to comment on blog posts. Uses local authentication.
+This is an open source simple blogging app, that allows users who are admins to create blog posts in markdown format. Logged in users can comment on blog posts. Uses local authentication.
Source: [https://github.com/mikaelm1/Blog-App-Buffalo](https://github.com/mikaelm1/Blog-App-Buffalo)
| 7 |
diff --git a/docs/source/docs/border-radius.blade.md b/docs/source/docs/border-radius.blade.md @@ -143,10 +143,10 @@ Use the `.rounded-t`, `.rounded-r`, `.rounded-b`, or `.rounded-l` utilities to o
<div class="bg-grey-light mr-3 p-4 rounded-lg rounded-b">.rounded-b</div>
<div class="bg-grey-light p-4 rounded-lg rounded-l">.rounded-l</div>
@slot('code')
-<div class="rounded-t"></div>
-<div class="rounded-r"></div>
-<div class="rounded-b"></div>
-<div class="rounded-l"></div>
+<div class="rounded-lg rounded-t"></div>
+<div class="rounded-lg rounded-r"></div>
+<div class="rounded-lg rounded-b"></div>
+<div class="rounded-lg rounded-l"></div>
@endslot
@endcomponent
| 7 |
diff --git a/packages/cx/src/util/getSearchQueryPredicate.js b/packages/cx/src/util/getSearchQueryPredicate.js -import { escapeSpecialRegexCharacters } from './escapeSpecialRegexCharacters';
+import { escapeSpecialRegexCharacters } from "./escapeSpecialRegexCharacters";
export function getSearchQueryPredicate(query, options) {
- if (!query)
- return () => true;
+ if (!query) return () => true;
- let terms = query.split(' ').filter(Boolean);
- if (terms.length == 0)
- return () => true;
+ let terms = query.split(" ").filter(Boolean);
+ if (terms.length == 0) return () => true;
- let regexes = terms.map(w => new RegExp(escapeSpecialRegexCharacters(w), 'gi'));
+ let regexes = terms.map((w) => new RegExp(escapeSpecialRegexCharacters(w), "gi"));
if (regexes.length == 1) {
let regex = regexes[0];
- return text => text.match(regex);
+ return (text) => text && text.match(regex);
}
- return text => regexes.every(re => text.match(re));
+ return (text) => text && regexes.every((re) => text.match(re));
}
-
| 8 |
diff --git a/server/lib/gateway/gateway.getLatestGladysVersion.js b/server/lib/gateway/gateway.getLatestGladysVersion.js +const db = require('../../models');
+
/**
* @description Return latest version of Gladys.
* @returns {Promise} Resolve with latest version of Gladys.
async function getLatestGladysVersion() {
const systemInfos = await this.system.getInfos();
const clientId = await this.variable.getValue('GLADYS_INSTANCE_CLIENT_ID');
+ const deviceStateCount = await db.DeviceFeatureState.count();
const params = {
system: systemInfos.platform,
node_version: systemInfos.nodejs_version,
is_docker: systemInfos.is_docker,
client_id: clientId,
+ device_state_count: deviceStateCount,
};
const latestGladysVersion = await this.gladysGatewayClient.getLatestGladysVersion(systemInfos.gladys_version, params);
this.system.saveLatestGladysVersion(latestGladysVersion.name);
| 7 |
diff --git a/src/og/terrain/MapboxTerrain.js b/src/og/terrain/MapboxTerrain.js @@ -11,9 +11,9 @@ class MapboxTerrain extends GlobusTerrain {
options = options || {};
- this.equalizeVertices = true;
+ this.equalizeVertices = options.equalizeVertices != undefined ? options.equalizeVertices : true;
- this.equalizeNormals = false;
+ this.equalizeNormals = options.equalizeNormals || false;
this.minZoom = options.minZoom != undefined ? options.minZoom : 3;
| 0 |
diff --git a/includes/Modules/Subscribe_With_Google.php b/includes/Modules/Subscribe_With_Google.php @@ -93,7 +93,7 @@ final class Subscribe_With_Google extends Module
return array(
'slug' => 'subscribe-with-google',
'name' => _x( 'Subscribe with Google', 'Service name', 'google-site-kit' ),
- 'description' => __( 'Generate revenue through your content by adding subscriptions or contributions to your publication.', 'google-site-kit' ),
+ 'description' => __( 'Generate revenue through your content by adding subscriptions or contributions to your publication', 'google-site-kit' ),
'order' => 7,
'homepage' => __( 'https://publishercenter.google.com/', 'google-site-kit' ),
);
| 2 |
diff --git a/components/search/FilterSidebar.js b/components/search/FilterSidebar.js @@ -107,7 +107,7 @@ function isValidFilterForTestname(testName = 'XX', arrayWithMapping) {
const tomorrowUTC = dayjs.utc().add(1, 'day').format('YYYY-MM-DD')
const asnRegEx = /^(AS)?([1-9][0-9]*)$/
-const domainRegEx = /(^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,7}(:[0-9]{1,5})?$)|(^(([0-9]{1,3})\.){3}([0-9]{1,3}))/
+const domainRegEx = /(^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,}(:[0-9]{1,5})?$)|(^(([0-9]{1,3})\.){3}([0-9]{1,3}))/
export const queryToFilterMap = {
domain: [ 'domainFilter', ''],
| 11 |
diff --git a/README.md b/README.md @@ -9,20 +9,31 @@ Want to contribute to JSDoc? Please read `CONTRIBUTING.md`.
Installation and Usage
----------------------
-JSDoc supports Node.js 4.2.0 and later. You can install JSDoc in your project's
-`node_modules` folder, or you can install it globally.
+JSDoc supports Node.js 4.2.0 and later. You can install JSDoc globally or in your project's
+`node_modules` folder.
-To install the latest version available on NPM:
+To install the latest version on npm globally (may require `sudo`; [learn how to fix
+this](https://docs.npmjs.com/getting-started/fixing-npm-permissions)):
- npm install jsdoc
+ npm install -g jsdoc
-To install the latest development version:
+To install the latest version on npm locally and save it in your package's `package.json` file:
+
+ npm install --save-dev jsdoc
+
+**Note**: By default, npm adds your package using the caret operator in front of the version number
+(for example, `^3.5.2`). We recommend using the tilde operator instead (for example, `~3.5.2`),
+which limits updates to the most recent patch-level version. See [this Stack Overflow
+answer](https://stackoverflow.com/questions/22343224) for more information about the caret and tilde
+operators.
+
+To install the latest development version locally, without updating your project's `package.json`
+file:
npm install git+https://github.com/jsdoc3/jsdoc.git
-If you installed JSDoc locally, the JSDoc command-line tool is available in
-`./node_modules/.bin`. To generate documentation for the file
-`yourJavaScriptFile.js`:
+If you installed JSDoc locally, the JSDoc command-line tool is available in `./node_modules/.bin`.
+To generate documentation for the file `yourJavaScriptFile.js`:
./node_modules/.bin/jsdoc yourJavaScriptFile.js
@@ -30,16 +41,16 @@ Or if you installed JSDoc globally, simply run the `jsdoc` command:
jsdoc yourJavaScriptFile.js
-By default, the generated documentation is saved in a directory named `out`. You
-can use the `--destination` (`-d`) option to specify another directory.
+By default, the generated documentation is saved in a directory named `out`. You can use the
+`--destination` (`-d`) option to specify another directory.
Run `jsdoc --help` for a complete list of command-line options.
Templates and Build Tools
-------------------------
-The JSDoc community has created numerous templates and other tools to help you
-generate and customize your documentation. Here are just a few:
+The JSDoc community has created numerous templates and other tools to help you generate and
+customize your documentation. Here are just a few:
### Templates
@@ -68,8 +79,8 @@ Overflow](http://stackoverflow.com/questions/tagged/jsdoc).
License
-------
-JSDoc 3 is copyright (c) 2011-present Michael Mathews <[email protected]> and the
-[contributors to JSDoc](https://github.com/jsdoc3/jsdoc/graphs/contributors).
+JSDoc 3 is copyright (c) 2011-present Michael Mathews <[email protected]> and the [contributors to
+JSDoc](https://github.com/jsdoc3/jsdoc/graphs/contributors).
-JSDoc 3 is free software, licensed under the Apache License, Version 2.0. See
-the file `LICENSE.md` in this distribution for more details.
+JSDoc 3 is free software, licensed under the Apache License, Version 2.0. See the file `LICENSE.md`
+in this distribution for more details.
| 7 |
diff --git a/token-metadata/0x196f4727526eA7FB1e17b2071B3d8eAA38486988/metadata.json b/token-metadata/0x196f4727526eA7FB1e17b2071B3d8eAA38486988/metadata.json "symbol": "RSV",
"address": "0x196f4727526eA7FB1e17b2071B3d8eAA38486988",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0x35A735B7D1d811887966656855F870c05fD0A86D/metadata.json b/token-metadata/0x35A735B7D1d811887966656855F870c05fD0A86D/metadata.json "symbol": "THRN",
"address": "0x35A735B7D1d811887966656855F870c05fD0A86D",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0x3D658390460295FB963f54dC0899cfb1c30776Df/metadata.json b/token-metadata/0x3D658390460295FB963f54dC0899cfb1c30776Df/metadata.json "symbol": "COVAL",
"address": "0x3D658390460295FB963f54dC0899cfb1c30776Df",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/web/binaries.html b/web/binaries.html <div class="col-xs-12 col-md-12">
<H3>Current Version</H3>
- <H4>Version 1.0, Dec 12, 2018</H4>
+ <H3>Version 1.0, Dec 12, 2018</H3>
- <OL>
- <LI> Desktop Applications</LI>
+ <H4> Desktop Applications</H4>
<UL>
<LI><a href="http://bisweb.yale.edu/binaries/BioImageSuiteWebInstaller-1.0.0-2018_12_12.exe">Microsoft
- Windows installer</a> (~ 140 MB)</LI>
+ Windows installer</a> (~ 90 MB)</LI>
<LI><a href="http://bisweb.yale.edu/binaries/bisweb_macos_1.0.0_2018_12_12.app.zip">MacOS
- zipped .app file</a> (~ 140 MB)</LI>
+ zipped .app file</a> (~ 170 MB)</LI>
<LI><a href="http://bisweb.yale.edu/binaries/bisweb_linux_1.0.0_2018_12_12.zip">Linux
- (Ubuntu) zip file</a> (~ 140 MB)</LI>
+ (Ubuntu) zip file</a> (~ 106 MB)</LI>
</UL>
<BR><p>The desktop applications are based on (and
include) <a href="https://electronjs.org/">Electron</a>. </p>
- <LI> Command Line Tools</LI>
+ <H4> Command Line Tools</H4>
<UL>
<LI> <a href="http://bisweb.yale.edu/binaries/bisweb-1.0.0-js-wasm-12_Dec_2018.tar.gz">All-platform
command line tools package.</a> (~ 10 MB)</LI>
Windows, Mac OS and Ubuntu. In all three cases you will need to install
<a href="https://nodejs.org/en/">Node.js v8.x or v10.x LTS</a>.</p>
- </OL>
<HR>
+ <H3>Developement Version 1.1.0a9, March 2019</H3>
- <H4>Developement Version 1.1.0a, Jan 2019</H4>
- <LI> Command Line Tools</LI>
+ <H4> Desktop Applications</H4>
+ <P>These may be obtained
+ from <a href="https://www.nitrc.org/frs/?group_id=51">our NITRC page</a>.</P>
+ <BR><UL>
+ <LI><a href="https://www.nitrc.org/frs/download.php/11168/BioImageSuiteWebInstaller-1.1.0a9-2019_03_20.exe">Microsoft
+ Windows installer</a> (~ 90 MB)</LI>
+ <LI><a href="https://www.nitrc.org/frs/download.php/11170/bisweb_macos_1.1.0a9_2019_03_20.app.zip">MacOS
+ zipped .app file</a> (~ 175 MB)</LI>
+ <LI><a href="https://www.nitrc.org/frs/download.php/11169/bisweb_linux_1.1.0a9_2019_03_20.zip">Linux
+ (Ubuntu) zip file</a> (~ 105 MB)</LI>
+
+ </UL>
+ <HR width="50%">
+ <H4> Command Line Tools</H4>
<BR>
<p>Please note that these distribution should work on both
Windows, Mac OS and Ubuntu. In all three cases you will need to install
<a href="https://nodejs.org/en/">Node.js v10.x LTS</a>.</p>
<p> To install, use npm. To install this globally (recommanded), open a
console and then type:
- <PRE>
- sudo npm install -g biswebnode
- </PRE>
+ <PRE>sudo npm install -g biswebnode</PRE>
<p>(On Ms-Wndows omit the sudo part).</p><BR>
<p> To uninstalll type:
<PRE>sudo npm remove -g biswebnode</PRE>
</p>
- <HR>
+ <HR width="50%">
<p> You may obtain the source code for this application from
our <a href="https://github.com/bioimagesuiteweb/bisweb"
</div>
</div>
+ <HR>
+
<div class="container-fluid">
- <HR>
<div class="row">
<div class="col-xs-12 col-sm-6 col-md-5 col-lg-4" style="background-color:rgb(192,128,128); height:90px;">
<img src="./images/bislogomed.png" height="60px" style="margin:10px" alt="oldlogo">
</div>
<div class="col-xs-12 col-sm-6 col-md-7 col-lg-7" style="background-color:rgb(192,128,128); color:white; height:90px;">
- <H4>
+ <H3>
If you are looking for the desktop C++/TCL
<a href="https://medicine.yale.edu/bioimaging/suite/">legacy version of
Yale BioImage Suite</a> it may be
downloaded from this <a href="https://medicine.yale.edu/bioimaging/suite/lands/">webpage</a>.
<BR> <BR>
- </H4>
+ </H3>
</div>
</div>
</div>
| 3 |
diff --git a/src/web/basics/form-elements/input-button/input-button.js b/src/web/basics/form-elements/input-button/input-button.js @@ -84,7 +84,8 @@ class InputButton extends Core {
_removeClass(klass) { this.el.classList.remove(klass) }
_setLabelAttribute(attribute, newValue) {
- this.el.querySelector("." + this.labelClass).setAttribute = newValue;
+ const label = this.el.querySelector("." + this.labelClass);
+ if (label) { label.setAttribute = newValue; }
}
_setInputAttribute(attribute, value) { this._buttonEl().setAttribute(attribute, value); }
| 9 |
diff --git a/src/components/ArrowKeyFocusManager.js b/src/components/ArrowKeyFocusManager.js @@ -33,10 +33,6 @@ class ArrowKeyFocusManager extends Component {
const arrowDownConfig = CONST.KEYBOARD_SHORTCUTS.ARROW_DOWN;
this.unsubscribeArrowUpKey = KeyboardShortcut.subscribe(arrowUpConfig.shortcutKey, () => {
- if (this.props.maxIndex < 1) {
- return;
- }
-
const currentFocusedIndex = this.props.focusedIndex > 0 ? this.props.focusedIndex - 1 : this.props.maxIndex;
let newFocusedIndex = currentFocusedIndex;
@@ -51,10 +47,6 @@ class ArrowKeyFocusManager extends Component {
}, arrowUpConfig.descriptionKey, arrowUpConfig.modifiers, true);
this.unsubscribeArrowDownKey = KeyboardShortcut.subscribe(arrowDownConfig.shortcutKey, () => {
- if (this.props.maxIndex < 1) {
- return;
- }
-
const currentFocusedIndex = this.props.focusedIndex < this.props.maxIndex ? this.props.focusedIndex + 1 : 0;
let newFocusedIndex = currentFocusedIndex;
| 9 |
diff --git a/reader/readerView.css b/reader/readerView.css #backtoarticle {
padding: 2em 0 0 44px;
color: dodgerblue;
- max-width: 800px;
+ max-width: 720px;
margin: auto;
display: block;
box-sizing: border-box;
@@ -17,7 +17,7 @@ body,
html {
padding: 0;
margin: 0;
- font-size: 22px;
+ font-size: 21px;
}
iframe {
display: none;
@@ -30,7 +30,7 @@ iframe.reader-frame {
}
.reader-main {
padding-top: 1em;
- max-width: 800px;
+ max-width: 720px;
display: block;
margin: auto;
}
@@ -114,7 +114,7 @@ body.dark-mode a {
a:hover {
background-image: linear-gradient(to bottom, transparent 70%, currentColor 0%);
background-size: 1px 3px;
- background-position: 0px 0.98em;
+ background-position: 0px 1.03em;
background-repeat: repeat-x;
}
figure {
@@ -129,8 +129,12 @@ figure {
}
}
figure figcaption {
- font-size: 0.9em;
- padding-top: 1em;
+ font-size: 0.8em;
+ margin-top: 1em;
+ opacity: 0.75;
+}
+figure figcaption * {
+ font-family: sans-serif;
}
pre,
pre *,
@@ -167,7 +171,8 @@ body.dark-mode {
.lede-container {
display: none;
}
-figure figcaption .credit {
+figure figcaption .credit,
+figure figcaption [itemprop=copyrightHolder] {
display: block;
font-style: italic;
margin-top: 0.25em;
@@ -179,7 +184,7 @@ figure figcaption .credit {
display: none;
}
-/* wsj */
+/* wsj.com */
dd {
display: block;
@@ -197,3 +202,9 @@ dd {
.off-screen {
display: none;
}
+
+/* lifehacker.com (and possibly others */
+
+svg {
+ display: none;
+}
| 3 |
diff --git a/appjs/logicjavascript.js b/appjs/logicjavascript.js @@ -4850,7 +4850,7 @@ function computejointprobability() {
let result3 = document.getElementById("probability-result3");
var check = true;
- if (favourable1 > 0 && total1 > 0 && favourable2 > 0 && total2 > 0) {
+ if (favourable1 >= 0 && total1 > 0 && favourable2 >= 0 && total2 > 0) {
if (favourable1 > total1) {
result1.innerHTML = "Number of favourable outcomes can't exceeds number of possible outcomes in first event";
check = false;
| 1 |
diff --git a/LightboxImages.user.js b/LightboxImages.user.js // @description Opens image links in a lightbox instead of new window/tab in main & chat. Lightbox images that are displayed smaller than it's original size.
// @homepage https://github.com/samliew/SO-mod-userscripts
// @author @samliew
-// @version 1.4.2
+// @version 1.4.3
//
// @include https://*stackoverflow.com/*
// @include https://*serverfault.com/*
const lbSelector = '.ob-image a, a[href$=".jpg"], a[href$=".png"], a[href$=".gif"]';
+ const ignoredParentClasses = [
+ 'avatar',
+ 'hat',
+ '-logo',
+ ];
jQuery.getCachedScript = function(url, callback) {
// If unlinked images' width is greater than displayed width of at least 100px, also lightbox the image
$('img').filter(function() {
- return typeof this.parentNode.href === 'undefined' && !this.parentNode.className.includes('avatar') && !this.parentNode.className.includes('hat');
+ return typeof this.parentNode.href === 'undefined' && !this.parentNode.classList.some(v => ignoredParentClasses.includes(v));
}).wrap(function() {
return `<a class="unlinked-image" data-src="${this.src}"></a>`;
});
| 8 |
diff --git a/src/pages/using-spark/guides/content-style.mdx b/src/pages/using-spark/guides/content-style.mdx @@ -12,7 +12,7 @@ UX Writers, designers and developers can use this **Content Style Guide** as an
<SprkDivider element="span" additionalClasses="sprk-u-mvn" />
-### Main Takeaways
+## Main Takeaways
- Use headings to label sections in a page according to their importance.
- As a general rule, use **start case** for headers.
| 3 |
diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue @@ -645,7 +645,12 @@ export default {
if (Node.isTimerType(type)) {
return new TimerEventNode(type, definition, diagram);
}
-
+ // Remove undefined or null properties
+ Object.keys(definition).forEach(key => {
+ if (definition[key] === undefined || definition[key] === null) {
+ delete definition[key];
+ }
+ });
return new Node(type, definition, diagram);
},
hasSourceAndTarget(definition) {
| 2 |
diff --git a/index.d.ts b/index.d.ts @@ -24,6 +24,11 @@ type Visibility = 'visible' | 'none'
type Alignment = 'map' | 'viewport';
type AutoAlignment = Alignment | 'auto';
+type NamedStyles<T> = {
+ [P in keyof T]: SymbolLayerStyle | RasterLayerStyle | LineLayerStyle | FillLayerStyle |
+ FillExtrusionLayerStyle | CircleLayerStyle | BackgroundLayerStyle
+};
+
declare namespace MapboxGL {
function setAccessToken(accessToken: string): void;
function getAccessToken(): Promise<void>;
@@ -52,6 +57,7 @@ declare namespace MapboxGL {
class Light extends Component<LightProps> { }
class StyleSheet extends Component {
+ static create<T extends NamedStyles<T> | NamedStyles<any>>(styles: T): void;
camera(stops: {[key: number]: string}, interpolationMode?: InterpolationMode): void;
source(stops: {[key: number]: string}, attributeName: string, interpolationMode?: InterpolationMode): void;
composite(stops: {[key: number]: string}, attributeName: string, interpolationMode?: InterpolationMode): void;
@@ -66,7 +72,7 @@ declare namespace MapboxGL {
* Sources
*/
class VectorSource extends Component<VectorSourceProps> { }
- class ShapeSourceProps extends Component<ShapeSourceProps> { }
+ class ShapeSource extends Component<ShapeSourceProps> { }
class RasterSource extends Component<RasterSourceProps> { }
/**
@@ -143,7 +149,7 @@ interface MapViewProps extends ViewProperties {
pitch?: number;
style?: any;
styleURL?: MapboxGL.StyleURL;
- zoomlevel?: number;
+ zoomLevel?: number;
minZoomLevel?: number;
maxZoomLevel?: number;
localizeLabels?: boolean;
@@ -155,6 +161,8 @@ interface MapViewProps extends ViewProperties {
logoEnabled?: boolean;
compassEnabled?: boolean;
surfaceView?: boolean;
+ regionWillChangeDebounceTime?: number;
+ regionDidChangeDebounceTime?: number;
onPress?: () => void;
onLongPress?: () => void;
| 7 |
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js @@ -326,16 +326,15 @@ function removeMembers(members, policyID) {
* @param {String} policyID
*/
function invite(logins, welcomeNote, policyID) {
- const key = `${ONYXKEYS.COLLECTION.POLICY}${policyID}`;
- const newEmployeeList = _.map(logins, login => OptionsListUtils.addSMSDomainIfPhoneNumber(login));
-
- // Make a shallow copy to preserve original data, and concat the login
- const policy = _.clone(allPolicies[key]);
- policy.employeeList = [...policy.employeeList, ...newEmployeeList];
- policy.alertMessage = '';
+ Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+ alertMessage: '',
+ });
// Optimistically add the user to the policy
- Onyx.merge(key, policy);
+ const newEmployeeLogins = _.map(logins, login => OptionsListUtils.addSMSDomainIfPhoneNumber(login));
+ const employeeUpdate = {};
+ _.each(newEmployeeLogins, login => employeeUpdate[login] = defaultEmployeeListEntry());
+ Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`, employeeUpdate);
// Make the API call to merge the login into the policy
DeprecatedAPI.Policy_Employees_Merge({
@@ -355,16 +354,15 @@ function invite(logins, welcomeNote, policyID) {
}
// If the operation failed, undo the optimistic addition
- const policyDataWithoutLogin = _.clone(allPolicies[key]);
- policyDataWithoutLogin.employeeList = _.without(allPolicies[key].employeeList, ...newEmployeeList);
+ _.each(newEmployeeLogins, login => employeeUpdate[login] = null);
+ Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`, employeeUpdate);
// Show the user feedback that the addition failed
- policyDataWithoutLogin.alertMessage = Localize.translateLocal('workspace.invite.genericFailureMessage');
+ let alertMessage = Localize.translateLocal('workspace.invite.genericFailureMessage');
if (data.jsonCode === 402) {
- policyDataWithoutLogin.alertMessage += ` ${Localize.translateLocal('workspace.invite.pleaseEnterValidLogin')}`;
+ alertMessage += ` ${Localize.translateLocal('workspace.invite.pleaseEnterValidLogin')}`;
}
-
- Onyx.set(key, policyDataWithoutLogin);
+ Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {alertMessage});
});
}
| 4 |
diff --git a/src/Widgets/FormContainerWidget/FormContainerWidgetEditingConfig.js b/src/Widgets/FormContainerWidget/FormContainerWidgetEditingConfig.js @@ -41,7 +41,7 @@ Scrivito.provideEditingConfig("FormContainerWidget", {
content: () => [
new FormTextInputWidget({ required: true }),
new TextWidget({
- text: "<p>By submitting you agree to the terms and conditions of our privacy policy.</p>",
+ text: "<p>By submitting, you agree to the terms and conditions of our privacy policy.</p>",
}),
new FormSubmitButtonWidget(),
],
| 7 |
diff --git a/token-metadata/0xa5a283557653f36cf9aA0d5cC74B1e30422349f2/metadata.json b/token-metadata/0xa5a283557653f36cf9aA0d5cC74B1e30422349f2/metadata.json "symbol": "UETL",
"address": "0xa5a283557653f36cf9aA0d5cC74B1e30422349f2",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/Modal.js b/src/Modal.js @@ -37,6 +37,8 @@ class Modal extends Component {
componentWillReceiveProps (nextProps) {
if (nextProps.open) {
this.showModal();
+ } else if (nextProps.open === false) {
+ this.hideModal();
}
}
@@ -80,6 +82,13 @@ class Modal extends Component {
$(`#${this.modalID}`).modal('open');
}
+ hideModal (e) {
+ if (e) e.preventDefault();
+ const { modalOptions = {} } = this.props;
+ $(`#${this.modalID}`).modal(modalOptions);
+ $(`#${this.modalID}`).modal('close');
+ }
+
render () {
const { trigger } = this.props;
| 11 |
diff --git a/public/js/wire.js b/public/js/wire.js @@ -66,7 +66,7 @@ Wire.prototype.update = function() {
}
else if(simulationArea.mouseDown && simulationArea.lastSelected==this&& !this.checkWithin(simulationArea.mouseX, simulationArea.mouseY)){
// lets move this wiree !
- if(this.node1.parent.objectType=="CircuitElement" && this.node2.parent.objectType=="CircuitElement"){
+ if(this.node1.type == NODE_INTERMEDIATE && this.node2.type == NODE_INTERMEDIATE) {
if(this.type=="horizontal"){
this.node1.y= simulationArea.mouseY
this.node2.y= simulationArea.mouseY
| 7 |
diff --git a/packages/app/src/server/service/page.ts b/packages/app/src/server/service/page.ts @@ -429,7 +429,6 @@ class PageService {
try {
await Page.bulkWrite(updatePathOperations);
- await PageRedirect.bulkWrite(insertPageRedirectOperations);
}
catch (err) {
if (err.code !== 11000) {
@@ -437,6 +436,15 @@ class PageService {
}
}
+ try {
+ await PageRedirect.bulkWrite(insertPageRedirectOperations);
+ }
+ catch (err) {
+ if (err.code !== 11000) {
+ throw Error(`Failed to create PageRedirect documents: ${err}`);
+ }
+ }
+
this.pageEvent.emit('updateMany', pages, user);
}
@@ -474,7 +482,6 @@ class PageService {
try {
await unorderedBulkOp.execute();
- await PageRedirect.bulkWrite(insertPageRedirectOperations);
}
catch (err) {
if (err.code !== 11000) {
@@ -482,6 +489,15 @@ class PageService {
}
}
+ try {
+ await PageRedirect.bulkWrite(insertPageRedirectOperations);
+ }
+ catch (err) {
+ if (err.code !== 11000) {
+ throw Error(`Failed to create PageRedirect documents: ${err}`);
+ }
+ }
+
this.pageEvent.emit('updateMany', pages, user);
}
| 7 |
diff --git a/lib/core/api_client_manager.rb b/lib/core/api_client_manager.rb @@ -14,10 +14,10 @@ module Core
interface: ENV['DEFAULT_SERVICE_INTERFACE'] || 'internal',
debug: Rails.env.development?,
client: {
- open_timeout: 10,
- read_timeout: 30,
+ open_timeout: nil,
+ read_timeout: 60,
verify_ssl: Rails.configuration.ssl_verify_peer,
- keep_alive_timeout: 30
+ keep_alive_timeout: 5
}
}
end
| 12 |
diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js @@ -124,7 +124,7 @@ LayergroupController.prototype.register = function(app) {
allowQueryParams(['layer']),
this.prepareContext,
getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi, forcedFormat),
- center(this.previewBackend),
+ getPreviewImageByCenter(this.previewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
getAffectedTables(this.layergroupAffectedTables, this.pgConnection),
@@ -140,7 +140,7 @@ LayergroupController.prototype.register = function(app) {
allowQueryParams(['layer']),
this.prepareContext,
getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi, forcedFormat),
- bbox(this.previewBackend),
+ getPreviewImageByBoundingBox(this.previewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
getAffectedTables(this.layergroupAffectedTables, this.pgConnection),
@@ -422,8 +422,8 @@ function getTile (tileBackend, profileLabel = 'tile') {
};
}
-function center (previewBackend) {
- return function centerMiddleware (req, res, next) {
+function getPreviewImageByCenter (previewBackend) {
+ return function getPreviewImageByCenterMiddleware (req, res, next) {
const width = +req.params.width;
const height = +req.params.height;
const zoom = +req.params.z;
@@ -457,8 +457,8 @@ function center (previewBackend) {
};
}
-function bbox (previewBackend) {
- return function bboxMiddleware (req, res, next) {
+function getPreviewImageByBoundingBox (previewBackend) {
+ return function getPreviewImageByBoundingBoxMiddleware (req, res, next) {
const width = +req.params.width;
const height = +req.params.height;
const bounds = {
| 10 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.