code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js @@ -10,6 +10,7 @@ var ExpressionManager = (function () {
var document = null;
var XMLHttpRequest = null;
var fetch = null;
+ var frames = null;
function $bm_isInstanceOfArray(arr) {
return arr.constructor === Array || arr.constructor === Float32Array;
@@ -591,11 +592,11 @@ var ExpressionManager = (function () {
return obKey;
}
- function framesToTime(frames, fps) {
+ function framesToTime(fr, fps) {
if (!fps) {
fps = elem.comp.globalData.frameRate;
}
- return frames / fps;
+ return fr / fps;
}
function timeToFrames(t, fps) {
| 2 |
diff --git a/token-metadata/0x6c4B85CaB20c13aF72766025F0e17E0fe558A553/metadata.json b/token-metadata/0x6c4B85CaB20c13aF72766025F0e17E0fe558A553/metadata.json "symbol": "YFFII",
"address": "0x6c4B85CaB20c13aF72766025F0e17E0fe558A553",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/Runtime/Library/GlobalObject.cpp b/lib/Runtime/Library/GlobalObject.cpp @@ -58,15 +58,25 @@ using namespace Js;
{
HRESULT hr = S_OK;
+ this->directHostObject = hostObject;
+ this->secureDirectHostObject = secureDirectHostObject;
+
BEGIN_TRANSLATE_OOM_TO_HRESULT_NESTED
{
// In fastDOM scenario, we should use the host object to lookup the prototype.
this->SetPrototype(library->GetNull());
+
+ // Host can call to set the direct host object after the GlobalObject has been initialized but
+ // before user script has run. (This happens even before the previous call to SetPrototype)
+ // If that happens, we'll need to update the 'globalThis' property to point to the secure
+ // host object so that we don't hand a reference to the bare GlobalObject out to user script.
+ if (this->GetScriptContext()->GetConfig()->IsESGlobalThisEnabled())
+ {
+ this->SetProperty(PropertyIds::globalThis, this->ToThis(), PropertyOperation_None, nullptr);
+ }
}
END_TRANSLATE_OOM_TO_HRESULT(hr)
- this->directHostObject = hostObject;
- this->secureDirectHostObject = secureDirectHostObject;
return hr;
}
| 9 |
diff --git a/js/inputmask.js b/js/inputmask.js matches = [],
insertStop = false,
latestMatch,
- cacheDependency = ndxIntlzr ? ndxIntlzr.join("") : "",
- offset = 0;
+ cacheDependency = ndxIntlzr ? ndxIntlzr.join("") : "";
function resolveTestFromToken(maskToken, ndxInitializer, loopNdx, quantifierRecurse) { //ndxInitializer contains a set of indexes to speedup searches in the mtokens
function handleMatch(match, loopNdx, quantifierRecurse) {
function staticCanMatchDefinition(source, target) {
var sloc = source.locator.slice(source.alternation).join(""),
- tloc = target.locator.slice(target.alternation).join(""), canMatch = sloc == tloc,
+ tloc = target.locator.slice(target.alternation).join(""), canMatch = sloc == tloc;
canMatch = canMatch && source.match.fn === null && target.match.fn !== null ? target.match.fn.test(source.match.def, getMaskSet(), pos, false, opts, false) : false;
return canMatch;
testPos = pos; //match the position after the group
break; //stop quantifierloop && search for next possible match
}
+ if (latestMatch.jit && !latestMatch.optionalQuantifier) {
+ latestMatch.jitOffset = tokenGroup.matches.indexOf(latestMatch);
+ }
return true;
}
}
return $.extend(true, [], matches);
}
getMaskSet().tests[pos] = $.extend(true, [], matches); //set a clone to prevent overwriting some props
- // console.log(pos + " - " + JSON.stringify(matches));
+ console.log(pos + " - " + JSON.stringify(matches));
return getMaskSet().tests[pos];
}
| 12 |
diff --git a/app/models/carto/visualization.rb b/app/models/carto/visualization.rb @@ -463,10 +463,6 @@ class Carto::Visualization < ActiveRecord::Base
CartoDB::Logger.warning(message: 'Couldn\'t add source analysis for layer', user: user, layer: layer)
end
end
-
- # This is needed because Carto::Layer does not yet triggers invalidations on save
- # It can be safely removed once it does
- map.notify_map_change
end
def ids_json
| 2 |
diff --git a/src/encoded/static/components/award.js b/src/encoded/static/components/award.js @@ -616,6 +616,17 @@ const Award = React.createClass({
:
<p className="browser-error">Award has no description</p>
}
+ {context.url ?
+ <div>
+ <hr />
+ <dl className="key-value">
+ <div data-test="project">
+ <dt>Project</dt>
+ <dd><a href={context.url} title={`${context.name} project page at NHGRI`}>{context.name}</a></dd>
+ </div>
+ </dl>
+ </div>
+ : null}
</PanelBody>
</Panel>
</div>
| 0 |
diff --git a/lib/AsyncDependenciesBlock.js b/lib/AsyncDependenciesBlock.js @@ -12,15 +12,12 @@ module.exports = class AsyncDependenciesBlock extends DependenciesBlock {
this.chunks = null;
this.module = module;
this.loc = loc;
-
- Object.defineProperty(this, "chunk", {
- get: function() {
- throw new Error("`chunk` was been renamed to `chunks` and is now an array");
- },
- set: function() {
+ }
+ get chunk() {
throw new Error("`chunk` was been renamed to `chunks` and is now an array");
}
- });
+ set chunk(chunk) {
+ throw new Error("`chunk` was been renamed to `chunks` and is now an array");
}
updateHash(hash) {
hash.update(this.chunkName || "");
| 14 |
diff --git a/app/components/view-edit-project/template.hbs b/app/components/view-edit-project/template.hbs {{top-errors errors=errors}}
{{save-cancel editing=editing save="save" cancel="cancel"}}
{{/if}}
-
-{{#if editing}}
- <section class="pt-20">
- {{env-catalog project=project catalogs=catalogs}}
- </section>
-{{/if}}
| 2 |
diff --git a/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs @@ -297,7 +297,8 @@ public class UserResource {
if (!onlyContainsAllowedProperties(pageable)) {
return ResponseEntity.badRequest().build();
}
- <% } %>
+ <%_ } _%>
+
final Page<<%= asDto('User') %>> page = userService.getAllManagedUsers(pageable);
HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
@@ -307,7 +308,8 @@ public class UserResource {
if (!onlyContainsAllowedProperties(pageable)) {
return Mono.just(ResponseEntity.badRequest().build());
}
- <% } %>
+ <%_ } _%>
+
return userService.countManagedUsers()
.map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
.map(page -> PaginationUtil.generatePaginationHttpHeaders(UriComponentsBuilder.fromHttpRequest(request), page))
| 4 |
diff --git a/packages/app/src/components/Common/ImageCropModal.tsx b/packages/app/src/components/Common/ImageCropModal.tsx @@ -81,19 +81,22 @@ const ImageCropModal: FC<Props> = (props: Props) => {
};
- const onCropChange = (crop) => {
- setCropOtions(crop);
- };
+ const getCroppedImg = async(image: HTMLImageElement, crop: ICropOptions) => {
+ const {
+ naturalWidth: imageNaturalWidth, naturalHeight: imageNaturalHeight, width: imageWidth, height: imageHeight,
+ } = image;
+
+ const {
+ width: cropWidth, height: cropHeight, x, y,
+ } = crop;
- const getCroppedImg = async(image, crop) => {
- // TODO: SVG image with no width & height not correctly cropped
const canvas = document.createElement('canvas');
- const scaleX = image.naturalWidth / image.width;
- const scaleY = image.naturalHeight / image.height;
- canvas.width = crop.width;
- canvas.height = crop.height;
+ const scaleX = imageNaturalWidth / imageWidth;
+ const scaleY = imageNaturalHeight / imageHeight;
+ canvas.width = cropWidth;
+ canvas.height = cropHeight;
const ctx = canvas.getContext('2d');
- ctx?.drawImage(image, crop.x * scaleX, crop.y * scaleY, crop.width * scaleX, crop.height * scaleY, 0, 0, crop.width, crop.height);
+ ctx?.drawImage(image, x * scaleX, y * scaleY, cropWidth * scaleX, cropHeight * scaleY, 0, 0, cropWidth, cropHeight);
try {
const blob = await canvasToBlob(canvas);
return blob;
@@ -143,7 +146,7 @@ const ImageCropModal: FC<Props> = (props: Props) => {
src={src}
crop={cropOptions}
onImageLoaded={onImageLoaded}
- onChange={onCropChange}
+ onChange={crop => setCropOtions(crop)}
circularCrop={isCircular}
/>
)
| 7 |
diff --git a/src/content/en/updates/2018/05/welcome-to-immersive.md b/src/content/en/updates/2018/05/welcome-to-immersive.md @@ -2,7 +2,7 @@ project_path: /web/_project.yaml
book_path: /web/updates/_book.yaml
description: The immersive web means virtual world experiences hosted through the browser. This entire virtual reality experiences surfaced in the browser or in VR enabled headsets.
-{# wf_updated_on: 2018-06-04 #}
+{# wf_updated_on: 2018-06-18 #}
{# wf_published_on: 2018-05-08 #}
{# wf_tags: immersive-web,webvr,webxr #}
{# wf_featured_image: /web/updates/images/generic/vr-in-chrome.png #}
@@ -240,7 +240,7 @@ shows how the render loop is started and maintained. Notice the dual use of the
word frame. And notice the recursive call to `requestAnimationFrame()`. This
function will be called 60 times a second.
- xrSession.requestFrameOfReference('eyeLevel')
+ xrSession.requestFrameOfReference('eye-level')
.then(xrFrameOfRef => {
xrSession.requestAnimationFrame(onFrame(time, xrPresFrame) {
// The time argument is for future use and not implemented at this time.
@@ -287,7 +287,7 @@ to have a single rendering path for a variety of devices.
If I put all this together, I get the code below. I've left a placeholder for
the input devices, which I'll cover in a later section.
- xrSession.requestFrameOfReference('eyeLevel')
+ xrSession.requestFrameOfReference('eye-level')
.then(xrFrameOfRef => {
xrSession.requestAnimationFrame(onFrame(time, xrPresFrame) {
// The time argument is for future use and not implemented at this time.
| 6 |
diff --git a/pages/tutorials/React & Webpack.md b/pages/tutorials/React & Webpack.md This guide will teach you how to wire up TypeScript with [React](https://reactjs.org/) and [webpack](https://webpack.js.org/).
-If you're starting a brand new project, take a look at the [React Quick Start guide](/samples/index.html) first.
+If you're starting a brand new project, take a look at the [React Quick Start guide](https://create-react-app.dev/docs/adding-typescript) first.
Otherwise, we assume that you're already using [Node.js](https://nodejs.org/) with [npm](https://www.npmjs.com/).
| 3 |
diff --git a/lib/shim/shim.js b/lib/shim/shim.js @@ -7,6 +7,7 @@ const hasOwnProperty = require('../util/properties').hasOwn
const logger = require('../logger').child({component: 'Shim'})
const path = require('path')
const specs = require('./specs')
+const util = require('util')
// Some modules do terrible things, like change the prototype of functions. To
// avoid crashing things we'll use a cached copy of apply everywhere.
@@ -768,7 +769,13 @@ function wrapClass(nodule, properties, spec, args) {
return Base
}
- return _es6WrapClass(shim, Base, fnName, spec, args)
+ // When es6 classes are being wrapped, we need to use an es6 class due to
+ // the fact our es5 wrapper depends on calling the constructor without `new`.
+ var wrapper = spec.es6 || /^class /.test(Base.toString())
+ ? _es6WrapClass
+ : _es5WrapClass
+
+ return wrapper(shim, Base, fnName, spec, args)
})
}
@@ -2228,3 +2235,57 @@ function _es6WrapClass(shim, Base, fnName, spec, args) {
}
}
}
+
+/**
+ * Wraps an es5-style class using a subclass.
+ *
+ * - `_es5WrapClass(shim, Base, fnName, spec, args)`
+ *
+ * @private
+ *
+ * @param {Shim} shim
+ * The shim performing the wrapping/binding.
+ *
+ * @param {Function} Base
+ * The class to be wrapped.
+ *
+ * @param {string} fnName
+ * The name of the base class.
+ *
+ * @param {ClassWrapSpec} spec
+ * The spec with pre- and post-execution hooks to call.
+ *
+ * @param {Array.<*>} args
+ * Extra arguments to pass through to the pre- and post-execution hooks.
+ *
+ * @return {Function} A class that extends Base with execution hooks.
+ */
+function _es5WrapClass(shim, Base, fnName, spec, args) {
+ function WrappedClass() {
+ var cnstrctArgs = argsToArray.apply(shim, arguments)
+ if (!(this instanceof WrappedClass)) {
+ // Some libraries support calling constructors without the `new` keyword.
+ // In order to support this we must apply the super constructor if `this`
+ // is not an instance of ourself. JavaScript really needs a better way
+ // to generically apply constructors.
+ cnstrctArgs.unshift(WrappedClass) // `unshift` === `push_front`
+ return new (WrappedClass.bind.apply(WrappedClass, cnstrctArgs))()
+ }
+
+ // Assemble the arguments to hand to the spec.
+ var _args = [shim, Base, fnName, cnstrctArgs]
+ if (args.length > 0) {
+ _args.push.apply(_args, args)
+ }
+
+ // Call the spec's before hook, then call the base constructor, then call
+ // the spec's after hook.
+ spec.pre && spec.pre.apply(null, _args)
+ Base.apply(this, cnstrctArgs)
+ spec.post && spec.post.apply(this, _args)
+ }
+ util.inherits(WrappedClass, Base)
+ WrappedClass.prototype = Base.prototype
+
+ return WrappedClass
+}
| 14 |
diff --git a/editor.js b/editor.js @@ -19,6 +19,8 @@ const localMatrix = new THREE.Matrix4();
const localMatrix2 = new THREE.Matrix4();
const localMatrix3 = new THREE.Matrix4();
+let getEditor = () => null;
+
function createPointerEvents(store) {
// const { handlePointer } = createEvents(store)
const handlePointer = key => e => {
@@ -68,11 +70,8 @@ function createPointerEvents(store) {
window.onload = async () => {
-const res = await fetch(`https://templates.webaverse.com/react-three-fiber/index.rtfjs`);
-const s = await res.text();
-let editor = null;
const bindTextarea = codeEl => {
- editor = CodeMirror.fromTextArea(codeEl, {
+ const editor = CodeMirror.fromTextArea(codeEl, {
lineNumbers: true,
styleActiveLine: true,
matchBrackets: true,
@@ -110,6 +109,7 @@ const bindTextarea = codeEl => {
e.preventDefault();
}
}); */
+ return editor;
};
{
const _ = React.createElement;
@@ -151,17 +151,20 @@ const bindTextarea = codeEl => {
);
};
const Textarea = React.memo(props => {
+ const {setEditor} = props;
+
const el = useRef();
useEffect(() => {
- el.current.innerHTML = s;
- bindTextarea(el.current);
+ // el.current.innerHTML = s;
+ const editor = bindTextarea(el.current);
+ setEditor(editor);
}, []);
return (
<textarea className="section code" ref={el} id="code"></textarea>
);
});
- const Editor = React.memo(({open, files, selectedTab, selectedFileIndex, setSelectedFileIndex}) => {
+ const Editor = React.memo(({open, files, selectedTab, selectedFileIndex, setSelectedFileIndex, templateOptions, selectedTemplateOption, setSelectedTemplateOption, setEditor}) => {
return (
<Fragment>
{open ?
@@ -187,10 +190,18 @@ const bindTextarea = codeEl => {
<img src="/assets/family-tree.svg" className="icon" />
<div className="label">Import URL...</div>
</button>
- <select name="nfttype" id="nfttype">
- <option value="react-three-fiber">react-three-fiber</option>
- <option value="threejs">three.js</option>
- <option value="3d-model">3D model</option>
+ <select name="nfttype" id="nfttype" value={selectedTemplateOption} onChange={e => {
+ // console.log('got change', e);
+ setSelectedTemplateOption(e.target.value);
+ }}>
+ {templateOptions.map((o, i) => {
+ return (
+ <option
+ value={o}
+ key={i}
+ >{o}</option>
+ );
+ })}
</select>
</div>
: null}
@@ -204,7 +215,9 @@ const bindTextarea = codeEl => {
);
})}
</div>
- <Textarea />
+ <Textarea
+ setEditor={setEditor}
+ />
</div>
</Fragment>
);
@@ -452,6 +465,11 @@ const bindTextarea = codeEl => {
const [q, setQ] = useState('');
const [currentQ, setCurrentQ] = useState('');
const [lastQ, setLastQ] = useState('');
+ const [templateOptions, setTemplateOptions] = useState([]);
+ const [selectedTemplateOption, setSelectedTemplateOption] = useState();
+ const [editor, setEditor] = useState(null);
+
+ getEditor = () => editor;
// console.log('set objects', objects);
@@ -461,7 +479,6 @@ const bindTextarea = codeEl => {
setCards(j);
}, []);
-
useEffect(async () => {
setFiles([
'index.rtfjs',
@@ -487,8 +504,6 @@ const bindTextarea = codeEl => {
};
}, []);
- /* const qs = parseQuery(router.asPath.match(/(\?.*)$/)?.[1] || '');
- const {q: currentQ} = qs; */
useEffect(() => {
if (currentQ !== lastQ) {
setLastQ(currentQ);
@@ -509,6 +524,25 @@ const bindTextarea = codeEl => {
}
}, [currentQ, lastQ]);
+ useEffect(async () => {
+ const res = await fetch('https://templates.webaverse.com/index.json');
+ const j = await res.json();
+ const {templates} = j;
+ setTemplateOptions(templates);
+ setSelectedTemplateOption(templates[0]);
+ }, []);
+
+ useEffect(async () => {
+ if (editor && selectedTemplateOption) {
+ console.log('load', );
+
+ const u = 'https://templates.webaverse.com/' + selectedTemplateOption;
+ const res = await fetch(u);
+ const text = await res.text();
+ editor.setValue(text);
+ }
+ }, [editor, selectedTemplateOption]);
+
return <div className="root">
<div className="left">
<div className="top">
@@ -569,6 +603,10 @@ const bindTextarea = codeEl => {
selectedTab={selectedTab}
selectedFileIndex={selectedFileIndex}
setSelectedFileIndex={setSelectedFileIndex}
+ templateOptions={templateOptions}
+ selectedTemplateOption={selectedTemplateOption}
+ setSelectedTemplateOption={setSelectedTemplateOption}
+ setEditor={setEditor}
/>
<Scene
open={selectedTab === 'scene'}
@@ -614,6 +652,7 @@ const bindTextarea = codeEl => {
// compact: false,
});
const {code} = spec;
+ // console.log('got code', code);
const fn = eval(code);
// console.log('got fn', fn);
@@ -882,6 +921,7 @@ const loadModule = async u => {
}; */
// const selectedType = 'rtfjs'; // XXX implement a real selector
const uploadHash = async () => {
+ const editor = getEditor();
const s = editor.getValue();
const b = new Blob([
s,
| 0 |
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js @@ -35,12 +35,20 @@ describe('kargo adapter tests', function () {
});
describe('build request', function() {
- var bids, cookies = [], localStorageItems = [];
+ var bids, undefinedCurrency, noAdServerCurrency, cookies = [], localStorageItems = [];
beforeEach(function () {
+ undefinedCurrency = false;
+ noAdServerCurrency = false;
sandbox.stub(config, 'getConfig').callsFake(function(key) {
if (key === 'currency') {
- return 'USD';
+ if (undefinedCurrency) {
+ return undefined;
+ }
+ if (noAdServerCurrency) {
+ return {};
+ }
+ return {adServerCurrency: 'USD'};
}
throw new Error(`Config stub incomplete! Missing key "${key}"`)
});
@@ -109,6 +117,16 @@ describe('kargo adapter tests', function () {
return sandbox.stub(localStorage, 'getItem').throws();
}
+ function simulateNoCurrencyObject() {
+ undefinedCurrency = true;
+ noAdServerCurrency = false;
+ }
+
+ function simulateNoAdServerCurrency() {
+ undefinedCurrency = false;
+ noAdServerCurrency = true;
+ }
+
function initializeKruxUser() {
setLocalStorageItem('kxkar_user', 'rsgr9pnij');
}
@@ -308,6 +326,24 @@ describe('kargo adapter tests', function () {
initializeInvalidKrgCrbType3();
testBuildRequests(getExpectedKrakenParams({crb: true}, undefined, getInvalidKrgCrbType3()));
});
+
+ it('handles a non-existant currency object on the config', function() {
+ simulateNoCurrencyObject();
+ initializeKruxUser();
+ initializeKruxSegments();
+ initializeKrgUid();
+ initializeKrgCrb();
+ testBuildRequests(getExpectedKrakenParams(undefined, undefined, getKrgCrb()));
+ });
+
+ it('handles no ad server currency being set on the currency object in the config', function() {
+ simulateNoAdServerCurrency();
+ initializeKruxUser();
+ initializeKruxSegments();
+ initializeKrgUid();
+ initializeKrgCrb();
+ testBuildRequests(getExpectedKrakenParams(undefined, undefined, getKrgCrb()));
+ });
});
describe('response handler', function() {
| 7 |
diff --git a/runtime/decorators/Transition.svelte b/runtime/decorators/Transition.svelte $: oldRoute = $route.prev || $route
$: [concestor, ancestor, oldAncestor] = getConcestor($route, oldRoute)
+ $: toAncestor = isAncestor(oldRoute, $route)
+ $: toDescendant = isAncestor($route, oldRoute)
+ $: toHigherIndex = ancestor && ancestor.meta.index > oldAncestor.meta.index
+ $: toLowerIndex = ancestor && ancestor.meta.index < oldAncestor.meta.index
+
+ $: console.log({toLowerIndex, toHigherIndex})
$: meta = {
- route: $route,
- path: $route.path,
- shortPath: $route.shortPath,
- index: $route.meta.index,
- ancestor,
- index: ancestor && ancestor.meta.index,
- oldRoute,
- oldPath: oldRoute.path,
- oldIndex: oldAncestor && oldAncestor.meta.index,
- oldShortPath: oldRoute.shortPath,
- oldAncestor,
+ toAncestor,
+ toDescendant,
+ toHigherIndex,
+ toLowerIndex,
+ routes: [$route, oldRoute],
+ ancestors: [ancestor, oldAncestor],
}
$: _config = configs.find(({ condition }) => condition(meta)) || config || {}
$: normalizedConfig = { ...defaultConfig, ..._config }
$: ({ transition, inParams, outParams } = normalizedConfig)
+ function isAncestor({ shortPath }, { shortPath: shortPath2 }) {
+ return shortPath !== shortPath2 && shortPath.startsWith(shortPath2)
+ }
+
function setAbsolute({ target }) {
target.style.position = 'absolute'
- target.style.width = '100%'
}
</script>
+<style>
+ .transition {
+ height: 100%;
+ width: 100%;
+ }
+</style>
+
<div
+ class="transition"
in:transition|local={inParams}
out:transition|local={outParams}
on:outrostart={setAbsolute}>
| 7 |
diff --git a/lib/carto/connector/connection_manager.rb b/lib/carto/connector/connection_manager.rb @@ -215,6 +215,7 @@ module Carto
connector_parameters.delete :connection_id
input_parameters[:connection_id] = connection.id
input_parameters.delete :connection
+ input_parameters.delete :provider
end
if legacy_oauth_db_connection?(connector_parameters)
| 2 |
diff --git a/exampleSite/config-dev.toml b/exampleSite/config-dev.toml @@ -19,6 +19,11 @@ googleAnalytics = ""
date = ["date", "lastmod"]
lastmod = ["lastmod", ":git", "date"]
+[markup]
+ [markup.goldmark]
+ [markup.goldmark.renderer]
+ unsafe = true
+
[params]
name = "Okkur Labs"
description = "Open Source Theme for your next project"
| 0 |
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml @@ -135,7 +135,7 @@ jobs:
run: |
BUILD_VERSION=`node -pe "require('./package.json')['version']"`
echo "Creating release using env: ${ENVFILE}"
- cd android && ./gradlew bundleRelease
+ cd android && ENVFILE=${{ env.ENVFILE }} ./gradlew bundleRelease
- name: Build Universal APK
uses: skywall/[email protected]
| 0 |
diff --git a/CHANGELOG.md b/CHANGELOG.md #### Tools
-- Created [ngf](https://github.com/ericmdantas/ngf) a simple alias for `ng-fullstack` to make your app development even faster
+- Created [ngf](https://github.com/ericmdantas/ngf), a simple alias for `ng-fullstack` to make your app development even faster
#### Client
| 0 |
diff --git a/.gitignore b/.gitignore @@ -7,6 +7,7 @@ resources/provision/node_modules/*
resources/describe/AWS-Architecture-Icons_PNG/*
Sparta.lambda.amd64
SampleProvision-code.zip
+mage_output_file.go
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
| 8 |
diff --git a/packages/table-core/src/features/Expanding.ts b/packages/table-core/src/features/Expanding.ts @@ -128,7 +128,7 @@ export const Expanding: TableFeature = {
}
// If any row is not expanded, return false
- if (table.getRowModel().flatRows.some(row => row.getIsExpanded())) {
+ if (table.getRowModel().flatRows.some(row => !row.getIsExpanded())) {
return false
}
| 1 |
diff --git a/test/jasmine/tests/calcdata_test.js b/test/jasmine/tests/calcdata_test.js @@ -4,6 +4,7 @@ var BADNUM = require('@src/constants/numerical').BADNUM;
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var failTest = require('../assets/fail_test');
+var delay = require('../assets/delay');
var Lib = require('@src/lib');
describe('calculated data and points', function() {
@@ -985,6 +986,7 @@ describe('calculated data and points', function() {
expect(gd._fullLayout[trace.type === 'splom' ? 'xaxis' : axName]._categories).toEqual(finalOrder, 'wrong order');
}
})
+ .then(delay(100))
.catch(failTest)
.then(done);
}
| 0 |
diff --git a/test/auth/oauth-with-idtoken-validation.tests.js b/test/auth/oauth-with-idtoken-validation.tests.js @@ -343,7 +343,7 @@ describe('OAUthWithIDTokenValidation', function() {
done();
});
});
- describe('when using a valid token', function() {
+ describe('when using a valid certificate to generate an invalid id_token', function() {
it('fails when `token.aud` is invalid', done => {
createCertificate(function(c) {
var idtoken = jwt.sign({ foo: 'bar' }, c.serviceKey, {
@@ -386,11 +386,12 @@ describe('OAUthWithIDTokenValidation', function() {
});
});
it('fails when `token.iss` is invalid', done => {
+ const TEST_AUDIENCE = 'foobar';
createCertificate(function(c) {
var idtoken = jwt.sign({ foo: 'bar' }, c.serviceKey, {
algorithm: 'RS256',
issuer: 'wrong_issuer',
- audience: 'foobar',
+ audience: TEST_AUDIENCE,
expiresIn: '1h'
});
var oauth = {
| 10 |
diff --git a/src/modules/legend/Legend.js b/src/modules/legend/Legend.js @@ -272,15 +272,7 @@ class Legend {
}
}
- // for now - just prevent click on heatmap legend - and allow hover only
- const clickAllowed =
- w.config.chart.type !== 'treemap' &&
- w.config.chart.type !== 'heatmap' &&
- !this.isBarsDistributed
-
- if (clickAllowed && w.config.legend.onItemClick.toggleDataSeries) {
w.globals.dom.elWrap.addEventListener('click', self.onLegendClick, true)
- }
if (w.config.legend.onItemHover.highlightDataSeries) {
w.globals.dom.elWrap.addEventListener(
@@ -421,6 +413,8 @@ class Legend {
}
onLegendClick(e) {
+ const w = this.w
+
if (
e.target.classList.contains('apexcharts-legend-text') ||
e.target.classList.contains('apexcharts-legend-marker')
@@ -448,9 +442,17 @@ class Legend {
])
}
+ // for now - just prevent click on heatmap legend - and allow hover only
+ const clickAllowed =
+ w.config.chart.type !== 'treemap' &&
+ w.config.chart.type !== 'heatmap' &&
+ !this.isBarsDistributed
+
+ if (clickAllowed && w.config.legend.onItemClick.toggleDataSeries) {
this.legendHelpers.toggleDataSeries(seriesCnt, isHidden)
}
}
}
+}
export default Legend
| 11 |
diff --git a/source/components/PasswordInput.js b/source/components/PasswordInput.js @@ -24,20 +24,22 @@ const STATE = {
};
export type PasswordInputProps = InputProps & {
- entropyFactor?: number,
debounceDelay?: number,
- strengthFeedbacks?: {
- insecure: string,
- weak: string,
- strong: string,
- },
- isTooltipOpen: boolean,
+ entropyFactor?: number,
isShowingTooltipOnFocus: boolean,
isShowingTooltipOnHover: boolean,
+ isTooltipOpen: boolean,
minLength?: number,
minStrongScore?: number,
- tooltip?: string | boolean,
+ repeatPassword?: string,
state?: $Values<typeof STATE>,
+ passwordFeedbacks?: {
+ insecure: string,
+ weak: string,
+ strong: string,
+ noMatch: string,
+ },
+ tooltip?: string | boolean,
useDebounce?: boolean,
};
@@ -46,11 +48,12 @@ export const PasswordInput: StatelessFunctionalComponent<PasswordInputProps> = (
) => {
const {
context,
- strengthFeedbacks,
+ passwordFeedbacks,
entropyFactor,
error,
minLength,
minStrongScore,
+ repeatPassword,
skin,
state,
theme,
@@ -77,21 +80,30 @@ export const PasswordInput: StatelessFunctionalComponent<PasswordInputProps> = (
const score = calculatePasswordScore(password, entropyFactor);
const isValidPassword = password.length >= minLength;
const isNotEmpty = password.length > 0;
+ const isRepeat = !!repeatPassword;
if (error) {
dynamicState = PasswordInput.STATE.ERROR;
passwordFeedback = error;
+ } else if (isRepeat) {
+ if (repeatPassword === props.value) {
+ dynamicState = PasswordInput.STATE.DEFAULT;
+ passwordFeedback = null;
+ } else {
+ dynamicState = PasswordInput.STATE.ERROR;
+ passwordFeedback = passwordFeedbacks.noMatch;
+ }
} else if (isValidPassword) {
if (score < minStrongScore) {
dynamicState = PasswordInput.STATE.WEAK;
- passwordFeedback = strengthFeedbacks[PasswordInput.STATE.WEAK];
+ passwordFeedback = passwordFeedbacks[PasswordInput.STATE.WEAK];
} else {
dynamicState = PasswordInput.STATE.STRONG;
- passwordFeedback = strengthFeedbacks[PasswordInput.STATE.STRONG];
+ passwordFeedback = passwordFeedbacks[PasswordInput.STATE.STRONG];
}
} else if (isNotEmpty) {
dynamicState = PasswordInput.STATE.INSECURE;
- passwordFeedback = strengthFeedbacks[PasswordInput.STATE.INSECURE];
+ passwordFeedback = passwordFeedbacks[PasswordInput.STATE.INSECURE];
}
return (
<PasswordInputSkin
@@ -114,10 +126,11 @@ PasswordInput.displayName = 'PasswordInput';
PasswordInput.defaultProps = {
debounceDelay: 1000,
entropyFactor: 0.01,
- strengthFeedbacks: {
+ passwordFeedbacks: {
insecure: 'insecure',
weak: 'weak',
strong: 'strong',
+ noMatch: "doesn't match",
},
isTooltipOpen: false,
isShowingTooltipOnFocus: true,
| 7 |
diff --git a/articles/tokens/idp.md b/articles/tokens/idp.md ---
description: How to obtain Identity Provider access tokens.
---
-
# Identity Provider Access Tokens
## Overview
@@ -26,6 +25,14 @@ The validity period for third-party access tokens will vary by the issuing IdP.
There is no standard way to renew IdP access tokens through Auth0. If available, the mechanism for renewing IdP access tokens will vary for each provider.
+For certain Identity Providers, Auth0 will store a `refresh_token` which you can use to obtain a new `access_token` for the IdP. Currently this is supported for the following Identity Providers:
+
+* BitBucket
+* Google OAuth 2.0
+* OAuth 2.0
+* SharePoint
+* Azure AD
+
## Termination of tokens
The ability to terminate IdP access tokens is up to each provider.
| 0 |
diff --git a/token-metadata/0x4F9254C83EB525f9FCf346490bbb3ed28a81C667/metadata.json b/token-metadata/0x4F9254C83EB525f9FCf346490bbb3ed28a81C667/metadata.json "symbol": "CELR",
"address": "0x4F9254C83EB525f9FCf346490bbb3ed28a81C667",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -87,14 +87,14 @@ Do this prior to every time you create a branch for a pull request:
> ```shell
> $ git status
- > On branch staging
+ > On branch development
> Your branch is up-to-date with 'origin/development'.
> ```
> If your aren't on `development`, resolve outstanding files / commits and checkout the `development` branch
> ```shell
- > $ git checkout staging
+ > $ git checkout development
> ```
2. Do a pull with rebase against `upstream`
@@ -103,15 +103,15 @@ Do this prior to every time you create a branch for a pull request:
> $ git pull --rebase upstream development
> ```
- > This will pull down all of the changes to the official staging branch, without making an additional commit in your local repo.
+ > This will pull down all of the changes to the official development branch, without making an additional commit in your local repo.
-3. (_Optional_) Force push your updated staging branch to your GitHub fork
+3. (_Optional_) Force push your updated development branch to your GitHub fork
> ```shell
- > $ git push origin staging --force
+ > $ git push origin development --force
> ```
- > This will overwrite the staging branch of your fork.
+ > This will overwrite the development branch of your fork.
### Setup meeting-for-good
@@ -120,7 +120,7 @@ Please follow the steps in the [README.md](README.md) document.
### Create a Branch
-Before you start working, you will need to create a separate git branch specific to the issue / feature you're working on. You will push your work to this branch. Do not work off the staging branch.
+Before you start working, you will need to create a separate git branch specific to the issue / feature you're working on. You will push your work to this branch. Do not work off the development branch.
#### Naming Your Branch
@@ -145,7 +145,7 @@ $ git push origin [name_of_your_new_branch]
### Setup Linting
-We reccomend you have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html). It will highlight anything that doesn't conform to our meeting-for-good's coding style conventions. (you can find a summary of those rules [here](https://github.com/freeCodeCamp/meeting-for-good/blob/staging/.eslintrc)).
+We reccomend you have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html). It will highlight anything that doesn't conform to our meeting-for-good's coding style conventions. (you can find a summary of those rules [here](https://github.com/freeCodeCamp/meeting-for-good/blob/development/.eslintrc)).
You can also check for linting errors by running the command
```shell
@@ -169,7 +169,7 @@ A pull request (PR) is a method of submitting proposed changes to a GitHub repos
Take away only one thing from this document, it should be this: Never, **EVER**
make edits to the `development` branch. ALWAYS make a new branch BEFORE you edit
files. This is critical, because if your PR is not accepted, your copy of
-staging will be forever sullied and the only way to fix it is to delete your
+development will be forever sullied and the only way to fix it is to delete your
fork and re-fork.
1. Perform the maintenance step of rebasing `development`.
@@ -177,14 +177,14 @@ fork and re-fork.
```bash
$ git status
-On branch staging
+On branch development
Your branch is up-to-date with 'origin/development'.
nothing to commit, working directory clean
```
-1. If you are not on staging or your working directory is not clean, resolve
- any outstanding files/commits and checkout staging `git checkout development`
+1. If you are not on development or your working directory is not clean, resolve
+ any outstanding files/commits and checkout development `git checkout development`
2. Create a branch off of `development` with git: `git checkout -B
branch/name-here` **Note:** Branch naming is important. Use a name like
| 14 |
diff --git a/src/components/play-mode/hotbar/Hotbar.jsx b/src/components/play-mode/hotbar/Hotbar.jsx @@ -104,6 +104,25 @@ const fullscreenFragmentShader = `\
bool isPointInTriangle(vec2 point, Tri tri) {
return isPointInTriangle(point, tri.a, tri.b, tri.c);
}
+ bool isInsideChevron(vec2 point, vec2 center, float width, float height, float skew) {
+ point -= center;
+
+ vec2 a = vec2(-width/2., height/2. - skew);
+ vec2 b = vec2(-width/2., -height/2. - skew);
+ vec2 c = vec2(0., height/2. + skew);
+ vec2 d = vec2(0., -height/2. + skew);
+ vec2 e = vec2(width/2., height/2. - skew);
+ vec2 f = vec2(width/2., -height/2. - skew);
+ Tri t1 = Tri(a, b, c);
+ Tri t2 = Tri(b, d, c);
+ Tri t3 = Tri(e, f, c);
+ Tri t4 = Tri(f, d, c);
+
+ return isPointInTriangle(point, t1) ||
+ isPointInTriangle(point, t2) ||
+ isPointInTriangle(point, t3) ||
+ isPointInTriangle(point, t4);
+ }
void main() {
// base color
@@ -166,6 +185,10 @@ const fullscreenFragmentShader = `\
) {
highlightColor = vec3(1.);
}
+
+ if (isInsideChevron(vUv, vec2(0.5), 0.5, 0.05, 0.05)) {
+ highlightColor = vec3(1.);
+ }
}
// mix
| 0 |
diff --git a/js/coreweb/bisweb_fileserverclient.js b/js/coreweb/bisweb_fileserverclient.js +
const $ = require('jquery');
const webutil = require('bis_webutil');
const bisweb_simplefiledialog = require('bisweb_simplefiledialog');
@@ -43,7 +44,7 @@ class BisWebFileServerClient extends BisFileServerClient {
let passwordEntryBox=$(`
<div class='form-group'>
<label for='server'>Host:</label>
- <input type='text' class = 'form-control' id='${hid}' value="localhost:8081">
+ <input type='text' class = 'form-control' id='${hid}' value="localhost:9081">
</div>
<div class='form-group'>
<label for='filename'>Password:</label>
@@ -124,6 +125,7 @@ class BisWebFileServerClient extends BisFileServerClient {
this.fileDialog.fileRequestFn = this.lastOpts.callback;
this.fileDialog.openDialog(payload.data,
payload.path,
+ payload.root,
this.lastOpts);
}
}
| 9 |
diff --git a/src/os/interaction/hoverinteraction.js b/src/os/interaction/hoverinteraction.js @@ -108,7 +108,7 @@ export default class Hover extends Select {
if (map.getView().getHints()[ViewHint.INTERACTING] > 0) {
if (this.lastFeature_) {
- this.setHighlightFeature_(undefined);
+ this.clearHighlight_();
}
return true;
@@ -172,12 +172,10 @@ export default class Hover extends Select {
}
/**
- * Handle mouseout on the map viewport.
- *
- * @param {MouseEvent} event The event
+ * Clear the current highlight.
* @private
*/
- onMouseOut_(event) {
+ clearHighlight_() {
this.setHighlightFeature_(undefined);
}
@@ -212,7 +210,7 @@ export default class Hover extends Select {
if (feature) {
this.highlight_(this.highlightedItems_);
} else {
- this.setHighlightFeature_(undefined);
+ this.clearHighlight_();
}
}
} else {
@@ -299,15 +297,30 @@ export default class Hover extends Select {
*/
setMap(map) {
if (this.viewport_) {
- unlisten(this.viewport_, EventType.MOUSEOUT, this.onMouseOut_, this);
+ unlisten(this.viewport_, EventType.MOUSEOUT, this.clearHighlight_, this);
+ this.viewport_ = null;
+ }
+
+ const currentMap = this.getMap();
+ const currentView = currentMap ? currentMap.getView() : null;
+ if (currentView) {
+ unlisten(currentView, EventType.CHANGE, this.clearHighlight_, this);
}
super.setMap(map);
- this.viewport_ = map ? map.getViewport() : null;
+ if (map) {
+ this.viewport_ = map.getViewport();
if (this.viewport_) {
// clear the highlight feature when the mouse leaves the viewport
- listen(this.viewport_, EventType.MOUSEOUT, this.onMouseOut_, this);
+ listen(this.viewport_, EventType.MOUSEOUT, this.clearHighlight_, this);
+ }
+
+ const view = map.getView();
+ if (view) {
+ // clear the highlight feature when the view changes
+ listen(view, EventType.CHANGE, this.clearHighlight_, this);
+ }
}
this.featureOverlay_.setMap(map);
| 1 |
diff --git a/docs/arch/adr-05.md b/docs/arch/adr-05.md @@ -138,5 +138,5 @@ Accepted
- *We will first try using this option.* Use a javascript helper library that has full support for map to [serialize](https://github.com/sonnyp/JSON8/tree/master/packages/json8#ooserialize) it as an object (maps are a sub-class of objects) and JSON [parse](https://github.com/sonnyp/JSON8/tree/master/packages/json8#ooparse) back to a map. This would probably be preferred since it would make sure our serialization and parsing is consistent and the keys we are using are strings, so it would be a straight forward conversion to a standard object.
- Manage the type conversion ourselves. We'd have to choose storing as an array, object, or stringifying. Examples on how to do this: http://2ality.com/2015/08/es6-map-json.html or http://exploringjs.com/es6/ch_maps-sets.html#_arbitrary-maps-as-json-via-arrays-of-pairs.
- Since the tasks object is not being changed, we should have backwards compatibility with classifier exports and aggregation, but this needs confirmation before implementation.
-- We will need to be able to describe steps, tasks and notifications in a serializable format, such as a plain unique name string, as this is a requirement of [mobx-state-tree](https://github.com/mobxjs/mobx-state-tree#tree-semantics-in-detail). Steps, tasks, and notifications can be converted to ES6 Maps as needed programmatically to provide a serializable key for Mobx-state-tree to use.
+- We will need to be able to describe steps, tasks and notifications in a serializable format, such as a plain unique name string, as this is a requirement of [mobx-state-tree](https://mobx-state-tree.js.org/concepts/trees#tree-semantics-in-detail). Steps, tasks, and notifications can be converted to ES6 Maps as needed programmatically to provide a serializable key for Mobx-state-tree to use.
- The Project Builder will need a UI update to be able to group tasks into steps. This will need some design time. An early idea is to use a kanban style representation of steps in the new workflow editor.
| 1 |
diff --git a/loaders.js b/loaders.js @@ -13,6 +13,46 @@ import {GIFLoader} from './GIFLoader.js';
import {VOXLoader} from './VOXLoader.js';
import {memoize} from './util.js';
+class MozLightMapExtension {
+ constructor(parser) {
+ this.parser = parser;
+ this.name = 'MOZ_lightmap';
+ }
+
+ // @TODO: Ideally we should use extendMaterialParams hook.
+ // But the current official glTF loader doesn't fire extendMaterialParams
+ // hook for unlit and specular-glossiness materials.
+ // So using loadMaterial hook as workaround so far.
+ // Cons is loadMaterial hook is fired as _invokeOne so
+ // if other plugins defining loadMaterial is registered
+ // there is a chance that this light map extension handler isn't called.
+ // The glTF loader should be updated to remove the limitation.
+ loadMaterial(materialIndex) {
+ const parser = this.parser;
+ const json = parser.json;
+ const materialDef = json.materials[materialIndex];
+
+ if (!materialDef.extensions || !materialDef.extensions[this.name]) {
+ return null;
+ }
+
+ const extensionDef = materialDef.extensions[this.name];
+
+ const pending = [];
+
+ pending.push(parser.loadMaterial(materialIndex));
+ pending.push(parser.getDependency('texture', extensionDef.index));
+
+ return Promise.all(pending).then(results => {
+ const material = results[0];
+ const lightMap = results[1];
+ material.lightMap = lightMap;
+ material.lightMapIntensity = extensionDef.intensity !== undefined ? extensionDef.intensity : 1;
+ return material;
+ });
+ }
+}
+
const _dracoLoader = memoize(() => {
const dracoLoader = new DRACOLoader();
dracoLoader.setDecoderPath('/three/draco/');
@@ -47,6 +87,9 @@ const _gltfLoader = memoize(() => {
const meshoptDecoder = _meshoptDecoder();
gltfLoader.setMeshoptDecoder(meshoptDecoder);
}
+
+ gltfLoader.register(parser => new MozLightMapExtension(parser));
+
return gltfLoader;
});
const _shadertoyLoader = memoize(() => new ShadertoyLoader());
| 0 |
diff --git a/src/client/js/components/PageDeleteModal.jsx b/src/client/js/components/PageDeleteModal.jsx @@ -13,16 +13,6 @@ import PageContainer from '../services/PageContainer';
import ApiErrorMessage from './PageManagement/ApiErrorMessage';
-const PageDeleteModal = (props) => {
- const {
- t, pageContainer, isOpen, toggle, isDeleteCompletelyModal, path, isAbleToDeleteCompletely,
- } = props;
- const [isDeleteRecursively, setIsDeleteRecursively] = useState(true);
- const [isDeleteCompletely, setIsDeleteCompletely] = useState(isDeleteCompletelyModal);
- const deleteMode = isDeleteCompletely ? 'completely' : 'temporary';
- const [errorCode, setErrorCode] = useState(null);
- const [errorMessage, setErrorMessage] = useState(null);
-
const deleteIconAndKey = {
completely: {
color: 'danger',
@@ -36,6 +26,16 @@ const PageDeleteModal = (props) => {
},
};
+const PageDeleteModal = (props) => {
+ const {
+ t, pageContainer, isOpen, toggle, isDeleteCompletelyModal, path, isAbleToDeleteCompletely,
+ } = props;
+ const [isDeleteRecursively, setIsDeleteRecursively] = useState(true);
+ const [isDeleteCompletely, setIsDeleteCompletely] = useState(isDeleteCompletelyModal);
+ const deleteMode = isDeleteCompletely ? 'completely' : 'temporary';
+ const [errorCode, setErrorCode] = useState(null);
+ const [errorMessage, setErrorMessage] = useState(null);
+
function changeIsDeleteRecursivelyHandler() {
setIsDeleteRecursively(!isDeleteRecursively);
}
| 5 |
diff --git a/edit.js b/edit.js @@ -905,6 +905,10 @@ function animate(timestamp, frame) {
// renderer.render(highlightScene, camera);
}
geometryManager.addEventListener('load', e => {
+ setInterval(() => {
+ uiManager.popupMesh.addMessage('lol ' + Math.random());
+ }, 5000);
+
renderer.setAnimationLoop(animate);
});
| 0 |
diff --git a/src/pages/index.js b/src/pages/index.js @@ -19,10 +19,10 @@ import CTA from '../components/CTA';
const Title = styled.h1`
color: ${color.lightest};
font-weight: ${typography.weight.extrabold};
-
font-size: ${typography.size.l2}px;
line-height: 1;
margin-bottom: 0.2em;
+ text-shadow: rgba(0, 135, 220, 0.3) 0 1px 5px;
@media (min-width: ${breakpoint * 1}px) {
font-size: 56px;
@@ -35,10 +35,10 @@ const Title = styled.h1`
const Desc = styled.div`
color: ${color.lightest};
-
font-size: ${typography.size.m1}px;
line-height: 1.4;
margin-bottom: 1em;
+ text-shadow: rgba(0, 135, 220, 0.3) 0 1px 5px;
@media (min-width: ${breakpoint * 1}px) {
font-size: ${typography.size.m2}px;
| 7 |
diff --git a/assets/js/modules/adsense/components/setup/SetupMain.js b/assets/js/modules/adsense/components/setup/SetupMain.js @@ -115,6 +115,7 @@ export default function SetupMain( { finishSetup } ) {
} );
const {
+ clearError,
setAccountID,
setClientID,
setAccountStatus,
@@ -127,7 +128,6 @@ export default function SetupMain( { finishSetup } ) {
resetAlerts,
resetClients,
resetURLChannels,
- receiveError,
} = useDispatch( STORE_NAME );
// Allow flagging when a background submission should happen.
@@ -246,7 +246,7 @@ export default function SetupMain( { finishSetup } ) {
}
// Unset any potential error.
- receiveError( undefined );
+ clearError();
// Reset all data to force re-fetch.
resetAccounts();
resetAlerts();
| 14 |
diff --git a/src/state/learnocaml_store.ml b/src/state/learnocaml_store.ml @@ -71,7 +71,7 @@ let with_git_register =
git ["config";"--local";"user.email";"[email protected]"]) >>=
f >>= fun files ->
git ("add"::"--"::files) () >>=
- git ["commit";"-m";"Update"] >>=
+ git ["commit";"--allow-empty";"-m";"Update"] >>=
git ["update-server-info"]
let write ?(no_create=false) file ?(extra=[]) contents =
| 11 |
diff --git a/src/DevChatter.Bot.Core/Games/Heist/HeistMission.cs b/src/DevChatter.Bot.Core/Games/Heist/HeistMission.cs @@ -12,7 +12,7 @@ public class HeistMission
internal static readonly List<HeistMission> Missions = new List<HeistMission>
{
new HeistMission(1,"Bank Robbery", new []{HR.Thief, HR.Tech, HR.Grifter, HR.Driver, HR.Carrier}, 1000),
- new HeistMission(2,"Mob Bank Robbery", new []{HR.Thief, HR.Tech, HR.Grifter, HR.Hitter, HR.Driver, HR.Carrier}, 1500),
+ new HeistMission(2,"Mob Bank Robbery", new []{HR.Thief, HR.Tech, HR.Grifter, HR.Thug, HR.Driver, HR.Carrier}, 1500),
new HeistMission(3,"Museum Heist", new []{HR.Thief, HR.Grifter, HR.Hacker, HR.Driver, HR.Carrier}, 1000),
new HeistMission(4,"Jewelry Store", new []{HR.Grifter, HR.Hacker, HR.Driver, HR.Carrier}, 800),
};
| 10 |
diff --git a/packages/yoga/src/ActionRequirement/web/ActionRequirement.jsx b/packages/yoga/src/ActionRequirement/web/ActionRequirement.jsx @@ -13,6 +13,7 @@ import Box from '../../Box';
const StyledActionRequirement = styled.div`
display: flex;
+ height: 100%;
${media.xxs`
flex-direction: column;
`}
@@ -38,7 +39,10 @@ const Content = styled.div`
`;
const BoxIllustration = styled(Box)`
- text-align: center;
+ flex-grow: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
`;
function isChildFromComponent(child, component) {
| 1 |
diff --git a/assets/sass/components/settings/_googlesitekit-settings-module.scss b/assets/sass/components/settings/_googlesitekit-settings-module.scss &--nomargin {
margin: 0;
}
-
- .googlesitekit-settings-module__inline-link {
- font-size: 1rem;
- }
}
.googlesitekit-settings-module__inline-items {
| 2 |
diff --git a/lib/taiko.js b/lib/taiko.js @@ -1477,7 +1477,7 @@ function fileField(attrValuePairs, ...args) {
const selector = getValues(attrValuePairs, args);
const get = getElementGetter(selector,
async () => await $$xpath(`//input[@type='file'][@id=(//label[contains(string(), ${xpath(selector.label)})]/@for)] | //label[contains(string(), ${xpath(selector.label)})]/input[@type='file']`),
- 'select');
+ 'input[type="file"]');
return {
get: getIfExists(get),
exists: exists(getIfExists(get)),
@@ -1510,7 +1510,7 @@ function textField(attrValuePairs, ...args) {
const selector = getValues(attrValuePairs, args);
const get = getElementGetter(selector,
async () => await $$xpath(`//input[@type='text'][@id=(//label[contains(string(), ${xpath(selector.label)})]/@for)] | //label[contains(string(), ${xpath(selector.label)})]/input[@type='text']`),
- 'select');
+ 'input[type="text"]');
return {
get: getIfExists(get),
exists: exists(getIfExists(get)),
| 1 |
diff --git a/physics-worker.js b/physics-worker.js @@ -12,6 +12,25 @@ const fakeMaterial = new THREE.MeshBasicMaterial({
color: 0xFFFFFF,
});
+const localMatrix = new THREE.Matrix4();
+const localMatrix2 = new THREE.Matrix4();
+const localFrustum = new THREE.Frustum();
+
+const _filterGroups = (chunkMesh, camera) => {
+ if (chunkMesh) {
+ localFrustum.setFromProjectionMatrix(
+ localMatrix.multiplyMatrices(camera.projectionMatrix, localMatrix2.multiplyMatrices(camera.matrixWorldInverse, chunkMesh.matrixWorld))
+ );
+ chunkMesh.geometry.originalGroups = chunkMesh.geometry.groups.slice();
+ chunkMesh.geometry.groups = chunkMesh.geometry.groups.filter(group => localFrustum.intersectsSphere(group.boundingSphere));
+ }
+};
+const _unfilterGroups = (chunkMesh) => {
+ if (chunkMesh) {
+ chunkMesh.geometry.groups = chunkMesh.geometry.originalGroups;
+ }
+};
+
const _getChunkMesh = meshId => {
for (const child of container.children) {
if (child.isChunkMesh && child.meshId === meshId) {
@@ -43,6 +62,7 @@ const _makeChunkMesh = (meshId, x, y, z, parcelSize, subparcelSize, slabTotalSiz
mesh.parcelSize = parcelSize;
mesh.subparcelSize = subparcelSize;
mesh.isChunkMesh = true;
+ const slabRadius = Math.sqrt((subparcelSize/2)*(subparcelSize/2)*3);
const slabs = [];
const freeSlabs = [];
let index = 0;
@@ -56,6 +76,11 @@ const _makeChunkMesh = (meshId, x, y, z, parcelSize, subparcelSize, slabTotalSiz
slab.z = z;
slabs.push(slab);
geometry.addGroup(slab.slabIndex * slabSliceVertices, slab.position.length/3, 0);
+ geometry.groups[geometry.groups.length-1].boundingSphere =
+ new THREE.Sphere(
+ new THREE.Vector3(x*subparcelSize + subparcelSize/2, y*subparcelSize + subparcelSize/2, z*subparcelSize + subparcelSize/2),
+ slabRadius
+ );
} else {
slab = {
x,
@@ -72,6 +97,11 @@ const _makeChunkMesh = (meshId, x, y, z, parcelSize, subparcelSize, slabTotalSiz
debugger;
}
geometry.addGroup(index * slabSliceVertices, slab.position.length/3, 0);
+ geometry.groups[geometry.groups.length-1].boundingSphere =
+ new THREE.Sphere(
+ new THREE.Vector3(x*subparcelSize + subparcelSize/2, y*subparcelSize + subparcelSize/2, z*subparcelSize + subparcelSize/2),
+ slabRadius
+ );
index++;
}
}
@@ -158,10 +188,22 @@ class PointRaycaster {
this.camera.quaternion.copy(quaternion);
this.camera.updateMatrixWorld();
+ container.traverse(o => {
+ if (o.isMesh) {
+ _filterGroups(o, this.camera);
+ }
+ });
+
this.renderer.setViewport(0, 0, 1, 1);
this.renderer.setRenderTarget(this.renderTarget);
this.renderer.render(this.scene, this.camera);
+ container.traverse(o => {
+ if (o.isMesh) {
+ _unfilterGroups(o);
+ }
+ });
+
this.scene.remove(container);
}
readRaycast() {
@@ -265,6 +307,12 @@ class CollisionRaycaster {
// this.scene.overrideMaterial.uniforms.uNear.value = this.camera.near;
// this.scene.overrideMaterial.uniforms.uFar.value = this.camera.far;
+ container.traverse(o => {
+ if (o.isMesh) {
+ _filterGroups(o, this.camera);
+ }
+ });
+
this.renderer.setViewport(0, 0, 10, 10);
if (!this.renderTargets[index]) {
this.renderTargets[index] = new THREE.WebGLRenderTarget(10, 10, {
@@ -287,6 +335,12 @@ class CollisionRaycaster {
this.renderTargets[index].near = this.camera.near;
this.renderTargets[index].far = this.camera.far;
+ container.traverse(o => {
+ if (o.isMesh) {
+ _unfilterGroups(o);
+ }
+ });
+
this.scene.remove(container);
}
readRaycast(index) {
@@ -370,19 +424,7 @@ class PhysicsRaycaster {
}
raycastMeshes(container, position, quaternion, uSize, vSize, dSize) {
- const oldParent = container.parent;
this.scene.add(container);
- if (oldParent) {
- this.scene.position.copy(oldParent.position);
- this.scene.quaternion.copy(oldParent.quaternion);
- this.scene.scale.copy(oldParent.scale);
- }
- container.traverse(o => {
- if (o.isMesh) {
- o.oldVisible = o.visible;
- o.visible = !o.isBuildMesh;
- }
- });
this.camera.position.copy(position);
this.camera.quaternion.copy(quaternion);
@@ -399,6 +441,12 @@ class PhysicsRaycaster {
// this.scene.overrideMaterial.uniforms.uNear.value = this.camera.near;
// this.scene.overrideMaterial.uniforms.uFar.value = this.camera.far;
+ container.traverse(o => {
+ if (o.isMesh) {
+ _filterGroups(o, this.camera);
+ }
+ });
+
const collisionIndex = this.index++;
this.renderer.setViewport(collisionIndex, 0, 1, 1);
this.renderer.setRenderTarget(this.renderTarget);
@@ -406,14 +454,12 @@ class PhysicsRaycaster {
container.traverse(o => {
if (o.isMesh) {
- o.visible = o.oldVisible;
+ _unfilterGroups(o);
}
});
- if (oldParent) {
- oldParent.add(container);
- } else {
- container.parent.remove(container);
- }
+
+ this.scene.remove(container);
+
return collisionIndex;
}
readRaycast() {
| 0 |
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js @@ -739,6 +739,8 @@ axes.autoTicks = function(ax, roughDTick) {
// being > half of the final unit - so precalculate twice the rough val
var roughX2 = 2 * roughDTick;
+ // TODO find way to have 'better' first tick on axes with breaks
+
if(roughX2 > ONEAVGYEAR) {
roughDTick /= ONEAVGYEAR;
base = getBase(10);
@@ -797,6 +799,9 @@ axes.autoTicks = function(ax, roughDTick) {
ax.tick0 = 0;
base = getBase(10);
ax.dtick = roundDTick(roughDTick, base, roundBase10);
+
+ // TODO having tick0 = 0 being insider a breaks does not seem
+ // to matter ...
}
// prevent infinite loops
| 0 |
diff --git a/src/components/common/PageCareers.vue b/src/components/common/PageCareers.vue <h1>Careers</h1>
<h2 class="c5">Our Mission</h2>
<p>
- We believe in the power of participant owned networks. These networks
- have the opportunity be more equitable, democratic, and resilient than
- the systems we interact with today.
+ Starting with Cosmos and the Cosmos Hub, we are on a mission to simplify
+ the user experience for new multi-stakeholder participant owned
+ networks.
</p>
<p>
- Starting with Cosmos and the Cosmos Hub, we are on a mission to simplify
- the user experience for these new multi-stakeholder, participant owned
- networks. By providing simple and secure user experiences we aim to make
- these networks more accessible, engaging, and enjoyable to use.
+ By providing simple and secure user experiences we aim to make these
+ networks more accessible, engaging, and enjoyable to use.
</p>
<p>...And we need your help to make it happen!</p>
</div>
<div class="card">
<h2 class="c5">Open Positions</h2>
- <ul>
- <li>Senior Software Engineer - API and Blockchain Systems</li>
- <li>Senior Software Engineer - Frontend</li>
- <li>Senior Designer - Product and Marketing</li>
+ <p>
+ The following are full-time roles based in Toronto or Berlin.
+ </p>
+ <ul class="jobs-list">
+ <li>
+ <a
+ href="https://angel.co/lunie/jobs/553123-senior-software-engineer-api-engineering-blockchain-systems"
+ class="job-title"
+ target="_blank"
+ rel="nofollow noreferrer noopener"
+ >Senior Software Engineer</a
+ >
+ <span>API Engineering, Blockchain Systems</span>
+ </li>
+ <li>
+ <a
+ href="https://angel.co/lunie/jobs/553137-senior-software-engineer-javascript-frontend"
+ class="job-title"
+ target="_blank"
+ rel="nofollow noreferrer noopener"
+ >Senior Software Engineer</a
+ >
+ <span>JavaScript, Frontend</span>
+ </li>
+ <li>
+ <a
+ href="https://angel.co/lunie/jobs/553139-senior-designer-product-marketing"
+ class="job-title"
+ target="_blank"
+ rel="nofollow noreferrer noopener"
+ >Senior Designer</a
+ >
+ <span>Product, Marketing</span>
+ </li>
</ul>
</div>
-
<div class="card">
- <h2 class="c5">Contact</h2>
+ <h2 class="c5">Why You Should Join Us</h2>
<p>
- To apply, send an email to [email protected].
+ We're an experienced and well-funded team, having an impact the future
+ of participant owned networks. We measure jokes per meeting and love
+ what we do.
+ </p>
+ <p>
+ We're offering significant equity, timeoff, and a flexible work
+ schedule. We respect the work week and treat eachother with kindness and
+ compassion.
</p>
</div>
</TmPage>
@@ -47,4 +81,16 @@ export default {
<style scoped>
@import "../../styles/content-page.css";
+
+.jobs-list li {
+ padding: 0.5rem 0;
+ line-height: 22px;
+ font-size: 18px;
+}
+
+.jobs-list span {
+ font-size: 14px;
+ font-weight: 500;
+ display: block;
+}
</style>
| 3 |
diff --git a/packages/mjml-core/src/index.js b/packages/mjml-core/src/index.js @@ -236,7 +236,7 @@ export default function mjml2html(mjml, options = {}) {
content = minify
? htmlMinify(content, {
collapseWhitespace: true,
- minifyCSS: true,
+ minifyCSS: false,
removeEmptyAttributes: true,
})
: content
| 12 |
diff --git a/src/encoded/schemas/library.json b/src/encoded/schemas/library.json "sonication (generic microtip)",
"sonication (Branson Sonifier 250)",
"sonication (Branson Sonifier 450)",
+ "sonication (Sonics VCX130)",
"shearing (Covaris LE Series)",
"see document",
"none",
| 0 |
diff --git a/token-metadata/0x60571E95E12c78CbA5223042692908f0649435a5/metadata.json b/token-metadata/0x60571E95E12c78CbA5223042692908f0649435a5/metadata.json "symbol": "PLAAS",
"address": "0x60571E95E12c78CbA5223042692908f0649435a5",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/views/env-parts/theme.es b/views/env-parts/theme.es @@ -44,8 +44,14 @@ const windowsSetVibrancy = value => {
const electronVibrancy = remote.require(join(window.ROOT, 'assets', 'binary', 'electron-vibrancy-x64'))
if (value === 1) {
electronVibrancy.SetVibrancy(remote.getCurrentWindow(), 0)
+ if (window.isWindowMode) {
+ remote.getCurrentWindow().setBackgroundColor('#002A2A2A')
+ }
} else {
electronVibrancy.DisableVibrancy(remote.getCurrentWindow())
+ if (window.isWindowMode) {
+ remote.getCurrentWindow().setBackgroundColor('#E62A2A2A')
+ }
}
} catch (e) {
console.warn('Set vibrancy style failed. Check if electron-vibrancy is correctly complied.', e)
| 12 |
diff --git a/codegens/js-fetch/lib/index.js b/codegens/js-fetch/lib/index.js @@ -44,7 +44,7 @@ function parseFormData (body, trim) {
if (data.type === 'file') {
bodySnippet += `// if access to fs, use fs.createReadStream('${data.src}') ` +
'to get file contents in second argument\n';
- bodySnippet += `formdata.append("${sanitize(data.key, trim)}",fileInput.files[0], '${data.src}');\n`;
+ bodySnippet += `formdata.append("${sanitize(data.key, trim)}",fileInput.files[0], "${data.src}");\n`;
}
else {
bodySnippet += `formdata.append("${sanitize(data.key, trim)}", "${sanitize(data.value, trim)}");\n`;
| 4 |
diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js @@ -2659,7 +2659,7 @@ defineSuite([
});
});
- it('immediatelyLoadDesiredLevelOfDetail', function() {
+ xit('immediatelyLoadDesiredLevelOfDetail', function() {
viewBottomRight();
var tileset = scene.primitives.add(new Cesium3DTileset({
url : tilesetOfTilesetsUrl,
| 8 |
diff --git a/token-metadata/0xa44E5137293E855B1b7bC7E2C6f8cD796fFCB037/metadata.json b/token-metadata/0xa44E5137293E855B1b7bC7E2C6f8cD796fFCB037/metadata.json "symbol": "SENT",
"address": "0xa44E5137293E855B1b7bC7E2C6f8cD796fFCB037",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/camera-manager.js b/camera-manager.js @@ -184,7 +184,10 @@ class CameraManager extends EventTarget {
this.lastTarget = null;
this.targetPosition = new THREE.Vector3(0, 0, 0);
this.targetQuaternion = new THREE.Quaternion();
- this.targetLerpFn = null;
+ this.sourcePosition = new THREE.Vector3();
+ this.sourceQuaternion = new THREE.Quaternion();
+ this.lerpStartTime = 0;
+ this.lastTimestamp = 0;
document.addEventListener('pointerlockchange', e => {
let pointerLockElement = document.pointerLockElement;
@@ -402,14 +405,41 @@ class CameraManager extends EventTarget {
this.targetQuaternion.copy(localQuaternion);
}
+ this.sourcePosition.copy(camera.position);
+ this.sourceQuaternion.copy(camera.quaternion);
+ this.lerpStartTime = timestamp;
+ this.lastTimestamp = timestamp;
+
cameraOffsetZ = -0.65;
cameraOffset.z = -0.65;
};
_setCameraToTarget();
}
- camera.position.lerp(this.targetPosition, 0.1);
- camera.quaternion.slerp(this.targetQuaternion, 0.1);
+ const _getLerpDelta = (position, quaternion) => {
+ const lastTimeFactor = Math.min(Math.max(Math.pow((this.lastTimestamp - this.lerpStartTime) / 1000, 0.5), 0), 1);
+ const currentTimeFactor = Math.min(Math.max(Math.pow((timestamp - this.lerpStartTime) / 1000, 0.5), 0), 1);
+ if (lastTimeFactor !== currentTimeFactor) {
+ {
+
+ const lastLerp = localVector.copy(this.sourcePosition).lerp(this.targetPosition, lastTimeFactor);
+ const currentLerp = localVector2.copy(this.sourcePosition).lerp(this.targetPosition, currentTimeFactor);
+ position.add(currentLerp).sub(lastLerp);
+ }
+ {
+ const lastLerp = localQuaternion.copy(this.sourceQuaternion).slerp(this.targetQuaternion, lastTimeFactor);
+ const currentLerp = localQuaternion2.copy(this.sourceQuaternion).slerp(this.targetQuaternion, currentTimeFactor);
+ quaternion.premultiply(lastLerp.invert()).premultiply(currentLerp);
+ }
+ }
+
+ this.lastTimestamp = timestamp;
+ };
+ _getLerpDelta(camera.position, camera.quaternion);
+ // camera.position.add(localQuaternion3);
+ // camera.quaternion.premultiply(lerpDelta.quaternion);
+ // camera.position.lerp(this.targetPosition, 0.1);
+ // camera.quaternion.slerp(this.targetQuaternion, 0.1);
// camera.position.copy(this.targetPosition);
// camera.quaternion.copy(this.targetQuaternion);
camera.updateMatrixWorld();
| 0 |
diff --git a/articles/protocols/saml/saml-configuration/special-configuration-scenarios/index.md b/articles/protocols/saml/saml-configuration/special-configuration-scenarios/index.md ---
description: Special configuration scenarios when setting up a SAML Integration
- url: /protocols/saml/saml-configuration/special-configuration-scenarios
---
# Special Configuration Scenarios
@@ -16,4 +15,5 @@ The instructions below assume that you're altering specific settings for an exis
## Scenarios
* [IdP-Initiated SSO](/protocols/saml/saml-configuration/special-configuration-scenarios/idp-initiated-sso)
+
* [Signing and Encrypting SAML Requests](/protocols/saml/saml-configuration/special-configuration-scenarios/signing-and-encrypting-saml-requests)
| 2 |
diff --git a/src/components/composer/index.js b/src/components/composer/index.js @@ -6,6 +6,7 @@ import { withRouter } from 'react-router';
import { connect } from 'react-redux';
import isURL from 'validator/lib/isURL';
import debounce from 'debounce';
+import queryString from 'query-string';
import { KeyBindingUtil } from 'draft-js';
import { URLS } from '../../helpers/regexps';
import { track } from '../../helpers/events';
@@ -302,6 +303,12 @@ class ComposerWithData extends Component<Props, State> {
this.clearEditorStateAfterPublish();
}
+ // we get the last thread id from the query params and dispatch it
+ // as the active thread.
+ const { location } = this.props;
+ const { t: threadId } = queryString.parse(location.search);
+
+ this.props.dispatch(changeActiveThread(threadId));
return this.props.dispatch(closeComposer());
};
| 12 |
diff --git a/src/resources/views/crud/fields/inc/repeatable_row.blade.php b/src/resources/views/crud/fields/inc/repeatable_row.blade.php if(isset($row)) {
if(!is_array($subfield['name'])) {
+ if(!Str::contains($subfield['name'], '.')) {
// this is a fix for 4.1 repeatable names that when the field was multiple, saved the keys with `[]` in the end. Eg: `tags[]` instead of `tags`
if(isset($row[$subfield['name']]) || isset($row[$subfield['name'].'[]'])) {
$subfield['value'] = $row[$subfield['name']] ?? $row[$subfield['name'].'[]'];
}
$subfield['name'] = $field['name'].'['.$repeatable_row_key.']['.$subfield['name'].']';
+ }else{
+ $subfield['value'] = \Arr::get($row, $subfield['name']);
+ $subfield['name'] = $field['name'].'['.$repeatable_row_key.']['.Str::replace('.', '][', $subfield['name']).']';
+ }
}else{
foreach ($subfield['name'] as $k => $item) {
$subfield['name'][$k] = $field['name'].'['.$repeatable_row_key.']['.$item.']';
| 11 |
diff --git a/stdcommands/owldictionary/owldictionary.go b/stdcommands/owldictionary/owldictionary.go @@ -18,6 +18,7 @@ import (
"github.com/botlabs-gg/yagpdb/v2/lib/dcmd"
"github.com/botlabs-gg/yagpdb/v2/lib/discordgo"
"github.com/microcosm-cc/bluemonday"
+ "github.com/sirupsen/logrus"
)
var confOwlbotToken = config.RegisterOption("yagpdb.owlbot_token", "Owlbot API token", "")
@@ -74,6 +75,7 @@ var Command = &commands.YAGCommand{
}
_, err = paginatedmessages.CreatePaginatedMessage(data.GuildData.GS.ID, data.ChannelID, 1, len(res.Definitions), func(p *paginatedmessages.PaginatedMessage, page int) (*discordgo.MessageEmbed, error) {
+ logrus.Info(page, len(res.Definitions))
if page > len(res.Definitions) {
return nil, paginatedmessages.ErrNoResults
}
| 1 |
diff --git a/data/brands/shop/clothes.json b/data/brands/shop/clothes.json },
{
"displayName": "RougeGorge",
- "id": "rougegorge-4a3e29",
- "locationSet": {"include": ["fr"]},
+ "id": "rougegorge-6db462",
+ "locationSet": {"include": ["be", "fr"]},
"tags": {
"brand": "RougeGorge",
"brand:wikidata": "Q104600739",
| 7 |
diff --git a/README.md b/README.md @@ -167,6 +167,7 @@ Embark will automatically take care of deployment for you and set all needed JS
```Javascript
# app/contracts/simple_storage.sol
+pragma solidity ^0.4.7;
contract SimpleStorage {
uint public storedData;
| 3 |
diff --git a/jmvc/seccubus/workspace/select/select.js b/jmvc/seccubus/workspace/select/select.js * limitations under the License.
*/
steal(
- 'jquery/controller',
- 'jquery/view/ejs',
- 'jquery/controller/view',
- 'seccubus/models'
+ "jquery/controller",
+ "jquery/view/ejs",
+ "jquery/controller/view",
+ "seccubus/models"
)
-.then( './views/init.ejs',
- './views/workspace.ejs',
- './views/no_workspace.ejs',
+.then(
+ "./views/init.ejs",
+ "./views/workspace.ejs",
function($){
/**
@@ -30,7 +30,8 @@ steal(
* @inherits jQuery.Controller
* Builds a dropdown selector of workspaces
*/
-$.Controller('Seccubus.Workspace.Select',
+ $.Controller(
+ 'Seccubus.Workspace.Select',
/** @Static */
{
defaults : {}
@@ -67,6 +68,7 @@ $.Controller('Seccubus.Workspace.Select',
);
}
-}); // Controller
-
-}); // Steal
+ }
+ ); // Controller
+ }
+); // Steal
| 7 |
diff --git a/js/huobipro.js b/js/huobipro.js @@ -1192,7 +1192,7 @@ module.exports = class huobipro extends Exchange {
if (type === 'withdraw') {
type = 'withdrawal';
}
- const status = this.parseTransactionStatus (this.safeString (transaction, 'status'));
+ const status = this.parseTransactionStatus (this.safeString (transaction, 'state'));
const tag = this.safeString (transaction, 'address-tag');
let feeCost = this.safeFloat (transaction, 'fee');
if (feeCost !== undefined) {
| 1 |
diff --git a/OurUmbraco.Client/src/scss/elements/_note.scss b/OurUmbraco.Client/src/scss/elements/_note.scss border: 1px solid #fff;
text-decoration: none;
display: inline-block;
- margin: 20px 10px 10px 10px;
+ margin: 20px 10px 0px 10px;
border-radius: 4px;
}
}
| 2 |
diff --git a/src/server/routes/apiv3/app-settings.js b/src/server/routes/apiv3/app-settings.js @@ -81,6 +81,11 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
* secretKey:
* type: String
* description: secret key for authentification of AWS
+ * PluginSettingParams:
+ * type: object
+ * isEnabledPlugins:
+ * type: String
+ * description: enable use plugins
*/
module.exports = (crowi) => {
@@ -154,6 +159,7 @@ module.exports = (crowi) => {
bucket: crowi.configManager.getConfig('crowi', 'aws:bucket'),
accessKeyId: crowi.configManager.getConfig('crowi', 'aws:accessKeyId'),
secretKey: crowi.configManager.getConfig('crowi', 'aws:secretKey'),
+ isEnabledPlugins: crowi.configManager.getConfig('crowi', 'plugin:isEnabledPlugins'),
};
return res.apiv3({ appSettingsParams });
@@ -405,5 +411,47 @@ module.exports = (crowi) => {
}
});
+
+ /**
+ * @swagger
+ *
+ * /app-settings/plugin-setting:
+ * put:
+ * tags: [AppSettings]
+ * description: Update plugin setting
+ * requestBody:
+ * required: true
+ * content:
+ * application/json:
+ * schema:
+ * $ref: '#/components/schemas/PluginSettingParams'
+ * responses:
+ * 200:
+ * description: Succeeded to update plugin setting
+ * content:
+ * application/json:
+ * schema:
+ * $ref: '#/components/schemas/PluginSettingParams'
+ */
+ router.put('/plugin-setting', loginRequiredStrictly, adminRequired, csrf, validator.pluginSetting, ApiV3FormValidator, async(req, res) => {
+ const requestPluginSettingParams = {
+ 'plugin:isEnabledPlugins': req.body.isEnabledPlugins,
+ };
+
+ try {
+ await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestPluginSettingParams);
+ const pluginSettingParams = {
+ isEnabledPlugins: crowi.configManager.getConfig('crowi', 'plugin:isEnabledPlugins'),
+ };
+ return res.apiv3({ pluginSettingParams });
+ }
+ catch (err) {
+ const msg = 'Error occurred in updating plugin setting';
+ logger.error('Error', err);
+ return res.apiv3Err(new ErrorV3(msg, 'update-pluginSetting-failed'));
+ }
+
+ });
+
return router;
};
| 13 |
diff --git a/app/views/audit.scala.html b/app/views/audit.scala.html else {
// no street view available in this range.
console.error("Error loading Street View imagery: " + status);
- svl.tracker.push("PanoId_NotFound_Onload", {'Location': JSON.stringify(latLng)});
- // Reload page (May need a better solution than this one)
+ console.log("Street edge we are trying to audit: " + @task.map(_.edgeId).getOrElse(-1));
+ svl.tracker.push("PanoId_NotFound_Onload", {'Location': JSON.stringify(latLng), 'StreetEdgeId': @task.map(_.edgeId).getOrElse(-1)});
+ // Reload page (May need a better solution than this one, issue #1570)
window.location.href = window.location.origin + "/audit";
// throw "Error loading Street View imagery.";
| 7 |
diff --git a/renderer/components/Settings/SettingsFieldHelpers.js b/renderer/components/Settings/SettingsFieldHelpers.js @@ -25,15 +25,14 @@ FieldLabel.propTypes = {
export const NumberField = props => (
<Input
- css={`
- text-align: right;
- `}
highlightOnValid={false}
isRequired
+ justifyContent="flex-end"
min="1"
step="1"
+ textAlign="right"
type="number"
- width={80}
+ width={100}
{...props}
/>
)
| 1 |
diff --git a/packages/bitcore-node/package.json b/packages/bitcore-node/package.json "bitcore-wallet-client": "^8.25.28",
"body-parser": "1.18.3",
"cors": "2.8.4",
- "crypto-rpc": "https://github.com/bitpay/crypto-rpc.git#e7891ae9dc1dc564273119a8bb484cd8f54134fd",
+ "crypto-rpc": "https://github.com/bitpay/crypto-rpc.git#e8106ed18740b0257a90365e830726cd66e912f6",
"crypto-wallet-core": "^8.25.28",
"heapdump": "0.3.15",
"http": "0.0.0",
| 3 |
diff --git a/login.js b/login.js @@ -241,6 +241,13 @@ class LoginManager extends EventTarget {
}));
}
+ getAddress() {
+ return loginToken && loginToken.address;
+ }
+ getMnemonic() {
+ return loginToken && loginToken.mnemonic;
+ }
+
getAvatar() {
return userObject && userObject.avatarHash;
}
| 0 |
diff --git a/client/app/dbaas/metrics/dashboard/metrics-dashboard.html b/client/app/dbaas/metrics/dashboard/metrics-dashboard.html <div data-ng-hide="MetricsDashboardCtrl.loading.service && MetricsDashboardCtrl.loading.consumption">
<metrics-chart-pie
legend="'metrics_ddp' | translate "
- text="MetricsDashboardCtrl.usage.conso.ddp | formatSi"
+ text="(MetricsDashboardCtrl.usage.conso.ddp | formatSi) || 0"
text-small="MetricsDashboardCtrl.displayUsage(MetricsDashboardCtrl.usage.conso.ddp, MetricsDashboardCtrl.usage.quota.ddp)"
value="MetricsDashboardCtrl.computeUsage(MetricsDashboardCtrl.usage.conso.ddp, MetricsDashboardCtrl.usage.quota.ddp)"
color="MetricsDashboardCtrl.computeColor(MetricsDashboardCtrl.usage.conso.ddp, MetricsDashboardCtrl.usage.quota.ddp)">
| 14 |
diff --git a/util.js b/util.js @@ -401,3 +401,11 @@ export function parseExtents(s) {
return null;
}
}
+
+export function isInIframe {
+ try {
+ return window.self !== window.top;
+ } catch (e) {
+ return true;
+ }
+}
\ No newline at end of file
| 0 |
diff --git a/src/system/dom.js b/src/system/dom.js @@ -52,7 +52,7 @@ export function DOMContentLoaded(fn) {
// bind dom load event if not done yet
if (!readyBound) {
// directly call domReady if document is already "ready"
- if (nodeJS === true || typeof globalThis.document !== "undefined" && globalThis.document.readyState === "complete") {
+ if (nodeJS === true || (typeof globalThis.document !== "undefined" && globalThis.document.readyState === "complete")) {
// defer the fn call to ensure our script is fully loaded
globalThis.setTimeout(_domReady, 0);
}
| 1 |
diff --git a/assets/js/util/i18n.js b/assets/js/util/i18n.js @@ -127,10 +127,18 @@ export const readableLargeNumber = ( number ) => {
/**
* Formats a number with unit using the JS Internationalization Number Format API.
*
+ * In addition to the supported 'style' values of the lower-level `numberFormat` function, this function
+ * supports two additional 'style' values 'metric' and 'seconds'.
+ *
+ * Another differentiation in behavior is that by default the function will use 'metric' formatting instead
+ * of 'decimal' formatting.
+ *
* @since n.e.x.t
*
* @param {number|string} number The number to format.
- * @param {(Intl.NumberFormatOptions|string)} [options] Formatting options or unit.
+ * @param {(Intl.NumberFormatOptions|string)} [options] Formatting options or unit shorthand.
+ * Possible shorthand values are '%', 's',
+ * or a currency code.
* @return {string} The formatted number with unit.
*/
export const numFmt = ( number, options = {} ) => {
| 7 |
diff --git a/samples/csharp_dotnetcore/16.proactive-messages/Controllers/NotifyController.cs b/samples/csharp_dotnetcore/16.proactive-messages/Controllers/NotifyController.cs @@ -47,8 +47,6 @@ public async Task<IActionResult> Get()
private async Task BotCallback(ITurnContext turnContext, CancellationToken cancellationToken)
{
- // If you encounter permission-related errors when sending this message, see
- // https://aka.ms/BotTrustServiceUrl
await turnContext.SendActivityAsync("proactive hello");
}
}
| 2 |
diff --git a/src/plots/cartesian/layout_attributes.js b/src/plots/cartesian/layout_attributes.js @@ -278,7 +278,6 @@ module.exports = {
pattern: {
valType: 'enumerated',
- // TODO could add '%H:%M:%S'
values: ['day of week', 'hour', ''],
dflt: '',
role: 'info',
@@ -287,8 +286,6 @@ module.exports = {
'Determines a pattern on the time line that generates breaks.',
'If *day of week* - Sunday-based weekday as a decimal number [0, 6].',
'If *hour* - hour (24-hour clock) as a decimal number [0, 23].',
- '*day of week* and *hour* are similar to *%w* and *%H* directives',
- 'applied in `tickformat`, see https://github.com/d3/d3-time-format#locale_format',
'for more info.',
'Examples:',
'- { pattern: \'day of week\', bounds: [6, 0] }',
| 2 |
diff --git a/test/server/cards/09.5-aCF/UnifiedCompany.spec.js b/test/server/cards/09.5-aCF/UnifiedCompany.spec.js @@ -34,12 +34,14 @@ describe('Unified Company', function() {
it('should trigger once the character wins a conflict and the controller has less cards in hand', function() {
this.noMoreActions();
expect(this.player1).toHavePrompt('Triggered Abilities');
+ expect(this.player1).toBeAbleToSelect(this.unifiedCompany);
this.player1.clickCard(this.unifiedCompany);
expect(this.player1).toHavePrompt('Unified Company');
});
it('should only be able to target non-unique cost 2 or less bushi in your dynasty discard pile', function() {
this.noMoreActions();
+ expect(this.player1).toBeAbleToSelect(this.unifiedCompany);
this.player1.clickCard(this.unifiedCompany);
expect(this.player1).toBeAbleToSelect(this.gunso);
expect(this.player1).not.toBeAbleToSelect(this.taiko);
@@ -51,6 +53,7 @@ describe('Unified Company', function() {
it('should put the character into play', function() {
expect(this.gunso.location).toBe('dynasty discard pile');
this.noMoreActions();
+ expect(this.player1).toBeAbleToSelect(this.unifiedCompany);
this.player1.clickCard(this.unifiedCompany);
this.player1.clickCard(this.gunso);
expect(this.gunso.location).toBe('play area');
@@ -61,22 +64,22 @@ describe('Unified Company', function() {
this.player2.clickCard('banzai');
this.player2.clickCard(this.unifiedCompany);
this.player2.clickPrompt('Done');
- this.noMoreActions();
expect(this.player1.player.hand.size()).toBe(1);
expect(this.player2.player.hand.size()).toBe(1);
- expect(this.player1).toHavePrompt('Do you wish to discard Adept of the Waves?');
+ this.noMoreActions();
+ expect(this.player1).not.toBeAbleToSelect(this.unifiedCompany);
});
- it('should not trigger if you have less cards in hand', function() {
+ it('should not trigger if you have more cards in hand', function() {
this.player2.clickCard('banzai');
this.player2.clickCard(this.unifiedCompany);
this.player2.clickPrompt('Done');
this.player1.pass();
this.player2.playAttachment('fine-katana', this.unifiedCompany);
- this.noMoreActions();
expect(this.player1.player.hand.size()).toBe(1);
expect(this.player2.player.hand.size()).toBe(0);
- expect(this.player1).toHavePrompt('Do you wish to discard Adept of the Waves?');
+ this.noMoreActions();
+ expect(this.player1).not.toBeAbleToSelect(this.unifiedCompany);
});
});
});
| 3 |
diff --git a/articles/libraries/custom-signup.md b/articles/libraries/custom-signup.md @@ -7,6 +7,14 @@ description: How to customize the user sign-up form with additional fields using
In some cases, you may want to customize the user sign up form with more fields other than email and password.
+:::panel-info
+Auth0 offers a [hosted login page](/hosted-pages/login) option that you can use instead of designing your own custom sign up page. If you want to offer sign up and log in options, and you only need to customize the following fields, the Hosted Login Page might be an easier option to implement:
+
+* Client Name
+* Logo
+* Background Color
+:::
+
## Using Lock
Lock 10 supports [custom fields signup](/libraries/lock/v10/customization#additionalsignupfields-array-).
@@ -54,7 +62,7 @@ For further reference, here is our [documentation on progressive profiling](/use
**NOTE**: `name` and `color` are custom fields.
::: panel-info Custom field validation
-There is currently no way to validate user-supplied custom fields when signing up. Validation must be done from an Auth0 [Rule](/rules) at login, or with custom logic in your application.
+There is currently no way to validate user-supplied custom fields when signing up. Validation must be done from an Auth0 [Rule](/rules) at login, or with custom, **server-side** logic in your application.
:::
### 2. Send the Form Data
| 0 |
diff --git a/server/src/classes/longRangeComm.js b/server/src/classes/longRangeComm.js @@ -100,7 +100,7 @@ export default class LongRangeComm extends System {
);
if (hasCommReview) {
// Get the last message and make it approved.
- this.messages[this.messages.length].approveMessage();
+ this.messages[this.messages.length - 1].approveMessage();
// Create a new message to train the comm review.
this.createMessage(
`This is a training message for you to review. It has secret, sensitive information in it, so you should encrypt it before approving it.`,
| 1 |
diff --git a/lib/Chunk.js b/lib/Chunk.js @@ -207,14 +207,15 @@ class Chunk {
other.blocks.forEach(b => {
b.chunks = b.chunks ? b.chunks.map(c => {
return c === other ? this : c;
- }, this) : [this];
+ }) : [this];
b.chunkReason = reason;
this.addBlock(b);
- }, this);
+ });
other.blocks.length = 0;
+
other.origins.forEach(origin => {
this.origins.push(origin);
- }, this);
+ });
this.origins.forEach(origin => {
if(!origin.reasons) {
origin.reasons = [reason];
| 2 |
diff --git a/assets/js/components/notifications/CoreSiteBannerNotifications.stories.js b/assets/js/components/notifications/CoreSiteBannerNotifications.stories.js @@ -30,8 +30,6 @@ const Template = ( { setupRegistry } ) => (
</WithRegistrySetup>
);
-const delay = 1000; // Needed for fonts to render properly.
-
const notification1 = {
id: 'test-notification',
title: 'Google Analytics 5 Beta',
@@ -66,11 +64,6 @@ NotificationCTA.args = {
.receiveGetNotifications( [ notification1 ], {} );
},
};
-NotificationCTA.scenario = {
- label: 'Global/CoreSiteBannerNotifications1',
- readySelector: '.googlesitekit-publisher-win',
- delay,
-};
export const NoNotifications = Template.bind( {} );
NoNotifications.storyName = 'Has No Notifications - Not Displayed';
@@ -79,10 +72,6 @@ NoNotifications.args = {
registry.dispatch( CORE_SITE ).receiveGetNotifications( [], {} );
},
};
-NoNotifications.scenario = {
- label: 'Global/CoreSiteBannerNotifications2',
- delay,
-};
export const NotificationCTAWithSurvey = Template.bind( {} );
NotificationCTAWithSurvey.storyName =
@@ -100,10 +89,6 @@ NotificationCTAWithSurvey.args = {
);
},
};
-NotificationCTAWithSurvey.scenario = {
- label: 'Global/CoreSiteBannerNotifications3',
- delay,
-};
export const NotificationCTAWithSurveyShortDelay = Template.bind( {} );
NotificationCTAWithSurveyShortDelay.storyName =
@@ -124,10 +109,6 @@ NotificationCTAWithSurveyShortDelay.args = {
}, 3 * 1000 );
},
};
-NotificationCTAWithSurveyShortDelay.scenario = {
- label: 'Global/CoreSiteBannerNotifications4',
- delay,
-};
export const NotificationCTAWithSurveyLongerDelay = Template.bind( {} );
NotificationCTAWithSurveyLongerDelay.storyName =
@@ -148,11 +129,6 @@ NotificationCTAWithSurveyLongerDelay.args = {
}, 6 * 1000 );
},
};
-NotificationCTAWithSurveyLongerDelay.scenario = {
- label: 'Global/CoreSiteBannerNotifications5',
- readySelector: '.googlesitekit-publisher-win',
- delay,
-};
export default {
title: 'Components/CoreSiteBannerNotifications',
| 2 |
diff --git a/src/resources/texture-atlas.js b/src/resources/texture-atlas.js @@ -114,6 +114,11 @@ class TextureAtlasHandler {
}
patch(asset, assets) {
+ // during editor update the underlying texture is temporarily null. just return in that case.
+ if (!asset.resource) {
+ return;
+ }
+
if (asset.resource.__data) {
// engine-only, so copy temporary asset data from texture atlas into asset and delete temp property
if (asset.resource.__data.minfilter !== undefined) asset.data.minfilter = asset.resource.__data.minfilter;
| 9 |
diff --git a/experimental/common-expression-language/prebuilt-functions.md b/experimental/common-expression-language/prebuilt-functions.md @@ -49,7 +49,7 @@ or you can browse the functions based on [alphabetical order](#alphabetical-list
|[where](#where) | Filter on each element and return the new collection of filtered elements which match specific condition |
|[sortBy](#sortBy) | Sort elements in the collection with ascending order and return the sorted collection |
|[sortByDescending](#sortByDescending) | Sort elements in the collection with descending order and return the sorted collection |
-
+|[indicesAndValues](#indicesAndValues) | turned an array into an array of objects with index and value property |
### Logical comparison functions
|Function |Explanation|
@@ -1819,6 +1819,57 @@ indexOf('hello world', 'world')
And returns this result: `6`
+<a name="indicesAndValues"></a>
+
+### indicesAndValues
+
+Turned an array into an array of objects with index (current index) and value property.
+
+```
+indicesAndValues('<collection>')
+```
+
+| Parameter | Required | Type | Description |
+| --------- | -------- | ---- | ----------- |
+| <*collection*> | Yes | Array | Original array |
+|||||
+
+| Return value | Type | Description |
+| ------------ | ---- | ----------- |
+| <*collection*> | Array | New array that each item has two properties, one is index, present this item's origin index, the other one is value |
+||||
+
+*Example*
+
+Suppose there is a list { items: ["zero", "one", "two"] }
+
+```
+where(indicesAndValues(items), elt, elt.index >= 1)
+```
+
+And returns a new list:
+```
+[
+ {
+ index: 1,
+ value: 'one'
+ },
+ {
+ index: 2,
+ value: 'two'
+ }
+]
+```
+
+Another example, with the same list `items`.
+
+```
+join(foreach(indicesAndValues(items), item, item.value), ',')
+```
+
+will return `zero,one,two`, and this expression has the same effect with `join(items, ',')`
+
+
<a name="int"></a>
### int
| 0 |
diff --git a/dual-contouring.js b/dual-contouring.js @@ -26,14 +26,18 @@ w.free = address => {
};
let chunkSize = defaultChunkSize;
-let inst = null;
+// let inst = null;
w.initialize = (newChunkSize, seed) => {
Module._initialize(newChunkSize, seed);
chunkSize = newChunkSize;
- inst = Module._createInstance();
+ // inst = Module._createInstance();
};
+w.createInstance = () => Module._createInstance();
+w.destroyInstance = instance => Module._destroyInstance(instance);
+
const cubeDamage = damageFn => (
+ inst,
x, y, z,
qx, qy, qz, qw,
sx, sy, sz,
@@ -51,6 +55,7 @@ const cubeDamage = damageFn => (
const damageBuffersTypedArray = allocator.alloc(Float32Array, numPositions * gridPoints * gridPoints * gridPoints);
const drew = damageFn(
+ inst,
x, y, z,
qx, qy, qz, qw,
sx, sy, sz,
@@ -79,13 +84,14 @@ const cubeDamage = damageFn => (
}
};
w.drawCubeDamage = function() {
- return cubeDamage(Module._drawCubeDamage.bind(Module, inst)).apply(this, arguments);
+ return cubeDamage(Module._drawCubeDamage.bind(Module)).apply(this, arguments);
};
w.eraseCubeDamage = function() {
- return cubeDamage(Module._eraseCubeDamage.bind(Module, inst)).apply(this, arguments);
+ return cubeDamage(Module._eraseCubeDamage.bind(Module)).apply(this, arguments);
};
const sphereDamage = damageFn => (
+ inst,
x, y, z,
radius,
) => {
@@ -102,6 +108,7 @@ const sphereDamage = damageFn => (
const damageBuffersTypedArray = allocator.alloc(Float32Array, numPositions * gridPoints * gridPoints * gridPoints);
const drew = damageFn(
+ inst,
x, y, z,
radius,
positionsTypedArray.byteOffset,
@@ -135,7 +142,7 @@ w.eraseSphereDamage = function() {
return sphereDamage(Module._eraseSphereDamage.bind(Module)).apply(this, arguments);
};
-w.injectDamage = function(x, y, z, damageBuffer) {
+w.injectDamage = function(inst, x, y, z, damageBuffer) {
const allocator = new Allocator(Module);
const damageBufferTypedArray = allocator.alloc(Float32Array, damageBuffer.length);
@@ -152,7 +159,7 @@ w.injectDamage = function(x, y, z, damageBuffer) {
}
};
-w.createChunkMeshDualContouring = (x, y, z, lods) => {
+w.createChunkMeshDualContouring = (inst, x, y, z, lods) => {
const allocator = new Allocator(Module);
const lodArray = allocator.alloc(Int32Array, 8);
@@ -221,7 +228,7 @@ w.createChunkMeshDualContouring = (x, y, z, lods) => {
}
};
-w.getHeightfieldRange = (x, z, w, h, lod) => {
+w.getHeightfieldRange = (inst, x, z, w, h, lod) => {
const allocator = new Allocator(Module);
const heights = allocator.alloc(Float32Array, w * h);
@@ -239,7 +246,7 @@ w.getHeightfieldRange = (x, z, w, h, lod) => {
allocator.freeAll();
}
};
-w.getChunkSkylight = (x, y, z, lod) => {
+w.getChunkSkylight = (inst, x, y, z, lod) => {
const allocator = new Allocator(Module);
// const gridPoints = chunkSize + 3 + lod;
@@ -257,7 +264,7 @@ w.getChunkSkylight = (x, y, z, lod) => {
allocator.freeAll();
}
};
-w.getChunkAo = (x, y, z, lod) => {
+w.getChunkAo = (inst, x, y, z, lod) => {
const allocator = new Allocator(Module);
const aos = allocator.alloc(Uint8Array, chunkSize * chunkSize * chunkSize);
@@ -274,7 +281,7 @@ w.getChunkAo = (x, y, z, lod) => {
allocator.freeAll();
}
};
-w.getSkylightFieldRange = (x, y, z, w, h, d, lod) => {
+w.getSkylightFieldRange = (inst, x, y, z, w, h, d, lod) => {
const allocator = new Allocator(Module);
const skylights = allocator.alloc(Uint8Array, w * h * d);
@@ -292,7 +299,7 @@ w.getSkylightFieldRange = (x, y, z, w, h, d, lod) => {
allocator.freeAll();
}
};
-w.getAoFieldRange = (x, y, z, w, h, d, lod) => {
+w.getAoFieldRange = (inst, x, y, z, w, h, d, lod) => {
const allocator = new Allocator(Module);
const aos = allocator.alloc(Uint8Array, w * h * d);
@@ -311,7 +318,7 @@ w.getAoFieldRange = (x, y, z, w, h, d, lod) => {
}
};
-w.createGrassSplat = (x, z, lod) => {
+w.createGrassSplat = (inst, x, z, lod) => {
const allocator = new Allocator(Module);
const allocSize = 64 * 1024;
@@ -340,7 +347,7 @@ w.createGrassSplat = (x, z, lod) => {
allocator.freeAll();
}
};
-w.createVegetationSplat = (x, z, lod) => {
+w.createVegetationSplat = (inst, x, z, lod) => {
const allocator = new Allocator(Module);
const allocSize = 64 * 1024;
@@ -369,7 +376,7 @@ w.createVegetationSplat = (x, z, lod) => {
allocator.freeAll();
}
};
-w.createMobSplat = (x, z, lod) => {
+w.createMobSplat = (inst, x, z, lod) => {
const allocator = new Allocator(Module);
const allocSize = 64 * 1024;
| 0 |
diff --git a/token-metadata/0xB81D70802a816B5DacBA06D708B5acF19DcD436D/metadata.json b/token-metadata/0xB81D70802a816B5DacBA06D708B5acF19DcD436D/metadata.json "symbol": "DEXG",
"address": "0xB81D70802a816B5DacBA06D708B5acF19DcD436D",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/home.scn b/home.scn "position": [0, 0, 0],
"quaternion": [0, 0, 0, 1],
"scale": [1, 1, 1],
- "start_url": "https://avaer.github.io/camera/index.js"
+ "start_url": "https://avaer.github.io/planet/index.js"
+ },
+ {
+ "name": "land",
+ "position": [-20, 2, 0],
+ "quaternion": [0, 0, 0, 1],
+ "scale": [1, 1, 1],
+ "start_url": "https://avaer.github.io/land/index.js"
}
]
}
\ No newline at end of file
| 0 |
diff --git a/articles/multifactor-authentication/developer/mfa-from-id-token.md b/articles/multifactor-authentication/developer/mfa-from-id-token.md @@ -30,7 +30,7 @@ jwt.verify(id_token, AUTH0_CLIENT_SECRET, { algorithms: ['HS256'] }, function(er
});
```
-## Further reading
+## Keep reading
::: next-steps
* [Auth0 id_token](/tokens/id-token)
| 10 |
diff --git a/scripts/test-mem.js b/scripts/test-mem.js -/*global process*/
-/*eslint no-console:0, no-sync:0*/
+/* global process setImmediate */
-'use strict';
-
-const {after, of} = require('..');
-const log = require('util').log;
-const sync = process.argv[2] === 'sync';
-const id = x => x;
-const spawn = (sync ? x => of(x).map(id) : x => after(1, x).map(id));
-
-log('PID', process.pid);
+const Future = require('..');
+const {log} = require('util');
const start = Date.now();
let batch = 0;
let stamp = Date.now();
-const recursive = () => {
+const report = () => {
const memMB = process.memoryUsage().rss / 1048576;
const now = Date.now();
const passed = now - stamp;
@@ -28,17 +20,66 @@ const recursive = () => {
);
stamp = now;
}
- // return spawn('l').chain(recursive).race(spawn('r')); //Runs out of memory in "sync" mode
- // return spawn('l').race(spawn('r').chain(recursive)); //Immediately exits with "l"
- return spawn('l').race(spawn('r')).chain(recursive); //Infinite recursion
};
-const cancel = recursive().fork(
+const sync = Future.of;
+const async = x => Future((l, r) => void setImmediate(r, x));
+
+const cases = Object.create(null);
+
+//Should infinitely run until finally running out of memory.
+cases.syncHeadRecursion = function recur(){
+ report();
+ return sync('l').chain(recur).race(sync('r'));
+};
+
+//Should immediately exit with "l".
+cases.syncDeepRecursion = function recur(){
+ report();
+ return sync('l').race(sync('r').chain(recur));
+};
+
+//Should infinitely run without any problems.
+cases.syncTailRecursion = function recur(){
+ report();
+ return sync('l').race(sync('r')).chain(recur);
+};
+
+//Should immediately exit with "r".
+cases.asyncHeadRecursion = function recur(){
+ report();
+ return async('l').chain(recur).race(async('r'));
+};
+
+//Should immediately exit with "l".
+cases.asyncDeepRecursion = function recur(){
+ report();
+ return async('l').race(async('r').chain(recur));
+};
+
+//Should infinitely run without any problems.
+cases.asyncTailRecursion = function recur(){
+ report();
+ return async('l').race(async('r')).chain(recur);
+};
+
+const f = cases[process.argv[2]];
+
+if(typeof f !== 'function'){
+ console.log('Usage: node test-mem.js <case>\n');
+ console.log('Possible cases:');
+ Object.keys(cases).forEach(k => console.log(` ${k}`));
+ process.exit(1);
+}
+
+log('PID', process.pid);
+
+const cancel = f().fork(
e => {console.error(e.stack); process.exit(1)},
v => {log('resolved', v); process.exit(2)}
);
-process.on('SIGINT', () => {
+process.once('SIGINT', () => {
log('SIGINT caught. Cancelling...');
cancel();
});
| 7 |
diff --git a/accessibility-checker-engine/help-v4/en-US/html_lang_valid.html b/accessibility-checker-engine/help-v4/en-US/html_lang_valid.html ### Why is this important?
-When language attributes are used to identify the language of a page or specific content within a page, the attribute values must conform to [BCP 47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). This ensures that user agents can correctly present the content using the correct presentation and pronunciation rules for that language.
+When the language attribute is used to identify the human language of the page, the attribute value must conform to [BCP 47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). This ensures that user agents and text-to-speech (TTS) synthesizers can correctly present the page's default content using the correct presentation and pronunciation rules for that language.
<!-- This is where the code snippet is injected -->
<div id="locSnippet"></div>
### What to do
-* Update the value of the `lang` or `xml:lang` attribute to a value that conforms to [BCP 47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) to correctly identify the language.
+* Update the value of the `lang` or `xml:lang` attribute to a value that conforms to [BCP 47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) to correctly identify the page's default human language.
For example:
@@ -84,6 +84,7 @@ For example:
* People using a screen reader, including blind, low vision and neurodivergent people
* People with low vision
* People with dexterity impairment using voice control
+* People using text-to-speech (TTS) synthesizer technoogies
</script></mark-down>
<!-- End side panel -->
| 2 |
diff --git a/components/csv/csv.js b/components/csv/csv.js @@ -48,6 +48,11 @@ class Csv extends React.Component {
error: null,
encoding: null
}
+
+ this.handleFileDrop = this.handleFileDrop.bind(this)
+ this.parseFile = this.parseFile.bind(this)
+ this.handleAddColumn = this.handleAddColumn.bind(this)
+ this.handleRemoveColumn = this.handleRemoveColumn.bind(this)
}
resetState() {
@@ -77,7 +82,7 @@ class Csv extends React.Component {
.catch(() => this.setState({error: 'Impossible de lire ce fichier.'}))
}
- onDrop(fileList) {
+ handleFileDrop(fileList) {
const file = fileList[0]
const fileExtension = getFileExtension(file.name)
if (file.type && !allowedTypes.includes(file.type)) {
@@ -100,13 +105,13 @@ class Csv extends React.Component {
}
}
- addColumn(column) {
+ handleAddColumn(column) {
const columns = [...this.state.columns]
columns.push(column)
this.setState({columns})
}
- removeColumn(column) {
+ handleRemoveColumn(column) {
const columns = [...this.state.columns.filter(col => col !== column)]
this.setState({columns})
}
@@ -119,7 +124,7 @@ class Csv extends React.Component {
<div id='main' className='csvtogeocoder'>
<div>
<h2>1. Choisir un fichier</h2>
- <Holder file={file} placeholder={`Glissez un fichier ici (max ${MAX_SIZE / 1000000} Mo), ou cliquez pour choisir`} onDrop={fileList => this.onDrop(fileList)} />
+ <Holder file={file} placeholder={`Glissez un fichier ici (max ${MAX_SIZE / 1000000} Mo), ou cliquez pour choisir`} onDrop={this.handleFileDrop} />
{error && <div className='error'>{error}</div>}
</div>
{csv ? (
@@ -133,8 +138,8 @@ class Csv extends React.Component {
<ColumnsSelect
columns={csv.data[0]}
selectedColumns={columns}
- onAdd={column => this.addColumn(column)}
- onRemove={column => this.removeColumn(column)} />
+ onAdd={this.handleAddColumn}
+ onRemove={this.handleRemoveColumn} />
</div>
<Geocoder file={file} encoding={encoding} columns={columns} />
</div>
| 7 |
diff --git a/README.md b/README.md -# Wappalyzer [](https://travis-ci.org/AliasIO/Wappalyzer/) [](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/?branch=master)
+# Wappalyzer [](https://travis-ci.org/AliasIO/Wappalyzer/) [](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/?branch=master)
[Wappalyzer](https://www.wappalyzer.com/) is a
[cross-platform](https://github.com/AliasIO/Wappalyzer/wiki/Drivers) utility that uncovers the
| 1 |
diff --git a/README.md b/README.md -
+
[](https://buildkite.com/calibre/terminal-cli)
| 4 |
diff --git a/src/payment-flows/native.js b/src/payment-flows/native.js @@ -112,10 +112,6 @@ function isNativeEligible({ props, config, serviceData } : IsEligibleOptions) :
const { firebase: firebaseConfig } = config;
const { eligibility } = serviceData;
- if (env === ENV.LOCAL || env === ENV.STAGE) {
- return false;
- }
-
if (platform !== PLATFORM.MOBILE) {
return false;
}
@@ -144,6 +140,10 @@ function isNativeEligible({ props, config, serviceData } : IsEligibleOptions) :
return true;
}
+ if (env === ENV.LOCAL || env === ENV.STAGE) {
+ return false;
+ }
+
if (eligibility.nativeCheckout.paypal || eligibility.nativeCheckout.venmo) {
return true;
}
| 11 |
diff --git a/lib/sandbox.js b/lib/sandbox.js @@ -1292,10 +1292,14 @@ function sandBox(script, name, verbose, debug, context) {
if ((typeof pattern === 'string' && pattern[0] === '{') || (typeof pattern === 'object' && pattern.period)) {
sandbox.verbose && sandbox.log(`schedule(wizard=${typeof pattern === 'object' ? JSON.stringify(pattern) : pattern})`, 'info');
+
+ sandbox.__engine.__schedules += 1;
+
const schedule = context.scheduler.add(pattern, sandbox.name, callback);
if (schedule) {
script.wizards.push(schedule);
- sandbox.__engine.__schedules += 1;
+ } else {
+ sandbox.__engine.__schedules -= 1;
}
return schedule;
}
| 13 |
diff --git a/packages/spark-extras/package.json b/packages/spark-extras/package.json "@sparkdesignsystem/spark-highlight-board": "^1.0.0-beta.2",
"chai": "^4.1.2",
"jsdom": "^11.11.0",
- "nyc": "^11.9.0"
+ "nyc": "^11.9.0",
+ "object-fit-images": "^3.2.3"
},
"devDependencies": {
"babel": "^6.23.0",
| 3 |
diff --git a/resource/js/components/PageEditor/Editor.js b/resource/js/components/PageEditor/Editor.js @@ -2,8 +2,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import urljoin from 'url-join';
-const loadScripts = require('simple-load-script').all;
-const loadCss = require('load-css-file');
+const loadScript = require('simple-load-script');
+const loadCssSync = require('load-css-file');
import * as codemirror from 'codemirror';
@@ -64,6 +64,11 @@ export default class Editor extends React.Component {
isUploading: false,
};
+ // manage keymap w/o state because 'cm.setOption' is invoked manually
+ this.currentKeymapMode = undefined;
+ this.loadedKeymapSet = new Set();
+
+
this.getCodeMirror = this.getCodeMirror.bind(this);
this.setCaretLine = this.setCaretLine.bind(this);
this.setScrollTopByLine = this.setScrollTopByLine.bind(this);
@@ -98,13 +103,19 @@ export default class Editor extends React.Component {
this.setKeymapMode(keymapMode);
}
+ componentWillReceiveProps(nextProps) {
+ // apply keymapMode
+ const keymapMode = nextProps.editorOptions.keymapMode;
+ this.setKeymapMode(keymapMode);
+ }
+
getCodeMirror() {
return this.refs.cm.editor;
}
- loadCssAsync(source) {
+ loadCss(source) {
return new Promise((resolve) => {
- loadCss(source);
+ loadCssSync(source);
resolve();
});
}
@@ -158,23 +169,39 @@ export default class Editor extends React.Component {
* @param {string} keymapMode 'vim' or 'emacs' or 'sublime'
*/
setKeymapMode(keymapMode) {
- const loadCssAsync = this.loadCssAsync;
+ const loadCss = this.loadCss;
+ if (this.currentKeymapMode === keymapMode) {
+ // do nothing
+ return;
+ }
if (keymapMode == null || !keymapMode.match(/^(vim|emacs|sublime)$/)) {
- // reset keymap
- this.getCodeMirror().setOption('keyMap', 'default');
+ // set 'default'
+ this.currentKeymapMode = 'default';
+ this.getCodeMirror().setOption('keyMap', this.currentKeymapMode);
return;
}
- Promise.all([
- loadScripts(
- urljoin(this.cmCdnRoot, 'addon/dialog/dialog.min.js'),
- urljoin(this.cmCdnRoot, `keymap/${keymapMode}.min.js`)
- ),
- loadCssAsync(
- urljoin(this.cmCdnRoot, 'addon/dialog/dialog.min.css')
- )
- ]).then(() => {
+ let scriptList = [];
+ let cssList = [];
+
+ // add dependencies
+ if (this.loadedKeymapSet.size == 0) {
+ scriptList.push(loadScript(urljoin(this.cmCdnRoot, 'addon/dialog/dialog.min.js')));
+ cssList.push(loadCss(urljoin(this.cmCdnRoot, 'addon/dialog/dialog.min.css')));
+ }
+ // load keymap
+ if (!this.loadedKeymapSet.has(keymapMode)) {
+ scriptList.push(loadScript(urljoin(this.cmCdnRoot, `keymap/${keymapMode}.min.js`)));
+ // update Set
+ this.loadedKeymapSet.add(keymapMode);
+ }
+
+ // update fields
+ this.currentKeymapMode = keymapMode;
+
+ Promise.all(scriptList.concat(cssList))
+ .then(() => {
this.getCodeMirror().setOption('keyMap', keymapMode);
});
}
@@ -367,7 +394,7 @@ export default class Editor extends React.Component {
height: '100%',
display: 'flex',
flexDirection: 'column',
- }
+ };
const theme = this.props.editorOptions.theme || 'elegant';
const styleActiveLine = this.props.editorOptions.styleActiveLine || undefined;
@@ -451,7 +478,7 @@ export default class Editor extends React.Component {
or pasting from the clipboard.
</button>
</div>
- )
+ );
}
}
| 4 |
diff --git a/readme.md b/readme.md ## Piston
-Piston is the underlying engine for running untrusted and possibly malicious code that originates
-from from EMKC contests and challenges. It's also used in the Engineer Man Discord server via
+Piston is the underlying engine for running untrusted and possibly malicious code that originates from EMKC contests and challenges. It's also used in the Engineer Man Discord server via
[felix bot](https://github.com/engineer-man/felix).
#### Installation
| 1 |
diff --git a/semantics-3.0/Semantics.hs b/semantics-3.0/Semantics.hs @@ -372,7 +372,7 @@ data ApplyAllResult = ApplyAllSuccess [ReduceWarning] [Payment] State Contract
-- | Apply a list of Inputs to the contract
applyAllInputs :: Environment -> State -> Contract -> [Input] -> ApplyAllResult
applyAllInputs env state contract inputs = let
- applyAllAux
+ applyAllLoop
:: Environment
-> State
-> Contract
@@ -380,16 +380,16 @@ applyAllInputs env state contract inputs = let
-> [ReduceWarning]
-> [Payment]
-> ApplyAllResult
- applyAllAux env state contract inputs warnings effects =
+ applyAllLoop env state contract inputs warnings effects =
case reduceContractUntilQuiescent env state contract of
QRAmbiguousSlotIntervalError -> ApplyAllAmbiguousSlotIntervalError
ContractQuiescent warns effs curState cont -> case inputs of
[] -> ApplyAllSuccess (warnings ++ warns) (effects ++ effs) curState cont
(input : rest) -> case applyInput env curState input cont of
Applied newState cont ->
- applyAllAux env newState cont rest (warnings ++ warns) (effects ++ effs)
+ applyAllLoop env newState cont rest (warnings ++ warns) (effects ++ effs)
ApplyNoMatchError -> ApplyAllNoMatchError
- in applyAllAux env state contract inputs [] []
+ in applyAllLoop env state contract inputs [] []
data ProcessError = PEAmbiguousSlotIntervalError
| 10 |
diff --git a/src/components/preview.js b/src/components/preview.js @@ -53,10 +53,10 @@ export default class Preview extends React.Component {
} else {
return <div className='emoji-mart-preview'>
<div className='emoji-mart-preview-emoji'>
- <Emoji
+ {idleEmoji.length > 0 && <Emoji
emoji={idleEmoji}
{...emojiProps}
- />
+ />}
</div>
<div className='emoji-mart-preview-data'>
| 11 |
diff --git a/lib/createTopLevelExpect.js b/lib/createTopLevelExpect.js @@ -1444,7 +1444,11 @@ expectPrototype._executeExpect = function(
}
if (assertionRule.expect && assertionRule.expect !== this._topLevelExpect) {
- return assertionRule.expect(subject, testDescriptionString, ...args);
+ return assertionRule.expect._expect(context, [
+ subject,
+ testDescriptionString,
+ ...args
+ ]);
}
const wrappedExpect = this._createWrappedExpect(
| 4 |
diff --git a/token-metadata/0xa7ED29B253D8B4E3109ce07c80fc570f81B63696/metadata.json b/token-metadata/0xa7ED29B253D8B4E3109ce07c80fc570f81B63696/metadata.json "symbol": "BAS",
"address": "0xa7ED29B253D8B4E3109ce07c80fc570f81B63696",
"decimals": 18,
- "dharmaVerificationStatus": "UNVERIFIED"
+ "dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
| 3 |
diff --git a/.github/workflows/azure-static-web-apps-happy-mud-02d95f10f.yml b/.github/workflows/azure-static-web-apps-happy-mud-02d95f10f.yml @@ -18,7 +18,7 @@ jobs:
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
- azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_WAVE_0D1A32B03 }}
+ azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_HAPPY_MUD_02D95F10F }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
@@ -37,5 +37,5 @@ jobs:
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
- azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_WAVE_0D1A32B03 }}
+ azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_HAPPY_MUD_02D95F10F }}
action: "close"
| 3 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.