code
stringlengths 122
4.99k
| label
int64 0
14
|
---|---|
diff --git a/package.json b/package.json {
"name": "julia-client",
"main": "./lib/julia-client",
- "version": "0.6.9",
+ "version": "0.6.10",
"description": "Julia Evaluation",
"keywords": [],
"repository": "https://github.com/JunoLab/atom-julia-client",
| 6 |
diff --git a/src/openseadragon.js b/src/openseadragon.js @@ -2491,6 +2491,31 @@ function OpenSeadragon( options ){
});
+ //TODO: $.console is often used inside a try/catch block which generally
+ // prevents allowings errors to occur with detection until a debugger
+ // is attached. Although I've been guilty of the same anti-pattern
+ // I eventually was convinced that errors should naturally propagate in
+ // all but the most special cases.
+ /**
+ * A convenient alias for console when available, and a simple null
+ * function when console is unavailable.
+ * @static
+ * @private
+ */
+ var nullfunction = function( msg ){
+ //document.location.hash = msg;
+ };
+
+ $.console = window.console || {
+ log: nullfunction,
+ debug: nullfunction,
+ info: nullfunction,
+ warn: nullfunction,
+ error: nullfunction,
+ assert: nullfunction
+ };
+
+
/**
* The current browser vendor, version, and related information regarding detected features.
* @member {Object} Browser
@@ -2616,31 +2641,6 @@ function OpenSeadragon( options ){
})();
- //TODO: $.console is often used inside a try/catch block which generally
- // prevents allowings errors to occur with detection until a debugger
- // is attached. Although I've been guilty of the same anti-pattern
- // I eventually was convinced that errors should naturally propagate in
- // all but the most special cases.
- /**
- * A convenient alias for console when available, and a simple null
- * function when console is unavailable.
- * @static
- * @private
- */
- var nullfunction = function( msg ){
- //document.location.hash = msg;
- };
-
- $.console = window.console || {
- log: nullfunction,
- debug: nullfunction,
- info: nullfunction,
- warn: nullfunction,
- error: nullfunction,
- assert: nullfunction
- };
-
-
// Adding support for HTML5's requestAnimationFrame as suggested by acdha.
// Implementation taken from matt synder's post here:
// http://mattsnider.com/cross-browser-and-legacy-supported-requestframeanimation/
| 5 |
diff --git a/cypress/integration/head.spec.js b/cypress/integration/head.spec.js +// file deepcode ignore PromiseNotCaughtGeneral: Cypress will fail in case there are any errors
describe('head.js', () => {
describe('stream', () => {
beforeEach('visit dev page', () => {
| 0 |
diff --git a/src/electron.js b/src/electron.js @@ -3021,7 +3021,6 @@ async function startIdleCheckShort() {
console.log(`\x1b[36mStarted short idle monitor.\x1b[0m`)
if(notIdleMonitor) clearInterval(notIdleMonitor);
notIdleMonitor = setInterval(idleCheckShort, 1000)
- lastIdleTime = 1
}
function idleCheckShort() {
@@ -3045,14 +3044,33 @@ function idleCheckShort() {
console.log(`\x1b[36mUser no longer idle after ${lastIdleTime} seconds.\x1b[0m`)
clearInterval(notIdleMonitor)
notIdleMonitor = false
- if(!settings.disableAutoApply) setKnownBrightness(false);
+
+ // Different behavior depending on if idle dimming is on
+ if(settings.detectIdleTimeEnabled) {
+ // Always restore when dimmed
+ setKnownBrightness(false)
+ } else {
+ // Not dimmed, try checking ToD first. sKB as backup.
+ const foundEvent = applyCurrentAdjustmentEvent(true, true)
+ if(!foundEvent && !settings.disableAutoApply) setKnownBrightness(false);
+ }
+
// Wait a little longer, re-apply known brightness in case monitors take a moment, and finish up
setTimeout(() => {
- if(!settings.disableAutoApply) setKnownBrightness(false);
isUserIdle = false
userIdleDimmed = false
lastIdleTime = 1
- applyCurrentAdjustmentEvent(true, false) // Apply ToD adjustments, if needed
+
+ // Similar logic to above
+ if(settings.detectIdleTimeEnabled) {
+ // Always restore when dimmed, then check ToD
+ setKnownBrightness(false)
+ applyCurrentAdjustmentEvent(true, false)
+ } else {
+ // Not dimmed, try checking ToD first. sKB as backup.
+ const foundEvent = applyCurrentAdjustmentEvent(true, true)
+ if(!foundEvent && !settings.disableAutoApply) setKnownBrightness(false)
+ }
}, 3000)
}
@@ -3202,6 +3220,7 @@ function applyCurrentAdjustmentEvent(force = false, instant = true) {
transitionBrightness(foundEvent.brightness, (foundEvent.monitors ? foundEvent.monitors : {}))
}
})
+ return foundEvent
}
}
} catch (e) {
| 7 |
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js @@ -12,7 +12,8 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
var currentAddressSocket = {};
var paymentSubscriptionObj = { op:"addr_sub" }
- var config = configService.getSync();
+
+ var config;
var soundLoaded = false;
var nativeAudioAvailable = (window.plugins && window.plugins.NativeAudio);
@@ -243,8 +244,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
})
];
- configService.whenAvailable(function(config) {
- $scope.displayBalanceAsFiat = config.wallet.settings.priceDisplay === 'fiat';
+ configService.whenAvailable(function(_config) {
+ $scope.displayBalanceAsFiat = _config.wallet.settings.priceDisplay === 'fiat';
+ config = _config;
});
});
| 4 |
diff --git a/loadout-manager.js b/loadout-manager.js @@ -102,7 +102,7 @@ class LoadoutManager extends EventTarget {
this.dispatchEvent(new MessageEvent('selectedchange', {
data: {
index,
- app: this.apps[index],
+ app: this.apps[index] || null,
},
}));
}
| 0 |
diff --git a/data/scripts/GR_R0_mapping.py b/data/scripts/GR_R0_mapping.py import sys
import numpy as np
+import copy
import matplotlib.pyplot as plt
sys.path.append('..')
from model import POPDATA, AGES, Sub, DefaultRates, solve_ode, trace_ages, Params, Fracs, init_pop
-from R0_estimator import get_growth_rate
+from R0_estimator import get_growth_rate, empty_data_list
def run_model(R0, nb_time_pts=50, initialCases=20, key="USA-California"):
time_points = np.arange(-21,nb_time_pts-21)
- rates = DefaultRates
+ rates = copy.deepcopy(DefaultRates)
rates.logR0 = np.log(R0)
+ rates.infectivity = np.exp(rates.logR0) * rates.infection
params = Params(ages=AGES[POPDATA[key]["ageDistribution"]], size=POPDATA[key]["size"],
times=time_points, date=nb_time_pts, rates=rates, fracs=Fracs())
+
model = trace_ages(solve_ode(params, init_pop(params.ages, params.size, initialCases)))
model = np.swapaxes(model, 0, 1)
return time_points, model
if __name__ == "__main__":
+ growth_rate_step = 7
+
+ plt.figure(1)
+ plt.title(f"Model cases")
+ plt.figure(2)
+ plt.title(f"Growth rate step {growth_rate_step}")
for R0 in [1.1, 1.2, 1.4, 2, 3, 4]:
time_points, model = run_model(R0)
- plt.figure()
- plt.title(f"R_0 = {R0}")
- plt.plot(time_points, model[Sub.T], label="cases")
- plt.plot(time_points, model[Sub.D], label="deaths")
- plt.legend()
+ growth_rate_data = empty_data_list()
+ for ii in [Sub.T, Sub.D]:
+ growth_rate_data[ii] = model[ii]
+ growth_rate = get_growth_rate(growth_rate_data, growth_rate_step)
+
+ plt.figure(1)
+ plt.plot(time_points, model[Sub.T], label=f"R0 = {R0}")
+
+ plt.figure(2)
+ plt.plot(time_points, growth_rate[Sub.T], label=f"R0 = {R0}")
+
+ plt.figure(1)
plt.yscale("log")
+ plt.legend()
+ plt.grid()
+ # plt.savefig("Model cases", format="png")
+
+ plt.figure(2)
+ plt.legend()
+ plt.grid()
+ # plt.savefig("Growth rate", format="png")
+
plt.show()
| 1 |
diff --git a/test/test-0.10.3.js b/test/test-0.10.3.js @@ -31,60 +31,84 @@ const { TEST_SERVER_URL, TEST_SERVER_URL_SSL, FILENAME, DROPBOX_TOKEN, styles }
const dirs = RNFetchBlob.fs.dirs
let prefix = ((Platform.OS === 'android') ? 'file://' : '')
let begin = Date.now()
+//
+// describe('#230 #249 cookies manipulation', (report, done) => {
+//
+// RNFetchBlob
+// .fetch('GET', `${TEST_SERVER_URL}/cookie/249230`)
+// .then((res) => RNFetchBlob.net.getCookies())
+// .then((cookies) => {
+// console.log(cookies)
+// report(<Assert
+// key="should set 10 cookies"
+// expect={10}
+// actual={cookies['localhost'].length}/>)
+// return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/cookie-echo`)
+// })
+// .then((res) => {
+// console.log(res.data)
+// let cookies = String(res.data).split(';')
+// report(<Assert
+// key="should send 10 cookies"
+// expect={10}
+// actual={cookies.length}/>)
+// return RNFetchBlob.net.removeCookies()
+// })
+// .then(() => RNFetchBlob.net.getCookies('localhost'))
+// .then((cookies) => {
+// report(<Assert
+// key="should have no cookies"
+// expect={undefined}
+// actual={cookies['localhost']}/>)
+// return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/cookie-echo`)
+// })
+// .then((res) => {
+// console.log(res.data)
+// let cookies = String(res.data).split(';')
+// cookies = _.reject(cookies, r => r.length < 2)
+// report(<Assert
+// key="should send no cookies"
+// expect={0}
+// actual={cookies.length}/>)
+// done()
+// })
+//
+// })
+//
+// describe('#254 IOS fs.stat lastModified date correction', (report, done) => {
+//
+// let path = dirs.DocumentDir + '/temp' + Date.now()
+// fs.createFile(path, 'hello', 'utf8' )
+// .then(() => fs.stat(path))
+// .then((stat) => {
+// console.log(stat)
+// let p = stat.lastModified / Date.now()
+// report(<Assert key="date is correct" expect={true} actual={ p< 1.05 && p > 0.95}/>)
+// done()
+// })
+//
+// })
-
-describe('#230 #249 cookies manipulation', (report, done) => {
-
- RNFetchBlob
- .fetch('GET', `${TEST_SERVER_URL}/cookie/249230`)
- .then((res) => RNFetchBlob.net.getCookies())
- .then((cookies) => {
- console.log(cookies)
- report(<Assert
- key="should set 10 cookies"
- expect={10}
- actual={cookies['localhost'].length}/>)
- return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/cookie-echo`)
- })
- .then((res) => {
- console.log(res.data)
- let cookies = String(res.data).split(';')
- report(<Assert
- key="should send 10 cookies"
- expect={10}
- actual={cookies.length}/>)
- return RNFetchBlob.net.removeCookies()
- })
- .then(() => RNFetchBlob.net.getCookies('localhost'))
- .then((cookies) => {
- report(<Assert
- key="should have no cookies"
- expect={undefined}
- actual={cookies['localhost']}/>)
- return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/cookie-echo`)
- })
- .then((res) => {
- console.log(res.data)
- let cookies = String(res.data).split(';')
- cookies = _.reject(cookies, r => r.length < 2)
- report(<Assert
- key="should send no cookies"
- expect={0}
- actual={cookies.length}/>)
- done()
- })
-
+describe('#263 parallel request', (report, done) => {
+ let urls = [
+ `${TEST_SERVER_URL}/public/1mb-dummy`,
+ `${TEST_SERVER_URL}/public/2mb-dummy`,
+ `${TEST_SERVER_URL}/public/404`
+ ]
+ let size = [1000000, 1310720, 23]
+ let asserts = []
+ new Promise
+ .all(urls.map((url) => RNFetchBlob.fetch('GET', url)))
+ .then((results) => {
+ _.each(results, (r, i) => {
+ report(
+ <Assert key={`redirect URL ${i} should be correct`}
+ expect={urls[i]}
+ actual={r.info().redirects[0]}/>)
+ report(<Assert key={`content ${i} should be correct`}
+ expect={size[i]}
+ actual={r.data.length}/>)
})
-
-describe('#254 IOS fs.stat lastModified date correction', (report, done) => {
-
- let path = dirs.DocumentDir + '/temp' + Date.now()
- fs.createFile(path, 'hello', 'utf8' )
- .then(() => fs.stat(path))
- .then((stat) => {
- console.log(stat)
- let p = stat.lastModified / Date.now()
- report(<Assert key="date is correct" expect={true} actual={ p< 1.05 && p > 0.95}/>)
done()
})
| 0 |
diff --git a/packages/mjml-cli/src/client.js b/packages/mjml-cli/src/client.js @@ -227,8 +227,8 @@ export default async () => {
}
case 's': {
Promise.all(convertedStream.map(outputToConsole))
- .then(() => (process.exitCode = EXIT_CODE)) // eslint-disable-line no-return-assign
- .catch(() => (process.exitCode = 1)) // eslint-disable-line no-return-assign
+ .then(() => process.exitCode = EXIT_CODE) // eslint-disable-line no-return-assign
+ .catch(() => process.exitCode = 1) // eslint-disable-line no-return-assign
break
}
default:
| 13 |
diff --git a/OpenRobertaServer/staticResources/js/app/roberta/controller/menu.controller.js b/OpenRobertaServer/staticResources/js/app/roberta/controller/menu.controller.js @@ -210,6 +210,10 @@ define([ 'exports', 'log', 'util', 'message', 'comm', 'robot.controller', 'socke
$('#navbarCollapse').onWrap('click', '.dropdown-menu a,.visible-xs', function(event) {
$('#navbarCollapse').collapse('hide');
});
+ // for gallery
+ $('#head-navigation-gallery').onWrap('click', 'a,.visible-xs', function(event) {
+ $('#navbarCollapse').collapse('hide');
+ });
$('#simButtonsCollapse').onWrap('click', 'a', function(event) {
$('#simButtonsCollapse').collapse('hide');
});
| 1 |
diff --git a/test/integration/core/promises_hook.tap.js b/test/integration/core/promises_hook.tap.js var semver = require('semver')
if (!(semver.satisfies(process.version, '>=8') || semver.prerelease(process.version))) {
- console.error('Promise tests cant run without native Promises')
+ console.error(
+ 'async hook promise instrumentation requires both native promises and async hooks'
+ )
return
}
| 1 |
diff --git a/device.js b/device.js @@ -595,8 +595,8 @@ function handlePairingMessage(json, device_pubkey, callbacks){
return callbacks.ifError("bad reverse pairing secret");
eventBus.emit("pairing_attempt", from_address, body.pairing_secret);
db.query(
- "SELECT is_permanent FROM pairing_secrets WHERE pairing_secret=? AND expiry_date > "+db.getNow(),
- [body.pairing_secret],
+ "SELECT is_permanent FROM pairing_secrets WHERE pairing_secret IN(?,'*') AND expiry_date>"+db.getNow()+" ORDER BY (pairing_secret=?) DESC LIMIT 1",
+ [body.pairing_secret, body.pairing_secret],
function(pairing_rows){
if (pairing_rows.length === 0)
return callbacks.ifError("pairing secret not found or expired");
| 11 |
diff --git a/.travis.yml b/.travis.yml language: node_js
git:
- depth: 1 # No need for commits history
+ # Do not take whole history, but ensure to not break things:
+ # - Merging multiple PR's around same time may introduce a case where it's not
+ # the last merge commit that is to be tested
+ depth: 10
branches:
only:
@@ -19,23 +22,30 @@ stages:
jobs:
include:
- # To speed up Travis build, use one job per Platform + Node.js version combination
- - name: "Lint, Unit Tests - Linux - Node.js v12"
+ # In most cases it's best to configure one job per Platform & Node.js version combination
+ # (job boot & setup takes ca 1 minute, one task run usually lasts seconds)
+
+ # PR's
+ - name: ' Lint updated, Unit Tests - Linux - Node.js v12'
+ if: type = pull_request
node_js: 12
env:
- SLS_IGNORE_WARNING=*
- FORCE_COLOR=1 # TTY is lost as processes are combined '&&'
# Combine with '&&' to not continue on fail
- script:
- - |
- if [ $TRAVIS_PULL_REQUEST = false ]
- then
- npm run lint
- else
- npm run lint-updated
- fi &&
- npm test
- - name: "Unit Tests - Windows - Node.js v12"
+ script: npm run lint-updated && npm test
+
+ # master branch and version tags
+ - name: 'Lint, Unit Tests - Linux - Node.js v12'
+ if: type != pull_request
+ node_js: 12
+ env:
+ - SLS_IGNORE_WARNING=*
+ - FORCE_COLOR=1 # TTY is lost as processes are combined '&&'
+ # Combine with '&&' to not continue on fail
+ script: npm run lint && npm test
+
+ - name: 'Unit Tests - Windows - Node.js v12'
os: windows
node_js: 12
env:
@@ -49,22 +59,24 @@ jobs:
choco install python2 &&
export PATH="/c/Python27:/c/Python27/Scripts:$PATH"
fi
- - name: "Isolated Unit Tests, Package Integration Tests - Linux - Node.js v10"
+
+ - name: 'Isolated Unit Tests, Package Integration Tests - Linux - Node.js v10'
node_js: 10
env:
- SLS_IGNORE_WARNING=*
- FORCE_COLOR=1 # TTY is lost as processes are combined '&&'
# Combine with '&&' to not continue on fail
script: npm run test-isolated && npm run integration-test-run-package
- - name: "Unit Tests, Coverage - Linux - Node.js v8"
+
+ - name: 'Unit Tests, Coverage - Linux - Node.js v8'
node_js: 8
script: npm run coverage
after_success: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
- - name: "Unit Tests - Linux - Node.js v6"
+ - name: 'Unit Tests - Linux - Node.js v6'
node_js: 6
- stage: Integration Test
- name: "Integration Tests - Linux - Node.js v12"
+ name: 'Integration Tests - Linux - Node.js v12'
node_js: 12
env:
- SLS_IGNORE_WARNING=*
| 7 |
diff --git a/engine/modules/endscreen/src/main/resources/view/endscreen-module/EndScreenModule.js b/engine/modules/endscreen/src/main/resources/view/endscreen-module/EndScreenModule.js @@ -241,14 +241,10 @@ export class EndScreenModule {
this.finishers = []
var finishers = new PIXI.Container()
- var curRank = 1
+
var elem
for (i = 0; i < podium.length; ++i) {
- if (i > 0 && podium[i - 1].score !== podium[i].score) {
- curRank++
- }
-
- podium[i].rank = curRank
+ podium[i].rank = podium.filter(p => p.score > podium[i].score).length + 1
elem = this.createFinisher(podium[i])
finishers.addChild(elem)
this.finishers.push(elem)
| 1 |
diff --git a/package.json b/package.json "newrelic": "^1.40.0",
"nodemon": "^1.9.2",
"npm-run-all": "^4.0.2",
- "numeral": "^2.0.6",
"postcss-flexbugs-fixes": "^3.0.0",
"postcss-loader": "^2.0.5",
"prop-types": "^15.5.10",
| 2 |
diff --git a/squeak_headless.js b/squeak_headless.js @@ -45,14 +45,6 @@ import "./vm.input.headless.js"; // use headless input to prevent image c
import "./vm.plugins.js";
import "./plugins/ConsolePlugin.js";
-// Run the VM
-Object.extend(Squeak, {
- vmPath: "/",
- platformSubtype: "Browser",
- osVersion: navigator.userAgent, // might want to parse
- windowSystem: "headless",
-});
-
// Run image by starting interpreter on it
function runImage(imageData, imageName, options) {
@@ -99,6 +91,16 @@ function fetchImageAndRun(imageName, options) {
});
}
+// Extend Squeak with settings and options to fetch and run image
+Object.extend(Squeak, {
+ vmPath: "/",
+ platformSubtype: "Browser",
+ osVersion: navigator.userAgent, // might want to parse
+ windowSystem: "headless",
+ fetchImageAndRun: fetchImageAndRun,
+});
+
+
// Retrieve image name from URL
var searchParams = (new URL(self.location)).searchParams;
var imageName = searchParams.get("imageName");
@@ -108,5 +110,3 @@ if(imageName) {
};
fetchImageAndRun(imageName, options);
}
-
-export default fetchImageAndRun;
| 14 |
diff --git a/test/unit/risk/three-d-secure/strategy/adyen.test.js b/test/unit/risk/three-d-secure/strategy/adyen.test.js @@ -128,7 +128,8 @@ describe('AdyenStrategy', function () {
PaReq: 'test-pa-req',
MD: 'test-md'
},
- container: strategy.container
+ container: strategy.container,
+ defaultEventName: 'adyen-3ds-challenge'
}));
strategy.remove();
});
| 3 |
diff --git a/core/bound_variables.js b/core/bound_variables.js @@ -362,82 +362,6 @@ Blockly.BoundVariables.getAllVariablesOnBlocks = function(block, opt_filter) {
return variables;
};
-/**
- * Collect a list of blocks which are need to infer types in order.
- * @param {!Array<!Blockly.Block>} blocks List of root blocks whose types are
- * need to be updated at least.
- * @return {orphanRefBlocks:!Array.<!Blockly.Block>,
- * !{blocks:!Array.<!Blockly.Block>}
- * orphanRefBlocks:!Array.<!Blockly.Block>} Object containing root blocks
- * whose types should be updated with the following two properties.
- * - orphanRefBlocks: A list of blocks which contains some variable
- * references, but their referring values do not exist inside.
- * - blocks: Other blocks to be updated.
- */
-Blockly.BoundVariables.getAffectedBlocksForTypeInfer = function(blocks) {
- var visitedValue = {};
- var visitedRef = {};
- // Collect references and values whose types might be changed.
- for (var i = 0, block; block = blocks[i]; i++) {
- goog.asserts.assert(!block.getParent());
-
- var references =
- Blockly.BoundVariables.getAllVariablesOnBlocks(block, true);
- for (var j = 0, ref; ref = references[j]; j++) {
- visitedRef[ref.getId()] = ref;
- var value = ref.getBoundValue();
- if (value) {
- visitedValue[value.getId()] = value;
- }
- }
- var values =
- Blockly.BoundVariables.getAllVariablesOnBlocks(block, false);
- for (var j = 0, val; val = values[j]; j++) {
- visitedValue[val.getId()] = val;
- for (var k = 0, ref; ref = val.referenceList_[k]; k++) {
- visitedRef[ref.getId()] = ref;
- }
- }
- }
- var rootBlock = {};
- var orphanRefRootBlock = {};
- // Store the value's root block first. The type inference for the value is
- // needed to be done before the reference.
- for (var id in visitedValue) {
- var val = visitedValue[id];
- var block = val.getSourceBlock();
- if (block) {
- var root = block.getRootBlock();
- rootBlock[root.id] = root;
- }
- }
- for (var id in visitedRef) {
- var ref = visitedRef[id];
- var block = ref.getSourceBlock();
- if (block && ref.getBoundValue()) {
- var root = block.getRootBlock();
- if (!(root.id in rootBlock)) {
- // The reference is bound to a value, but they do not share the root
- // block.
- orphanRefRootBlock[root.id] = root;
- }
- }
- }
- for (var i = 0, block; block = blocks[i]; i++) {
- if (!(block.id in rootBlock) &&
- !(block.id in orphanRefRootBlock)) {
- rootBlock[block.id] = block;
- }
- }
- function objectValues(obj) {
- var keys = Object.keys(obj);
- return goog.array.map(keys, key => obj[key]);
- }
- var blocksToUpdate = objectValues(rootBlock);
- var orphanRefRoot = objectValues(orphanRefRootBlock);
- return {blocks: blocksToUpdate, orphanRefBlocks: orphanRefRoot};
-};
-
/**
* Returns if any existing variable references will never be changed even if
* the variable is renamed to the given name.
| 2 |
diff --git a/package.json b/package.json {
"name": "prettier-atom",
"main": "./dist/main.js",
- "version": "0.43.0",
+ "version": "0.43.1",
"description": "Atom plugin for formatting JavaScript using prettier with (optional) prettier-eslint integration",
"keywords": [
"atom",
| 6 |
diff --git a/src/web/HTMLOperation.mjs b/src/web/HTMLOperation.mjs @@ -131,14 +131,16 @@ class HTMLOperation {
*/
function titleFromWikiLink(url) {
const splitURL = url.split("/");
- if (splitURL.indexOf("wikipedia.org") < 0) {
+ if (splitURL.indexOf("wikipedia.org") < 0 && splitURL.indexOf("forensicswiki.org") < 0) {
// Not a wiki link, return full URL
return `<a href='${url}' target='_blank'>More Information<i class='material-icons inline-icon'>open_in_new</i></a>`;
}
+ const wikiName = splitURL.indexOf("forensicswiki.org") < 0 ? "Wikipedia" : "Forensics Wiki";
+
const pageTitle = decodeURIComponent(splitURL[splitURL.length - 1])
.replace(/_/g, " ");
- return `<a href='${url}' target='_blank'>${pageTitle}<i class='material-icons inline-icon'>open_in_new</i></a> on Wikipedia`;
+ return `<a href='${url}' target='_blank'>${pageTitle}<i class='material-icons inline-icon'>open_in_new</i></a> on ${wikiName}`;
}
export default HTMLOperation;
| 0 |
diff --git a/test/compiler.js b/test/compiler.js @@ -22,7 +22,7 @@ describe('embark.Compiler', function() {
compiler.compile_solidity([
readFile('test/contracts/simple_storage.sol'),
readFile('test/contracts/token.sol')
- ], function(compiledContracts) {
+ ], function(err, compiledContracts) {
assert.deepEqual(compiledContracts, expectedObject);
done();
});
| 3 |
diff --git a/test/Air/AirParser.test.js b/test/Air/AirParser.test.js @@ -345,7 +345,6 @@ describe('#AirParser', () => {
.then((result) => {
testTicket(result);
expect(result.commission).to.be.deep.equal({ amount: 0 });
- expect(result.tourCode).to.be.a('string');
expect(result.tourCode).to.be.equal('IT151920');
});
});
| 2 |
diff --git a/shaders.js b/shaders.js @@ -897,6 +897,69 @@ const portalMaterial = new THREE.ShaderMaterial({
// polygonOffsetUnits: 1,
});
+/* const loadVsh = `
+ #define M_PI 3.1415926535897932384626433832795
+ uniform float uTime;
+
+ mat4 rotationMatrix(vec3 axis, float angle)
+ {
+ axis = normalize(axis);
+ float s = sin(angle);
+ float c = cos(angle);
+ float oc = 1.0 - c;
+
+ return mat4(oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s, 0.0,
+ oc * axis.x * axis.y + axis.z * s, oc * axis.y * axis.y + c, oc * axis.y * axis.z - axis.x * s, 0.0,
+ oc * axis.z * axis.x - axis.y * s, oc * axis.y * axis.z + axis.x * s, oc * axis.z * axis.z + c, 0.0,
+ 0.0, 0.0, 0.0, 1.0);
+ }
+
+ void main() {
+ // float f = 1.0 + pow(sin(uTime * M_PI), 0.5) * 0.2;
+ gl_Position = projectionMatrix * modelViewMatrix * rotationMatrix(vec3(0, 0, 1), -uTime * M_PI * 2.0) * vec4(position, 1.);
+ }
+`;
+const loadFsh = `
+ uniform float uHighlight;
+ uniform float uTime;
+ void main() {
+ float f = 1.0 + max(1.0 - uTime, 0.0);
+ gl_FragColor = vec4(vec3(${new THREE.Color(0xf4511e).toArray().join(', ')}) * f, 1.0);
+ }
+`;
+const loadMeshMaterial = new THREE.ShaderMaterial({
+ uniforms: {
+ uTime: {
+ type: 'f',
+ value: 0,
+ },
+ },
+ vertexShader: loadVsh,
+ fragmentShader: loadFsh,
+ side: THREE.DoubleSide,
+});
+const _makeLoadMesh = (() => {
+ const geometry = new THREE.RingBufferGeometry(0.05, 0.08, 128, 0, Math.PI / 2, Math.PI * 2 * 0.9);
+ // .applyMatrix4(new THREE.Matrix4().makeRotationFromQuaternion(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI)));
+ return () => {
+ const mesh = new THREE.Mesh(geometry, loadMeshMaterial);
+ // mesh.frustumCulled = false;
+ return mesh;
+ };
+})();
+const _ensureLoadMesh = p => {
+ if (!p.loadMesh) {
+ p.loadMesh = _makeLoadMesh();
+ p.loadMesh.matrix.copy(p.matrix).decompose(p.loadMesh.position, p.loadMesh.quaternion, p.loadMesh.scale);
+ scene.add(p.loadMesh);
+
+ p.waitForRun()
+ .then(() => {
+ p.loadMesh.visible = false;
+ });
+ }
+}; */
+
export {
/* LAND_SHADER,
WATER_SHADER,
| 0 |
diff --git a/CHANGES.md b/CHANGES.md @@ -4,6 +4,14 @@ Search:
- Prevent freeText query from being None which will cause score to be 0
+Others:
+
+- Made registry-api DB pool settings configurable via Helm
+- Make broken link sleuther recrawl period configurable via Helm
+- Format minion will trust dcat format if other measures indicate a ZIP format
+- Format minion will trust dcat format if other measures indicate a ESRI REST format
+- Added ASC to 4 stars rating list
+
Cataloging:
- Added new aspects for publishing state and spatial coverage
@@ -12,13 +20,9 @@ Cataloging:
- Updated dataset ui page to be able to edit fields
- Added editor / editor type abstraction for making state management simpler for large forms.
-Others:
+UI:
-- Made registry-api DB pool settings configurable via Helm
-- Make broken link sleuther recrawl period configurable via Helm
-- Format minion will trust dcat format if other measures indicate a ZIP format
-- Format minion will trust dcat format if other measures indicate a ESRI REST format
-- Added ASC to 4 stars rating list
+- Replaced star emoji in static page markdown with quality star icon
## 0.0.55
| 14 |
diff --git a/lib/MqttClient.js b/lib/MqttClient.js @@ -329,12 +329,20 @@ MqttClient.prototype.handleCustomCommand = function(message) {
if(msg && msg.command) {
switch(msg.command) {
case "zoned_cleanup":
- if(msg.zone_id) {
+ if(msg.zone_ids && Array.isArray(msg.zone_ids)) {
const areas = this.configuration.get("areas");
- const zone = areas.find(e => Array.isArray(e) && e[0] === msg.zone_id);
+ let zones = new Array();
+ msg.zone_ids.forEach(function(zone_id) {
+ let area = areas.find(e => Array.isArray(e) && e[0] === zone_id);
+ if (area && Array.isArray(area[1])) {
+ area[1].forEach(function(zone) {
+ zones.push(zone);
+ });
+ }
+ });
- if(zone) {
- this.vacuum.startCleaningZone(zone, () => {});
+ if(zones.length) {
+ this.vacuum.startCleaningZone(zones, () => {});
}
} else if (msg.zones) {
//TODO: validation
| 11 |
diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -173,16 +173,12 @@ jobs:
### Check if the local version is beta, otherwise publish normally
if [[ $LOCAL_VERSION == *"beta"* ]]; then
if [[ $LOCAL_VERSION != $NPM_BETA_VERSION ]]; then
- echo "Compiling..."
- yarn compile
echo "Publishing package to NPM with 'beta' tag..."
npm publish --tag beta
npm access public $NPM_NAME
fi
else
if [[ $LOCAL_VERSION != $NPM_VERSION ]]; then
- echo "Compiling..."
- yarn compile
echo "Publishing package to NPM with 'latest' tag..."
npm publish
npm access public $NPM_NAME
@@ -205,8 +201,6 @@ jobs:
### Check if the local version is beta, otherwise publish normally
if [[ $LOCAL_VERSION == *"beta"* ]]; then
if [[ $LOCAL_VERSION != $NPM_BETA_VERSION ]]; then
- echo "Compiling..."
- yarn compile
### This is where we deploy the package to NPM
echo "Publishing package to NPM with 'beta' tag..."
npm publish --tag beta
@@ -214,8 +208,6 @@ jobs:
fi
else
if [[ $LOCAL_VERSION != $NPM_VERSION ]]; then
- echo "Compiling..."
- yarn compile
### This is where we deploy the package to NPM
echo "Publishing package to NPM with 'latest' tag..."
npm publish
| 2 |
diff --git a/src/web/store/index.js b/src/web/store/index.js @@ -234,7 +234,7 @@ const getUserConfig = () => {
}
let json = JSON.parse(value) || {};
- cnc.version = json.version;
+ cnc.version = json.version || settings.version; // fallback to current version
cnc.state = json.state;
} catch (err) {
log.error(err);
@@ -285,6 +285,10 @@ const migrateStore = () => {
}
};
+try {
migrateStore();
+} catch (err) {
+ log.error(err);
+}
export default store;
| 1 |
diff --git a/server/preprocessing/other-scripts/base.R b/server/preprocessing/other-scripts/base.R @@ -45,7 +45,7 @@ get_papers <- function(query, params, limit=100,
# add "textus:" to each word/phrase to enable verbatim search
# make sure it is added after any opening parentheses to enable queries such as "(a and b) or (a and c)"
- exact_query = gsub('(\"(.*?)\")|(?<=\\(|\\+|-\\"\\b)|(?!or\\b|and\\b|-[\\"\\(]*\\b)(?<!\\S)(?=\\S)(?!\\(|\\+)'
+ exact_query = gsub('([\"]+(.*?)[\"]+)|(?<=\\(\\b|\\+|-\\"\\b)|(?!or\\b|and\\b|-[\\"\\(]*\\b)(?<!\\S)(?=\\S)(?!\\(|\\+)'
, "textus:\\1", query_cleaned, perl=T)
blog$info(paste("BASE query:", exact_query))
| 8 |
diff --git a/.travis.yml b/.travis.yml -language: node_js
-python: "3.6"
cache:
yarn: true
directories:
@@ -9,12 +7,14 @@ cache:
jobs:
include:
- stage: python unit tests
+ language: python
script: echo WIP
- stage: javascript unit tests
+ language: node_js
script: yarn test
- stage: security tests
script: echo WIP
- stage: deploy to staging
script: echo WIP
- stage: test staging
- script: 'https://staging-kamu.thoughtworks-labs.net'
\ No newline at end of file
+ script: 'curl https://staging-kamu.thoughtworks-labs.net'
\ No newline at end of file
| 1 |
diff --git a/bin/openapi.js b/bin/openapi.js @@ -26,6 +26,9 @@ const rxPathParam = /{([^}]+)}/;
const rxVersion = /^2.0$|^\d+\.\d+\.\d+$/;
const defaults = {
+ deserialize: {
+ throw: true
+ },
populate: {
copy: false,
defaults: true,
@@ -35,6 +38,7 @@ const defaults = {
serialize: false,
templateDefaults: true,
templates: true,
+ throw: true,
variables: true
}
};
@@ -139,8 +143,7 @@ OpenApiEnforcer.prototype.deserialize = function(schema, value, options) {
const version = store.get(this).version;
// normalize options
- if (!options) options = {};
- if (!options.hasOwnProperty('throw')) options.throw = true;
+ options = Object.assign({}, defaults.deserialize, OpenApiEnforcer.defaults && OpenApiEnforcer.defaults.deserialize, options);
// run version specific deserialization
const result = version.serial.deserialize(errors, '', schema, value);
@@ -215,28 +218,36 @@ OpenApiEnforcer.prototype.path = function(path) {
/**
* Populate an object or an array using default, x-template, x-variable, and a parameter map.
* @param {object} schema
- * @param {object} config
- * @param {object} [config.params={}]
- * @param {object} [config.options] The populate options
- * @param {boolean} [config.throw=true] If true then throw errors if found, otherwise return errors array.
- * @param {*} [config.value]
- * @returns {{ errors: string[]|null, value: *}}
+ * @param {object} [params={}]
+ * @param {object} options
+ * @param {boolean} [options.copy]
+ * @param {boolean} [options.ignoreMissingRequired]
+ * @param {boolean} [options.oneOf]
+ * @param {string} [options.replacement]
+ * @param {boolean} [options.serialize]
+ * @param {boolean} [options.templateDefaults]
+ * @param {boolean} [options.templates]
+ * @param {boolean} [options.throw=true] If true then throw errors if found, otherwise return errors array.
+ * @param {boolean} [options.variables]
+ * @param {*} [options.value] Initial value
+ * @returns {{ errors: string[]|null, value: *}|*}
*/
-OpenApiEnforcer.prototype.populate = function (schema, config) {
- if (!config) config = {};
- if (!config.hasOwnProperty('throw')) config.throw = true;
+OpenApiEnforcer.prototype.populate = function (schema, params, options) {
+ if (!options) options = {};
- const options = config.options
- ? Object.assign({}, defaults.populate, OpenApiEnforcer.defaults && OpenApiEnforcer.defaults.populate, config.options)
- : OpenApiEnforcer.defaults.populate;
+ // normalize options
+ options = Object.assign({},
+ defaults.populate,
+ OpenApiEnforcer.defaults && OpenApiEnforcer.defaults.populate,
+ options);
// initialize variables
- const initialValueProvided = config.hasOwnProperty('value');
+ const initialValueProvided = options.hasOwnProperty('value');
const version = store.get(this).version;
const v = {
errors: [],
injector: populate.injector[options.replacement],
- map: config.params || {},
+ map: params || {},
options: options,
schemas: version.schemas,
version: version
@@ -244,8 +255,8 @@ OpenApiEnforcer.prototype.populate = function (schema, config) {
// produce start value
const value = v.options.copy && initialValueProvided
- ? util.copy(config.value)
- : config.value;
+ ? util.copy(options.value)
+ : options.value;
// begin population
const root = { root: value };
| 3 |
diff --git a/util/logger.js b/util/logger.js +const TEST_ENV = process.env.NODE_ENV === 'test'
const Discord = require('discord.js')
const COLORS = {
Error: '\x1b[31m',
@@ -56,6 +57,7 @@ class _Logger {
const color = COLORS[level] ? COLORS[level] : ''
const reset = COLORS.reset ? COLORS.reset : ''
return (contents, ...details) => {
+ if (TEST_ENV) return
if (suppressedLevels.includes(level.toLowerCase())) return
const extra = this._parseDetails(details)
console.log(`${LOG_DATES ? formatConsoleDate(new Date()) : ''}${color}${intro}${reset} | ${extra.identifier}${contents}${extra.err ? ` (${extra.err}${extra.err.code ? `, Code ${extra.err.code}` : ''})` : ''}`)
| 8 |
diff --git a/views/components/settings/parts/display-config.es b/views/components/settings/parts/display-config.es @@ -190,27 +190,30 @@ const ZoomingConfig = connect(() => (
const PanelMinSizeConfig = connect(() => (
(state, props) => ({
panelMinSize: get(state.config, 'poi.panelMinSize', 1),
+ layout: get(state.config, 'poi.layout', 'horizontal'),
})
-))(class zoomingConfig extends Component {
+))(class PanelMinSizeConfig extends Component {
static propTypes = {
panelMinSize: React.PropTypes.number,
+ layout: React.PropTypes.string,
}
- handleChangeZoomLevel = (e) => {
+ handleChangePanelMinSize = (e) => {
config.set('poi.panelMinSize', parseFloat(e.target.value))
}
render() {
+ const configName = this.props.layout == 'horizontal' ? 'Minimal width' : 'Minimal height'
return (
<Grid>
<Col xs={6}>
<OverlayTrigger placement='top' overlay={
- <Tooltip id='displayconfig-zoom'>{__('Minimal size')} <strong>{parseInt(this.props.panelMinSize * 100)}%</strong></Tooltip>
+ <Tooltip id='displayconfig-panel-size'>{__(configName)} <strong>{parseInt(this.props.panelMinSize * 100)}%</strong></Tooltip>
}>
- <FormControl type="range" onInput={this.handleChangeZoomLevel}
+ <FormControl type="range" onInput={this.handleChangePanelMinSize}
min={1.0} max={2.0} step={0.05} defaultValue={this.props.panelMinSize} />
</OverlayTrigger>
</Col>
<Col xs={6}>
- {__('Minimal size')} <strong>{parseInt(this.props.panelMinSize * 100)}%</strong>
+ {__(configName)} <strong>{parseInt(this.props.panelMinSize * 100)}%</strong>
</Col>
</Grid>
)
| 7 |
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js @@ -191,7 +191,11 @@ class Variables {
valueFromSource = this.getValueFromSsm(variableString);
}
if (valueFromSource) {
- this.cache[variableString] = valueFromSource;
+ this.cache[variableString] = BbPromise.resolve(valueFromSource)
+ .then((result) => {
+ this.cache[variableString] = result
+ return result;
+ });
return valueFromSource;
}
| 14 |
diff --git a/bin.js b/bin.js @@ -26,18 +26,18 @@ const argv = minimist(process.argv.slice(2), opts.options());
const sourceArg = argv._[0];
const destArg = argv._[1];
+if (argv.version) {
+ console.log(pkg.version);
+ process.exit();
+}
+
if (argv.help || !sourceArg || !destArg) {
console.log(
`${pkg.name}: Zip lambda functions and their dependencies for deployment\n`
);
console.log(`Usage: zip-it-and-ship-it [source] [destination] {options}`);
opts.print();
- process.exit();
-}
-
-if (argv.version) {
- console.log(pkg.version);
- process.exit();
+ process.exit(argv.help ? 0 : 1);
}
const source = path.resolve(process.cwd(), sourceArg)
| 7 |
diff --git a/js/bitstamp.js b/js/bitstamp.js // ---------------------------------------------------------------------------
const Exchange = require ('./base/Exchange');
-const { AuthenticationError, ExchangeError, NotSupported, PermissionDenied, InvalidNonce, OrderNotFound, InsufficientFunds, InvalidAddress, InvalidOrder, ArgumentsRequired, OnMaintenance } = require ('./base/errors');
+const { AuthenticationError, ExchangeError, NotSupported, PermissionDenied, InvalidNonce, OrderNotFound, InsufficientFunds, InvalidAddress, InvalidOrder, ArgumentsRequired, OnMaintenance, ExchangeNotAvailable } = require ('./base/errors');
// ---------------------------------------------------------------------------
@@ -223,6 +223,7 @@ module.exports = class bitstamp extends Exchange {
'Order not found': OrderNotFound,
'Price is more than 20% below market price.': InvalidOrder,
'Bitstamp.net is under scheduled maintenance.': OnMaintenance, // { "error": "Bitstamp.net is under scheduled maintenance. We'll be back soon." }
+ 'Order could not be placed.': ExchangeNotAvailable, // Order could not be placed (perhaps due to internal error or trade halt). Please retry placing order.
},
'broad': {
'Minimum order size is': InvalidOrder, // Minimum order size is 5.0 EUR.
| 9 |
diff --git a/token-metadata/0x905D3237dC71F7D8f604778e8b78f0c3ccFF9377/metadata.json b/token-metadata/0x905D3237dC71F7D8f604778e8b78f0c3ccFF9377/metadata.json "symbol": "BRAP",
"address": "0x905D3237dC71F7D8f604778e8b78f0c3ccFF9377",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0x82A6A22d68fFba4057d5b49F93dE5C05e4416bd1/metadata.json b/token-metadata/0x82A6A22d68fFba4057d5b49F93dE5C05e4416bd1/metadata.json "symbol": "MWT",
"address": "0x82A6A22d68fFba4057d5b49F93dE5C05e4416bd1",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/src/config/supportedRuntimes.js b/src/config/supportedRuntimes.js @@ -15,7 +15,7 @@ module.exports = new Set([
// 'dotnetcore2.0',
// supported
- // dotnetcore2.1
+ // 'dotnetcore2.1'
// ==========
// GO
@@ -27,7 +27,7 @@ module.exports = new Set([
// JAVA
// ==========
- // java8
+ // 'java8'
// ==========
// NODE.JS
| 0 |
diff --git a/src/ModelerApp.vue b/src/ModelerApp.vue @@ -26,8 +26,6 @@ import Modeler from './components/Modeler.vue';
import statusbar from './components/statusbar.vue';
import FileUpload from 'vue-upload-component';
import FilerSaver from 'file-saver';
-import { faCheckCircle, faTimesCircle } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
import validationStatus from '@/components/validationStatus';
const reader = new FileReader();
@@ -39,42 +37,12 @@ export default {
FileUpload,
validationStatus,
statusbar,
- FontAwesomeIcon,
},
data() {
return {
validationErrors: null,
};
},
- computed: {
- statusIcon() {
- return this.hasValidationErrors
- ? faTimesCircle
- : faCheckCircle;
- },
- statusColor() {
- return this.hasValidationErrors
- ? 'red'
- : 'green';
- },
- hasValidationErrors() {
- return this.numberOfValidationErrors > 0;
- },
- numberOfValidationErrors() {
- if (!this.validationErrors) {
- return 0;
- }
-
- return Object.entries(this.validationErrors).reduce((numberOfErrors, [,errors]) => {
- return numberOfErrors + errors.length;
- }, 0);
- },
- statusText() {
- return this.hasValidationErrors
- ? `${this.numberOfValidationErrors} error${this.numberOfValidationErrors === 1 ? '' : 's'} detected`
- : 'No errors detected';
- },
- },
methods: {
download() {
this.$refs.modeler.toXML(function(err, xml) {
| 2 |
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js // last layer/move is to zmax
// injected into the last layer generated
- if (lastPoint)
+ if (lastPoint && newOutput.length)
addOutput(newOutput[newOutput.length-1], printPoint = lastPoint.clone().setZ(zmax_outer), 0, 0, tool.getNumber());
// replace output single flattened layer with all points
| 1 |
diff --git a/checkfiles/checkfiles.py b/checkfiles/checkfiles.py @@ -874,6 +874,10 @@ def patch_file(session, url, job):
if data:
item_url = urljoin(url, job['@id'])
+
+ etag_r = session.get(item_url + '?frame=edit&datastore=database')
+ if etag_r.ok:
+ if job['etag'] == etag_r.headers['etag']:
r = session.patch(
item_url,
data=json.dumps(data),
@@ -887,6 +891,10 @@ def patch_file(session, url, job):
'{} {}\n{}'.format(r.status_code, r.reason, r.text)
else:
job['patched'] = True
+ else:
+ errors['etag_does_not_match'] = 'Original etag was {}, but the current etag is {}.'.format(
+ job['etag'], etag_r.headers['etag']) + ' File {} '.format(job['item'].get('accession', 'UNKNOWN')) + \
+ 'was {} and now is {}.'.format(job['item'].get('status', 'UNKNOWN'), etag_r.json()['status'])
return
def run(out, err, url, username, password, encValData, mirror, search_query,
| 0 |
diff --git a/blocks/loops.js b/blocks/loops.js @@ -334,9 +334,8 @@ Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN = {
// Don't change state if:
// * It's at the start of a drag.
// * It's not a move event.
- // * Or the moving block is not this block.
if (!this.workspace.isDragging || this.workspace.isDragging() ||
- e.type != Blockly.Events.BLOCK_MOVE || e.blockId != this.id) {
+ e.type != Blockly.Events.BLOCK_MOVE) {
return;
}
var enabled = Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN
| 3 |
diff --git a/src/client/js/components/PageEditor/CodeMirrorEditor.jsx b/src/client/js/components/PageEditor/CodeMirrorEditor.jsx @@ -58,7 +58,7 @@ require('../../util/codemirror/autorefresh.ext');
const MARKDOWN_TABLE_ACTIVATED_CLASS = 'markdown-table-activated';
// TODO: activate by GW-3443
// const MARKDOWN_LINK_ACTIVATED_CLASS = 'markdown-link-activated';
-const MARKDOWN_LINK_ACTIVATED_CLASS = 'markdown-link-activated';
+const MARKDOWN_LINK_ACTIVATED_CLASS = '';
export default class CodeMirrorEditor extends AbstractEditor {
| 12 |
diff --git a/include/wf.hrl b/include/wf.hrl -type context_data() :: iolist() | {file, Filename :: path()}
| {stream, Size :: integer(), fun()}
| {sendfile, integer(), Size :: integer(), Path :: any()}.
--type context_type() :: first_request | postback_request | static_file | postback_websocket | undefined.
+-type context_type() :: first_request | postback_request | static_file | postback_websocket | comet | undefined.
-type mermaid_code() :: binary() | string() | iolist().
-type mermaid_diagram() :: flowchart | sequence | gantt.
-type mermaid_diagram_options(Diagram) :: {Diagram, proplist()}.
| 11 |
diff --git a/packages/app/src/components/Page/FixPageGrantAlert.tsx b/packages/app/src/components/Page/FixPageGrantAlert.tsx @@ -15,7 +15,7 @@ type ModalProps = {
isOpen: boolean
pageId: string
dataApplicableGrant: IResApplicableGrant
- close(): Promise<void> | void
+ close(): void
}
const FixPageGrantModal = (props: ModalProps): JSX.Element => {
| 7 |
diff --git a/test/contracts/FuturesMarket.nextPrice.js b/test/contracts/FuturesMarket.nextPrice.js @@ -54,8 +54,6 @@ contract('FuturesMarket MixinFuturesNextPriceOrders', accounts => {
contracts: [
'FuturesMarketManager',
'FuturesMarketSettings',
- 'ProxyFuturesMarketBTC',
- 'ProxyFuturesMarketETH',
'FuturesMarketBTC',
'AddressResolver',
'FeePool',
| 1 |
diff --git a/lib/default-config.js b/lib/default-config.js @@ -178,10 +178,10 @@ module.exports = {
* own project based on Browsersync
* @property logPrefix
* @type String
- * @default BS
+ * @default Browsersync
* @since 1.5.1
*/
- logPrefix: "BS",
+ logPrefix: "Browsersync",
/**
* @property logConnections
| 12 |
diff --git a/src/components/Dropdown/Dropdown.jsx b/src/components/Dropdown/Dropdown.jsx @@ -305,7 +305,7 @@ Dropdown.propTypes = {
*/
menuPortalTarget: PropTypes.oneOfType(PropTypes.element, PropTypes.object),
/**
- * Custom function to override existing styles, ex: base => {...base, ...myCustomOverrides}
+ * Custom function to override existing styles (similar to `react-select`'s `style` prop), for example: `base => ({...base, color: 'red'})`, where `base` is the component's default styles
*/
extraStyles: PropTypes.func,
| 7 |
diff --git a/src/server/service/search-reconnect-context/reconnect-context.js b/src/server/service/search-reconnect-context/reconnect-context.js +const loggerFactory = require('@alias/logger');
+
+const logger = loggerFactory('growi:service:search-reconnect-context:reconnect-context');
+
+
+const RECONNECT_INTERVAL_SEC = 120;
+
class ReconnectContext {
constructor() {
+ this.lastEvalDate = null;
+
this.reset(true);
}
@@ -18,16 +27,44 @@ class ReconnectContext {
this.stage++;
}
- get shouldReconnect() {
+ get shouldReconnectByCount() {
const thresholdOfThisStage = 10 * Math.log2(this.stage); // 0, 10, 15.9, 20, 23.2, 25.9, 28.1, 30, ...
return this.counter > thresholdOfThisStage;
}
+ get shouldReconnectByTime() {
+ if (this.lastEvalDate == null) {
+ this.lastEvalDate = new Date();
+ return true;
+ }
+
+ const thres = this.lastEvalDate.setSeconds(this.lastEvalDate.getSeconds() + RECONNECT_INTERVAL_SEC);
+ return thres < new Date();
+ }
+
+ get shouldReconnect() {
+ if (this.shouldReconnectByTime) {
+ logger.info('Server should reconnect by time');
+ return true;
+ }
+ if (this.shouldReconnectByCount) {
+ logger.info('Server should reconnect by count');
+ return true;
+ }
+ return false;
}
-function nextTick(context) {
+}
+
+async function nextTick(context, reconnectHandler) {
context.incrementCount();
- return context.shouldReconnect;
+
+ if (context.shouldReconnect) {
+ await reconnectHandler();
+ }
+ else {
+ context.incrementStage();
+ }
}
module.exports = {
| 7 |
diff --git a/README.md b/README.md ## [Documentation](http://react-slick.neostack.com)
-### :warning: Alert
-
-:construction: [email protected].* releases are experimental.
-:white_check_mark: **Use [email protected] in production** until we make our next stable release ([email protected])
-:pray: We invite you to test [email protected].* in dev environment and report any breaking changes.
-
### Installation
**npm**
@@ -118,4 +112,3 @@ open http://localhost:8080
## Contributing
Please see the [contributing guidelines](./CONTRIBUTING.md)
-
| 2 |
diff --git a/server/dumper.js b/server/dumper.js @@ -60,7 +60,7 @@ var Dumper = function(intrp1, intrp2) {
/** @const {!Map<!Interpreter.Scope,!ScopeDumper>} */
this.scopeDumpers = new Map();
/** @const {!Map<!Interpreter.prototype.Object,!ObjectDumper>} */
- this.objDumpers = new Map();
+ this.objDumpers2 = new Map();
/**
* Map of Arguments objects to the ScopeDumpers for the scopes to
* which they belong.
@@ -612,9 +612,9 @@ Dumper.prototype.getScopeDumper = function(scope) {
* @return {!ObjectDumper} The ObjectDumper for obj.
*/
Dumper.prototype.getObjectDumper = function(obj) {
- if (this.objDumpers.has(obj)) return this.objDumpers.get(obj);
+ if (this.objDumpers2.has(obj)) return this.objDumpers2.get(obj);
var objDumper = new ObjectDumper(this, obj);
- this.objDumpers.set(obj, objDumper);
+ this.objDumpers2.set(obj, objDumper);
return objDumper;
};
| 10 |
diff --git a/assets/src/edit-story/app/media/utils/useUploadVideoFrame.js b/assets/src/edit-story/app/media/utils/useUploadVideoFrame.js @@ -46,6 +46,7 @@ function useUploadVideoFrame({ updateMediaElement }) {
const processData = async (id, src) => {
try {
const obj = await getFirstFrameOfVideo(src);
+ obj.name = getFileName(src) + '-poster.jpeg';
const {
id: posterId,
source_url: poster,
@@ -97,6 +98,15 @@ function useUploadVideoFrame({ updateMediaElement }) {
}
};
+ /**
+ * Helper function get the file name without the extension from a url.
+ *
+ * @param {string} url URL to file.
+ * @return {string} File name without the extension.
+ */
+ const getFileName = (url) =>
+ url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
+
/**
* Uploads the video's first frame as an attachment.
*
| 7 |
diff --git a/assets/js/modules/analytics/settings/settings-edit.js b/assets/js/modules/analytics/settings/settings-edit.js @@ -47,12 +47,6 @@ export default function SettingsEdit() {
const isDoingSubmitChanges = useSelect( ( select ) => select( STORE_NAME ).isDoingSubmitChanges() );
const isCreateAccount = ACCOUNT_CREATE === accountID;
- // Rollback any temporary selections to saved values on dismount.
- const { rollbackSettings } = useDispatch( STORE_NAME );
- useEffect( () => {
- return () => rollbackSettings();
- }, [] );
-
// Toggle disabled state of legacy confirm changes button.
useEffect( () => {
const confirm = global.document.getElementById( 'confirm-changes-analytics' );
| 2 |
diff --git a/src/main/resources/META-INF/primefaces-extensions.taglib.xml b/src/main/resources/META-INF/primefaces-extensions.taglib.xml @@ -6887,7 +6887,7 @@ See showcase for an example. Default null.]]>
</attribute>
<attribute>
<description>
- <![CDATA[Date object to render.]]>
+ <![CDATA[Date, ZonedDateTime or LocalDateTime object to render.]]>
</description>
<name>value</name>
<required>true</required>
| 7 |
diff --git a/src/lib/login/LoginService.js b/src/lib/login/LoginService.js @@ -26,10 +26,10 @@ class LoginService {
}
// eslint-disable-next-line class-methods-use-this
- storeJWT(jwt: string) {
+ async storeJWT(jwt: string) {
this.jwt = jwt
if (jwt) {
- AsyncStorage.setItem(JWT, jwt)
+ await AsyncStorage.setItem(JWT, jwt)
}
}
@@ -80,7 +80,7 @@ class LoginService {
creds = await this.requestJWT(creds)
await this.storeJWT(creds.jwt)
- await API.init()
+ await API.init(creds.jwt)
return creds
}
| 0 |
diff --git a/token-metadata/0x61cDb66e56FAD942a7b5cE3F419FfE9375E31075/metadata.json b/token-metadata/0x61cDb66e56FAD942a7b5cE3F419FfE9375E31075/metadata.json "symbol": "RAIN",
"address": "0x61cDb66e56FAD942a7b5cE3F419FfE9375E31075",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/balances.js b/balances.js +/*jslint node: true */
+"use strict";
var db = require('./db');
-var ValidationUtils = require("./validation_utils.js");
function readBalance(wallet, handleBalance){
- var walletIsAddress = ValidationUtils.isValidAddress(wallet);
+ var walletIsAddress = typeof wallet === 'string' && wallet.length === 32; // ValidationUtils.isValidAddress
var join_my_addresses = walletIsAddress ? "" : "JOIN my_addresses USING(address)";
var where_condition = walletIsAddress ? "address=?" : "wallet=?";
var assocBalances = {base: {stable: 0, pending: 0}};
| 4 |
diff --git a/Source/Widgets/CesiumInspector/CesiumInspectorViewModel.js b/Source/Widgets/CesiumInspector/CesiumInspectorViewModel.js @@ -238,7 +238,7 @@ define([
* @type {Boolean}
* @default false
*/
- this.pickPimitiveActive = false;
+ this.pickPrimitiveActive = false;
/**
* Gets if the picking tile command is active. This property is observable.
@@ -296,10 +296,35 @@ define([
*/
this.terrainSwitchText = '+';
- knockout.track(this, ['filterTile', 'suspendUpdates', 'dropDownVisible', 'shaderCacheText', 'frustums',
- 'frustumStatisticText', 'pickTileActive', 'pickPrimitiveActive', 'hasPickedPrimitive',
- 'hasPickedTile', 'tileText', 'generalVisible', 'generalSwitchText',
- 'primitivesVisible', 'primitivesSwitchText', 'terrainVisible', 'terrainSwitchText', 'depthFrustumText']);
+ knockout.track(this, [
+ 'frustums',
+ 'shaderCacheText',
+ 'primitiveBoundingSphere',
+ 'primitiveReferenceFrame',
+ 'filterPrimitive',
+ 'tileBoundingSphere',
+ 'filterTile',
+ 'wireframe',
+ 'globeDepth',
+ 'pickDepth',
+ 'depthFrustum',
+ 'depthFrustumText',
+ 'suspendUpdates',
+ 'tileCoordinates',
+ 'frustumStatisticText',
+ 'tileText',
+ 'hasPickedPrimitive',
+ 'hasPickedTile',
+ 'pickPrimitiveActive',
+ 'pickTileActive',
+ 'dropDownVisible',
+ 'generalVisible',
+ 'primitivesVisible',
+ 'terrainVisible',
+ 'generalSwitchText',
+ 'primitivesSwitchText',
+ 'terrainSwitchText'
+ ]);
this._toggleDropDown = createCommand(function() {
that.dropDownVisible = !that.dropDownVisible;
| 3 |
diff --git a/README.md b/README.md @@ -131,8 +131,8 @@ Parameters with dots in their names are single strings used to organize subordin
Parameter Name | Description
--- | ---
url | The url pointing to API definition (normally `swagger.json` or `swagger.yaml`). Will be ignored if `urls` or `spec` is used.
-urls | An array of API definition objects (`{url: "<url>", name: "<name>"}`) used by Topbar plugin. When used and Topbar plugin is enabled, the `url` parameter will not be parsed.
-urls.primaryName | When using `urls`, you can use this subparameter select an initial spec instead of defaulting to the first one. Useful as a query parameter to link to a specific spec.
+urls | An array of API definition objects (`{url: "<url>", name: "<name>"}`) used by Topbar plugin. When used and Topbar plugin is enabled, the `url` parameter will not be parsed. Names and URLs must be unique among all items in this array, since they're used as identifiers.
+urls.primaryName | When using `urls`, you can use this subparameter. If the value matches the name of a spec provided in `urls`, that spec will be displayed when Swagger-UI loads, instead of defaulting to the first spec in `urls`.
spec | A JSON object describing the OpenAPI Specification. When used, the `url` parameter will not be parsed. This is useful for testing manually-generated specifications without hosting them.
validatorUrl | By default, Swagger-UI attempts to validate specs against swagger.io's online validator. You can use this parameter to set a different validator URL, for example for locally deployed validators ([Validator Badge](https://github.com/swagger-api/validator-badge)). Setting it to `null` will disable validation.
dom_id | The id of a dom element inside which SwaggerUi will put the user interface for swagger.
| 7 |
diff --git a/index.js b/index.js @@ -34,7 +34,7 @@ module.exports = {
convertedSpecs = [],
rootFiles = parse.getRootFiles(filesPathArray);
- async.each(rootFiles, (rootFile, callback) => {
+ async.eachSeries(rootFiles, (rootFile, callback) => {
loader
// will merge all the files in the folder
.loadSpec(rootFile, loaderOptions)
| 4 |
diff --git a/src/js/Nostr.ts b/src/js/Nostr.ts @@ -809,7 +809,7 @@ export default {
.map((tag) => tag[1])
.slice(0, 2);
for (const id of repliedMsgs) {
- this.getMessageById(id);
+ //this.getMessageById(id);
if (!this.threadRepliesByMessageId.has(id)) {
this.threadRepliesByMessageId.set(id, new Set<string>());
}
@@ -872,7 +872,7 @@ export default {
this.likesByUser.get(event.pubkey).add({ id, created_at: event.created_at });
const myPub = iris.session.getKey().secp256k1.rpub;
if (event.pubkey === myPub || this.followedByUser.get(myPub)?.has(event.pubkey)) {
- this.getMessageById(id);
+ //this.getMessageById(id);
}
},
handleFollow(event: Event) {
| 13 |
diff --git a/scripts/upcoming.js b/scripts/upcoming.js @@ -171,9 +171,12 @@ const year = /^[0-9]{4}$/;
const output = await Promise.all(promises);
// Display if the document was found, and if it was modified or not
- output.forEach(doc => {
- console.log(`N: ${doc.result.n}`);
- console.log(`Modified: ${doc.result.nModified}`);
+ output.forEach((doc, index) => {
+ if (doc.result.nModified !== 0) {
+ console.log(`${payloads[index]} UPDATED`);
+ } else {
+ console.log(`${payloads[index]}`);
+ }
});
} catch (err) {
console.log(err.stack);
| 14 |
diff --git a/src/components/Picker.vue b/src/components/Picker.vue ref="scroll"
@scroll="onScroll"
>
- <div id="emoji-mart-list" role="listbox" aria-expanded="true">
+ <div
+ id="emoji-mart-list"
+ ref="scrollContent"
+ role="listbox"
+ aria-expanded="true"
+ >
<category
v-for="(category, idx) in filteredCategories"
v-show="infiniteScroll || category == activeCategory"
@@ -371,8 +376,8 @@ export default {
].emojis[this.previewEmojiIdx]
// Scroll the view if the `previewEmoji` goes out of the visible area.
- const emojiEl = document.querySelector('.emoji-mart-emoji-selected')
- const scrollEl = document.querySelector('.emoji-mart-scroll')
+ const scrollEl = this.$refs.scroll
+ const emojiEl = scrollEl.querySelector('.emoji-mart-emoji-selected')
if (!scrollEl) return
| 4 |
diff --git a/components/core/CollectionPreviewBlock/index.js b/components/core/CollectionPreviewBlock/index.js @@ -334,8 +334,8 @@ const useAnimateDescription = ({
const getObjectToPreview = (coverImage) => {
let isImage =
- Validations.isPreviewableImage(coverImage) ||
- (coverImage.coverImage && Validations.isPreviewableImage(coverImage.coverImage));
+ Validations.isPreviewableImage(coverImage.type) ||
+ (coverImage.coverImage && Validations.isPreviewableImage(coverImage.coverImage.type));
return { object: coverImage, type: isImage ? "IMAGE" : "PLACEHOLDER" };
};
| 1 |
diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js @@ -47,7 +47,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
userMiddleware(),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
getTile(this.tileBackend, 'map_tile'),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -66,7 +66,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
userMiddleware(),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
getTile(this.tileBackend, 'map_tile'),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -86,7 +86,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
userMiddleware(),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
getTile(this.tileBackend, 'maplayer_tile'),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -105,7 +105,7 @@ LayergroupController.prototype.register = function(app) {
cors(),
userMiddleware(),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
getFeatureAttributes(this.attributesBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -123,7 +123,7 @@ LayergroupController.prototype.register = function(app) {
userMiddleware(),
allowQueryParams(['layer']),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi, forcedFormat),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi, forcedFormat),
getPreviewImageByCenter(this.previewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -139,7 +139,7 @@ LayergroupController.prototype.register = function(app) {
userMiddleware(),
allowQueryParams(['layer']),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi, forcedFormat),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi, forcedFormat),
getPreviewImageByBoundingBox(this.previewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -173,7 +173,7 @@ LayergroupController.prototype.register = function(app) {
userMiddleware(),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
getDataview(this.dataviewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -189,7 +189,7 @@ LayergroupController.prototype.register = function(app) {
userMiddleware(),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
getDataview(this.dataviewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -205,7 +205,7 @@ LayergroupController.prototype.register = function(app) {
userMiddleware(),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
dataviewSearch(this.dataviewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -221,7 +221,7 @@ LayergroupController.prototype.register = function(app) {
userMiddleware(),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
- getMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
+ createMapStoreMapConfigProvider(this.mapStore, this.userLimitsApi),
dataviewSearch(this.dataviewBackend),
setCacheControlHeader(),
setLastModifiedHeader(),
@@ -282,8 +282,8 @@ function getRequestParams(locals) {
return params;
}
-function getMapStoreMapConfigProvider (mapStore, userLimitsApi, forcedFormat = null) {
- return function getMapStoreMapConfigProviderMiddleware (req, res, next) {
+function createMapStoreMapConfigProvider (mapStore, userLimitsApi, forcedFormat = null) {
+ return function createMapStoreMapConfigProviderMiddleware (req, res, next) {
const { user } = res.locals;
const params = getRequestParams(res.locals);
| 10 |
diff --git a/src/core/operations/Hash.js b/src/core/operations/Hash.js @@ -333,6 +333,12 @@ const Hash = {
"\nSHA3 256: " + Hash.runSHA3(input, ["256"]) +
"\nSHA3 384: " + Hash.runSHA3(input, ["384"]) +
"\nSHA3 512: " + Hash.runSHA3(input, ["512"]) +
+ "\nKeccak 224: " + Hash.runKeccak(input, ["224"]) +
+ "\nKeccak 256: " + Hash.runKeccak(input, ["256"]) +
+ "\nKeccak 384: " + Hash.runKeccak(input, ["384"]) +
+ "\nKeccak 512: " + Hash.runKeccak(input, ["512"]) +
+ "\nShake 128: " + Hash.runShake(input, ["128", 256]) +
+ "\nShake 256: " + Hash.runShake(input, ["256", 512]) +
"\nRIPEMD-160: " + Hash.runRIPEMD160(input, []) +
"\n\nChecksums:" +
"\nFletcher-8: " + Checksum.runFletcher8(byteArray, []) +
| 0 |
diff --git a/.gitmodules b/.gitmodules url = https://github.com/KhronosGroup/glTF-Sample-Models.git
[submodule "assets/environments"]
path = assets/environments
- url = https://github.com/ux3d/glTF-Sample-Environments.git
+ url = https://github.com/KhronosGroup/glTF-Sample-Environments.git
| 4 |
diff --git a/.github/workflows/website_deploy.yml b/.github/workflows/website_deploy.yml @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: amondnet/vercel-action@v19
+ - uses: amondnet/[email protected]+1
with:
vercel-token: ${{ secrets.ZEIT_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }} # Optional
| 4 |
diff --git a/core/workspace_svg.js b/core/workspace_svg.js @@ -479,7 +479,7 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
this.grid_.update(this.scale);
}
this.recordDeleteAreas();
- this.recordBoundingBoxes();
+ this.recordWorkspaceAreas();
return this.svgGroup_;
};
@@ -656,7 +656,7 @@ Blockly.WorkspaceSvg.prototype.getToolbox = function() {
Blockly.WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
this.updateInverseScreenCTM();
this.recordDeleteAreas();
- this.recordBoundingBoxes();
+ this.recordWorkspaceAreas();
};
/**
@@ -1171,20 +1171,20 @@ Blockly.WorkspaceSvg.prototype.recordDeleteAreas = function() {
};
/**
- * Make the bounding boxes which contain this workspace and flyout. These are
- * necessary to detect if mouse is over the elements.
+ * Make the bounding rectangles which contain this workspace and flyout. These
+ * are necessary to detect if mouse is over the elements.
*/
-Blockly.WorkspaceSvg.prototype.recordBoundingBoxes = function() {
+Blockly.WorkspaceSvg.prototype.recordWorkspaceAreas = function() {
if (this.isFlyout) {
var rect = this.ownerFlyout_.getBoundingRectangle();
} else {
var rect = goog.math.Rect.createFromBox(
this.svgGroup_.getBoundingClientRect());
}
- this.workspaceBoundingBox_ = rect;
+ this.workspaceArea_ = rect;
if (this.flyout_) {
- this.flyoutBoundingBox_ = this.flyout_.getBoundingRectangle();
+ this.flyoutArea_ = this.flyout_.getBoundingRectangle();
}
};
@@ -1211,7 +1211,7 @@ Blockly.WorkspaceSvg.prototype.isDeleteArea = function(e) {
*/
Blockly.WorkspaceSvg.prototype.isFlyoutArea = function(e) {
var xy = new goog.math.Coordinate(e.clientX, e.clientY);
- return !!this.flyoutBoundingBox_ && this.flyoutBoundingBox_.contains(xy);
+ return !!this.flyoutArea_ && this.flyoutArea_.contains(xy);
};
/**
@@ -1261,8 +1261,8 @@ Blockly.WorkspaceSvg.prototype.detectWorkspace = function(e) {
var targetWS = mainWS;
for (var i = 0, child; child = children[i]; i++) {
var ws = children.pop();
- // TODO: Use the workspaceBoundingBox_ instead of the dom API.
- // workspaceBoundingBox_ is not updated instantly when the workspace is
+ // TODO: Use the workspaceArea_ instead of the dom API.
+ // workspaceArea_ is not updated instantly when the workspace is
// mutator.
var rect = goog.math.Rect.createFromBox(
ws.svgGroup_.getBoundingClientRect());
| 10 |
diff --git a/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/Autopilot/CJ4NavModeSelector.js b/src/workingtitle-vcockpits-instruments-cj4/html_ui/Pages/VCockpit/Instruments/Airliners/CJ4/Shared/Autopilot/CJ4NavModeSelector.js @@ -229,6 +229,7 @@ class CJ4NavModeSelector {
case VerticalNavModeState.ALTC:
case VerticalNavModeState.ALT:
SimVar.SetSimVarValue("L:WT_CJ4_VS_ON", "number", 1);
+ Coherent.call("AP_VS_VAR_SET_ENGLISH", 1, Simplane.getVerticalSpeed());
SimVar.SetSimVarValue("K:AP_PANEL_VS_HOLD", "number", 1);
this.currentVerticalActiveState = VerticalNavModeState.VS;
break;
@@ -250,6 +251,7 @@ class CJ4NavModeSelector {
break;
case VerticalNavModeState.PATH:
SimVar.SetSimVarValue("L:WT_CJ4_VS_ON", "number", 1);
+ Coherent.call("AP_VS_VAR_SET_ENGLISH", 1, Simplane.getVerticalSpeed());
this.currentVerticalActiveState = VerticalNavModeState.VS;
break;
}
| 12 |
diff --git a/token-metadata/0x2167FB82309CF76513E83B25123f8b0559d6b48f/metadata.json b/token-metadata/0x2167FB82309CF76513E83B25123f8b0559d6b48f/metadata.json "symbol": "LION",
"address": "0x2167FB82309CF76513E83B25123f8b0559d6b48f",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/lib/axios.js b/lib/axios.js @@ -30,7 +30,7 @@ function createInstance(defaultConfig) {
utils.extend(instance, Axios.prototype, context, {allOwnKeys: true});
// Copy context to instance
- utils.extend(instance, context, {allOwnKeys: true});
+ utils.extend(instance, context, null, {allOwnKeys: true});
// Factory for creating new instances
instance.create = function create(instanceConfig) {
| 1 |
diff --git a/assets/js/components/DashboardNavigation.js b/assets/js/components/DashboardNavigation.js @@ -99,7 +99,7 @@ export default function DashboardNavigation() {
const breakpoint = useBreakpoint();
const [ selectedID, setSelectedID ] = useState(
- global.location.hash.substr( 1 )
+ global.location.hash.substring( 1 )
);
const handleSelect = useCallback(
| 14 |
diff --git a/package.json b/package.json "test:native": "npm run test:ios && npm run test:android",
"test:ios": "npm run animation:assets && ENVFILE=.env.test detox build -c ios.sim.debug && detox test -c ios.sim.debug",
"test:android": "npm run animation:assets && ENVFILE=.env.test detox build -c android.emu.debug && detox test -c android.emu.debug",
- "coverage": "react-app-rewired test --coverage",
+ "coverage": "npm run link && react-app-rewired test --coverage",
"coveralls": "cat ./coverage/lcov.info | node node_modules/.bin/coveralls",
"bundlesize:check": "bundlesize",
"flow": "flow",
| 0 |
diff --git a/src/js/modules/Edit/List.js b/src/js/modules/Edit/List.js @@ -65,12 +65,19 @@ export default class Edit{
var attribs = this.params.elementAttributes;
var input = document.createElement("input");
+ // input.setAttribute("type", "search");
input.setAttribute("type", this.params.clearable ? "search" : "text");
input.style.padding = "4px";
input.style.width = "100%";
input.style.boxSizing = "border-box";
+ if(!this.params.autocomplete){
+ input.style.cursor = "default";
+ input.style.caretColor = "transparent";
+ // input.readOnly = (this.edit.currentCell != false);
+ }
+
if(attribs && typeof attribs == "object"){
for (let key in attribs){
if(key.charAt(0) == "+"){
@@ -103,6 +110,7 @@ export default class Edit{
input.addEventListener("click", this._inputClick.bind(this))
input.addEventListener("blur", this._inputBlur.bind(this))
input.addEventListener("keydown", this._inputKeyDown.bind(this))
+ input.addEventListener("search", this._inputSearch.bind(this))
if(this.params.autocomplete){
input.addEventListener("keyup", this._inputKeyUp.bind(this))
@@ -132,6 +140,10 @@ export default class Edit{
}
}
+ _inputSearch(){
+ this._clearChoices();
+ }
+
_inputKeyDown(e){
switch(e.keyCode){
@@ -166,6 +178,7 @@ export default class Edit{
default:
this._keySelectLetter(e);
+ e.preventDefault();
}
}
@@ -311,6 +324,7 @@ export default class Edit{
rebuildOptionsList(){
this._generateOptions()
+ .then(this._sortOptions.bind(this))
.then(this._buildList.bind(this))
.then(this._showList.bind(this))
}
@@ -447,6 +461,13 @@ export default class Edit{
});
}
+ _sortOptions(options){
+
+ //TODO Sort Values
+
+ return options;
+ }
+
_filterOptions(){
var filterFunc = this.params.filterFunc || this._defaultFilterFunc;
var term = this.input.value;
@@ -608,6 +629,17 @@ export default class Edit{
this.actions.cancel();
}
+ _clearChoices(){
+ this.currentItems.forEach((item) => {
+ item.selected = false;
+ this._styleItem(item);
+ });
+
+ this.currentItems = [];
+
+ this._focusItem = null;
+ }
+
_chooseItem(item, silent){
var index;
@@ -646,7 +678,7 @@ export default class Edit{
if(this.params.multiselect){
this.actions.success(this.currentItems.map(item => item.value));
}else{
- this.actions.success(this.currentItems[0] ? this.currentItems[0].value : this.initialValues[0]);
+ this.actions.success(this.currentItems[0] ? this.currentItems[0].value : "");
}
}
| 11 |
diff --git a/src/common/blockchain/interface-blockchain/mining/Interface-Blockchain-Mining.js b/src/common/blockchain/interface-blockchain/mining/Interface-Blockchain-Mining.js @@ -344,7 +344,7 @@ class InterfaceBlockchainMining extends InterfaceBlockchainMiningBasic{
} else {
- await this.blockchain.sleep(100);
+ await this.blockchain.sleep(500);
}
} catch (exception){
@@ -364,7 +364,7 @@ class InterfaceBlockchainMining extends InterfaceBlockchainMiningBasic{
}
- await this.blockchain.sleep(200);
+ await this.blockchain.sleep(1000);
}
| 7 |
diff --git a/demos/blockfactory/workspacefactory/wfactory_init.js b/demos/blockfactory/workspacefactory/wfactory_init.js @@ -346,7 +346,7 @@ WorkspaceFactoryInit.addWorkspaceFactoryEventListeners_ = function(controller) {
// surrounding parent, meaning it is nested in another block (blocks that
// are not nested in parents cannot be shadow blocks).
if (e.type == Blockly.Events.BLOCK_MOVE ||
- e.type == Blockly.Event.SELECTED) {
+ e.type == Blockly.Events.SELECTED) {
var selected = Blockly.selected;
// Show shadow button if a block is selected. Show "Add Shadow" if
| 3 |
diff --git a/vite.config.js b/vite.config.js @@ -16,6 +16,11 @@ export default defineConfig({
},
rollupOptions: options,
},
+ server: {
+ https: true,
+ host: '127.0.0.1',
+ port: 3000,
+ },
css: {
modules: {
generateScopedName: (name) => {
| 12 |
diff --git a/src/layer/tile/WMSTileLayer.js b/src/layer/tile/WMSTileLayer.js @@ -42,7 +42,7 @@ const defaultWmsParams = {
* @param {Object} [options=null] - options defined in [WMSTileLayer]{@link TileLayer#options}
* @example
* var layer = new maptalks.WMSTileLayer('wms', {
- * 'urlTemplate' : 'https://ahocevar.com/geoserver/wms',
+ * 'urlTemplate' : 'https://demo.boundlessgeo.com/geoserver/ows',
* 'crs' : 'EPSG:3857',
* 'layers' : 'ne:ne',
* 'styles' : '',
| 3 |
diff --git a/src/compiler/lexer.imba1 b/src/compiler/lexer.imba1 @@ -9,6 +9,7 @@ import INVERSES from './constants'
var K = 0
var ERR = require './errors'
+var helpers = require './helpers'
# Constants
# ---------
@@ -938,8 +939,9 @@ export class Lexer
prev = last(@tokens)
if !prev or prev:spaced or @prevVal in ['(','[','=']
- token 'STRING', '"' + symbol.slice(1) + '"', match[0]:length
- warn error("Symbols are deprecated - use strings '{symbol.slice(1)}'")
+ let sym = helpers.dashToCamelCase(symbol.slice(1))
+ token 'STRING', '"' + sym + '"', match[0]:length
+ # warn error("Symbols are deprecated - use strings '{symbol.slice(1)}'")
return match[0]:length
return 0
| 11 |
diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html );
return;
}
- const terrainSamplePositions = createGrid(0.005);
+ const terrainSamplePositions = createGrid(0.0005);
Promise.resolve(
Cesium.sampleTerrainMostDetailed(
viewer.terrainProvider,
| 13 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -100,12 +100,12 @@ node /path/to/snowpack/create-snowpack-app/cli [my-new-dir] --template @snowpack
To test a local version of the `create-snowpack-app` templates use
-NOTE This does not work, trying to figure this one out
-
```bash
-npx create-snowpack-app [my-new-dir] --template /path/to/template
+npx create-snowpack-app [my-new-dir] --template ./path/to/template
```
+Note the path must start with must start with a `.` to be considered local
+
The `--verbose` flag enables additional logs which will help to identify the source of a problem. The `--reload` will clear the local cache which might have been created by a different `snowpack` version. Learn more about [Snowpack's CLI flags](https://www.snowpack.dev/#cli-flags).
## Discussion
| 0 |
diff --git a/publish/src/commands/deploy.js b/publish/src/commands/deploy.js @@ -44,7 +44,7 @@ const parameterNotice = props => {
const DEFAULTS = {
gasPrice: '1',
methodCallGasLimit: 15e4,
- contractDeploymentGasLimit: 7e6,
+ contractDeploymentGasLimit: 7.5e6,
network: 'kovan',
buildPath: path.join(__dirname, '..', '..', '..', BUILD_FOLDER),
};
@@ -168,10 +168,6 @@ const deploy = async ({
oracleExrates = await currentExrates.methods.oracle().call();
}
- if (!oracleGasLimit) {
- oracleGasLimit = await oldSynthetix.methods.gasLimitOracle().call();
- }
-
if (!oracleDepot) {
const currentDepot = getExistingContract({ contract: 'Depot' });
oracleDepot = await currentDepot.methods.oracle().call();
@@ -215,7 +211,6 @@ const deploy = async ({
'FeePool exchangeFeeRate': `${w3utils.fromWei(currentExchangeFee)}`,
'ExchangeRates Oracle': oracleExrates,
'Depot Oracle': oracleDepot,
- 'Gas Limit Oracle': oracleGasLimit,
});
if (!yes) {
| 2 |
diff --git a/src/components/accordion/_accordion.scss b/src/components/accordion/_accordion.scss color: $govuk-link-colour;
background: none;
cursor: pointer;
+ -webkit-appearance: none;
@include govuk-link-common;
@include govuk-link-style-default;
}
}
- // Setting focus styles on header so that summary that is not part of the button is included in focus
- .govuk-accordion__section-header--focused {
- // These replicate @mixin govuk-focusable (the mixin can't be used as the header doesn't get the focus)
- outline: $govuk-focus-width solid transparent;
- outline-offset: 0;
- }
-
.govuk-accordion__section--expanded .govuk-accordion__section-header--focused {
border-top-color: $govuk-focus-colour;
+ // When colours are overridden, for example when users have a dark mode,
+ // backgrounds and box-shadows disappear, so we need to ensure there's a
+ // transparent outline which will be set to a visible colour.
+ outline: $govuk-focus-width solid transparent;
+ outline-offset: 0;
color: $govuk-text-colour;
// sass-lint:disable indentation
box-shadow: inset 0 $govuk-accordion-border-width 0 0 $govuk-focus-colour,
background: none;
text-align: left;
cursor: pointer;
+ -webkit-appearance: none;
@include govuk-not-ie8 {
&:focus {
| 7 |
diff --git a/vis/stylesheets/modules/list/_header.scss b/vis/stylesheets/modules/list/_header.scss .btn-default.active, .btn-default:active, .btn-default:focus, .btn-default.active:focus, .btn-default.active.focus, .btn-default.focus, .open > .dropdown-toggle.btn-default {
color: white;
- background-color: $abstract-gray;
- border-color: $abstract-gray;
+ background-color: $journal-gray;
+ border-color: $journal-gray;
}
.btn-default.active:hover, .btn-default:hover {
| 7 |
diff --git a/src/lib/blocks.js b/src/lib/blocks.js @@ -331,5 +331,15 @@ export default function (vm) {
return collator.compare(str1, str2);
};
+ // Blocks wants to know if 3D CSS transforms are supported. The cross
+ // section of browsers Scratch supports and browsers that support 3D CSS
+ // transforms will make the return always true.
+ //
+ // Shortcutting to true lets us skip an expensive style recalculation when
+ // first loading the Scratch editor.
+ ScratchBlocks.utils.is3dSupported = function () {
+ return true;
+ };
+
return ScratchBlocks;
}
| 14 |
diff --git a/rig.js b/rig.js @@ -128,6 +128,9 @@ class RigManager {
}
setLocalAvatarImage(avatarImage) {
+ if (this.localRig.textMesh.avatarMesh) {
+ this.localRig.textMesh.remove(this.localRig.textMesh.avatarMesh);
+ }
const geometry = new THREE.CircleBufferGeometry(0.1, 32);
const img = new Image();
img.src = avatarImage;
@@ -143,11 +146,12 @@ class RigManager {
map: texture,
side: THREE.DoubleSide,
});
+
const avatarMesh = new THREE.Mesh(geometry, material);
avatarMesh.position.x = -0.5;
avatarMesh.position.y = -0.02;
- this.localRig.textMesh.remove(this.localRig.textMesh.children[0]);
+ this.localRig.textMesh.avatarMesh = avatarMesh;
this.localRig.textMesh.add(avatarMesh);
}
| 2 |
diff --git a/src/templates/bootstrap/file/form.ejs b/src/templates/bootstrap/file/form.ejs <div class="col-md-2">
<select class="file-type" ref="fileType">
{% ctx.component.fileTypes.map(function(type) { %}
- <option class="test" value="{{ type.value }}" {% if (type.label === file.fileType) { %}selected="selected"{% } %}>{{ type.label }}</option>
+ <option class="test" value="{{ type.value }}" {% if (type.label === file.fileType) { %}selected="selected"{% } %}>{{ctx.t(type.label)}}</option>
{% }); %}
</select>
</div>
| 11 |
diff --git a/src/components/invite/Invite.js b/src/components/invite/Invite.js @@ -288,7 +288,7 @@ const Invite = () => {
}, [inviteState])
if (isNil(bounty) || isNaN(bounty)) {
- return
+ return null
}
return (
@@ -303,7 +303,7 @@ const Invite = () => {
lineHeight={34}
style={styles.bounty}
>
- {`Get ${bounty / 100}G$`}
+ {`Get ${bounty}G$`}
</Section.Text>
<Section.Text
letterSpacing={0.1}
| 2 |
diff --git a/src/Navigation.js b/src/Navigation.js @@ -25,11 +25,7 @@ import iconSavedActive from "../assets/images/savedActive.png";
import iconSavedDefault from "../assets/images/savedDefault.png";
import iconSupportUsActive from "../assets/images/supportUsActive.png";
import iconSupportUsDefault from "../assets/images/supportUsDefault.png";
-import {
- lightNavyBlueColor,
- transparent,
- tabBarShadowColor
-} from "./constants/colors";
+import { transparent, tabBarShadowColor } from "./constants/colors";
import {
EVENT_LIST,
EVENT_DETAILS,
@@ -75,8 +71,7 @@ const styles = StyleSheet.create({
bottom: 0
},
card: {
- shadowOpacity: 0,
- backgroundColor: lightNavyBlueColor
+ shadowOpacity: 0
}
});
| 2 |
diff --git a/vm.image.js b/vm.image.js @@ -1037,7 +1037,7 @@ Object.subclass('Squeak.Image',
hi = hi >> 3; // shift down, make signed
var negative = hi < 0;
if (negative) { hi = -hi; lo = -lo; if (lo !== 0) hi--; }
- var size = hi <= 0xFF ? 5 : hi <= 0xFFFF ? 6 : hi <= 0xFFFFFF ? 7 : 8;
+ var size = hi === 0 ? 4 : hi <= 0xFF ? 5 : hi <= 0xFFFF ? 6 : hi <= 0xFFFFFF ? 7 : 8;
var largeIntClass = negative ? this.largeNegIntClass : this.largePosIntClass;
var largeInt = new largeIntClass.instProto;
this.registerObjectSpur(largeInt);
| 11 |
diff --git a/javascripts/shared/pv.js b/javascripts/shared/pv.js @@ -1610,7 +1610,7 @@ class Pv extends PvConfig {
$('.daterangepicker').append(
$('<div>')
.addClass('daterange-notice')
- .html($.i18n('date-notice'))
+ .html($.i18n('date-notice', $.i18n('title')))
);
}
| 1 |
diff --git a/publish/deployed/local/feeds.json b/publish/deployed/local/feeds.json -{"SNX":{"asset":"SNX","feed":"0xDaBf717D3d41a2225cdf215d6BD24C4981Bd7e45"},"ETH":{"asset":"ETH","feed":"0xF691bd584f26aE23E603BA3Bb80594f6c02DCe97"},"COMP":{"asset":"COMP","feed":"0x7bC12d4C52CA861b4bB414BA51FfA51d055E598D"},"KNC":{"asset":"KNC","feed":"0x6d7ddCeA7d18320691e7484960d283e9D8C72238"},"REN":{"asset":"REN","feed":"0xe2A410Be4a90d04c2b34CE927FB942d14Af5551C"},"BTC":{"asset":"BTC","feed":"0x43cd3cAa26C926a686465c2695d4154E20A51C4A"},"BNB":{"asset":"BNB","feed":"0x113317AebB0Fca3e85B32B02cdF23D7BFC9fa264"},"TRX":{"asset":"TRX","feed":"0x0D504Fb976440c26E67D51302642Fa69efe3B26A"},"XTZ":{"asset":"XTZ","feed":"0x361866Ea971fEb80dc6c1F3f1B9b53a570C6468C"},"XRP":{"asset":"XRP","feed":"0x13aBe1C85a7b6646Da90d7BC66869D9486A4b527"},"LTC":{"asset":"LTC","feed":"0x05dB82C7DE36D5E04AC9Ebc4340d4689d8bF63B1"},"LINK":{"asset":"LINK","feed":"0xD50629736f10b9920D3F6c4D23756F8430715acC"},"EOS":{"asset":"EOS","feed":"0x0AAe17323D392c6915d093A109F6150727a7E6fF"},"BCH":{"asset":"BCH","feed":"0x3A3e76beB061f2305a470D3B3B1244b44e7556B6"},"ETC":{"asset":"ETC","feed":"0x0DBE6333c6FC681559AB1A08f60DA7F6F03db7f3"},"DASH":{"asset":"DASH","feed":"0x7761E6E591f9F46fCc961fF1B3875A7e33bcB5d8"},"XMR":{"asset":"XMR","feed":"0x02af38f7Ad53D9E964D7dB954fe2168Ef440cfBc"},"ADA":{"asset":"ADA","feed":"0x77D23A6F4c9Fc24695a950e66B618CB3b47D40Ce"},"CEX":{"asset":"CEX","feed":"0x9011D8EE4C695a87364dEB0077b054d5CDdD0DBD"},"DEFI":{"asset":"DEFI","feed":"0xf380D56d33c2C238679B1f3D44d5A2C1FDA85679"},"EUR":{"asset":"EUR","feed":"0x033a74CEE832067b4C5F0cEF367987f253732f97"},"JPY":{"asset":"JPY","feed":"0xA5cfE965809ef23179098CA586394c81Af060AE7"},"AUD":{"asset":"AUD","feed":"0x491AeE807DB94E88db4F24986261C624E27A224c"},"GBP":{"asset":"GBP","feed":"0x6a29046A24f939cb05Cde8C462928233ebf0C49A"},"CHF":{"asset":"CHF","feed":"0xdBAB528b8bA1876FF476F3cc086b94A1EAB33F3D"},"XAU":{"asset":"XAU","feed":"0xE6531C631812769D04449F1e3F4401183ceBD862"},"XAG":{"asset":"XAG","feed":"0xA789A37d623307042684d6b14befcFdDF3477534"},"FTSE100":{"asset":"FTSE100","feed":"0xeA36E6945BA085140CeEd52A9982bE833De71D3a"},"NIKKEI225":{"asset":"NIKKEI225","feed":"0xC3c9EF900b4CEf5542B270C4285b2940344B4B30"}}
\ No newline at end of file
+{
+ "SNX": {"asset": "SNX", "feed": "0x0"},
+ "ETH": {"asset": "ETH", "feed": "0x0"},
+ "COMP": {"asset": "COMP", "feed": "0x0"},
+ "KNC": {"asset": "KNC", "feed": "0x0"},
+ "REN": {"asset": "REN", "feed": "0x0"},
+ "BTC": {"asset": "BTC", "feed": "0x0"},
+ "BNB": {"asset": "BNB", "feed": "0x0"},
+ "TRX": {"asset": "TRX", "feed": "0x0"},
+ "XTZ": {"asset": "XTZ", "feed": "0x0"},
+ "XRP": {"asset": "XRP", "feed": "0x0"},
+ "LTC": {"asset": "LTC", "feed": "0x0"},
+ "LINK": {"asset": "LINK", "feed": "0x0"},
+ "EOS": {"asset": "EOS", "feed": "0x0"},
+ "BCH": {"asset": "BCH", "feed": "0x0"},
+ "ETC": {"asset": "ETC", "feed": "0x0"},
+ "DASH": {"asset": "DASH", "feed": "0x0"},
+ "XMR": {"asset": "XMR", "feed": "0x0"},
+ "ADA": {"asset": "ADA", "feed": "0x0"},
+ "CEX": {"asset": "CEX", "feed": "0x0"},
+ "DEFI": {"asset": "DEFI", "feed": "0x0"},
+ "EUR": {"asset": "EUR", "feed": "0x0"},
+ "JPY": {"asset": "JPY", "feed": "0x0"},
+ "AUD": {"asset": "AUD", "feed": "0x0"},
+ "GBP": {"asset": "GBP", "feed": "0x0"},
+ "CHF": {"asset": "CHF", "feed": "0x0"},
+ "XAU": {"asset": "XAU", "feed": "0x0"},
+ "XAG": {"asset": "XAG", "feed": "0x0"},
+ "FTSE100": {"asset": "FTSE100", "feed": "0x0"},
+ "NIKKEI225": {"asset": "NIKKEI225", "feed": "0x0"}
+}
| 13 |
diff --git a/loadout-manager.js b/loadout-manager.js @@ -53,6 +53,15 @@ class LoadoutManager extends EventTarget {
this.ensureHotbarRenderers();
return this.hotbarRenderers[index];
}
+ getSelectedApp() {
+ this.ensureHotbarRenderers();
+
+ if (this.selectedIndex !== -1) {
+ return this.hotbarRenderers[this.selectedIndex].app;
+ } else {
+ return null;
+ }
+ }
setSelectedIndex(index) {
this.ensureHotbarRenderers();
| 0 |
diff --git a/src/algorithms/initialize.ts b/src/algorithms/initialize.ts @@ -129,13 +129,14 @@ export function getPopulationParams(
return [sim]
}
- const r0s = sampleUniform(params.r0 as [number, number], NUMBER_PARAMETER_SAMPLES)
+ const r0s = sampleUniform([params.r0[0], params.r0[1]], NUMBER_PARAMETER_SAMPLES)
return r0s.map((r0, i) => {
const elt = cloneDeep(sim)
const avgInfectionRate = r0 / params.infectiousPeriod
+ const containment = containmentRealization.length > 1 ? containmentRealization[i] : containmentRealization[0]
elt.rate.infection = (time: number) =>
- containmentRealization[i](time) * infectionRate(time, avgInfectionRate, params.peakMonth, params.seasonalForcing)
+ containment(time) * infectionRate(time, avgInfectionRate, params.peakMonth, params.seasonalForcing)
return elt
})
| 1 |
diff --git a/packages/bitcore-wallet-service/src/lib/chain/eth/index.ts b/packages/bitcore-wallet-service/src/lib/chain/eth/index.ts @@ -467,11 +467,16 @@ export class EthChain implements IChain {
address = Web3.utils.toChecksumAddress(tx.abiType.params[0].value);
amount = tx.abiType.params[1].value;
} else if (tx.abiType && tx.abiType.type === 'MULTISIG' && tx.abiType.name === 'confirmTransaction') {
+ let amount = 0,
+ address = '0x0';
multisigContractAddress = tx.to;
- address = tx.internal
- ? Web3.utils.toChecksumAddress(tx.internal[0].action.to)
- : Web3.utils.toChecksumAddress(tx.calls[0].to);
- amount = tx.internal ? tx.internal[0].action.value : tx.calls[0].value;
+ if (tx.internal) {
+ address = Web3.utils.toChecksumAddress(tx.internal[0].action.to);
+ amount = tx.internal[0].action.value;
+ } else if (tx.calls) {
+ address = Web3.utils.toChecksumAddress(tx.calls[0].to);
+ amount = tx.calls[0].value;
+ }
} else {
address = tx.to;
amount = tx.value;
| 9 |
diff --git a/routes/params.js b/routes/params.js @@ -47,7 +47,7 @@ module.exports = {
typeParam: {
name: 'type',
in: 'query',
- description: '"players" or "guilds"',
+ description: '`players`, `guilds` or `skyblock`',
required: true,
schema: {
type: 'string',
@@ -137,7 +137,7 @@ module.exports = {
pageParam: {
name: 'page',
in: 'query',
- description: 'Pages allow you to split data with the "limit" param. For example if there are 23 auctions matching you query and you se limit to 10, pages 0 and 1 will return 10 results and the third page 3.',
+ description: 'Pages allow you to split the data using the `limit` param. For example, if there are 23 auctions matching your query and you set the limit to 10, each page will return up to the next 10 consecutive results. With 23 results, you would expect pages 0 and 1 to each have 20 results and page 2 to have the remaining 3.',
required: false,
schema: {
type: 'integer',
| 7 |
diff --git a/articles/libraries/custom-signup.md b/articles/libraries/custom-signup.md @@ -118,8 +118,4 @@ Then users can log in with Username and Password.
Password policies for database connections can be configured in the dashboard. For more information, see: [Password Strength in Auth0 Database Connections](/connections/database/password-strength).
-The configured password policies, along with other connection information, can be retrieved publicly by accessing a JSONP file at the following URL:
-
-`https://cdn.auth0.com/client/${account.clientId}.js`
-
-This file can then be parsed client-side to find the current password policy configured in the dashboard. For an example, see: [Custom signup with password policy](https://github.com/auth0/auth0-password-policy-sample).
+If required for implementation of custom signup forms, the configured password policies, along with other connection information, can be retrieved from the the [Management v2 API](https://auth0.com/docs/api/management/v2#!/Connections/get_connections_by_id). The result can be parsed client-side, and will contain information about the current password policy (or policies) configured in the dashboard for that connection.
| 3 |
diff --git a/test/definition.schema.test.js b/test/definition.schema.test.js @@ -2716,7 +2716,7 @@ describe('definition/schema', () => {
const enforcer = await Enforcer(def);
const schema = enforcer.components.schemas.something;
const [ , err ] = schema.populate({ first: 'Bob', type: 'dog' });
- expect(err).to.match(/Unable to find discriminator schema/)
+ expect(err).to.match(/Discriminator property "type" as "undefined" did not map to a schema/)
});
});
@@ -3611,7 +3611,7 @@ describe('definition/schema', () => {
const schema = enforcer.components.schemas.Pet;
schema.anyOf[0].properties.birthDate.format = 'date';
const [ , err ] = schema.serialize({ birthDate: new Date('2000-01-01') });
- expect(err).to.match(/too many schemas match/);
+ expect(err).to.match(/Discriminator property "petType" as "undefined" did not map to a schema/);
});
it('can determine anyOf with discriminator', async () => {
| 3 |
diff --git a/metaversefile-api.js b/metaversefile-api.js @@ -393,6 +393,15 @@ metaversefile.setApi({
getWinds() {
return world.winds;
},
+ setWinds(wind) {
+ world.winds.push(wind);
+ },
+ removeWind(wind) {
+ const index = world.winds.indexOf(wind);
+ if (index > -1) {
+ world.winds.splice(index, 1);
+ }
+ },
registerMirror(mirror) {
mirrors.push(mirror);
},
| 0 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.