code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/articles/managing-heap/index.md b/articles/managing-heap/index.md @@ -14,7 +14,7 @@ images:
- url: /engineering-education/managing-heap/hero.jpg
alt: memory drive image example
---
-Memory management is very important. In Google Chrome, [70% of security bugs are memory problems](https://zdnet.com/article/chrom-70-of-all-security-bugs-are-memory-safety-issues/). Fixing memory management would lead to much more reliable and secure programs. There are two possible solutions to this. You can use a language with [better](https://www.rust-lang.org) or [easier](https://www.java.com), or just learn how to use memory properly. We will talk about the latter today.
+Memory management is very important. In Google Chrome, [70% of security bugs are memory problems](https://zdnet.com/article/chrome-70-of-all-security-bugs-are-memory-safety-issues/). Fixing memory management would lead to much more reliable and secure programs. There are two possible solutions to this. You can use a language with [better](https://www.rust-lang.org) or [easier](https://www.java.com) memory management, or just learn how to use memory properly. We will talk about the latter today.
<!--more-->
### The Stack
| 1 |
diff --git a/index.d.ts b/index.d.ts @@ -32,7 +32,7 @@ declare namespace Moleculer {
trace(...args: any[]): void;
}
- type ActionHandler<T = any> = ((ctx: Context) => PromiseLike<T> | T) & ThisType<Service>;
+ type ActionHandler<T = any> = ((ctx: Context<any, any>) => PromiseLike<T> | T) & ThisType<Service>;
type ActionParamSchema = { [key: string]: any };
type ActionParamTypes =
| "any"
@@ -452,7 +452,7 @@ declare namespace Moleculer {
disconnected(): void;
}
- class Context<P = {}, M extends object = {}> {
+ class Context<P = unknown, M extends object = {}> {
constructor(broker: ServiceBroker, endpoint: Endpoint);
id: string;
broker: ServiceBroker;
@@ -1053,6 +1053,7 @@ declare namespace Moleculer {
del(key: string|Array<string>): PromiseLike<any>;
clean(match?: string|Array<string>): PromiseLike<any>;
getCacheKey(actionName: string, params: object, meta: object, keys: Array<string> | null) : string;
+ defaultKeygen(actionName: string, params: object | null, meta: object, keys: Array<string> | null): string;
}
class Memory extends Base {
| 3 |
diff --git a/selenium-test/ratings.js b/selenium-test/ratings.js @@ -103,8 +103,6 @@ exports.testUrls = async function(urlArray) {
let jsonText = await _testUrl(url);
log( jsonText );
let jsonData = JSON.parse(jsonText);
- log( jsonData );
- log( jsonData[0] );
jsonArray.push(jsonData[0]);
}
| 2 |
diff --git a/src/templates/actors/drone-sheet.hbs b/src/templates/actors/drone-sheet.hbs <ul class="attributes flexcol">
<li class="attribute-row flexrow">
<h4 class="defense-name">{{ localize "SFRPG.EnergyArmorClass" }}</h4>
- <span>{{numberFormat system.attributes.eac.value decimals=0 sign=true}}</span>
+ <span>{{numberFormat system.attributes.eac.value decimals=0 sign=false}}</span>
</li>
<li class="attribute-row flexrow">
<h4 class="defense-name">{{ localize "SFRPG.KineticArmorClass" }}</h4>
- <span>{{numberFormat system.attributes.kac.value decimals=0 sign=true}}</span>
+ <span>{{numberFormat system.attributes.kac.value decimals=0 sign=false}}</span>
</li>
<li class="attribute-row flexrow">
<h4 class="defense-name">{{ localize "SFRPG.ACvsCombatManeuversLabel" }}</h4>
- <span>{{numberFormat system.attributes.cmd.value decimals=0 sign=true}}</span>
+ <span>{{numberFormat system.attributes.cmd.value decimals=0 sign=false}}</span>
</li>
</ul>
</li>
| 2 |
diff --git a/packages/http-cors/__tests__/index.js b/packages/http-cors/__tests__/index.js @@ -300,8 +300,8 @@ test('It should not override already declared Access-Control-Allow-Credentials h
// other middleware that puts the cors header
.use({
after: (request) => {
- request.response = request.response ?? {}
- request.response.headers = request.response.headers ?? {}
+ request.response = request.response || {}
+ request.response.headers = request.response.headers || {}
request.response.headers['Access-Control-Allow-Credentials'] = 'true'
}
})
| 1 |
diff --git a/packages/nova-embedly/lib/server/get_embedly_data.js b/packages/nova-embedly/lib/server/get_embedly_data.js @@ -5,8 +5,9 @@ function getEmbedlyData(url) {
var data = {};
var extractBase = 'http://api.embed.ly/1/extract';
var embedlyKey = getSetting('embedlyKey');
+ // 200 x 200 is the minimum size accepted by facebook
var thumbnailWidth = getSetting('thumbnailWidth', 200);
- var thumbnailHeight = getSetting('thumbnailHeight', 125);
+ var thumbnailHeight = getSetting('thumbnailHeight', 200);
if(!embedlyKey) {
// fail silently to still let the post be submitted as usual
| 12 |
diff --git a/test/server/cards/04.5-AaN/GameOfSadane.spec.js b/test/server/cards/04.5-AaN/GameOfSadane.spec.js describe('Game Of Sadane', function() {
integration(function () {
- fdescribe('when a character leaves play during the duel', function () {
+ describe('when a character leaves play during the duel', function () {
beforeEach(function () {
this.setupTest({
phase: 'conflict',
| 2 |
diff --git a/src/font/text.js b/src/font/text.js * @param {String} [settings.textAlign="left"] horizontal text alignment
* @param {String} [settings.textBaseline="top"] the text baseline
* @param {Number} [settings.lineHeight=1.0] line spacing height
- * @param {Number} [settings.z] [z] position order in the parent container
+ * @param {(string|string[])} [settings.text=] a string, or an array of strings
*/
me.Text = me.Renderable.extend(
/** @scope me.Font.prototype */ {
| 1 |
diff --git a/src/article/editor/DownloadSupplementaryFileTool.js b/src/article/editor/DownloadSupplementaryFileTool.js @@ -5,11 +5,26 @@ export default class DownloadSupplementaryFileTool extends Tool {
render ($$) {
let el = super.render($$)
let link = $$('a').ref('link')
- // Downloads a non-remote urls
- .attr('download', '')
// ATTENTION: stop propagation, otherwise infinite loop
.on('click', domHelpers.stop)
+ // Downloading is a bit involved:
+ // In electron, everything can be done with one solution,
+ // handling a 'will-download' event, which is triggered when the `download`
+ // attribute is present.
+ // For the browser, the `download` attribute works only for files from the same
+ // origin. For remote files the best we can do at the moment, is opening
+ // a new tab, and let the browser deal with it.
+ // TODO: if this feature is important, one idea is that the DAR server could
+ // provide an end-point to provide download-urls, and act as a proxy to
+ // cirvumvent the CORS problem.
+ const isLocal = this._isLocal()
+ if (platform.inElectron || isLocal) {
+ link.attr('download', '')
+ } else {
+ link.attr('target', '_blank')
+ }
+
el.append(link)
return el
}
@@ -26,10 +41,8 @@ export default class DownloadSupplementaryFileTool extends Tool {
_triggerDownload () {
const archive = this.context.archive
- const editorSession = this.context.editorSession
- const selectionState = editorSession.getSelectionState()
- const node = selectionState.node
- const isLocal = !node.remote
+ const node = this._getNode()
+ const isLocal = this._isLocal()
let url = node.href
if (isLocal) {
url = archive.getDownloadLink(node.href)
@@ -38,11 +51,16 @@ export default class DownloadSupplementaryFileTool extends Tool {
this.refs.link.el.attr({
'href': url
})
- // Note: in the browser version we want to open remote files in a new tab
- if (!platform.inElectron && !isLocal) {
- this.refs.link.attr('target', '_blank')
- }
this.refs.link.el.click()
}
}
+
+ _getNode () {
+ return this.props.commandState.node
+ }
+
+ _isLocal () {
+ let node = this._getNode()
+ return (!node || !node.remote)
+ }
}
| 7 |
diff --git a/content/articles/integrating-django-with-tinymce/index.md b/content/articles/integrating-django-with-tinymce/index.md @@ -274,7 +274,7 @@ I added the title, changed the text color, wrote some text, clicked the `insert/
This is how my [homepage](http://127.0.0.1:8000/) looks like now:
-
+
### Conclusion
If you're not okay with the size of your TinyMCE text editor, you could go back to its configurations in `settings.py` and adjust the `height` and `width` values until you get the size you want.
| 1 |
diff --git a/assets/js/googlesitekit/widgets/components/WidgetAreaRenderer.js b/assets/js/googlesitekit/widgets/components/WidgetAreaRenderer.js import classnames from 'classnames';
import PropTypes from 'prop-types';
-/**
- * WordPress dependencies
- */
-import { useMemo } from '@wordpress/element';
-
/**
* Internal dependencies
*/
@@ -108,13 +103,17 @@ const WidgetAreaRenderer = ( { slug } ) => {
// Verify that widgets are active (do not render null)
const isActiveWidget = ( widget ) =>
- widgets.find( ( item ) => item.slug === widget.slug ) &&
+ widgets.some( ( item ) => item.slug === widget.slug ) &&
typeof widget.component === 'function' &&
widget.component( {} );
const activeWidgets = widgets.filter( isActiveWidget );
- const widgetClassNames = useMemo( () => {
+ if ( activeWidgets.length === 0 ) {
+ return null;
+ }
+
+ const getWidgetClassNames = () => {
let classNames = [].fill( null, 0, activeWidgets.length );
let counter = 0;
activeWidgets.forEach( ( widget, i ) => {
@@ -154,11 +153,9 @@ const WidgetAreaRenderer = ( { slug } ) => {
}
return classNames;
- }, [ activeWidgets ] );
+ };
- if ( activeWidgets.length === 0 ) {
- return null;
- }
+ const widgetClassNames = getWidgetClassNames();
const widgetsOutput = activeWidgets.map( ( widget, i ) => {
return (
| 2 |
diff --git a/test/routes/v2-info.test.js b/test/routes/v2-info.test.js @@ -12,8 +12,8 @@ beforeAll((done) => {
// Company Info V2
//------------------------------------------------------------
-test('It should return company info', () => {
- return request(app).get('/v2/info').then((response) => {
+test('It should return company info', async () => {
+ const response = await request(app).get('/v2/info');
expect(response.statusCode).toBe(200);
expect(response.body).toHaveProperty('name', 'SpaceX');
expect(response.body).toHaveProperty('founder', 'Elon Musk');
@@ -32,4 +32,3 @@ test('It should return company info', () => {
expect(response.body).toHaveProperty('headquarters.state', 'California');
expect(response.body).toHaveProperty('summary');
});
-});
| 3 |
diff --git a/lib/modules/apostrophe-pieces/public/js/editor-modal.js b/lib/modules/apostrophe-pieces/public/js/editor-modal.js @@ -221,9 +221,8 @@ apos.define('apostrophe-pieces-editor-modal', {
return next(null);
}
- // Redirect to list view if we don't have a manager modal
- // (because then we are editing multiple pieces)
- if ($('.apos-manager').length < 1) {
+ // Redirect to list view if we are on the the page of piece we deleted
+ if (apos.contextPiece && apos.contextPiece._id === piece._id) {
window.location.href = apos.pages.page._url;
}
| 7 |
diff --git a/src/components/Toast.js b/src/components/Toast.js import React from 'react';
import PropTypes from 'prop-types';
-import {Toast, ToastBody, ToastHeader} from 'reactstrap';
+import {Toast as RSToast, ToastBody, ToastHeader} from 'reactstrap';
-class ToastSimple extends React.Component {
+class Toast extends React.Component {
constructor(props) {
super(props);
- this.toggle = this.toggle.bind(this);
+ this.dismiss = this.dismiss.bind(this);
this.state = {
- ToastOpen: props.is_open
+ toastOpen: props.is_open
};
}
- toggle() {
+ dismiss() {
if (this.props.setProps) {
this.props.setProps({
- is_open: !this.state.ToastOpen,
+ is_open: false,
n_dismiss: this.props.n_dismiss + 1,
n_dismiss_timestamp: Date.now()
});
} else {
- this.setState({ToastOpen: !this.state.ToastOpen});
+ this.setState({toastOpen: false});
}
}
- static getDerivedStateFromProps(nextProps, prevState) {
- if (nextProps.is_open != prevState.ToastOpen) {
- return {ToastOpen: nextProps.is_open};
- } else return null;
+ componentWillReceiveProps(nextProps) {
+ if (nextProps.is_open != this.state.toastOpen) {
+ this.setState({toastOpen: nextProps.is_open});
+ if (nextProps.is_open && this.props.duration) {
+ setTimeout(this.dismiss, this.props.duration);
+ }
+ }
+ }
+
+ componentDidMount() {
+ if (this.props.is_open && this.props.duration) {
+ setTimeout(this.dismiss, this.props.duration);
+ }
}
render() {
@@ -43,28 +52,28 @@ class ToastSimple extends React.Component {
...otherProps
} = this.props;
return (
- <Toast isOpen={this.state.ToastOpen} {...otherProps}>
+ <RSToast isOpen={this.state.toastOpen} {...otherProps}>
<ToastHeader
icon={icon}
style={header_style}
className={headerClassName}
- toggle={dismissable && this.toggle}
+ toggle={dismissable && this.dismiss}
>
{header}
</ToastHeader>
<ToastBody style={body_style} className={bodyClassName}>
{children}
</ToastBody>
- </Toast>
+ </RSToast>
);
}
}
-ToastSimple.defaultProps = {
+Toast.defaultProps = {
is_open: true
};
-ToastSimple.propTypes = {
+Toast.propTypes = {
/**
* The ID of this component, used to identify dash components
* in callbacks. The ID needs to be unique across all of the
@@ -144,6 +153,11 @@ ToastSimple.propTypes = {
*/
dismissable: PropTypes.bool,
+ /**
+ * Duration in milliseconds after which the Alert dismisses itself.
+ */
+ duration: PropTypes.number,
+
/**
* An integer that represents the number of times that the dismiss button has
* been clicked on.
@@ -167,4 +181,4 @@ ToastSimple.propTypes = {
icon: PropTypes.string
};
-export default ToastSimple;
+export default Toast;
| 11 |
diff --git a/src/matrix/net/HomeServerApi.ts b/src/matrix/net/HomeServerApi.ts @@ -165,19 +165,20 @@ export class HomeServerApi {
return this._unauthedRequest("GET", this._url("/login"));
}
- register(username: string, password: string, initialDeviceDisplayName: string, auth?: Record<string, any>, inhibitLogin?: boolean , options?: IRequestOptions): IHomeServerRequest {
+ register(username: string | null, password: string, initialDeviceDisplayName: string, auth?: Record<string, any>, inhibitLogin?: boolean , options?: IRequestOptions): IHomeServerRequest {
// todo: This is so that we disable cache-buster because it would cause the hs to respond with error
// see https://github.com/matrix-org/synapse/issues/7722
// need to this about the implications of this later
const _options = options ?? {};
Object.assign(_options, { cache: true });
+ const _username = username ?? undefined;
return this._unauthedRequest(
"POST",
this._url("/register", CS_V3_PREFIX),
undefined,
{
auth,
- username,
+ _username,
password,
initial_device_displayname: initialDeviceDisplayName,
inhibit_login: inhibitLogin ?? false,
| 11 |
diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js @@ -218,7 +218,7 @@ define([
this._initialClippingPlanesOriginMatrix = Matrix4.IDENTITY; // Computed from the tileset JSON.
this._clippingPlanesOriginMatrix = undefined; // Combines the above with any run-time transforms.
- this._recomputeClippingPlaneMatrix = true;
+ this._clippingPlanesOriginMatrixDirty = true;
/**
* Optimization option. Whether the tileset should refine based on a dynamic screen space error. Tiles that are further
@@ -1174,9 +1174,9 @@ define([
return Matrix4.IDENTITY;
}
- if (this._recomputeClippingPlaneMatrix) {
+ if (this._clippingPlanesOriginMatrixDirty) {
Matrix4.multiply(this.root.computedTransform, this._initialClippingPlanesOriginMatrix, this._clippingPlanesOriginMatrix);
- this._recomputeClippingPlaneMatrix = false;
+ this._clippingPlanesOriginMatrixDirty = false;
}
return this._clippingPlanesOriginMatrix;
@@ -1917,7 +1917,7 @@ define([
// Update clipping planes
var clippingPlanes = this._clippingPlanes;
- this._recomputeClippingPlaneMatrix = true;
+ this._clippingPlanesOriginMatrixDirty = true;
if (defined(clippingPlanes) && clippingPlanes.enabled) {
clippingPlanes.update(frameState);
}
| 10 |
diff --git a/assets/src/edit-story/components/sidebar/provider.js b/assets/src/edit-story/components/sidebar/provider.js @@ -25,30 +25,20 @@ import { useState, useCallback, useRef } from 'react';
* Internal dependencies
*/
import ColorPicker from '../../components/colorPicker';
-import {
- LIBRARY_MIN_WIDTH,
- LIBRARY_MAX_WIDTH,
- INSPECTOR_MIN_WIDTH,
- INSPECTOR_MAX_WIDTH,
-} from '../../constants';
+import { WorkspaceLayout, CanvasArea } from '../workspace/layout';
import Context from './context';
-const SidebarLayout = styled.div`
+const SidebarLayout = styled(WorkspaceLayout)`
position: absolute;
left: 0;
right: 0;
top: 0;
height: 0;
z-index: 2;
- display: grid;
- grid:
- '. sidebar .' 1fr
- / minmax(${LIBRARY_MIN_WIDTH}px, ${LIBRARY_MAX_WIDTH}px) 1fr minmax(${INSPECTOR_MIN_WIDTH}px, ${INSPECTOR_MAX_WIDTH}px);
`;
-const Sidebar = styled.div`
- grid-area: sidebar;
- position: relative;
+const Sidebar = styled(CanvasArea)`
+ overflow: visible;
`;
const SidebarContent = styled.div`
| 4 |
diff --git a/src/widgets/popover/Popover.js b/src/widgets/popover/Popover.js @@ -20,7 +20,10 @@ const initialState = {
* body and I can even use <Link to="/">react components</Link> inside it</p>
* }
* className="CustomClassname" // default will be .BusyPopover
- * />
+ * appearOn="bottom-left" // default bottom. available options bottom, bottom-left, right
+ * >
+ * children
+ * </Popover>
*/
export default class Popover extends Component {
constructor(props) {
| 3 |
diff --git a/src/components/permissions/hooks/usePermissions.js b/src/components/permissions/hooks/usePermissions.js @@ -89,22 +89,24 @@ const usePermissions = (permission: Permission, options = {}) => {
const handlePrompt = useCallback(
options => {
- const { promptPopup } = options || {}
- const PopupComponent = promptPopup || PromptPopup
+ const { promptPopup: popupOption } = options || {}
+ const showPopup = popupOption !== false && promptPopup !== false
const onPrompted = result => (true === result ? handleRequest() : handleDenied())
- if (promptPopup === false) {
- onPrompted(true)
- } else {
+ if (showPopup) {
+ const PopupComponent = popupOption || PromptPopup
+
showPopup({
content: <PopupComponent onDismiss={onPrompted} />,
onDismiss: handleDenied,
})
+ } else {
+ onPrompted(true)
}
onPrompt()
},
- [handleRequest, onPrompt, PromptPopup],
+ [handleRequest, onPrompt, promptPopup, PromptPopup],
)
const handleRequestFlow = useCallback(
| 0 |
diff --git a/suneditor/js/suneditor.js b/suneditor/js/suneditor.js */
if(typeof window.SUNEDITOR === 'undefined') {window.SUNEDITOR = {}; SUNEDITOR.plugin = {};}
-/** default language (english) */
+/**
+ * @description default language (english)
+ */
SUNEDITOR.defaultLang = {
toolbar : {
fontFamily : 'Font',
@@ -79,7 +81,7 @@ SUNEDITOR.defaultLang = {
'use strict';
/**
- * @summary utile function
+ * @description utile function
*/
var func = SUNEDITOR.func = {
/**
@@ -155,7 +157,7 @@ SUNEDITOR.defaultLang = {
};
/**
- * @summary document function
+ * @description document function
*/
var dom = SUNEDITOR.dom = {
/**
@@ -364,25 +366,38 @@ SUNEDITOR.defaultLang = {
};
/**
- * @summary SunEditor core closure
+ * @description SunEditor core closure
* @param context
* @param dom
* @param func
- * @returns {save, getContent, setContent, appendContent, disabled, enabled, show, hide, destroy}
+ * @returns {{save: save, getContent: getContent, setContent: setContent, appendContent: appendContent, disabled: disabled, enabled: enabled, show: show, hide: hide, destroy: destroy}}
*/
var core = function(context, dom, func){
/**
- * @summary Practical editor function
+ * @description Practical editor function
* This function is 'this' used by other plugins
*/
var editor = SUNEDITOR.editor = {
- /** editor elements and loaded plugins */
+ /**
+ * @description editor elements
+ */
context : context,
+ /**
+ * @description loaded plugins
+ */
loadedPlugins : {},
- /** dialog element, submenu element, controller array (image resize area, link modified button) */
+ /**
+ * @description dialog element
+ */
dialogForm : null,
+ /**
+ * @description submenu element
+ */
submenu : null,
+ /**
+ * @description controllers array (image resize area, link modified button)
+ */
controllerArray : [],
/** Number of blank characters to be entered when tab key is operated */
@@ -461,6 +476,9 @@ SUNEDITOR.defaultLang = {
this.controllersOff();
},
+ /**
+ * @description Disable controller in editor area (link button, image resize button)
+ */
controllersOff : function() {
var len = this.controllerArray.length;
if(len > 0) {
@@ -821,7 +839,7 @@ SUNEDITOR.defaultLang = {
};
/**
- * @summary event function
+ * @description event function
*/
var event = {
resize_window : function() {
@@ -1239,7 +1257,7 @@ SUNEDITOR.defaultLang = {
};
/**
- * @summary Create editor HTML
+ * @description Create editor HTML
* @param options - user option
*/
var createToolBar = function (options){
@@ -1633,7 +1651,7 @@ SUNEDITOR.defaultLang = {
};
/**
- * @summary create Suneditor
+ * @description create Suneditor
* @param elementId
* @param options
* @returns {save|getContent|setContent|appendContent|disabled|enabled|show|hide|destroy}
@@ -1668,7 +1686,7 @@ SUNEDITOR.defaultLang = {
};
/**
- * @summary destroy Suneditor
+ * @description destroy Suneditor
* @param elementId
*/
SUNEDITOR.destroy = function(elementId) {
| 3 |
diff --git a/src/extensions/renderer/base/coord-ele-math/edge-control-points.js b/src/extensions/renderer/base/coord-ele-math/edge-control-points.js @@ -284,14 +284,16 @@ BRp.findTaxiPoints = function( edge, pairInfo ){
const dx = subDWH(pdx, dw);
const dy = subDWH(pdy, dh);
+ let isExplicitDir = false;
+
if( taxiDir === AUTO ){
taxiDir = Math.abs(dx) > Math.abs(dy) ? HORIZONTAL : VERTICAL;
- }
-
- if( taxiDir === UPWARD || taxiDir === DOWNWARD ){
+ } else if( taxiDir === UPWARD || taxiDir === DOWNWARD ){
taxiDir = VERTICAL;
+ isExplicitDir = true;
} else if( taxiDir === LEFTWARD || taxiDir === RIGHTWARD ){
taxiDir = HORIZONTAL;
+ isExplicitDir = true;
}
const isVert = taxiDir === VERTICAL;
@@ -301,10 +303,13 @@ BRp.findTaxiPoints = function( edge, pairInfo ){
let forcedDir = false;
if(
+ !(isExplicitDir && turnIsPercent) // forcing in this case would cause weird growing in the opposite direction
+ && (
(rawTaxiDir === DOWNWARD && pl < 0)
|| (rawTaxiDir === UPWARD && pl > 0)
|| (rawTaxiDir === LEFTWARD && pl > 0)
|| (rawTaxiDir === RIGHTWARD && pl < 0)
+ )
){
sgnL *= -1;
l = sgnL * Math.abs(l);
| 7 |
diff --git a/src/main/resources/public/js/src/analytics/AnalyticsGA.js b/src/main/resources/public/js/src/analytics/AnalyticsGA.js @@ -49,7 +49,7 @@ define(function (require) {
if (services && services.API && services.API.extensions && services.API.extensions.instanceId) {
instanceId = services.API.extensions.instanceId;
}
- ga('set', 'hostname', instanceId);
+ ga('set', 'campaignMedium', instanceId);
});
},
send: function (data) {
| 12 |
diff --git a/server/views/user.py b/server/views/user.py @@ -53,7 +53,9 @@ def permissions_for_user():
@api_error_handler
def signup():
logger.debug("reg request from %s", request.form['email'])
- subscribe_to_newsletter = 1 if request.form['subscribeToNewsletter'] == 'true' else 0
+ subscribe_to_newsletter = 0
+ if ('subscribeToNewsletter' in request.form) and (request.form['subscribeToNewsletter'] == 'true'):
+ subscribe_to_newsletter = 1
results = mc.authRegister(request.form['email'],
request.form['password'],
request.form['fullName'],
| 9 |
diff --git a/data.js b/data.js @@ -5251,6 +5251,14 @@ module.exports = [
url: "https://github.com/branneman/TinyAnimate",
source: "https://raw.githubusercontent.com/branneman/TinyAnimate/master/src/TinyAnimate.js"
},
+ {
+ name: "ns.js",
+ github: "Soldier-B/ns.js",
+ tags: ["namespace","module","scope","simple","name","space"],
+ description: "A small and simple Javascript namespace function",
+ url: "https://github.com/Soldier-B/ns.js",
+ source: "https://raw.githubusercontent.com/Soldier-B/ns.js/master/ns.js"
+ },
{
name: "microTK",
github: "microTK/microTK",
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md ## 7.0.1 (unreleased)
-### Breaking
-
-### Feature
-
### Bugfix
-### Internal
-
-- Adding absolute url in ObjectBrowser for image type
+- Adding absolute url in ObjectBrowser for image type @iFlameing
## 7.0.0 (2020-07-06)
| 6 |
diff --git a/src/material.js b/src/material.js @@ -348,13 +348,13 @@ class gltfMaterial extends GltfObject
{
specularFactor = this.extensions.KHR_materials_specular.specularFactor;
}
- if (this.MetallicRoughnessSpecularTexture !== undefined)
+ if (this.metallicRoughnessSpecularTexture !== undefined)
{
- this.MetallicRoughnessSpecularTexture.samplerName = "u_MetallicRoughnessSpecularSampler";
- this.parseTextureInfoExtensions(this.MetallicRoughnessSpecularTexture, "MetallicRoughnessSpecular");
- this.textures.push(this.MetallicRoughnessSpecularTexture);
+ this.metallicRoughnessSpecularTexture.samplerName = "u_MetallicRoughnessSpecularSampler";
+ this.parseTextureInfoExtensions(this.metallicRoughnessSpecularTexture, "MetallicRoughnessSpecular");
+ this.textures.push(this.metallicRoughnessSpecularTexture);
this.defines.push("HAS_METALLICROUGHNESS_SPECULAROVERRIDE_MAP 1");
- this.properties.set("u_MetallicRougnessSpecularTextureUVSet", this.MetallicRoughnessSpecularTexture.texCoord);
+ this.properties.set("u_MetallicRougnessSpecularTextureUVSet", this.metallicRoughnessSpecularTexture.texCoord);
}
}
this.properties.set("u_MetallicRoughnessSpecularFactor", specularFactor);
@@ -494,7 +494,7 @@ class gltfMaterial extends GltfObject
{
const specularTexture = new gltfTextureInfo();
specularTexture.fromJson(jsonMRSpecular.specularTexture);
- this.MetallicRoughnessSpecularTexture = specularTexture;
+ this.metallicRoughnessSpecularTexture = specularTexture;
}
}
}
| 12 |
diff --git a/docs/content/docs/themes.md b/docs/content/docs/themes.md @@ -51,7 +51,7 @@ You can [download][bootstrap-download] a stylesheet and serve it locally if you
There are numerous free to use Bootstrap stylesheets available on the web. The `dash_bootstrap_components.themes` module contains CDN links for Bootstrap and all of the [Bootswatch themes][bootswatch-themes]. Bootstrap also maintains its own [themes website][bootstrap-themes] which lists a number of free and premium themes that you could incorporate into your apps.
-To start with, we recommend experimenting with some of the Bootswatch themes available in the `dash_bootstrap_components.themes` module. The full list of available themes is [`CERULEAN`](https://bootswatch.com/cerulean/), [`COSMO`](https://bootswatch.com/cosmo/), [`CYBORG`](https://bootswatch.com/cosmos/), [`DARKLY`](https://bootswatch.com/darkly/), [`FLATLY`](https://bootswatch.com/flatly/), [`JOURNAL`](https://bootswatch.com/journal/), [`LITERA`](https://bootswatch.com/litera/), [`LUMEN`](https://bootswatch.com/lumen/), [`LUX`](https://bootswatch.com/cosmos/), [`MATERIA`](https://bootswatch.com/materia/), [`MINTY`](https://bootswatch.com/minty/), [`PULSE`](https://bootswatch.com/pulse/), [`SANDSTONE`](https://bootswatch.com/sandstone/), [`SIMPLEX`](https://bootswatch.com/simplex/), [`SKETCHY`](https://bootswatch.com/sketchy/), [`SLATE`](https://bootswatch.com/slate/), [`SOLAR`](https://bootswatch.com/solar/), [`SPACELAB`](https://bootswatch.com/spacelab/), [`SUPERHERO`](https://bootswatch.com/superhero/), [`UNITED`](https://bootswatch.com/united/), [`YETI`](https://bootswatch.com/cosmos/)
+To start with, we recommend experimenting with some of the Bootswatch themes available in the `dash_bootstrap_components.themes` module. The full list of available themes is [`CERULEAN`](https://bootswatch.com/cerulean/), [`COSMO`](https://bootswatch.com/cosmo/), [`CYBORG`](https://bootswatch.com/cyborg/), [`DARKLY`](https://bootswatch.com/darkly/), [`FLATLY`](https://bootswatch.com/flatly/), [`JOURNAL`](https://bootswatch.com/journal/), [`LITERA`](https://bootswatch.com/litera/), [`LUMEN`](https://bootswatch.com/lumen/), [`LUX`](https://bootswatch.com/lux/), [`MATERIA`](https://bootswatch.com/materia/), [`MINTY`](https://bootswatch.com/minty/), [`PULSE`](https://bootswatch.com/pulse/), [`SANDSTONE`](https://bootswatch.com/sandstone/), [`SIMPLEX`](https://bootswatch.com/simplex/), [`SKETCHY`](https://bootswatch.com/sketchy/), [`SLATE`](https://bootswatch.com/slate/), [`SOLAR`](https://bootswatch.com/solar/), [`SPACELAB`](https://bootswatch.com/spacelab/), [`SUPERHERO`](https://bootswatch.com/superhero/), [`UNITED`](https://bootswatch.com/united/), [`YETI`](https://bootswatch.com/yeti/)
[dash-docs-external]: https:/dash.plot.ly/external-resources/
[bootstrapcdn]: https://www.bootstrapcdn.com/
| 1 |
diff --git a/apps/heatmap/init.js b/apps/heatmap/init.js @@ -261,20 +261,20 @@ function initUIcomponents(){
// free draw
{
//icon:'linear_scale',
- value:10,
- title:'10x',
+ value:0.5,
+ title:'0.5',
checked:true
},
// rectangle fraw
{
//icon:'timeline',
- value:20,
- title:'20x'
+ value:1,
+ title:'1.0'
},
{
//icon:'timeline',
- value:40,
- title:'40x'
+ value:2,
+ title:'2.0'
}
],
callback:toggleMagnifier
| 1 |
diff --git a/src/components/auth/torus/sdk/strategies.js b/src/components/auth/torus/sdk/strategies.js import { Platform } from 'react-native'
import { replace } from 'lodash'
-import { isIOSNative } from '../../../../lib/utils/platform'
-const IosMobileLoginConfig = {
- jwtParams: {
- prompt: isIOSNative ? 'login' : undefined,
+const jwtParams = Platform.select({
+ default: {},
+ ios: {
+ prompt: 'login',
},
-}
+})
/* eslint-disable require-await */
export const LoginStrategy = {
@@ -80,7 +80,7 @@ export class FacebookStrategy extends AbstractLoginStrategy {
typeOfLogin: 'facebook',
verifier: torusFacebook,
clientId: facebookAppId,
- ...IosMobileLoginConfig,
+ jwtParams,
})
}
}
@@ -94,7 +94,7 @@ export class GoogleLegacyStrategy extends AbstractLoginStrategy {
typeOfLogin: 'google',
verifier: torusGoogle,
clientId: googleClientId,
- ...IosMobileLoginConfig,
+ jwtParams,
})
}
}
@@ -114,7 +114,7 @@ export class GoogleStrategy extends AbstractLoginStrategy {
// for mainnet torus uses a different verifier
verifier: config.env === 'production' ? 'google' : 'google-shubs',
- ...IosMobileLoginConfig,
+ jwtParams,
},
],
})
@@ -137,7 +137,7 @@ export class Auth0Strategy extends AbstractAuth0Strategy {
jwtParams: {
connection: 'Username-Password-Authentication',
domain: auth0ServerUri,
- ...IosMobileLoginConfig.jwtParams,
+ ...jwtParams,
},
},
],
@@ -162,7 +162,7 @@ export class PaswordlessEmailStrategy extends AbstractAuth0Strategy {
connection: '',
domain: auth0ServerUri,
verifierIdField: 'name',
- ...IosMobileLoginConfig.jwtParams,
+ ...jwtParams,
},
},
],
@@ -183,7 +183,7 @@ export class PaswordlessSMSStrategy extends AbstractAuth0Strategy {
connection: '',
domain: auth0ServerUri,
verifierIdField: 'name',
- ...IosMobileLoginConfig.jwtParams,
+ ...jwtParams,
},
})
}
| 0 |
diff --git a/404.js b/404.js @@ -161,6 +161,7 @@ const _setUrl = async u => {
<img src="https://preview.exokit.org/[https://raw.githubusercontent.com/avaer/vrm-samples/master/vroid/male.vrm]/preview.png" class="avatar">
<div class=detail-1>${username}</div>
<div class=detail-2>${myAddress}</div>
+ <div class=detail-3>${file.properties.hash.slice(2)}</div>
</div>
</li>
`)).flat().join('\n');
@@ -228,6 +229,7 @@ const _setUrl = async u => {
<img src="https://preview.exokit.org/[https://raw.githubusercontent.com/avaer/vrm-samples/master/vroid/male.vrm]/preview.png" class="avatar">
<div class=detail-1>${username}</div>
<div class=detail-2>${myAddress}</div>
+ <div class=detail-3>${file.properties.hash.slice(2)}</div>
</div>
</li>
`).join('\n');
@@ -319,6 +321,7 @@ const _setUrl = async u => {
<img src="https://preview.exokit.org/[https://raw.githubusercontent.com/avaer/vrm-samples/master/vroid/male.vrm]/preview.png" class="avatar">
<div class=detail-1>${username}</div>
<div class=detail-2>${myAddress}</div>
+ <div class=detail-3>${file.properties.hash.slice(2)}</div>
</div>
</li>
`).join('\n');
| 0 |
diff --git a/edit.js b/edit.js @@ -1990,6 +1990,42 @@ const cometFireMesh = (() => {
scene.add(cometFireMesh);
const hpMesh = (() => {
+ const mesh = new THREE.Object3D();
+
+ let hp = 37;
+ let animation = null;
+ mesh.damage = dmg => {
+ hp -= dmg;
+ hp = Math.max(hp, 0);
+ textMesh.text = _getText();
+ textMesh.sync();
+ barMesh.scale.x = _getBar();
+
+ const startTime = Date.now();
+ const endTime = startTime + 500;
+ animation = {
+ update() {
+ const now = Date.now();
+ const factor = (now - startTime) / (endTime - startTime);
+ if (factor < 1) {
+ frameMesh.position.set(0, 0, 0)
+ .add(localVector2.set(-1+Math.random()*2, -1+Math.random()*2, -1+Math.random()*2).multiplyScalar((1-factor)*0.02));
+ } else {
+ animation.end();
+ animation = null;
+ }
+ },
+ end() {
+ frameMesh.position.set(0, 0, 0);
+ material.color.setHex(0x000000);
+ },
+ };
+ material.color.setHex(0xb71c1c);
+ };
+ mesh.update = () => {
+ animation && animation.update();
+ };
+
const geometry = BufferGeometryUtils.mergeBufferGeometries([
new THREE.PlaneBufferGeometry(1, 0.02).applyMatrix4(new THREE.Matrix4().makeTranslation(0, 0.02, 0)),
new THREE.PlaneBufferGeometry(1, 0.02).applyMatrix4(new THREE.Matrix4().makeTranslation(0, -0.02, 0)),
@@ -1999,8 +2035,9 @@ const hpMesh = (() => {
const material = new THREE.MeshBasicMaterial({
color: 0x000000,
});
- const mesh = new THREE.Mesh(geometry, material);
- mesh.frustumCulled = false;
+ const frameMesh = new THREE.Mesh(geometry, material);
+ frameMesh.frustumCulled = false;
+ mesh.add(frameMesh);
const geometry2 = new THREE.PlaneBufferGeometry(1, 0.02).applyMatrix4(new THREE.Matrix4().makeTranslation(1/2, 0, 0))
const material2 = new THREE.MeshBasicMaterial({
@@ -2009,11 +2046,13 @@ const hpMesh = (() => {
const barMesh = new THREE.Mesh(geometry2, material2);
barMesh.position.x = -1/2;
barMesh.position.z = -0.001;
- barMesh.scale.x = 37/100;
+ const _getBar = () => hp/100;
+ barMesh.scale.x = _getBar();
barMesh.frustumCulled = false;
- mesh.add(barMesh);
+ frameMesh.add(barMesh);
- const textMesh = makeTextMesh('HP 37/100', './Bangers-Regular.ttf', 0.05, 'left', 'bottom');
+ const _getText = () => `HP ${hp}/100`;
+ const textMesh = makeTextMesh(_getText(), './Bangers-Regular.ttf', 0.05, 'left', 'bottom');
textMesh.position.x = -1/2;
textMesh.position.y = 0.05;
mesh.add(textMesh);
@@ -2363,7 +2402,6 @@ function animate(timestamp, frame) {
return false;
}
});
-
for (let i = 0; i < remoteChunkMeshes.length; i++) {
const chunkMesh = remoteChunkMeshes[i];
chunkMesh.material[0].uniforms.uTime.value = (now % timeFactor) / timeFactor;
@@ -2372,7 +2410,7 @@ function animate(timestamp, frame) {
}
}
cometFireMesh.material.uniforms.uAnimation.value = (Date.now() % 2000) / 2000;
-
+ hpMesh.update();
for (let i = 0; i < npcMeshes.length; i++) {
npcMeshes[i].update();
}
@@ -2651,6 +2689,9 @@ function animate(timestamp, frame) {
scene.add(explosionMesh);
explosionMeshes.push(explosionMesh);
};
+ const _damage = dmg => {
+ hpMesh.damage(dmg);
+ };
switch (selectedWeapon) {
case 'rifle': {
_hit()
@@ -2682,6 +2723,7 @@ function animate(timestamp, frame) {
pxMesh.getWorldPosition(localVector2);
pxMesh.getWorldQuaternion(localQuaternion2);
_explode(localVector2, localQuaternion2);
+ _damage(15);
return false;
}
};
| 0 |
diff --git a/src/views/user/components/communityList.js b/src/views/user/components/communityList.js @@ -4,12 +4,12 @@ import Link from 'src/components/link';
import { connect } from 'react-redux';
import { withRouter } from 'react-router';
import compose from 'recompose/compose';
-import { CommunityListItem } from '../../../components/listItems';
-import Icon from '../../../components/icons';
+import { CommunityListItem } from 'src/components/listItems';
+import Icon from 'src/components/icons';
import { getUserCommunityConnection } from 'shared/graphql/queries/user/getUserCommunityConnection';
import type { GetUserCommunityConnectionType } from 'shared/graphql/queries/user/getUserCommunityConnection';
-import { ListContainer } from '../../../components/listItems/style';
+import { ListContainer } from 'src/components/listItems/style';
type Props = {
data: {
@@ -59,7 +59,7 @@ class CommunityList extends React.Component<Props> {
reputation={
community.contextPermissions
? community.contextPermissions.reputation
- : '0'
+ : 0
}
>
<Icon glyph="view-forward" />
| 1 |
diff --git a/src/common/sockets/protocol/extend-socket/Node-Protocol.js b/src/common/sockets/protocol/extend-socket/Node-Protocol.js @@ -186,7 +186,7 @@ class NodeProtocol {
this.node.sendRequest("head/new-block", {
l: Blockchain.blockchain.blocks.length,
- h: Blockchain.blockchain.blocks.last.chainHash,
+ h: Blockchain.blockchain.blocks.last.hashChain,
s: Blockchain.blockchain.blocks.blocksStartingPoint,
p: Blockchain.blockchain.agent.light ? ( Blockchain.blockchain.proofPi !== undefined && Blockchain.blockchain.proofPi.validatesLastBlock() ? true : false ) : true, // i also have the proof
W: Blockchain.blockchain.blocks.chainWorkSerialized, // chain work
| 14 |
diff --git a/src/platform/web/ui/session/room/RoomView.js b/src/platform/web/ui/session/room/RoomView.js @@ -68,10 +68,10 @@ export class RoomView extends TemplateView {
const vm = this.value;
const options = [];
if (vm.canLeave) {
- options.push(Menu.option(vm.i18n`Leave room`, () => vm.leaveRoom()));
+ options.push(Menu.option(vm.i18n`Leave room`, () => vm.leaveRoom()).setDestructive());
}
if (vm.canForget) {
- options.push(Menu.option(vm.i18n`Forget room`, () => vm.forgetRoom()));
+ options.push(Menu.option(vm.i18n`Forget room`, () => vm.forgetRoom()).setDestructive());
}
if (vm.canRejoin) {
options.push(Menu.option(vm.i18n`Rejoin room`, () => vm.rejoinRoom()));
| 12 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -220,13 +220,12 @@ This will produce the following plot, and say you want to simulate a selection p
- Distributed files are in `dist/`
- CommonJS require-able modules are in `lib/`
-- Sources files are in `src/`, including the index
+- Sources files are in `src/`
- Build and repo management scripts are in `tasks/`
- All tasks can be run using [`npm run-script`](https://docs.npmjs.com/cli/run-script)
- Tests are `test/`, they are partitioned into `image` and `jasmine` tests
- Test dashboard and image viewer code is in `devtools/`
-- Built files are in `build/` (most files in here are git-ignored, the css and font built files are exceptions)
-
+- Built files are in `build/` (the files in here are git-ignored, except for `plotcss.js`)
## Coding style
| 3 |
diff --git a/components/mapbox/ban-map/index.js b/components/mapbox/ban-map/index.js @@ -136,23 +136,19 @@ function BanMap({map, isSourceLoaded, popup, address, setSources, setLayers, onS
}
}, [map, address])
- const editPaintProperties = useCallback(() => {
- const layerPaint = isSourcesLegendActive ? sourcesLayerPaint : defaultLayerPaint
-
- map.setPaintProperty(adresseCircleLayer.id, 'circle-color', layerPaint)
- map.setPaintProperty(adresseLabelLayer.id, 'text-color', layerPaint)
- map.setPaintProperty(adresseCompletLabelLayer.id, 'text-color', layerPaint)
- }, [map, isSourcesLegendActive])
-
useEffect(() => {
isAddressVisible()
}, [address, isAddressVisible])
useEffect(() => {
if (isSourceLoaded) {
- editPaintProperties()
+ const layerPaint = isSourcesLegendActive ? sourcesLayerPaint : defaultLayerPaint
+
+ map.setPaintProperty(adresseCircleLayer.id, 'circle-color', layerPaint)
+ map.setPaintProperty(adresseLabelLayer.id, 'text-color', layerPaint)
+ map.setPaintProperty(adresseCompletLabelLayer.id, 'text-color', layerPaint)
}
- }, [isSourceLoaded, editPaintProperties])
+ }, [isSourceLoaded, isSourcesLegendActive, map])
useEffect(() => {
map.off('dragend', isAddressVisible)
| 2 |
diff --git a/src/spatial/platform.js b/src/spatial/platform.js @@ -239,6 +239,9 @@ Crafty.c("GroundAttacher", {
*
* Additionally, this component provides the entity with `Supportable` and `Motion` methods & events.
*
+ * Simulates jumping and falling when used with the `Twoway` component and is thus well suited for side-scrolling platformer type games.
+ * This component should not be used alongside `Fourway` or `Multiway`.
+ *
* @see Supportable, Motion
*/
Crafty.c("Gravity", {
| 7 |
diff --git a/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js b/lib/node_modules/@stdlib/_tools/scripts/publish_packages.js @@ -48,7 +48,7 @@ var ENV = require( '@stdlib/process/env' );
var debug = logger( 'scripts:publish-packages' );
-var LAST_PKG_INDEX = 9;
+var LAST_PKG_INDEX = 12;
var INSTALLATION_SECTION = [
'<section class="installation">',
@@ -400,8 +400,12 @@ function publish( pkg, clbk ) {
'homepage': 'https://github.com/stdlib-js/stdlib',
'issues': false,
'wiki': false,
+ 'projects': false,
'private': false,
- 'token': ENV.GITHUB_TOKEN
+ 'token': ENV.GITHUB_TOKEN,
+ 'allowSquashMerge': true,
+ 'allowRebaseMerge': false,
+ 'allowMergeCommit': false
}, onRepoCreation );
}
| 12 |
diff --git a/ui/src/components/common/Date.jsx b/ui/src/components/common/Date.jsx -import React, { PureComponent } from 'react';
-import { min } from 'lodash';
-import { FormattedDate, FormattedTime } from 'react-intl';
+import React from 'react';
+import { Date } from '@alephdata/vislib';
+import { connect } from 'react-redux';
-class Earliest extends PureComponent {
- render() {
- const earliest = min(this.props.values);
- return <Date value={earliest} />;
- }
-}
+import { selectLocale } from 'src/selectors';
+const mapStateToProps = state => ({
+ locale: selectLocale(state),
+});
-class Date extends PureComponent {
- static Earliest = Earliest;
-
- render() {
- const { value: dateString, showTime } = this.props;
- if (!dateString) {
- return null;
- }
- const availableChunks = dateString.split(/-/);
- const dateObject = Reflect.construct(window.Date, [dateString]);
- return (
- <>
- <FormattedDate
- value={dateObject}
- year="numeric"
- month={availableChunks[1] && '2-digit'}
- day={availableChunks[2] && '2-digit'}
- />
- {showTime && (
- <>
- <span>-</span>
- <FormattedTime value={dateObject} />
- </>
- )}
- </>
- );
- }
-}
-
-export default Date;
+export default connect(mapStateToProps)(Date);
| 14 |
diff --git a/src/modules/dex/directives/dexWatchlist/DexWatchlist.html b/src/modules/dex/directives/dexWatchlist/DexWatchlist.html <w-input placeholder="directives.watchlist.placeholders.coin"
ng-model="$ctrl.search"
- ng-focus="$ctrl.focused = true"
- ng-blur="$ctrl.focused = false"
w-i18n-attr="placeholder"></w-input>
<div class="search-list"
ng-if="$ctrl.shouldShowSearchResults()">
<div class="search-item"
ng-repeat="asset in $ctrl.assetSearchResults track by asset.id"
- ng-click="$ctrl.addNewPair(asset)"
+ ng-click="$ctrl.addNewPairFromSearch(asset)"
ng-class="{
'watched': asset.isWatched
}">
| 5 |
diff --git a/src/lib/reduxHelpers.js b/src/lib/reduxHelpers.js @@ -254,14 +254,22 @@ export function createIndexedAsyncReducer(handlers) {
handleSuccess: (payload, state, args) => {
const { uid } = args[0];
// const { uid } = meta;
- const updatedResults = [...state.results];
const updatedFetchStatuses = { ...state.fetchStatuses };
updatedFetchStatuses[uid] = fetchConstants.FETCH_SUCCEEDED;
+ // if results already exist (by uid), we need to replace them, otherwise add them as new results
+ const updatedResults = [...state.results];
+ let resultsToSave;
if ('handleSuccess' in handlers) {
const results = handlers.handleSuccess(payload, state, args, uid);
- updatedResults.push({ uid, results });
+ resultsToSave = { uid, results };
+ } else {
+ resultsToSave = { uid, ...payload };
+ }
+ const itemIndex = updatedResults.findIndex(item => item.uid === uid); // does this UID exist?
+ if (itemIndex === -1) {
+ updatedResults.push(resultsToSave);
} else {
- updatedResults.push({ uid, ...payload });
+ updatedResults[itemIndex] = resultsToSave;
}
return Object.assign({}, state, {
fetchStatus: fetchConstants.combineFetchStatuses(updatedFetchStatuses),
| 14 |
diff --git a/assets/src/edit-story/components/panels/captions/captions.js b/assets/src/edit-story/components/panels/captions/captions.js @@ -36,7 +36,25 @@ import { getCommonValue } from '../utils';
import { useConfig } from '../../../app';
import { useMediaPicker } from '../../mediaPicker';
-const Section = styled.div``;
+const Section = styled.div`
+ display: grid;
+ grid-template-areas: 'Options Remove';
+ grid-template-columns: auto 30px;
+`;
+const Options = styled.div`
+ grid-area: Options;
+`;
+const Remove = styled.div`
+ grid-area: Remove;
+ justify-self: center;
+ align-self: center;
+`;
+const RemoveButton = styled.button`
+ border: 0px;
+ background: none;
+ padding: 0;
+ color: ${({ theme }) => theme.colors.fg.white};
+`;
function CaptionsPanel({ selectedElements, pushUpdate }) {
const tracks = getCommonValue(selectedElements, 'tracks', []);
@@ -107,6 +125,7 @@ function CaptionsPanel({ selectedElements, pushUpdate }) {
{tracks &&
tracks.map(({ id, srclang, trackName }) => (
<Section key={`section-${id}`}>
+ <Options>
<Row>
<ExpandedTextInput
value={trackName}
@@ -125,9 +144,14 @@ function CaptionsPanel({ selectedElements, pushUpdate }) {
key={`dropdown-${id}`}
/>
</Row>
+ </Options>
+ <Remove>
<Row>
- <Button onClick={() => handleRemoveTrack(id)}>{'X'}</Button>
+ <RemoveButton onClick={() => handleRemoveTrack(id)}>
+ {'x'}
+ </RemoveButton>
</Row>
+ </Remove>
</Section>
))}
| 7 |
diff --git a/src/base/README.md b/src/base/README.md @@ -54,7 +54,7 @@ See [site-config](global-config/README.md)
### `this.netlify`
-An instance of the [`netlify`]('../utils/api/README.md') api client.
+An instance of the [`netlify`](../utils/api/README.md) api client.
#### `this.authenticate()`
| 2 |
diff --git a/services/flow-repository/test/test.js b/services/flow-repository/test/test.js @@ -270,9 +270,12 @@ describe('Flow Validation', () => {
});
expect(res.status).toEqual(400);
expect(res.body.errors).toHaveLength(3);
- expect(res.body.errors).toContainEqual({ code: 400, message: 'Cast to ObjectID failed for value "abc" at path "componentId"' });
- expect(res.body.errors).toContainEqual({ code: 400, message: 'Cast to ObjectID failed for value "IncorrectSecret" at path "credentials_id"' });
- expect(res.body.errors).toContainEqual({ code: 400, message: 'Flows with more than one node require edges.' });
+ const expectedArray = [
+ { code: 400, message: 'Cast to ObjectID failed for value "abc" at path "componentId"' },
+ { code: 400, message: 'Cast to ObjectID failed for value "IncorrectSecret" at path "credentials_id"' },
+ { code: 400, message: 'Flows with more than one node require edges.' },
+ ];
+ expect(res.body.errors).toMatchObject(expectedArray);
});
test('should refuse a flow with malformed edges', async () => {
| 4 |
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js @@ -4,6 +4,7 @@ import {
View,
TouchableOpacity,
InteractionManager,
+ Platform,
} from 'react-native';
import _ from 'underscore';
import lodashGet from 'lodash/get';
@@ -135,12 +136,15 @@ class ReportActionCompose extends React.Component {
this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
this.getIOUOptions = this.getIOUOptions.bind(this);
this.addAttachment = this.addAttachment.bind(this);
-
this.comment = props.comment;
- this.shouldFocusInputOnScreenFocus = canFocusInputOnScreenFocus();
+
+ // React Native will retain focus on an input for native devices but web/mWeb behave differently so we have some focus management
+ // code that will refocus the compose input after a user closes a modal or some other actions, see usage of ReportActionComposeFocusManager
+ this.isWeb = Platform.select({native: () => false, default: () => true});
+ console.log('bondydaa '+this.isWeb);
this.state = {
- isFocused: this.shouldFocusInputOnScreenFocus && !this.props.modal.isVisible && !this.props.modal.willAlertModalBecomeVisible,
+ isFocused: this.isWeb && !this.props.modal.isVisible && !this.props.modal.willAlertModalBecomeVisible,
isFullComposerAvailable: props.isComposerFullSize,
textInputShouldClear: false,
isCommentEmpty: props.comment.length === 0,
@@ -161,7 +165,7 @@ class ReportActionCompose extends React.Component {
// This callback is used in the contextMenuActions to manage giving focus back to the compose input.
// TODO: we should clean up this convoluted code and instead move focus management to something like ReportFooter.js or another higher up component
ReportActionComposeFocusManager.onComposerFocus(() => {
- if (!this.shouldFocusInputOnScreenFocus || !this.props.isFocused) {
+ if (!this.isWeb || !this.props.isFocused) {
return;
}
@@ -180,7 +184,7 @@ class ReportActionCompose extends React.Component {
// We want to focus or refocus the input when a modal has been closed and the underlying screen is focused.
// We avoid doing this on native platforms since the software keyboard popping
// open creates a jarring and broken UX.
- if (this.shouldFocusInputOnScreenFocus && this.props.isFocused
+ if (this.isWeb && this.props.isFocused
&& prevProps.modal.isVisible && !this.props.modal.isVisible) {
this.focus();
}
@@ -662,7 +666,7 @@ class ReportActionCompose extends React.Component {
disabled={this.props.disabled}
>
<Composer
- autoFocus={!this.props.modal.isVisible && (this.shouldFocusInputOnScreenFocus || this.isEmptyChat())}
+ autoFocus={!this.props.modal.isVisible && (this.isWeb || this.isEmptyChat())}
multiline
ref={this.setTextInputRef}
textAlignVertical="top"
| 12 |
diff --git a/lib/assets/test/spec/builder/components/form-components/editors/fill-color/inputs/input-color-fixed.spec.js b/lib/assets/test/spec/builder/components/form-components/editors/fill-color/inputs/input-color-fixed.spec.js @@ -9,7 +9,7 @@ describe('components/form-components/editors/fill-color/inputs/input-color-fixed
model: new Backbone.Model({
type: 'color',
fixed: '#FF0000',
- opacity: 0.9
+ opacity: 0.90
}),
columns: {},
editorAttrs: { help: '' }
@@ -23,11 +23,11 @@ describe('components/form-components/editors/fill-color/inputs/input-color-fixed
it('renders a colorbar', function () {
inputColor.render();
- expect(inputColor._getValue()).toBe('rgba(255, 0, 0, 0.9)');
+ expect(inputColor._getValue()).toContain('rgba(255, 0, 0, 0.9');
expect(inputColor._getOpacity()).toBe(0.9);
var colorBarBackground = inputColor.$el.find('.ColorBar')[0].style.backgroundColor;
- expect(colorBarBackground).toBe('rgba(255, 0, 0, 0.9)');
+ expect(colorBarBackground).toContain('rgba(255, 0, 0, 0.9');
});
it('can create a color picker to choose one', function () {
| 1 |
diff --git a/components/welcome-mat/tile.jsx b/components/welcome-mat/tile.jsx @@ -60,7 +60,7 @@ const defaultProps = {
/**
* Tile component item represents a tile in a Welcome Mat
*/
-class Tile extends React.Component {
+class WelcomeMatTile extends React.Component {
componentWillMount() {
this.generatedId = shortid.generate();
}
@@ -133,8 +133,8 @@ class Tile extends React.Component {
}
}
-Tile.displayName = displayName;
-Tile.propTypes = propTypes;
-Tile.defaultProps = defaultProps;
+WelcomeMatTile.displayName = displayName;
+WelcomeMatTile.propTypes = propTypes;
+WelcomeMatTile.defaultProps = defaultProps;
-export default Tile;
+export default WelcomeMatTile;
| 10 |
diff --git a/test/layer/GroupTileLayerSpec.js b/test/layer/GroupTileLayerSpec.js @@ -162,14 +162,12 @@ describe('GroupTileLayer', function () {
});
it('update child layer tile config if map\'s spatial reference changed', function () {
- var group = new maptalks.GroupTileLayer('group', [
- new maptalks.TileLayer('tile1', {
+ var t1 = new maptalks.TileLayer('tile1', {
maxZoom : 17,
urlTemplate : '/resources/tile.png'
- }),
- new maptalks.TileLayer('tile2', {
- urlTemplate : '/resources/tile.png'
- })
+ });
+ var group = new maptalks.GroupTileLayer('group', [
+ t1
], {
renderer : 'canvas'
});
@@ -177,11 +175,13 @@ describe('GroupTileLayer', function () {
map.setBaseLayer(group);
expect(group._getTileConfig().tileSystem).to.be.eql(maptalks.TileSystem['web-mercator']);
+ expect(t1._getTileConfig().tileSystem).to.be.eql(maptalks.TileSystem['web-mercator']);
map.setSpatialReference({
projection : 'baidu'
});
expect(group._getTileConfig().tileSystem).to.be.eql(maptalks.TileSystem['baidu']);
+ expect(t1._getTileConfig().tileSystem).to.be.eql(maptalks.TileSystem['baidu']);
});
});
| 3 |
diff --git a/README.md b/README.md @@ -54,8 +54,8 @@ npm install jquery.tabulator --save
### CDNJS
To access Tabulator directly from the CDNJS CDN servers, include the following two lines at the start of your project, instead of the localy hosted versions:
```html
-<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.3.2/css/tabulator.min.css" rel="stylesheet">
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.3.2/js/tabulator.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.3.3/css/tabulator.min.css" rel="stylesheet">
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/3.3.3/js/tabulator.min.js"></script>
Coming Soon
================================
| 3 |
diff --git a/package.json b/package.json "protobufjs": "=5.0.1"
},
"devDependencies": {
- "bitcore-build": "https://github.com/matiu/bitcore-build.git#ref/phantom2",
+ "bitcore-build": "https://github.com/bitpay/bitcore-build.git#d4e8b2b2f1e2c065c3a807dcb6a6250f61d67ab3",
"brfs": "^1.2.0",
"chai": "~1.10.0",
"gulp": "^3.8.10",
| 3 |
diff --git a/closure/goog/memoize/memoize.js b/closure/goog/memoize/memoize.js @@ -91,8 +91,8 @@ goog.memoize.CACHE_PROPERTY_ = 'closure_memoize_cache_';
* @param {number} functionUid Unique identifier of the function whose result
* is cached.
* @param {?{length:number}} args The arguments that the function to memoize is
- * called with. Note: it is an array-like object, because supports indexing
- * and has the length property.
+ * called with. Note: it is an array-like object, because it supports
+ * indexing and has the length property.
* @return {string} The list of arguments with type information concatenated
* with the functionUid argument, serialized as \x0B-separated string.
*/
| 1 |
diff --git a/app/webpack/observations/uploader/models/obs_card.js b/app/webpack/observations/uploader/models/obs_card.js @@ -143,13 +143,20 @@ const ObsCard = class ObsCard {
const err = util.errorJSON( e.message );
if ( err && err.errors && err.errors[0] ) {
errors = err.errors[0];
+ }
+ if ( errors ) {
+ dispatch( actions.updateObsCard( this, { saveState: "failed", saveErrors: errors } ) );
} else {
+ e.response.json( ).then( errorJSON => {
errors = [I18n.t( "unknown_error" )];
+ if ( errorJSON && errorJSON.errors && errorJSON.errors[0] ) {
+ errors = errorJSON.errors[0];
}
- console.log( "Save failed:", e );
dispatch( actions.updateObsCard( this, { saveState: "failed", saveErrors: errors } ) );
} );
}
+ } );
+ }
};
export default ObsCard;
| 9 |
diff --git a/webpack.config.js b/webpack.config.js @@ -52,9 +52,6 @@ const common = {
'chart': 'Chart'
},
plugins: [
- new webpack.ProvidePlugin({
- process: 'process/browser',
- }),
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// all options are optional
| 2 |
diff --git a/src/se.js b/src/se.js const { me } = se;
const model = me.getModel();
if (!se.promptType) return;
- const ls = Object.keys(se.dirty).map(l => +l);
+ const ls = Object.keys(se.dirty)
+ .map(l => +l)
+ .filter(l => !/^\s*$/.test(model.getLineContent(l)));
if (ls.length) {
ls.sort((x, y) => x - y);
const max = model.getLineCount();
| 8 |
diff --git a/modules/experimental-layers/src/tile-layer/tile-layer.js b/modules/experimental-layers/src/tile-layer/tile-layer.js @@ -84,14 +84,14 @@ export default class TileLayer extends CompositeLayer {
renderLayers() {
// eslint-disable-next-line no-unused-vars
- const {getTileData, renderSubLayers, ...geoProps} = this.props;
+ const {getTileData, renderSubLayers, visible, ...geoProps} = this.props;
const z = this.getLayerZoomLevel();
return this.state.tiles.map(tile => {
return renderSubLayers({
...geoProps,
id: `${this.id}-${tile.x}-${tile.y}-${tile.z}`,
data: tile.data,
- visible: !this.state.isLoaded || tile.z === z,
+ visible: visible && (!this.state.isLoaded || tile.z === z),
tile
});
});
| 1 |
diff --git a/js/okex.js b/js/okex.js @@ -1636,8 +1636,7 @@ module.exports = class okex extends Exchange {
let cost = undefined;
// spot market buy: "sz" can refer either to base currency units or to quote currency units
// see documentation: https://www.okex.com/docs-v5/en/#rest-api-trade-place-order
- const defaultTgtCcy = this.safeString (this.options, 'tgtCcy', 'base_ccy');
- const tgtCcy = this.safeString (order, 'tgtCcy', defaultTgtCcy);
+ const tgtCcy = this.safeString (order, 'tgtCcy', 'base_ccy');
if (side === 'buy' && type === 'market' && market['type'] === 'spot' && tgtCcy === 'quote_ccy') {
// "sz" refers to the cost
cost = this.safeNumber (order, 'sz');
| 1 |
diff --git a/src/components/Modeler.vue b/src/components/Modeler.vue @@ -75,6 +75,7 @@ import { id as poolId } from './nodes/pool';
import { id as laneId } from './nodes/poolLane';
import { id as sequenceFlowId } from './nodes/sequenceFlow';
import { id as associationId } from './nodes/association';
+import { id as messageFlowId } from './nodes/messageFlow';
const version = '1.0';
@@ -286,7 +287,7 @@ export default {
/* First load the flow elements */
flowElements
.filter(definition => definition.$type !== 'bpmn:SequenceFlow')
- .forEach((definition) => this.setNode(definition, flowElements, artifacts));
+ .forEach(definition => this.setNode(definition, flowElements, artifacts));
/* Then the sequence flows */
flowElements
@@ -297,12 +298,12 @@ export default {
return this.hasSourceAndTarget(definition);
})
- .forEach((definition) => this.setNode(definition, flowElements, artifacts));
+ .forEach(definition => this.setNode(definition, flowElements, artifacts));
/* Then the artifacts */
artifacts
.filter(definition => definition.$type !== 'bpmn:Association')
- .forEach((definition) => this.setNode(definition, flowElements, artifacts));
+ .forEach(definition => this.setNode(definition, flowElements, artifacts));
/* Then the associations */
artifacts
@@ -313,9 +314,16 @@ export default {
return this.hasSourceAndTarget(definition);
})
- .forEach((definition) => this.setNode(definition, flowElements, artifacts));
+ .forEach(definition => this.setNode(definition, flowElements, artifacts));
});
+ /* Add any message flows */
+ if (this.collaboration) {
+ this.collaboration
+ .get('messageFlows')
+ .forEach(definition => this.setNode(definition));
+ }
+
store.commit('highlightNode', this.processNode);
},
setNode(definition, flowElements, artifacts) {
@@ -335,6 +343,7 @@ export default {
]);
pull(artifacts, definition);
pull(this.planeElements, diagram);
+ pull(this.collaboration.get('messageFlows'), definition);
return;
}
@@ -450,7 +459,7 @@ export default {
pool: this.poolTarget,
});
- if (![sequenceFlowId, laneId, associationId].includes(type)) {
+ if (![sequenceFlowId, laneId, associationId, messageFlowId].includes(type)) {
setTimeout(() => this.pushToUndoStack());
}
| 11 |
diff --git a/magda-dap-connector/src/Dap.ts b/magda-dap-connector/src/Dap.ts @@ -287,6 +287,14 @@ export default class Dap implements ConnectorSource {
reject2(error);
return;
}
+ if (detail.access) {
+ // --- added access info to description
+ // --- so that we know why the dataset has no distribution
+ // --- and when the distribution will be available for public
+ detail.description = `${
+ detail.description
+ }\n\n${detail.access}`;
+ }
resolve2(detail);
}
);
@@ -315,6 +323,33 @@ export default class Dap implements ConnectorSource {
response,
detail
) => {
+ if (
+ detail &&
+ detail.errors &&
+ detail.errors.length
+ ) {
+ // --- handle access error
+ const id =
+ simpleData.id
+ .identifier;
+ console.log(
+ `** Unable to fetch files for collection: ${id}; url: ${
+ simpleData.data
+ }`
+ );
+ console.log(
+ `** Reason: ${
+ detail
+ .errors[0]
+ .defaultMessage
+ }`
+ );
+ resolve3({
+ identifier: id,
+ distributions: []
+ });
+ return;
+ }
console.log(
">> request distribution of " +
simpleData.data,
| 9 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -105,7 +105,7 @@ jobs:
name: download google fonts e.g. GravitasOne, NotoSansMono, NotoSans, NotoSerif, Old_Standard_TT, PT_Sans_Narrow, Raleway and Roboto
command: python3 ./.circleci/download_google_fonts.py
- run:
- name: install download and other google fonts
+ name: install OpenSans as well as downloaded google fonts
command: |
sudo cp -r .circleci/fonts/ /usr/share/
sudo fc-cache -f
| 3 |
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md @@ -122,6 +122,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
* [Daniel Cooper](https://github.com/moodragon46)
* [GeoFS](https://www.geo-fs.com)
* [Xavier Tassin](https://github.com/xtassin/)
+* [Esri](https://www.esri.com)
+ * [Tamrat Belayneh](https://github.com/Tamrat-B/)
+ * [Chris Andrews](https://github.com/chri7928/)
## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
* [Victor Berchet](https://github.com/vicb)
| 3 |
diff --git a/src/react/projects/spark-react/src/SprkModal/SprkModal.test.js b/src/react/projects/spark-react/src/SprkModal/SprkModal.test.js @@ -14,6 +14,11 @@ it('should load the module', () => {
expect(wrapper.find('div.sprk-c-Modal').length).toBe(1);
});
+it ('should not render an invisible component', () => {
+ const wrapper = mount(<SprkModal isVisible={false} />);
+ expect(wrapper.find('div.sprk-c-Modal').length).toBe(0);
+});
+
it('should have 3 buttons in the Choice variant', () => {
const wrapper = mount(<SprkModal isVisible={true} />);
expect(wrapper.find('button').length).toBe(3);
@@ -52,12 +57,9 @@ it('should render a Mask with the correct class', () => {
expect(wrapper.find('div.sprk-c-ModalMask').length).toBe(1);
});
-it('should correctly apply focus in choice variant', () => {
- const wrapper = mount(<SprkModal isVisible={true} confirmText='foo'/>);
- const confirmButton = wrapper.find('button').at(1);
+it('should accept key events', () => {
+ const wrapper = mount(<SprkModal isVisible={true} />);
- expect(confirmButton.text()).toBe('foo');
- expect(confirmButton).toEqual(document.activeElement);
});
// setting focus
| 1 |
diff --git a/app/pages/lab/project-details.cjsx b/app/pages/lab/project-details.cjsx @@ -18,6 +18,8 @@ Select = require 'react-select'
MAX_AVATAR_SIZE = 64000
MAX_BACKGROUND_SIZE = 256000
+DISCIPLINE_NAMES = (discipline.value for discipline in DISCIPLINES)
+
module.exports = React.createClass
displayName: 'EditProjectDetails'
@@ -35,10 +37,11 @@ module.exports = React.createClass
disciplineTagList = []
otherTagList = []
for t in @props.project.tags
- if DISCIPLINES.some((el) -> el.value == t)
- disciplineTagList.push(t)
+ name = t[1]
+ if name in DISCIPLINE_NAMES
+ disciplineTagList.push name
else
- otherTagList.push(t)
+ otherTagList.push name
{disciplineTagList, otherTagList}
render: ->
| 1 |
diff --git a/token-metadata/0x514910771AF9Ca656af840dff83E8264EcF986CA/metadata.json b/token-metadata/0x514910771AF9Ca656af840dff83E8264EcF986CA/metadata.json "symbol": "LINK",
"address": "0x514910771AF9Ca656af840dff83E8264EcF986CA",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0xB63B606Ac810a52cCa15e44bB630fd42D8d1d83d/metadata.json b/token-metadata/0xB63B606Ac810a52cCa15e44bB630fd42D8d1d83d/metadata.json "symbol": "MCO",
"address": "0xB63B606Ac810a52cCa15e44bB630fd42D8d1d83d",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/articles/hooks/extensibility-points/credentials-exchange.md b/articles/hooks/extensibility-points/credentials-exchange.md @@ -41,6 +41,10 @@ You can add the following as claims to the issued token:
The extensibility point will ignore all other response object properties.
+## How to implement this
+
+You can implement a Hook for this extensibility point using either the Dashboard or the Auth0 CLI. For detailed steps refer to [Using Hooks with Client Credentials Grant](/api-auth/tutorials/client-credentials/customize-with-hooks).
+
## Parameters
* **audience** [string] - audience claim of the token
| 0 |
diff --git a/higlass_developer.rst b/higlass_developer.rst @@ -84,7 +84,7 @@ The passed in ``viewUid`` should refer to a view which is present. If it
doesn't, an exception will be thrown.
-goTo(view,chr1,s1,e1,chr2,s2,e2,animate,animateTime): Zoom to a genomic location
+goTo(view,chr1,s1,e1,chr2,s2,e2,animateTime): Zoom to a genomic location
--------------------------------------------------------------------------------
Change the current view port to a certain genomic location. When ``animate`` is true HiGlass transitions from the current to the new location smoothly.
@@ -99,7 +99,6 @@ Change the current view port to a certain genomic location. When ``animate`` is
chrom2,
start2,
end2,
- animate = false,
animateTime = 3000,
);
@@ -107,7 +106,7 @@ Change the current view port to a certain genomic location. When ``animate`` is
.. code-block:: javascript
- hgv.goTo('v1', 'chr1', 0, 1, 'chr2', 0, 1, true, 500);
+ hgv.goTo('v1', 'chr1', 0, 1, 'chr2', 0, 1, 500);
activateTool(mouseTool): Select a mouse tool
--------------------------------------------
| 2 |
diff --git a/src/technologies/w.json b/src/technologies/w.json "payg"
],
"saas": true,
- "scriptSrc": "\\.rch\\.io/",
+ "scriptSrc": [
+ "\\.rch\\.io/",
+ "checkout\\.gointerpay\\.net"
+ ],
"website": "https://www.withreach.com"
},
"Wix": {
| 7 |
diff --git a/ui/less/containers.less b/ui/less/containers.less /* 32px tall controls. */
height: 32px;
+ /* Consistent alignment of buttons. */
+ line-height: 0.5;
+
/* Consistent margins (external) and padding (internal) between controls. */
.bottom-panels-elements-margin();
| 1 |
diff --git a/src/pages/StrategyEditor/StrategyEditor.js b/src/pages/StrategyEditor/StrategyEditor.js @@ -81,7 +81,7 @@ export default class StrategyEditorPage extends React.Component {
docsText = '',
steps,
} = this.state
-
+ const { firstLogin } = this.props
return (
<div className='hfui-strategyeditorpage__wrapper'>
<StrategyEditor
@@ -93,12 +93,14 @@ export default class StrategyEditorPage extends React.Component {
removeable={false}
tf='1m'
/>
+ {firstLogin
+ && (
<Joyride
steps={steps}
run
continuous
/>
-
+ )}
<div
key='main'
className='hfui-strategiespage__right'
| 3 |
diff --git a/sources-dist-stable.json b/sources-dist-stable.json "meta": "https://raw.githubusercontent.com/sebilm/ioBroker.nibeuplink/master/io-package.json",
"icon": "https://raw.githubusercontent.com/sebilm/ioBroker.nibeuplink/master/admin/nibeuplink.png",
"type": "climate-control",
- "version": "0.5.2"
+ "version": "0.5.3"
},
"nina": {
"meta": "https://raw.githubusercontent.com/TA2k/ioBroker.nina/master/io-package.json",
| 12 |
diff --git a/shared/js/background/chrome-events.es6.js b/shared/js/background/chrome-events.es6.js @@ -231,8 +231,7 @@ chrome.webRequest.onErrorOccurred.addListener((e) => {
}
if (e.error && e.url.match(/^https/)) {
- // map error message to an int code or zero if we haven't defined this code yet
- const errCode = constants.httpsErrorCodes[e.error] || 0
+ const errCode = constants.httpsErrorCodes[e.error]
tab.hasHttpsError = true
if (errCode) {
| 2 |
diff --git a/app-template/bitcoincom/google-services.json b/app-template/bitcoincom/google-services.json "client": [
{
"client_info": {
- "mobilesdk_app_id": "1:432300239540:android:e23224cd1aed3778",
+ "mobilesdk_app_id": "1:432300239540:android:3be699f352c30a45",
"android_client_info": {
- "package_name": "com.bitcoin.mwallet"
+ "package_name": "com.bitcoin.wallet"
}
},
"oauth_client": [
"status": 2
}
}
+ },
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:432300239540:android:e23224cd1aed3778",
+ "android_client_info": {
+ "package_name": "com.bitcoin.mwallet"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "432300239540-tpp5t3pmftfvuedlphevullpentp5pbo.apps.googleusercontent.com",
+ "client_type": 1,
+ "android_info": {
+ "package_name": "com.bitcoin.mwallet",
+ "certificate_hash": "2b6a5264cc4a58c711d09ce05273a057ed19aafd"
+ }
+ },
+ {
+ "client_id": "432300239540-aeh6b8eebnkgq0e3tv0g0a0t1qhkhhcc.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyDphC3flCVFFOENAy9tMgOUFxC6_H8JWMs"
+ }
+ ],
+ "services": {
+ "analytics_service": {
+ "status": 1
+ },
+ "appinvite_service": {
+ "status": 2,
+ "other_platform_oauth_client": [
+ {
+ "client_id": "432300239540-aeh6b8eebnkgq0e3tv0g0a0t1qhkhhcc.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ]
+ },
+ "ads_service": {
+ "status": 2
+ }
+ }
}
],
"configuration_version": "1"
| 3 |
diff --git a/package.json b/package.json "dependencies": {
"debug": "*",
"zigbee-shepherd": "https://github.com/kirovilya/zigbee-shepherd/tarball/dev",
- "zigbee-shepherd-converters": "2.0.38"
+ "zigbee-shepherd-converters": "2.0.39"
},
"description": "Zigbee devices",
"devDependencies": {
| 3 |
diff --git a/examples/browser.html b/examples/browser.html <body>
<script src="three.js"></script>
<script>
-let renderer, scene, camera, brwsr, planeMesh;
+let renderer, scene, camera, iframe, planeMesh;
function init() {
renderer = new THREE.WebGLRenderer({
@@ -36,7 +36,10 @@ function init() {
directionalLight.position.set(1, 1, 1);
scene.add(directionalLight);
- brwsr = new Browser(renderer.getContext(), window.innerWidth, window.innerHeight, 'https://google.com');
+ iframe = document.createElement('iframe');
+ iframe.d = 2;
+ iframe.src = 'https://google.com';
+ document.body.appendChild(iframe);
planeMesh = (() => {
const geometry = new THREE.PlaneBufferGeometry(0.9, 0.9)
@@ -61,7 +64,7 @@ function init() {
16
);
const properties = renderer.properties.get(texture);
- properties.__webglTexture = brwsr.texture;
+ properties.__webglTexture = iframe.texture;
properties.__webglInit = true;
const material = new THREE.MeshBasicMaterial({
map: texture,
@@ -79,7 +82,6 @@ init();
let direction = true;
function animate() {
- brwsr.update();
if (direction) {
planeMesh.rotation.y += 0.01;
| 4 |
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js @@ -514,13 +514,10 @@ proto.plot = function(sceneData, fullLayout, layout) {
var fullSceneLayout = fullLayout[scene.id];
var sceneLayout = layout[scene.id];
- scene.glplot.setClearColor(str2RGBAarray(fullSceneLayout.bgcolor));
-
// Update layout
scene.fullLayout = fullLayout;
scene.fullSceneLayout = fullSceneLayout;
- scene.glplotLayout = fullSceneLayout;
scene.axesOptions.merge(fullLayout, fullSceneLayout);
scene.spikeOptions.merge(fullSceneLayout);
@@ -529,8 +526,8 @@ proto.plot = function(sceneData, fullLayout, layout) {
scene.updateFx(fullSceneLayout.dragmode, fullSceneLayout.hovermode);
scene.camera.enableWheel = scene.graphDiv._context._scrollZoom.gl3d;
- // Update scene
- scene.glplot.update({});
+ // Update scene background
+ scene.glplot.setClearColor(str2RGBAarray(fullSceneLayout.bgcolor));
// Update axes functions BEFORE updating traces
scene.setConvert(axis);
| 2 |
diff --git a/app/models/carto/visualization.rb b/app/models/carto/visualization.rb @@ -36,7 +36,7 @@ class Carto::Visualization < ActiveRecord::Base
belongs_to :user_table, class_name: Carto::UserTable, primary_key: :map_id, foreign_key: :map_id, inverse_of: :visualization
- belongs_to :permission
+ belongs_to :permission, inverse_of: :visualization
has_many :likes, foreign_key: :subject
has_many :shared_entities, foreign_key: :entity_id, inverse_of: :visualization
| 12 |
diff --git a/plugins/insomnia-plugin-core-themes/themes/purple.js b/plugins/insomnia-plugin-core-themes/themes/purple.js @@ -8,7 +8,7 @@ module.exports = {
styles: {
appHeader: {
background: {
- default: '#695eb8',
+ default: '#fff',
},
},
link: {
| 1 |
diff --git a/website/client/components/UpdateBlock.js b/website/client/components/UpdateBlock.js -import React from 'react';
+import React, { useState } from 'react';
import styled from 'styled-components';
import Input from '@semcore/input';
import Button from '@semcore/button';
import updatesImg from '../static/space/updates.svg';
import NavLink from './NavLink';
+import Tooltip from '@semcore/tooltip';
+import { css } from '@semcore/core';
+import { Text } from '@semcore/typography';
+import { Box } from '@semcore/flex-box';
const UpdateWrapper = styled.div`
display: grid;
@@ -68,7 +72,7 @@ const InputSubscribe = styled(Input)`
height: 56px !important;
font-size: 18px !important;
width: 296px;
- margin: 32px 16px 16px 0;
+ margin: 0 16px 16px 0;
@media (max-width: 768px) {
width: 428px;
}
@@ -85,10 +89,8 @@ const ButtonSubscribe = styled(Button)`
border-color: #ff622d !important;
font-size: 18px !important;
color: #fff !important;
- margin-top: 16px;
- @media (max-width: 768px) {
- margin-top: 0;
margin-bottom: 16px;
+ @media (max-width: 768px) {
width: 428px;
}
@media (max-width: 320px) {
@@ -96,17 +98,59 @@ const ButtonSubscribe = styled(Button)`
}
`;
+const styles = css`
+ STooltip {
+ background-color: #f71939 !important;
+ border-color: #f71939 !important;
+ max-width: 500px;
+ font-size: 16px;
+ }
+ SArrow {
+ &:before {
+ border-color: #f71939 !important;
+ }
+ }
+`;
+
function UpdateBlock() {
+ const [value, setValue] = useState('');
+ const [error, setError] = useState('');
+
+ const handleInput = (value) => {
+ if (!/.+@.+\..+/i.test(value) && value !== '') {
+ setError("Email don't valid");
+ }
+ };
+
+ const handleFocus = () => setError('');
+
+ const handleChange = (value) => setValue(value);
+
return (
<UpdateWrapper id="updBlock">
<UpdatesImg src={updatesImg} />
<Info>
<Header>All updates in your inbox</Header>
+ <Box mb={8}>
We will send only information about new releases and component versions. And nothing more!
- <br />
- <InputSubscribe size="xl">
- <Input.Value placeholder="Your email " />
+ </Box>
+ <Tooltip
+ title={'You need to enter valid mail, dear friend.'}
+ visible={!!error}
+ theme="warning"
+ styles={styles}
+ placement="top-start"
+ >
+ <InputSubscribe size="xl" state={!!error ? 'invalid' : 'normal'}>
+ <Input.Value
+ value={value}
+ placeholder="Your email "
+ onChange={handleChange}
+ onFocus={handleFocus}
+ onBlur={() => handleInput(value)}
+ />
</InputSubscribe>
+ </Tooltip>
<ButtonSubscribe size="l">I want all updates</ButtonSubscribe>
<Terms>
By clicking the button you agree to the
| 0 |
diff --git a/app/connectors/importer.rb b/app/connectors/importer.rb @@ -80,9 +80,10 @@ module CartoDB
overwrite = overwrite_table? && taken_names.include?(name)
assert_schema_is_valid(name) if overwrite
- name = rename(result, result.table_name, result.name)
+
database.transaction do
+ name = rename(result, result.table_name, result.name)
begin
if overwrite
log("Dropping destination table: #{name}")
| 5 |
diff --git a/test/precedence.test.js b/test/precedence.test.js @@ -48,7 +48,7 @@ describe("Test precedence", function() {
shouldBeSame("5 % 3 . 2", "(5 % 3) . 2");
});
it("test instanceof", function() {
- shouldBeSame("3 instanceof 2 * 5", "(3 instanceof 2) * 5");
+ shouldBeSame("$a instanceof $b && $c", "($a instanceof $b) && $c");
});
it("test <<", function() {
shouldBeSame("1 + 3 << 5", "(1 + 3) << 5");
@@ -95,8 +95,8 @@ describe("Test precedence", function() {
shouldBeSame("5 AND 4 + 3", "5 AND (4 + 3)");
});
it("test unary : !", function() {
- shouldBeSame("!4 instanceof 3", "(!4) instanceof 3");
- shouldBeSame("!4 + 5 instanceof 3", "(!4) + (5 instanceof 3)");
+ shouldBeSame("!$a instanceof $b", "(!$a) instanceof $b");
+ shouldBeSame("!$a + $b instanceof $c", "(!$a) + ($b instanceof $c)");
shouldBeSame("6 + !4 + 5", "6 + (!4) + 5");
shouldBeSame("if($a && !$b) {}", "if($a && (!$b)) {}");
});
| 1 |
diff --git a/articles/cms/wordpress/troubleshoot.md b/articles/cms/wordpress/troubleshoot.md @@ -28,7 +28,13 @@ State validation is a security feature added in [version 3.6.0](https://github.c
### I'm seeing the error message "Invalid ID token" or "Expired ID token" that prevents me from logging in
-This is typically caused by a server set to an incorrect time. If the error message includes "used too early," then your server time is set in the future. If it says that the token is expired, then the server time is set too far in the past. Check what `echo current_time( 'c' )` outputs on your server for a clue as to what time is being used.
+This is typically caused by a server set to an incorrect time. If the error message includes "used too early," then your server time is set in the future. If it says that the token is expired, then the server time is set too far in the past. Check what `echo current_time( 'c' )` outputs on your server for a clue as to whether the time on your server matches the timezone it is using. According to the [spec](https://tools.ietf.org/html/rfc7519#section-4.1.5), you can define a short leeway to account for the clock skew on your server. For example, you can insert the below code in your `functions.php` or anywhere else that would run it after the plugin loads and before the login hook runs:
+
+```
+if ( class_exists( 'JWT' ) ) { \JWT::$leeway = 60; }
+```
+
+This would provide a 60 second leeway. You may need to adjust this depending upon how skewed your server's time is.
### I see the error message "This account does not have an email associated..." that prevents me from logging in
| 3 |
diff --git a/src/pages/strategy/tabs/expedpast/expedpast.js b/src/pages/strategy/tabs/expedpast/expedpast.js // Add all expedition numbers on the filter list
$('.tab_expedpast .expedNumbers').empty();
- if(localStorage.raw && JSON.parse(localStorage.raw).mission) {
- var missions = JSON.parse(localStorage.raw).mission;
- $.each(missions, function(ind, curVal) {
+ if(KC3Master.available) {
+ $.each(KC3Master.all_missions(), function(ind, curVal) {
+ // Event expeditions have the event world (eg, 38, 39, ...)
+ if(curVal.api_maparea_id > 10) return;
var row = $('.tab_expedpast .factory .expedNum').clone();
$(".expedCheck input", row).attr("value", curVal.api_id);
$(".expedCheck input", row).attr("world", curVal.api_maparea_id);
} else {
// In case missing raw data
const KE = PS["KanColle.Expedition"];
- $('.tab_expedpast .expedNumbers').empty();
KE.allExpeditions.forEach( function(curVal, ind) {
var row = $('.tab_expedpast .factory .expedNum').clone();
$(".expedCheck input", row).attr("value", curVal.id);
| 8 |
diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js @@ -52,11 +52,7 @@ class CloseAccountPage extends Component {
}
render() {
- const confirmInputLabel = this.props.translate('closeAccountPage.typeToConfirmPart1')
- + ' '
- + Str.removeSMSDomain(this.props.session.email)
- + ' '
- + this.props.translate('closeAccountPage.typeToConfirmPart2');
+ const userEmailOrPhone = Str.removeSMSDomain(this.props.session.email);
return (
<ScreenWrapper>
<KeyboardAvoidingView>
@@ -84,15 +80,15 @@ class CloseAccountPage extends Component {
/>
<Text style={[styles.mt5]}>
<Text style={[styles.textStrong]}>
- {this.props.translate('closeAccountPage.closeAccountWarningPart1')}
+ {this.props.translate('closeAccountPage.closeAccountWarning')}
</Text>
{' '}
- {this.props.translate('closeAccountPage.closeAccountWarningPart2')}
+ {this.props.translate('closeAccountPage.closeAccountPermanentlyDeleteData')}
</Text>
<TextInput
value={this.state.phoneOrEmail}
onChangeText={phoneOrEmail => this.setState({phoneOrEmail})}
- label={confirmInputLabel}
+ label={this.props.translate('closeAccountPage.typeToConfirm', {emailOrPhone: userEmailOrPhone})}
containerStyles={[styles.mt5]}
/>
</ScrollView>
@@ -103,7 +99,7 @@ class CloseAccountPage extends Component {
text={this.props.translate('closeAccountPage.closeAccount')}
isLoading={this.state.loading}
onPress={() => User.closeAccount(this.state.reasonForLeaving)}
- isDisabled={Str.removeSMSDomain(this.props.session.email) !== this.state.phoneOrEmail}
+ isDisabled={Str.removeSMSDomain(userEmailOrPhone) !== this.state.phoneOrEmail}
/>
</FixedFooter>
<ConfirmModal
@@ -112,7 +108,7 @@ class CloseAccountPage extends Component {
confirmText={this.props.translate('closeAccountPage.okayGotIt')}
prompt={(
<Text>
- {this.props.translate('closeAccountPage.closeAccountActionRequiredPart1')}
+ {this.props.translate('closeAccountPage.closeAccountActionRequired')}
{' '}
<Text
style={styles.link}
@@ -121,7 +117,7 @@ class CloseAccountPage extends Component {
{this.props.translate('common.here')}
</Text>
{' '}
- {this.props.translate('closeAccountPage.closeAccountActionRequiredPart2')}
+ {this.props.translate('closeAccountPage.closeAccountTryAgainAfter')}
</Text>
)}
onConfirm={CloseAccountActions.hideCloseAccountModal}
| 7 |
diff --git a/packages/app/src/components/Sidebar.tsx b/packages/app/src/components/Sidebar.tsx @@ -250,8 +250,9 @@ const Sidebar: FC<Props> = (props: Props) => {
}
else {
const newWidth = resizableContainer.current.clientWidth;
+ mutateSidebarCollapsed(false);
mutateProductNavWidth(newWidth, false);
- scheduleToPutUserUISettings({ currentProductNavWidth: newWidth });
+ scheduleToPutUserUISettings({ isSidebarCollapsed: false, currentProductNavWidth: newWidth });
}
resizableContainer.current.classList.remove('dragging');
| 7 |
diff --git a/docs/get-started/learning-resources.md b/docs/get-started/learning-resources.md ## API Documentation
-The documentation for the latest release can be found on deck.gl's [website](https://deck.gl/docs).
+The documentation for the latest release can be found on deck.gl [website](https://deck.gl/docs).
The documentation for previous releases are in the *docs* directory on the `<version-release>` branch in this repo.
@@ -12,14 +12,15 @@ An in-depth view into the technical details and architectural decisions behind d
## Live Demos
-The sources of deck.gl's [website demos](https://deck.gl/examples) can be found in the repo's [examples](https://github.com/visgl/deck.gl/tree/master/examples) directory. Most of the applications use React, although non-React templates are provided for developers from other ecosystems.
+The sources of deck.gl [website demos](https://deck.gl/examples) can be found in the repo's [examples](https://github.com/visgl/deck.gl/tree/master/examples) directory. Most of the applications use React, although non-React templates are provided for developers from other ecosystems.
## Prototyping & Sharing
PureJS examples in prototyping environments. These are great templates for feature testing and bug reporting:
-* deck.gl's [Codepen demos](https://codepen.io/vis-gl/)
-* deck.gl's [Observable demos](https://beta.observablehq.com/@pessimistress)
+* deck.gl [Codepen demos](https://codepen.io/vis-gl/)
+* deck.gl [Observable demos](https://beta.observablehq.com/@pessimistress)
+* [RandomFractals](https://github.com/RandomFractals) [Observable DeckGL collection](https://observablehq.com/collection/@randomfractals/deckgl)
* [One-page scripting examples](http://deck.gl/showcases/gallery/)
## Community
| 0 |
diff --git a/src/injected/content/inject.js b/src/injected/content/inject.js @@ -11,7 +11,7 @@ import { Run } from './cmd-run';
* so we'll use the extension's UUID, which is unique per computer in FF, for messages
* like VAULT_WRITER to avoid interception by sites that can add listeners for all of our
* INIT_FUNC_NAME ids even though we change it now with each release. */
-const VAULT_WRITER = `${IS_FIREFOX ? VM_UUID : INIT_FUNC_NAME}VW`;
+const VAULT_WRITER = `${VM_UUID}${INIT_FUNC_NAME}VW`;
const VAULT_WRITER_ACK = `${VAULT_WRITER}+`;
const tardyQueue = [];
let contLists;
| 1 |
diff --git a/locksmith/src/app.ts b/locksmith/src/app.ts @@ -58,7 +58,11 @@ server.applyMiddleware({ app })
const router = require('./routes')
-app.use(cors())
+app.use(
+ cors({
+ origin: /unlock-protocol\.com$/,
+ })
+)
app.use(bodyParser.json({ limit: '5mb' }))
app.use('/', router)
| 11 |
diff --git a/app/controllers/helper/ShapefilesCreatorHelper.java b/app/controllers/helper/ShapefilesCreatorHelper.java @@ -216,21 +216,21 @@ public class ShapefilesCreatorHelper {
+ // <- StreetId
"score:Double,"
+ // street score
- "sCurbRamp:Double,"
+ "sigRamp:Double,"
+ // curb ramp significance score
- "sNCurbRamp:Double,"
+ "sigNoRamp:Double,"
+ // no Curb ramp significance score
- "sObstacle:Double,"
+ "sigObs:Double,"
+ // obstacle significance score
- "sSurfProb:Double,"
+ "sigSurfce:Double,"
+ // Surface problem significance score
- "fCurbRamp:Double,"
+ "nRamp:Double,"
+ // curb ramp feature score
- "fNCurbRamp:Double,"
+ "nNoRamp:Double,"
+ // no Curb ramp feature score
- "fObstacle:Double,"
+ "nObs:Double,"
+ // obstacle feature score
- "fSurfProb:Double" // Surface problem feature score
+ "nSurfce:Double" // Surface problem feature score
);
@@ -418,21 +418,21 @@ public class ShapefilesCreatorHelper {
+ // coverage score
"score:Double,"
+ // obstacle score
- "sCurbRamp:Double,"
+ "sigRamp:Double,"
+ // curb ramp significance score
- "sNCurbRamp:Double,"
+ "sigNoRamp:Double,"
+ // no Curb ramp significance score
- "sObstacle:Double,"
+ "sigObs:Double,"
+ // obstacle significance score
- "sSurfProb:Double,"
+ "sigSurfce:Double,"
+ // Surface problem significance score
- "fCurbRamp:Double,"
+ "nRamp:Double,"
+ // curb ramp feature score
- "fNCurbRamp:Double,"
+ "nNoRamp:Double,"
+ // no Curb ramp feature score
- "fObstacle:Double,"
+ "nObs:Double,"
+ // obstacle feature score
- "fSurfProb:Double" // Surface problem feature score
+ "nSurfce:Double" // Surface problem feature score
);
| 3 |
diff --git a/src/lib/logger/pino-logger.js b/src/lib/logger/pino-logger.js @@ -19,8 +19,12 @@ export const LogEvent = {
const emitter = new EventEmitter()
const logger = pino({ level: Config.logLevel })
+// adding .on() method to listen logger events
+// this allows other services (e.g. analytics)
+// to listen for a specific log messages (e.g. errors)
logger.on = emitter.on.bind(emitter)
+// overriding log levels methods to emit corresponding event additionally
values(omit(LogEvent, 'Log')).forEach(level => {
// logger.debug = logger.info hack
const proxy = logger[level === 'debug' ? 'info' : level].bind(logger)
| 0 |
diff --git a/_config.yml b/_config.yml @@ -66,34 +66,42 @@ collections:
title: Projects
output: true
permalink: /library/projects/
+ collection: project
startups:
title: Startups
output: true
permalink: /library/startups/
+ collection: startup
labs:
title: Labs
output: true
permalink: /library/labs/
+ collection: lab
incubators:
title: Incubators
output: true
permalink: /library/incubators/
+ collection: incubator
groups:
title: Groups
output: true
permalink: /library/groups/
+ collection: group
networks:
title: Networks
output: true
permalink: /library/networks/
+ collection: network
events:
title: Events
output: true
permalink: /library/events/
+ collection: event
others:
title: Others
output: true
permalink: /library/others/
+ collection: other
# Default Values
defaults:
| 0 |
diff --git a/package.json b/package.json "build": "gulp minify"
},
"main": "dist/maptalks.js",
- "module": "dist/maptalks.es.js",
- "jsnext:main": "dist/maptalks.es.js",
+ "module": "dist/maptalks.mjs",
+ "jsnext:main": "dist/maptalks.mjs",
"style": "dist/maptalks.css",
"dependencies": {
"simplify-js": "^1.2.1",
"karma-rollup-preprocessor": "^5.0.1",
"karma-safari-launcher": "^1.0.0",
"karma-sinon": "^1.0.5",
- "maptalks-build-helpers": "^0.4.2",
- "maptalks-jsdoc": "^0.2.0",
+ "maptalks-build-helpers": "^0.5.0",
+ "maptalks-jsdoc": "^0.2.2",
"minimist": "^1.2.0",
"mocha": "^3.5.0",
"sinon": "^3.2.1"
| 3 |
diff --git a/react/src/base/inputs/Select.stories.js b/react/src/base/inputs/Select.stories.js @@ -12,7 +12,12 @@ export default {
decorators: [(story) => <div className="sprk-o-Box">{story()}</div>],
component: SprkSelect,
parameters: {
- jest: ['SprkErrorContainer', 'SprkInputIconCheck'],
+ jest: [
+ 'SprkSelect',
+ 'SprkErrorContainer',
+ 'SprkInputIconCheck',
+ 'SprkIcon',
+ ],
info: `${markdownDocumentationLinkBuilder('input')}`,
},
};
| 3 |
diff --git a/setup.py b/setup.py @@ -32,7 +32,8 @@ def clang_archs():
with tempfile.NamedTemporaryFile(mode='w', suffix='.cpp') as cpp:
cpp.write('int main() {return 0;}\n')
cpp.flush()
- p = subprocess.run(["clang", "-arch", arch, cpp.name], capture_output=True)
+ with tempfile.NamedTemporaryFile(mode='w', suffix='.out') as obj:
+ p = subprocess.run(["clang", "-arch", arch, cpp.name, "-o", obj.name], capture_output=True)
if p.returncode == 0:
arch_flags += ['-arch', arch]
| 1 |
diff --git a/src/asset/asset.js b/src/asset/asset.js @@ -147,7 +147,7 @@ pc.extend(pc, function () {
if (! this.file)
return null;
- if (this.type === 'texture') {
+ if (this.type === 'texture' || this.type === 'textureatlas') {
var device = this.registry._loader.getHandler('texture')._device;
if (this.variants.pvr && device.extCompressedTexturePVRTC) {
| 11 |
diff --git a/test/image/mocks/gl2d_scatter_fill_self_next.json b/test/image/mocks/gl2d_scatter_fill_self_next.json "y": [5, 6, 5],
"fill": "toself",
"type": "scattergl"
+ },
+ {
+ "x": [1.1, 1.1, 2.1, null,
+ -1.9,-1.9,-0.9,null,
+ -4.9,-4.9,-3.9],
+ "y": [6.1, 7.1, 7.1, null,
+ 1.1, 2.1, 2.1, null,
+ 1.1, 2.1, 2.1],
+ "type": "scattergl",
+ "fill": "tonext"
+ },
+ {
+ "x": [ 0, 0, 2, 2, 0, null,
+ 1,1,3,3,1,null,
+ -2,-2,0,0,-2,null,
+ -5,-5,-3,-3,-5],
+ "y": [9, 10, 10, 9, 9, null,
+ 6,8, 8, 6,6,null,
+ 1,3,3,1, 1,null,
+ 1,3,3,1,1],
+ "type": "scattergl",
+ "fill": "tonext"
}
],
"layout":{
| 0 |
diff --git a/character-controller.js b/character-controller.js @@ -17,6 +17,25 @@ const localVector2 = new THREE.Vector3();
const localMatrix = new THREE.Matrix4();
const localMatrix2 = new THREE.Matrix4();
+class BiActionInterpolant {
+ constructor(fn, minValue, maxValue) {
+ this.fn = fn;
+ this.value = minValue;
+ this.minValue = minValue;
+ this.maxValue = maxValue;
+ }
+ update(timeDiff) {
+ this.value += (this.fn() ? 1 : -1) * timeDiff;
+ this.value = Math.min(Math.max(this.value, this.minValue), this.maxValue);
+ }
+ get() {
+ return this.value;
+ }
+ getNormalized() {
+ return this.value / (this.maxValue - this.minValue);
+ }
+}
+
class PlayerHand {
constructor() {
this.position = new THREE.Vector3();
| 0 |
diff --git a/templates/workflow/program_form_tab_ui.html b/templates/workflow/program_form_tab_ui.html </div>
<div class="bg-white p-10 pt-0">
+ <!-- Tabs -->
<ul class="nav nav-tabs">
- <li role="presentation" class="active"><a href="#">Details</a></li>
- <li role="presentation"><a href="#">Funding</a></li>
- <li role="presentation"><a href="#">Access</a></li>
+ <li role="presentation" class="active">
+ <a href="#program_details" role="tab" data-toggle="tab">Details</a>
+ </li>
+ <li role="presentation">
+ <a href="#program_funding" role="tab" data-toggle="tab">Funding</a>
+ </li>
+ <li role="presentation">
+ <a href="#program_access" role="tab" data-toggle="tab">Access</a>
+ </li>
</ul>
+
+ <!-- Tab content -->
<div class="tab-content">
- <div role="tabpanel" class="tab-pane fade in active" id="programDetails">
+ <div role="tabpanel" class="tab-pane active" id="program_details">
{% include '../workflow/form-sections/program_details.html' %}
</div>
- <div role="tabpanel" class="tab-pane fade" id="profile">...</div>
- <div role="tabpanel" class="tab-pane fade" id="messages">...</div>
- <div role="tabpanel" class="tab-pane fade" id="settings">...</div>
+ <div role="tabpanel" class="tab-pane" id="program_funding">...</div>
+ <div role="tabpanel" class="tab-pane" id="program_access">...</div>
</div>
</div>
</div>
| 3 |
diff --git a/lib/credentials.js b/lib/credentials.js @@ -81,8 +81,8 @@ AWS.Credentials = AWS.util.inherit({
},
/**
- * @return [Integer] the window size in seconds to attempt refreshing of
- * credentials before the expireTime occurs.
+ * @return [Integer] the number of seconds before {expireTime} during which
+ * the credentials will be considered expired.
*/
expiryWindow: 15,
| 7 |
diff --git a/core/algorithm-builder/dockerfile/get-deps-java.sh b/core/algorithm-builder/dockerfile/get-deps-java.sh #!/bin/bash
set -eo pipefail
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-mkdir -p $SCRIPTPATH/../environments/java/jars
mkdir -p $SCRIPTPATH/../environments/java/m2
export javaWrapperVersion='2.0-SNAPSHOT'
-docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dependency:get -Dartifact=io.hkube:wrapper:$javaWrapperVersion:jar:wide -DremoteRepositories=https://oss.sonatype.org/content/repositories/snapshots -Ddest=/jars/wrapper.jar
-docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dependency:get -Dartifact=io.hkube:interfaces:$javaWrapperVersion:jar -DremoteRepositories=https://oss.sonatype.org/content/repositories/snapshots -Ddest=/jars/interfaces.jar
-docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dependency:get -Dartifact=io.hkube:java-algo-parent:$javaWrapperVersion:pom -DremoteRepositories=https://oss.sonatype.org/content/repositories/snapshots -Ddest=/jars/java-algo-parent.xml
-docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dependency:get -Dartifact=io.hkube:algorithm-deployment-descriptor:$javaWrapperVersion:jar -DremoteRepositories=https://oss.sonatype.org/content/repositories/snapshots -Ddest=/jars/algorithm-deployment-descriptor.jar
-docker run --rm -v $SCRIPTPATH/../environments/java/jars:/jars maven mvn -q dependency:get -Dartifact=org.json:json:20190722:jar -Ddest=/jars/json.jar
-
-
mkdir -p $SCRIPTPATH/../environments/java/debs
cd $SCRIPTPATH/../environments/java/debs
docker run --rm --workdir /tmp/pkg -v $SCRIPTPATH/../environments/java/debs:/tmp/pkg\
| 2 |
diff --git a/src/components/ProductItem/ProductItem.js b/src/components/ProductItem/ProductItem.js @@ -2,6 +2,7 @@ import React, { Component } from "react";
import PropTypes from "prop-types";
import { withStyles } from "@material-ui/core/styles";
import Typography from "@material-ui/core/Typography";
+import Price from "@reactioncommerce/components/Price/v1";
import track from "lib/tracking/track";
import trackProductClicked from "lib/tracking/trackProductClicked";
import priceByCurrencyCode from "lib/utils/priceByCurrencyCode";
@@ -69,7 +70,9 @@ class ProductItem extends Component {
<Typography variant="body2">
{title}
</Typography>
- <Typography variant="body1">{productPrice.displayPrice}</Typography>
+ <Typography variant="body1">
+ <Price displayPrice={productPrice.displayPrice} />
+ </Typography>
</div>
<div>
<Typography variant="body1">{vendor}</Typography>
| 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.